From 07c91e3b27d10bad17ad2f805aab7b74e24fad2b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 06 十一月 2023 14:58:48 +0800
Subject: [PATCH] 场景增加配置自动化使能；安防增加干接点触发条件
---
HDL_ON/Entity/FunctionList.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index f6aad52..f91b737 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -185,6 +185,16 @@
}
/// <summary>
+ /// 鑾峰彇褰遍煶涓帶鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetVideoControlsList()
+ {
+ var spkList = SPK.GetVideoControlsSPKList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+
+ /// <summary>
/// 鏂伴鍒楄〃
/// </summary>
/// <returns></returns>
@@ -218,7 +228,7 @@
/// </summary>
public List<Function> GetElectricals()
{
- var spkList = SPK.ElectricalSpkList();
+ var spkList = SPK.ElectricalSpkList();
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
@@ -272,6 +282,8 @@
SPK.SensorSmoke,
SPK.SensorWater,
SPK.SensorGas,
+ SPK.SensorDryContact,
+ SPK.SensorDryContact2,
};
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
--
Gitblit v1.8.0