From ea285ffe71284f5499e870f89c65b710d2d6a79c Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期一, 27 六月 2022 10:54:32 +0800
Subject: [PATCH] Merge branch 'wxr0114' of http://59.41.255.150:6688/r/~wxr/OnPro into wxr0114
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 143 +++++------------------------------------------
1 files changed, 16 insertions(+), 127 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index ecbb380..7fa0b4b 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -176,23 +176,6 @@
}
break;
//浼犳劅鍣�
- case SPK.SensorHelp:
- {
- foreach (var dic in dicList)
- {
- string value = dic["value"];
- if (value == "alarm")
- {
- inputView.btnState.Text = Language.StringByID(StringId.qiujiu);
-
- }
- else
- {
- inputView.btnState.Text = Language.StringByID(StringId.zhengchang);
- }
- }
- }
- break;
case SPK.SensorSmoke:
case SPK.SensorGas:
{
@@ -420,31 +403,18 @@
}
break;
case SPK.SensorCO2:
- {
- string str = new InpOrOutLogicMethod { }.GetText(dicList, "co2");
- inputView.btnState.Text = str;
-
- }
- break;
case SPK.SensorPm25:
- {
- string str = new InpOrOutLogicMethod { }.GetText(dicList, "pm25");
- inputView.btnState.Text = str;
-
- }
- break;
case SPK.SensorTVOC:
- {
- string str = new InpOrOutLogicMethod { }.GetText(dicList, "tvoc");
- inputView.btnState.Text = str;
-
- }
- break;
case SPK.SensorHcho:
{
- string str = new InpOrOutLogicMethod { }.GetText(dicList, "hcho");
+ string strvalue = "";
+ foreach (var dic in dicList)
+ {
+ strvalue = dic["value"];
+ break;
+ }
+ string str = new PublicInterface().GetSensorLevelText(device, strvalue, true);
inputView.btnState.Text = str;
-
}
break;
case SPK.DoorLock:
@@ -1022,6 +992,8 @@
}
break;
case SPK.CurtainSwitch:
+ case SPK.CurtainTrietex:
+ case SPK.CurtainRoller:
{
foreach (var dic in dicList)
{
@@ -1044,29 +1016,6 @@
}
break;
}
- }
- }
- break;
- case SPK.CurtainTrietex:
- case SPK.CurtainRoller:
- {
- string on_off = GetKeyValue("on_off", dicList);
- string percent = GetKeyValue("percent", dicList);
- if (on_off == "on" && percent != "")
- {
- stateStr = Language.StringByID(StringId.onLogic) + percent + "%";
- }
- else if (on_off == "on")
- {
- stateStr = Language.StringByID(StringId.onLogic);
- }
- else if (on_off == "off")
- {
- stateStr = Language.StringByID(StringId.offLogic);
- }
- else if (percent != "")
- {
- stateStr = percent + "%";
}
}
break;
@@ -1506,6 +1455,8 @@
}
break;
case SPK.CurtainSwitch:
+ case SPK.CurtainTrietex:
+ case SPK.CurtainRoller:
{
foreach (var dic in dicList)
{
@@ -1529,52 +1480,6 @@
break;
}
}
- }
- break;
- case SPK.CurtainTrietex:
- case SPK.CurtainRoller:
- {
- foreach (var dic in dicList)
- {
- string value = dic["value"];
- switch (dic["key"])
- {
- case "on_off":
- {
- switch (value)
- {
- case "on":
- {
- button1.Text = Language.StringByID(StringId.onLogic);
- }
- break;
- case "off":
- {
- button1.Text = Language.StringByID(StringId.offLogic);
- }
- break;
- case "stop":
- {
- button1.Text = Language.StringByID(StringId.stop);
- }
- break;
- }
- }
- break;
- case "percent":
- {
- if (button2 == null)
- {
- //鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
- break;
- }
- button2.Text = value + "%";
- }
- break;
- }
-
- }
-
}
break;
case SPK.AcStandard:
@@ -1838,22 +1743,6 @@
}
- }
- break;
- case SPK.SensorHelp:
- {
- foreach (var dic in dicList)
- {
- string value = dic["value"];
- if (value == "alarm")
- {
- button1.Text = Language.StringByID(StringId.qiujiu);
- }
- else
- {
- button1.Text = Language.StringByID(StringId.zhengchang);
- }
- }
}
break;
case SPK.SensorGas:
@@ -2271,11 +2160,11 @@
//纭畾鐐瑰嚮浜嬩欢
timePointView.btnConfirm.MouseUpEventHandler += (sender, e3) =>
{
- //if (timepoint == 0)
- //{
- // //鎻愮ず
- // return;
- //}
+ if (timepoint == 0)
+ {
+ //鎻愮ず
+ return;
+ }
fLayout.RemoveFromParent();
action(timepoint);
};
--
Gitblit v1.8.0