From cbc156bc38d8b8eae7aef60cb186ab2b52fa701f Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 16 七月 2024 13:59:56 +0800
Subject: [PATCH] 增加全部挂断

---
 HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
index bdc5072..d638b04 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
@@ -246,7 +246,7 @@
             seekBarVoiceControl.BindPageLayout();
 
             //澹伴煶鐧惧垎姣�
-            this.btnVoicePersent = new NormalViewControl(Application.GetRealWidth(50), btnVoice.Height, false);
+            this.btnVoicePersent = new NormalViewControl(Application.GetRealWidth(55), btnVoice.Height, false);
             btnVoicePersent.X = seekBarVoiceControl.Right + Application.GetRealWidth(8) - seekBarVoiceControl.SeekBarPadding;
             btnVoicePersent.Y = btnVoice.Y;
             btnVoicePersent.TextColor = CSS_Color.PromptingColor1;
@@ -567,7 +567,7 @@
             this.frameTempPsw.AddChidren(picBack);
 
             //瀵嗙爜鏄剧ず鎺т欢
-            var btnPassword = new NormalViewControl(150, 50, true);
+            var btnPassword = new NormalViewControl(258, 50, true);
             btnPassword.Gravity = Gravity.CenterHorizontal;
             btnPassword.TextSize = CSS_FontSize.SubheadingFontSize;
             btnPassword.TextColor = CSS_Color.MainBackgroundColor;
@@ -919,7 +919,7 @@
                     }
                 }
                 this.seekBarVoiceControl.Progress = this.doorLockData.Voice;
-                this.btnVoicePersent.Text = this.doorLockData.Voice.ToString();
+                this.btnVoicePersent.Text = this.doorLockData.Voice.ToString()+"%";
             }
             catch (Exception ex)
             {
@@ -1118,7 +1118,7 @@
         /// </summary>
         private void RefreshNowDeviceStatuMemory(Function i_LocalDevice)
         {
-            this.doorLockData.IsOnline = i_LocalDevice.online;
+            this.doorLockData.IsOnline = i_LocalDevice.isOnline();
             for (int i = 0; i < i_LocalDevice.attributes.Count; i++)
             {
                 var data = i_LocalDevice.attributes[i];

--
Gitblit v1.8.0