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/EZAPConfigResultViewController.m | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZAPConfigResultViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZAPConfigResultViewController.m
index 1645fb3..98abe9e 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZAPConfigResultViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZAPConfigResultViewController.m
@@ -8,8 +8,8 @@
#import "EZAPConfigResultViewController.h"
#import "GlobalKit.h"
-#import "EZOpenSDK.h"
-#import "EZProbeDeviceInfo.h"
+#import <EZOpenSDKFramework/EZOpenSDK.h>
+#import <EZOpenSDKFramework/EZProbeDeviceInfo.h>
#import "Toast+UIView.h"
#import "EZDeviceTableViewController.h"
@@ -88,8 +88,8 @@
if ([vc isKindOfClass:[EZAddByQRCodeViewController class]])
{//璺宠浆鍒版壂鐮侀〉
- ((EZAddByQRCodeViewController *)vc).shouldPop = YES;
- [self.navigationController popToViewController:vc animated:YES];
+// ((EZAddByQRCodeViewController *)vc).shouldPop = YES;
+ [self.navigationController popToViewController:((EZAddByQRCodeViewController *)vc).prevController animated:YES];
break;
}
@@ -116,7 +116,8 @@
completion:^(ResponseData *responseData) {
if (!responseData.success){
- [self.view makeToast:NSLocalizedString(@"wifi_add_fail", @"娣诲姞澶辫触") duration:2.0 position:@"center"];
+// [self.view makeToast:NSLocalizedString(@"wifi_add_fail", @"娣诲姞澶辫触") duration:2.0 position:@"center"];
+ [self.view makeToast:responseData.message duration:2.0 position:@"center"];
}
else
{
@@ -202,7 +203,7 @@
[self.loadingIndicator stopAnimating];
self.msgLabel.text = NSLocalizedString(@"ad_result_verify_local_lock",@"璇峰湪2鍒嗛挓涔嬪唴鏍￠獙宸叉坊鍔犵殑涓荤敤鎴锋寚绾广�佸瘑閽ユ垨鎰熷簲鍗★紝鏍￠獙瀹屾垚璇风偣鍑诲凡鏍￠獙鎸夐挳");
[self.verifiedBtn setHidden:NO];
-
+ [self stopTimer];
}else{
[self addErrorProcessWithError:responseData];
}
@@ -324,6 +325,9 @@
self.successImageView.hidden = NO;
self.doneBtn.hidden = NO;
self.msgLabel.hidden = YES;
+
+ [self.verifiedBtn setHidden:YES];
+
}
--
Gitblit v1.8.0