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/UIViewControllers/EZAddByQRCodeViewController.m | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m
index ac5e272..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)
@@ -234,8 +238,10 @@
- (void)checkQRCode:(NSString *)strQRcode
{
- NSArray *arrString = [strQRcode componentsSeparatedByCharactersInSet:[NSCharacterSet newlineCharacterSet]];
+ 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