1.上传相关优化

创维盒子/双子星云手机/AppDelegate/SceneDelegate.m

@@ -874,10 +874,13 @@
     }
     
     //clear下载和上传的已经获取的数据
-    [[uploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
-    [uploadFileManager shareInstance].databaseArr = [NSMutableArray new];
-    [uploadFileManager shareInstance].fileModelDataArr = [NSMutableArray new];
-    [uploadFileManager shareInstance].curUploadFileDataModel.curUploadStateType = uploadStateWait;
+//    [[uploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
+//    [uploadFileManager shareInstance].databaseArr = [NSMutableArray new];
+//    [uploadFileManager shareInstance].fileModelDataArr = [NSMutableArray new];
+//    [uploadFileManager shareInstance].curUploadFileDataModel.curUploadStateType = uploadStateWait;
+    
+    [[nasUploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
+    [nasUploadFileManager shareInstance].databaseArr = [NSMutableArray new];
     
     [[downloadManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
     [downloadManager shareInstance].databaseArr = [NSMutableArray new];

创维盒子/双子星云手机/Class/Set/ChangeDevice/QRCodeScanForChangeDeviceViewController.m

@@ -10,7 +10,8 @@
 #import <ImageIO/ImageIO.h>
 #import "RSATool.h"
 #import "connectDeviceManager.h"
-#import "uploadFileManager.h"
+//#import "uploadFileManager.h"
+#import "nasUploadFileManager.h"
 #import "downloadManager.h"
 #import "backupsFileManager.h"
 #import "nasBackupsManager.h"
@@ -289,7 +290,8 @@ bool isDownType22 = YES;
 - (void)handleScanCodeResultFun:(NSString*)resultStr
 {
     
-    [[uploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
+    //[[uploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
+    [[nasUploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
     [[downloadManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
     //[[backupsFileManager shareInstance] suspendBackupsFileFun];
     [[nasBackupsManager shareInstance] suspendBackupsFileFun];

创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/fileTransfeSetViewController.m

@@ -8,7 +8,8 @@
 #import "fileTransfeSetViewController.h"
 #import "fileSetTableViewCell.h"
 #import "fileTransferPathCheckViewController.h"
-#import "uploadFileManager.h"
+//#import "uploadFileManager.h"
+#import "nasUploadFileManager.h"
 //#import "backupsFileManager.h"
 #import "nasBackupsManager.h"
 
@@ -379,64 +380,66 @@
 
 -(void)gotoSetUploadPathFun
 {
-    uploadFileDataModel* model = [uploadFileManager shareInstance].curUploadFileDataModel;
+    [self gotofileTransferPathCheckVCFunWithType:1];
     
-    if(!model){
-        [[uploadFileManager shareInstance] getDataInDatabaseFun:YES complete:^(NSMutableArray * _Nonnull Arr) {
-            mainBlock(^{
-                if(Arr && Arr.count== 3){
-                    NSArray *uploadingArr = Arr.firstObject;
-                    if(uploadingArr.count == 0){
-                        [self gotofileTransferPathCheckVCFunWithType:1];
-                    }
-                    else{
-                        [[iToast makeText:NSLocalizedString(@"File_upload_set_default_path_tip",nil)] show];
-                    }
-                }
-            });
-            
-        }];
-    }
-    else if(model.curUploadStateType == uploadStateUploading
-        ||model.curUploadStateType == uploadStateSuspend
-       ){
-        
-        //判断尺寸路径是否存在
-        
-        NSString * uploadDefaultPath = [HWDataManager getStringWithKey:stringKeyAddSn(Const_photo_upload_default_path)];
-        
-        BOOL isExtraFileType = NO;
-        BOOL isExtraPathFind = NO;
-        if(uploadDefaultPath){
-            if(![uploadDefaultPath containsString:@"sdcard/"]){
-                isExtraFileType = YES;
-            }
-        }
-        
-        if(uploadDefaultPath && ksharedAppDelegate.cloudPhoneExtraFileListMod){
-            NSArray*arr =  ksharedAppDelegate.cloudPhoneExtraFileListMod.data;
-            
-            for (cloudPhoneExtraFileModel*model in arr) {
-                if([uploadDefaultPath containsString:model.extraPath]){
-                    isExtraPathFind = YES;
-                    break;
-                }
-            }
-            
-            
-        }
-        
-        if(isExtraFileType && !isExtraPathFind){
-            [self gotofileTransferPathCheckVCFunWithType:1];
-        }
-        else{
-            [[iToast makeText:NSLocalizedString(@"File_upload_set_default_path_tip",nil)] show];
-        }
-        
-    }
-    else{
-        [self gotofileTransferPathCheckVCFunWithType:1];
-    }
+//    uploadFileDataModel* model = [uploadFileManager shareInstance].curUploadFileDataModel;
+//    
+//    if(!model){
+//        [[uploadFileManager shareInstance] getDataInDatabaseFun:YES complete:^(NSMutableArray * _Nonnull Arr) {
+//            mainBlock(^{
+//                if(Arr && Arr.count== 3){
+//                    NSArray *uploadingArr = Arr.firstObject;
+//                    if(uploadingArr.count == 0){
+//                        [self gotofileTransferPathCheckVCFunWithType:1];
+//                    }
+//                    else{
+//                        [[iToast makeText:NSLocalizedString(@"File_upload_set_default_path_tip",nil)] show];
+//                    }
+//                }
+//            });
+//            
+//        }];
+//    }
+//    else if(model.curUploadStateType == uploadStateUploading
+//        ||model.curUploadStateType == uploadStateSuspend
+//       ){
+//        
+//        //判断尺寸路径是否存在
+//        
+//        NSString * uploadDefaultPath = [HWDataManager getStringWithKey:stringKeyAddSn(Const_photo_upload_default_path)];
+//        
+//        BOOL isExtraFileType = NO;
+//        BOOL isExtraPathFind = NO;
+//        if(uploadDefaultPath){
+//            if(![uploadDefaultPath containsString:@"sdcard/"]){
+//                isExtraFileType = YES;
+//            }
+//        }
+//        
+//        if(uploadDefaultPath && ksharedAppDelegate.cloudPhoneExtraFileListMod){
+//            NSArray*arr =  ksharedAppDelegate.cloudPhoneExtraFileListMod.data;
+//            
+//            for (cloudPhoneExtraFileModel*model in arr) {
+//                if([uploadDefaultPath containsString:model.extraPath]){
+//                    isExtraPathFind = YES;
+//                    break;
+//                }
+//            }
+//            
+//            
+//        }
+//        
+//        if(isExtraFileType && !isExtraPathFind){
+//            [self gotofileTransferPathCheckVCFunWithType:1];
+//        }
+//        else{
+//            [[iToast makeText:NSLocalizedString(@"File_upload_set_default_path_tip",nil)] show];
+//        }
+//        
+//    }
+//    else{
+//        [self gotofileTransferPathCheckVCFunWithType:1];
+//    }
 
 }
 

创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileRecordViewController.m

@@ -543,7 +543,7 @@
         
         NSMutableArray *curLoadIngArr = Arr[0];
         //不是上传视频和进来的  所以上传状态（上传中和等待）改为重新上传
-        if(![uploadFileManager shareInstance].isUploadIngType){
+        if(!weakSelf.isUploadingType){
             //改为暂停
 //            for (uploadFileDataModel * curModel in curLoadIngArr) {
 //                curModel.curUploadStateType = uploadStateSuspend;
@@ -633,24 +633,24 @@
 #pragma mark 处理上传中的 全部暂停等
 - (void)handleUploadingRightButFun:(BOOL)isUserUploadIngType
 {
-    if(_leftTableView.uploadingArr.count == 0){
-        //不处理
-    }
-    else{
-        NSMutableArray *upLoadingArr = [uploadFileManager shareInstance].fileModelDataArr;
-        BOOL isUploadIngType = [uploadFileManager shareInstance].isUploadIngType;
-
-        if(!isUserUploadIngType
-           &&(!upLoadingArr ||upLoadingArr.count == 0 || !isUploadIngType)){//不是上传状态
-            _leftTableView.uploadingHeadView.rightButton.selected = YES;
-        }
-        else if(upLoadingArr.count == _leftTableView.uploadingArr.count){
-            _leftTableView.uploadingHeadView.rightButton.selected = NO;
-        }
-        else{
-            _leftTableView.uploadingHeadView.rightButton.selected = YES;
-        }
-    }
+//    if(_leftTableView.uploadingArr.count == 0){
+//        //不处理
+//    }
+//    else{
+//        NSMutableArray *upLoadingArr = [uploadFileManager shareInstance].fileModelDataArr;
+//        BOOL isUploadIngType = [uploadFileManager shareInstance].isUploadIngType;
+//
+//        if(!isUserUploadIngType
+//           &&(!upLoadingArr ||upLoadingArr.count == 0 || !isUploadIngType)){//不是上传状态
+//            _leftTableView.uploadingHeadView.rightButton.selected = YES;
+//        }
+//        else if(upLoadingArr.count == _leftTableView.uploadingArr.count){
+//            _leftTableView.uploadingHeadView.rightButton.selected = NO;
+//        }
+//        else{
+//            _leftTableView.uploadingHeadView.rightButton.selected = YES;
+//        }
+//    }
 }
 
 #pragma mark 处理下载中的 全部暂停等
@@ -948,7 +948,7 @@
 
 - (void)ClearAllRecordInDoneFun
 {
-    [[uploadFileManager shareInstance] deleteUploadFileRecordBy:_leftTableView.uploadDoneArr withDelCache:YES complete:^(BOOL isSuccess) {
+    [[nasUploadFileManager shareInstance] deleteUploadFileRecordBy:_leftTableView.uploadDoneArr withDelCache:YES complete:^(BOOL isSuccess) {
         HLog(@"isSuccess:%d",isSuccess);
 
         if(isSuccess){
@@ -1018,7 +1018,7 @@
 
 - (void)ClearAllRecordInFailFun
 {
-    [[uploadFileManager shareInstance] deleteUploadFileRecordBy:_leftTableView.uploadfailArr withDelCache:YES complete:^(BOOL isSuccess) {
+    [[nasUploadFileManager shareInstance] deleteUploadFileRecordBy:_leftTableView.uploadfailArr withDelCache:YES complete:^(BOOL isSuccess) {
         HLog(@"isSuccess:%d",isSuccess);
         
         if(isSuccess){

创维盒子/双子星云手机/mine/mineViewController.m

@@ -324,21 +324,21 @@
     NSString *ImagePath = [NSString stringWithFormat:@"%@/Image",CachesPatch];
     long imageAllSize = [iTools folderSizeAtPath:ImagePath];
     
-    if([uploadFileManager shareInstance].curUploadFileDataModel
-       && [uploadFileManager shareInstance].curUploadFileDataModel.curUploadFileType == uploadFileTypeImage
-       && [uploadFileManager shareInstance].curUploadFileDataModel.curUploadStateType == uploadStateUploading){
-        
-        [uploadFileManager shareInstance].curUploadFileDataModel.curUploadStateType = uploadStateSuspend;
-        needReUploadingType  = YES;
-    }
+//    if([uploadFileManager shareInstance].curUploadFileDataModel
+//       && [uploadFileManager shareInstance].curUploadFileDataModel.curUploadFileType == uploadFileTypeImage
+//       && [uploadFileManager shareInstance].curUploadFileDataModel.curUploadStateType == uploadStateUploading){
+//        
+//        [uploadFileManager shareInstance].curUploadFileDataModel.curUploadStateType = uploadStateSuspend;
+//        needReUploadingType  = YES;
+//    }
     
     [[NSFileManager defaultManager] removeItemAtPath:ImagePath error:nil];
     
-    if(needReUploadingType){
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [uploadFileManager shareInstance].curUploadFileDataModel.curUploadStateType = uploadStateUploading;
-        });
-    }
+//    if(needReUploadingType){
+//        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//            [uploadFileManager shareInstance].curUploadFileDataModel.curUploadStateType = uploadStateUploading;
+//        });
+//    }
     
     //清理视频文件
     NSString *videoPath = [NSString stringWithFormat:@"%@/Video",CachesPatch];
@@ -351,10 +351,10 @@
     }
     
     NSString *uploadingVideoName = nil;
-    if([uploadFileManager shareInstance].curUploadFileDataModel
-       && [uploadFileManager shareInstance].curUploadFileDataModel.curUploadFileType == uploadFileTypeVideo){
-        uploadingVideoName = [uploadFileManager shareInstance].curUploadFileDataModel.filename;
-    }
+//    if([uploadFileManager shareInstance].curUploadFileDataModel
+//       && [uploadFileManager shareInstance].curUploadFileDataModel.curUploadFileType == uploadFileTypeVideo){
+//        uploadingVideoName = [uploadFileManager shareInstance].curUploadFileDataModel.filename;
+//    }
     
     if(backupsingVideoName || uploadingVideoName){