Merge remote-tracking branch 'origin/newBranch1' into WJC

JLChen

2021-08-21 af9c3e0b3b1eb370e966b3ca9db3f62848d4189b

 HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs

@@ -473,8 +473,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>