|
|
@@ -246,6 +246,14 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
//_curUploadFileDataModel = _fileModelDataArr.lastObject;
|
|
|
}
|
|
|
|
|
|
+// //做个异常处理
|
|
|
+// if(_databaseArr.count == 3){
|
|
|
+// NSMutableArray *uploadIngArr = _databaseArr[0];
|
|
|
+// if(_fileModelDataArr.count != uploadIngArr.count){
|
|
|
+// _databaseArr[0] = _fileModelDataArr;
|
|
|
+// }
|
|
|
+// }
|
|
|
+
|
|
|
|
|
|
if(!_curUploadFileDataModel){
|
|
|
return;
|
|
|
@@ -257,6 +265,9 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
_curUploadFileDataModel.imageData = [NSData dataWithContentsOfFile:pathStr];
|
|
|
|
|
|
if(_curUploadFileDataModel.imageData && _curUploadFileDataModel.imageData.length >0){
|
|
|
+ if(_curUploadFileDataModel.totalBytes == 0){
|
|
|
+ _curUploadFileDataModel.totalBytes = _curUploadFileDataModel.imageData.length;
|
|
|
+ }
|
|
|
|
|
|
[[NSNotificationCenter defaultCenter] postNotificationName:uploadFileBeginNotification object:_curUploadFileDataModel];
|
|
|
return;
|
|
|
@@ -507,14 +518,17 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
//暂停上传完成
|
|
|
- (void)suspendUploadFileFun:(BOOL)isSuspendAll
|
|
|
{
|
|
|
-// if(isSuspendAll){
|
|
|
-//
|
|
|
-// }
|
|
|
|
|
|
if(!_fileModelDataArr || !_curUploadFileDataModel){
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
+ if(isSuspendAll){
|
|
|
+ for (uploadFileDataModel*model in _fileModelDataArr) {
|
|
|
+ model.curUploadStateType = uploadStateSuspend;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
_isSuspendType = YES;
|
|
|
_isUploadIngType = NO;
|
|
|
|
|
|
@@ -536,6 +550,10 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
_fileModelDataArr = [NSMutableArray new];
|
|
|
}
|
|
|
|
|
|
+ for (uploadFileDataModel*model in Arr) {
|
|
|
+ model.curUploadStateType = uploadStateUploading;
|
|
|
+ }
|
|
|
+
|
|
|
if(isAllType)
|
|
|
{
|
|
|
_fileModelDataArr = Arr;
|