|
|
@@ -224,14 +224,21 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
|
|
|
- (void)beginUploadFileFun
|
|
|
{
|
|
|
- if(_isUploadIngType){
|
|
|
+ if(_isUploadIngType && _reUploadIngSelectIndex <= 0){
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
_isSuspendType = NO;
|
|
|
_isUploadIngType = YES;
|
|
|
|
|
|
- _curUploadFileDataModel = _fileModelDataArr.firstObject;
|
|
|
+ if(_reUploadIngSelectIndex > 0 && _reUploadIngSelectIndex < _fileModelDataArr.count){
|
|
|
+ _curUploadFileDataModel = _fileModelDataArr[_reUploadIngSelectIndex];
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ _curUploadFileDataModel = _fileModelDataArr.firstObject;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
if(!_curUploadFileDataModel){
|
|
|
return;
|
|
|
@@ -450,15 +457,30 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
_fileModelDataArr = [NSMutableArray new];
|
|
|
}
|
|
|
|
|
|
+ _reUploadIngSelectIndex = 0;
|
|
|
+
|
|
|
for (uploadFileDataModel*addModel in Arr) {
|
|
|
|
|
|
BOOL needAddModel = YES;
|
|
|
|
|
|
- for (uploadFileDataModel*preModel in _fileModelDataArr) {
|
|
|
+ //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;
|
|
|
}
|
|
|
}
|