Commit 9ae7b0b10a22d338e97f95bbb0de3ec6dd234574
1 parent
934a6564
no message
Showing
3 changed files
with
17 additions
and
6 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
| @@ -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 = 385; | 3603 | CURRENT_PROJECT_VERSION = 385; |
| 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.2; | 3638 | MARKETING_VERSION = 3.6.2; |
| 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 = 385; | 3656 | CURRENT_PROJECT_VERSION = 385; |
| 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.2; | 3691 | MARKETING_VERSION = 3.6.2; |
| 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/My/用户设置/Controller/CNLiveUserSettingViewController.m
| @@ -285,6 +285,7 @@ static NSString *userSettingTableViewCell = @"CNLiveUserSettingTableViewCell"; | @@ -285,6 +285,7 @@ static NSString *userSettingTableViewCell = @"CNLiveUserSettingTableViewCell"; | ||
| 285 | // 拍照 | 285 | // 拍照 |
| 286 | if ([self isCameraAvailable] && [self doesCameraSupportTakingPhotos]) { | 286 | if ([self isCameraAvailable] && [self doesCameraSupportTakingPhotos]) { |
| 287 | UIImagePickerController *controller = [[UIImagePickerController alloc] init]; | 287 | UIImagePickerController *controller = [[UIImagePickerController alloc] init]; |
| 288 | + controller.modalPresentationStyle = UIModalPresentationFullScreen; | ||
| 288 | controller.sourceType = UIImagePickerControllerSourceTypeCamera; | 289 | controller.sourceType = UIImagePickerControllerSourceTypeCamera; |
| 289 | if ([self isFrontCameraAvailable]) { | 290 | if ([self isFrontCameraAvailable]) { |
| 290 | controller.cameraDevice = UIImagePickerControllerCameraDeviceFront; | 291 | controller.cameraDevice = UIImagePickerControllerCameraDeviceFront; |
| @@ -305,6 +306,7 @@ static NSString *userSettingTableViewCell = @"CNLiveUserSettingTableViewCell"; | @@ -305,6 +306,7 @@ static NSString *userSettingTableViewCell = @"CNLiveUserSettingTableViewCell"; | ||
| 305 | if ([self isPhotoLibraryAvailable]) { | 306 | if ([self isPhotoLibraryAvailable]) { |
| 306 | UIImagePickerController *controller = [[UIImagePickerController alloc] init]; | 307 | UIImagePickerController *controller = [[UIImagePickerController alloc] init]; |
| 307 | controller.sourceType = UIImagePickerControllerSourceTypePhotoLibrary; | 308 | controller.sourceType = UIImagePickerControllerSourceTypePhotoLibrary; |
| 309 | + controller.modalPresentationStyle = UIModalPresentationFullScreen; | ||
| 308 | NSMutableArray *mediaTypes = [[NSMutableArray alloc] init]; | 310 | NSMutableArray *mediaTypes = [[NSMutableArray alloc] init]; |
| 309 | [mediaTypes addObject:(__bridge NSString *)kUTTypeImage]; | 311 | [mediaTypes addObject:(__bridge NSString *)kUTTypeImage]; |
| 310 | controller.mediaTypes = mediaTypes; | 312 | controller.mediaTypes = mediaTypes; |
| @@ -325,6 +327,7 @@ static NSString *userSettingTableViewCell = @"CNLiveUserSettingTableViewCell"; | @@ -325,6 +327,7 @@ static NSString *userSettingTableViewCell = @"CNLiveUserSettingTableViewCell"; | ||
| 325 | // 裁剪 | 327 | // 裁剪 |
| 326 | VPImageCropperViewController *imgEditorVC = [[VPImageCropperViewController alloc] initWithImage:portraitImg cropFrame:CGRectMake(0, 100.0f, self.view.frame.size.width, self.view.frame.size.width) limitScaleRatio:3.0]; | 328 | VPImageCropperViewController *imgEditorVC = [[VPImageCropperViewController alloc] initWithImage:portraitImg cropFrame:CGRectMake(0, 100.0f, self.view.frame.size.width, self.view.frame.size.width) limitScaleRatio:3.0]; |
| 327 | imgEditorVC.delegate = self; | 329 | imgEditorVC.delegate = self; |
| 330 | + imgEditorVC.modalPresentationStyle = UIModalPresentationFullScreen; | ||
| 328 | [self presentViewController:imgEditorVC animated:YES completion:^{ | 331 | [self presentViewController:imgEditorVC animated:YES completion:^{ |
| 329 | // TO DO | 332 | // TO DO |
| 330 | }]; | 333 | }]; |
| @@ -455,4 +458,8 @@ static NSString *userSettingTableViewCell = @"CNLiveUserSettingTableViewCell"; | @@ -455,4 +458,8 @@ static NSString *userSettingTableViewCell = @"CNLiveUserSettingTableViewCell"; | ||
| 455 | return newImage; | 458 | return newImage; |
| 456 | } | 459 | } |
| 457 | 460 | ||
| 461 | +- (UIStatusBarStyle)preferredStatusBarStyle { | ||
| 462 | + return UIStatusBarStyleLightContent; | ||
| 463 | +} | ||
| 464 | + | ||
| 458 | @end | 465 | @end |