huangxiaodong 9 місяців тому
батько
коміт
2d9ae2a5d7

+ 12 - 0
创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -796,6 +796,10 @@
 		6BB481D02C52481E00C21921 /* backupsOptionTipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BB481CE2C52481E00C21921 /* backupsOptionTipView.m */; };
 		6BB481D12C52481E00C21921 /* backupsOptionTipView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BB481CD2C52481E00C21921 /* backupsOptionTipView.h */; };
 		6BB481D22C52481E00C21921 /* backupsOptionTipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BB481CE2C52481E00C21921 /* backupsOptionTipView.m */; };
+		6BB5730F2C7C18DC00713351 /* frpFileExistModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BB5730D2C7C18DB00713351 /* frpFileExistModel.h */; };
+		6BB573102C7C18DC00713351 /* frpFileExistModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BB5730E2C7C18DB00713351 /* frpFileExistModel.m */; };
+		6BB573112C7C18DC00713351 /* frpFileExistModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BB5730D2C7C18DB00713351 /* frpFileExistModel.h */; };
+		6BB573122C7C18DC00713351 /* frpFileExistModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BB5730E2C7C18DB00713351 /* frpFileExistModel.m */; };
 		6BB852282C4F7FE600570BF6 /* playingAudioGif.gif in Resources */ = {isa = PBXBuildFile; fileRef = 6BB852272C4F7FE500570BF6 /* playingAudioGif.gif */; };
 		6BB852292C4F7FE600570BF6 /* playingAudioGif.gif in Resources */ = {isa = PBXBuildFile; fileRef = 6BB852272C4F7FE500570BF6 /* playingAudioGif.gif */; };
 		6BBB35D92AE7645200E4A59B /* RunInBackground.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 6BBB35D62AE7645200E4A59B /* RunInBackground.mp3 */; };
@@ -1943,6 +1947,8 @@
 		6BA533372B16E65500D1CB5C /* TvStatusModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TvStatusModel.m; sourceTree = "<group>"; };
 		6BB481CD2C52481E00C21921 /* backupsOptionTipView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = backupsOptionTipView.h; sourceTree = "<group>"; };
 		6BB481CE2C52481E00C21921 /* backupsOptionTipView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = backupsOptionTipView.m; sourceTree = "<group>"; };
+		6BB5730D2C7C18DB00713351 /* frpFileExistModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = frpFileExistModel.h; sourceTree = "<group>"; };
+		6BB5730E2C7C18DB00713351 /* frpFileExistModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = frpFileExistModel.m; sourceTree = "<group>"; };
 		6BB852272C4F7FE500570BF6 /* playingAudioGif.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = playingAudioGif.gif; sourceTree = "<group>"; };
 		6BBB35D62AE7645200E4A59B /* RunInBackground.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = RunInBackground.mp3; sourceTree = "<group>"; };
 		6BBB35DB2AE76AD800E4A59B /* AudioSessionObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AudioSessionObject.h; sourceTree = "<group>"; };
@@ -3280,6 +3286,8 @@
 				6B9773A02C637E3A00213317 /* nasUploadFileManager.m */,
 				6BEF9B832C64CDD300142B75 /* frpUploadModel.h */,
 				6BEF9B842C64CDD300142B75 /* frpUploadModel.m */,
+				6BB5730D2C7C18DB00713351 /* frpFileExistModel.h */,
+				6BB5730E2C7C18DB00713351 /* frpFileExistModel.m */,
 			);
 			path = nasUploadManager;
 			sourceTree = "<group>";
@@ -3851,6 +3859,7 @@
 				6B4C0F722C0314BA0070EF2E /* DFPlayerTool.h in Headers */,
 				6B679DEA2C252A4E00D0DC03 /* NASMySpaceViewController.h in Headers */,
 				6B4C0F622C0314BA0070EF2E /* DFPlayerFileManager.h in Headers */,
+				6BB5730F2C7C18DC00713351 /* frpFileExistModel.h in Headers */,
 				6B2170982B15CD9200656670 /* NSDictionary+Log.h in Headers */,
 				6B7E042C2C3E5A98004B4948 /* customDownloadManager.h in Headers */,
 				6B4C0F932C0320710070EF2E /* NSObject+Extensions.h in Headers */,
@@ -4121,6 +4130,7 @@
 				6B4C0F732C0314BA0070EF2E /* DFPlayerTool.h in Headers */,
 				6B679DEC2C252A4E00D0DC03 /* NASMySpaceViewController.h in Headers */,
 				6B4C0F632C0314BA0070EF2E /* DFPlayerFileManager.h in Headers */,
+				6BB573112C7C18DC00713351 /* frpFileExistModel.h in Headers */,
 				6BD506B92B9576A4006E7CB0 /* NSDictionary+Log.h in Headers */,
 				6B7E042D2C3E5A98004B4948 /* customDownloadManager.h in Headers */,
 				6B4C0F962C0320710070EF2E /* NSObject+Extensions.h in Headers */,
@@ -4748,6 +4758,7 @@
 				6B2C1EAB2C070ADE00FDCF82 /* ZFReachabilityManager.m in Sources */,
 				6BD507292B9576A4006E7CB0 /* RYShearDeviceUDPManager.m in Sources */,
 				6B7E042B2C3E5A98004B4948 /* customDownloadCacheManager.m in Sources */,
+				6BB573122C7C18DC00713351 /* frpFileExistModel.m in Sources */,
 				6BD5072A2B9576A4006E7CB0 /* TipsQRCodeForChangeDeviceViewController.m in Sources */,
 				6B9354972BF33F2700AA8D31 /* editShareView.m in Sources */,
 				6BD5072B2B9576A4006E7CB0 /* fileTransfeSetViewController.m in Sources */,
@@ -5100,6 +5111,7 @@
 				6B2C1EAA2C070ADE00FDCF82 /* ZFReachabilityManager.m in Sources */,
 				18BB18422AC417CB00A36F63 /* RYShearDeviceUDPManager.m in Sources */,
 				6B7E042A2C3E5A98004B4948 /* customDownloadCacheManager.m in Sources */,
+				6BB573102C7C18DC00713351 /* frpFileExistModel.m in Sources */,
 				18F9CB062ABD7835003FF71A /* TipsQRCodeForChangeDeviceViewController.m in Sources */,
 				6B9354942BF33F2700AA8D31 /* editShareView.m in Sources */,
 				6B5B60662B3D5FD8009A2AE2 /* fileTransfeSetViewController.m in Sources */,

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

@@ -47,9 +47,9 @@
     [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDarkContent];
     
     //保护App,一般常见的问题不会导致闪退,增强App的健壮性,同时会将错误抛出来,根据每个App自身的日志渠道记录
-    [JJException configExceptionCategory:JJExceptionGuardAll];
-    [JJException startGuardException];
-    [JJException registerExceptionHandle:self];
+//    [JJException configExceptionCategory:JJExceptionGuardAll];
+//    [JJException startGuardException];
+//    [JJException registerExceptionHandle:self];
     
 //    //Default value:NO  no表示异常不退出 YES 表示退出  开发时应该设置为YES
 //    JJException.exceptionWhenTerminate = YES;

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

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

+ 5 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/model/uploadFileDataModel.h

@@ -45,6 +45,11 @@ typedef enum{
 
 //1.3.1新增字段
 @property (nonatomic, copy)  NSString *savePath;
+
+//1.4.2 http上传
+@property (nonatomic, copy)  NSString *taskId;
+
+//新增字段要处理.m的copy协议里面添加
 @end
 
 NS_ASSUME_NONNULL_END

+ 1 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/model/uploadFileDataModel.m

@@ -37,7 +37,7 @@
     model.curTimeInterval = self.curTimeInterval;
     model.savePath = self.savePath;
     model.bg_id = self.bg_id;
-    
+    model.taskId = self.taskId;
     return model;
 }
 @end

+ 13 - 3
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordTableView.m

@@ -476,12 +476,14 @@
 - (void)handleUploadingStateTapFunBy:(BOOL)isSuspendType with:(uploadFileDataModel*)model
 {
     if (isSuspendType) {
-        [[uploadFileManager shareInstance] suspendUploadFileFun:NO withModel:model];
+        //[[uploadFileManager shareInstance] suspendUploadFileFun:NO withModel:model];
+        [[nasUploadFileManager shareInstance] suspendUploadFileFun:NO withModel:model];
     }
     else{
         NSMutableArray*arr = [NSMutableArray new];
         [arr addObject:model];
-        [[uploadFileManager shareInstance] reUploadFileFunBy:arr withAll:NO];
+        //[[uploadFileManager shareInstance] reUploadFileFunBy:arr withAll:NO];
+        [[nasUploadFileManager shareInstance] reUploadFileFunBy:arr withAll:NO];
     }
     
     [self reloadDataFun];
@@ -494,6 +496,13 @@
         [_uploadfailArr removeObject:model];
     }
    
+    //添加到上传中的列表
+    if(!_uploadingArr){
+        _uploadingArr = [NSMutableArray new];
+    }
+    model.curUploadStateType = uploadStateUploading;
+    [_uploadingArr addObject:model];
+    
     [self RefreshAllDataFun];
     
     if(_didClickReUploadBlock){
@@ -503,7 +512,8 @@
     NSMutableArray*arr = [NSMutableArray new];
     model.curUploadStateType = uploadStateUploading;
     [arr addObject:model];
-    [[uploadFileManager shareInstance] reUploadFileFunBy:arr withAll:NO];
+    //[[uploadFileManager shareInstance] reUploadFileFunBy:arr withAll:NO];
+    [[nasUploadFileManager shareInstance] reUploadFileFunBy:arr withAll:NO];
     
 }
 @end

+ 23 - 0
创维盒子/双子星云手机/NAS/nasUploadManager/frpFileExistModel.h

@@ -0,0 +1,23 @@
+//
+//  frpFileExistModel.h
+//  双子星云手机
+//
+//  Created by xd h on 2024/8/26.
+//
+
+#import "SuperModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface frpFileExistDataModel : SuperModel
+@property(nonatomic,assign) BOOL isComplete; //是否完成 (0 表示完成  1表示未完成)???
+@property(nonatomic,assign) long size; //已经上传的长度
+@property(nonatomic,assign) BOOL exist; //文件是否存在
+@property(nonatomic,copy) NSString* taskId; //上传任务中用到
+@end
+
+@interface frpFileExistModel : SuperModel
+@property(nonatomic,strong) frpFileExistDataModel* data; //
+@end
+
+NS_ASSUME_NONNULL_END

+ 16 - 0
创维盒子/双子星云手机/NAS/nasUploadManager/frpFileExistModel.m

@@ -0,0 +1,16 @@
+//
+//  frpFileExistModel.m
+//  双子星云手机
+//
+//  Created by xd h on 2024/8/26.
+//
+
+#import "frpFileExistModel.h"
+
+@implementation frpFileExistDataModel
+
+@end
+
+@implementation frpFileExistModel
+
+@end

+ 6 - 1
创维盒子/双子星云手机/NAS/nasUploadManager/nasUploadFileManager.h

@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
 #import "uploadFileManager.h"
 #import "frpUploadModel.h"
-
+#import "frpFileExistModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 #define nasUpLoadFile_tableName [[NSString alloc] initWithFormat:@"upLoadFile_tableName_%@",[connectDeviceManager shareInstance].DeviceThirdIdMod.data.sn]
@@ -40,6 +40,11 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)deleteUploadFileRecordBy:(NSMutableArray *)delArr withDelCache:(BOOL)isDelCache complete:(custom_complete_B)complete;
 
 - (void)checkHadUploadTaskWithComplete:(custom_complete_B)complete;
+
+//文件重新上传
+- (void)reUploadFileFunBy:(NSMutableArray*)Arr withAll:(BOOL)isAllType;
+//暂停上传 当 isSuspendAll为NO时候 传指定暂停哪一个
+- (void)suspendUploadFileFun:(BOOL)isSuspendAll withModel:(uploadFileDataModel*)model;
 @end
 
 NS_ASSUME_NONNULL_END

+ 172 - 6
创维盒子/双子星云手机/NAS/nasUploadManager/nasUploadFileManager.m

@@ -426,8 +426,87 @@
 #pragma mark 开始上传
 - (void)beginGotoUploadDataFun{
     
-    [_uploadingModelArr addObject:_curUploadFileDataModel];
+    [self checkFileUploadStateFun];
+}
+
+
+#pragma mark 检测文件是否上传过 或者云机里存在文件了
+- (void)checkFileUploadStateFun
+{
+    NSMutableDictionary*paraDict = [NSMutableDictionary new];
+    
+    if(_curUploadFileDataModel.savePath){
+        NSString *absPath = [[NSString alloc] initWithFormat:@"%@%@",_curUploadFileDataModel.savePath,_curUploadFileDataModel.filename];
+        [paraDict setValue:absPath forKey:@"absPath"];
+    }
+    
+    KWeakSelf
+    [[netWorkManager shareInstance] cloudPhoneGETCallBackCode:@"isFileExist" Parameters:paraDict success:^(id  _Nonnull responseObject) {
+        
+        frpFileExistModel *model = [[frpFileExistModel alloc] initWithDictionary:responseObject error:nil];
+        if(model && model.status == 0){
+            [weakSelf checkFileUploadStateFunAfterNetWith:model];
+        }
+        else{
+            [weakSelf checkFileUploadStateFunAfterNetWith:nil];
+        }
+    } failure:^(NSError * _Nonnull error) {
+        HLog(@"%@",error)
+        [weakSelf checkFileUploadStateFunAfterNetWith:nil];
+    }];
+    
+    
+}
+
+- (void)checkFileUploadStateFunAfterNetWith:(frpFileExistModel*)model
+{
+    if(!model){
+        [self beginUploadFileFun];
+        return;
+    }
+    
+    _curUploadFileDataModel.didUploadBytes = 0;
+    _curUploadFileDataModel.taskId = model.data.taskId;
+    
+    if(!model.data.exist){//未上传过
+        [self realUploadAfterCheckFileUploadStateFun];
+    }
+    else if(model.data.isComplete){//上传过了 并且文件上传完了
+        //判断下文件创建长度是否一致 一致则是上传完了 不一致 重新上传一个 可能是同名的文件而已
+        if(model.data.size == _curUploadFileDataModel.totalBytes){//上传完了
+            
+        }
+        else{
+            [self realUploadAfterCheckFileUploadStateFun];
+        }
+    }
+    else{//上传过了 未上传完成
+        _curUploadFileDataModel.didUploadBytes = model.data.size;
+        [self realUploadAfterCheckFileUploadStateFun];
+    }
+}
+
+#pragma mark 检测文件是否上传过 或者云机里存在文件了
+- (void)realUploadAfterCheckFileUploadStateFun
+{
+    
+    BOOL isNewTask = YES;
+    for (uploadFileDataModel *preModel in _uploadingModelArr) {
+        if(preModel.bg_id.integerValue == _curUploadFileDataModel.bg_id.integerValue){
+            isNewTask = NO;
+            break;
+        }
+    }
+    
     [_fileModelDataArr removeObject:_curUploadFileDataModel];
+    if(isNewTask){
+        [_uploadingModelArr addObject:_curUploadFileDataModel];
+    }
+    else{
+        [self beginUploadFileFun];
+        return;
+    }
+    
     __block uploadFileDataModel *curUploadModel = [_curUploadFileDataModel copy];
     _curUploadFileDataModel = nil;
     
@@ -449,13 +528,10 @@
         [weakSelf deleteCacheDataBy:curUploadModel];
     }];
     
-    //任务没饱和 再开启一个
-    if(_uploadingModelArr.count <_maxUploadingNumber)
-    {
-        [self beginUploadFileFun];
-    }
+    [self beginUploadFileFun];
 }
 
+
 #pragma mark 上传完成 清理缓存
 - (void)deleteCacheDataBy:(uploadFileDataModel*)uploadFileDataMod
 {
@@ -820,4 +896,94 @@
     }];
 }
 
+//文件重新上传
+- (void)reUploadFileFunBy:(NSMutableArray*)Arr withAll:(BOOL)isAllType
+{
+    if(!Arr || Arr.count == 0){
+        return;
+    }
+    
+    if(!_fileModelDataArr){
+        _fileModelDataArr = [NSMutableArray new];
+    }
+    
+    //1.修改状态从失败改为上传中
+    for (uploadFileDataModel * model in Arr) {
+        model.curUploadStateType = uploadStateUploading;
+        
+        //修改已经读取的内存数据
+        NSMutableArray * failArr = _databaseArr[2];
+        for (uploadFileDataModel * failModel in failArr) {
+            if(model.bg_id.integerValue == failModel.bg_id.integerValue){
+                [failArr removeObject:failModel];
+                break;
+            }
+        }
+        
+        //判断是否是新任务
+        BOOL isNewTask = YES;
+        for (uploadFileDataModel *preModel in _fileModelDataArr) {
+            if(preModel.bg_id.integerValue == model.bg_id.integerValue){
+                isNewTask = NO;
+                break;
+            }
+        }
+        
+        //添加到等待上传列表
+        if(isNewTask){
+            [_fileModelDataArr insertObject:model atIndex:0];
+        }
+    }
+    
+    //2、保存到数控库
+    [uploadFileDataModel bg_saveOrUpdateArrayAsync:Arr complete:^(BOOL isSuccess) {
+        
+    }];
+    
+    
+    //开始上传
+    [self beginUploadFileFun];
+   
+}
+
+//暂停上传 当 isSuspendAll为NO时候 传指定暂停哪一个
+- (void)suspendUploadFileFun:(BOOL)isSuspendAll withModel:(uploadFileDataModel*)model
+{
+    [[nasUploadManager shareInstance] cancelUploadTaskFun];
+    
+    [self deleteUploadingTaskBy:isSuspendAll withModel:model];
+}
+
+#pragma mark 删除任务
+- (void)deleteUploadingTaskBy:(BOOL)isDeleteAll withModel:(uploadFileDataModel*)model
+{
+    if(isDeleteAll){
+        [_fileModelDataArr removeAllObjects];
+        [_uploadingModelArr removeAllObjects];
+    }
+    else{
+        
+        //更新数据库
+        [uploadFileDataModel bg_saveOrUpdateArrayAsync:@[model] complete:^(BOOL isSuccess) {
+            
+        }];
+        
+        
+        for (uploadFileDataModel *preModel in _fileModelDataArr) {
+            if(preModel.bg_id.integerValue == model.bg_id.integerValue){
+                [_fileModelDataArr removeObject:preModel];
+                break;
+            }
+        }
+        
+        for (uploadFileDataModel *preModel in _uploadingModelArr) {
+            if(preModel.bg_id.integerValue == model.bg_id.integerValue){
+                [_uploadingModelArr removeObject:preModel];
+                break;
+            }
+        }
+        
+        [self beginUploadFileFun];
+    }
+}
 @end

+ 21 - 35
创维盒子/双子星云手机/NAS/nasUploadManager/nasUploadManager.m

@@ -258,7 +258,7 @@
     }
     
     __block long dataLength = [data length];
-    HLog(@"上传地址:%@---%@---position:%ld--data 长度:%ld",urlString,params,position,[data length]);
+    HLog(@"上传地址:%@---%@---position:%ld--data 长度:%ld ",urlString,params,position,[data length]);
     
     self.uploadTask = [_uploadManager POST:urlString parameters:params constructingBodyWithBlock:^(id<AFMultipartFormData>  _Nonnull formData) {
         
@@ -291,8 +291,9 @@
         success(responseObject);
         
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error, id  _Nonnull responseObject) {
-        
-        faildStr(error);
+        if(error.code != -999){
+            faildStr(error);
+        }
     }];
     
     data = nil;
@@ -301,10 +302,15 @@
 - (void)beginUploadDataBy:(uploadFileDataModel*)dataModel success:(netWork_Success)success faild:(netWork_Faild)faildStr
 {
     NSMutableDictionary *paraDict = [NSMutableDictionary new];
-    NSString* taskUid = [iTools getTaskUidStr];
+    
+    NSString* taskUid  = dataModel.taskId;
+    if(!taskUid || taskUid.length == 0){
+        taskUid = [iTools getTaskUidStr];
+    }
+    
     [paraDict setObject:taskUid forKey:@"taskId"];
     [paraDict setObject:@0 forKey:@"position"];
-    [paraDict setObject:@1 forKey:@"isLast"];
+    [paraDict setObject:@"true" forKey:@"isLast"];
     if(dataModel.savePath){
         [paraDict setObject:dataModel.savePath forKey:@"savePath"];
     }
@@ -335,36 +341,13 @@
         }];
     }
     else{
-        [paraDict setObject:@1 forKey:@"videoType"];
-        
-        //断点续传处理 先传1字节数据看服务器是否有数据
-        __block NSData *videoData = [self cutVideoFileFunAtIndex:0 withMaxLenght:1 withModel:dataModel];
-        [paraDict setObject:@0 forKey:@"isLast"];
+        [paraDict setObject:@0 forKey:@"videoType"];
+        [paraDict setObject:@"false" forKey:@"isLast"];
         
-//        __block NSData *videoData = [self cutVideoFileFunAtIndex:0 withMaxLenght:MaxNasUploadPieceSzie withModel:dataModel];
-        
-        [self nasUploadFileToFileServiceWithParams:paraDict model:dataModel data:videoData success:^(id  _Nonnull responseObject) {
-            HLog(@"%@上传完成 111 %@",dataModel.filename,responseObject)
-            videoData = nil;
+        long curPosition = dataModel.didUploadBytes;
+        [self beginUploadVideoDataFunBy:dataModel with:curPosition withPara:paraDict success:^(id  _Nonnull responseObject) {
             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);
-            }
-        
         } faild:^(NSError * _Nonnull error) {
-            videoData = nil;
-            HLog(@"%@上传失败 -- %@",dataModel.filename,error)
             faildStr(error);
         }];
     }
@@ -376,7 +359,7 @@
 
     BOOL isLastPicece = NO;
     if((dataModel.totalBytes - position) <= MaxNasUploadPieceSzie){
-        [paraDict setObject:@1 forKey:@"isLast"];
+        [paraDict setObject:@"true" forKey:@"isLast"];
         isLastPicece = YES;
     }
     
@@ -399,8 +382,11 @@
                 [weakSelf beginUploadVideoDataFunBy:dataModel with:model.position withPara:paraDict success:^(id  _Nonnull responseObject) {
                     success(responseObject);
                 } faild:^(NSError * _Nonnull error) {
-                    NSError *err = [NSError new];
-                    faildStr(err);
+                    NSError *err = error;
+                    if(error.code != -999){
+                        faildStr(err);
+                    }
+                   
                 }];
             }
         }

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

@@ -366,6 +366,9 @@ static netWorkManager *Game_NetWorkShareInstance = nil;
 //事件模块值 Scan_code
 - (void)DataEmbeddingPointBy:(int)eventType withEventValue:(NSString*)eventValue
 {
+    //test code
+    return;
+    
     if(!eventValue){
         return;
     }