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/EZSettingViewController.m |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZSettingViewController.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZSettingViewController.m
index 1b4e1c4..2719447 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZSettingViewController.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/UIViewControllers/EZSettingViewController.m
@@ -142,6 +142,7 @@
 
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
+    self.navigationController.navigationBar.hidden = NO;//2021-02-01
     [self.tableView reloadData];
 }
 
@@ -150,7 +151,7 @@
         [_timer invalidate];
         _timer = nil;
     }
-
+//    self.navigationController.navigationBarHidden = YES;//2021-02-01 娣诲姞闅愯棌navigationBarHidden
     [super viewWillDisappear:animated];
 }
 
@@ -359,10 +360,27 @@
     {
         __weak MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
         hud.labelText = NSLocalizedString(@"message_deleting", @"姝e湪鍒犻櫎锛岃绋嶅��...");
-        [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)
                 {
@@ -373,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