From 48c5a2c66c549d26fecadc6d2dad1924fdd1cc8b Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期四, 27 七月 2023 13:52:08 +0800
Subject: [PATCH] bugfix 猫眼呼叫问题修复
---
EZSDK/EZSDK/EZSDK.m | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/EZSDK/EZSDK/EZSDK.m b/EZSDK/EZSDK/EZSDK.m
index 4300cc7..b9b1725 100644
--- a/EZSDK/EZSDK/EZSDK.m
+++ b/EZSDK/EZSDK/EZSDK.m
@@ -204,12 +204,19 @@
[[self getCurrentVC] pushViewController:rootViewController animated:YES];
}
-- (void)Play:(EZDeviceInfo*)deviceInfo showCallout:(BOOL)isShow {
+/**
+ 鏌ョ湅瑙嗛鐩戞帶鐩存挱
+ @param deviceInfo 璁惧淇℃伅
+ @param msgId 娑堟伅Id
+ @param isShow 鏄惁灞曠ず鍛煎彨寮规
+ */
+- (void)Play:(EZDeviceInfo*)deviceInfo messageId:(NSString *)msgId 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;
+ rootViewController.msgId = msgId;
NSLog(@"play--iphone--deviceName -%@",rootViewController.deviceInfo.deviceName);
[[self getCurrentVC].navigationBar setHidden:NO];
@@ -232,6 +239,22 @@
}];
}
+/// 鎸囧畾搴忓垪鍙� 鏌ョ湅瑙嗛鐩戞帶鐩存挱(鐚溂鍛煎彨鍔熻兘)
+/// @param deviceSerial 搴忓垪鍙�
+- (void)PlayWithDeviceSerial:(NSString *)deviceSerial msgId:(NSString *)msgId {
+ //鑾峰彇璁惧鍒楄〃鎺ュ彛
+ [EZOpenSDK getDeviceInfo:deviceSerial completion:^(EZDeviceInfo *deviceInfo, NSError *error) {
+ if(error)
+ {
+ NSLog(@"EZ 鏌ヨ璁惧淇℃伅澶辫触");
+ return;
+ }
+ if (deviceInfo) {
+ [self Play:deviceInfo messageId:msgId showCallout:YES];
+ }
+ }];
+}
+
/**
鏍规嵁搴忓垪鍙疯繘鍏ラ棬閿佽棰�
@param deviceSerial 搴忓垪鍙�
@@ -253,6 +276,24 @@
[[self getCurrentVC] pushViewController:vc animated:YES];
}
+-(void)PlayWithDeviceSerial:(NSString *)deviceSerial deviceId:(NSString*)deviceId deviceType:(NSString *)deviceType msgId:(NSString *)msgId {
+ 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.isShowAlert = YES;
+ vc.msgId = msgId;
+
+ vc.isVideoDoorLock = [deviceType isEqualToString:HDLEZ_DOOR_SPK];
+ [[self getCurrentVC] setNavigationBarHidden:NO];
+ [[self getCurrentVC].navigationBar setHidden:NO];
+ [[self getCurrentVC] pushViewController:vc animated:YES];
+}
+
/**
鎵撳紑鎽勫儚澶磋缃〉闈�
*/
--
Gitblit v1.8.0