From df93e50c747a585aa3acad599ba9be7d9617872d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 21 四月 2022 10:28:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
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 c6af2de..82876da 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
@@ -1434,6 +1442,10 @@
public const string SenesorMegahealth = "sensor.megahealth";
public const string SenesorMegahealth2 = "sensor.megahealth.zg";
/// <summary>
+ /// 绱ф�ュ懠鍙�
+ /// </summary>
+ public const string SensorHelp = "sensor.help";
+ /// <summary>
/// 瀹夐槻浼犳劅鍣╯pk鍒楄〃
/// </summary>
/// <returns></returns>
@@ -1455,6 +1467,17 @@
spkList.Add(SenesorMegahealth2);
return spkList;
}
+
+ /// <summary>
+ /// 闈㈡澘spk鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public static List<string> PanelSpkList()
+ {
+ var spkList = new List<string>();
+ spkList.Add(SensorHelp);
+ return spkList;
+ }
#endregion
#region 鐜浼犳劅鍣�
--
Gitblit v1.8.0