1.上传编辑修改

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

@@ -467,7 +467,20 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
 - (void)handleDatabaseArrByDelete:(uploadFileDataModel*)delModel
 {
     if(_databaseArr && _databaseArr.count == 3 ){
-        NSMutableArray *uploadingArr = _databaseArr[0];
+        
+        NSMutableArray *uploadingArr = nil;
+        
+        if(delModel.curUploadStateType == uploadStateUploading
+           ||delModel.curUploadStateType == uploadStateSuspend){
+            uploadingArr = _databaseArr[0];
+        }
+        else if(delModel.curUploadStateType == uploadStateDone)
+        {
+            uploadingArr = _databaseArr[1];
+        }
+        else{
+            uploadingArr = _databaseArr[2];
+        }
         
         for (uploadFileDataModel *baseUploadFileDataMod in uploadingArr) {
             if(delModel.bg_id.integerValue == baseUploadFileDataMod.bg_id.integerValue){

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

@@ -136,6 +136,10 @@
         [weakSelf didClikRightButInUploadTableVieFunBy:section];
     };
 
+    _leftTableView.didNeedRefreshGetDatabaseFun = ^{
+        [weakSelf RefreshUploadViewFun];
+    };
+    
     _midTableView = [[uploadFileRecordTableView alloc] init];
     _midTableView.tag = 101;
     [_uploadFileRecordBgScorllV addSubview:_midTableView];
@@ -239,17 +243,18 @@
 #pragma mark 底部删除点击
 -(void)didClickBottomDeleteFun
 {
-    NSMutableArray *selectModelArr = nil;
-    if(_selectIndex == 1){
-        selectModelArr = _leftTableView.selectModelArr;
-    }
-    else if(_selectIndex == 2){
-        selectModelArr = _midTableView.selectModelArr;
-        [_midTableView deleteModelOneByOneFun];
-    }
-    else if(_selectIndex == 3){
-        //selectModelArr = _rightTableView.selectModelArr;
-    }
+    NSMutableArray *selectModelArr = _leftTableView.selectModelArr;
+    
+//    if(_selectIndex == 1){
+//        selectModelArr = _leftTableView.selectModelArr;
+//    }
+//    else if(_selectIndex == 2){
+//        selectModelArr = _midTableView.selectModelArr;
+//        [_midTableView deleteModelOneByOneFun];
+//    }
+//    else if(_selectIndex == 3){
+//        //selectModelArr = _rightTableView.selectModelArr;
+//    }
     
     if(!selectModelArr || selectModelArr.count== 0){
         
@@ -292,15 +297,17 @@
 
 -(void)didClickBottomDeleteFunAfterAleartFun
 {
-    if(_selectIndex == 1){
-        [_leftTableView deleteModelOneByOneFun];
-    }
-    else if(_selectIndex == 2){
-        [_midTableView deleteModelOneByOneFun];
-    }
-    else if(_selectIndex == 3){
-        //[_rightTableView deleteModelOneByOneFun];
-    }
+    [_leftTableView deleteModelOneByOneFun];
+    
+//    if(_selectIndex == 1){
+//        [_leftTableView deleteModelOneByOneFun];
+//    }
+//    else if(_selectIndex == 2){
+//        [_midTableView deleteModelOneByOneFun];
+//    }
+//    else if(_selectIndex == 3){
+//        //[_rightTableView deleteModelOneByOneFun];
+//    }
 }
 
 #pragma mark 头部点击 背景滚动

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

@@ -29,6 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,copy) void (^didClickReUploadBlock)(uploadFileDataModel* model);
 
 @property (nonatomic,copy) void (^didClickSectionHeadViewRightButton)(NSInteger section);
+@property (nonatomic,copy) void (^didNeedRefreshGetDatabaseFun)(void);
 
 -(void)reloadDataFun;
 - (void)RefreshAllDataFun;

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

@@ -387,7 +387,14 @@
 #pragma mark  点击全选
 - (void)setIsSelectAllType:(BOOL)isSelectAllType
 {
-    _selectModelArr = [NSMutableArray arrayWithArray:_curDataArr];
+    //_selectModelArr = [NSMutableArray arrayWithArray:_curDataArr];
+    
+    _selectModelArr = [NSMutableArray new];
+    
+    [_selectModelArr addObjectsFromArray:_uploadingArr];
+    [_selectModelArr addObjectsFromArray:_uploadfailArr];
+    [_selectModelArr addObjectsFromArray:_uploadDoneArr];
+    
     [self reloadDataFun];
 }
 
@@ -438,14 +445,24 @@
         HLog(@"isSuccess:%d",isSuccess);
         
         if(isSuccess){
-            NSMutableArray *curArr = self->_curDataArr;
-            [curArr removeObjectsInArray:self->_selectModelArr];
-            [weakSelf reloadDataFun];
+//            NSMutableArray *curArr = self->_curDataArr;
+//            [curArr removeObjectsInArray:self->_selectModelArr];
+//            [weakSelf reloadDataFun];
             self->_selectModelArr = [NSMutableArray new];
+            
+            //重新拿数据
+            [weakSelf refreshGetDatabaseFun];
         }
     }];
 }
 
+#pragma mark 删除后重新拿数据
+- (void)refreshGetDatabaseFun
+{
+    if(_didNeedRefreshGetDatabaseFun){
+        _didNeedRefreshGetDatabaseFun();
+    }
+}
 
 #pragma mark 处理上传中的 状态点击事件
 - (void)handleUploadingStateTapFunBy:(BOOL)isSuspendType with:(uploadFileDataModel*)model