From cf977559d6821a1ccce2acae076835a8037f2a90 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期一, 05 六月 2023 11:47:18 +0800
Subject: [PATCH] 1.提交萤石demo 2.修改部分UI

---
 EZSDK/EZSDK/EZSDK.m |   88 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 72 insertions(+), 16 deletions(-)

diff --git a/EZSDK/EZSDK/EZSDK.m b/EZSDK/EZSDK/EZSDK.m
index 81b7859..ae54994 100644
--- a/EZSDK/EZSDK/EZSDK.m
+++ b/EZSDK/EZSDK/EZSDK.m
@@ -7,21 +7,20 @@
 
 #import "EZSDK.h"
 //#import "DeviceInfo.h"
-#import "EZDeviceInfo.h"
-#import "EZOpenSDK.h"
+#import <EZOpenSDKFramework/EZDeviceInfo.h>
+#import <EZOpenSDKFramework/EZOpenSDK.h>
 #import "GlobalKit.h"
-#import "EZAccessToken.h"
+#import <EZOpenSDKFramework/EZAccessToken.h>
 #import "NSArray+DDKit.h"
 #import "EZAddByQRCodeViewController.h"
 #import "EZLivePlayViewController.h"
 #import "EZSettingViewController.h"
 #import "EZPlaybackViewController.h"
 #import "EZDeviceTableViewController.h"
-#import "EZHCNetDeviceSDK.h"
+#import <EZOpenSDKFramework/EZHCNetDeviceSDK.h>
 #import "EZMessagePhotoViewController.h"
 #import "HDLEZVisitorRecordViewController.h"
-
-
+#import "HDLEZDeviceMsgListViewController.h"
 
 @implementation EZSDK
 
@@ -52,11 +51,11 @@
         if (!LanguageIsChinese) {
             //娴峰鐗�
             isHavelibInit = [EZGlobalSDK initLibWithAppKey:globalAppKey];
-            NSLog(@"娴峰鐗坘ey--%@",globalAppKey);
+            HDLEZLog(@"娴峰鐗坘ey--%@",globalAppKey);
         }else{
             isHavelibInit = [EZOpenSDK initLibWithAppKey:appKey];
             [[GlobalKit shareKit] setHdlAppKey:appKey];
-            NSLog(@"鍥藉唴鐗坘ey--%@", appKey);
+            HDLEZLog(@"鍥藉唴鐗坘ey--%@", appKey);
         }
         [EZHCNetDeviceSDK initSDK];
         [EZOPENSDK enableP2P:YES];
@@ -120,16 +119,35 @@
  */
 -(void)go2EZvizMonitor
 {
-    //    NSLog(@"go2EZvizMonitor");
+//    [GlobalKit shareKit].deviceType=HDLEZDeviceType_Default;
+//    //    NSLog(@"go2EZvizMonitor");
+//    //鑾峰彇EZMain鐨剆troyboard鏂囦欢
+//    UIStoryboard *ezMainStoryboard = [UIStoryboard storyboardWithName:@"EZMain" bundle:nil];
+//    //鑾峰彇EZMain.storyboard鐨勫疄渚媀iewController--鑾峰彇鎽勫儚澶村垪琛�
+//    EZDeviceTableViewController *instanceVC = [ezMainStoryboard instantiateViewControllerWithIdentifier:@"EZCameraList"];
+//    //push鎽勫儚澶村垪琛ㄧ殑viewController
+//    [[self getCurrentVC] setNavigationBarHidden:NO];
+//    //        NSLog(@"willpush********");
+//    [[self getCurrentVC] pushViewController:instanceVC animated:YES];
+//    //        NSLog(@"had pushed********");
+    [self toEZDeviceListViewWithFilterTypes:@[@""]];
+}
+
+/**
+ 鐩存帴璺宠浆鍒拌悿鐭虫憚鍍忓ご鍒楄〃(绛涙帀闂ㄩ攣璁惧)
+ @param filterTepes 杩囨护鍨嬪彿鏁扮粍
+ */
+- (void)toEZDeviceListViewWithFilterTypes:(NSArray*)filterTepes{
+    [GlobalKit shareKit].deviceType=HDLEZDeviceType_Default;
     //鑾峰彇EZMain鐨剆troyboard鏂囦欢
     UIStoryboard *ezMainStoryboard = [UIStoryboard storyboardWithName:@"EZMain" bundle:nil];
     //鑾峰彇EZMain.storyboard鐨勫疄渚媀iewController--鑾峰彇鎽勫儚澶村垪琛�
     EZDeviceTableViewController *instanceVC = [ezMainStoryboard instantiateViewControllerWithIdentifier:@"EZCameraList"];
+    instanceVC.filterTypes=filterTepes;
     //push鎽勫儚澶村垪琛ㄧ殑viewController
     [[self getCurrentVC] setNavigationBarHidden:NO];
-    //        NSLog(@"willpush********");
+//    [[self getCurrentVC].navigationBar setHidden:NO];
     [[self getCurrentVC] pushViewController:instanceVC animated:YES];
-    //        NSLog(@"had pushed********");
 }
 
 /**
@@ -147,20 +165,22 @@
 //        //        [UIView dd_showMessage:@"iOS 7.0浠ヤ笅鎵爜鍔熻兘璇疯嚜琛屽疄鐜�"];
 //        NSLog(@"iOS 7.0浠ヤ笅鎵爜鍔熻兘璇疯嚜琛屽疄鐜�");
 //    }
-    [self addEzvizMonitorWithDeviceType:HDLEZDeviceType_Default];
+    [self addEzvizMonitorWithDeviceType:@""];
 }
 
 /**
  璺宠浆娣诲姞娣诲姞璁惧
  @param deviceType 璁惧绫诲瀷
  */
-- (void)addEzvizMonitorWithDeviceType:(HDLEZDeviceType)deviceType{
+- (void)addEzvizMonitorWithDeviceType:(NSString *)deviceType{
+    HDLEZDeviceType type=[deviceType isEqualToString:HDLEZ_DOOR_SPK] ? HDLEZDeviceType_Door : HDLEZDeviceType_Default;
     //    NSLog(@"娣诲姞鎽勫儚澶�");
     if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 7.0) {
         UIStoryboard *addDeviceStoryBoard = [UIStoryboard storyboardWithName:@"AddDevice" bundle:nil];
         EZAddByQRCodeViewController *rootViewController = [addDeviceStoryBoard instantiateViewControllerWithIdentifier:@"AddByQRCode"];
-        rootViewController.deviceType=deviceType;
+        rootViewController.deviceType=type;
         [[self getCurrentVC] setNavigationBarHidden:NO];
+        [[self getCurrentVC].navigationBar setHidden:NO];
         [[self getCurrentVC] pushViewController:rootViewController animated:YES];
     } else {
         //        [UIView dd_showMessage:@"iOS 7.0浠ヤ笅鎵爜鍔熻兘璇疯嚜琛屽疄鐜�"];
@@ -173,13 +193,14 @@
  */
 -(void)Play:(EZDeviceInfo*)deviceInfo
 {
+    [GlobalKit shareKit].deviceType=HDLEZDeviceType_Default;
     UIStoryboard *addDeviceStoryBoard = [UIStoryboard storyboardWithName:@"EZMain" bundle:nil];
     EZLivePlayViewController *rootViewController = [addDeviceStoryBoard instantiateViewControllerWithIdentifier:@"EZLivePlayViewController"];
     //        NSLog(@"play--iphone--rootViewController");
     rootViewController.deviceInfo=(EZDeviceInfo *)deviceInfo;
     NSLog(@"play--iphone--deviceName -%@",rootViewController.deviceInfo.deviceName);
 //            rootViewController.cameraIndex=0;
-    [[self getCurrentVC] setNavigationBarHidden:NO];
+    [[self getCurrentVC].navigationBar setHidden:NO];
     [[self getCurrentVC] pushViewController:rootViewController animated:YES];
     
     
@@ -202,6 +223,26 @@
 }
 
 /**
+ 鏍规嵁搴忓垪鍙疯繘鍏ラ棬閿佽棰�
+ @param deviceSerial 搴忓垪鍙�
+ @param deviceId 璁惧id
+ @param deviceType 璁惧spk(鐢ㄤ簬鍖哄垎鏄惁涓洪棬閿�)
+ */
+-(void)PlayWithDeviceSerial:(NSString *)deviceSerial deviceId:(NSString*)deviceId deviceType:(NSString *)deviceType{
+    if ([[self getCurrentVC] isKindOfClass:[EZLivePlayViewController class]]) {//闃叉閲嶅杩涘叆
+        return;
+    }
+    [GlobalKit shareKit].deviceType=[deviceType isEqualToString:HDLEZ_DOOR_SPK] ? HDLEZDeviceType_Door : HDLEZDeviceType_Default;
+    UIStoryboard *ezMainStoryBoard = [UIStoryboard storyboardWithName:@"EZMain" bundle:nil];
+    EZLivePlayViewController *vc = [ezMainStoryBoard instantiateViewControllerWithIdentifier:@"EZLivePlayViewController"];
+    vc.deviceId=deviceId;
+    vc.deviceSerial=deviceSerial;
+    [[self getCurrentVC] setNavigationBarHidden:NO];
+    [[self getCurrentVC].navigationBar setHidden:NO];
+    [[self getCurrentVC] pushViewController:vc animated:YES];
+}
+
+/**
  鎵撳紑鎽勫儚澶磋缃〉闈�
  */
 -(void)setting:(EZDeviceInfo*)deviceInfo
@@ -210,6 +251,7 @@
     EZSettingViewController *settingVC=[settingStoryBoard instantiateViewControllerWithIdentifier:@"EZSettingViewController"];
     settingVC.deviceInfo=(EZDeviceInfo *)deviceInfo;
     [[self getCurrentVC] setNavigationBarHidden:NO];
+    [[self getCurrentVC].navigationBar setHidden:NO];
     [[self getCurrentVC] pushViewController:settingVC animated:YES];
 }
 
@@ -222,6 +264,7 @@
     EZPlaybackViewController *playBackVC=[playBackStoryBoard instantiateViewControllerWithIdentifier:@"EZPlaybackViewController"];
     playBackVC.deviceInfo=(EZDeviceInfo *)deviceInfo;
     [[self getCurrentVC] setNavigationBarHidden:NO];
+    [[self getCurrentVC].navigationBar setHidden:NO];
     [[self getCurrentVC] pushViewController:playBackVC animated:YES];
 }
 
@@ -231,10 +274,23 @@
 - (void)toTemPassView:(NSString*)deviceId{
     HDLEZVisitorRecordViewController *vc=[[HDLEZVisitorRecordViewController alloc] init];
     vc.deviceId=deviceId;
-    [[self getCurrentVC] setNavigationBarHidden:YES];
+//    [[self getCurrentVC] setNavigationBarHidden:YES];
+    [[self getCurrentVC].navigationBar setHidden:YES];
     [[self getCurrentVC] pushViewController:vc animated:YES];
 }
 
+/**璁惧鍘嗗彶璁板綍椤�
+ @param deviceId 璁惧id
+ */
+- (void)toDeviceMsgListView:(NSString*)deviceId{
+    HDLEZDeviceMsgListViewController *vc=[[HDLEZDeviceMsgListViewController alloc] init];
+    vc.deviceId=deviceId;
+//    [[self getCurrentVC] setNavigationBarHidden:YES];
+    [[self getCurrentVC].navigationBar setHidden:YES];
+    [[self getCurrentVC] pushViewController:vc animated:YES];
+
+}
+
 ////
 //-(void)goToEZMessagePhotoVC:(EZAlarmInfo*)alarmInfo{
 //    UIStoryboard *addDeviceStoryBoard = [UIStoryboard storyboardWithName:@"EZMain" bundle:nil];

--
Gitblit v1.8.0