From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 13:21:10 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs b/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
index 69299ed..5ccdaac 100755
--- a/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
+++ b/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
@@ -105,7 +105,12 @@
eSVideoInfo.RoomName = videoInfos.RoomName;
GateWay.Ios.ESVideo.ShowESVideoMonitor(eSVideoInfo);
#elif Android
-
+ Shared.Phone.VideoPhone.ESVideoInfo eSVideoInfo = new Shared.Phone.VideoPhone.ESVideoInfo();
+ eSVideoInfo.DeviceName = videoInfos.DeviceName;
+ eSVideoInfo.ESVideoUUID = videoInfos.ESVideoUUID;
+ eSVideoInfo.ESRoomID = videoInfos.ESRoomID;
+ eSVideoInfo.RoomName = videoInfos.RoomName;
+ Shared.Phone.VideoPhone.ESVideo.ShowESVideoMonitor(eSVideoInfo);
#endif
};
--
Gitblit v1.8.0