iOS Team / ScioLive · Commits

Commit 69efca88271e74375df9ccd5eca474553a8e3d10

Authored by iOS-Xiaowen
1 parent e56afb03

no message

Inline Side-by-side
Showing 2 changed files with 10 additions and 8 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
  View file @69efca8
@@ -3598,8 +3598,8 @@ @@ -3598,8 +3598,8 @@
3598 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 3598 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
3599 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; 3599 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
3600 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements; 3600 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3601 - CODE_SIGN_IDENTITY = "iPhone Distribution";  
3602 - CODE_SIGN_STYLE = Manual; 3601 + CODE_SIGN_IDENTITY = "Apple Development";
  3602 + CODE_SIGN_STYLE = Automatic;
3603 CURRENT_PROJECT_VERSION = 375; 3603 CURRENT_PROJECT_VERSION = 375;
3604 DEVELOPMENT_TEAM = 94X49GG3ZW; 3604 DEVELOPMENT_TEAM = 94X49GG3ZW;
3605 ENABLE_BITCODE = NO; 3605 ENABLE_BITCODE = NO;
@@ -3638,7 +3638,7 @@ @@ -3638,7 +3638,7 @@
3638 MARKETING_VERSION = 3.6.1; 3638 MARKETING_VERSION = 3.6.1;
3639 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1; 3639 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3640 PRODUCT_NAME = "$(TARGET_NAME)"; 3640 PRODUCT_NAME = "$(TARGET_NAME)";
3641 - PROVISIONING_PROFILE_SPECIFIER = SCIOLiveDis_AppStore; 3641 + PROVISIONING_PROFILE_SPECIFIER = "";
3642 TARGETED_DEVICE_FAMILY = 1; 3642 TARGETED_DEVICE_FAMILY = 1;
3643 VALID_ARCHS = "arm64 arm64e armv7s"; 3643 VALID_ARCHS = "arm64 arm64e armv7s";
3644 }; 3644 };
@@ -3651,8 +3651,8 @@ @@ -3651,8 +3651,8 @@
3651 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 3651 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
3652 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; 3652 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
3653 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements; 3653 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3654 - CODE_SIGN_IDENTITY = "iPhone Distribution";  
3655 - CODE_SIGN_STYLE = Manual; 3654 + CODE_SIGN_IDENTITY = "Apple Development";
  3655 + CODE_SIGN_STYLE = Automatic;
3656 CURRENT_PROJECT_VERSION = 375; 3656 CURRENT_PROJECT_VERSION = 375;
3657 DEVELOPMENT_TEAM = 94X49GG3ZW; 3657 DEVELOPMENT_TEAM = 94X49GG3ZW;
3658 ENABLE_BITCODE = NO; 3658 ENABLE_BITCODE = NO;
@@ -3691,7 +3691,7 @@ @@ -3691,7 +3691,7 @@
3691 MARKETING_VERSION = 3.6.1; 3691 MARKETING_VERSION = 3.6.1;
3692 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1; 3692 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3693 PRODUCT_NAME = "$(TARGET_NAME)"; 3693 PRODUCT_NAME = "$(TARGET_NAME)";
3694 - PROVISIONING_PROFILE_SPECIFIER = SCIOLiveDis_AppStore; 3694 + PROVISIONING_PROFILE_SPECIFIER = "";
3695 TARGETED_DEVICE_FAMILY = 1; 3695 TARGETED_DEVICE_FAMILY = 1;
3696 VALID_ARCHS = "arm64 arm64e armv7s"; 3696 VALID_ARCHS = "arm64 arm64e armv7s";
3697 }; 3697 };
CNLiveScioLive/Pages/Tools/ZXVideoPlayer/Classes/ZXVideoPlayerControlView.m
  View file @69efca8
@@ -127,6 +127,8 @@ static const CGFloat kVideoControlBarAutoFadeOutTimeInterval = 5.0; @@ -127,6 +127,8 @@ static const CGFloat kVideoControlBarAutoFadeOutTimeInterval = 5.0;
127 127
128 self.anchorLabel.center = self.center; 128 self.anchorLabel.center = self.center;
129 self.retryButton.center = self.center; 129 self.retryButton.center = self.center;
  130 +
  131 + self.shareButton.frame = CGRectMake(CGRectGetWidth(self.bounds)-40, 20, 30, 30);
130 } 132 }
131 133
132 - (void)didMoveToSuperview 134 - (void)didMoveToSuperview
@@ -360,7 +362,7 @@ static const CGFloat kVideoControlBarAutoFadeOutTimeInterval = 5.0; @@ -360,7 +362,7 @@ static const CGFloat kVideoControlBarAutoFadeOutTimeInterval = 5.0;
360 _titleLabel = [[UILabel alloc] init]; 362 _titleLabel = [[UILabel alloc] init];
361 _titleLabel.lineBreakMode = NSLineBreakByTruncatingTail; 363 _titleLabel.lineBreakMode = NSLineBreakByTruncatingTail;
362 _titleLabel.textColor = [UIColor whiteColor]; 364 _titleLabel.textColor = [UIColor whiteColor];
363 - _titleLabel.textAlignment = NSTextAlignmentCenter; 365 +// _titleLabel.textAlignment = NSTextAlignmentCenter;
364 } 366 }
365 return _titleLabel; 367 return _titleLabel;
366 } 368 }
@@ -369,7 +371,7 @@ static const CGFloat kVideoControlBarAutoFadeOutTimeInterval = 5.0; @@ -369,7 +371,7 @@ static const CGFloat kVideoControlBarAutoFadeOutTimeInterval = 5.0;
369 if (!_anchorLabel) { 371 if (!_anchorLabel) {
370 _anchorLabel = [[UILabel alloc] init]; 372 _anchorLabel = [[UILabel alloc] init];
371 _anchorLabel.textColor = [UIColor whiteColor]; 373 _anchorLabel.textColor = [UIColor whiteColor];
372 - _anchorLabel.textAlignment = NSTextAlignmentCenter; 374 +// _anchorLabel.textAlignment = NSTextAlignmentCenter;
373 _anchorLabel.layer.borderColor = [UIColor whiteColor].CGColor; 375 _anchorLabel.layer.borderColor = [UIColor whiteColor].CGColor;
374 _anchorLabel.font = [UIFont systemFontOfSize:15]; 376 _anchorLabel.font = [UIFont systemFontOfSize:15];
375 } 377 }