From 4c586bb23cdcae56ae4e4c62e90e148dc10b9d90 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 17 五月 2022 14:19:31 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wxr1215
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 107 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index b9c6f17..646c43e 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -176,6 +176,23 @@
}
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:
{
@@ -992,8 +1009,6 @@
}
break;
case SPK.CurtainSwitch:
- case SPK.CurtainTrietex:
- case SPK.CurtainRoller:
{
foreach (var dic in dicList)
{
@@ -1016,6 +1031,29 @@
}
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;
@@ -1455,8 +1493,6 @@
}
break;
case SPK.CurtainSwitch:
- case SPK.CurtainTrietex:
- case SPK.CurtainRoller:
{
foreach (var dic in dicList)
{
@@ -1480,6 +1516,52 @@
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:
@@ -1743,6 +1825,22 @@
}
+ }
+ 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:
@@ -2147,11 +2245,11 @@
//纭畾鐐瑰嚮浜嬩欢
timePointView.btnConfirm.MouseUpEventHandler += (sender, e3) =>
{
- if (timepoint == 0)
- {
- //鎻愮ず
- return;
- }
+ //if (timepoint == 0)
+ //{
+ // //鎻愮ず
+ // return;
+ //}
fLayout.RemoveFromParent();
action(timepoint);
};
--
Gitblit v1.8.0