From f48b20ee2ed48652ff4f0bfcdc2cfb8b9340685c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 14 四月 2022 15:37:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into release0123
---
HDL_ON/Entity/Function/Function.cs | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index c6af2de..5f8beba 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -111,6 +111,7 @@
/// <returns></returns>
public string GetAttrState(string key)
{
+ //涓�绾ф煡璇eyValue鍊�
var attrState = attributes.Find((s) => s.key == key.ToString());
if (attrState == null)
{
@@ -118,6 +119,7 @@
}
if (string.IsNullOrEmpty(attrState.state))
{
+ //浜岀骇鏌ヨkeyValue鍊�
return GetOriginalState(key);
}
return attrState.state;
@@ -125,8 +127,9 @@
/// <summary>
/// 鑾峰彇鍒濆鐘舵��
+ /// 榛樿鍊硷細0
/// </summary>
- /// <param name="key"></param>
+ /// <param name="key">璇泙瀹氫箟鐨勫睘鎬у��</param>
/// <returns></returns>
public string GetOriginalState(string key)
{
@@ -1268,6 +1271,10 @@
/// 绌鸿皟
/// </summary>
public const string HvacAC = "hvac.ac";
+ /// <summary>
+ /// 姣涚粏绠＄┖璋�
+ /// </summary>
+ public const string HvacCac = "hvac.cac";
/// <summary>
/// 绌鸿皟spk鍒楄〃
@@ -1279,6 +1286,7 @@
spkList.Add(AcStandard);
spkList.Add(HvacAC);
spkList.Add(AcIr);
+ spkList.Add(HvacCac);
return spkList;
}
#endregion
--
Gitblit v1.8.0