From 2614964c9c3e0c8740e208d4d0606fa8a518b9c4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 01 九月 2021 15:16:39 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into wxr7
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index 5198364..41d5dec 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -300,12 +300,14 @@
DeviceName = video.deviceName,
roomno = video.flRoomBindVO.flRoomId,
unitno = video.flRoomBindVO.flBuildingId,
- uuid= getUuid(video.deviceId),
- cmtID=video.flRoomBindVO.flCmtId,
+ uuid = getUuid(video.deviceId),
+ cmtID = video.flRoomBindVO.flCmtId,
Lc_AccessToken = video.subAccountToken,
Lc_DeviceId = video.deviceId,
Lc_Psk = video.deviceName,
Lc_PlayToken = video.playToken,
+ deviceSipAccount = video.deviceSipAccount,
+ HomeId = video.homeId
};
ESOnVideo.Current.ShowESVideoMonitor(eSVideoInfo, video.interphoneType);
}
--
Gitblit v1.8.0