From 024703246120fee33e2f6c2f662383f1facdecd2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 14 四月 2022 15:35:00 +0800
Subject: [PATCH] 2022年04月14日15:34:55
---
HDL_ON/Entity/Function/Function.cs | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index b64d1e6..5f8beba 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -111,12 +111,34 @@
/// <returns></returns>
public string GetAttrState(string key)
{
+ //涓�绾ф煡璇eyValue鍊�
var attrState = attributes.Find((s) => s.key == key.ToString());
- if (attrState == null || string.IsNullOrEmpty(attrState.state))
+ if (attrState == null)
{
return "0";
}
+ if (string.IsNullOrEmpty(attrState.state))
+ {
+ //浜岀骇鏌ヨkeyValue鍊�
+ return GetOriginalState(key);
+ }
return attrState.state;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍒濆鐘舵��
+ /// 榛樿鍊硷細0
+ /// </summary>
+ /// <param name="key">璇泙瀹氫箟鐨勫睘鎬у��</param>
+ /// <returns></returns>
+ public string GetOriginalState(string key)
+ {
+ var originalState = status.Find((s) => s.key == key.ToString());
+ if (originalState == null || string.IsNullOrEmpty(originalState.value))
+ {
+ return "0";
+ }
+ return originalState.value;
}
/// <summary>
/// 璁剧疆灞炴�х姸鎬�
@@ -1249,6 +1271,10 @@
/// 绌鸿皟
/// </summary>
public const string HvacAC = "hvac.ac";
+ /// <summary>
+ /// 姣涚粏绠＄┖璋�
+ /// </summary>
+ public const string HvacCac = "hvac.cac";
/// <summary>
/// 绌鸿皟spk鍒楄〃
@@ -1260,6 +1286,7 @@
spkList.Add(AcStandard);
spkList.Add(HvacAC);
spkList.Add(AcIr);
+ spkList.Add(HvacCac);
return spkList;
}
#endregion
--
Gitblit v1.8.0