From 485a9553e08984a945d692483b1aea15a02ef5ab Mon Sep 17 00:00:00 2001 From: chenqiyang <1406175257@qq.com> Date: 星期一, 13 三月 2023 11:09:17 +0800 Subject: [PATCH] 1.更新sdk到5.1.1 2.新增临时密码列表界面 3.新增跳转添加设备页接口 4.新增添加门锁设备逻辑 --- EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceResultViewController.m | 46 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 39 insertions(+), 7 deletions(-) diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceResultViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceResultViewController.m index afe9d1e..500c658 100644 --- a/EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceResultViewController.m +++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceResultViewController.m @@ -127,13 +127,29 @@ // [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]; - }]; - + if ([GlobalKit shareKit].deviceType==HDLEZDeviceType_Door) {//涓洪棬绂佽澶囷紙闇�瑕侀獙璇侀棬閿侊級 + [EZHttpUtil.sharedManager verifyLocalLockByHDL:[GlobalKit shareKit].deviceSerialNo completion:^(ResponseData * _Nonnull responseData) { + [hud hide:YES]; + if (responseData.success) { + self.resultLabel.numberOfLines=2; + self.resultLabel.adjustsFontSizeToFitWidth=YES; + self.resultLabel.text = NSLocalizedString(@"ad_result_verify_local_lock",@"璇峰湪2鍒嗛挓涔嬪唴鏍¢獙宸叉坊鍔犵殑涓荤敤鎴锋寚绾广�佸瘑閽ユ垨鎰熷簲鍗★紝鏍¢獙瀹屾垚璇风偣鍑诲凡鏍¢獙鎸夐挳"); + + [self.actionButton setTitle:NSLocalizedString(@"ad_verified", @"宸叉牎楠�") forState:UIControlStateNormal]; + }else{ + [self handleTheError:responseData]; + } + + NSLog(@"璋冪敤楠岃瘉鎺ュ彛杩斿洖锛�%@",responseData.data); + }]; + }else{ + [EZHttpUtil.sharedManager addDeviceByHDL:[GlobalKit shareKit].deviceSerialNo + verifyCode:[GlobalKit shareKit].deviceVerifyCode + completion:^(ResponseData *responseData) { + [hud hide:YES]; + [self handleTheError:responseData]; + }]; + } } else @@ -144,6 +160,22 @@ [alertView show]; } } + else if([self.actionButton.titleLabel.text isEqualToString:NSLocalizedString(@"ad_verified",@"宸叉牎楠�")]) + { + __weak MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES]; + hud.labelText = NSLocalizedString(@"ad_adding_msg", @"姝e湪娣诲姞锛岃绋嶅��..."); + [EZHttpUtil.sharedManager addDeviceByHDL:[GlobalKit shareKit].deviceSerialNo + verifyCode:[GlobalKit shareKit].deviceVerifyCode + completion:^(ResponseData *responseData) { + [hud hide:YES]; + if (!responseData.success){ + [self.view makeToast:NSLocalizedString(@"wifi_add_fail", @"娣诲姞澶辫触") duration:2.0 position:@"center"]; + }else{ + [self handleTheError:responseData]; + } + + }]; + } else { [self doSearchDevice]; -- Gitblit v1.8.0