|
@@ -284,6 +284,12 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
_curUploadFileDataModel.imageData = nil;
|
|
|
_curUploadFileDataModel.videoData = nil;
|
|
|
_curUploadFileDataModel = nil;
|
|
|
+
|
|
|
+ if(_fileModelDataArr.count == 0){
|
|
|
+ [self didUploadAllTaskDoneFun];
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
if(_reUploadIngSelectIndex > 0 && _reUploadIngSelectIndex < _fileModelDataArr.count){
|
|
|
_curUploadFileDataModel = _fileModelDataArr[_reUploadIngSelectIndex];
|
|
|
}
|
|
@@ -738,8 +744,6 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
[self beginUploadFileFun];
|
|
|
}
|
|
|
else{
|
|
|
- self->_isUploadIngType = NO;
|
|
|
- self->_curUploadFileDataModel = nil;
|
|
|
[self didUploadAllTaskDoneFun];
|
|
|
}
|
|
|
}];
|
|
@@ -939,9 +943,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
|
|
|
- (BOOL)checkUploadingFun
|
|
|
{
|
|
|
- if(!_curUploadFileDataModel
|
|
|
- || _curUploadFileDataModel.curUploadStateType == uploadStateDone
|
|
|
- || _curUploadFileDataModel.curUploadStateType == uploadStateSuspend){
|
|
|
+ if(!_curUploadFileDataModel){
|
|
|
return NO;
|
|
|
}
|
|
|
|
|
@@ -975,6 +977,8 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
|
|
|
- (void)didUploadAllTaskDoneFun
|
|
|
{
|
|
|
+ self->_isUploadIngType = NO;
|
|
|
+ self->_curUploadFileDataModel = nil;
|
|
|
[[NSNotificationCenter defaultCenter] postNotificationName:uploadFileAllTaskDoneNotification object:nil];
|
|
|
}
|
|
|
@end
|