From 58ccc89832196860a74609a1c54b40b7c6f7faed Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 十一月 2023 11:51:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr-udp修改验证' into Wxr-V2.4.2
---
HDL_ON/Entity/FunctionList.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 5dbf0f1..f91b737 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -190,7 +190,7 @@
/// <returns></returns>
public List<Function> GetVideoControlsList()
{
- var spkList = SPK.GetVideoDoorLockSPKList();
+ var spkList = SPK.GetVideoControlsSPKList();
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
@@ -228,7 +228,7 @@
/// </summary>
public List<Function> GetElectricals()
{
- var spkList = SPK.ElectricalSpkList();
+ var spkList = SPK.ElectricalSpkList();
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
@@ -282,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