From 60bb4ce8d3ef0f8a324c6844cc990405de5d2e0f Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 三月 2021 11:06:13 +0800
Subject: [PATCH] 2021-03-05 1.更新
---
EZSDK/EZSDK/EZ/UIViewControllers/EZAPConfigResultViewController.m | 91 ++++++++++++++++++++++++++++++++-------------
1 files changed, 65 insertions(+), 26 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZAPConfigResultViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZAPConfigResultViewController.m
index d199690..748bfd4 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZAPConfigResultViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZAPConfigResultViewController.m
@@ -31,7 +31,7 @@
- (void)viewDidLoad
{
[super viewDidLoad];
-
+
self.title = NSLocalizedString(@"wifi_ap_add_device_title", @"娣诲姞璁惧");
[self initSubviews];
@@ -102,7 +102,7 @@
[self stopTimer];
self.addCount = 0;
-
+
self.timer = [NSTimer scheduledTimerWithTimeInterval:5.0
target:self
selector:@selector(timerCallback)
@@ -130,26 +130,41 @@
[EZOPENSDK probeDeviceInfo:[GlobalKit shareKit].deviceSerialNo
deviceType:[GlobalKit shareKit].deviceModel
completion:^(EZProbeDeviceInfo *deviceInfo, NSError *error) {
- if (error)
- {
- [self probeErrorProcessWithError:error];
- }
- else
- {
- [EZOpenSDK addDevice:[GlobalKit shareKit].deviceSerialNo
- verifyCode:[GlobalKit shareKit].deviceVerifyCode
- completion:^(NSError *error) {
- if (error)
- {
- [self addErrorProcessWithError:error];
- }
- else
- {
- [self successProcess];
- }
- }];
- }
- }];
+ if (error)
+ {
+ [self probeErrorProcessWithError:error];
+ }
+ else
+ {
+ // [EZOpenSDK addDevice:[GlobalKit shareKit].deviceSerialNo
+ // verifyCode:[GlobalKit shareKit].deviceVerifyCode
+ // completion:^(NSError *error) {
+ // if (error)
+ // {
+ // [self addErrorProcessWithError:error];
+ // }
+ // else
+ // {
+ // [self successProcess];
+ // }
+ // }];
+ [EZHttpUtil.sharedManager addDeviceByHDL:[GlobalKit shareKit].deviceSerialNo
+ verifyCode:[GlobalKit shareKit].deviceVerifyCode
+ completion:^(ResponseData *responseData) {
+
+ if (!responseData.success)
+ {
+ [self addErrorProcessWithError:responseData];
+ }
+ else
+ {
+ [self successProcess];
+ }
+
+ }];
+
+ }
+ }];
}
- (void) probeErrorProcessWithError:(NSError *) error
@@ -181,18 +196,42 @@
[self.view makeToast:msg duration:2.0 position:@"center"];
}
-- (void) addErrorProcessWithError:(NSError *) error
+//- (void) addErrorProcessWithError:(NSError *) error
+//{
+// NSString *msg = nil;
+// if (error.code == 120010)
+// {
+// msg = NSLocalizedString(@"device_verify_code_wrong", @"楠岃瘉鐮侀敊璇�");
+// }
+// else if (error.code == 120020)
+// {
+// msg = NSLocalizedString(@"ad_already_added", @"鎮ㄥ凡娣诲姞杩囨璁惧");
+// }
+// else if (error.code == 120022)
+// {
+// msg = NSLocalizedString(@"ad_added_by_others", @"姝よ澶囧凡琚埆浜烘坊鍔�");
+// }
+// else
+// {
+// msg = NSLocalizedString(@"wifi_add_fail", @"娣诲姞澶辫触");
+// }
+//
+// [self.view makeToast:msg duration:2.0 position:@"center"];
+// self.msgLabel.hidden = YES;
+//}
+
+- (void) addErrorProcessWithError:(ResponseData *)responseData
{
NSString *msg = nil;
- if (error.code == 120010)
+ if ([responseData.code isEqual: @"20010"])
{
msg = NSLocalizedString(@"device_verify_code_wrong", @"楠岃瘉鐮侀敊璇�");
}
- else if (error.code == 120020)
+ else if ([responseData.code isEqual: @"20017"])
{
msg = NSLocalizedString(@"ad_already_added", @"鎮ㄥ凡娣诲姞杩囨璁惧");
}
- else if (error.code == 120022)
+ else if ([responseData.code isEqual: @"20013"])
{
msg = NSLocalizedString(@"ad_added_by_others", @"姝よ澶囧凡琚埆浜烘坊鍔�");
}
--
Gitblit v1.8.0