1.上传视频进度显示（图片太小 一次上传完成 没有进度过程）

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

@@ -45,11 +45,18 @@
     
 }
 
-- (void)nasUploadFileToFileServiceWithParams:(NSMutableDictionary *)params data:(NSData *)data success:(netWork_Success)success faild:(netWork_Faild)faildStr {
+- (void)nasUploadFileToFileServiceWithParams:(NSMutableDictionary *)params model:(uploadFileDataModel*)dataModel data:(NSData *)data success:(netWork_Success)success faild:(netWork_Faild)faildStr {
     
     NSString *urlString = ksharedAppDelegate.NASFileByBoxService;
     urlString = [[NSString alloc] initWithFormat:@"%@uploadFile",urlString];
-    HLog(@"上传地址：%@---%@",urlString,params)
+    
+    NSInteger position = 0;
+    if([[params allKeys] containsObject:@"position"]){
+        NSNumber *positionNumber = params[@"position"];
+        position = positionNumber.longValue;
+    }
+    
+    HLog(@"上传地址：%@---%@---position:%ld--",urlString,params,position);
     
     [_uploadManager POST:urlString parameters:params constructingBodyWithBlock:^(id<AFMultipartFormData>  _Nonnull formData) {
         
@@ -64,7 +71,10 @@
         [formData appendPartWithFileData:data name:@"file" fileName:params[@"filename"] mimeType:mimeType];
         
     } progress:^(NSProgress * _Nonnull uploadProgress) {
-        HLog(@"上传 Progress：--%@",uploadProgress)
+        HLog(@"上传 Progress：--%@---%lld",uploadProgress,uploadProgress.completedUnitCount)
+        dataModel.didUploadBytes = position + (uploadProgress.completedUnitCount);
+        [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileRefreshNotification object:dataModel];
+        
     } success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
         
         success(responseObject);
@@ -103,7 +113,7 @@
         [paraDict setObject:@1 forKey:@"imageType"];
         NSData *curData = dataModel.imageData;
         
-        [self nasUploadFileToFileServiceWithParams:paraDict data:curData success:^(id  _Nonnull responseObject) {
+        [self nasUploadFileToFileServiceWithParams:paraDict model:dataModel data:curData success:^(id  _Nonnull responseObject) {
             HLog(@"%@上传完成",dataModel.filename)
             success(responseObject);
         } faild:^(NSError * _Nonnull error) {
@@ -115,28 +125,31 @@
         [paraDict setObject:@1 forKey:@"videoType"];
         
         //断点续传处理 先传1字节数据看服务器是否有数据
-        NSData *videoData = [self cutVideoFileFunAtIndex:0 withMaxLenght:1 withModel:dataModel];
-        [paraDict setObject:@0 forKey:@"isLast"];
+        //NSData *videoData = [self cutVideoFileFunAtIndex:0 withMaxLenght:1 withModel:dataModel];
+        //[paraDict setObject:@0 forKey:@"isLast"];
+        
+        NSData *videoData = [self cutVideoFileFunAtIndex:0 withMaxLenght:MaxNasUploadPieceSzie withModel:dataModel];
         
        // NSData *videoData = [self cutVideoFileFunAtIndex:0 withMaxLenght:MaxNasUploadPieceSzie withModel:dataModel];
         
         
-        [self nasUploadFileToFileServiceWithParams:paraDict data:videoData success:^(id  _Nonnull responseObject) {
+        [self nasUploadFileToFileServiceWithParams:paraDict model:dataModel data:videoData success:^(id  _Nonnull responseObject) {
             HLog(@"%@上传完成",dataModel.filename)
+            success(responseObject);
             
-            frpUploadModel *model = [[frpUploadModel alloc] initWithDictionary:responseObject error:nil];
-            if(model && model.msg){
-                NSInteger curPosition = model.position > 0 ? model.position : 1;
-                [weakSelf beginUploadVideoDataFunBy:dataModel with:curPosition withPara:paraDict success:^(id  _Nonnull responseObject) {
-                    success(responseObject);
-                } faild:^(NSError * _Nonnull error) {
-                    faildStr(error);
-                }];
-            }
-            else{
-                NSError *err = [NSError new];
-                faildStr(err);
-            }
+//            frpUploadModel *model = [[frpUploadModel alloc] initWithDictionary:responseObject error:nil];
+//            if(model && model.msg){
+//                NSInteger curPosition = model.position > 0 ? model.position : 1;
+//                [weakSelf beginUploadVideoDataFunBy:dataModel with:curPosition withPara:paraDict success:^(id  _Nonnull responseObject) {
+//                    success(responseObject);
+//                } faild:^(NSError * _Nonnull error) {
+//                    faildStr(error);
+//                }];
+//            }
+//            else{
+//                NSError *err = [NSError new];
+//                faildStr(err);
+//            }
         
         } faild:^(NSError * _Nonnull error) {
             HLog(@"%@上传失败",dataModel.filename)
@@ -161,7 +174,7 @@
     NSData *videoData = [self cutVideoFileFunAtIndex:position withMaxLenght:MaxNasUploadPieceSzie withModel:dataModel];
     
     KWeakSelf
-    [self nasUploadFileToFileServiceWithParams:paraDict data:videoData success:^(id  _Nonnull responseObject) {
+    [self nasUploadFileToFileServiceWithParams:paraDict model:dataModel data:videoData success:^(id  _Nonnull responseObject) {
         HLog(@"%@上传完成",dataModel.filename)
         
         frpUploadModel *model = [[frpUploadModel alloc] initWithDictionary:responseObject error:nil];
@@ -184,7 +197,7 @@
         }
         
     } faild:^(NSError * _Nonnull error) {
-        HLog(@"%@上传失败",dataModel.filename)
+        HLog(@"%@上传失败---%@",dataModel.filename,error)
         faildStr(error);
     }];
 }