Kaynağa Gözat

1.文件删除接口调试未成功
2.单个文件下载关联管理逻辑完成

huangxiaodong 1 yıl önce
ebeveyn
işleme
ca8e1f3fd4

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

@@ -298,14 +298,14 @@
 
     if(_NASMsgMod){
         if([_NASMsgMod.data.domainName rangeOfString:@"http"].location != NSNotFound){
-            //return  [[NSString alloc] initWithFormat:@"%@:%@/getFile?path=",_NASMsgMod.data.domainName,_NASMsgMod.data.port];
-            //return  [[NSString alloc] initWithFormat:@"%@:%@/getFile?path=",@"http://transfer.armclouding.com",@"10016"];
-            return  [[NSString alloc] initWithFormat:@"%@:%@/",@"http://transfer.armclouding.com",@"10016"];
+            return  [[NSString alloc] initWithFormat:@"%@:%@/",_NASMsgMod.data.domainName,_NASMsgMod.data.port];
+            //return  [[NSString alloc] initWithFormat:@"%@:%@/",@"http://transfer.armclouding.com",@"10016"];
+            //return  [[NSString alloc] initWithFormat:@"%@:%@/",@"http://transfer.armclouding.com",_NASMsgMod.data.port];
         }
         else{
-            //return  [[NSString alloc] initWithFormat:@"http://%@:%@/getFile?path=",_NASMsgMod.data.domainName,_NASMsgMod.data.port];
-            //return  [[NSString alloc] initWithFormat:@"http://%@:%@/getFile?path=",@"transfer.armclouding.com",@"10016"];
-            return  [[NSString alloc] initWithFormat:@"http://%@:%@/",@"transfer.armclouding.com",@"10016"];
+            return  [[NSString alloc] initWithFormat:@"http://%@:%@/",_NASMsgMod.data.domainName,_NASMsgMod.data.port];
+            //return  [[NSString alloc] initWithFormat:@"http://%@:%@/",@"transfer.armclouding.com",@"10016"];
+            //return  [[NSString alloc] initWithFormat:@"http://%@:%@/",@"transfer.armclouding.com",_NASMsgMod.data.port];
         }
        
         //return [[NSString alloc] initWithFormat:@"%@getFile?path=",_NASMsgMod.data.baseUrl];

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

@@ -10,6 +10,7 @@
 #import "editTypeBottomView.h"
 #import "editShareView.h"
 #import "NASFilePicModel.h"
+#import "uploadFileRecordViewController.h"
 
 @interface imageDetailsScrollViewController ()
 {
@@ -51,13 +52,15 @@
 #pragma mark 编辑状态的 下载 分享 删除 响应事件
     _curEditTypeBottomView.didClickButtonFun = ^(NSInteger tag) {
         if(tag==1){
-            [[iToast makeText:@"点击下载"] show];
+            //[[iToast makeText:@"点击下载"] show];
+            [weakSelf gotoDownLoadFileFun];
         }
         else if(tag==2){
             [weakSelf gotoShareViewFun];
         }
         else if(tag==3){
-            [[iToast makeText:@"点击删除"] show];
+            //[[iToast makeText:@"点击删除"] show];
+            [weakSelf delFileListFun];
         }
     };
 }
@@ -111,6 +114,7 @@
     });
     
     _curScrollView.itemDidScrollOperationBlock = ^(NSInteger currentIndex) {
+        weakSelf.index = currentIndex;
         [weakSelf setTitleLabelTextFunBy:currentIndex];
     };
 }
@@ -122,4 +126,55 @@
         self.titleLabel.text = dataModel.name;
     }
 }
+
+#pragma mark 删除文件数据
+- (void)delFileListFun
+{
+    NSMutableDictionary*paraDict = [NSMutableDictionary new];
+    
+    if(_index >=0 &&  _index < _totalDataArr.count){
+        NASFilePicDataArrModel *dataModel = _totalDataArr[_index];
+        NSArray *pathArr = @[dataModel.path];
+        [paraDict setValue:pathArr forKey:@"path"];
+    }
+    
+    [self showNewIndicatorWithCanBack:YES canTouch:NO];
+    
+    //NSString*code = [[NSString alloc] initWithFormat:@"delFile?path=%@",paraDict[@"path"]]; //delFile?path=[/storage/emulated/0/Download/IMG_6464.HEIC]
+    KWeakSelf //@"delFile"
+    [[netWorkManager shareInstance] cloudPhoneGETCallBackCode:@"delFile" Parameters:paraDict success:^(id  _Nonnull responseObject) {
+        [weakSelf removeNewIndicator];
+        SuperModel *model = [[SuperModel alloc] initWithDictionary:responseObject error:nil];
+        if(model && model.status == 0){
+            
+        }
+        else{
+            
+        }
+    } failure:^(NSError * _Nonnull error) {
+        [weakSelf removeNewIndicator];
+    }];
+}
+
+- (void)gotoDownLoadFileFun
+{
+    if(_index >=0 &&  _index < _totalDataArr.count){
+        NASFilePicDataArrModel *dataModel = _totalDataArr[_index];
+        
+        couldPhoneFileModel* fileModel =  [couldPhoneFileModel new];
+        fileModel.fileType = @".jpg";
+        fileModel.path = dataModel.path;
+        fileModel.name = dataModel.name;
+        fileModel.length = dataModel.size;
+        
+        NSMutableArray *arr = [NSMutableArray new];
+        [arr addObject:fileModel];
+        
+        uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
+        [self.navigationController pushViewController:vc animated:YES];
+        vc.isDownloadingType = YES;
+        [vc gotoDownloadFile:arr];
+    }
+}
+
 @end

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

@@ -76,6 +76,12 @@
         NSString *urlStr = ksharedAppDelegate.NASFileService;
         NSString *fileUrl = [[NSString alloc] initWithFormat:@"%@getThumbnail?path=%@",urlStr,filePath];
         
+        //iOS格式的图片 代理拿不到缩略图
+        if([filePath rangeOfString:@".HEIC"].location != NSNotFound
+           ||[filePath rangeOfString:@".heic"].location != NSNotFound){
+            fileUrl = [[NSString alloc] initWithFormat:@"%@getFile?path=%@",urlStr,filePath];
+        }
+  
         [_imageView sd_setImageWithURL:[NSURL URLWithString:fileUrl] placeholderImage:defaultImage completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
 //            if(image){
 //                HLog(@"11图片1:%@",imageURL.absoluteString);

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

@@ -33,6 +33,9 @@ typedef void (^netWork_Faild) (NSError *error);
 - (void)doUploadFileToFileServiceWithParams:(NSMutableDictionary *)params data:(NSData *)data success:(netWork_Success)success faild:(netWork_Faild)faildStr;
 
 #pragma mark  afnetwork  post 请求
+- (void)cloudPhonePostCallBackCode:(NSString*)code  Parameters:(NSDictionary*)dict success:(netWork_Success)success failure:(netWork_Faild)failure;
+
+#pragma mark  afnetwork  get 请求
 - (void)cloudPhoneGETCallBackCode:(NSString*)code  Parameters:(NSDictionary*)dict success:(netWork_Success)success failure:(netWork_Faild)failure;
 
 @end

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

@@ -262,7 +262,8 @@ static netWorkManager *Game_NetWorkShareInstance = nil;
     }];
 }
 
-- (void)cloudPhoneGETCallBackCode:(NSString*)code  Parameters:(NSDictionary*)dict success:(netWork_Success)success failure:(netWork_Faild)failure
+#pragma mark  afnetwork  post 请求
+- (void)cloudPhonePostCallBackCode:(NSString*)code  Parameters:(NSDictionary*)dict success:(netWork_Success)success failure:(netWork_Faild)failure
 {
     
     NSString *curServer = NASService;
@@ -289,6 +290,46 @@ static netWorkManager *Game_NetWorkShareInstance = nil;
     }
     
     
+    [manager POST:url parameters:dict progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+        
+        HLog(@"接口名称:%@ 接口返回:%@,\n ",code,responseObject);
+        
+        success(responseObject);
+        
+        
+    } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error, id  _Nonnull responseObject) {
+        
+        failure(error);
+        HLog(@"%@", error);
+    }];
+}
+
+- (void)cloudPhoneGETCallBackCode:(NSString*)code  Parameters:(NSDictionary*)dict success:(netWork_Success)success failure:(netWork_Faild)failure
+{
+    
+    NSString *curServer = NASService;
+    if(!curServer ||curServer.length ==0){
+        NSDictionary *responseObject = @{@"code" : @(-998), @"msg" : @"ip wrong", @"data" : @""};
+        mainBlock(^{
+            success(responseObject);
+        });
+        return;
+    }
+    
+    NSString *url = [NSString stringWithFormat:@"%@/%@",curServer,code];
+    HLog(@"地址:%@ \n接口名称:%@,\n 参数:%@\n",url,code,dict);
+    
+    [manager.requestSerializer setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
+    
+    if ([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable)
+    {// 无网络状态
+        NSDictionary *responseObject = @{@"code" : @(-999), @"msg" : @"当前网络不可用", @"data" : @""};
+        mainBlock(^{
+            success(responseObject);
+        });
+        return;
+    }
+    
     [manager GET:url parameters:dict progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
         
         HLog(@"接口名称:%@ 接口返回:%@,\n ",code,responseObject);