From 3532db3610381f37eca1a6ac783d882517847c91 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 31 三月 2021 15:28:49 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/Entity/Function/Function.cs | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 9211829..a6beab4 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -919,7 +919,13 @@
{
get
{
- return Convert.ToByte(loopId, 16);
+ try
+ {
+ return Convert.ToByte(loopId, 16);
+ }catch
+ {
+ return 0;
+ }
}
}
@@ -1064,6 +1070,23 @@
}
#endregion
+ #region 鑳芥簮
+ /// <summary>
+ /// 鑳芥簮妯″潡
+ /// </summary>
+ public const string EnergyStandard = "energy.standard";
+ /// <summary>
+ /// 鑳芥簮spk鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public static List<string> EnergySpkList()
+ {
+ var spkList = new List<string>();
+ spkList.Add(EnergyStandard);
+ return spkList;
+ }
+ #endregion
+
#region 闊充箰
/// <summary>
/// 锛堥煶涔愶級
--
Gitblit v1.8.0