iOS Team / ScioLive · Commits

Commit 5baabc111cf625704ec1f16e4cde46c5951adc98

Authored by iOS-Xiaowen
1 parent cbbf71e3

no message

Inline Side-by-side
Showing 7 changed files with 32 additions and 7 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
  View file @5baabc1
@@ -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 = 374; 3603 CURRENT_PROJECT_VERSION = 374;
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.0; 3638 MARKETING_VERSION = 3.6.0;
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 = 374; 3656 CURRENT_PROJECT_VERSION = 374;
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.0; 3691 MARKETING_VERSION = 3.6.0;
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/Base/CNLiveBaseNavigationController.m
  View file @5baabc1
@@ -79,4 +79,9 @@ @@ -79,4 +79,9 @@
79 79
80 } 80 }
81 81
  82 +- (UIStatusBarStyle)preferredStatusBarStyle {
  83 + UIViewController *vc = self.topViewController;
  84 + return [vc preferredStatusBarStyle];
  85 +}
  86 +
82 @end 87 @end
CNLiveScioLive/Pages/Base/CNLiveBaseViewController.m
  View file @5baabc1
@@ -186,4 +186,9 @@ @@ -186,4 +186,9 @@
186 return UIInterfaceOrientationMaskPortrait; 186 return UIInterfaceOrientationMaskPortrait;
187 187
188 } 188 }
  189 +
  190 +- (UIStatusBarStyle)preferredStatusBarStyle {
  191 + return UIStatusBarStyleDefault;
  192 +}
  193 +
189 @end 194 @end
CNLiveScioLive/Pages/Home/新闻详情/OldController/BaseViewController.m
  View file @5baabc1
@@ -25,4 +25,8 @@ @@ -25,4 +25,8 @@
25 return UIInterfaceOrientationMaskPortrait; 25 return UIInterfaceOrientationMaskPortrait;
26 } 26 }
27 27
  28 +- (UIStatusBarStyle)preferredStatusBarStyle {
  29 + return UIStatusBarStyleLightContent;
  30 +}
  31 +
28 @end 32 @end
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
  View file @5baabc1
@@ -604,4 +604,8 @@ @@ -604,4 +604,8 @@
604 [super didReceiveMemoryWarning]; 604 [super didReceiveMemoryWarning];
605 } 605 }
606 606
  607 +- (UIStatusBarStyle)preferredStatusBarStyle {
  608 + return UIStatusBarStyleLightContent;
  609 +}
  610 +
607 @end 611 @end
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
  View file @5baabc1
@@ -525,7 +525,8 @@ @@ -525,7 +525,8 @@
525 frame.origin.y = y; 525 frame.origin.y = y;
526 frame.size.height = height; 526 frame.size.height = height;
527 [relatedInformationView setFrame:frame]; 527 [relatedInformationView setFrame:frame];
528 - 528 + [backgroundView setContentSize:CGSizeMake(MainScreenWidth, relatedInformationView.bottom)];
  529 +
529 } 530 }
530 - (void)showGraphicLive:(id)sender { 531 - (void)showGraphicLive:(id)sender {
531 isShow = !isShow; 532 isShow = !isShow;
CNLiveScioLive/Pages/SDK/XLSlideMenu/XLSlideMenu.m
  View file @5baabc1
@@ -325,4 +325,10 @@ static CGFloat MinActionSpeed = 500; @@ -325,4 +325,10 @@ static CGFloat MinActionSpeed = 500;
325 [super didReceiveMemoryWarning]; 325 [super didReceiveMemoryWarning];
326 } 326 }
327 327
  328 +- (UIStatusBarStyle)preferredStatusBarStyle {
  329 + UITabBarController *tabbar = (UITabBarController *)self.rootViewController;
  330 + UIViewController *vc = tabbar.selectedViewController;
  331 + return [vc preferredStatusBarStyle];
  332 +}
  333 +
328 @end 334 @end