|
@@ -183,7 +183,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
// 直接得到最终的 NSData 数据
|
|
|
if (imageData) {
|
|
|
curModel.imageData = imageData;
|
|
|
- [cachesFileManager getFileNameWithContent:curModel.imageData fileName:curModel.videoFirstImageName type:uploadFileTypeImage];;
|
|
|
+ [cachesFileManager getFileNameWithContent:curModel.imageData fileName:curModel.videoFirstImageName type:uploadFileTypeImage];
|
|
|
}
|
|
|
}];
|
|
|
|
|
@@ -533,6 +533,20 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
|
|
|
}
|
|
|
|
|
|
+//修改文件上传的状态
|
|
|
+- (void)changeUploadState:(uploadStateType)curUploadStateType withModelArr:(NSArray*)modelArr complete:(custom_complete_B)complete
|
|
|
+{
|
|
|
+
|
|
|
+ for (uploadFileDataModel * model in modelArr) {
|
|
|
+ model.curUploadStateType = curUploadStateType;
|
|
|
+ }
|
|
|
+
|
|
|
+ [uploadFileDataModel bg_saveOrUpdateArrayAsync:modelArr complete:^(BOOL isSuccess) {
|
|
|
+ complete(YES);
|
|
|
+ }];
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
|
|
|
- (void)handleDatabaseArrByDelete:(uploadFileDataModel*)delModel
|
|
|
{
|
|
@@ -647,15 +661,9 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
_isSuspendType = YES;
|
|
|
_isUploadIngType = NO;
|
|
|
|
|
|
- NSEnumerator *curArr = [_fileModelDataArr reverseObjectEnumerator];
|
|
|
- for (uploadFileDataModel*model in curArr) {
|
|
|
- [self changeUploadFileState:uploadStateSuspend withDidUploadBytes:model.didUploadBytes withModel:model complete:^(BOOL isSuccess) {
|
|
|
-
|
|
|
- }];
|
|
|
- }
|
|
|
-
|
|
|
- [_fileModelDataArr removeAllObjects];
|
|
|
-
|
|
|
+ [self changeUploadState:uploadStateSuspend withModelArr:_fileModelDataArr complete:^(BOOL isSuccess) {
|
|
|
+ [self->_fileModelDataArr removeAllObjects];
|
|
|
+ }];
|
|
|
}
|
|
|
else{
|
|
|
|
|
@@ -678,12 +686,19 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
_fileModelDataArr = [NSMutableArray new];
|
|
|
}
|
|
|
|
|
|
+ _isSuspendType = NO;
|
|
|
+
|
|
|
for (uploadFileDataModel*model in Arr) {
|
|
|
model.curUploadStateType = uploadStateUploading;
|
|
|
}
|
|
|
|
|
|
- _isSuspendType = NO;
|
|
|
|
|
|
+ [self changeUploadState:uploadStateUploading withModelArr:Arr complete:^(BOOL isSuccess) {
|
|
|
+ [self reUploadFileSecondBy:Arr withAll:isAllType];
|
|
|
+ }];
|
|
|
+}
|
|
|
+
|
|
|
+- (void)reUploadFileSecondBy:(NSMutableArray*)Arr withAll:(BOOL)isAllType{
|
|
|
if(isAllType)
|
|
|
{
|
|
|
_isNewAddTaskType = YES;
|
|
@@ -707,43 +722,10 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
[_fileModelDataArr insertObject:addModel atIndex:0];
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-// for (uploadFileDataModel*addModel in curArr) {
|
|
|
-//
|
|
|
-// BOOL needAddModel = YES;
|
|
|
-//
|
|
|
-// //for (uploadFileDataModel*preModel in _fileModelDataArr)
|
|
|
-// for (int i=0;i< _fileModelDataArr.count;i++)
|
|
|
-// {
|
|
|
-// uploadFileDataModel*preModel = _fileModelDataArr[i];
|
|
|
-//
|
|
|
-// if(addModel.bg_id.integerValue == preModel.bg_id.integerValue
|
|
|
-// || [addModel.localIdentifier isEqualToString:preModel.localIdentifier])
|
|
|
-// {
|
|
|
-// needAddModel = NO;
|
|
|
-//
|
|
|
-// if(_reUploadIngSelectIndex == 0){
|
|
|
-// _reUploadIngSelectIndex = i;
|
|
|
-//
|
|
|
-// if(i==0){
|
|
|
-// _reUploadIngSelectIndex = -1;
|
|
|
-// }
|
|
|
-// }
|
|
|
-//
|
|
|
-// break;
|
|
|
-// }
|
|
|
-// }
|
|
|
-//
|
|
|
-// if(needAddModel){
|
|
|
-// [_fileModelDataArr addObject:addModel];
|
|
|
-// [self handleDatabaseArrAddModelInUploading:addModel];
|
|
|
-// }
|
|
|
-// }
|
|
|
-
|
|
|
- //[_fileModelDataArr addObjectsFromArray:Arr];
|
|
|
[self beginUploadFileFun];
|
|
|
}
|
|
|
|
|
|
+
|
|
|
- (void)uploadFileDoneFun
|
|
|
{
|
|
|
long totalSizeByte = _curUploadFileDataModel.totalBytes;
|