Parcourir la source

1.下载逻辑优化,暂停一个后自动下载下一个

huangxiaodong il y a 1 an
Parent
commit
06e7c63b84

+ 22 - 10
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/downloadManager.m

@@ -179,7 +179,7 @@ static downloadManager * cur_downloadManager = nil;
         return;
     }
     
-    _downLoadFileModelDataArr = _databaseArr[0];
+    _downLoadFileModelDataArr = [NSMutableArray arrayWithArray:_databaseArr[0]];
     
     [self beginDownloadFileFun];
 }
@@ -250,13 +250,13 @@ static downloadManager * cur_downloadManager = nil;
         return;
     }
     
-    //做个异常处理
-    if(_databaseArr.count == 3 && _isNewAddTaskType){
-        NSMutableArray *downloadIngArr = _databaseArr[0];
-        if(_downLoadFileModelDataArr.count != downloadIngArr.count){
-            _databaseArr[0] = _downLoadFileModelDataArr;
-        }
-    }
+//    //做个异常处理
+//    if(_databaseArr.count == 3 && _isNewAddTaskType){
+//        NSMutableArray *downloadIngArr = _databaseArr[0];
+//        if(_downLoadFileModelDataArr.count != downloadIngArr.count){
+//            _databaseArr[0] = [NSMutableArray arrayWithArray:_downLoadFileModelDataArr];
+//        }
+//    }
     
     if(![self checkFreeDiskSpaceInBytesIsOK:_curDownloadFileModel.length]){
         mainBlock(^{
@@ -398,7 +398,15 @@ static downloadManager * cur_downloadManager = nil;
         for (couldPhoneFileModel *couldPhoneFileMod in _downLoadFileModelDataArr) {
             couldPhoneFileMod.curDownloadStateType = downloadStateSuspend;
         }
+        [_downLoadFileModelDataArr removeAllObjects];
         
+        [[NSNotificationCenter defaultCenter] postNotificationName:downloadFileSuspendAllNotification object:nil];
+    }
+    else{
+        [_downLoadFileModelDataArr removeObject:_curDownloadFileModel];
+        
+        _reDownloadIngSelectIndex = -1;
+        [self beginDownloadFileFun];
     }
 }
 
@@ -411,7 +419,7 @@ static downloadManager * cur_downloadManager = nil;
     if(isAllType)
     {
         _isNewAddTaskType = YES;
-        _downLoadFileModelDataArr = Arr;
+        _downLoadFileModelDataArr = [NSMutableArray arrayWithArray:Arr];
         _reDownloadIngSelectIndex = -1;
         [self beginDownloadFileFun];
         return;
@@ -421,7 +429,11 @@ static downloadManager * cur_downloadManager = nil;
     _reDownloadIngSelectIndex = 0;
     
     NSMutableArray *curArr = [NSMutableArray arrayWithArray:Arr];
-    _downLoadFileModelDataArr = curArr;
+    //_downLoadFileModelDataArr = curArr;
+    for (uploadFileDataModel*addModel in curArr){
+        [_downLoadFileModelDataArr insertObject:addModel atIndex:0];
+        [self beginDownloadFileFun];
+    }
     
 //    for (uploadFileDataModel*addModel in Arr) {
 //