From 4796f4a91d85dedb5a30d2f5d3844c5720f5919a Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 13 五月 2022 17:36:46 +0800
Subject: [PATCH] 2022年05月13日17:36:43
---
HDL_ON/Entity/Function/Function.cs | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 6e3b439..6fdb8d9 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>
/// 璁剧疆灞炴�х姸鎬�
@@ -1420,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>
@@ -1439,6 +1465,18 @@
spkList.Add(SensorDryContact2);
spkList.Add(SenesorMegahealth);
spkList.Add(SenesorMegahealth2);
+ spkList.Add(SensorHelp);
+ return spkList;
+ }
+
+ /// <summary>
+ /// 闈㈡澘spk鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public static List<string> PanelSpkList()
+ {
+ var spkList = new List<string>();
+ spkList.Add(SensorHelp);
return spkList;
}
#endregion
--
Gitblit v1.8.0