Browse Source

1.添加日志

huangxiaodong 1 year ago
parent
commit
d05b912b93

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

@@ -1471,10 +1471,12 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     internetVideoPort = [[connectDeviceManager shareInstance] tcpPortStr];
     
     if(self.didRecyclResource){
+        [cachesFileManager writeLogsWithMsg:@"connectVideoServer didRecyclResource return"];
         return;
     }
     
     if (!mySelf || haveBack || !ip || !internetVideoPort){
+        [cachesFileManager writeLogsWithMsg:@"connectVideoServer mySelf haveBack return"];
         return;
     }
     
@@ -1491,7 +1493,7 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     
     NSString *tempIP = ip;
     
-    HLog(@"__连接ip__%@,端口__%@",ip,internetVideoPort);
+    HLog(@"__连接ip__%@_端口__%@",ip,internetVideoPort);
     
     [cachesFileManager writeLogsWithMsg:[[NSString alloc] initWithFormat:@"link ip %@,port %@",ip,internetVideoPort]];
     //
@@ -2306,6 +2308,8 @@ BOOL inReconnect = NO;
     
     HLog(@"yyyyyyyyyyyyy 重连次数 %ld ",reConnectAccount);
     
+    [cachesFileManager writeLogsWithMsg:[[NSString alloc] initWithFormat:@"yyyyyyyyyyyyy 重连次数 %ld ",reConnectAccount]];
+    
     //20231017 修改后台3分钟再次进入 不断转圈圈问题
     if (reConnectAccount >0 && reConnectAccount == 50 )
     {
@@ -2349,6 +2353,8 @@ BOOL inReconnect = NO;
         }
     });
     
+    [cachesFileManager writeLogsWithMsg:@"reconnectDevice"];
+    
     [self reconnectDevice];
 }
 

+ 29 - 9
创维盒子/双子星云手机/connectDeviceManager/connectDeviceManager.m

@@ -83,6 +83,17 @@ static connectDeviceManager *connectDeviceManagerInstance = nil;
     _isGetThridMsgType = YES;
     KWeakSelf
     [[netWorkManager shareInstance] CommonGetWithCallBackCode:getThirdIdBySn Parameters:paraDict success:^(id  _Nonnull responseObject) {
+        
+        if(!needReconnect){
+            NSError *parseError;
+            NSData *jsonData = [NSJSONSerialization dataWithJSONObject:responseObject options:NSJSONWritingPrettyPrinted error:&parseError];
+            if (parseError) {
+              //解析出错
+            }
+            NSString * str = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+            [cachesFileManager writeLogsWithMsg:str];
+        }
+        
         self->_isGetThridMsgType = NO;
         DeviceThirdIdModel *model = [[DeviceThirdIdModel alloc] initWithDictionary:responseObject error:nil];
 
@@ -362,6 +373,15 @@ static connectDeviceManager *connectDeviceManagerInstance = nil;
 - (void)tryReconnectFun{
     
     [cachesFileManager writeLogsWithMsg:@"tryReconnect"];
+    
+    [cachesFileManager writeLogsWithMsg:@"click again try Net Work"];
+    
+    [self getThridMsgBySN:self.DeviceThirdIdMod.data.changeSn needReconnect:NO didNetEnd:^(NSInteger didSuc) {
+        
+        NSString *tip = [[NSString alloc] initWithFormat:@"Net Work state:%ld",didSuc];
+        [cachesFileManager writeLogsWithMsg:tip];
+    }];
+    
     if(!disconnected_cb_type){
         [cachesFileManager writeLogsWithMsg:@"tryReconnect return"];
         return;
@@ -415,15 +435,15 @@ static connectDeviceManager *connectDeviceManagerInstance = nil;
 
 //音视频 链接返回-5的时候调用
 - (void)recreateHttpServiceFun{
-//    [cachesFileManager writeLogsWithMsg:@"recreateHttpServiceFun"];
-//    NSString *sdnId = self.DeviceThirdIdMod.data.sdnId;
-//    [RaylinkProxy.sharedManager closeHttpService:sdnId];
-//    
-//
-//    self.tcpPort = [RaylinkProxy.sharedManager createHttpService:sdnId];
-//    self.tcpPortStr = [[NSString alloc] initWithFormat:@"%ld",self.tcpPort];
-//    [RaylinkProxy.sharedManager addSdnId:sdnId allowPort:9300];
-//    [RaylinkProxy.sharedManager addSdnId:sdnId allowPort:9100];
+    [cachesFileManager writeLogsWithMsg:@"recreateHttpServiceFun"];
+    NSString *sdnId = self.DeviceThirdIdMod.data.sdnId;
+    [RaylinkProxy.sharedManager closeHttpService:sdnId];
+    
+
+    self.tcpPort = [RaylinkProxy.sharedManager createHttpService:sdnId];
+    self.tcpPortStr = [[NSString alloc] initWithFormat:@"%ld",self.tcpPort];
+    [RaylinkProxy.sharedManager addSdnId:sdnId allowPort:9300];
+    [RaylinkProxy.sharedManager addSdnId:sdnId allowPort:9100];
     
 }