From b4e1288a9b63eb820e9c9489c56aac4bf6b31067 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 18 十二月 2024 14:34:16 +0800
Subject: [PATCH] feature 图片资源更新
---
EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m
index ac5e272..94e8e17 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m
@@ -32,7 +32,7 @@
- (void)dealloc
{
-
+
}
- (void)viewDidLoad {
@@ -66,11 +66,21 @@
[alert show];
}
self.qrView.hidden = YES;
+
+ self.prevController = (UIViewController *)[self.navigationController.viewControllers objectAtIndex: ([self.navigationController.viewControllers count] -2)];
+ HDLEZLog(@"瀵艰埅鏍忓瓙view锛�%@",self.prevController );
+
+
+ self.tipsLabel.text=HDLEZLocallizedString(@"device_add_device_qr_code");
}
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
+// if(self.shouldPop){//閫�鍑虹晫闈�
+// [self.navigationController popViewControllerAnimated:YES];
+// }
+
[[GlobalKit shareKit] clearDeviceInfo];
if (authStatus == AVAuthorizationStatusDenied ||
authStatus == AVAuthorizationStatusRestricted)
@@ -234,8 +244,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