From 0a11352dffeb8d5f31dd40b9728fe1abf4537f04 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期五, 01 九月 2023 18:06:45 +0800 Subject: [PATCH] 2023年09月01日18:06:42 --- HDL_ON/Entity/Function/Function.cs | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs index 2ef2075..afb0f09 100644 --- a/HDL_ON/Entity/Function/Function.cs +++ b/HDL_ON/Entity/Function/Function.cs @@ -108,6 +108,7 @@ /// 鑾峰彇灞炴�у綋鍓嶇姸鎬� /// </summary> /// <param name="key"></param> + /// <param name="defaultValue">榛樿鍊�</param> /// <returns></returns> public string GetAttrState(string key, string defaultValue = "0") { @@ -120,7 +121,7 @@ if (string.IsNullOrEmpty(attrState.state)) { //浜岀骇鏌ヨkeyValue鍊� - return GetOriginalState(key); + return GetOriginalState(key, defaultValue); } return attrState.state; } @@ -130,13 +131,14 @@ /// 榛樿鍊硷細0 /// </summary> /// <param name="key">璇泙瀹氫箟鐨勫睘鎬у��</param> + /// <param name="defaultValue">榛樿鍊�</param> /// <returns></returns> - public string GetOriginalState(string key) + public string GetOriginalState(string key, string defaultValue) { var originalState = status.Find((s) => s.key == key.ToString()); if (originalState == null || string.IsNullOrEmpty(originalState.value)) { - return "0"; + return defaultValue; } return originalState.value; } @@ -2192,6 +2194,7 @@ spkList.Add(SensorEnvironment2); spkList.Add(SensorEnvironment3); spkList.Add(SensorHcho); + spkList.Add(SensorLight); return spkList; } /// <summary> @@ -2208,6 +2211,7 @@ spkList.Add(SensorTVOC); spkList.Add(SensorHumidity); spkList.Add(SensorHcho); + spkList.Add(SensorLight); return spkList; } @@ -2221,6 +2225,7 @@ spkList.Add(SensorEnvironment); spkList.Add(SensorEnvironmentHailin); spkList.Add(SensorEnvironment2); spkList.Add(SensorEnvironment3); + return spkList; } -- Gitblit v1.8.0