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.增加添加设备通知功能
---
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZDeviceTableViewController.m | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZDeviceTableViewController.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZDeviceTableViewController.m
index 431da2e..abad069 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZDeviceTableViewController.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZDeviceTableViewController.m
@@ -43,9 +43,17 @@
@implementation EZDeviceTableViewController
+-(void)viewWillDisappear:(BOOL)animated
+{
+ // self.navigationController.navigationBarHidden = YES;//2021-02-01 娣诲姞闅愯棌navigationBarHidden
+}
+
- (void)viewDidLoad
{
[super viewDidLoad];
+
+// [[UIBarButtonItem appearance] setBackButtonTitlePositionAdjustment:UIOffsetMake(0, -60)
+// forBarMetrics:UIBarMetricsDefault];
// Uncomment the following line to preserve selection between presentations.
// self.clearsSelectionOnViewWillAppear = NO;
@@ -58,6 +66,8 @@
// self.title.
self.logoutBtn.title = NSLocalizedString(@"Logout", @"娉ㄩ攢");
+ self.logoutBtn.title = @"";
+ [self.logoutBtn setEnabled: NO];
[self checkEZIsLogin];
}
@@ -66,6 +76,9 @@
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
+
+ self.navigationController.navigationBar.hidden = NO;//2021-02-01
+
if (_needRefresh)
{
_needRefresh = NO;
@@ -105,12 +118,12 @@
// self.navigationItem.rightBarButtonItem = self.addButton;
}];
}else{
- [[EZGlobalSDK class] getAreaList:^(NSArray *areaList, NSError *error) {
+ [EZOPENSDK getAreaList:^(NSArray *areaList, NSError *error) {
EZAreaInfo *areaInfo = areaList.firstObject;
- [[EZGlobalSDK class] openLoginPage:[NSString stringWithFormat:@"%ld",(long)areaInfo.id]
+ [EZOPENSDK openLoginPage:[NSString stringWithFormat:@"%ld",(long)areaInfo.id]
completion:^(EZAccessToken *accessToken) {
[[GlobalKit shareKit] setAccessToken:accessToken.accessToken];
- [[EZGlobalSDK class] setAccessToken:accessToken.accessToken];
+ [EZOPENSDK setAccessToken:accessToken.accessToken];
[self addRefreshKit];
// self.navigationItem.rightBarButtonItem = self.addButton;
}];
@@ -377,9 +390,9 @@
}
- (void) go2VideoTalk:(EZDeviceInfo *)deviceInfo {
- EZVideoTalkViewcontroller *vc = [EZVideoTalkViewcontroller videoTalkVC];
- vc.deviceInfo = deviceInfo;
- [self.navigationController pushViewController:vc animated:YES];
+// EZVideoTalkViewcontroller *vc = [EZVideoTalkViewcontroller videoTalkVC];
+// vc.deviceInfo = deviceInfo;
+// [self.navigationController pushViewController:vc animated:YES];
}
- (IBAction)go2MultiPlay:(id)sender {
--
Gitblit v1.8.0