Merge branch 'feature/私讯+座驾体系' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私讯+座驾体系

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/BaseVC/FUSBaseViewController.m

@@ -46,6 +46,7 @@
     // 设置状态栏为黑
     [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDarkContent animated:NO];
     [self setNeedsStatusBarAppearanceUpdate];
+    [self.navigationController setNavigationBarHidden:self.hiddenNavigationBar animated:YES];
     
     if (!self.hiddenNavigationBar) {
         
@@ -94,6 +95,7 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+    self.navigationController.delegate = self;
     // Do any additional setup after loading the view.
     _navBarColor = UIColor.fus_navBarColor;
     

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSSelectImageView.m

@@ -269,7 +269,7 @@ typedef void(^Block)(BOOL isSuccess, UIImage *image);
             
             [FUSAlertView showAlertWithTitle:nil message:[NSString fus_localString:@"请打开权限以使用手机摄像头"] cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
                 if (buttonIndex == 1) {
-                    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
                 }
             }];
         }
@@ -282,7 +282,7 @@ typedef void(^Block)(BOOL isSuccess, UIImage *image);
                photoAuthor == PHAuthorizationStatusDenied){
                 [FUSAlertView showAlertWithTitle:nil message:[NSString fus_localString:@"需要獲取所有照片權限，請在「設置」-「螢火蟲直播」-「照片」中選擇「所有照片」"] cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
                     if (buttonIndex == 1) {
-                        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
                     }
                 }];
                 return;

Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/Controller/FUSChatDetailViewController.m

@@ -1636,7 +1636,7 @@
                         // 跳转到FuSi设置界面
                         NSURL *pushSettingUrl = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
                         if ([[UIApplication sharedApplication] canOpenURL:pushSettingUrl]) {
-                            [[UIApplication sharedApplication] openURL:pushSettingUrl];
+                            [[UIApplication sharedApplication] openURL:pushSettingUrl options:@{} completionHandler:nil];
                         }
                     }
                 }];
@@ -1683,7 +1683,7 @@
                 // 跳转到FuSi设置界面
                 NSURL *pushSettingUrl = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
                 if ([[UIApplication sharedApplication] canOpenURL:pushSettingUrl]) {
-                    [[UIApplication sharedApplication] openURL:pushSettingUrl];
+                    [[UIApplication sharedApplication] openURL:pushSettingUrl options:@{} completionHandler:nil];
                 }
             }
         }];

Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/Cell/CellContentView/image/FUSIMChatImageFillScreenView.m

@@ -347,7 +347,7 @@
             if (status == PHAuthorizationStatusDenied) {
                 [FUSAlertView showAlertWithTitle:nil message:[NSString fus_localString:@"请打开权限以访问手机相册"] cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
                     if (buttonIndex == 1) {
-                        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
                     }
                 }];
             }else if (status == PHAuthorizationStatusAuthorized) {

Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/ToolViews/FUSIMVoiceButtonView.m

@@ -624,7 +624,7 @@
     // 不允许使用麦克风
     [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"麦克风不可用"] message:[NSString fus_localString:@"请前往设置开启麦克风权限"] cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
         if (buttonIndex == 1) {
-             [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+             [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
         }
     }];
 }

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/AlertView/FUSSevenDayCheckinAlertView.m

@@ -207,7 +207,7 @@
                     NSURL *pushSettingUrl = [NSURL URLWithString:pushSettingStr];
                     if (pushSettingUrl) {
                         if ([[UIApplication sharedApplication] canOpenURL:pushSettingUrl]) {
-                            [[UIApplication sharedApplication] openURL:pushSettingUrl];
+                            [[UIApplication sharedApplication] openURL:pushSettingUrl options:@{} completionHandler:nil];
                         }
                     }
                     //TODO: 看一下是否需要检测开启通知后自动点击确定，我觉得不需要，因为通知开关会导致app重启，根本无法走到监听哪一步

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LinkMicro/Other/FUSAgoraHelper.m

@@ -382,7 +382,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
     if (authStatus == AVAuthorizationStatusDenied || authStatus == AVAuthorizationStatusRestricted) {
         [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"麦克风不可用"] message:[NSString fus_localString:@"请前往设置开启麦克风权限"] cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
             if (buttonIndex == 1) {
-                 [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                 [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
             }
         }];
         

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LinkMicro/View/FUSLinkMicroUserListView.m

@@ -904,7 +904,7 @@
         if (authStatus == AVAuthorizationStatusDenied || authStatus == AVAuthorizationStatusRestricted) {
             [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"麦克风不可用"] message:[NSString fus_localString:@"请前往设置开启麦克风权限"] cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
                 if (buttonIndex == 1) {
-                    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
                 }
             }];
             return;
@@ -1373,7 +1373,7 @@
         if (authStatus == AVAuthorizationStatusDenied || authStatus == AVAuthorizationStatusRestricted) {
             [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"麦克风不可用"] message:[NSString fus_localString:@"请前往设置开启麦克风权限"] cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
                 if (buttonIndex == 1) {
-                     [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                     [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
                 }
             }];
             return;

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/FUSVideoAuthorizationView.m

@@ -125,7 +125,7 @@
             // 不允许使用麦克风
             [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"麦克风不可用"] message:[NSString fus_localString:@"请前往设置开启麦克风权限"] cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
                 if (buttonIndex == 1) {
-                     [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                     [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
                 }
             }];
         }
@@ -156,7 +156,7 @@
             [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"摄像头不可用"] message:[NSString fus_localString:@"请前往设置开启摄像头权限"]
             cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
                 if (buttonIndex == 1) {
-                     [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                     [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
                 }
             }];
         };

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/FUSImagePicker/Controller/FUSAlbumViewController.m

@@ -223,7 +223,7 @@
         
     }]];
     [alertVC addAction:[UIAlertAction actionWithTitle:[NSString fus_localString:@"确定"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
     }]];
     
     [self presentViewController:alertVC animated:YES completion:nil];

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/FUSImagePicker/Controller/FUSPhotoViewController.m

@@ -123,7 +123,7 @@
 
 - (void)fus_updatePhotosWithCurrentAlbum {
 
-    NSString *title = self.albumModel ? self.albumModel.title : [NSString fus_localString:@"照片"];;
+    NSString *title = self.albumModel.title ? self.albumModel.title : [NSString fus_localString:@"照片"];;
     
     self.photos = [self.albumPhotosDict[title] mutableCopy];
     
@@ -1072,7 +1072,7 @@
     UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:[NSString stringWithFormat:@"%@%@%@", [NSString fus_localString:@"请前往 设置->隐私->照片 中允许"],bundleName, [NSString fus_localString:@"访问相册"]] message:@"" preferredStyle:UIAlertControllerStyleAlert];
     [alertVC addAction:[UIAlertAction actionWithTitle:[NSString fus_localString:@"确定"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         
-        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
         
         if ([self.navigationController isKindOfClass:[FUSImagePickerViewController class]]) {
             FUSImagePickerViewController *imagePickerVC = (FUSImagePickerViewController *)self.navigationController;

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/FUSImagePicker/View/FUSHalfScreenPhotoView.m

@@ -90,7 +90,7 @@
             [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"请打开权限以使用相册"] message:nil cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"确定"]] clickBlock:^(NSInteger buttonIndex) {
                 if (buttonIndex == 1) {
                     if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]]) {
-                        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
                     }
                     return ;
                 }
@@ -125,7 +125,7 @@
             [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"请打开权限以使用手机摄像头"] message:nil cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"确定"]] clickBlock:^(NSInteger buttonIndex) {
                 if (buttonIndex == 1) {
                     if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]]) {
-                        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
                     }
                 }
             }];
@@ -458,7 +458,7 @@
         
     }]];
     [alertVC addAction:[UIAlertAction actionWithTitle:[NSString fus_localString:@"确定"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
     }]];
     
     [[UIViewController fus_topViewController] presentViewController:alertVC animated:YES completion:nil];

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/Other/FUSNewsFeedNoticeShownHelper.m

@@ -130,7 +130,7 @@
         // 跳转到FuSi设置界面
         NSURL *pushSettingUrl = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
         if ([[UIApplication sharedApplication] canOpenURL:pushSettingUrl]) {
-            [[UIApplication sharedApplication] openURL:pushSettingUrl];
+            [[UIApplication sharedApplication] openURL:pushSettingUrl options:@{} completionHandler:nil];
         }
     }];
     [pushNoticeView fus_showViewWithSuperView:[UIApplication sharedApplication].keyWindow];

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/RichEditor/Controller/FUSPublishNewsFeedViewController.m

@@ -110,6 +110,8 @@ FUSImagePickerViewControllerDelegate>
 
 - (void)configNavigation{
     
+    self.hiddenNavigationBar = NO;
+    
     UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 35, 50)];
     imageView.image = [UIImage fus_naviLogoIcon];
     imageView.contentMode = UIViewContentModeScaleAspectFit;
@@ -471,7 +473,7 @@ FUSImagePickerViewControllerDelegate>
            photoAuthor == PHAuthorizationStatusDenied){
             [FUSAlertView showAlertWithTitle:nil message:[NSString fus_localString:@"需要獲取所有照片權限，請在「設置」-「螢火蟲直播」-「照片」中選擇「所有照片」"] cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
                 if (buttonIndex == 1) {
-                    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
                 }
             }];
             return;
@@ -483,7 +485,7 @@ FUSImagePickerViewControllerDelegate>
         
         [FUSAlertView showAlertWithTitle:nil message:[NSString fus_localString:@"请打开权限以访问手机相册"] cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
             if (buttonIndex == 1) {
-                [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
             }
         }];
         return;;
@@ -530,7 +532,7 @@ FUSImagePickerViewControllerDelegate>
                 [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"请打开权限以使用相册"] message:nil cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"确定"]] clickBlock:^(NSInteger buttonIndex) {
                     if (buttonIndex == 1) {
                         if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]]) {
-                            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
                         }
                         return ;
                     }

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/RichEditor/Controller/WGBaseRichEditorViewController.m

@@ -699,7 +699,7 @@ FUSImagePickerViewControllerDelegate
                            photoAuthor == PHAuthorizationStatusDenied){
                             [FUSAlertView showAlertWithTitle:nil message:[NSString fus_localString:@"需要獲取所有照片權限，請在「設置」-「Fusi Club」-「照片」中選擇「所有照片」"] cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
                                 if (buttonIndex == 1) {
-                                    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                                    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
                                 }
                             }];
                             return;
@@ -725,7 +725,7 @@ FUSImagePickerViewControllerDelegate
                            photoAuthor == PHAuthorizationStatusDenied){
                             [FUSAlertView showAlertWithTitle:nil message:[NSString fus_localString:@"需要獲取所有照片權限，請在「設置」-「螢火蟲直播」-「照片」中選擇「所有照片」"] cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
                                 if (buttonIndex == 1) {
-                                    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                                    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
                                 }
                             }];
                             return;
@@ -941,7 +941,7 @@ FUSImagePickerViewControllerDelegate
            photoAuthor == PHAuthorizationStatusDenied){
             [FUSAlertView showAlertWithTitle:nil message:[NSString fus_localString:@"需要獲取所有照片權限，請在「設置」-「螢火蟲直播」-「照片」中選擇「所有照片」"] cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
                 if (buttonIndex == 1) {
-                    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
                 }
             }];
             return;
@@ -953,7 +953,7 @@ FUSImagePickerViewControllerDelegate
         
         [FUSAlertView showAlertWithTitle:nil message:[NSString fus_localString:@"请打开权限以访问手机相册"] cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
             if (buttonIndex == 1) {
-                [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
             }
         }];
         

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/Views/FUSNewsFeedReplyInputView.m

@@ -225,7 +225,7 @@
            photoAuthor == PHAuthorizationStatusDenied){
             [FUSAlertView showAlertWithTitle:nil message:[NSString fus_localString:@"需要獲取所有照片權限，請在「設置」-「螢火蟲直播」-「照片」中選擇「所有照片」"] cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
                 if (buttonIndex == 1) {
-                    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
                 }
             }];
             return;
@@ -237,7 +237,7 @@
         
         [FUSAlertView showAlertWithTitle:nil message:[NSString fus_localString:@"请打开权限以访问手机相册"] cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
             if (buttonIndex == 1) {
-                [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
             }
         }];
         

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/Controller/FUSAuthFacePageOneViewController.m

@@ -165,7 +165,7 @@
                     [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"摄像头不可用"] message:[NSString fus_localString:@"请前往设置开启摄像头权限"]
                     cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
                         if (buttonIndex == 1) {
-                             [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                             [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
                         }
                     }];
                 }

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/Controller/FUSNoticeSettingViewController.m

@@ -432,7 +432,7 @@
 - (void)clickSettingNoticeBtnAction:(UIButton *)button {
     NSURL *pushSettingUrl = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
     if ([[UIApplication sharedApplication] canOpenURL:pushSettingUrl]) {
-        [[UIApplication sharedApplication] openURL:pushSettingUrl];
+        [[UIApplication sharedApplication] openURL:pushSettingUrl options:@{} completionHandler:nil];
     }
 }
 

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/Controller/FUSPrivacySettingViewController.m

@@ -51,10 +51,10 @@
                         if (SYSTEM_VERSION_GREATER_THAN(@"8.0")) {
                             NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
                             if ([[UIApplication sharedApplication] canOpenURL:url]) {
-                                [[UIApplication sharedApplication] openURL:url];
+                                [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
                             }
                         } else {
-                            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
                         }
                     }
                 }];

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/View/FUSChatSettingOneToOneHeaderView.m

@@ -241,7 +241,7 @@
                             
                             NSURL *pushSettingUrl = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
                             if ([[UIApplication sharedApplication] canOpenURL:pushSettingUrl]) {
-                                [[UIApplication sharedApplication] openURL:pushSettingUrl];
+                                [[UIApplication sharedApplication] openURL:pushSettingUrl options:@{} completionHandler:nil];
                             }
                             
                         }];
@@ -267,7 +267,7 @@
                     
                     NSURL *pushSettingUrl = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
                     if ([[UIApplication sharedApplication] canOpenURL:pushSettingUrl]) {
-                        [[UIApplication sharedApplication] openURL:pushSettingUrl];
+                        [[UIApplication sharedApplication] openURL:pushSettingUrl options:@{} completionHandler:nil];
                     }
                     
                 }];

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/TZImagePickerController/TZImagePickerController.m

@@ -651,7 +651,7 @@
 }
 
 - (void)settingBtnClick {
-    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
 }
 
 - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated {

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/TZImagePickerController/TZPhotoPickerController.m

@@ -893,7 +893,7 @@ static CGFloat collectionViewMargin = 0;
         UIAlertAction *cancelAct = [UIAlertAction actionWithTitle:[NSBundle tz_localizedStringForKey:@"Cancel"] style:UIAlertActionStyleCancel handler:nil];
         [alertController addAction:cancelAct];
         UIAlertAction *settingAct = [UIAlertAction actionWithTitle:[NSBundle tz_localizedStringForKey:@"Setting"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
         }];
         [alertController addAction:settingAct];
         [self.navigationController presentViewController:alertController animated:YES completion:nil];

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/Controller/FUSVoiceSignRecordViewController.m

@@ -178,7 +178,7 @@
     // 不允许使用麦克风
     [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"麦克风不可用"] message:[NSString fus_localString:@"请前往设置开启麦克风权限"] cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"设置"]] clickBlock:^(NSInteger buttonIndex) {
         if (buttonIndex == 1) {
-             [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+             [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
         }
     }];
 }

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/Controller/FireFlyMyZone/FUSMyZoneViewController.m

@@ -741,7 +741,7 @@
             // 跳转到FuSi设置界面
             NSURL *pushSettingUrl = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
             if ([[UIApplication sharedApplication] canOpenURL:pushSettingUrl]) {
-                [[UIApplication sharedApplication] openURL:pushSettingUrl];
+                [[UIApplication sharedApplication] openURL:pushSettingUrl options:@{} completionHandler:nil];
             }
         }];
         [pushNoticeView fus_showViewWithSuperView:[UIApplication sharedApplication].keyWindow];