From 3e4be5ed4d2c0395dd60e392baf86c59762059b1 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期五, 30 六月 2023 10:14:50 +0800
Subject: [PATCH] feature 猫眼全屏布局调整 && UI细节适配

---
 EZSDK/EZSDK/EZSDK.m |   43 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/EZSDK/EZSDK/EZSDK.m b/EZSDK/EZSDK/EZSDK.m
index d7c2c54..4300cc7 100644
--- a/EZSDK/EZSDK/EZSDK.m
+++ b/EZSDK/EZSDK/EZSDK.m
@@ -7,17 +7,17 @@
 
 #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"
@@ -51,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];
@@ -146,6 +146,7 @@
     instanceVC.filterTypes=filterTepes;
     //push鎽勫儚澶村垪琛ㄧ殑viewController
     [[self getCurrentVC] setNavigationBarHidden:NO];
+//    [[self getCurrentVC].navigationBar setHidden:NO];
     [[self getCurrentVC] pushViewController:instanceVC animated:YES];
 }
 
@@ -179,6 +180,7 @@
         EZAddByQRCodeViewController *rootViewController = [addDeviceStoryBoard instantiateViewControllerWithIdentifier:@"AddByQRCode"];
         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浠ヤ笅鎵爜鍔熻兘璇疯嚜琛屽疄鐜�"];
@@ -198,10 +200,20 @@
     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];
-    
-    
+}
+
+- (void)Play:(EZDeviceInfo*)deviceInfo showCallout:(BOOL)isShow {
+    [GlobalKit shareKit].deviceType=HDLEZDeviceType_Default;
+    UIStoryboard *addDeviceStoryBoard = [UIStoryboard storyboardWithName:@"EZMain" bundle:nil];
+    EZLivePlayViewController *rootViewController = [addDeviceStoryBoard instantiateViewControllerWithIdentifier:@"EZLivePlayViewController"];
+    rootViewController.isShowAlert = isShow;
+    rootViewController.deviceInfo=(EZDeviceInfo *)deviceInfo;
+    NSLog(@"play--iphone--deviceName -%@",rootViewController.deviceInfo.deviceName);
+
+    [[self getCurrentVC].navigationBar setHidden:NO];
+    [[self getCurrentVC] pushViewController:rootViewController animated:YES];
 }
 
 /// 鎸囧畾搴忓垪鍙锋挱鏀�
@@ -227,12 +239,17 @@
  @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;
+    vc.isVideoDoorLock = [deviceType isEqualToString:HDLEZ_DOOR_SPK];
     [[self getCurrentVC] setNavigationBarHidden:NO];
+    [[self getCurrentVC].navigationBar setHidden:NO];
     [[self getCurrentVC] pushViewController:vc animated:YES];
 }
 
@@ -245,6 +262,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];
 }
 
@@ -257,6 +275,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];
 }
 
@@ -266,7 +285,8 @@
 - (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];
 }
 
@@ -276,7 +296,8 @@
 - (void)toDeviceMsgListView:(NSString*)deviceId{
     HDLEZDeviceMsgListViewController *vc=[[HDLEZDeviceMsgListViewController alloc] init];
     vc.deviceId=deviceId;
-    [[self getCurrentVC] setNavigationBarHidden:YES];
+//    [[self getCurrentVC] setNavigationBarHidden:YES];
+    [[self getCurrentVC].navigationBar setHidden:YES];
     [[self getCurrentVC] pushViewController:vc animated:YES];
 
 }

--
Gitblit v1.8.0