From 07b0239f824ddb5a0cadf93f20ff6247f72baca2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 一月 2022 11:32:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr0114' into wjc
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 3914880..77796b7 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -678,6 +678,8 @@
#endregion
break;
case ShowFunction.DoorLock:
+ functionCount = FunctionList.List.GetDoorLockList().Count;
+ functionOnCount = 1;
break;
case ShowFunction.Electric:
#region 鐢靛櫒
@@ -934,6 +936,10 @@
break;
case ShowFunction.DoorLock:
btnName.TextID = StringId.DoorLock;
+ btnFunctionViewBg.MouseUpEventHandler = (sende, e) => {
+ var form = new DoorLockListPage();
+ form.AddForm(FunctionList.List.GetDoorLockList());
+ };
break;
case ShowFunction.Electric:
#region 鐢靛櫒
@@ -1050,7 +1056,7 @@
}
//鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
- if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring
+ if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring && item != ShowFunction.DoorLock
&& ShowFunction.EnergyMonitoring!= item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item)
{
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
--
Gitblit v1.8.0