合并了新代码

黄学彪

2020-08-11 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb

 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
                 };