1.局域网连接切到后台再回前台问题

创维盒子/双子星云手机/Class/Set/view/allVersionView.m

@@ -226,7 +226,7 @@
             case 10:{
                 NSString *curIp = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.ip;
                 NSString * networkStr = @"_LAN";
-                if(![connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPingOk){
+                if(![connectDeviceManager shareInstance].isPingOk){
                     networkStr = @"_Not_LAN";
                 }
                 cell.detailTextLabel.text = [[NSString alloc] initWithFormat:@"%@%@",curIp,networkStr];

创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm

@@ -264,7 +264,7 @@ ComontAlretViewControllerDelegate>
     
     //第一次进 先输入密码才能连接
     if([connectDeviceManager shareInstance].isFirstInputPwdDone){
-        if([connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPingOk){
+        if([connectDeviceManager shareInstance].isPingOk){
             ip = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.ip;
             internetVideoPort = @"9100";
             [self didCanConnectServerFun];
@@ -506,7 +506,7 @@ ComontAlretViewControllerDelegate>
     self.commandChannelManager = [[RCCommandChannelManager alloc] init];
     NSString *instructionsChannelUrl = [NSString stringWithFormat:@"ws://%@:%@/businessChannel",ip,internetVideoPort];
     
-    if([connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPingOk){
+    if([connectDeviceManager shareInstance].isPingOk){
         instructionsChannelUrl = [NSString stringWithFormat:@"ws://%@:%@/businessChannel",ip,@"9300"];
     }
     
@@ -1480,10 +1480,14 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
 // 连接
 - (void)connectVideoServer {
     
-    if(![connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPingOk){
+    if([connectDeviceManager shareInstance].isPingOk){
+        internetVideoPort = @"9100";
+    }
+    else{
         internetVideoPort = [[connectDeviceManager shareInstance] tcpPortStr];
     }
     
+    
     if(self.didRecyclResource){
         [cachesFileManager writeLogsWithMsg:@"connectVideoServer didRecyclResource return"];
         return;
@@ -1513,7 +1517,7 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     //
     RCCloudPhoneConnectType ConnectType = RCCloudPhoneConnectType_websocket;
     RCCloudPhoneVideoQuality VideoQuality = RCCloudPhoneVideoQuality_Default;//RCCloudPhoneVideoQuality_High;
-    if([connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPingOk)
+    if([connectDeviceManager shareInstance].isPingOk)
     {
         ConnectType = RCCloudPhoneConnectType_udp;
         VideoQuality = RCCloudPhoneVideoQuality_Default;

创维盒子/双子星云手机/connectDeviceManager/connectDeviceManager.h

@@ -26,6 +26,8 @@ typedef void (^netWork_DidEndByOK) (NSInteger didSuc); // 0 fail 1 suc -1 处理
 @interface connectDeviceManager : NSObject
 +(connectDeviceManager *)shareInstance;
 
+/**自定义字段 是否为局域网*/
+@property (nonatomic,assign) bool isPingOk; //
 @property(nonatomic,strong) DeviceThirdIdModel *DeviceThirdIdMod;//设备的第三方信息  连接时需要
 @property(nonatomic,assign) connectDeviceState  curConnectDeviceState;
 

创维盒子/双子星云手机/connectDeviceManager/connectDeviceManager.m

@@ -541,7 +541,7 @@ static connectDeviceManager *connectDeviceManagerInstance = nil;
 {
     //roomInternetIp = @"www.baidu.com";
     if(!roomInternetIp || roomInternetIp.length < 7){
-        self.DeviceThirdIdMod.data.isPingOk = NO;
+        self.isPingOk = NO;
         return;
     }
     
@@ -591,7 +591,7 @@ static connectDeviceManager *connectDeviceManagerInstance = nil;
 
 -(void)didGetPingStateIsOK:(BOOL)isOk
 {
-    self.DeviceThirdIdMod.data.isPingOk = isOk;
+    self.isPingOk = isOk;
     [self->whPingTester stopPing];
     self->whPingTester = nil;
 }

创维盒子/双子星云手机/connectDeviceManager/model/DeviceThirdIdModel.h

@@ -44,8 +44,6 @@ NS_ASSUME_NONNULL_BEGIN
 //@property(nonatomic,copy) NSString  *avVersionNumber;//
 //@property(nonatomic,copy) NSString  *clientVersionNumber;//
 
-/**自定义字段 是否为局域网*/
-@property (nonatomic,assign) bool isPingOk; //
 @end
 
 @interface DeviceThirdIdModel : SuperModel