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/UIViewControllers/EZAddByQRCodeViewController.m | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m
index 4abf5f3..27f7e85 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m
@@ -71,6 +71,10 @@
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
+ if(self.shouldPop){//閫�鍑虹晫闈�
+ [self.navigationController popViewControllerAnimated:YES];
+ }
+
[[GlobalKit shareKit] clearDeviceInfo];
if (authStatus == AVAuthorizationStatusDenied ||
authStatus == AVAuthorizationStatusRestricted)
@@ -237,7 +241,7 @@
strQRcode = [strQRcode stringByReplacingOccurrencesOfString:@"\r\n" withString:@"\r"];//2021-10-19 瑙ｅ喅閮ㄥ垎鐚溂璁惧灞忓箷鏄剧ず鐨勪簩缁寸爜锛屽弬鏁颁箣闂村嚭鐜扮┖琛屽鑷村垎鍓插彇閿欏瓧娈甸棶棰�
NSArray *arrString = [strQRcode componentsSeparatedByCharactersInSet:[NSCharacterSet newlineCharacterSet]];
-
+ [GlobalKit shareKit].deviceType = self.deviceType;
if(arrString.count >=3)
{
[GlobalKit shareKit].deviceSerialNo = arrString[1];
--
Gitblit v1.8.0