浏览代码

IOS端上传成功列表,唤起删除按钮,文件未选中状态,点击删除仍弹窗二次弹窗,应给提示“请先选择文件”

huangxiaodong 2 年之前
父节点
当前提交
31ab6fc7bb

+ 1 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordTableView.h

@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) NSMutableArray *curDataArr;
 @property (nonatomic,assign) BOOL isEditType;
 @property (nonatomic,assign) BOOL isSelectAllType;
+@property (nonatomic,strong) NSMutableArray *selectModelArr;
 
 @property (nonatomic,copy) void (^didLongPressClick)(void);
 @property (nonatomic,copy) void (^didClickReUploadBlock)(uploadFileDataModel* model);

+ 1 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordTableView.m

@@ -11,7 +11,7 @@
 #import "uploadFileManager.h"
 
 @interface uploadFileRecordTableView()<UITableViewDataSource,UITableViewDelegate,DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
-@property (nonatomic,strong) NSMutableArray *selectModelArr;
+
 @end
 
 @implementation uploadFileRecordTableView

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

@@ -258,9 +258,29 @@
 #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;
+    }
+    
+    if(!selectModelArr || selectModelArr.count== 0){
+        
+        [[iToast makeText:NSLocalizedString(@"File_upload_Record_delete_noFile",nil)] show];
+        
+        return;
+    }
+    
+    
     NSString *delTipTip = nil;
     if(_selectIndex == 1){
-        delTipTip = NSLocalizedString(@"File_upload_Record_clear_uploading_Tip_msg",nil);;
+        delTipTip = NSLocalizedString(@"File_upload_Record_clear_uploading_Tip_msg",nil);
     }
     else if(_selectIndex == 2){
         delTipTip = NSLocalizedString(@"File_upload_Record_clear_done_Tip_msg",nil);

+ 1 - 0
创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings

@@ -273,6 +273,7 @@
 "File_upload_Record_select_all"   = "全选";
 "File_upload_cancel_select_all"   = "取消全选";
 "File_upload_Record_delete"   = "删除";
+"File_upload_Record_delete_noFile"   = "请先选择文件";
 "File_upload_fail"   = "文件上传失败";
 "File_upload_success"   = "文件上传成功";
 "File_upload_file_already_exists"   = "文件已存在";