1.2.2.1 bug同步完成

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

@@ -253,7 +253,7 @@
             });
         }
         
-        _isQRCodeType = NO;
+        //_isQRCodeType = NO;
     }
     else{
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
@@ -269,6 +269,7 @@
         });
     }
     
+    _isQRCodeType = NO;
 }
 
 #pragma mark 处理进来是非隐私模式的情况

创维盒子/双子星云手机/Class/Set/view/allVersionView.m

@@ -85,6 +85,7 @@
     versionTipLabel.text = NSLocalizedString(@"my_set_about_version_tap_tip",nil) ;
     versionTipLabel.textAlignment = NSTextAlignmentCenter;
     versionTipLabel.font = [UIFont boldSystemFontOfSize:16.0];
+    versionTipLabel.textColor = [UIColor blackColor];
     [_whiteBgView addSubview:versionTipLabel];
     
     [versionTipLabel mas_makeConstraints:^(MASConstraintMaker *make) {

创维盒子/双子星云手机/Class/Set/view/mySetHeadView.m

@@ -24,6 +24,7 @@
     UILabel *titleLabel = [[UILabel alloc] init];
     titleLabel.text = NSLocalizedString(@"my_set_no_File_upload",nil) ;
     titleLabel.font = [UIFont boldSystemFontOfSize:16.0];
+    titleLabel.textColor = [UIColor blackColor];
     [self addSubview:titleLabel];
     
     [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {

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

@@ -233,9 +233,9 @@ ComontAlretViewControllerDelegate>
     
     _checkThridConnectNum += 1;
     
-    if(_checkThridConnectNum == 30 && [[connectDeviceManager shareInstance] curConnectDeviceState] <= 3 ){
+    if(_checkThridConnectNum >= 30 && [[connectDeviceManager shareInstance] curConnectDeviceState] <= 3 ){
         [self showNetErrorAlertFun:11];
-        
+        _checkThridConnectNum = 0;
 //        [_checkThridConnectTimer invalidate];
 //        return;
     }
@@ -2130,6 +2130,7 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
 
 - (void)tryAgainInLinkFailFun
 {
+    linkFailAlretVC = nil;
     
     if([[connectDeviceManager shareInstance] curConnectDeviceState] <= 3)
     {
@@ -2147,7 +2148,6 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     reConnectAccount = 0;
     [self tryAgain];
     
-    linkFailAlretVC = nil;
 }
 
 BOOL inReconnect = NO;

创维盒子/双子星云手机/CloudPlayer/View/playerShowSecretkeyView.m

@@ -44,6 +44,7 @@
     titleLab.text = NSLocalizedString(@"player_Secret_key_title",nil);
     titleLab.textAlignment = NSTextAlignmentCenter;
     titleLab.font = [UIFont boldSystemFontOfSize:18];
+    titleLab.textColor = [UIColor blackColor];
     [_whiteBgView addSubview:titleLab];
     
     [titleLab mas_makeConstraints:^(MASConstraintMaker *make) {