From 157be5220d9d81bce18e8248ef6ac056415405a1 Mon Sep 17 00:00:00 2001
From: Tong <1025782220@qq.com>
Date: 星期二, 31 八月 2021 09:29:45 +0800
Subject: [PATCH] 更新推送库
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 105 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 98 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index e2ec5ee..a6b8a3b 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -56,6 +56,8 @@
case SPK.AcStandard:
//鍦扮儹
case SPK.FloorHeatStandard:
+ //鏂伴
+ case SPK.AirFreshStandard:
{
LogicView.FunTypeView view = new LogicView.FunTypeView();
@@ -104,7 +106,6 @@
{
GetEditState(device, index, view.btnState, null, null, null);
}
-
}
break;
//骞叉帴鐐�
@@ -161,7 +162,7 @@
}
break;
//瓒呭０娉紶鎰熷櫒
- case SPK.SensoruUtrasonic:
+ case SPK.SensorUtrasonic:
{
LogicView.FunTypeView view = new LogicView.FunTypeView();
@@ -203,7 +204,9 @@
}
break;
//鐜妫�娴嬩紶鎰熷櫒
- case SPK.SenesorEnvironment:
+ case SPK.SensorEnvironment:
+ case SPK.SensorEnvironment2:
+ case SPK.SensorEnvironment3:
{
#region 鐣岄潰
///娓╁害
@@ -229,7 +232,11 @@
LogicView.FunTypeView tvocView = new LogicView.FunTypeView();
tvocView.frameLayout.Y = co2View.frameLayout.Bottom;
tvocView.btnText.TextID = StringId.tvoc;
- fLayout.AddChidren(tvocView.FLayoutView());
+ if (SPK.SensorEnvironment3 != device.spk)
+ {
+ fLayout.AddChidren(tvocView.FLayoutView());
+ }
+
#endregion
#region 鐐瑰嚮浜嬩欢
///娓╁害鐐瑰嚮浜嬩欢
@@ -266,6 +273,90 @@
};
#endregion
+ }
+ break;
+ //娓╁害浼犳劅鍣�
+ case SPK.SensorTemperature:
+ {
+ ///娓╁害
+ LogicView.FunTypeView wenuView = new LogicView.FunTypeView();
+ wenuView.btnText.TextID = StringId.wendu;
+ fLayout.AddChidren(wenuView.FLayoutView());
+
+ ///娓╁害鐐瑰嚮浜嬩欢
+ wenuView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ new PublicInterface { }.ViewZuHe(this, StringId.wendugaoyu, StringId.wendudiyu, (intText, view) =>
+ {
+ InputBoxAction(device, intText, index, edit);
+ });
+ };
+ }
+ break;
+ //婀垮害浼犳劅鍣�
+ case SPK.SensorHumidity:
+ {
+ ///婀垮害
+ LogicView.FunTypeView shiduView = new LogicView.FunTypeView();
+ shiduView.btnText.TextID = StringId.shidu;
+ fLayout.AddChidren(shiduView.FLayoutView());
+ ///婀垮害鐐瑰嚮浜嬩欢
+ shiduView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ new PublicInterface { }.ViewZuHe(this, StringId.shidugaoyu, StringId.shidudiyu, (intText, view) =>
+ {
+ InputBoxAction(device, intText, index, edit);
+ });
+
+ };
+ }
+ break;
+ //co2
+ case SPK.SensorCO2:
+ {
+
+
+ ///co2
+ LogicView.FunTypeView co2View = new LogicView.FunTypeView();
+ co2View.btnText.TextID = StringId.co2;
+ fLayout.AddChidren(co2View.FLayoutView());
+
+ ///co2鐐瑰嚮浜嬩欢
+ co2View.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ PmCo2TvocAction(this, device, "co2", StringId.co2, index, edit);
+ };
+ }
+ break;
+ //pm2.5
+ case SPK.SensorPm25:
+ {
+ ///pm2.5
+ LogicView.FunTypeView pm25View = new LogicView.FunTypeView();
+ pm25View.btnText.TextID = StringId.pm25;
+ fLayout.AddChidren(pm25View.FLayoutView());
+
+ ///pm2.5鐐瑰嚮浜嬩欢
+ pm25View.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ PmCo2TvocAction(this, device, "pm25", StringId.pm25, index, edit);
+ };
+ }
+ break;
+ //tvoc
+ case SPK.SensorTVOC:
+ {
+ ///tvoc
+ LogicView.FunTypeView tvocView = new LogicView.FunTypeView();
+ tvocView.btnText.TextID = StringId.tvoc;
+ fLayout.AddChidren(tvocView.FLayoutView());
+
+ ///tvoc鐐瑰嚮浜嬩欢
+ tvocView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ PmCo2TvocAction(this, device, "tvoc", StringId.tvoc, index, edit);
+
+ };
}
break;
}
@@ -366,7 +457,7 @@
case SPK.SensorDuiShe:
case SPK.SensorPir:
case SPK.SensorDoorWindow:
- case SPK.SensoruUtrasonic:
+ case SPK.SensorUtrasonic:
{
keyVlaue = "status";
}
@@ -537,7 +628,7 @@
{
var value = view.GetValue(key, text);
selectedState = device.spk + "_"+ key;
- AddDictionary(key, value, "integer");
+ AddDictionary(key, value, "integer","in");
Save(device,index, edit);
});
}
@@ -553,7 +644,7 @@
private void GetEditState(Entity.Function device, int index, Button button1, Button button2, Button button3, Button button4)
{
Input inputs = Logic.currlogic.input[index];
- var dicList = inputs.condition as List<Dictionary<string, string>>;
+ var dicList = inputs.condition;
//娓呴櫎涔嬪墠鏃ф暟鎹�
dicSateteList.Clear();
if (dicList.Count != 0)
--
Gitblit v1.8.0