Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

 HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs

@@ -130,7 +130,6 @@
        /// </summary>
        private void GetTempPwd()
        {
            return;
            new System.Threading.Thread(() =>
            {
                try
@@ -828,12 +827,6 @@
                        }
                    })
                    { IsBackground = true }.Start();
                    ////生成临时密码
                    //this.doorLockData.TempPassword = "987654";
                    //this.doorLockData.StatrtTime = startTime.ToString("yyyy.MM.dd HH:mm");
                    //this.doorLockData.EndTime = endTime.ToString("yyyy.MM.dd HH:mm");
                    ////重新初始化临时密码控件
                    //this.InitTempPasswordControl();
                }
            };

@@ -855,6 +848,12 @@
            {
                //生效时间必须大于失效时间
                HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(StringId.EffectiveTimeMustBeOverFailureTime));
                return false;
            }
            if ((endTime - startTime).TotalHours>=24)
            {
                //临时密码有效期不能大于24小时
                HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(StringId.TempPwdValidityTip));
                return false;
            }
            return true;
@@ -888,34 +887,43 @@
        /// </summary>
        private void RefreshFormStatu()
        {
            //如果不在线
            if (this.doorLockData.IsOnline == false)
            try
            {
                //开锁图片
                this.picLockControl.UnSelectedImagePath = "FunctionIcon/DoorLock/LockPictrue2.png";
                //连接状态
                this.btnOnlineIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/UnConnect.png";
                this.btnOnlineView.Text = this.dicText["未连接"];
                this.btnOnlineView.TextColor = CSS_Color.AuxiliaryColor2;
                //常开模式图标
                if (this.btnNormallyOpenIcon != null)
                //如果不在线
                if (this.doorLockData.IsOnline == false)
                {
                    this.btnNormallyOpenIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/NormallyOpenIcon2.png";
                    //开锁图片
                    this.picLockControl.UnSelectedImagePath = "FunctionIcon/DoorLock/LockPictrue2.png";
                    //连接状态
                    this.btnOnlineIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/UnConnect.png";
                    this.btnOnlineView.Text = this.dicText["未连接"];
                    this.btnOnlineView.TextColor = CSS_Color.AuxiliaryColor2;
                    //常开模式图标
                    if (this.btnNormallyOpenIcon != null)
                    {
                        this.btnNormallyOpenIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/NormallyOpenIcon2.png";
                    }
                }
                else
                {
                    //开锁图片
                    this.picLockControl.UnSelectedImagePath = this.doorLockData.Open == true ? "FunctionIcon/DoorLock/UnLockPictrue3.png" : "FunctionIcon/DoorLock/LockPictrue1.png";
                    //连接状态
                    this.btnOnlineIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/Connect.png";
                    this.btnOnlineView.Text = this.dicText["已连接"];
                    this.btnOnlineView.TextColor = CSS_Color.PromptingColor1;
                    //常开模式图标
                    if (this.btnNormallyOpenIcon != null)
                    {
                        this.btnNormallyOpenIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/NormallyOpenIcon1.png";
                    }
                }
                this.seekBarVoiceControl.Progress = this.doorLockData.Voice;
                this.btnVoicePersent.Text = this.doorLockData.Voice.ToString();
            }
            else
            catch (Exception ex)
            {
                //开锁图片
                this.picLockControl.UnSelectedImagePath = this.doorLockData.Open == true ? "FunctionIcon/DoorLock/UnLockPictrue3.png" : "FunctionIcon/DoorLock/LockPictrue1.png";
                //连接状态
                this.btnOnlineIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/Connect.png";
                this.btnOnlineView.Text = this.dicText["已连接"];
                this.btnOnlineView.TextColor = CSS_Color.PromptingColor1;
                //常开模式图标
                if (this.btnNormallyOpenIcon != null)
                {
                    this.btnNormallyOpenIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/NormallyOpenIcon1.png";
                }
                MainPage.Log($"界面更新异常，门锁:{ex.Message}");
            }
        }