From df93e50c747a585aa3acad599ba9be7d9617872d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 21 四月 2022 10:28:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL_ON/Entity/FunctionList.cs | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index c1b1641..208eb41 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -72,6 +72,12 @@
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
+ public List<Function> GetDoorLockList()
+ {
+ var spkList = SPK.GetDoorLockSPKList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+
/// <summary>
/// 鏂伴鍒楄〃
/// </summary>
@@ -81,6 +87,15 @@
var spkList = SPK.AirFreshSpkList();
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
+ /// <summary>
+ /// 闈㈡澘鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetPanelList()
+ {
+ var spkList = SPK.PanelSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
/// <summary>
/// 鑳芥簮鍒楄〃
--
Gitblit v1.8.0