From 64b84c33e8733228c624d07229026470497eb417 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 22 十二月 2020 10:41:16 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 50 +++-----------------------------------------------
1 files changed, 3 insertions(+), 47 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..2968b81
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -260,7 +260,9 @@
}
break;
case FunctionType.Curtain:
- {//寮�鍏崇伅
+ case FunctionType.MotorCurtain:
+ case FunctionType.RollingShutter:
+ {
foreach (var dic in dicList)
{
string value = dic["value"];
@@ -284,52 +286,6 @@
}
}
targetView.btnState.Text = stateStr;
- }
- break;
- case FunctionType.MotorCurtain:
- case FunctionType.RollingShutter:
- {//寮�鍏崇伅
- string on_off = GetKeyValue("on_off", dicList);
- string brightness = GetKeyValue("brightness", dicList);
- if (on_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;
- }
- }
- if (brightness != "")
- {
- stateStr += brightness + "%";
-
- }
-
- if (on_off != "" && on_off == "stop"|| on_off != "" && on_off == "off")
- {
- targetView.btnState.Text = Language.StringByID(StringId.stop);
- }
- else
- {
- targetView.btnState.Text = stateStr;
-
- }
-
}
break;
case FunctionType.AC: {
--
Gitblit v1.8.0