From d90c55272f597acd0e946493896b7977293cf84d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 09 三月 2023 09:10:31 +0800
Subject: [PATCH] 人脸管理菜单
---
HDL_ON/Entity/FunctionList.cs | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 2999288..b294d7d 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -19,7 +19,7 @@
try
{
_FunctionList._IpCamImou = null;
- _FunctionList.Clear();
+ _FunctionList.ClearDatas();
_FunctionList = null;
}
catch (Exception ex)
@@ -94,7 +94,7 @@
/// <returns></returns>
public List<Function> GetAcstParentList()
{
- return Functions.FindAll((obj) => obj.spk == SPK.AcstParent);
+ return Functions.FindAll((obj) => obj.spk == SPK.AcstParent);//.OrderByDescending(o=>o.controlCounter).ToList()
}
/// <summary>
@@ -175,17 +175,9 @@
/// </summary>
public List<Function> InverterList()
{
- //get
- //{
- // return _inverterList;
- //}
- //set
- //{
- // _inverterList = value;
- //}
- return Functions.FindAll((obj) => obj.spk == SPK.Inverter);
+ return Functions.FindAll((obj) => obj.spk == SPK.Inverter || obj.spk == SPK.InverterRst);
}
-#region 瀹剁數鍒楄〃 electricals
+ #region 瀹剁數鍒楄〃 electricals
/// <summary>
/// 瀹剁數鍒楄〃
/// </summary>
@@ -452,14 +444,16 @@
/// <summary>
/// 娓呯┖璁惧鍔熻兘鍒楄〃
/// </summary>
- public void Clear()
+ public void ClearDatas()
{
try
{
- _IpCamImou.Clear();
- _IpCamImou = null;
- _FunctionList.Clear();
- _FunctionList = null;
+ if (_IpCamImou != null)
+ {
+ _IpCamImou.Clear();
+ _IpCamImou = null;
+ }
+ _FunctionList = new FunctionList();
}
catch (Exception ex)
{
--
Gitblit v1.8.0