From cf977559d6821a1ccce2acae076835a8037f2a90 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期一, 05 六月 2023 11:47:18 +0800
Subject: [PATCH] 1.提交萤石demo 2.修改部分UI
---
EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m
index 27f7e85..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,14 +66,20 @@
[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];
- }
+// if(self.shouldPop){//閫�鍑虹晫闈�
+// [self.navigationController popViewControllerAnimated:YES];
+// }
[[GlobalKit shareKit] clearDeviceInfo];
if (authStatus == AVAuthorizationStatusDenied ||
--
Gitblit v1.8.0