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/EZWifiConfigViewController.m | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZWifiConfigViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZWifiConfigViewController.m index 6a410db..90c2019 100644 --- a/EZSDK/EZSDK/EZ/UIViewControllers/EZWifiConfigViewController.m +++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZWifiConfigViewController.m @@ -11,6 +11,7 @@ #import "DDKit.h" #import "EZDeviceTableViewController.h" #import "EZDdnsDeviceTableViewController.h" +#import "EZAddByQRCodeViewController.h" // 璁惧bonjour鎼滅储鍒扮殑鐘舵�佹爣绀� typedef enum _DEVICE_STATE @@ -788,7 +789,6 @@ } } #pragma mark - Action Methods - - (void)completionButtonClicked:(id)sender { NSArray *viewControllers = self.navigationController.viewControllers; @@ -807,6 +807,13 @@ [self.navigationController popToViewController:vc animated:YES]; break; } + + if ([vc isKindOfClass:[EZAddByQRCodeViewController class]]) + {//璺宠浆鍒版壂鐮侀〉 +// ((EZAddByQRCodeViewController *)vc).shouldPop = YES; + [self.navigationController popToViewController:((EZAddByQRCodeViewController *)vc).prevController animated:YES]; + break; + } } } -- Gitblit v1.8.0