From e172a0f48fdd01733e04bda2370846b9f36b840f Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 15 十月 2021 14:44:03 +0800
Subject: [PATCH] 2021-10-15 1.修改乐橙推送字段，psk参数取值不能取cname和deviceName
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index de7c61b..6d0dd75 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_Psk = video.deviceId,//2021-10-15 PSK瀛楁涓嶈兘鍙杁eviceName
Lc_PlayToken = video.playToken,
+ deviceSipAccount = video.deviceSipAccount,
+ HomeId = video.homeId
};
ESOnVideo.Current.ShowESVideoMonitor(eSVideoInfo, video.interphoneType);
}
@@ -473,8 +475,9 @@
{
var utcTime = Convert.ToDateTime(str);
var dateTime = TimeZoneInfo.ConvertTimeFromUtc(utcTime, TimeZoneInfo.Local);
- return dateTime.ToString("HH") + ":" + dateTime.ToString("mm");
+ return dateTime.ToString("MM-dd HH:mm");
}
+
/// <summary>
/// 鑾峰彇鍛煎彨鐘舵�佹枃鏈�
/// </summary>
--
Gitblit v1.8.0