From 9eec81850e418a3c16410b4870910bde142b06e3 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 14 九月 2022 15:50:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Dev-Branch' into wjc
---
HDL_ON/Entity/FunctionList.cs | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 9b724ca..cf3f154 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -24,7 +24,11 @@
var filePathList = FileUtlis.Files.ReadFiles();
foreach (var filePath in filePathList)
{
- _FunctionList.IniFunctionList(filePath);
+ try
+ {
+ _FunctionList.IniFunctionList(filePath);
+ }
+ catch { }
}
#endregion
}
@@ -87,15 +91,6 @@
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>
/// 鑳芥簮鍒楄〃
@@ -107,6 +102,21 @@
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
+ List<InverterInfo> _inverterList = new List<InverterInfo>();
+ /// <summary>
+ /// 鍏変紡鍒楄〃
+ /// </summary>
+ public List<InverterInfo> InverterList
+ {
+ get
+ {
+ return _inverterList;
+ }
+ set
+ {
+ _inverterList = value;
+ }
+ }
#region 瀹剁數鍒楄〃 electricals
/// <summary>
/// 瀹剁數鍒楄〃
@@ -480,6 +490,7 @@
if (readList.Count > 9)
{
Control.Ins.SendReadCommand(readList);
+ readList.Clear();
}
}
if (readList.Count > 0)
--
Gitblit v1.8.0