From d07d62be7111d78b2aaa44c9cdee23a7d22b4dda Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 10:38:15 +0800
Subject: [PATCH] 20201222-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 50 +++++++++++++++++---------------------------------
1 files changed, 17 insertions(+), 33 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
old mode 100644
new mode 100755
index 7eee6bc..606fa03
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -260,7 +260,7 @@
}
break;
case FunctionType.Curtain:
- {//寮�鍏崇伅
+ {
foreach (var dic in dicList)
{
string value = dic["value"];
@@ -288,48 +288,32 @@
break;
case FunctionType.MotorCurtain:
case FunctionType.RollingShutter:
- {//寮�鍏崇伅
+ {
string on_off = GetKeyValue("on_off", dicList);
- string brightness = GetKeyValue("brightness", dicList);
- if (on_off != "")
+ string percent = GetKeyValue("percent", dicList);
+
+ if (on_off == "off")
{
- switch (on_off)
- {
- case "on":
- {
- stateStr = Language.StringByID(StringId.onLogic);
-
- }
- break;
- case "off":
- {
- stateStr = Language.StringByID(StringId.offLogic);
-
- }
- break;
- case "stop":
- {
- stateStr = Language.StringByID(StringId.stop);
- }
- break;
- }
+ stateStr = Language.StringByID(StringId.offLogic);
}
- if (brightness != "")
+ else if (on_off == "stop")
{
- stateStr += brightness + "%";
+ stateStr = Language.StringByID(StringId.stop);
+ }
+ else if (on_off == "on" && percent != "")
+ {
+ stateStr = Language.StringByID(StringId.onLogic) + percent + "%";
}
-
- if (on_off != "" && on_off == "stop"|| on_off != "" && on_off == "off")
+ else if (on_off == "on")
{
- targetView.btnState.Text = Language.StringByID(StringId.stop);
+ stateStr = Language.StringByID(StringId.onLogic);
}
- else
+ else if (percent != "")
{
- targetView.btnState.Text = stateStr;
-
+ stateStr = percent + "%";
}
-
+ targetView.btnState.Text = stateStr;
}
break;
case FunctionType.AC: {
--
Gitblit v1.8.0