1.下载相关优化

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

@@ -24,7 +24,8 @@
 #import "AFNetworkReachabilityManager.h"
 #import "ComontAlretViewController.h"
 #import "uploadFileManager.h"
-#import "downloadManager.h"
+//#import "downloadManager.h"
+#import "nasDownloadFileManager.h"
 //#import "backupsFileManager.h"
 #import "nasBackupsManager.h"
 #import "iPhone.h"
@@ -880,11 +881,14 @@
 //    [uploadFileManager shareInstance].curUploadFileDataModel.curUploadStateType = uploadStateWait;
     
     [[nasUploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
-    [nasUploadFileManager shareInstance].databaseArr = [NSMutableArray new];
+    [nasUploadFileManager shareInstance].databaseArr = nil;
     
-    [[downloadManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
-    [downloadManager shareInstance].databaseArr = [NSMutableArray new];
-    [downloadManager shareInstance].downLoadFileModelDataArr = [NSMutableArray new];
+//    [[downloadManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
+//    [downloadManager shareInstance].databaseArr = [NSMutableArray new];
+//    [downloadManager shareInstance].downLoadFileModelDataArr = [NSMutableArray new];
+    
+    [[nasDownloadFileManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
+    [nasDownloadFileManager shareInstance].databaseArr = nil;
     
     //[[backupsFileManager shareInstance] suspendBackupsFileFun];
     [[nasBackupsManager shareInstance] suspendBackupsFileFun];

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

@@ -12,7 +12,8 @@
 #import "connectDeviceManager.h"
 //#import "uploadFileManager.h"
 #import "nasUploadFileManager.h"
-#import "downloadManager.h"
+//#import "downloadManager.h"
+#import "nasDownloadFileManager.h"
 #import "backupsFileManager.h"
 #import "nasBackupsManager.h"
 #import <TZImageManager.h>
@@ -292,7 +293,8 @@ bool isDownType22 = YES;
     
     //[[uploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
     [[nasUploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
-    [[downloadManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
+    //[[downloadManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
+    [[nasDownloadFileManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
     //[[backupsFileManager shareInstance] suspendBackupsFileFun];
     [[nasBackupsManager shareInstance] suspendBackupsFileFun];
     [[boxDownloadFileManager shareInstance] suspendDownloadFileFun:YES withModel:nil];

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

@@ -293,6 +293,10 @@
     }
     else if(dataModel.curUploadStateType == uploadStateFail){
         
+        if (!_databaseArr || _databaseArr.count != 3) {
+            return;
+        }
+        
         //删除操作导致的失败
         NSMutableArray *ingArr = _databaseArr[0];
         NSInteger count = ingArr.count;
@@ -500,7 +504,7 @@
     NSLock *lock = [NSLock new];
     [lock lock];
     
-    if(!_databaseArr && _databaseArr.count != 3){
+    if (!_databaseArr || _databaseArr.count != 3) {
         return;
     }
     
@@ -626,6 +630,9 @@
     }
     else
     {
+        if (!_databaseArr || _databaseArr.count != 3) {
+            return;
+        }
         uploadingArr = _databaseArr[0];
         for (uploadFileDataModel*preModel in uploadingArr) {
             preModel.curUploadStateType = uploadStateSuspend;

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

@@ -385,18 +385,19 @@
     NSString *downLoadingPath = [NSString stringWithFormat:@"%@/DownLoadFlie",CachesPatch];
     long downLoadingSizeBeforeClear = [iTools folderSizeAtPath:downLoadingPath];
     
-    NSString *downLoadingFileName = nil;
-    if([downloadManager shareInstance].curDownloadFileModel
-       && ([downloadManager shareInstance].curDownloadFileModel.curDownloadStateType == downloadStateUploading
-           ||[downloadManager shareInstance].curDownloadFileModel.curDownloadStateType == downloadStateSuspend)){
-        downLoadingFileName = [[downloadManager shareInstance].curDownloadFileModel getFileNameFun];
-        
-        [self deleteFilesInDirectoryAtPath:downLoadingPath withOutFileName:downLoadingFileName];
-    }
-    else{
-        [[NSFileManager defaultManager] removeItemAtPath:downLoadingPath error:nil];
-    }
+//    NSString *downLoadingFileName = nil;
+//    if([downloadManager shareInstance].curDownloadFileModel
+//       && ([downloadManager shareInstance].curDownloadFileModel.curDownloadStateType == downloadStateUploading
+//           ||[downloadManager shareInstance].curDownloadFileModel.curDownloadStateType == downloadStateSuspend)){
+//        downLoadingFileName = [[downloadManager shareInstance].curDownloadFileModel getFileNameFun];
+//        
+//        [self deleteFilesInDirectoryAtPath:downLoadingPath withOutFileName:downLoadingFileName];
+//    }
+//    else{
+//        [[NSFileManager defaultManager] removeItemAtPath:downLoadingPath error:nil];
+//    }
     
+    [[NSFileManager defaultManager] removeItemAtPath:downLoadingPath error:nil];
     long downLoadingSizeAfterClear = [iTools folderSizeAtPath:downLoadingPath];