From 54ada3b3c6c58da67dda2ecaea4b19b42ab5c257 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 29 三月 2023 17:51:47 +0800
Subject: [PATCH] 1.改用萤石动态库，解决openssl版本冲突问题 2.设备回调成功增加返回设备序列号 3.优化部分功能
---
EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m
index 27f7e85..b1592e9 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZAddByQRCodeViewController.m
@@ -66,14 +66,19 @@
[alert show];
}
self.qrView.hidden = YES;
+
+ self.prevController = (UIViewController *)[self.navigationController.viewControllers objectAtIndex: ([self.navigationController.viewControllers count] -2)];
+ HDLEZLog(@"瀵艰埅鏍忓瓙view锛�%@",self.prevController );
+
+
}
- (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