From d3189eaa6be7c70ed5ac783efe68f43211a90d27 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 20 七月 2023 08:58:56 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://172.16.1.23:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/Entity/FunctionList.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index bb14283..f6aad52 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()
@@ -258,6 +267,7 @@
var spkList = new List<string>()
{
SPK.SensorPir,
+ SPK.SensorPirHold,
SPK.SensorDoorWindow,
SPK.SensorSmoke,
SPK.SensorWater,
@@ -576,14 +586,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