From 3698c13aba988cd3e41b91b255e1c682c057e565 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期四, 23 三月 2023 11:49:58 +0800
Subject: [PATCH] 1.新增历史记录相关页面及功能 2.修改配网为热点配网 3.设备列表增加过滤门锁功能 4.增加添加设备通知功能
---
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZDeviceResultViewController.m | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZDeviceResultViewController.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZDeviceResultViewController.m
index 0c32699..afe9d1e 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZDeviceResultViewController.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZDeviceResultViewController.m
@@ -14,7 +14,7 @@
#import "EZWifiConfigViewController.h"
#import "EZWifiTipsViewController.h"
#import "MBProgressHUD.h"
-
+#import "EZSDK.h"
@interface EZDeviceResultViewController ()<UIAlertViewDelegate>
@@ -82,12 +82,21 @@
[GlobalKit shareKit].deviceVerifyCode = [alertView textFieldAtIndex:0].text;
__weak MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
hud.labelText = NSLocalizedString(@"ad_adding_msg", @"姝ｅ湪娣诲姞锛岃绋嶅��...");
- [EZOPENSDK addDevice:[GlobalKit shareKit].deviceSerialNo
- verifyCode:[GlobalKit shareKit].deviceVerifyCode
- completion:^(NSError *error) {
- [hud hide:YES];
- [self handleTheError:error];
- }];
+
+// [EZOPENSDK addDevice:[GlobalKit shareKit].deviceSerialNo
+// verifyCode:[GlobalKit shareKit].deviceVerifyCode
+// completion:^(NSError *error) {
+// [hud hide:YES];
+// [self handleTheError:error];
+// }];
+
+ [EZHttpUtil.sharedManager addDeviceByHDL:[GlobalKit shareKit].deviceSerialNo
+ verifyCode:[GlobalKit shareKit].deviceVerifyCode
+ completion:^(ResponseData *responseData) {
+ [hud hide:YES];
+ [self handleTheError:responseData];
+ }];
+
}
else if (alertView.tag == 0xbb && buttonIndex == 1)
{
@@ -112,12 +121,20 @@
{
__weak MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
hud.labelText = NSLocalizedString(@"ad_adding_msg", @"姝ｅ湪娣诲姞锛岃绋嶅��...");
- [EZOPENSDK addDevice:[GlobalKit shareKit].deviceSerialNo
- verifyCode:[GlobalKit shareKit].deviceVerifyCode
- completion:^(NSError *error) {
- [hud hide:YES];
- [self handleTheError:error];
- }];
+// [EZOPENSDK addDevice:[GlobalKit shareKit].deviceSerialNo
+// verifyCode:[GlobalKit shareKit].deviceVerifyCode
+// completion:^(NSError *error) {
+// [hud hide:YES];
+// [self handleTheError:error];
+// }];
+ [EZHttpUtil.sharedManager addDeviceByHDL:[GlobalKit shareKit].deviceSerialNo
+ verifyCode:[GlobalKit shareKit].deviceVerifyCode
+ completion:^(ResponseData *responseData) {
+ [hud hide:YES];
+ [self handleTheError:responseData];
+ }];
+
+
}
else
{
@@ -161,7 +178,7 @@
if (error.code == EZ_HTTPS_DEVICE_ADDED_MYSELF || error.code == EZ_HTTPS_DEVICE_ONLINE_ADDED)
{
self.statusLabel.textColor = [UIColor blackColor];
- self.statusLabel.text = NSLocalizedString(@"ad_already_added",@"鎮ㄥ凡娣诲姞杩囨璁惧");
+ self.statusLabel.text = NSLocalizedString(@"ad_already_added",@"姝よ澶囧凡琚坊鍔�");
self.statusLabel.hidden = NO;
}
else if (error.code == EZ_HTTPS_DEVICE_ONLINE_IS_ADDED || error.code == EZ_HTTPS_DEVICE_OFFLINE_IS_ADDED)
@@ -212,24 +229,24 @@
}
-- (void)handleTheError:(NSError *)error
+- (void)handleTheError:(ResponseData *)responseData
{
- if (!error)
+ if (responseData.success)
{
[self performSegueWithIdentifier:@"go2WifiResult" sender:nil];
return;
}
- if (error.code == 105002)
+ if ([responseData.code isEqual: @"20010"])
{
UIAlertView *retryAlertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"device_verify_code_wrong", @"楠岃瘉鐮侀敊璇�") message:nil delegate:self cancelButtonTitle:NSLocalizedString(@"cancel", @"鍙栨秷") otherButtonTitles:NSLocalizedString(@"retry", @"閲嶈瘯"), nil];
retryAlertView.tag = 0xbb;
[retryAlertView show];
}
- else if (error.code == 105000)
+ else if ([responseData.code isEqual: @"20017"])
{
[UIView dd_showMessage:NSLocalizedString(@"ad_already_added",@"鎮ㄥ凡娣诲姞杩囨璁惧")];
}
- else if (error.code == 105001)
+ else if ([responseData.code isEqual: @"20013"])
{
[UIView dd_showMessage:NSLocalizedString(@"ad_added_by_others",@"姝よ澶囧凡琚埆浜烘坊鍔�")];
}
--
Gitblit v1.8.0