1.单个上传调整基本完成

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

@@ -122,7 +122,7 @@ isBangsScreen; \
 #define EachPieceSzie (2*1024*1024) //每片上传文件大小切割
 #define cutVideoPieceSzie (3 * EachPieceSzie) //视频每次切片多少（切完上传再切一次）
 
-#define MaxNasUploadPieceSzie (10*1024*1024) //frp上传 限制每片最大xx M
+#define MaxNasUploadPieceSzie (50*1024*1024) //frp上传 限制每片最大xx M
 #define keyToForgetPwd @"%==%"
 
 #define FileService            @"http://file.phone.androidscloud.com:8210/document/file/lowLevelMultipartUpload"

创维盒子/双子星云手机/NAS/nasUploadManager/nasUploadFileManager.m

@@ -29,7 +29,7 @@
 
 - (void)initManager
 {
-    _maxUploadingNumber = 2;
+    _maxUploadingNumber = 1;
     _uploadingModelArr = [NSMutableArray new];
 }
 
@@ -438,6 +438,9 @@
     if(_curUploadFileDataModel.savePath){
         NSString *absPath = [[NSString alloc] initWithFormat:@"%@%@",_curUploadFileDataModel.savePath,_curUploadFileDataModel.filename];
         [paraDict setValue:absPath forKey:@"absPath"];
+        
+        NSNumber *totalBytesNumber = [NSNumber numberWithLong:_curUploadFileDataModel.totalBytes];
+        [paraDict setValue:totalBytesNumber forKey:@"fileSize"];
     }
     
     KWeakSelf
@@ -473,12 +476,15 @@
     }
     else if(model.data.isComplete){//上传过了 并且文件上传完了
         //判断下文件创建长度是否一致 一致则是上传完了 不一致 重新上传一个 可能是同名的文件而已
-        if(model.data.size == _curUploadFileDataModel.totalBytes){//上传完了
-            
-        }
-        else{
-            [self realUploadAfterCheckFileUploadStateFun];
-        }
+//        if(model.data.size >= _curUploadFileDataModel.totalBytes){//上传完了
+//            HLog(@"222");
+//        }
+//        else{
+//
+//        }
+        
+        [self handleTaskDidUploadWith:_curUploadFileDataModel];
+        
     }
     else{//上传过了 未上传完成
         _curUploadFileDataModel.didUploadBytes = model.data.size;
@@ -486,6 +492,23 @@
     }
 }
 
+#pragma mark 文件上传在云机已经存在
+- (void)handleTaskDidUploadWith:(uploadFileDataModel*)didUploadModel
+{
+    mainBlock(^{
+        [[iToast makeText:NSLocalizedString(@"File_upload_file_already_exists",nil)] show];
+    });
+    
+    NSMutableArray *delArr = [NSMutableArray new];
+    [delArr addObject:didUploadModel];
+    
+    [[nasUploadFileManager shareInstance] deleteUploadFileRecordBy:delArr withDelCache:NO complete:^(BOOL isSuccess) {
+        if (isSuccess) {
+            
+        }
+    }];
+}
+
 #pragma mark 检测文件是否上传过 或者云机里存在文件了
 - (void)realUploadAfterCheckFileUploadStateFun
 {

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

@@ -192,7 +192,6 @@
      */
     NSURLSessionUploadTask *uploadTask = [session uploadTaskWithRequest:request fromData:nil completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
         //解析
-        //HLog(@"data string:%@",[[NSString alloc]initWithData:data encoding:NSUTF8StringEncoding]);
         [weakSelf handleCustomUploadResultBy:data withResponse:response withError:error success:success faild:faildStr];
     }];
     
@@ -241,7 +240,7 @@
     }
 }
 
-
+#pragma mark afnetwork
 - (void)nasUploadFileToFileServiceWithParams:(NSMutableDictionary *)params model:(uploadFileDataModel*)dataModel data:(NSData *)data success:(netWork_Success)success faild:(netWork_Faild)faildStr {
     
     //test code