1.同步首位密码为零的bug以及iOS被挤下线后从后台进入后可以重新登入问题

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

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

创维盒子/双子星云手机/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+AppDelegate.m

@@ -72,6 +72,10 @@
     
     self.nowSSid = tempSSID;
     
+    if(self->logoutAlertVC){
+        return;
+    }
+
     if ([wattingView superview])
     {
         [self removeNewIndicator];

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

@@ -22,6 +22,10 @@
 - (void)CommonAlertokBtnClickPressed{
     //HLog("11111");
     
+    if(self->logoutAlertVC){
+        self->logoutAlertVC = nil;
+    }
+
     self.isLoginAgainType = YES;
     
     [[NSNotificationCenter defaultCenter] postNotificationName:lockBypwdNotification object:nil];

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

@@ -20,6 +20,7 @@
 //#import <RCCloudPhoneSDK/RCCommandChannel.h>
 #import <RCCloudPhoneSDK/RCLiveSteamManager.h>
 #import "imageVersionRenewTipView.h"
+#import "ComontAlretViewController.h"
 
 @protocol PlayerViewControllerDelegate <NSObject>
 
@@ -51,6 +52,9 @@
     RCMAACPlayer *aacPlayer;
     
     UIView *wattingView;
+    /*弹窗提示重启*/
+    ComontAlretViewController *logoutAlertVC;
+
 }
 
 @property(copy,nonatomic)NSString * _Nullable internetVideoPort;

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

@@ -113,8 +113,6 @@ ComontAlretViewControllerDelegate>
     
     PhoneTimeInfoDataModel *phoneTimeInfoDataModel;
     
-    /*弹窗提示重启*/
-    ComontAlretViewController *logoutAlertVC;
     /*弹窗提示链接失败 网络或者云机*/
     ComontAlretViewController *linkFailAlretVC;
     
@@ -1838,7 +1836,11 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
 -(void)setShowImgAndVoiceTypeFun:(bool)isCan
 {
     if(isCan){//判断当前是否为最前面 才能播放
+        if(self->logoutAlertVC){
+            return;
+        }
         
+
         if(_isLoginAgainType ){
             [self tryAgain];
             [self opencommandChannelManagerrc_openURL];