From c8c33200e43f05136eca9fc8ff4942f8def31cc6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 18 八月 2021 10:45:40 +0800
Subject: [PATCH] 2021-08-18 1.完善Android对接LinphoneSDK 2.完善SIP相关接口对接
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index f5ca90f..41d5dec 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -115,6 +115,8 @@
/// <param name="video">鍙瀵硅瀵硅薄</param>
void View1(FrameLayout view1, List<Video> videoList)
{
+
+
#region 甯冨眬鐣岄潰
var bjFl = new FrameLayout
{
@@ -222,17 +224,16 @@
#region
var fLayout = new FrameLayout
{
- Width = Application.GetRealWidth(50),
+ Width = Application.GetRealWidth(96),
Height = Application.GetRealWidth(48),
- X = Application.GetRealWidth(31 + (58 + 50) * j),
+ X = Application.GetRealWidth(20 + (26 + 28 + 42) * j),
Y = Application.GetRealHeight(20 + (48 + 24) * line),
-
};
fL.AddChidren(fLayout);
var iconBtn = new Button
{
- X = Application.GetRealWidth(11),
+ Gravity=Gravity.CenterHorizontal,
Width = Application.GetRealWidth(28),
Height = Application.GetRealWidth(28),
UnSelectedImagePath = "VideoIcon/weiqiangji.png",
@@ -242,7 +243,8 @@
var deviceNameBtn = new Button
{
Y = iconBtn.Bottom + Application.GetRealHeight(6),
- Width = Application.GetRealWidth(50),
+ X = Application.GetRealWidth(6),
+ Width = Application.GetRealWidth(96-12),
Height = Application.GetRealHeight(14),
TextSize = TextSize.Text10,
TextColor = CSS.CSS_Color.TextualColor,
@@ -265,11 +267,11 @@
//闂ㄥ彛鏈虹殑鐐瑰嚮浜嬩欢
clickBtn.MouseUpEventHandler += (sender, e) =>
{
- var video = clickBtn.Tag as Video;
- if (video.devType == "100")
+ var video2 = clickBtn.Tag as Video;
+ if (video2.devType == "100")
{
//闂ㄧ浜岀淮鐮佸浐瀹氭湁鐨�
- VideoSend.GetQRcode(this, video, (tag, paw) =>
+ VideoSend.GetQRcode(this, video2, (tag, paw) =>
{
if (tag)
{
@@ -298,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);
}
@@ -471,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