1.ios在恢复出厂设置中，使用安卓端去登录，ios没有弹窗提示 ‘下线通知’ ---优化 未完全解决

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

@@ -1623,6 +1623,7 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     
 #pragma mark 恢复出厂盒子 ok
         nextVC.needToResetAndOk = ^{
+            [weakSelf tryAgainInLinkFailFun];
             [weakSelf startCheckThridRuiYunTimerFun];
         };
         
@@ -1657,9 +1658,9 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     _canShowImgAndVoiceType = YES;
     
     _isRebootIngType = YES;
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(30 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self reconnectDevice];
-    });
+//    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(30 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//        [self reconnectDevice];
+//    });
 }
 
 - (void)needToResetFun
@@ -1695,6 +1696,7 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     KWeakSelf
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(30 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [weakSelf reconnectDevice];
+        [weakSelf WebSocketNeedRelinkFun];
     });
 }
 
@@ -1888,19 +1890,22 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     }
     
     /*弹窗提示重启*/
+    KWeakSelf
     logoutAlertVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"single_sign_on_Tips_logout",nil)
                                                                                      msg:_LogoutTimerStr
                                                                                 imageStr:nil
                                                                              cancelTitle:NSLocalizedString(@"single_sign_on_exit",nil)
                                                                                  okTitle:loginAgainStr isOkBtnHighlight:isOkBtnHighlight
-                                                                              didClickOk:^{
+                                                                             didClickOk:^{
+        [weakSelf tryAgain];
+        [weakSelf WebSocketNeedRelinkFun];
         
     } didClickCancel:^{
         
     }];
     logoutAlertVC.modalPresentationStyle = UIModalPresentationCustom;
     logoutAlertVC.delegate = self;
-    [self presentViewController:logoutAlertVC animated:YES completion:^{
+    [[iTools appRootViewController] presentViewController:logoutAlertVC animated:YES completion:^{
         self->logoutAlertVC.view.superview.backgroundColor = [UIColor clearColor];
     }];
     
@@ -2951,7 +2956,7 @@ static int  couneeee = 0;
 
 - (void)timerChange {
     
-    self.currentTime++;// 0、定时器计数
+    //self.currentTime++;// 0、定时器计数
     
     [self extensionAdjustBtnFrameCheckAdjustTime];// 1、悬浮球3s后 自动靠边隐藏