Pārlūkot izejas kodu

1.iOS端-在推流页面被挤下线,退出后台重新登录输入密码后,被挤下线弹窗还在需要再次输入密码

huangxiaodong 1 gadu atpakaļ
vecāks
revīzija
e05c6bf0ab

+ 16 - 6
创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm

@@ -111,6 +111,9 @@ ComontAlretViewControllerDelegate>
     NSString *hidenTextFieldOldStr;
     
     PhoneTimeInfoDataModel *phoneTimeInfoDataModel;
+    
+    /*弹窗提示重启*/
+    ComontAlretViewController *logoutAlertVC;
 }
 @property (nonatomic, strong, nullable) RCVideoRecoderManager *recoderManager;
 @property (nonatomic, strong, nullable) RCAudioRecoderMamager *audioRecoderMamager;
@@ -1503,7 +1506,7 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
         NSString *commondStr  = @"{\"type\":\"reboot\"}";
         [self send_data:commondStr];
         
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(30 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(20 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             [self reconnectDevice];
         });
     };
@@ -1594,7 +1597,7 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     _needShowLogoutDelayType = NO;
     
     /*弹窗提示重启*/
-    ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"single_sign_on_Tips_logout",nil)
+    logoutAlertVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"single_sign_on_Tips_logout",nil)
                                                                                      msg:_LogoutTimerStr
                                                                              cancelTitle:NSLocalizedString(@"single_sign_on_exit",nil)
                                                                                  okTitle:NSLocalizedString(@"single_sign_on_login_again",nil) isOkBtnHighlight:YES
@@ -1603,10 +1606,10 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     } didClickCancel:^{
         
     }];
-    nextVC.modalPresentationStyle = UIModalPresentationCustom;
-    nextVC.delegate = self;
-    [self presentViewController:nextVC animated:YES completion:^{
-        nextVC.view.superview.backgroundColor = [UIColor clearColor];
+    logoutAlertVC.modalPresentationStyle = UIModalPresentationCustom;
+    logoutAlertVC.delegate = self;
+    [self presentViewController:logoutAlertVC animated:YES completion:^{
+        logoutAlertVC.view.superview.backgroundColor = [UIColor clearColor];
     }];
 }
 
@@ -1619,6 +1622,13 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
 -(void)setShowImgAndVoiceTypeFun
 {
     _isPwdVCShow = NO;
+    
+    if(logoutAlertVC){
+        [logoutAlertVC dismissViewControllerAnimated:NO completion:^{
+            self->logoutAlertVC = nil;
+        }];
+    }
+    
     [self setShowImgAndVoiceTypeFun:YES];
     
     if(_needShowLogoutDelayType){