1.修改bug

创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/downloadManager.h

@@ -23,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL  isSuspendType;
 @property (nonatomic, assign) BOOL  isDownloadIngType;
 @property (nonatomic, assign) NSInteger  reDownloadIngSelectIndex;
+@property (nonatomic, assign) BOOL  isNewAddTaskType;
 
 +(downloadManager *)shareInstance;
 #pragma mark 读取数据库数据

创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/downloadManager.m

@@ -102,6 +102,8 @@ static downloadManager * cur_downloadManager = nil;
         model.bg_tableName = download_tableName;
     }
     
+    _isNewAddTaskType = YES;
+    
     KWeakSelf
     //查
     [self getDataInDatabaseFun:YES complete:^(NSMutableArray * _Nonnull Arr) {
@@ -210,6 +212,14 @@ static downloadManager * cur_downloadManager = nil;
         return;
     }
     
+    //做个异常处理
+    if(_databaseArr.count == 3 && _isNewAddTaskType){
+        NSMutableArray *downloadIngArr = _databaseArr[0];
+        if(_downLoadFileModelDataArr.count != downloadIngArr.count){
+            _databaseArr[0] = _downLoadFileModelDataArr;
+        }
+    }
+    
     if(![self checkFreeDiskSpaceInBytesIsOK:_curDownloadFileModel.length]){
         mainBlock(^{
             [[iToast makeText:NSLocalizedString(@"phone_space_Insufficient",nil)] show];
@@ -348,43 +358,48 @@ static downloadManager * cur_downloadManager = nil;
     
     if(isAllType)
     {
+        _isNewAddTaskType = YES;
         _downLoadFileModelDataArr = Arr;
         _reDownloadIngSelectIndex = -1;
         [self beginDownloadFileFun];
         return;
     }
     
+    _isNewAddTaskType = NO;
     _reDownloadIngSelectIndex = 0;
     
-    for (uploadFileDataModel*addModel in Arr) {
-        
-        BOOL needAddModel = YES;
-        
-        for (int i=0;i< _downLoadFileModelDataArr.count;i++)
-        {
-            couldPhoneFileModel*preModel = _downLoadFileModelDataArr[i];
-            
-            if(addModel.bg_id.integerValue == preModel.bg_id.integerValue)
-            {
-                needAddModel = NO;
-                
-                if(_reDownloadIngSelectIndex == 0){
-                    _reDownloadIngSelectIndex = i;
-                    
-                    if(i==0){
-                        _reDownloadIngSelectIndex = -1;
-                    }
-                }
-                
-                break;
-            }
-        }
-        
-        if(needAddModel){
-            [_downLoadFileModelDataArr addObject:addModel];
-            _reDownloadIngSelectIndex = _downLoadFileModelDataArr.count -1;
-        }
-    }
+    NSMutableArray *curArr = [NSMutableArray arrayWithArray:Arr];
+    _downLoadFileModelDataArr = curArr;
+    
+//    for (uploadFileDataModel*addModel in Arr) {
+//        
+//        BOOL needAddModel = YES;
+//        
+//        for (int i=0;i< _downLoadFileModelDataArr.count;i++)
+//        {
+//            couldPhoneFileModel*preModel = _downLoadFileModelDataArr[i];
+//            
+//            if(addModel.bg_id.integerValue == preModel.bg_id.integerValue)
+//            {
+//                needAddModel = NO;
+//                
+//                if(_reDownloadIngSelectIndex == 0){
+//                    _reDownloadIngSelectIndex = i;
+//                    
+//                    if(i==0){
+//                        _reDownloadIngSelectIndex = -1;
+//                    }
+//                }
+//                
+//                break;
+//            }
+//        }
+//        
+//        if(needAddModel){
+//            [_downLoadFileModelDataArr addObject:addModel];
+//            _reDownloadIngSelectIndex = _downLoadFileModelDataArr.count -1;
+//        }
+//    }
     
     [self beginDownloadFileFun];
 }

创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/uploadFileManager.h

@@ -33,6 +33,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL  isUploadIngType;
 @property (nonatomic, assign) NSInteger  curUploadModelNumbers;
 @property (nonatomic, assign) NSInteger  reUploadIngSelectIndex;
+
+@property (nonatomic, assign) BOOL  isNewAddTaskType;
 #pragma mark 读取数据库数据
 - (void)getDataInDatabaseFun:(BOOL)isReGet complete:(custom_complete_Arr)complete;
 

创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/uploadFileManager.m

@@ -112,6 +112,8 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
         _fileModelDataArr = [NSMutableArray new];
     }
     
+    _isNewAddTaskType = YES;
+    
     self.curUploadModelNumbers = indexPathsForSelectedItems.count;
     
     NSMutableArray *newUploadTaskArr = [NSMutableArray new];
@@ -231,7 +233,11 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
 //        return;
 //    }
     
-    _isSuspendType = NO;
+    if(_isSuspendType)
+    {
+        return;
+    }
+    
     _isUploadIngType = YES;
     
     
@@ -247,13 +253,13 @@ 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(_databaseArr.count == 3 && _isNewAddTaskType){
+        NSMutableArray *uploadIngArr = _databaseArr[0];
+        if(_fileModelDataArr.count != uploadIngArr.count){
+            _databaseArr[0] = _fileModelDataArr;
+        }
+    }
     
     
     if(!_curUploadFileDataModel){
@@ -579,49 +585,54 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
         model.curUploadStateType = uploadStateUploading;
     }
     
+    _isSuspendType = NO;
+    
     if(isAllType)
     {
+        _isNewAddTaskType = YES;
         _fileModelDataArr = Arr;
         _reUploadIngSelectIndex = -1;
         [self beginUploadFileFun];
         return;
     }
     
+    _isNewAddTaskType = NO;
     _reUploadIngSelectIndex = 0;
     
     NSMutableArray *curArr = [NSMutableArray arrayWithArray:Arr];
+    _fileModelDataArr = curArr;
     
-    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];
-        }
-    }
+//    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];