|
@@ -1504,6 +1504,7 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
|
|
|
verify:@"123456"
|
|
|
streamAESKey:nil];
|
|
|
|
|
|
+ [cachesFileManager writeLogsWithMsg:[[NSString alloc] initWithFormat:@"result %ld",(long)result]];
|
|
|
if ([tempIP isEqualToString:ip])
|
|
|
{
|
|
|
if (result < 0)
|
|
@@ -2297,7 +2298,7 @@ BOOL inReconnect = NO;
|
|
|
HLog(@"yyyyyyyyyyyyy 重连次数 %ld ",reConnectAccount);
|
|
|
|
|
|
//20231017 修改后台3分钟再次进入 不断转圈圈问题
|
|
|
- if (reConnectAccount >0 && reConnectAccount == 10 )
|
|
|
+ if (reConnectAccount >0 && reConnectAccount == 50 )
|
|
|
{
|
|
|
mainBlock(^{
|
|
|
|
|
@@ -2319,23 +2320,25 @@ BOOL inReconnect = NO;
|
|
|
}
|
|
|
|
|
|
//hxd add 每次重新连接时间 要间隔3秒
|
|
|
- NSInteger curTryAginTime = [iTools getNowTimeStamp];
|
|
|
- if(preTryAginTime > 0
|
|
|
- && (curTryAginTime - preTryAginTime < 3)){
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- if(RCLiveSteamlinkState == ConnectStateConnected){
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- preTryAginTime = curTryAginTime;
|
|
|
+// NSInteger curTryAginTime = [iTools getNowTimeStamp];
|
|
|
+// if(preTryAginTime > 0
|
|
|
+// && (curTryAginTime - preTryAginTime < 3)){
|
|
|
+// return;
|
|
|
+// }
|
|
|
+//
|
|
|
+// if(RCLiveSteamlinkState == ConnectStateConnected){
|
|
|
+// return;
|
|
|
+// }
|
|
|
+//
|
|
|
+// preTryAginTime = curTryAginTime;
|
|
|
|
|
|
reConnectAccount++;
|
|
|
|
|
|
- if(linkFailAlretVC && linkFailAlretVC.view.tag == 2){
|
|
|
- [self WebSocketNeedRelinkFun];//hxd add 20240229
|
|
|
- }
|
|
|
+ mainBlock(^{
|
|
|
+ if(self->linkFailAlretVC && self->linkFailAlretVC.view.tag == 2){
|
|
|
+ [self WebSocketNeedRelinkFun];//hxd add 20240229
|
|
|
+ }
|
|
|
+ });
|
|
|
|
|
|
[self reconnectDevice];
|
|
|
}
|