From f338bb377a9e2f87f876cf8c5f0124d84da85bea Mon Sep 17 00:00:00 2001 From: chenqiyang <1406175257@qq.com> Date: 星期三, 15 三月 2023 14:18:40 +0800 Subject: [PATCH] 1.引入自定义button和scrollview 2.引入时间选择器组件 3.完善临时密码功能 4.修改部分类名 --- EZSDK/EZSDK/EZ/TempPassword/Controllers/HDLEZVisitorRecordViewController.m | 43 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 35 insertions(+), 8 deletions(-) diff --git a/EZSDK/EZSDK/EZ/TempPassword/Controllers/HDLEZVisitorRecordViewController.m b/EZSDK/EZSDK/EZ/TempPassword/Controllers/HDLEZVisitorRecordViewController.m index 5b0c31d..d5fb9b0 100755 --- a/EZSDK/EZSDK/EZ/TempPassword/Controllers/HDLEZVisitorRecordViewController.m +++ b/EZSDK/EZSDK/EZ/TempPassword/Controllers/HDLEZVisitorRecordViewController.m @@ -10,8 +10,12 @@ #import "HDLEZVisitorRecordView.h" //#import "HDLFVTempPassViewController.h" //#import "HDLFVHttpRequestManager.h" +#import "MJRefreshNormalHeader.h" +#import "HDLEZCreatTempPassViewController.h" +#import "HDLEZTempDetailViewController.h" @interface HDLEZVisitorRecordViewController ()<HDLEZVisitorRecordViewDelegate> @property (nonatomic, strong) HDLEZVisitorRecordView *visitorRecordV; +@property (nonatomic, strong) MJRefreshNormalHeader *header; @end @@ -21,7 +25,11 @@ [super viewDidLoad]; [self setTopBarViewWithTitle:HDLEZLocallizedString(@"device_temp_pass")]; [self.topBarView.bottomLine setHidden:YES]; - + //娣诲姞鎸夐挳 + [self.topBarView.rightButton setHidden:NO]; + [self.topBarView.rightButton setBackgroundImage:[UIImage imageNamed:@"hdl_ez_temp_add"] forState:UIControlStateNormal]; + [self.topBarView.rightButton addTarget:self action:@selector(addTemp) forControlEvents:UIControlEventTouchUpInside]; + //娉ㄥ唽涓存椂瀵嗙爜鍒楄〃鍙樺寲閫氱煡 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(notificationChangeTemP) name:HDLEZNotificationChangeTemP object:nil]; // Do any additional setup after loading the view. @@ -35,7 +43,7 @@ //涓存椂瀵嗙爜鍙樺寲閫氱煡 -(void)notificationChangeTemP{ - [self getTemPList]; + [_header beginRefreshing]; } -(void)addSubViews{ @@ -49,7 +57,18 @@ }]; _visitorRecordV.choseDelegate=self; - [self getTemPList]; + //涓嬫媺鍒锋柊 + // 璁剧疆鍥炶皟锛堜竴鏃﹁繘鍏ュ埛鏂扮姸鎬侊紝灏辫皟鐢╰arget鐨刟ction锛屼篃灏辨槸璋冪敤self鐨刲oadNewData鏂规硶锛� + _header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(getTemPList)]; + // 璁剧疆鑷姩鍒囨崲閫忔槑搴�(鍦ㄥ鑸爮涓嬮潰鑷姩闅愯棌) + _header.automaticallyChangeAlpha = YES; + // 闅愯棌鏃堕棿 + _header.lastUpdatedTimeLabel.hidden = YES; + // 闅愯棌鍒锋柊鐘舵�佹枃鏈� + _header.stateLabel.hidden = YES; + _visitorRecordV.mj_header=_header; + [_header beginRefreshing]; +// [self getTemPList]; } /*鑾峰彇涓存椂瀵嗙爜鍒楄〃 @@ -58,6 +77,7 @@ __weak __typeof(self)weakSelf = self; [[EZHttpUtil sharedManager] getTempListByHDL:self.deviceId completion:^(ResponseData * _Nonnull responseData) { HDLEZLog(@"涓存椂瀵嗙爜鍒楄〃锛�%@",responseData.data); + [weakSelf.header endRefreshing]; weakSelf.visitorRecordV.temPList=[NSArray yy_modelArrayWithClass:[HDLEZTemInfoModel class] json:responseData.data]; }]; } @@ -79,10 +99,17 @@ -(void)visitorRecordViewdidSelectRecord:(HDLEZTemInfoModel *)tempDetailModel{ -// HDLFVTempPassViewController *vc=[[HDLFVTempPassViewController alloc] init]; -// vc.temPassType=HDLFVTemPassType_Detail; -// vc.temPdetailModel=tempDetailModel; -// vc.isShowDetail=YES; -// [self.navigationController pushViewController:vc animated:YES ]; + HDLEZTempDetailViewController *vc=[[HDLEZTempDetailViewController alloc] init]; + vc.temPdetailModel=tempDetailModel; + vc.deviceId=self.deviceId; + [self.navigationController pushViewController:vc animated:YES ]; +} + +/*娣诲姞涓存椂瀵嗙爜 + */ +-(void)addTemp{ + HDLEZCreatTempPassViewController *vc=[[HDLEZCreatTempPassViewController alloc] init]; + vc.deviceId=self.deviceId; + [self.navigationController pushViewController:vc animated:YES]; } @end -- Gitblit v1.8.0