From f703a411c0ebdf7ada490fda75b52fd839dae079 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 三月 2023 14:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-cqy（1.5.9）' into dev--wxr
---
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs
index 3558ece..4f83b31 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs
@@ -66,7 +66,7 @@
btnFloor.MouseUpEventHandler = (sender, e) =>
{
string nowSelectId = null;
- var list = FunctionList.List.GetArmSensorList();
+ var list = FunctionList.List.GetArmCenterList();
#if DEBUG
list.AddRange(FunctionList.List.GetLightList());
@@ -93,7 +93,7 @@
bodyView.AddChidren(functionListView);
- var listAllFun = FunctionList.List.GetArmSensorList();
+ var listAllFun = FunctionList.List.GetArmCenterList();
#if DEBUG
listAllFun.AddRange(FunctionList.List.GetLightList());
#endif
@@ -145,7 +145,7 @@
if (functions == null)
{
//鍒濆鍊�
- functions = FunctionList.List.GetArmSensorList();
+ functions = FunctionList.List.GetArmCenterList();
}
@@ -177,6 +177,8 @@
inValue = "alarm";
break;
case SPK.SensorDoorWindow:
+ case SPK.SensorDryContact:
+ case SPK.SensorDryContact2:
inKey = "contact_status";
inValue = "open";
break;
--
Gitblit v1.8.0