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/ViewController.m |   68 +++++++++++++++++++++++++++++++--
 1 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m
index a06dbdf..8c6f738 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m
@@ -11,6 +11,7 @@
 #import "DDKit.h"
 #import "EZSDK.h"
 #import "MBProgressHUD.h"
+#import "EZCameraInfo.h"
 
 @interface ViewController ()
 @property (weak, nonatomic) IBOutlet UIButton *ddnsDemoBtn;
@@ -55,18 +56,17 @@
 //     */
 //    [self performSegueWithIdentifier:@"go2CameraList" sender:nil];
     
-    [EZSDK setHDlAccessToken:@"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI4ZmIxNDBlYzMzYTM0OGU2YjgyYjg5MmJhNDc4NzljMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiIxODgyNDg2NDE0MyIsInRlbmFudElkIjoiMjAiLCJ1c2VyVHlwZSI6IlVTRVJfQyIsInRva2VuVHlwZSI6ImFjY2Vzc190b2tlbiIsInVzZXJOYW1lIjoiTEUwMDAiLCJhcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzMjg4ODYyNzMwMDM4NTU4NzQiLCJleHAiOjE2MTQ5MTc0NzYsIm5iZiI6MTYxNDkxMDI3Nn0.RUKrm2BARWbdwmhj6KKlqalYCXUQ7hIRJBT-5LbPM2EUs2eLNFnwSxx3CGTgN94l3-5WW00srhzvcx6la4IAMfR1kh8-vzr4bXcXOs-wXifxIyt36Y3j9wodzEUWnR0w-42XlQb3jjlz9LiaFKWAHoXaOsmb3Uf6UsoWdqFlnSc" refreshToken:@"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJhZTU1NjBmOTRlNzY0Mzk5ODFlY2MzZDZkZGQ3NDNhYiIsImhlYWRlclByZWZpeCI6IkJlYXJlciAiLCJ0ZW5hbnRJZCI6IjIwIiwidG9rZW5UeXBlIjoicmVmcmVzaF90b2tlbiIsImFwcGxpY2F0aW9uSWQiOiIwIiwidXNlcklkIjoiMTMyODg4NjI3MzAwMzg1NTg3NCIsImV4cCI6MTYxNTUxNTA3NiwibmJmIjoxNjE0OTEwMjc2fQ.YTb0I1t9SKJpoQmdGDyzOIB6mVNQ94AteekAgs15bFsx_LVsj9xOoiURGVfHpthqpCcvL4MxYAYqLjDQHqsf_FbT0KKujqCOjTfnVB-EkqKm5yCmq827NEbq3ZukBcGs0fxGxRQJPzkDyd0AerzkwERYZqryoooNGsOeMN6vC_k"];
     
-//    [EZSDK setRequestHttpsHost:@"https://nearest.hdlcontrol.com"];
     
+    [self initChina];
     
     
     __weak MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     hud.labelText = NSLocalizedString(@"ad_adding_msg", @"姝ｅ湪娣诲姞锛岃绋嶅��...");
-    [EZHttpUtil.sharedManager  getChildToken:^(NSString *accessToken) {
+    [EZHttpUtil.sharedManager getChildToken:^(NSString *accessToken) {
         [hud hide:YES];
         if(accessToken != NULL && ![accessToken isEqual:@""]){
-            [[GlobalKit shareKit] setAccessToken:accessToken];
+            [[EZSDK sharedInstance] setEZAccessToken:accessToken];
             /**
              *  涓嬮潰浠ｇ爜鍔熻兘涓庝互涓婄殑娉ㄩ噴鏂规硶鐩稿悓
              */
@@ -75,16 +75,74 @@
         }
     }];
 }
+-(void)initTest{
+ 
+    
+}
+-(void)initChina{
+//    [[EZSDK sharedInstance] setHDlAccessToken:@"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI3NzEwNjRjODZhOTU0MzM0ODgyYzVmZDNhNWUxNDdiMyIsImNvbXBhbnlJZCI6IjAiLCJyb2xlIjoiIiwiaGVhZGVyUHJlZml4IjoiQmVhcmVyICIsInRlbmFudElkIjoiMjAiLCJ1c2VyVHlwZSI6IlVTRVJfQyIsInRva2VuVHlwZSI6ImFjY2Vzc190b2tlbiIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzNTAyODA5OTU5OTg4NjMzNjEiLCJleHAiOjE2MjY2NzE4ODQsIm5iZiI6MTYyNjY2NDY4NH0.bER2i5FI5Y8QVDFhDY6yNB7Q8fM844C-yM4jmk1M5H16hhxiQYSyVAL5ljKmMrBC9YXhJbd0QeqoSflhYLy98-e9VxBgdNdyKQAIMb4pW8jdbDRrSWhM5QMRwxcbiCG_6C3n4qqYBqH7JuYS6BkQ96QQK6ly0lLgL_Nib9JFRt4" refreshToken:@"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI0NzJkMzk1ZmVmMmM0YTk2YTZmZDAzYWZmNTVkYjdkMSIsImNvbXBhbnlJZCI6IjAiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidGVuYW50SWQiOiIyMCIsInRva2VuVHlwZSI6InJlZnJlc2hfdG9rZW4iLCJvcGVuQXBwbGljYXRpb25JZCI6IjAiLCJ1c2VySWQiOiIxMzUwMjgwOTk1OTk4ODYzMzYxIiwiZXhwIjoxNjI3MjY5NDg0LCJuYmYiOjE2MjY2NjQ2ODR9.QFgMui3Wg8wIG9yRxJ-zpL0nsMs7g6Z03yVpsp0ZKhW3NvoK4agT3WmkrHIhxAqpMr1foSzuxhs-JYk3b9398rJByHelWzkaKNWXjG4LHz2lAlooSEgrgM9NqRsnNfs31aYB5AHvGYF1FuUO0YS367Uafx_NM6LgfBz3n4sWFyw"];
+//
+//
+//    [[EZSDK sharedInstance] setRequestHttpsHostAndPlatform:@"https://china-gateway.hdlcontrol.com" platform:1 homeId:@"1409421094585028610"];
+    [[EZSDK sharedInstance] setHDlAccessToken:@"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJmNDE3MGQyZjIxZWI0NjMyYWU5ZmUxOTM5NDJmOTNmYiIsImNvbXBhbnlJZCI6IjAiLCJyb2xlIjoiIiwiaGVhZGVyUHJlZml4IjoiQmVhcmVyICIsInRlbmFudElkIjoiMjAiLCJ1c2VyVHlwZSI6IlVTRVJfQyIsInRva2VuVHlwZSI6ImFjY2Vzc190b2tlbiIsInVzZXJOYW1lIjoi5ZiJ5LmQIiwib3BlbkFwcGxpY2F0aW9uSWQiOiIwIiwidXNlcklkIjoiMTM1NzEzODQzNDgyODMzMzA1OCIsImV4cCI6MTYzNDAyNzAxOSwibmJmIjoxNjM0MDE5ODE5fQ.Bn4bTXJq-o4Ch05rM81UdjR_EO4ybEpGwzt19as16UaoQVR9i2OGgoT7r4jVjC204o1APLC3JvrPq-eJKXieh7VBP6n5s-2BwGHTdV4W2cKdiMC5ciVeHFopmkw7cd3JNkxgGiXykQqxMnIl3keNXu5VXjo4XCOw3cYOuXhg_ZA" refreshToken:@"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiIxMWIyNDFjY2U2MDE0YTM2YmIyMTdjZGFhZGY0NzlhMCIsImNvbXBhbnlJZCI6IjAiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidGVuYW50SWQiOiIyMCIsInRva2VuVHlwZSI6InJlZnJlc2hfdG9rZW4iLCJvcGVuQXBwbGljYXRpb25JZCI6IjAiLCJ1c2VySWQiOiIxMzU3MTM4NDM0ODI4MzMzMDU4IiwiZXhwIjoxNjM0NjI0NjE5LCJuYmYiOjE2MzQwMTk4MTl9.GL9idS-BWGVbZG8RdmwM1sATKJr9FC6Z4x64xZoZf0E421iL_IkGy2iflLWToTmeLqMzBJ-bjN34yCgban-7M4dY5HuEMvWbxgP5sAiXTuS9z1UDkbry8gvs6zrcVUreb9H5ciroNJOh20yoCzfnfXZVl9M7w5acCkl9UmdtX0c"];
+    
+    
+    [[EZSDK sharedInstance] setRequestHttpsHostAndPlatform:@"https://china-gateway.hdlcontrol.com" platform:1 homeId:@"1357564319439441921"];
+    
+    
+}
 
 - (IBAction)logout:(id)sender
 {
-   
+    
+    return;
+//    [[GlobalKit shareKit] setAccessToken:@"ra.a5bfkhhx7ycscsj41if7l0cf9ytfhv5q-9keuxvphmn-1fvjt6p-jugtyy8sr"];
+    [[EZSDK sharedInstance] setHDlAccessToken:@"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJmNDE3MGQyZjIxZWI0NjMyYWU5ZmUxOTM5NDJmOTNmYiIsImNvbXBhbnlJZCI6IjAiLCJyb2xlIjoiIiwiaGVhZGVyUHJlZml4IjoiQmVhcmVyICIsInRlbmFudElkIjoiMjAiLCJ1c2VyVHlwZSI6IlVTRVJfQyIsInRva2VuVHlwZSI6ImFjY2Vzc190b2tlbiIsInVzZXJOYW1lIjoi5ZiJ5LmQIiwib3BlbkFwcGxpY2F0aW9uSWQiOiIwIiwidXNlcklkIjoiMTM1NzEzODQzNDgyODMzMzA1OCIsImV4cCI6MTYzNDAyNzAxOSwibmJmIjoxNjM0MDE5ODE5fQ.Bn4bTXJq-o4Ch05rM81UdjR_EO4ybEpGwzt19as16UaoQVR9i2OGgoT7r4jVjC204o1APLC3JvrPq-eJKXieh7VBP6n5s-2BwGHTdV4W2cKdiMC5ciVeHFopmkw7cd3JNkxgGiXykQqxMnIl3keNXu5VXjo4XCOw3cYOuXhg_ZA" refreshToken:@"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiIxMWIyNDFjY2U2MDE0YTM2YmIyMTdjZGFhZGY0NzlhMCIsImNvbXBhbnlJZCI6IjAiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidGVuYW50SWQiOiIyMCIsInRva2VuVHlwZSI6InJlZnJlc2hfdG9rZW4iLCJvcGVuQXBwbGljYXRpb25JZCI6IjAiLCJ1c2VySWQiOiIxMzU3MTM4NDM0ODI4MzMzMDU4IiwiZXhwIjoxNjM0NjI0NjE5LCJuYmYiOjE2MzQwMTk4MTl9.GL9idS-BWGVbZG8RdmwM1sATKJr9FC6Z4x64xZoZf0E421iL_IkGy2iflLWToTmeLqMzBJ-bjN34yCgban-7M4dY5HuEMvWbxgP5sAiXTuS9z1UDkbry8gvs6zrcVUreb9H5ciroNJOh20yoCzfnfXZVl9M7w5acCkl9UmdtX0c"];
+    
+    [[EZSDK sharedInstance] setRequestHttpsHostAndPlatform:@"https://test-gz.hdlcontrol.com" platform:1 homeId:@"1396717478877241345"];
+
+    
+    __weak MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+    hud.labelText = NSLocalizedString(@"ad_adding_msg", @"璇风◢鍊�...");
+    [EZHttpUtil.sharedManager getChildToken:^(NSString *accessToken) {
+        [hud hide:YES];
+        if(accessToken != NULL && ![accessToken isEqual:@""]){
+            NSLog(@"accessToken HDL:%@",accessToken);
+            [[EZSDK sharedInstance] setEZAccessToken:accessToken];
+            
+//            [[EZSDK sharedInstance] PlayWithDeviceSerial:@"F44133728"];
+            
+//            EZAlarmInfo *info = [[EZAlarmInfo alloc] init];
+//            info.alarmName = @"浜轰綋妫�娴�";
+//            info.alarmPicUrl = @"https://i.ys7.com/streamer/alarm/url/get?fileId=20210707204930-F41014762-1-00000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&ct=1&lc=90&bn=1_hikalarm";
+//            [[EZSDK sharedInstance] goToEZMessagePhotoVC:info];
+            
+        }
+    }];
+    
 //    [EZOPENSDK logout:^(NSError *error) {
 //    }];
     
 
 }
 
+-(void)getEzDeviceInfo:(NSString *)deviceSerial{
+    
+    //鑾峰彇璁惧鍒楄〃鎺ュ彛
+    [EZOpenSDK getDeviceInfo:deviceSerial completion:^(EZDeviceInfo *deviceInfo, NSError *error) {
+        if(error)
+        {
+            return;
+        }
+        if (deviceInfo) {
+            [[EZSDK sharedInstance] Play:deviceInfo];
+        }
+    
+    }];
+        
+//    [EZOPENSDK :deviceSerial];
+}
+
 - (void)handleTheError:(NSError *)error
 {
     if (!error)

--
Gitblit v1.8.0