From 23bbed132eea46eef51c6d01c21b346238e29ee2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 13:39:12 +0800
Subject: [PATCH] Merge branch 'wxr0114' into V1.5.9
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 116 ++++-----------------------------------------------------
1 files changed, 9 insertions(+), 107 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index eef7829..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:
{
@@ -1009,6 +992,8 @@
}
break;
case SPK.CurtainSwitch:
+ case SPK.CurtainTrietex:
+ case SPK.CurtainRoller:
{
foreach (var dic in dicList)
{
@@ -1031,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;
@@ -1493,6 +1455,8 @@
}
break;
case SPK.CurtainSwitch:
+ case SPK.CurtainTrietex:
+ case SPK.CurtainRoller:
{
foreach (var dic in dicList)
{
@@ -1516,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:
@@ -1825,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:
@@ -2258,11 +2160,11 @@
//纭畾鐐瑰嚮浜嬩欢
timePointView.btnConfirm.MouseUpEventHandler += (sender, e3) =>
{
- //if (timepoint == 0)
- //{
- // //鎻愮ず
- // return;
- //}
+ if (timepoint == 0)
+ {
+ //鎻愮ず
+ return;
+ }
fLayout.RemoveFromParent();
action(timepoint);
};
--
Gitblit v1.8.0