Quellcode durchsuchen

1.IOS端同端扫码同一个设备进入推流,未弹被挤掉弹窗(偶现)

huangxiaodong vor 1 Jahr
Ursprung
Commit
061ffce15c
1 geänderte Dateien mit 22 neuen und 13 gelöschten Zeilen
  1. 22 13
      创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm

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

@@ -765,7 +765,9 @@ ComontAlretViewControllerDelegate>
     }
     
     //[self showNetErrorAlertFun:2];
-    [self opencommandChannelManagerrc_openURL];
+    if(self.commandChannelManager){
+        [self opencommandChannelManagerrc_openURL];
+    }
 }
 
 #pragma mark wifi handle
@@ -1640,15 +1642,16 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
 #pragma mark 盒子第一次连接成功  给ws发送信息 单点登录 把其他账号挤下去
 - (void)fristConnectNeedGiveAMsgFun{
     
-    if([self isPlayerViewIsTopVCFun]){
-        //等下再发
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [self fristConnectNeedGiveAMsgFun];
-        });
-        return;
-    }
+//    if([self isPlayerViewIsTopVCFun]){
+//        //等下再发
+//        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//            [self fristConnectNeedGiveAMsgFun];
+//        });
+//        return;
+//    }
     
-    if(!_didSendfristMsg || _isLoginAgainType){
+    if(!_didSendfristMsg || _isLoginAgainType)
+    {
         NSString *commondStr  = @"{\"type\":\"forwardMsg\",\"data\":\"offline_notification\"}";
         [self send_data:commondStr];
         _didSendfristMsg = true;
@@ -1733,6 +1736,9 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
 - (void)LogoutByOtherFun
 {
     //
+    [self.commandChannelManager rc_close];
+    self.commandChannelManager = nil;
+    
     [self disconnectVideoServer];
     
     _canShowImgAndVoiceType = NO;
@@ -1820,16 +1826,19 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
 {
     if(isCan){//判断当前是否为最前面 才能播放
         
+        if(_isLoginAgainType ){
+            [self tryAgain];
+            [self opencommandChannelManagerrc_openURL];
+            
+            //[self fristConnectNeedGiveAMsgFun];
+        }
+        
         if([self isPlayerViewIsTopVCFun]){
             return;
         }
         
         _canShowImgAndVoiceType = isCan;
         
-        if(_isLoginAgainType ){
-            [self tryAgain];
-            [self fristConnectNeedGiveAMsgFun];
-        }
     }
     else{
         _canShowImgAndVoiceType = isCan;