Browse Source

1.正常链接的云机切换到链接不上的云机显示异常以及可以进入前面的云机问题修复(111)

huangxiaodong 10 months ago
parent
commit
4bcdf8190a

+ 4 - 4
创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -5459,7 +5459,7 @@
 				CODE_SIGN_ENTITLEMENTS = "计算器.entitlements";
 				CODE_SIGN_ENTITLEMENTS = "计算器.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(inherited)",
@@ -5542,7 +5542,7 @@
 				CODE_SIGN_ENTITLEMENTS = "计算器.entitlements";
 				CODE_SIGN_ENTITLEMENTS = "计算器.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(inherited)",
@@ -5740,7 +5740,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 23;
 				DEVELOPMENT_TEAM = "";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5821,7 +5821,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 23;
 				DEVELOPMENT_TEAM = "";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 				FRAMEWORK_SEARCH_PATHS = (

+ 8 - 0
创维盒子/双子星云手机/AppDelegate/AppDelegate.m

@@ -311,6 +311,10 @@
 {
 {
 //http://transfer.armclouding.com:10012/getFile?path=/sdcard/Download/mmexport1712039794930_4124382.png
 //http://transfer.armclouding.com:10012/getFile?path=/sdcard/Download/mmexport1712039794930_4124382.png
 
 
+    if(_NASShareFileService && _NASShareFileService.length >0){
+        return _NASShareFileService;
+    }
+    
     if(_NASMsgMod){
     if(_NASMsgMod){
         if([_NASMsgMod.data.domainName rangeOfString:@"http"].location != NSNotFound){
         if([_NASMsgMod.data.domainName rangeOfString:@"http"].location != NSNotFound){
             return  [[NSString alloc] initWithFormat:@"%@:%@/",_NASMsgMod.data.domainName,_NASMsgMod.data.port];
             return  [[NSString alloc] initWithFormat:@"%@:%@/",_NASMsgMod.data.domainName,_NASMsgMod.data.port];
@@ -330,6 +334,10 @@
 }
 }
 - (NSString*)NASFileByBoxService
 - (NSString*)NASFileByBoxService
 {
 {
+    if(_NASShareFileService && _NASShareFileService.length >0){
+        return _NASShareFileService;
+    }
+    
     if([connectDeviceManager shareInstance].isPingOk){
     if([connectDeviceManager shareInstance].isPingOk){
         return [NSString stringWithFormat:@"http://%@:9888/",[connectDeviceManager shareInstance].DeviceThirdIdMod.data.ip];
         return [NSString stringWithFormat:@"http://%@:9888/",[connectDeviceManager shareInstance].DeviceThirdIdMod.data.ip];
     }
     }

+ 3 - 2
创维盒子/双子星云手机/AppDelegate/SceneDelegate.m

@@ -872,8 +872,6 @@
         self.isLoginAgainType = YES;
         self.isLoginAgainType = YES;
     }
     }
     
     
-    [self enterMainVCFromScene];
-    
     //clear下载和上传的已经获取的数据
     //clear下载和上传的已经获取的数据
     [[uploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
     [[uploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
     [uploadFileManager shareInstance].databaseArr = [NSMutableArray new];
     [uploadFileManager shareInstance].databaseArr = [NSMutableArray new];
@@ -904,6 +902,9 @@
     
     
     [lastFileManager shareManager].uid = uid;
     [lastFileManager shareManager].uid = uid;
     [audioPlayListManager shareManager].uid = uid;
     [audioPlayListManager shareManager].uid = uid;
+    
+    
+    [self enterMainVCFromScene];
 }
 }
 
 
 #pragma mark 上报版本号信息
 #pragma mark 上报版本号信息

+ 16 - 1
创维盒子/双子星云手机/Class/Set/ChangeDevice/QRCodeScanForChangeDeviceViewController.m

@@ -369,9 +369,24 @@ bool isDownType22 = YES;
                 [webSocketManager shareInstance].isChangeBoxType = YES;
                 [webSocketManager shareInstance].isChangeBoxType = YES;
                 [[webSocketManager shareInstance].commandChannelManager rc_close];
                 [[webSocketManager shareInstance].commandChannelManager rc_close];
                 [webSocketManager shareInstance].commandChannelManager = nil;
                 [webSocketManager shareInstance].commandChannelManager = nil;
-            
+                
                 //尝试修复偶现扫码切换云机 已经扫码到 要输新SN密码 但是云机显示是旧SN的 延时一秒跳转
                 //尝试修复偶现扫码切换云机 已经扫码到 要输新SN密码 但是云机显示是旧SN的 延时一秒跳转
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    
+                    //清除原来设置的数据
+                    ksharedAppDelegate.isWebSockLinkOKAginType = NO;
+                    ksharedAppDelegate.cloudPhoneExtraFileListMod = nil;
+                    ksharedAppDelegate.DisabledFileTransferType = NO;
+                    ksharedAppDelegate.isImageNewFor130 = NO;
+                    ksharedAppDelegate.isNeedShowImageNewType = NO;
+                    ksharedAppDelegate.TvStatusMod = nil;
+                    ksharedAppDelegate.NASMsgMod = nil;
+                    ksharedAppDelegate.isDidShowPwdType = NO;
+                    ksharedAppDelegate.isDidShowPwdType = NO;
+                    ksharedAppDelegate.NASFileByBoxService = nil;
+                    ksharedAppDelegate.NASShareFileService = nil;
+                    HLog(@"isWebSockLinkOKAginType NO")
+                    
                     [[webSocketManager shareInstance] opencommandChannelManagerrc_openURL];
                     [[webSocketManager shareInstance] opencommandChannelManagerrc_openURL];
                     [[NSNotificationCenter defaultCenter] postNotificationName:GuideOkNotification object:nil];
                     [[NSNotificationCenter defaultCenter] postNotificationName:GuideOkNotification object:nil];
                 });
                 });

+ 2 - 0
创维盒子/双子星云手机/connectDeviceManager/connectDeviceManager.m

@@ -133,6 +133,8 @@ static connectDeviceManager *connectDeviceManagerInstance = nil;
                 self->didPingType = NO;
                 self->didPingType = NO;
                 self->didRuiyunLinkType = NO;
                 self->didRuiyunLinkType = NO;
                 self->_isPingOk = NO;
                 self->_isPingOk = NO;
+                self->_tcpPortStr = nil;
+                self->_tcpPort = 0;
                 
                 
                 weakSelf.curConnectDeviceState = DeviceConnectGetThridOK;
                 weakSelf.curConnectDeviceState = DeviceConnectGetThridOK;
                 NSString *ipStr = weakSelf.DeviceThirdIdMod.data.ip;
                 NSString *ipStr = weakSelf.DeviceThirdIdMod.data.ip;