1.同步设置密码首位为零以及修复在输入密码界面 点击了切换设备或者忘记密码 后点击返回在输入密码后 界面一直在转圈问题

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

@@ -2798,7 +2798,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2877,7 +2877,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

创维盒子/双子星云手机/AppDelegate/SceneDelegate.m

@@ -662,13 +662,13 @@
 #pragma mark 忘记密码返回
 - (void)forgetPwdBackFun:(NSNotification*)not
 {
-    if(_preRootPlayerNav)
-    {
-        self.window.rootViewController = _preRootPlayerNav;
-    }
-    else{
+//    if(_preRootPlayerNav)
+//    {
+//        self.window.rootViewController = _preRootPlayerNav;
+//    }
+//    else{
         [self enterMainVCFromScene];
-    }
+    //}
     
     [self showCalculatorVC];
 }
@@ -676,17 +676,17 @@
 #pragma mark 忘记密码设置密码完成
 - (void)forgetPwdDidSetPwdFun:(NSNotification*)not
 {
-    if(_preRootPlayerNav)
-    {
-        NSArray *vcArr = _preRootPlayerNav.viewControllers;
-        if(vcArr.count > 2){
-            [_preRootPlayerNav popToViewController:vcArr[1] animated:NO];
-        }
-        self.window.rootViewController = _preRootPlayerNav;
-    }
-    else{
+//    if(_preRootPlayerNav)
+//    {
+//        NSArray *vcArr = _preRootPlayerNav.viewControllers;
+//        if(vcArr.count > 2){
+//            [_preRootPlayerNav popToViewController:vcArr[1] animated:NO];
+//        }
+//        self.window.rootViewController = _preRootPlayerNav;
+//    }
+//    else{
         [self enterMainVCFromScene];
-    }
+    //}
     
     [self closeCalculatorVC];
     
@@ -710,13 +710,13 @@
 #pragma mark 扫码切换设备点击返回
 - (void)scanChangeDeviceBackFun:(NSNotification*)not
 {
-    if(_preRootPlayerNav)
-    {
-        self.window.rootViewController = _preRootPlayerNav;
-    }
-    else{
+//    if(_preRootPlayerNav)
+//    {
+//        self.window.rootViewController = _preRootPlayerNav;
+//    }
+//    else{
         [self enterMainVCFromScene];
-    }
+    //}
     
     [self showCalculatorVC];
 }

创维盒子/双子星云手机/Class/Guide/SetPWDSecondViewController.m

@@ -19,6 +19,7 @@
     UILabel *pointView3;
     
     UILabel *topLabel;
+    UIButton *keyBoardBtn0;
 }
 
 @end
@@ -185,12 +186,14 @@
     }];
     
     /*0*/
-    UIButton *keyBoardBtn0 = [[UIButton alloc] init];
+    keyBoardBtn0 = [[UIButton alloc] init];
     [keyBoardBtn0 setBackgroundColor:[UIColor clearColor]];
     [keyBoardBtn0 setTitleColor:HW0A132BColor forState:(UIControlStateNormal)];
+    [keyBoardBtn0 setTitleColor:COLOR_PACEHOLDER forState:(UIControlStateDisabled)];
     [keyBoardBtn0.titleLabel setFont:[UIFont boldSystemFontOfSize:40.f]];
     [keyBoardBtn0 setTitle:@"0" forState:(UIControlStateNormal)];
     [keyBoardBtn0 addTarget:self action:@selector(keyBoardBtnPressed:) forControlEvents:(UIControlEventTouchUpInside)];
+    keyBoardBtn0.enabled = NO;
     [bgViewForNumberBoard addSubview:keyBoardBtn0];
     [keyBoardBtn0 mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(w_key_btn);
@@ -221,6 +224,7 @@
         if (numberLength == 1){
             [pointView0 setText:@""];
             [pointView0 setBackgroundColor:HWE3E8F1Color];
+            self->keyBoardBtn0.enabled = NO;
         }else if (numberLength == 2){
             [pointView1 setText:@""];
             [pointView1 setBackgroundColor:HWE3E8F1Color];
@@ -280,6 +284,7 @@
             [pointView0 setText:selectNumberStr];
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 [self->pointView0 setBackgroundColor:HW0A132BColor];
+                self->keyBoardBtn0.enabled = YES;
             });
         }else if (numberLength == 1){
             [pointView1 setText:selectNumberStr];

创维盒子/双子星云手机/Class/Set/ModifyPWD/ModifyPWDFirstViewController.m

@@ -219,6 +219,7 @@
         if (numberLength == 1){
             [pointView0 setText:@""];
             [pointView0 setBackgroundColor:HWE3E8F1Color];
+            self->keyBoardBtn0.enabled = NO;
         }else if (numberLength == 2){
             [pointView1 setText:@""];
             [pointView1 setBackgroundColor:HWE3E8F1Color];

创维盒子/双子星云手机/Class/Set/ModifyPWD/ModifyPWDSecondViewController.m

@@ -18,6 +18,7 @@
     UILabel *pointView3;
     
     UILabel *topLabel;
+    UIButton *keyBoardBtn0;
 }
 
 @end
@@ -200,12 +201,14 @@
     }];
     
     /*0*/
-    UIButton *keyBoardBtn0 = [[UIButton alloc] init];
+    keyBoardBtn0 = [[UIButton alloc] init];
     [keyBoardBtn0 setBackgroundColor:[UIColor clearColor]];
     [keyBoardBtn0 setTitleColor:HW0A132BColor forState:(UIControlStateNormal)];
+    [keyBoardBtn0 setTitleColor:COLOR_PACEHOLDER forState:(UIControlStateDisabled)];
     [keyBoardBtn0.titleLabel setFont:[UIFont boldSystemFontOfSize:40.f]];
     [keyBoardBtn0 setTitle:@"0" forState:(UIControlStateNormal)];
     [keyBoardBtn0 addTarget:self action:@selector(keyBoardBtnPressed:) forControlEvents:(UIControlEventTouchUpInside)];
+    keyBoardBtn0.enabled = NO;
     [bgViewForNumberBoard addSubview:keyBoardBtn0];
     [keyBoardBtn0 mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(w_key_btn);
@@ -236,6 +239,7 @@
         if (numberLength == 1){
             [pointView0 setText:@""];
             [pointView0 setBackgroundColor:HWE3E8F1Color];
+            self->keyBoardBtn0.enabled = NO;
         }else if (numberLength == 2){
             [pointView1 setText:@""];
             [pointView1 setBackgroundColor:HWE3E8F1Color];
@@ -309,6 +313,7 @@
             [pointView0 setText:selectNumberStr];
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 [self->pointView0 setBackgroundColor:HW0A132BColor];
+                self->keyBoardBtn0.enabled = YES;
             });
         }else if (numberLength == 1){
             [pointView1 setText:selectNumberStr];

创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm

@@ -1902,11 +1902,9 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
 {
     _isPwdVCShow = NO;
     
-//    if(logoutAlertVC){
-//        [logoutAlertVC dismissViewControllerAnimated:NO completion:^{
-//            self->logoutAlertVC = nil;
-//        }];
-//    }
+    if(logoutAlertVC){
+        return;
+    }
     
     [self setShowImgAndVoiceTypeFun:YES];