From f61d0079e62f0aff83e15a5a3d584e7523f26321 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 11 三月 2021 15:33:35 +0800
Subject: [PATCH] 2021-03-11 1.增加ON+集成丰林项目相关工程
---
ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/OpenViewController.m | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/OpenViewController.m b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/OpenViewController.m
index 8805112..1270e8e 100644
--- a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/OpenViewController.m
+++ b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/OpenViewController.m
@@ -12,7 +12,7 @@
#import "GDHDLUtlis.h"
-
+#import "ESVideo.h"
@interface OpenViewController ()
@@ -35,13 +35,17 @@
- (void)viewDidLoad {
[super viewDidLoad];
self.view.backgroundColor = [UIColor whiteColor];
+
+ [ESVideo.shareInstance initSDK];
// Do any additional setup after loading the view.
[self.view addSubview:self.monitorBtn];
[self.view addSubview:self.calledBtn];
- DEVICEID = @"JJY000017XLUXX";
-// DEVICEID = @"JJY000016YWECG";
+ // DEVICEID = @"JJY000017XLUXX";
+ DEVICEID = @"JJY000019VPLLF";
+
+// DEVICEID = @"JJY000016YWECG";
}
@@ -68,16 +72,16 @@
-(void)monitorAction{
ESVideoMonitorViewController *mVc = [[ESVideoMonitorViewController alloc] init];
-// mVc.modalPresentationStyle = UIModalPresentationFullScreen;
-// mVc.edgesForExtendedLayout = YES;
+ // mVc.modalPresentationStyle = UIModalPresentationFullScreen;
+ // mVc.edgesForExtendedLayout = YES;
mVc.deviceName = @"瀹ゅ鏈�";
mVc.roomName = @"2鏍�108";
mVc.mESRoomID = 888;
-
+
// mVc.mESVideoID = @"JJY000007FSEYX";
-// mVc.mESVideoID = @"JJY000016YWECG";
-// mVc.mESVideoID = @"JJY000016YWECG";
- mVc.mESVideoID = DEVICEID;
+ // mVc.mESVideoID = @"JJY000016YWECG";
+ // mVc.mESVideoID = @"JJY000016YWECG";
+ mVc.mESVideoID = DEVICEID;
mVc.isCollect = self.isCollect;
@@ -94,7 +98,7 @@
NSLog(@"CallBack%@",str);
};
-// [self presentViewController:mVc animated:YES completion:nil];
+ // [self presentViewController:mVc animated:YES completion:nil];
[self.navigationController pushViewController:mVc animated:YES];
@@ -127,13 +131,13 @@
-(void)calledAction{
ESvideoVideoIntercomViewController *mVc = [[ESvideoVideoIntercomViewController alloc] init];
-// mVc.modalPresentationStyle = UIModalPresentationFullScreen;
-// mVc.edgesForExtendedLayout = YES;
+ // mVc.modalPresentationStyle = UIModalPresentationFullScreen;
+ // mVc.edgesForExtendedLayout = YES;
mVc.deviceName = @"瀹ゅ鏈�2";
mVc.roomName = @"3鏍�808";
mVc.mESRoomID = 888;
// mVc.mESVideoID = @"JJY000007FSEYX";
-// mVc.mESVideoID = @"JJY000016YWECG";
+ // mVc.mESVideoID = @"JJY000016YWECG";
mVc.mESVideoID = DEVICEID;
mVc.isCollect = self.isCollect;
@@ -149,8 +153,8 @@
NSLog(@"CallBack%@",str);
};
-// [self presentViewController:mVc animated:YES completion:nil];
- [self.navigationController pushViewController:mVc animated:YES];
+ // [self presentViewController:mVc animated:YES completion:nil];
+ [self.navigationController pushViewController:mVc animated:YES];
}
--
Gitblit v1.8.0