权限检测UI

Change-Id: I855988b7698dee117150c90aba98e2364d34e65d

Author: tonychanchen

Source/LinkApp/Classes/AppConfig/AppUIConfig/TIoTAlertView.m

@@ -146,16 +146,17 @@ - (void)setUpPricyViews {
     self.procolTV.textColor = [UIColor colorWithHexString:@"#888888"];
     self.procolTV.delegate = self;
     self.procolTV.editable = NO;        //必须禁止输入，否则点击将弹出输入键盘
-    self.procolTV.scrollEnabled = NO;
+    self.procolTV.scrollEnabled = YES;
     [bgView addSubview:self.procolTV];
     [self.procolTV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.leading.mas_equalTo(20);
         make.trailing.mas_equalTo(-20);
         make.top.equalTo(self.nameL.mas_bottom).offset(20);
+        make.height.mas_equalTo(300);
     }];
 
 
-    UITextView *procolTV1 = [[UITextView alloc] init];
+    /*UITextView *procolTV1 = [[UITextView alloc] init];
     procolTV1.attributedText = [self protolStr];;
     procolTV1.linkTextAttributes = @{NSForegroundColorAttributeName:[UIColor colorWithHexString:kIntelligentMainHexColor]}; //
     procolTV1.textColor = [UIColor colorWithHexString:kRegionHexColor];
@@ -180,15 +181,15 @@ - (void)setUpPricyViews {
         make.top.equalTo(procolTV1.mas_top).offset(4);
         make.width.height.mas_equalTo(30);
         make.right.equalTo(procolTV1.mas_left);
-    }];
+    }];*/
 
     UIView *line = [[UIView alloc]init];
     line.backgroundColor = kLineColor;
     [bgView addSubview:line];
     [line mas_makeConstraints:^(MASConstraintMaker *make) {
         make.leading.trailing.equalTo(bgView);
         make.height.mas_equalTo(1);
-        make.top.equalTo(procolTV1.mas_bottom).offset(20 *kScreenAllHeightScale);
+        make.top.equalTo(self.procolTV.mas_bottom).offset(20 *kScreenAllHeightScale);
     }];
 
     UIStackView *stack = [[UIStackView alloc] init];
@@ -203,7 +204,7 @@ - (void)setUpPricyViews {
     }];
 
     UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
-    [btn setTitle:NSLocalizedString(@"cancel", @"取消") forState:UIControlStateNormal];
+    [btn setTitle:NSLocalizedString(@"register_privacy_policy_btn1", @"取消") forState:UIControlStateNormal];
     [btn setTitleColor:[UIColor colorWithHexString:@"#6C7078"] forState:UIControlStateNormal];
     btn.titleLabel.font = [UIFont wcPfRegularFontOfSize:16];
     [btn setBackgroundColor:[UIColor whiteColor]];
@@ -222,7 +223,7 @@ - (void)setUpPricyViews {
     }];
 
     UIButton *btn2 = [UIButton buttonWithType:UIButtonTypeCustom];
-    [btn2 setTitle:NSLocalizedString(@"confirm", @"确定") forState:UIControlStateNormal];
+    [btn2 setTitle:NSLocalizedString(@"register_privacy_policy_btn2", @"确定") forState:UIControlStateNormal];
     [btn2 setTitleColor:[UIColor colorWithHexString:kIntelligentMainHexColor] forState:UIControlStateNormal];
     [btn2 setBackgroundColor:[UIColor whiteColor]];
     btn2.titleLabel.font = [UIFont wcPfRegularFontOfSize:16];
@@ -478,7 +479,9 @@ - (NSMutableAttributedString *)conentTextProtolString {
         NSString *str3 = NSLocalizedString(@"register_privacy_policy_conte3", @"及");
         NSString *str4 = NSLocalizedString(@"register_privacy_policy_conte4", @"隐私政策");
         NSString *str5 = NSLocalizedString(@"register_privacy_policy_conte5", nil);
-        NSString *showStr = [NSString stringWithFormat:@"%@%@%@%@%@",str1,str2,str3,str4,str5];
+        NSString *str6 = NSLocalizedString(@"register_privacy_policy_conte6", @"第三方sdk");
+        NSString *str7 = NSLocalizedString(@"register_privacy_policy_conte7", nil);
+        NSString *showStr = [NSString stringWithFormat:@"%@%@%@%@%@%@%@",str1,str2,str3,str4,str5,str6,str7];
 
         NSMutableParagraphStyle *pstype = [[NSMutableParagraphStyle alloc] init];
         [pstype setAlignment:NSTextAlignmentLeft];
@@ -490,10 +493,14 @@ - (NSMutableAttributedString *)conentTextProtolString {
         NSRange range2 = [showStr rangeOfString:str2];
         [mastring addAttributes:@{NSLinkAttributeName:valueString2,/*NSUnderlineStyleAttributeName:[NSNumber numberWithInteger:NSUnderlineStyleSingle],*/NSFontAttributeName:[UIFont wcPfRegularFontOfSize:14],} range:range2];
 
-        NSString *valueString4 = [[NSString stringWithFormat:@"Privacy4://%@",str2] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
+        NSString *valueString4 = [[NSString stringWithFormat:@"Privacy4://%@",str4] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
         NSRange range4 = [showStr rangeOfString:str4];
         [mastring addAttributes:@{NSLinkAttributeName:valueString4,/*NSUnderlineStyleAttributeName:[NSNumber numberWithInteger:NSUnderlineStyleSingle],*/NSFontAttributeName:[UIFont wcPfRegularFontOfSize:14],} range:range4];
 
+        NSString *valueString6 = [[NSString stringWithFormat:@"Privacy6://%@",str6] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
+        NSRange range6 = [showStr rangeOfString:str6];
+        [mastring addAttributes:@{NSLinkAttributeName:valueString6,/*NSUnderlineStyleAttributeName:[NSNumber numberWithInteger:NSUnderlineStyleSingle],*/NSFontAttributeName:[UIFont wcPfRegularFontOfSize:14],} range:range6];
+        
         _conentTextProtolString = mastring;
     }
     return _conentTextProtolString;
@@ -519,6 +526,12 @@ - (BOOL)textView:(UITextView *)textView shouldInteractWithURL:(NSURL *)URL inRan
             self.doneAction([URL scheme]);
         }
         return NO;
+    }else if ([[URL scheme] isEqualToString:@"Privacy6"]) {
+        [self removeView];
+        if (self.doneAction) {
+            self.doneAction([URL scheme]);
+        }
+        return NO;
     }
     return YES;
 }
@@ -535,15 +548,15 @@ - (void)cancle
 
 - (void)done
 {
-    if (self.procolBtn.selected) {
+//    if (self.procolBtn.selected) {
 
         [self removeView];
         if (self.doneAction) {
             self.doneAction(self.messageT.text);
         }
-    }else {
-        [MBProgressHUD showError:@"请点击同意按钮"];
-    }
+//    }else {
+//        [MBProgressHUD showError:@"请点击同意按钮"];
+//    }
 }
 
 - (void)removeView {

Source/LinkApp/Classes/Module/Debug/TIoTAPPConfig.swift

@@ -97,6 +97,15 @@ class TIoTAPPConfig: NSObject {
         return "https://imgcache.qq.com/qzone/qzactStatics/qcloud/data/42/config9.js"
     }
 
+    // static config 中国区-第三方sdk目录
+    public static var userThridSDKChChineseString: NSString {
+        return "https://imgcache.qq.com/qzone/qzactStatics/qcloud/data/42/config12.js"
+    }
+    
+    // static config 中国区-第三方sdk目录英文
+    public static var userThridSDKChEnglishString: NSString {
+        return "https://imgcache.qq.com/qzone/qzactStatics/qcloud/data/42/config13.js"
+    }
 }
 
 

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

@@ -5,7 +5,7 @@
 //
 
 #import "TIoTMainVC.h"
-#import "TIoTRegisterViewController.h"
+#import "TIoTRegionViewController.h"
 #import "TIoTVCLoginAccountVC.h"
 #import "TIoTSingleCustomButton.h"
 #import "UIButton+LQRelayout.h"
@@ -115,7 +115,7 @@ - (UIButton *)loginButton {
 }
 
 - (void)createNewAccount {
-    TIoTRegisterViewController *registerVC = [[TIoTRegisterViewController alloc]init];
+    TIoTRegionViewController *registerVC = [[TIoTRegionViewController alloc]init];
     [self.navigationController pushViewController:registerVC animated:YES];
 }
 

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

@@ -0,0 +1,18 @@
+//
+//  TIoTRegionViewController.h
+//  LinkApp
+//
+//  Created by eagleychen on 2021/10/25.
+//  Copyright © 2021 Tencent. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface TIoTRegionViewController : UIViewController
+@property (nonatomic, copy) NSString *defaultPhoneOrEmail;
+
+@end
+
+NS_ASSUME_NONNULL_END