合规整改：修改账号密码登录页面，获取验证码和微信登录需要同意隐私条款限制，补充相册权限开关

ccharlesren · ccharlesren · commit 5b68bfde7bc2 · 2022-02-18T21:02:40.000+08:00
Change-Id: Ib5beb03e7cfa7e742f3a0773e693456633b75804
diff --git a/Source/LinkApp/Classes/Module/Login/Controller/TIoTVCLoginAccountVC.m b/Source/LinkApp/Classes/Module/Login/Controller/TIoTVCLoginAccountVC.m
@@ -886,8 +886,7 @@ - (void)loginStyleChange:(UIButton *)sender {
 
 - (void)loginSure {
     
-    if (!self.procolBtn.selected) {
-        [MBProgressHUD showError:NSLocalizedString(@"agree_userAgreement_privacyPolicy", @"请同意用户协议和隐私协议后才能登录")];
+    if (![self agreementToast]) {
         return;
     }
     
@@ -1032,9 +1031,21 @@ - (void)changePasswordTextShow:(UIButton *)button {
     
 }
 
+- (BOOL)agreementToast {
+    if (!self.procolBtn.selected) {
+        [MBProgressHUD showError:NSLocalizedString(@"agree_userAgreement_privacyPolicy", @"请同意用户协议和隐私协议后才能登录")];
+        return NO;
+    }else {
+        return YES;
+    }
+}
 
 #pragma mark - 发送验证码
 - (void)sendCode:(UIButton *)button {
+
+    if (![self agreementToast]) {
+        return;
+    }
     
     [MBProgressHUD showLodingNoneEnabledInView:nil withMessage:@""];
 
@@ -1114,6 +1125,11 @@ - (void)judgeCancelAccountTip {
 }
 
 - (void)wxLoginClick:(id)sender{
+    
+    if (![self agreementToast]) {
+        return;
+    }
+    
     [[WxManager sharedWxManager] authFromWxComplete:^(id obj, NSError *error) {
         if (!error) {
             [self getTokenByOpenId:[NSString stringWithFormat:@"%@",obj]];
diff --git a/Source/LinkApp/Classes/Module/Mine/Controller/TIoTAuthentationVC.m b/Source/LinkApp/Classes/Module/Mine/Controller/TIoTAuthentationVC.m
@@ -9,6 +9,7 @@
 #import <CoreLocation/CoreLocation.h>
 #import <AVFoundation/AVFoundation.h>
 #import "TIoTCoreUtil.h"
+#import <Photos/Photos.h>
 
 @interface TIoTAuthentationVC ()<UITableViewDelegate, UITableViewDataSource, CBCentralManagerDelegate,CLLocationManagerDelegate>
 @property (nonatomic, strong) UITableView *tableView;
@@ -19,6 +20,7 @@ @interface TIoTAuthentationVC ()<UITableViewDelegate, UITableViewDataSource, CBC
 
 @property (nonatomic, strong) CLLocationManager *locationManager;
 @property (nonatomic, assign) BOOL locationAvailable; //地图是否可用
+@property (strong, nonatomic) UIImagePickerController *picker;
 @end
 
 @implementation TIoTAuthentationVC
@@ -101,8 +103,10 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     }else if (indexPath.section == 2) {
         cell.arrowSwitch.on = [self audioAuthority:AVMediaTypeVideo];
     }else if (indexPath.section == 3) {
-        cell.arrowSwitch.on = [self audioAuthority:AVMediaTypeAudio];
+        cell.arrowSwitch.on = [self authoriedPhotoAlbum];
     }else if (indexPath.section == 4) {
+        cell.arrowSwitch.on = [self audioAuthority:AVMediaTypeAudio];
+    }else if (indexPath.section == 5) {
         cell.arrowSwitch.on = self.bluetoothAvailable;
     }
     
@@ -140,6 +144,39 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                 [self jumpSetting];
             }
         }else if (indexPath.section == 3) {
+            if ([self getPhoteNotDetermStatus]) {
+                BOOL isAuth = [UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary];
+                if (!isAuth) return;
+                [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) { //弹出访问权限提示框
+                    if (status == PHAuthorizationStatusAuthorized) {
+                        dispatch_async(dispatch_get_main_queue(),^{
+                            //同意授权
+                            switchControl.on = YES;
+                            
+                        });
+                    }if (status == PHAuthorizationStatusRestricted || status == PHAuthorizationStatusNotDetermined) {
+                        //未授权
+                        switchControl.on = NO;
+                    }if (status == PHAuthorizationStatusDenied) {
+                        dispatch_async(dispatch_get_main_queue(),^{
+                            //拒绝授权
+                            switchControl.on = NO;
+                        });
+                    }else {
+                        if (@available(iOS 14, *)) {
+                            if (status == PHAuthorizationStatusLimited) {
+                                dispatch_async(dispatch_get_main_queue(),^{
+                                    //权限只在 accessLevel 为 PHAccessLevelReadWrite 时生效
+                                    switchControl.on = YES;
+                                });
+                            }
+                        }
+                    }
+                }];
+            }else {
+                [self jumpSetting];
+            }
+        }else if (indexPath.section == 4) {
             if ([self getMediaNotDetermStatusWithType:AVMediaTypeAudio]) {
                 [AVCaptureDevice requestAccessForMediaType:AVMediaTypeAudio
                                          completionHandler:^(BOOL granted) {
@@ -156,7 +193,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             }else {
                 [self jumpSetting];
             }
-        }else if (indexPath.section == 4) {
+        }else {
             if (self.centralManager.state == CBManagerStateUnauthorized) {
                 //判断蓝牙是否开启
                 self.centralManager = [[CBCentralManager alloc] initWithDelegate:self queue:nil options:nil];
@@ -210,6 +247,7 @@ - (NSMutableArray *)dataArr{
             @[@{@"title":NSLocalizedString(@"authentation_privacy_conte1", @"通知推送权限"),@"value":@"",@"vc":@"",@"haveArrow":@"2"}],
             @[@{@"title":NSLocalizedString(@"authentation_privacy_conte2", @"位置信息"),@"value":@"",@"vc":@"",@"haveArrow":@"2"}],
             @[@{@"title":NSLocalizedString(@"authentation_privacy_conte3", @"摄像头权限"),@"value":@"",@"vc":@"",@"haveArrow":@"2"}],
+            @[@{@"title":NSLocalizedString(@"authentation_privacy_conte6", @"相册权限"),@"value":@"",@"vc":@"",@"haveArrow":@"2"}],
             @[@{@"title":NSLocalizedString(@"authentation_privacy_conte5", @"麦克风权限"),@"value":@"",@"vc":@"",@"haveArrow":@"2"}],
             @[@{@"title":NSLocalizedString(@"authentation_privacy_conte4", @"蓝牙权限"),@"value":@"",@"vc":@"",@"haveArrow":@"2"}],
         ]];
@@ -228,6 +266,15 @@ - (BOOL)getMediaNotDetermStatusWithType:(AVMediaType)mediaType {
     }
 }
 
+- (BOOL)getPhoteNotDetermStatus {
+    PHAuthorizationStatus status= [PHPhotoLibrary authorizationStatus];
+    if (status == PHAuthorizationStatusNotDetermined) {
+        return YES;
+    }else {
+        return NO;
+    }
+}
+
 - (void)jumpSetting {
     NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
     if ([[UIApplication sharedApplication] canOpenURL:url]){
@@ -297,6 +344,27 @@ - (BOOL)locationAuthority {
     return YES;
 }
 
+- (BOOL)authoriedPhotoAlbum {
+     BOOL isAccess = NO;
+    PHAuthorizationStatus status= [PHPhotoLibrary authorizationStatus];
+    if (status == PHAuthorizationStatusNotDetermined) {
+        isAccess = NO;
+    }else if (status == PHAuthorizationStatusRestricted || status == PHAuthorizationStatusDenied) {
+        isAccess = NO;
+    }else if (status == PHAuthorizationStatusAuthorized) {
+        isAccess = YES;
+    }else {
+        if (@available(iOS 14, *)) {
+            if (status == PHAuthorizationStatusLimited) {
+                isAccess = YES;
+            }
+        }else {
+            isAccess = NO;
+        }
+    }
+    return isAccess;
+}
+
 - (BOOL)audioAuthority:(AVMediaType)type {
 //    return [TIoTCoreUtil requestMediaAuthorization:type];
     return [TIoTCoreUtil userAccessMediaAuthorization:type];
@@ -368,4 +436,14 @@ - (void)locationManagerDidChangeAuthorization:(CLLocationManager *)manager API_A
     }
     [self.tableView reloadData];
 }
+
+#pragma mark - lazyloading
+- (UIImagePickerController *)picker
+{
+    if (!_picker) {
+        _picker = [[UIImagePickerController alloc]init];
+        _picker.allowsEditing = NO;
+    }
+    return _picker;
+}
 @end
diff --git a/Source/LinkApp/Supporting Files/Resource/en.lproj/Localizable.strings b/Source/LinkApp/Supporting Files/Resource/en.lproj/Localizable.strings
@@ -947,6 +947,7 @@ If the problem still persists, we recommend you remove the device and add it aga
 "authentation_privacy_conte3" = "Camera";
 "authentation_privacy_conte4" = "Bluetooth";
 "authentation_privacy_conte5" = "Microphone";
+"authentation_privacy_conte6" = "Photoalbum";
 "authentation_alert_btn" = "Allow";
 "authentation_alert_wifi_title" = "Please authorize Tencent LLink the following permissions";
 "authentation_alert_wifi_conte" = "This step will configure the WiFi network for the hardware device to achieve communication, and bind the relationship between the hardware device and the APP user. Therefore, Tencent LLink needs to obtain the following permissions：";
diff --git a/Source/LinkApp/Supporting Files/Resource/zh-Hans.lproj/Localizable.strings b/Source/LinkApp/Supporting Files/Resource/zh-Hans.lproj/Localizable.strings
@@ -942,6 +942,7 @@
 "authentation_privacy_conte3" = "摄像头权限";
 "authentation_privacy_conte4" = "蓝牙权限";
 "authentation_privacy_conte5" = "麦克风权限";
+"authentation_privacy_conte6" = "相册权限";
 "authentation_alert_btn" = "始终允许";
 "authentation_alert_wifi_title" = "请授权腾讯连连以下权限";
 "authentation_alert_wifi_conte" = "该步骤将为硬件设备配置WiFi网络实现通信，绑定硬件设备与APP用户之间的关系。因此 腾讯连连 需获取以下权限：";
