From d2d5878e3e78ec456ba571fd8970eb8403089681 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 22 六月 2020 09:43:26 +0800
Subject: [PATCH] 2020-06-22 1.更新

---
 ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/OpenViewController.m |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/OpenViewController.m b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/OpenViewController.m
index 8805112..e08f37f 100644
--- a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/OpenViewController.m
+++ b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/OpenViewController.m
@@ -40,8 +40,10 @@
     [self.view addSubview:self.monitorBtn];
     [self.view addSubview:self.calledBtn];
     
-    DEVICEID = @"JJY000017XLUXX";
-//     DEVICEID = @"JJY000016YWECG";
+    //    DEVICEID = @"JJY000017XLUXX";
+    DEVICEID = @"JJY000003UYRBK";
+    
+    //     DEVICEID = @"JJY000016YWECG";
     
 }
 
@@ -68,16 +70,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 +96,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 +129,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 +151,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