App数据隐私合规整改--年龄限制

tapd: http://tapd.oa.com/NEW_IOT/prong/stories/view/1020393192868776255
Change-Id: If028a326e66821a11c67196a25d1103534fb3728

Author: tonychanchen

Source/LinkApp/Classes/Module/Login/Controller/TIoTRegionViewController.m

@@ -232,7 +232,25 @@ - (void)registStyleChange:(UIButton *)sender
     [self refreshUserActionItems];
 }
 
-- (void)sendCode:(id)sender{    
+- (void)sendCode:(id)sender{
+    NSString *errorCode = [TIoTCoreUserManage shared].isShowBirthDayView;
+    
+    //-1表示年龄错误
+    if ([[TIoTCoreUserManage shared].userRegionId isEqualToString:@"22"]) {
+        //美东
+        if ([errorCode containsString:@"-1"]) {
+            [MBProgressHUD showError:NSLocalizedString(@"sorry_we_cannot_support_service", @"很遗憾，我们目前无法向您提供腾通讯连连")];
+            return;
+        }
+        
+    }else {
+        //国内
+        if ([errorCode containsString:@"-2"]) {
+            [MBProgressHUD showError:NSLocalizedString(@"sorry_we_cannot_support_service_CN", @"很遗憾，我们目前无法向您提供腾通讯连连")];
+            return;
+        }
+    }
+    
     TIoTRegisterViewController *registerVC = [[TIoTRegisterViewController alloc]init];
     [self.navigationController pushViewController:registerVC animated:YES];
 }

Source/LinkApp/Classes/Module/Login/Controller/TIoTRegisterViewController.m

@@ -245,12 +245,12 @@ - (void)firstShowBirthdayView {
             }else if ([text isEqualToString:@"Privacy6"]) {
                 if (LanguageIsEnglish) {
                     TIoTOpensourceLicenseViewController *vc = [TIoTOpensourceLicenseViewController new];
-                    vc.title = NSLocalizedString(@"register_agree_2", @"用户协议");
+                    vc.title = NSLocalizedString(@"authentation_thirdsdk_title", @"第三方信息");
                     vc.urlPath = TIoTAPPConfig.userThridSDKChEnglishString;
                     [self.navigationController pushViewController:vc animated:YES];
                 }else {
                     TIoTOpensourceLicenseViewController *vc = [TIoTOpensourceLicenseViewController new];
-                    vc.title = NSLocalizedString(@"register_agree_2", @"用户协议");
+                    vc.title = NSLocalizedString(@"authentation_thirdsdk_title", @"第三方信息");
                     vc.urlPath = TIoTAPPConfig.userThridSDKChChineseString;
                     [self.navigationController pushViewController:vc animated:YES];
                 }
@@ -271,7 +271,8 @@ - (void)firstShowBirthdayView {
 }
 
 - (void)showEN_age_view {
-    if ([NSString isNullOrNilWithObject:[TIoTCoreUserManage shared].isShowBirthDayView] &&  [[TIoTCoreUserManage shared].userRegionId isEqualToString:@"22"]) {
+    NSString *errorCode = [TIoTCoreUserManage shared].isShowBirthDayView;
+    if ([NSString isNullOrNilWithObject:errorCode] || [errorCode containsString:@"-1"] || [errorCode containsString:@"-2"]) {
         TIoTAlertCustomView *customView = [[TIoTAlertCustomView alloc]init];
         [customView alertContentType:TIoTAlertViewContentTypeDatePick isAddHideGesture:NO];
         [customView alertCustomViewTitleMessage:NSLocalizedString(@"please_setting_birthday", @"为了给您提供更好的体验，请设备您的出生日期") cancelBtnTitle:NSLocalizedString(@"cancel", @"取消") confirmBtnTitle:NSLocalizedString(@"confirm", @"确定")];
@@ -286,14 +287,30 @@ - (void)showEN_age_view {
             NSString *selectedTime = [NSString getTimeStampWithString:timeString withFormatter:@"yyyy-MM-dd" withTimezone:@""];
 
             NSInteger age = [NSString timeDifferenceInfoWitFormTimeStamp:[[NSDate date] timeIntervalSince1970] toTimeStamp:selectedTime.longLongValue dateFormatter:@"yyyy-MM-dd" timeType:TIoTTimeTypeYear];
-            if (age < 13) {
-                [MBProgressHUD showError:NSLocalizedString(@"sorry_we_cannot_support_service", @"很遗憾，我们目前无法向您提供腾通讯连连")];
-                [self.navigationController popViewControllerAnimated:YES];
+            
+            NSString *tempErrorCode = errorCode?:@"";
+            if ([[TIoTCoreUserManage shared].userRegionId isEqualToString:@"22"]) {
+                //美东
+                if (age < 13) {
+                    [MBProgressHUD showError:NSLocalizedString(@"sorry_we_cannot_support_service", @"很遗憾，我们目前无法向您提供腾通讯连连")];
+                    [self.navigationController popViewControllerAnimated:YES];
+                    
+                    [TIoTCoreUserManage shared].isShowBirthDayView = [tempErrorCode stringByAppendingString:@"-1"];
+                    return;
+                }
+            }else {
+                //国内
+                if (age < 18) {
+                    [MBProgressHUD showError:NSLocalizedString(@"sorry_we_cannot_support_service_CN", @"很遗憾，我们目前无法向您提供腾通讯连连")];
+                    [self.navigationController popViewControllerAnimated:YES];
+                    
+                    [TIoTCoreUserManage shared].isShowBirthDayView = [tempErrorCode stringByAppendingString:@"-2"];
+                    return;
+                }
             }
+            
+            [TIoTCoreUserManage shared].isShowBirthDayView = @"1";
         };
-        
-        [TIoTCoreUserManage shared].isShowBirthDayView = @"1";
-        
     }
 }
 #pragma mark - 显示用户之前操作项

Source/LinkApp/Supporting Files/Resource/en.lproj/Localizable.strings

@@ -864,7 +864,8 @@ If the problem still persists, we recommend you remove the device and add it aga
 "video_call" = "Making video call";
 "call" = "Call";
 "please_setting_birthday" = "To have better experience, please set your date of birth";
-"sorry_we_cannot_support_service" = "Sorry. Tencent LLink is not available";
+"sorry_we_cannot_support_service" = "Because you are under 13 years old, you cannot use our products and services temporarily.";
+"sorry_we_cannot_support_service_CN" = "Because you are under 18 years old, you cannot use our products and services temporarily.";
 "device_share" = "Share Devices";
 "privacy_policy_lower_case" = "privacy policy";
 "device_shared_agree_1" = "By connecting the device with Tencent LLink, you agree to share information about your device and device logs, and the third party can use the device in accordance with its terms and policies.\nFor more information, please read our ";

Source/LinkApp/Supporting Files/Resource/zh-Hans.lproj/Localizable.strings

@@ -858,7 +858,8 @@
 "video_call" = "视频呼叫中...";
 "call" = "呼叫";
 "please_setting_birthday" = "为了给您提供更好的体验，请设备您的出生日期";
-"sorry_we_cannot_support_service" = "很遗憾，我们目前无法向您提供腾通讯连连";
+"sorry_we_cannot_support_service" = "由于您未满十三周岁，暂无法使用我们的产品服务。";
+"sorry_we_cannot_support_service_CN" = "由于您未满十八周岁，暂无法使用我们的产品服务。";
 "device_share" = "设备共享";
 "privacy_policy_lower_case" = "隐私政策";
 "device_shared_agree_1" = "通过将设备与腾讯连连连接，即表示您同意共享有关您设备和设备日志的信息，第三方可以根据其条款和政策使用该设备。\n有关更多信息，请阅读我们的";
@@ -946,7 +947,7 @@
 "authentation_alert_wechat_detai" = "· 昵称、头像、地区、性别\n· 设备信息";
 "authentation_resister_title" = "国家/地区";
 "authentation_resister_privacy" = "为了向您提供对应国家/地区的用户协议和隐私政策，请您选择所在的国家及地区";
-"authentation_thirdsdk_title" = "第三方SDK目录";
+"authentation_thirdsdk_title" = "第三方信息共享清单";
 "unknow_device" = "未知设备";
 "bind_LLSync_device_success" = "绑定纯蓝牙设备成功";
 "bind_LLSync_device_failure" = "绑定纯蓝牙设备失败";