From ae9061e8e648af95393d96d6f5e59c434aed1558 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 21 十二月 2020 09:57:44 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 50 ++++++++----------------
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 28 ++++++++++++-
2 files changed, 42 insertions(+), 36 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 7eee6bc..606fa03 100755
--- 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: {
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index ce8b875..236032e 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -817,8 +817,30 @@
#region 鐐瑰嚮浜嬩欢
int brightnesValue = 0;
Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.dictionary(dic, "key", "brightness");
- string keyVlaue = "brightness";
+ string keyVlaue = "";
+
+ switch (device.functionType)
+ {
+ //寮�鍏崇伅鍏� light.Switch
+ case FunctionType.Dimmer:
+ case FunctionType.RGB:
+ case FunctionType.RGBW:
+ case FunctionType.ColorTemperature:
+ {
+ LogicMethod.dictionary(dic, "key", "brightness");
+ keyVlaue = "brightness";
+ }
+ break;
+
+ case FunctionType.MotorCurtain:
+ case FunctionType.RollingShutter:
+ {
+ LogicMethod.dictionary(dic, "key", "percent");
+ keyVlaue = "percent";
+ }
+ break;
+ }
+
//鈥旂偣鍑讳簨浠�
brightness.btn_subtract_click.MouseUpEventHandler += (sender2, e2) =>
{
@@ -1007,7 +1029,7 @@
}
}
break;
- case "brightness":
+ case "percent":
{
button2.Text = value;
--
Gitblit v1.8.0