From fce62de6533d85a2381e275017542861ecd3c806 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 07 四月 2021 14:18:25 +0800
Subject: [PATCH] 2021-4-7-1

---
 HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index e70db56..88f2e84 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
 {
@@ -348,13 +347,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 +393,6 @@
                     frameLayout60.btnTime.Text = getTime(call.callTime);
                     ///鍛煎彨鐘舵�侊紙0锛氭湭鎺ワ紱1锛氬凡鎺ワ紱2锛氭嫆鎺ワ級锛涙槸鍚﹀紑閿侊紱
                     frameLayout60.btnStateText.Text = getStateText(call.callStatus) + "," + getUnlockText(call.isUnlock);
-
                 }
 
             }
@@ -461,7 +459,9 @@
         {
             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 time = dateTime.ToString("HH") + ":" + dateTime.ToString("mm");
+            return monday + " " + time;
         }
         /// <summary>
         /// 鑾峰彇鍛煎彨鐘舵�佹枃鏈�

--
Gitblit v1.8.0