From 3698c13aba988cd3e41b91b255e1c682c057e565 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期四, 23 三月 2023 11:49:58 +0800
Subject: [PATCH] 1.新增历史记录相关页面及功能 2.修改配网为热点配网 3.设备列表增加过滤门锁功能 4.增加添加设备通知功能
---
EZSDK/EZSDK/EZ/TempPassword/Controllers/HDLEZVisitorRecordViewController.m | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/TempPassword/Controllers/HDLEZVisitorRecordViewController.m b/EZSDK/EZSDK/EZ/TempPassword/Controllers/HDLEZVisitorRecordViewController.m
index 5b0c31d..ef6ab69 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,7 +77,17 @@
__weak __typeof(self)weakSelf = self;
[[EZHttpUtil sharedManager] getTempListByHDL:self.deviceId completion:^(ResponseData * _Nonnull responseData) {
HDLEZLog(@"涓存椂瀵嗙爜鍒楄〃锛�%@",responseData.data);
- weakSelf.visitorRecordV.temPList=[NSArray yy_modelArrayWithClass:[HDLEZTemInfoModel class] json:responseData.data];
+ [weakSelf.header endRefreshing];
+ if (responseData.success) {
+ weakSelf.visitorRecordV.temPList=[NSArray yy_modelArrayWithClass:[HDLEZTemInfoModel class] json:responseData.data];
+// if (weakSelf.visitorRecordV.temPList.count==0) {
+//
+// }
+ }else{
+ [weakSelf.view makeToast:responseData.message
+ duration:1.5
+ position:@"center"];
+ }
}];
}
@@ -79,10 +108,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