|
@@ -121,6 +121,7 @@ ComontAlretViewControllerDelegate>
|
|
|
NSTimer *forceStartTimer;//请知重启timer
|
|
|
|
|
|
int preIFrameNum;
|
|
|
+ BOOL isWebSockLinkOKAginType;//WebSock断开后或者链接上了
|
|
|
|
|
|
}
|
|
|
@property (nonatomic, strong, nullable) RCVideoRecoderManager *recoderManager;
|
|
@@ -803,6 +804,7 @@ ComontAlretViewControllerDelegate>
|
|
|
}
|
|
|
|
|
|
} failure:^(NSError *error) {
|
|
|
+ self->isWebSockLinkOKAginType = NO;
|
|
|
[self showNetErrorAlertFun:2];
|
|
|
[self WebSocketNeedRelinkFun];
|
|
|
}];
|
|
@@ -1700,6 +1702,8 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
|
|
|
#pragma mark 盒子链接成功后需要处理的各种各样事情
|
|
|
- (void)handlAllMsgAfterDidLinkFun
|
|
|
{
|
|
|
+ self->isWebSockLinkOKAginType = YES;
|
|
|
+
|
|
|
//获取云机尺寸 兼容 720*1080 &1080*1920 不同分辨率的展示和触控
|
|
|
NSString *getPhoneSizeStr = [RCCommandHelp getPhoneSizecommand];
|
|
|
[self send_data:getPhoneSizeStr];
|
|
@@ -2181,7 +2185,10 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
|
|
|
|
|
|
[cachesFileManager writeLogsWithMsg:[[NSString alloc] initWithFormat:@"showNetErrorAlertFun %ld",type]];
|
|
|
|
|
|
- if(linkFailAlretVC){
|
|
|
+ if(linkFailAlretVC
|
|
|
+ ||[connectDeviceManager shareInstance].isReInitType//瑞云重新init 耗时2-7s 他们说的
|
|
|
+ ||(self->isWebSockLinkOKAginType && type == 2) //重连上了但是延时消息来了
|
|
|
+ ){
|
|
|
return;
|
|
|
}
|
|
|
|