From f9f9b0030fdd2691632569b7dcad9d0ddca5e4cf Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 十二月 2020 09:28:54 +0800
Subject: [PATCH] 2020-12-23 1.调整mqtt挤下线，跑ui线程。2.LoadEvent_CheckLinkStatus方法调整
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 80 ++++++---------------------------------
1 files changed, 13 insertions(+), 67 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..350280b
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -173,7 +173,7 @@
/// <param name="viewLayout">涓婁笅婊戝姩鎺т欢</param>
public static void OutputTarget(FrameLayout thisView, VerticalScrolViewLayout viewLayout)
{
-
+
for (int i = 0; i < Logic.currlogic.output.Count; i++)
{
Output outputTarget = Logic.currlogic.output[i];
@@ -230,37 +230,29 @@
{
string on_off = GetKeyValue("on_off", dicList);
string brightness = GetKeyValue("brightness", dicList);
- if (on_off != "")
+ if (on_off == "on" && brightness != "")
{
- if (on_off == "on")
- {
- stateStr = Language.StringByID(StringId.onLogic);
-
- }
- else
- {
- stateStr = Language.StringByID(StringId.offLogic);
-
- }
+ stateStr = Language.StringByID(StringId.onLogic) + brightness + "%";
}
- if (brightness != "")
+ else if (on_off == "on")
{
- stateStr += brightness + "%";
+ stateStr = Language.StringByID(StringId.onLogic);
}
- if (on_off != "" && on_off == "off")
+ else if (on_off == "off")
{
- targetView.btnState.Text = Language.StringByID(StringId.offLogic);
+ stateStr = Language.StringByID(StringId.offLogic);
}
- else
+ else if (brightness != "")
{
- targetView.btnState.Text = stateStr;
-
+ stateStr = brightness + "%";
}
-
+ targetView.btnState.Text = stateStr;
}
break;
case FunctionType.Curtain:
- {//寮�鍏崇伅
+ case FunctionType.MotorCurtain:
+ case FunctionType.RollingShutter:
+ {
foreach (var dic in dicList)
{
string value = dic["value"];
@@ -284,52 +276,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