From 0f13be8b24ef37fe16cd34c8411a907f93b7f304 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 28 十一月 2023 09:35:42 +0800
Subject: [PATCH] Merge branch 'Wxr-V2.4.2' into Google-2023-11-17-1
---
HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockListPage.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockListPage.cs b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockListPage.cs
index 914e3a1..85dcbb1 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockListPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockListPage.cs
@@ -38,13 +38,21 @@
/// <param name="i_listDevice">闂ㄩ攣璁惧鍒楄〃</param>
public void ShowForm(List<Function> i_listDevice)
{
+
+#if DEBUG
+
+
+#endif
+
+
+
this.listDevice.AddRange(i_listDevice);
//鏅鸿兘闂ㄩ攣
base.SetTitleText(Language.StringByID(StringId.DoorLock));
//鍒濆鍖栧ご閮ㄥ巻鍙茶褰曟帶浠�
- this.InitTopHistoryControl();
+ //this.InitTopHistoryControl();
//鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleFrame();
@@ -165,7 +173,7 @@
//鐢垫睜鍥炬爣
var btnBattery = new BatteryPersentControl();
btnBattery.Y = Application.GetRealHeight(62);
- frameBack.AddChidren(btnBattery, ChidrenBindMode.BindEvent);
+ //frameBack.AddChidren(btnBattery, ChidrenBindMode.BindEvent);
btnBattery.InitControl();
btnBattery.SetValue(80);
btnBattery.X = frameBack.Width - btnBattery.Width - Application.GetRealWidth(12);
--
Gitblit v1.8.0