From 94217b294ccd75a34787eb04d6e273e99536e45b Mon Sep 17 00:00:00 2001
From: 重庆迈尖科技有限公司
Date: 星期三, 30 一月 2019 15:12:32 +0800
Subject: [PATCH] no message
---
BuWanVideo2.0/LookNoteController.m | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/BuWanVideo2.0/LookNoteController.m b/BuWanVideo2.0/LookNoteController.m
index bd08717..a2f79b3 100755
--- a/BuWanVideo2.0/LookNoteController.m
+++ b/BuWanVideo2.0/LookNoteController.m
@@ -106,7 +106,11 @@
鍒涘缓鎿嶄綔瑙嗗浘锛堝叏閫夛紝鍒犻櫎锛�
*/
-(void)CreateOperatingView{
- allSelAndDelView = [[UIView alloc]initWithFrame:CGRectMake(0, KScreenH-40, KScreenW, 40)];
+ CGFloat height = 40;
+ if (KIsiPhoneX) {
+ height = 60;
+ }
+ allSelAndDelView = [[UIView alloc]initWithFrame:CGRectMake(0, KScreenH-height, KScreenW, 40)];
allSelAndDelView.hidden = YES;
allSelAndDelView.backgroundColor = [UIColor whiteColor];
@@ -160,12 +164,13 @@
-(void)allSelectOrCancelClick{
if ([allSelectBut.titleLabel.text isEqualToString:@"鍏ㄩ��"]){
[allSelectBut setTitle:@"鍙栨秷鍏ㄩ��" forState:UIControlStateNormal];
- [deleteBut setTitle:[NSString stringWithFormat:@"鍒犻櫎(%ld)",(unsigned long)_editDataAry.count] forState:UIControlStateNormal];
for (int i = 0 ; i <historyListDataArray.count; ++i){
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:i inSection:0];
[mytableview selectRowAtIndexPath:indexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
[_editDataAry addObject:[historyListDataArray objectAtIndex:i]];
}
+ [deleteBut setTitle:[NSString stringWithFormat:@"鍒犻櫎(%ld)",(unsigned long)_editDataAry.count] forState:UIControlStateNormal];
+
}else{
[allSelectBut setTitle:@"鍏ㄩ��" forState:UIControlStateNormal];
[deleteBut setTitle:[NSString stringWithFormat:@"鍒犻櫎"] forState:UIControlStateNormal];
@@ -173,8 +178,9 @@
for (int i = 0 ; i < _editDataAry.count ; ++i){
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:i inSection:0];
[mytableview deselectRowAtIndexPath:indexPath animated:NO];
- [_editDataAry removeAllObjects];
}
+ [_editDataAry removeAllObjects];
+
}
}
@@ -182,12 +188,18 @@
* 鍒犻櫎
*/
-(void)deleteSelectDataClick{
+ if (_editDataAry.count == 0) {
+ [self autoDisappearAlertTime:0.5 msg:@"璇烽�夋嫨瑕佸垹闄ょ殑璁板綍"];
+ return;
+ }
[deleBtn setSelected:NO];
[deleBtn setImage:[[UIImage imageNamed:@"鍒犻櫎"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
allSelAndDelView.hidden = YES;
[historyListDataArray removeObjectsInArray:_editDataAry];
-
+ [_editDataAry removeAllObjects];
+ [deleteBut setTitle:[NSString stringWithFormat:@"鍒犻櫎"] forState:UIControlStateNormal];
+
//鍐欏叆 HISTORYFILE
if (historyListDataArray.count){
[historyListDataArray writeToFile:HISTORYFILE atomically:YES];
@@ -212,6 +224,8 @@
* 鍙充笂鍒犻櫎鎸夐挳
*/
-(void)deletebutton:(id)sender{
+ [deleteBut setTitle:[NSString stringWithFormat:@"鍒犻櫎"] forState:UIControlStateNormal];
+
if (mytableview.editing) {
[mytableview setEditing:NO];
[deleBtn setSelected:NO];
--
Gitblit v1.8.0