合并温居城代码

wxr

2021-04-19 39eb1c016f49275bb8449fba9286619670f39a42

 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,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 +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