1.需求 图片 视频选择不需要长按

创维盒子/双子星云手机/Class/Set/previewFile/previewImageOrVideoViewController.m

@@ -513,7 +513,7 @@
 - (void)setViewEditTypeFun
 {
     _isEditType = YES;
-    [_dataCollectionView reloadData];
+    //[_dataCollectionView reloadData];
     
     _curEditTypeHeadView.hidden = NO;
     _curEditTypeBottomView.hidden = NO;
@@ -537,9 +537,24 @@
         model.isSelectType = NO;
     }
     
+//    for (NASFilePicTimeArrModel *timeArrModel in _curNASFilePicModel.data.fileList) {
+//        for (NASFilePicDataArrModel *model in timeArrModel.list) {
+//            model.isSelectType = NO;
+//        }
+//    }
+
     _isEditType = NO;
+    
+    BOOL isNeedReload = NO;
+    if(self->_didSelectListArr.count >0){
+        isNeedReload = YES;
+    }
+    
     [_didSelectListArr removeAllObjects];
-    [_dataCollectionView reloadData];
+    
+    if(isNeedReload){
+        [_dataCollectionView reloadData];
+    }
     
     _curEditTypeHeadView.hidden = YES;
     _curEditTypeBottomView.hidden = YES;
@@ -559,16 +574,24 @@
         NASFilePicTimeArrModel *timeArrModel = _curNASFilePicModel.data.fileList[section];
         if (timeArrModel.list.count > row) {
             NASFilePicDataArrModel * dataModel = timeArrModel.list[row];
-            if(dataModel.isSelectType)
+            dataModel.isSelectType = !dataModel.isSelectType;
+            
+            if(!dataModel.isSelectType)
             {
                 [_didSelectListArr removeObject:dataModel];
+                
+                if(_didSelectListArr.count == 0){
+                    [self userCancelEditTypeFun];
+                }
             }
             else{
                 [_didSelectListArr addObject:dataModel];
+                
+                if(_didSelectListArr.count == 1){
+                    [self setViewEditTypeFun];
+                }
             }
             
-            dataModel.isSelectType = !dataModel.isSelectType;
-            
             [self setEditTypeTitleFun];
             
         }

创维盒子/双子星云手机/Class/Set/previewFile/view/imageCollectionViewCell.m

@@ -50,7 +50,7 @@
     [but setImage:[UIImage imageNamed:@"upload_file_check"] forState:UIControlStateSelected];
     [self.contentView addSubview:but];
     [but addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
-    but.hidden = YES;
+    //but.hidden = YES;
     
     //but.backgroundColor = [UIColor greenColor];
     
@@ -170,14 +170,15 @@
     }];
     
     
-    if(!_isEditType){
-        self.selectButton.hidden = YES;
-    }
-    else{
-        self.selectButton.hidden = NO;
-        self.selectButton.selected = curFileModel.isSelectType;
-    }
+//    if(!_isEditType){
+//        self.selectButton.hidden = YES;
+//    }
+//    else{
+//        self.selectButton.hidden = NO;
+//        self.selectButton.selected = curFileModel.isSelectType;
+//    }
     
+    self.selectButton.selected = curFileModel.isSelectType;
 }
 
 #pragma mark 选中按钮