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.增加添加设备通知功能
---
EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m
index 31aab9b..2719447 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZSettingViewController.m
@@ -142,7 +142,7 @@
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
-// self.navigationController.navigationBarHidden = NO;//2021-02-01
+ self.navigationController.navigationBar.hidden = NO;//2021-02-01
[self.tableView reloadData];
}
@@ -360,10 +360,27 @@
{
__weak MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
hud.labelText = NSLocalizedString(@"message_deleting", @"姝ｅ湪鍒犻櫎锛岃绋嶅��...");
- [EZOPENSDK deleteDevice:self.deviceInfo.deviceSerial completion:^(NSError *error) {
- if(!error)
+// [EZOPENSDK deleteDevice:self.deviceInfo.deviceSerial completion:^(NSError *error) {
+// if(!error)
+// {
+// [hud hide:YES];
+// NSArray *viewControllers = self.navigationController.viewControllers;
+// for (UIViewController *vc in viewControllers)
+// {
+// if([vc isKindOfClass:[EZDeviceTableViewController class]])
+// {
+// ((EZDeviceTableViewController *)vc).needRefresh = YES;
+// [self.navigationController popToViewController:vc animated:YES];
+// break;
+// }
+// }
+// }
+// }];
+
+ [EZHttpUtil.sharedManager deleteDeviceByHDL:self.deviceInfo.deviceSerial completion:^(ResponseData *responseData) {
+ [hud hide:YES];
+ if(responseData.success)
{
- [hud hide:YES];
NSArray *viewControllers = self.navigationController.viewControllers;
for (UIViewController *vc in viewControllers)
{
@@ -374,8 +391,14 @@
break;
}
}
+ }else{
+ NSString *mes = [NSString stringWithFormat:@"%@(%@)",NSLocalizedString(@"setting_opration_fail", @"鎿嶄綔澶辫触"),responseData.code];
+
+ [self.view makeToast:mes duration:2.0 position:@"center"];
}
}];
+
+
}
}
--
Gitblit v1.8.0