1.下载逻辑优化

创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -6111,7 +6111,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -6169,7 +6169,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.4.3;
+				MARKETING_VERSION = 1.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -6193,7 +6193,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -6251,7 +6251,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.4.3;
+				MARKETING_VERSION = 1.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

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

@@ -600,7 +600,7 @@
         
         NSMutableArray *curLoadIngArr = Arr[0];
         //不是上传视频和进来的  所以上传状态（上传中和等待）改为暂停
-        if(![nasDownloadManager shareManager].isDownLoadIngType){
+        if(![nasDownloadManager shareManager].isDownLoadIngType && isRegetType){
 //            for (couldPhoneFileModel * curModel in curLoadIngArr) {
 //                curModel.curDownloadStateType = downloadStateSuspend;
 //            }

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

@@ -69,46 +69,7 @@ static nasDownloadFileManager * cur_nasDownloadFileManager = nil;
 
 #pragma mark 删除多余的任务 比如数据删除了 但是任务还在
 - (void)checkDownloadTaskFun{
-//    NSArray *allDownItemArr = [YCDownloadManager downloadList];
-//
-//    NSArray* downloadingArr = nil;
-//    NSArray* downloadingFail = nil;
-//    if(_databaseArr && _databaseArr.count == 3){
-//        downloadingArr = _databaseArr[0];
-//        downloadingFail = _databaseArr[2];
-//    }
-//
-//    for (YCDownloadItem *item in allDownItemArr) {
-//
-//        BOOL isNeedStopType = YES;
-//
-//        //解码
-//        NSString * urlString = [item.downloadURL stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-//
-//        if(downloadingArr && downloadingArr.count > 0){
-//            for (couldPhoneFileModel*dataModel in downloadingArr) {
-//                if([urlString isEqualToString:dataModel.fileUrl]){
-//                    isNeedStopType = NO;
-//                }
-//            }
-//        }
-//
-//        if(downloadingFail && downloadingFail.count > 0){
-//            for (couldPhoneFileModel*dataModel in downloadingFail) {
-//                if([urlString isEqualToString:dataModel.fileUrl]){
-//                    if(item.downloadedSize >0){
-//                        isNeedStopType = NO;
-//                    }
-//                }
-//            }
-//        }
-//
-//        if(isNeedStopType){
-//            HLog(@"停止多的下载任务：%@",item.downloadURL);
-//            [YCDownloadManager stopDownloadWithItem:item];
-//        }
-//
-//    }
+    
 }
 
 //添加保存记录
@@ -133,7 +94,7 @@ static nasDownloadFileManager * cur_nasDownloadFileManager = nil;
     
     for (couldPhoneFileModel*model in taskArr) {
         BOOL canAdd = YES;
-        
+        HLog(@"正在遍历下载数组 看是否有任务重复")
         if(downloadingArr.count > 0){
             for (couldPhoneFileModel*downloadingModel in downloadingArr) {
                 if([downloadingModel.fileUrl isEqualToString:model.fileUrl]){
@@ -246,12 +207,16 @@ static nasDownloadFileManager * cur_nasDownloadFileManager = nil;
 #pragma mark  处理删除内存数据
 - (void)deteleModel:(couldPhoneFileModel*)delModel inArr:(NSMutableArray*)delArr{
     
-    for (couldPhoneFileModel *dataModel in delArr) {
-        if(delModel.bg_id.integerValue == dataModel.bg_id.integerValue){
-            [delArr removeObject:dataModel];
-            break;
-        }
-    }
+        HLog(@"删除某个指定的下载对象 %@",delModel.name)
+        [delArr removeObject:delModel];
+    
+//    for (couldPhoneFileModel *dataModel in delArr) {
+//        if(delModel.bg_id.integerValue == dataModel.bg_id.integerValue){
+//            HLog(@"正在遍历下载的 数组 并且删除某个数据")
+//            [delArr removeObject:dataModel];
+//            break;
+//        }
+//    }
     
 }
 
@@ -303,6 +268,7 @@ static nasDownloadFileManager * cur_nasDownloadFileManager = nil;
         NSMutableArray *ingArr = _databaseArr[0];
         for (couldPhoneFileModel* model in failArr) {
             if (dataModel.bg_id.integerValue == model.bg_id.integerValue) {
+                HLog(@"正在遍历下载失败数组 并且删除某个数据")
                 [failArr removeObject:model];
                 [ingArr addObject:dataModel];
                 break;
@@ -349,6 +315,8 @@ static nasDownloadFileManager * cur_nasDownloadFileManager = nil;
 #pragma mark 下载完成
 - (void)downloadTaskFinishedNoti:(NSNotification *)notification
 {
+    HLog(@"downloadTaskFinishedNoti")
+    
     customDownloadOperation *model = notification.userInfo.allValues.firstObject;
 
     if(!model)return;
@@ -360,12 +328,14 @@ static nasDownloadFileManager * cur_nasDownloadFileManager = nil;
         [self saveFileInfoWithDict:dataDict with:model.url];
         
         [self handldDownloadDoneDataBy:model];
+        
+        HLog(@"handldDownloadDoneDataBy done")
     }
     else if (model.downloadState == customDownloadStateFailed){
         [self handldDownloadFailDataBy:model];
     }
     
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [[NSNotificationCenter defaultCenter] postNotificationName:nasDownloadTaskFinishedNotification object:model];
         
         [[webRtcManager shareManager] NasDownloadTaskFinishedNoti:model];
@@ -381,26 +351,51 @@ static nasDownloadFileManager * cur_nasDownloadFileManager = nil;
     NSString * urlString = [model.url stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
 
     if(_databaseArr && _databaseArr.count == 3 ){
+        HLog(@"正在遍历下载完成数组 开始 %@",model.fileName)
         NSMutableArray *ingArr = _databaseArr[0];
+        couldPhoneFileModel*curDataModel = nil;
         for (couldPhoneFileModel*dataModel in ingArr) {
-            HLog(@"22222222 %@\n%@",urlString,dataModel.fileUrl);
+            //HLog(@"22222222 %@\n%@",urlString,dataModel.fileUrl);
             if([urlString isEqualToString:dataModel.fileUrl]){
         
-                dataModel.curDownloadStateType = downloadStateDone;
-                
-                NSMutableArray *doneArr = _databaseArr[1];
-                [doneArr insertObject:dataModel atIndex:0];
-                
-                //更新数据库
-                [dataModel bg_saveOrUpdateAsync:^(BOOL isSuccess) {
-                                    
-                }];
+//                dataModel.curDownloadStateType = downloadStateDone;
+//                HLog(@"正在遍历下载完成数组 并且添加 %@",dataModel.name)
+//                NSMutableArray *doneArr = _databaseArr[1];
+//                [doneArr insertObject:dataModel atIndex:0];
+//                
+//                //更新数据库
+//                [dataModel bg_saveOrUpdateAsync:^(BOOL isSuccess) {
+//                                    
+//                }];
                 
-                [self deteleModel:dataModel inArr:ingArr];
+                curDataModel = dataModel;
+                //[self deteleModel:dataModel inArr:ingArr];
                 
                 break;
             }
         }
+        
+        HLog(@"正在遍历下载完成数组 结束")
+        if(curDataModel){
+            curDataModel.curDownloadStateType = downloadStateDone;
+            HLog(@"正在遍历下载完成数组 并且添加 %@",curDataModel.name)
+            NSMutableArray *doneArr = _databaseArr[1];
+            [doneArr insertObject:curDataModel atIndex:0];
+            
+            HLog(@"开始删除某个指定的下载对象 %@",curDataModel.name)
+            [ingArr removeObject:curDataModel];
+            HLog(@"完成删除某个指定的下载对象 %@",curDataModel.name)
+            
+            //更新数据库
+//            [curDataModel bg_saveOrUpdateAsync:^(BOOL isSuccess) {
+//                HLog(@"33333")
+//            }];
+            
+            [curDataModel bg_saveOrUpdate];
+            
+            HLog(@"44444")
+        }
+        
     }
 
 }
@@ -421,6 +416,7 @@ static nasDownloadFileManager * cur_nasDownloadFileManager = nil;
                 
                 dataModel.curDownloadStateType = downloadStateFail;
                 dataModel.failMsg = NSLocalizedString(@"File_download_error_404",nil);
+                HLog(@"正在遍历下载失败数组 并且删除某个数据")
                 
                 //失败里面添加
                 NSMutableArray *failArr = _databaseArr[2];
@@ -489,9 +485,10 @@ static nasDownloadFileManager * cur_nasDownloadFileManager = nil;
 - (void)reDownloadFileFunBy:(NSMutableArray*)arr withAll:(BOOL)isAllType
 {
  
+    HLog(@"reDownloadFileFunBy --- %ld",arr.count)
+    KWeakSelf
     if(isAllType){
-        //[[mixDownloadManager shareManager] startAllDownloadTask];
-
+        
         if (_databaseArr && _databaseArr.count == 3) {
         
             NSMutableArray *downloadingArr = _databaseArr[0];
@@ -502,43 +499,61 @@ static nasDownloadFileManager * cur_nasDownloadFileManager = nil;
                 model.curDownloadStateType = downloadStateUploading;
                 [ReverseOrderArr addObject:model];
             }
-            
-//            for (couldPhoneFileModel*model in downloadingArr) {
-//                model.downloadBoxStateType = downloadBoxStateDownloadloading;
-//            }
-            
+
             //这里处理重新下载
-            [self beginDownloadFilesByUrls:ReverseOrderArr];
-            
+            [weakSelf beginDownloadFilesByUrls:ReverseOrderArr];
             
             if(downloadingArr.count > 0){
-                [couldPhoneFileModel bg_updateArrayAsync:downloadingArr complete:^(BOOL isSuccess) {
-                                
+                [couldPhoneFileModel bg_saveOrUpdateArrayAsync:downloadingArr complete:^(BOOL isSuccess) {
+                
                 }];
             }
         }
     }
-    else{
+    else
+    {
+    
+        NSMutableArray *downloadingArr = arr;
+        NSMutableArray *ReverseOrderArr = [NSMutableArray new];
         
-        couldPhoneFileModel* dataModel = nil;
-        if(arr && arr.count > 0){
-            dataModel = arr.firstObject;
-            
-            //修改数据库状态
-            dataModel.curDownloadStateType = downloadStateUploading;
-            [couldPhoneFileModel bg_saveOrUpdateArrayAsync:@[dataModel] complete:^(BOOL isSuccess) {
-                            
-            }];
-        }else{
-            return;
+        for (NSInteger i = downloadingArr.count -1; i>=0; i--) {
+            couldPhoneFileModel*model = downloadingArr[i];
+            model.curDownloadStateType = downloadStateUploading;
+            [ReverseOrderArr addObject:model];
         }
-        NSString *urlString = dataModel.fileUrl;
-        NSString *requestURLEncodedString = [urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-        HLog(@"%@",urlString);
+                
+        //这里处理重新下载
+        [self beginDownloadFilesByUrls:ReverseOrderArr];
         
-        [[nasDownloadManager shareManager] startDownLoadWithUrl:requestURLEncodedString];
         
+        if(downloadingArr.count > 0){
+            [couldPhoneFileModel bg_saveOrUpdateArrayAsync:downloadingArr complete:^(BOOL isSuccess) {
+
+            }];
+        }
     }
+    
+//    {
+//        
+//        couldPhoneFileModel* dataModel = nil;
+//        if(arr && arr.count > 0){
+//            dataModel = arr.firstObject;
+//            
+//            //修改数据库状态
+//            dataModel.curDownloadStateType = downloadStateUploading;
+//            [couldPhoneFileModel bg_saveOrUpdateArrayAsync:@[dataModel] complete:^(BOOL isSuccess) {
+//                            
+//            }];
+//        }else{
+//            return;
+//        }
+//        NSString *urlString = dataModel.fileUrl;
+//        NSString *requestURLEncodedString = [urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+//        HLog(@"%@",urlString);
+//        
+//        [[nasDownloadManager shareManager] startDownLoadWithUrl:requestURLEncodedString];
+//        
+//    }
 }
 
 #pragma mark 重新开始下载 第一次进去传输列表是用

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

@@ -70,6 +70,8 @@
         }
     }
     
+    //HLog(@"beginDownload downloadWaitingUrlArr:%@ --- %ld -- \n downloadingOperationArr:%@ ----%ld --%ld --- urls:%@",self.downloadWaitingUrlArr,self.downloadWaitingUrlArr.count,self.downloadingOperationArr,self.downloadingOperationArr.count,_maxDownLoadCount,urls)
+    
     //启动下载
     [self beginDownload];
 }
@@ -78,6 +80,8 @@
 - (void)beginDownload
 {
     @synchronized (self) {
+        //HLog(@"beginDownload downloadWaitingUrlArr:%@ --- %ld -- \n downloadingOperationArr:%@ ----%ld --%ld",self.downloadWaitingUrlArr,self.downloadWaitingUrlArr.count,self.downloadingOperationArr,self.downloadingOperationArr.count,_maxDownLoadCount)
+        
         if(self.downloadingOperationArr.count == _maxDownLoadCount){
             HLog(@"正在下载的数量达到了最大值 %ld",_maxDownLoadCount)
             return;
@@ -88,6 +92,15 @@
             return;
         }
         
+        //判断手机磁盘空间是否有剩余
+        if(![iTools checkFreeDiskSpaceInBytesIsOK:500*1024*1024]){
+            mainBlock(^{
+                [[iToast makeText:NSLocalizedString(@"phone_space_Insufficient",nil)] show];
+            });
+            
+            return;
+        }
+        
         NSInteger canAddTaskNumber = _maxDownLoadCount - self.downloadingOperationArr.count;
         
         for (int i=0; i<canAddTaskNumber; i++) {
@@ -370,6 +383,18 @@ totalBytesExpectedToSend:(int64_t)totalBytesExpectedToSend {
     }
     operation.totalSize = operation.currentSize + response.expectedContentLength;
     
+    //判断手机磁盘空间是否有剩余
+    if(![iTools checkFreeDiskSpaceInBytesIsOK:operation.totalSize + 500*1024*1024]){
+        
+        operation.downloadState = customDownloadStateFailed;
+        [dataTask cancel];
+        
+        mainBlock(^{
+            [[iToast makeText:NSLocalizedString(@"phone_space_Insufficient",nil)] show];
+        });
+        return NO;
+    }
+    
     // 创建空的文件夹
     if (operation.currentSize == 0) {
         // 创建空的文件
@@ -502,6 +527,7 @@ totalBytesExpectedToSend:(int64_t)totalBytesExpectedToSend {
     if (operation.preNotTimeInterval <= 0
         || timeDiff > 0.8 ) {
         
+        HLog(@"下载发送刷新通知：%f",timeDiff);
         operation.preNotTimeInterval = curTime;
         [[NSNotificationCenter defaultCenter] postNotificationName:nasDownloadTaskExeing object:nil userInfo:@{@"operation" : operation}];
     }