From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs | 68 +++++++++++++++++++---------------
1 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
index a79684c..bdc5072 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
+++ b/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}");
}
}
--
Gitblit v1.8.0