From 223ed8e3003f9534887b6ae9c9eb4353aebf1748 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期六, 28 八月 2021 19:24:18 +0800 Subject: [PATCH] Merge branch 'WJC' into wxr7 --- HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs index 0bc97bc..a6dc46d 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs @@ -641,8 +641,23 @@ view.SingleSelectionShow(frame, listStr, Language.StringByID(title), view.GetString(key, stateValue) , (text) => { + var value = view.GetValue(key, text); selectedState = device.spk + "_" + key; + switch (device.spk) + { + case SPK.SensorTemperature: + case SPK.SensorHumidity: + case SPK.SensorCO2: + case SPK.SensorPm25: + case SPK.SensorTVOC: + case SPK.SensorHcho: + { + ///鍏徃浼犳劅鍣╧ey鐨勫仴鍊兼槸鈥渧alue鈥濓紱 + key = "value"; + } + break; + } AddDictionary(key, value, "integer", "in"); Save(device, index, edit); }); -- Gitblit v1.8.0