From d2666457d16f6171785596a8a9cb2fb9fb35f84b Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期五, 16 四月 2021 18:03:54 +0800 Subject: [PATCH] 2021-4-16-1 --- HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs index 88f2e84..3271e9e 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs @@ -459,7 +459,8 @@ { var utcTime = Convert.ToDateTime(str); var dateTime = TimeZoneInfo.ConvertTimeFromUtc(utcTime, TimeZoneInfo.Local); - var monday = dateTime.ToString("MM") + Language.StringByID(StringId.month) + dateTime.ToString("dd") + Language.StringByID(StringId.day); + // 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; } @@ -498,16 +499,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