|
@@ -645,16 +645,16 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
}
|
|
|
|
|
|
//暂停上传完成
|
|
|
-- (void)suspendUploadFileFun:(BOOL)isSuspendAll
|
|
|
+- (void)suspendUploadFileFun:(BOOL)isSuspendAll withModel:(uploadFileDataModel*)model
|
|
|
{
|
|
|
|
|
|
if(!_fileModelDataArr || !_curUploadFileDataModel){
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileSuspendNotification object:nil];
|
|
|
-
|
|
|
if(isSuspendAll){
|
|
|
+ [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileSuspendNotification object:nil];
|
|
|
+
|
|
|
for (uploadFileDataModel*model in _fileModelDataArr) {
|
|
|
model.curUploadStateType = uploadStateSuspend;
|
|
|
}
|
|
@@ -666,13 +666,23 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
}];
|
|
|
}
|
|
|
else{
|
|
|
-
|
|
|
- _curUploadFileDataModel.curUploadStateType = uploadStateSuspend;
|
|
|
- [self changeUploadFileState:uploadStateSuspend withDidUploadBytes:_curUploadFileDataModel.didUploadBytes withModel:_curUploadFileDataModel complete:^(BOOL isSuccess) {
|
|
|
+ uploadFileDataModel *curModel = _curUploadFileDataModel;
|
|
|
+ if(model){
|
|
|
+ curModel = model;
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileSuspendNotification object:nil];
|
|
|
+ }
|
|
|
+
|
|
|
+ curModel.curUploadStateType = uploadStateSuspend;
|
|
|
+ [self changeUploadState:uploadStateSuspend withModelArr:@[curModel] complete:^(BOOL isSuccess) {
|
|
|
+ [self->_fileModelDataArr removeObject:model];
|
|
|
+
|
|
|
+ if(curModel.bg_id.integerValue == self->_curUploadFileDataModel.bg_id.integerValue){
|
|
|
+ //开启下一个任务
|
|
|
+ [self beginUploadFileFun];
|
|
|
+ }
|
|
|
|
|
|
- [self->_fileModelDataArr removeObject:self->_curUploadFileDataModel];
|
|
|
- //处理完暂停某一个后 开启下一个任务
|
|
|
- [self beginUploadFileFun];
|
|
|
}];
|
|
|
|
|
|
}
|