From d9fd4c59bea0f21d4c8241920cef90440cf53f43 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 28 八月 2021 17:20:45 +0800
Subject: [PATCH] 2021-8-28-05
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 6944734..0bc97bc 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -360,17 +360,16 @@
}
break;
//鐢查啗
- case SPK.:
+ case SPK.SensorHcho:
{
- ///tvoc
- LogicView.FunTypeView tvocView = new LogicView.FunTypeView();
- tvocView.btnText.TextID = StringId.tvoc;
- fLayout.AddChidren(tvocView.FLayoutView());
-
- ///tvoc鐐瑰嚮浜嬩欢
- tvocView.btnClick.MouseUpEventHandler += (sender, e) =>
+ ///hcho
+ LogicView.FunTypeView hchoView = new LogicView.FunTypeView();
+ hchoView.btnText.TextID = StringId.tvoc;
+ fLayout.AddChidren(hchoView.FLayoutView());
+ ///hcho鐐瑰嚮浜嬩欢
+ hchoView.btnClick.MouseUpEventHandler += (sender, e) =>
{
- PmCo2TvocAction(this, device, "tvoc", StringId.tvoc, index, edit);
+ PmCo2TvocAction(this, device, "hcho", StringId.Formaldehyde, index, edit);
};
}
@@ -624,7 +623,7 @@
/// <param name="index"></param>
/// <param name="edit"></param>
/// <param name="stateValue">缂栬緫涔嬪墠鐨勭姸鎬佸��,榛樿涓�""</param>
- public void PmCo2TvocAction(FrameLayout frame, Entity.Function device,string key,int title, int index, bool edit, string stateValue = "")
+ public void PmCo2TvocAction(FrameLayout frame, Entity.Function device, string key, int title, int index, bool edit, string stateValue = "")
{
if (edit)
{
@@ -637,15 +636,15 @@
dicSateteList = inputs.condition;
}
}
- PublicInterface view = new PublicInterface();
- var listStr = view.GetViewList(key);
+ PublicInterface view = new PublicInterface();
+ var listStr = view.GetViewList(key);
view.SingleSelectionShow(frame, listStr, Language.StringByID(title), view.GetString(key, stateValue)
, (text) =>
{
var value = view.GetValue(key, text);
- selectedState = device.spk + "_"+ key;
- AddDictionary(key, value, "integer","in");
- Save(device,index, edit);
+ selectedState = device.spk + "_" + key;
+ AddDictionary(key, value, "integer", "in");
+ Save(device, index, edit);
});
}
/// <summary>
--
Gitblit v1.8.0