From 334daf8dc48d6798524162228ae9cbe221773010 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 13:55:15 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 32 ++------------------------------
1 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 606fa03..2968b81 100755
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -260,6 +260,8 @@
}
break;
case FunctionType.Curtain:
+ case FunctionType.MotorCurtain:
+ case FunctionType.RollingShutter:
{
foreach (var dic in dicList)
{
@@ -282,36 +284,6 @@
}
break;
}
- }
- targetView.btnState.Text = stateStr;
- }
- break;
- case FunctionType.MotorCurtain:
- case FunctionType.RollingShutter:
- {
- string on_off = GetKeyValue("on_off", dicList);
- string percent = GetKeyValue("percent", dicList);
-
- if (on_off == "off")
- {
- stateStr = Language.StringByID(StringId.offLogic);
- }
- else if (on_off == "stop")
- {
- stateStr = Language.StringByID(StringId.stop);
- }
- else if (on_off == "on" && percent != "")
- {
- stateStr = Language.StringByID(StringId.onLogic) + percent + "%";
-
- }
- else if (on_off == "on")
- {
- stateStr = Language.StringByID(StringId.onLogic);
- }
- else if (percent != "")
- {
- stateStr = percent + "%";
}
targetView.btnState.Text = stateStr;
}
--
Gitblit v1.8.0