From fd1f19e8479c764fa28b0da3a2f9b34a3debe772 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 03 八月 2023 21:47:04 +0800
Subject: [PATCH] 2023年08月03日21:47:02
---
HDL_ON/Entity/Function/Function.cs | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 8f4f3c3..d17fa05 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -803,25 +803,27 @@
var list = new List<FunctionAttributes>();
if (spk == SPK.GroupControl)
{
- var gc = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
- if (gc != null)
+ lock (list)
{
- foreach (var temp in gc.sids)
+ var gc = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
+ if (gc != null)
{
- var light = FunctionList.List.GetLightList().Find((obj) => obj.sid == temp.sid);
- if (light != null)
+ foreach (var temp in gc.sids)
{
- foreach (var attr in light.attributes)
+ var light = FunctionList.List.GetLightList().Find((obj) => obj.sid == temp.sid);
+ if (light != null)
{
- if (list.Find((obj) => obj.key == attr.key) == null)
+ foreach (var attr in light.attributes)
{
- list.Add(attr);
+ if (list.Find((obj) => obj.key == attr.key) == null)
+ {
+ list.Add(attr);
+ }
}
}
}
}
}
-
}
else
{
@@ -1142,6 +1144,10 @@
/// 褰撳墠鍊�
/// </summary>
public object curValue = new object();
+ /// <summary>
+ /// 灞炴�у崟浣�
+ /// </summary>
+ public string unit=string.Empty;
}
/// <summary>
@@ -1552,6 +1558,10 @@
/// </summary>
public const string Ev_Ipcam = "security.ipcam.ez";
/// <summary>
+ /// 褰遍煶涓帶
+ /// </summary>
+ public const string AvZkAiks = "av.zk.aiks";
+ /// <summary>
/// 钀ょ煶瑙嗛闂ㄩ攣spk鍒楄〃
/// </summary>
/// <returns></returns>
@@ -1561,6 +1571,18 @@
list.Add(VideoDoorLock);
return list;
}
+ /// <summary>
+ /// 褰遍煶涓帶spk鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public static List<string> GetVideoControlsSPKList()
+ {
+ var list = new List<string>
+ {
+ AvZkAiks
+ };
+ return list;
+ }
/// <summary>
/// 钀ょ煶鎽勫儚澶磗pk鍒楄〃
--
Gitblit v1.8.0