|
@@ -271,7 +271,7 @@
|
|
_curUploadFileDataModel = nil;
|
|
_curUploadFileDataModel = nil;
|
|
|
|
|
|
if(_fileModelDataArr.count == 0){
|
|
if(_fileModelDataArr.count == 0){
|
|
- //[self didUploadAllTaskDoneFun];
|
|
|
|
|
|
+ [self didUploadAllTaskDoneFun];
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -409,9 +409,12 @@
|
|
[[nasUploadManager shareInstance] beginUploadDataBy:_curUploadFileDataModel success:^(id _Nonnull responseObject) {
|
|
[[nasUploadManager shareInstance] beginUploadDataBy:_curUploadFileDataModel success:^(id _Nonnull responseObject) {
|
|
weakSelf.curUploadFileDataModel.curUploadStateType = uploadStateDone;
|
|
weakSelf.curUploadFileDataModel.curUploadStateType = uploadStateDone;
|
|
[weakSelf nasUploadFileChangeingOneFileFunBy:weakSelf.curUploadFileDataModel];
|
|
[weakSelf nasUploadFileChangeingOneFileFunBy:weakSelf.curUploadFileDataModel];
|
|
|
|
+ [weakSelf uploadFileDoneOneFun];
|
|
|
|
+
|
|
} faild:^(NSError * _Nonnull error) {
|
|
} faild:^(NSError * _Nonnull error) {
|
|
weakSelf.curUploadFileDataModel.curUploadStateType = uploadStateFail;
|
|
weakSelf.curUploadFileDataModel.curUploadStateType = uploadStateFail;
|
|
[weakSelf nasUploadFileChangeingOneFileFunBy:weakSelf.curUploadFileDataModel];
|
|
[weakSelf nasUploadFileChangeingOneFileFunBy:weakSelf.curUploadFileDataModel];
|
|
|
|
+ [weakSelf uploadFileFailOneFun];
|
|
}];
|
|
}];
|
|
}
|
|
}
|
|
|
|
|
|
@@ -496,4 +499,23 @@
|
|
[lock unlock];
|
|
[lock unlock];
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+#pragma mark 上传完成一个任务
|
|
|
|
+- (void)uploadFileDoneOneFun
|
|
|
|
+{
|
|
|
|
+ [self beginUploadFileFun];
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+#pragma mark 上传失败一个任务
|
|
|
|
+- (void)uploadFileFailOneFun
|
|
|
|
+{
|
|
|
|
+ [self beginUploadFileFun];
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+#pragma mark 上传完成所有任务
|
|
|
|
+- (void)didUploadAllTaskDoneFun
|
|
|
|
+{
|
|
|
|
+ self->_isUploadIngType = NO;
|
|
|
|
+ self->_curUploadFileDataModel = nil;
|
|
|
|
+ [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileAllTaskDoneNotification object:nil];
|
|
|
|
+}
|
|
@end
|
|
@end
|