1.权限相关描述修改

创维盒子/code/Class/Guide/LoginType1ViewController.m

@@ -13,6 +13,7 @@
 
 @interface LoginType1ViewController ()<UITextViewDelegate,UITextFieldDelegate>
 @property(nonatomic,strong) UITextField *accountTF;
+@property(nonatomic,strong) UIButton *scanBut;
 @property(nonatomic,strong) UIButton *loginOkBut;
 @property(nonatomic,strong) UIButton *protocolSelectBut;//协议按钮
 @property(nonatomic,strong) CAGradientLayer *gradientLayer;
@@ -99,10 +100,10 @@
 //        make.centerY.mas_equalTo(0);
 //    }];
     
-    UIButton *scanBut = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 50, 50)];
-    [scanBut setImage:[UIImage imageNamed:@"login_scan"] forState:UIControlStateNormal];
-    [scanBut addTarget:self action:@selector(didClickScanButtonFun:) forControlEvents:UIControlEventTouchUpInside];
-    [bgView addSubview:scanBut];
+    _scanBut = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 50, 50)];
+    [_scanBut setImage:[UIImage imageNamed:@"login_scan"] forState:UIControlStateNormal];
+    [_scanBut addTarget:self action:@selector(didClickScanButtonFun:) forControlEvents:UIControlEventTouchUpInside];
+    [bgView addSubview:_scanBut];
     //scanBut.backgroundColor = [UIColor greenColor];
     
 //    [scanBut mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -118,7 +119,7 @@
     _accountTF.font = [UIFont systemFontOfSize:14];
     _accountTF.delegate = self;
     _accountTF.keyboardType = UIKeyboardTypeASCIICapable;//UIKeyboardTypeNamePhonePad;
-    _accountTF.rightView = scanBut;
+    _accountTF.rightView = _scanBut;
     _accountTF.rightViewMode = UITextFieldViewModeAlways;
     [bgView addSubview:_accountTF];
     
@@ -292,10 +293,15 @@
 #pragma mark 点击登录
 - (void)didClickScanButtonFun:(UIButton*)but
 {
+    _scanBut.userInteractionEnabled = NO;
     ScanToLoginViewController *vc =[ScanToLoginViewController new];
     [self.navigationController pushViewController:vc animated:YES];
     
     KWeakSelf
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        weakSelf.scanBut.userInteractionEnabled = YES;
+    });
+    
     vc.didScanSNFun = ^(NSString * _Nonnull curSnStr) {
         weakSelf.accountTF.text = curSnStr;
         [weakSelf checkLoginButCanClickFun];

创维盒子/code/Class/Guide/ScanToLoginViewController.m

@@ -340,7 +340,8 @@ bool isScantoLoginDownType = YES;
             _didScanSNFun(resStr);
         }
         
-        [self.navigationController popViewControllerAnimated:YES];
+        //[self.navigationController popViewControllerAnimated:YES];
+        [self.navigationController popToRootViewControllerAnimated:YES];
     }
     else{
         [[iToast makeText:NSLocalizedString(@"guide_qrcoede_tips_error",nil)] show];

创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -5979,10 +5979,10 @@
 				);
 				INFOPLIST_FILE = code/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Private-X";
-				INFOPLIST_KEY_NSCameraUsageDescription = "Private-X需求获取您的相机扫码登录。";
-				INFOPLIST_KEY_NSMicrophoneUsageDescription = "Private-X需求获取您的麦克风在录音机功能中进行录音操作。";
-				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "Private-X需求使用您的相册浏览或上传以及保存图片。";
-				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Private-X需求使用您的相册浏览或上传以及保存图片。";
+				INFOPLIST_KEY_NSCameraUsageDescription = "Private-X希望能获取您的相机权限用于扫描识别您的账号用于登录以及扫码PC端登录";
+				INFOPLIST_KEY_NSMicrophoneUsageDescription = "Private-X希望能获取您的麦克风在录音机功能中进行录音操作，您可以把录音文件保存到本地或者上传到Private-X中存储。";
+				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "Private-X希望能获取您的相册权限用于识别账号信息以及您可以相册里的内容上传到Private-X或者从Private-X上下载图片和视频存储到您的相册内。";
+				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Private-X希望能获取您的相册权限用于识别账号信息以及您可以相册里的内容上传到Private-X或者从Private-X上下载图片和视频存储到您的相册内。";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIStatusBarStyle = UIStatusBarStyleDefault;
@@ -6056,10 +6056,10 @@
 				);
 				INFOPLIST_FILE = code/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Private-X";
-				INFOPLIST_KEY_NSCameraUsageDescription = "Private-X需求获取您的相机扫码登录。";
-				INFOPLIST_KEY_NSMicrophoneUsageDescription = "Private-X需求获取您的麦克风在录音机功能中进行录音操作。";
-				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "Private-X需求使用您的相册浏览或上传以及保存图片。";
-				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Private-X需求使用您的相册浏览或上传以及保存图片。";
+				INFOPLIST_KEY_NSCameraUsageDescription = "Private-X希望能获取您的相机权限用于扫描识别您的账号用于登录以及扫码PC端登录";
+				INFOPLIST_KEY_NSMicrophoneUsageDescription = "Private-X希望能获取您的麦克风在录音机功能中进行录音操作，您可以把录音文件保存到本地或者上传到Private-X中存储。";
+				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "Private-X希望能获取您的相册权限用于识别账号信息以及您可以相册里的内容上传到Private-X或者从Private-X上下载图片和视频存储到您的相册内。";
+				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Private-X希望能获取您的相册权限用于识别账号信息以及您可以相册里的内容上传到Private-X或者从Private-X上下载图片和视频存储到您的相册内。";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIStatusBarStyle = UIStatusBarStyleDefault;