Browse Source

1.nas服务地址修改

huangxiaodong 1 year ago
parent
commit
2f12128d7f

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

@@ -319,16 +319,20 @@
 }
 - (NSString*)NASFileByBoxService
 {
+    if([connectDeviceManager shareInstance].isPingOk){
+        return [NSString stringWithFormat:@"http://%@:9888",[connectDeviceManager shareInstance].DeviceThirdIdMod.data.ip];
+    }
+    
     if(_NASMsgMod){
         if([_NASMsgMod.data.domainName rangeOfString:@"http"].location != NSNotFound){
-            return  [[NSString alloc] initWithFormat:@"%@:%@/",_NASMsgMod.data.ip,@"9888"];
+            return  [[NSString alloc] initWithFormat:@"%@:%@/",_NASMsgMod.data.domainName,@"9888"];
             
         }
         else{
-            return  [[NSString alloc] initWithFormat:@"http://%@:%@/",_NASMsgMod.data.ip,@"9888"];
+            return  [[NSString alloc] initWithFormat:@"http://%@:%@/",_NASMsgMod.data.domainName,@"9888"];
         }
     }
-    return nil;
+    return @"";
 }
 
 - (void)imageLoadingSettings {

+ 1 - 1
创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch

@@ -92,7 +92,7 @@ isBangsScreen; \
 #define CloudService   @"http://14.18.190.141:1801"
 #define shareService   @"http://testprivacy.phone.armclouding.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
-#define NASService [NSString stringWithFormat:@"http://%@:9888",[connectDeviceManager shareInstance].DeviceThirdIdMod.data.ip]
+//#define NASService [NSString stringWithFormat:@"http://%@:9888",[connectDeviceManager shareInstance].DeviceThirdIdMod.data.ip]
 //#define NASService [NSString stringWithFormat:@"https://%@:9888",[connectDeviceManager shareInstance].DeviceThirdIdMod.data.ip]
 
 //#define NASService @"http://127.0.0.1:9888";

+ 6 - 3
创维盒子/双子星云手机/netWork/netWorkManager.m

@@ -152,7 +152,8 @@ static netWorkManager *Game_NetWorkShareInstance = nil;
     
     managerNAS.requestSerializer.HTTPMethodsEncodingParametersInURI = [NSSet setWithObjects:@"GET", @"HEAD", nil];
     
-    if ([NASService rangeOfString:@"https"].location != NSNotFound)
+    //if ([NASService rangeOfString:@"https"].location != NSNotFound)
+    if ([ksharedAppDelegate.NASFileByBoxService rangeOfString:@"https"].location != NSNotFound)
     {
         [managerNAS setSecurityPolicy:[self customSecurityPolicy]];
     }
@@ -343,7 +344,8 @@ static netWorkManager *Game_NetWorkShareInstance = nil;
 - (void)cloudPhonePostCallBackCode:(NSString*)code  Parameters:(NSDictionary*)dict success:(netWork_Success)success failure:(netWork_Faild)failure
 {
     
-    NSString *curServer = NASService;
+    //NSString *curServer = NASService;
+    NSString *curServer = ksharedAppDelegate.NASFileByBoxService;
     if(!curServer ||curServer.length ==0){
         NSDictionary *responseObject = @{@"code" : @(-998), @"msg" : @"ip wrong", @"data" : @""};
         mainBlock(^{
@@ -425,7 +427,8 @@ static netWorkManager *Game_NetWorkShareInstance = nil;
 - (void)cloudPhoneGETCallBackCode:(NSString*)code  Parameters:(NSDictionary*)dict success:(netWork_Success)success failure:(netWork_Faild)failure
 {
     
-    NSString *curServer = NASService;
+    //NSString *curServer = NASService;
+    NSString *curServer = ksharedAppDelegate.NASFileByBoxService;
     if(!curServer ||curServer.length ==0){
         NSDictionary *responseObject = @{@"code" : @(-998), @"msg" : @"ip wrong", @"data" : @""};
         mainBlock(^{