Kaynağa Gözat

1.盒子链接跟公网地址分开

huangxiaodong 1 yıl önce
ebeveyn
işleme
0bfb4383c5

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

@@ -308,10 +308,6 @@
 {
 //http://transfer.armclouding.com:10012/getFile?path=/sdcard/Download/mmexport1712039794930_4124382.png
 
-    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.domainName,_NASMsgMod.data.port];

+ 6 - 3
创维盒子/双子星云手机/Class/Set/previewFile/audioPlayerViewController.m

@@ -171,7 +171,7 @@
         model.audioId = i;//****重要。AudioId从0开始,仅标识当前音频在数组中的位置。
         
         NSString *filePath = yourModel.path;
-        NSString *urlStr = ksharedAppDelegate.NASFileService;
+        NSString *urlStr = ksharedAppDelegate.NASFileByBoxService;
         
         //filePath = [filePath  stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
         NSString *fileUrl = [[NSString alloc] initWithFormat:@"%@getFile?path=%@",urlStr,filePath];
@@ -183,8 +183,11 @@
         //fileUrl = @"https://www.cambridgeenglish.org/images/506891-a2-key-for-schools-listening-sample-test.mp3";
         //fileUrl = @"http://downsc.chinaz.net/Files/DownLoad/sound1/201906/11582.mp3";
         //fileUrl = @"http://downsc.chinaz.net/files/download/sound1/201206/1638.mp3";
-        fileUrl =@"http://192.168.11.248:9888/getFile?path=/storage/C47D-46D2/audioTest/jiajiaeeyinyue.mp3";
-        
+        //fileUrl =@"http://192.168.11.248:9888/getFile?path=/storage/C47D-46D2/audioTest/jiajiaeeyinyue.mp3";
+        //fileUrl =@"http://transfertest.armclouding.com:21025/getFiles/L3N0b3JhZ2UvZW11bGF0ZWQvMC9NdXNpYy9hYmMubXAz";
+        fileUrl =@"http://transfertest.armclouding.com:21025/test/abc/abc.mp3";
+        //fileUrl =@"http://transfertest.armclouding.com:21025/getFiles/L3N0b3JhZ2UvZW11bGF0ZWQvMC9NdXNpYy9hYmMubXAz";
+    
 //        fileUrl = @"http://transfertest.armclouding.com:10001/getFile?path=/storage/6C07-E638/miniType/%E9%9F%B3%E9%A2%91%E6%A0%BC%E5%BC%8Fing/jiajiaeeyinyue.mp3";
 //        fileUrl  = [fileUrl stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
         

+ 1 - 1
创维盒子/双子星云手机/Class/Set/previewFile/imageDetailsScrollViewController.m

@@ -91,7 +91,7 @@
     imageURLStringsGroup = [NSMutableArray new];
     
     for (NASFilePicDataArrModel*dataModel in _totalDataArr) {
-        NSString * URLString = [[NSString alloc] initWithFormat:@"%@getFile?path=%@",ksharedAppDelegate.NASFileService,dataModel.path];
+        NSString * URLString = [[NSString alloc] initWithFormat:@"%@getFile?path=%@",ksharedAppDelegate.NASFileByBoxService,dataModel.path];
         URLString = [URLString  stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
         [imageURLStringsGroup addObject:URLString];
     }

+ 1 - 1
创维盒子/双子星云手机/Class/Set/previewFile/videoPlayByAVPlayerViewController.m

@@ -78,7 +78,7 @@
     
     if(!self.playerManager.assetURL){
         NSString *filePath = _VideoDataMode.path;
-        NSString *urlStr = ksharedAppDelegate.NASFileService;
+        NSString *urlStr = ksharedAppDelegate.NASFileByBoxService;
         //NSString *urlStr = ksharedAppDelegate.NASFileByBoxService;
         NSString *fileUrl = [[NSString alloc] initWithFormat:@"%@getFile?path=%@",urlStr,filePath];
         NSString *showUrl = [[NSString alloc] initWithFormat:@"%@getThumbnail?path=%@",urlStr,filePath];

+ 1 - 1
创维盒子/双子星云手机/Class/Set/previewFile/videoPlayViewController.m

@@ -114,7 +114,7 @@
 {
     NSString *filePath = _VideoDataMode.path;
     
-    NSString *urlStr = ksharedAppDelegate.NASFileService;
+    NSString *urlStr = ksharedAppDelegate.NASFileByBoxService;
     NSString *fileUrl = [[NSString alloc] initWithFormat:@"%@getFile?path=%@",urlStr,filePath];
     fileUrl = [fileUrl  stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     

+ 1 - 1
创维盒子/双子星云手机/Class/Set/previewFile/view/imageCollectionViewCell.m

@@ -81,7 +81,7 @@
     _curFileModel = curFileModel;
    
     NSString *filePath = _curFileModel.path;
-    NSString *urlStr = ksharedAppDelegate.NASFileService;
+    NSString *urlStr = ksharedAppDelegate.NASFileByBoxService;
     NSString *fileUrl = [[NSString alloc] initWithFormat:@"%@getThumbnail?path=%@",urlStr,filePath];
     
     UIImage *defaultImage = [UIImage imageNamed:@"uploadFile_image"];

+ 1 - 1
创维盒子/双子星云手机/Class/Set/previewFile/view/shareSecretTableViewCell.m

@@ -90,7 +90,7 @@
     else
     {
         NSString *filePath = dataModel.path;
-        NSString *urlStr = ksharedAppDelegate.NASFileService;
+        NSString *urlStr = ksharedAppDelegate.NASFileByBoxService;
         NSString *fileUrl = [[NSString alloc] initWithFormat:@"%@getThumbnail?path=%@",urlStr,filePath];
         
         //iOS格式的图片 代理拿不到缩略图

+ 1 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/downLoadFile/view/downLoadPreViewCell.m

@@ -266,7 +266,7 @@
     checkButton.selected = curNASFileAndFolderDataModel.isSelectType;
     
     NSString *filePath = _curNASFileAndFolderDataModel.path;
-    NSString *urlStr = ksharedAppDelegate.NASFileService;
+    NSString *urlStr = ksharedAppDelegate.NASFileByBoxService;
     NSString *fileUrl = [[NSString alloc] initWithFormat:@"%@getThumbnail?path=%@",urlStr,filePath];
     
     UIImage *placeholderImage = nil;