Parcourir la source

1.文件类型进行全选时,把文件夹也勾选上了
2.接收的删除文案

huangxiaodong il y a 1 an
Parent
commit
7c549e377d

+ 4 - 2
创维盒子/双子星云手机/Class/Set/previewFile/previewFileAndFolderSecondViewController.m

@@ -410,8 +410,10 @@
             dataModel.isSelectType = button.selected;
         }
         else{
-            [_didSelectListArr addObject:dataModel];
-            dataModel.isSelectType = button.selected;
+            if(![dataModel.type isEqualToString:@"dir"]){
+                [_didSelectListArr addObject:dataModel];
+                dataModel.isSelectType = button.selected;
+            }
         }
     }
     

+ 4 - 2
创维盒子/双子星云手机/Class/Set/previewFile/previewFileAndFolderViewController.m

@@ -532,8 +532,10 @@
             dataModel.isSelectType = button.selected;
         }
         else{
-            [_didSelectListArr addObject:dataModel];
-            dataModel.isSelectType = button.selected;
+            if(![dataModel.type isEqualToString:@"dir"]){
+                [_didSelectListArr addObject:dataModel];
+                dataModel.isSelectType = button.selected;
+            }
         }
     }
     

+ 1 - 0
创维盒子/双子星云手机/Class/Set/previewFile/shareRecordViewController.m

@@ -585,6 +585,7 @@
     }];
 }
 
+#pragma mark 分享规则
 - (void)ruleBtnClick {
 //https://cliys.armclouding.com/h5/protocol/protocol.html?agreementCoding=YSZYHXY2002&type=1
 //    [self gotoProtocolWKWebVCByPush:YES];

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

@@ -365,7 +365,7 @@
         delTipTip = NSLocalizedString(@"File_upload_Record_clear_fail_Tip_msg",nil);
     }
     else if(_selectIndex == 4){
-        delTipTip = NSLocalizedString(@"File_upload_Record_clear_done_Tip_msg",nil);
+        delTipTip = NSLocalizedString(@"box_receive_delete_msg",nil);
     }
     
     /*弹窗提示二次确认*/