From d93de8833865eb833ca72320f317bf92ba2ae52a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 08 七月 2021 15:38:24 +0800
Subject: [PATCH] 2021-07-08 1.更新
---
EZSDK/EZSDK/EZSDK.m | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/EZSDK/EZSDK/EZSDK.m b/EZSDK/EZSDK/EZSDK.m
index 57ebd9c..cfb414f 100644
--- a/EZSDK/EZSDK/EZSDK.m
+++ b/EZSDK/EZSDK/EZSDK.m
@@ -74,9 +74,10 @@
/**
璁剧疆SDK鐨勬渤涓滄帴鍙ｇ殑requestHttpsHost鍜屽钩鍙� 鏍囪瘑锛�1.on+(榛樿) 2.evoyo
*/
-+(void)setRequestHttpsHostAndPlatform:(NSString *) requestHttpsHost platform:(int) platform{
++(void)setRequestHttpsHostAndPlatform:(NSString *) requestHttpsHost platform:(int)platform homeId:(NSString *)homeId{
[[GlobalKit shareKit] setGlobalRequestHttpsHost:requestHttpsHost];
[[GlobalKit shareKit] setHdlPlatform:platform];
+ [[GlobalKit shareKit] setHdlHomeId:homeId];
}
//鑾峰彇褰撳墠灞忓箷鏄剧ず鐨剉iewcontroller (杩欓噷闈㈣幏鍙栫殑鐩稿綋浜巖ootViewController)
@@ -138,22 +139,40 @@
/**
鏌ョ湅瑙嗛鐩戞帶鐩存挱
*/
-+(void)Play:(NSObject*)deviceInfo
++(void)Play:(EZDeviceInfo*)deviceInfo
{
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;
+// rootViewController.cameraIndex=0;
[[self getCurrentVC] setNavigationBarHidden:NO];
[[self getCurrentVC] pushViewController:rootViewController animated:YES];
+
+
+}
+
+/// 鎸囧畾搴忓垪鍙锋挱鏀�
+/// @param deviceSerial 搴忓垪鍙�
++(void)PlayWithDeviceSerial:(NSString *)deviceSerial{
+ //鑾峰彇璁惧鍒楄〃鎺ュ彛
+ [EZOpenSDK getDeviceInfo:deviceSerial completion:^(EZDeviceInfo *deviceInfo, NSError *error) {
+ if(error)
+ {
+ NSLog(@"EZ 鏌ヨ璁惧淇℃伅澶辫触");
+ return;
+ }
+ if (deviceInfo) {
+ [self Play:deviceInfo];
+ }
+ }];
}
/**
鎵撳紑鎽勫儚澶磋缃〉闈�
*/
-+(void)setting:(NSObject*)deviceInfo
++(void)setting:(EZDeviceInfo*)deviceInfo
{
UIStoryboard *settingStoryBoard=[UIStoryboard storyboardWithName:@"EZMain" bundle:nil];
EZSettingViewController *settingVC=[settingStoryBoard instantiateViewControllerWithIdentifier:@"EZSettingViewController"];
@@ -165,7 +184,7 @@
/**
鍥炴斁鎾斁鍘嗗彶
*/
-+(void)playBackVideo:(NSObject*)deviceInfo
++(void)playBackVideo:(EZDeviceInfo*)deviceInfo
{
UIStoryboard *playBackStoryBoard=[UIStoryboard storyboardWithName:@"EZMain" bundle:nil];
EZPlaybackViewController *playBackVC=[playBackStoryBoard instantiateViewControllerWithIdentifier:@"EZPlaybackViewController"];
--
Gitblit v1.8.0