From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45
---
HDL_ON/Entity/FunctionList.cs | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index cf7a775..f91b737 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -143,6 +143,15 @@
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
/// <summary>
+ /// 搴忓垪鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetSeries()
+ {
+ return Functions.FindAll((obj) => obj.spk == SPK.CommonSeries);
+ }
+
+ /// <summary>
/// 绐楀笜鍒楄〃
/// </summary>
public List<Function> GetCurtainList()
@@ -172,6 +181,16 @@
public List<Function> GetVideoDoorLockList()
{
var spkList = SPK.GetVideoDoorLockSPKList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+
+ /// <summary>
+ /// 鑾峰彇褰遍煶涓帶鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetVideoControlsList()
+ {
+ var spkList = SPK.GetVideoControlsSPKList();
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
@@ -209,7 +228,7 @@
/// </summary>
public List<Function> GetElectricals()
{
- var spkList = SPK.ElectricalSpkList();
+ var spkList = SPK.ElectricalSpkList();
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
@@ -263,6 +282,8 @@
SPK.SensorSmoke,
SPK.SensorWater,
SPK.SensorGas,
+ SPK.SensorDryContact,
+ SPK.SensorDryContact2,
};
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
@@ -577,14 +598,14 @@
{
if (lockReadFunctionStatus)
{
- MainPage.Log($"澶氭杩涘叆--杩斿洖");
+ MainPage.Log($"澶氭杩涘叆--杩斿洖1");
return;
}
new Thread(() =>
{
if (lockReadFunctionStatus)
{
- MainPage.Log($"澶氭杩涘叆--杩斿洖");
+ MainPage.Log($"澶氭杩涘叆--杩斿洖2");
return;
}
MainPage.Log($"杩涘叆--璇诲彇");
--
Gitblit v1.8.0