|
@@ -149,8 +149,12 @@ static boxDownloadFileManager * cur_boxDownloadFileShareInstance = nil;
|
|
|
KWeakSelf
|
|
|
//[ShareFileDataModel bg_saveOrUpdateArray:arr];
|
|
|
[ShareFileDataModel bg_saveOrUpdateArrayAsync:addTaskArr complete:^(BOOL isSuccess) {
|
|
|
- [weakSelf beginDownloadFilesByUrls:addTaskArr];
|
|
|
- complete(isSuccess);
|
|
|
+ //保存完成重新读取数据库 这样下载中的任务才会完整
|
|
|
+ [weakSelf getDataInDatabaseFun:YES complete:^(NSMutableArray * _Nonnull Arr) {
|
|
|
+ [weakSelf beginDownloadFilesByUrls:addTaskArr];
|
|
|
+ complete(YES);
|
|
|
+ }];
|
|
|
+
|
|
|
}];
|
|
|
}
|
|
|
else{//任务下载中
|
|
@@ -399,15 +403,15 @@ static boxDownloadFileManager * cur_boxDownloadFileShareInstance = nil;
|
|
|
|
|
|
if(_databaseArr && _databaseArr.count == 3 ){
|
|
|
NSMutableArray *ingArr = _databaseArr[0];
|
|
|
+ HLog(@"%@",ingArr)
|
|
|
for (ShareFileDataModel*dataModel in ingArr) {
|
|
|
HLog(@"22222222 %@\n%@",urlString,dataModel.fileUrl);
|
|
|
if([urlString isEqualToString:dataModel.fileUrl]){
|
|
|
- [self handleDatabaseArrByDelete:dataModel];
|
|
|
|
|
|
dataModel.downloadBoxStateType = downloadBoxStateFail;
|
|
|
-
|
|
|
dataModel.failMsg = NSLocalizedString(@"File_download_error_404",nil);
|
|
|
|
|
|
+ //失败里面添加
|
|
|
NSMutableArray *failArr = _databaseArr[2];
|
|
|
[failArr insertObject:dataModel atIndex:0];
|
|
|
|
|
@@ -415,6 +419,8 @@ static boxDownloadFileManager * cur_boxDownloadFileShareInstance = nil;
|
|
|
[dataModel bg_saveOrUpdateAsync:^(BOOL isSuccess) {
|
|
|
|
|
|
}];
|
|
|
+
|
|
|
+ [self deteleModel:dataModel inArr:ingArr];
|
|
|
break;
|
|
|
}
|
|
|
}
|