From a19e58425e44c8a83c3d1b23de292659c38a6b1e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 05 六月 2023 14:09:20 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/Entity/FunctionList.cs | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index f8e9c99..bb14283 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -14,20 +14,20 @@
{
static FunctionList _FunctionList;
- public static void ClearData()
- {
- try
- {
- _FunctionList._IpCamImou = null;
- _FunctionList.ClearDatas();
- _FunctionList = null;
- }
- catch (Exception ex)
- {
- MainPage.Log($"娓呯悊FunctionList寮傚父:{ex.Message}");
- _FunctionList = null;
- }
- }
+ //public static void ClearData()
+ //{
+ // try
+ // {
+ // _FunctionList._IpCamImou = null;
+ // _FunctionList.ClearDatas();
+ // _FunctionList = null;
+ // }
+ // catch (Exception ex)
+ // {
+ // MainPage.Log($"娓呯悊FunctionList寮傚父:{ex.Message}");
+ // _FunctionList = null;
+ // }
+ //}
public static FunctionList List
{
@@ -55,6 +55,12 @@
/// 鍔熻兘鍒楄〃
/// </summary>
public List<Function> Functions = new List<Function>();
+ /// <summary>
+ /// 缇ゆ帶鍒楄〃
+ /// </summary>
+ public List<GroupControl> groupControls = new List<GroupControl>();
+
+
/// <summary>
/// 鏈烘鑷傚垪琛�
/// </summary>
@@ -157,6 +163,15 @@
public List<Function> GetDoorLockList()
{
var spkList = SPK.GetDoorLockSPKList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+ /// <summary>
+ /// 鑾峰彇钀ょ煶瑙嗛闂ㄩ攣
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetVideoDoorLockList()
+ {
+ var spkList = SPK.GetVideoDoorLockSPKList();
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
@@ -369,7 +384,7 @@
var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityAlarm>(dataString);
if (temp == null)
{
- MainPage.Log("null");
+ MainPage.Log("SecurityData_null");
FileUtlis.Files.DeleteFile(filePath);
return;
}
--
Gitblit v1.8.0