From dc8967247d149e9b0d1f8e75829928db0ea1fe13 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 06 六月 2021 16:42:36 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index e70db56..109cdc4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -4,7 +4,6 @@
using Shared;
using HDL_ON.Stan;
using ZXing.QrCode.Internal;
-using static HDL_ON.UI.UI2.FuntionControlView.Video.VideoMethod;
namespace HDL_ON.UI.UI2.FuntionControlView.Video
{
@@ -36,8 +35,8 @@
pageView.AddChidren(view1);
var view2 = new FrameLayout();
pageView.AddChidren(view2);
- View1(view1, listVideo, video);
- View2(view2, listCall, video);
+ ViewFrameLayout1(view1, listVideo, video);
+ ViewFrameLayout2(view2, listCall, video);
Button btn11 = new Button
{
X = Application.GetRealWidth(170),
@@ -114,8 +113,10 @@
/// <param name="view1">鐖舵帶浠�</param>
/// <param name="list">闂ㄥ彛鏈哄垪琛�</param>
/// <param name="videoClouds">褰撳墠鐨勫彲瑙嗗璁�</param>
- void View1(FrameLayout view1, List<FlVideo> list, VideoClouds videoClouds)
+ void ViewFrameLayout1(FrameLayout view1, List<FlVideo> list, VideoClouds videoClouds)
{
+
+
#region 甯冨眬鐣岄潰
var bjFl = new FrameLayout
{
@@ -221,17 +222,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",
@@ -241,7 +241,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,
@@ -307,7 +308,7 @@
/// <param name="view2">鐖舵帶浠�</param>
/// <param name="listCall">閫氳瘽璁板綍鍒楄〃</param>
/// <param name="video">褰撳墠鐨勫彲瑙嗗璁�</param>
- void View2(FrameLayout view2, List<CallView> listCall, VideoClouds video)
+ void ViewFrameLayout2(FrameLayout view2, List<CallView> listCall, VideoClouds video)
{
var bjFl = new FrameLayout
@@ -348,13 +349,13 @@
TextAlignment = TextAlignment.CenterLeft,
TextID = StringId.baolu30,
};
- bjFl.AddChidren(regionBtn);
+ //bjFl.AddChidren(regionBtn);
var vv = new VerticalRefreshLayout
{
X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(58 + 17),
- Height = Application.GetRealHeight(458 - 17),
+ Y = Application.GetRealHeight(58),
+ Height = Application.GetRealHeight(458),
Width = Application.GetRealWidth(295),
};
bjFl.AddChidren(vv);
@@ -394,7 +395,6 @@
frameLayout60.btnTime.Text = getTime(call.callTime);
///鍛煎彨鐘舵�侊紙0锛氭湭鎺ワ紱1锛氬凡鎺ワ紱2锛氭嫆鎺ワ級锛涙槸鍚﹀紑閿侊紱
frameLayout60.btnStateText.Text = getStateText(call.callStatus) + "," + getUnlockText(call.isUnlock);
-
}
}
@@ -461,7 +461,10 @@
{
var utcTime = Convert.ToDateTime(str);
var dateTime = TimeZoneInfo.ConvertTimeFromUtc(utcTime, TimeZoneInfo.Local);
- return dateTime.ToString("HH") + ":" + dateTime.ToString("mm");
+ // var monday = dateTime.ToString("MM") + Language.StringByID(StringId.month) + dateTime.ToString("dd") + Language.StringByID(StringId.day);
+ var monday = dateTime.ToString("MM") + "/" + dateTime.ToString("dd");
+ var time = dateTime.ToString("HH") + ":" + dateTime.ToString("mm");
+ return monday + " " + time;
}
/// <summary>
/// 鑾峰彇鍛煎彨鐘舵�佹枃鏈�
@@ -498,16 +501,14 @@
/// <returns></returns>
private string getUnlockText(bool if_bool)
{
- string s = "";
if (if_bool)
{
- s = Language.StringByID(StringId.yikaisuo);
+ return Language.StringByID(StringId.yikaisuo);
}
else
{
- s = Language.StringByID(StringId.weikaisuo);
+ return Language.StringByID(StringId.weikaisuo);
}
- return s;
}
/// <summary>
/// 鑾峰彇uuid
--
Gitblit v1.8.0