From cc7eb0553e93844be984045bca3e335d4ae0dede Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 04 七月 2022 10:46:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into release0123
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 11 +++++++++--
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 6 +++---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs | 9 +++++++--
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 1d7589f..abf4b91 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -63,7 +63,7 @@
case SPK.LightRGB:
case SPK.LightRGBW:
case SPK.LightCCT:
- case SPK.LightSwitch:
+ //case SPK.LightSwitch:
//绐楀笜
case SPK.CurtainSwitch:
case SPK.CurtainRoller:
@@ -230,7 +230,7 @@
fLayout.AddChidren(view2.FLayoutView());
view2.btnClick.MouseUpEventHandler += (sender, e) =>
{
- DeviceView(device, view2.btnState, StringId.shi, StringId.offLogic, 1);
+ DeviceView(device, view2.btnState, StringId.youren, StringId.wuren, 2);
};
if (edit)
{
@@ -634,7 +634,7 @@
break;
case StringId.wuren:
{
- if (device.spk == SPK.SenesorMegahealth || device.spk == SPK.SenesorMegahealth2)
+ if (device.spk == SPK.SenesorMegahealth2)
{
value = "uninhabited";
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 3db5687..eb1cc55 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -338,7 +338,11 @@
{
if (value == "true")
{
- inputView.btnState.Text = Language.StringByID(StringId.shi);
+ inputView.btnState.Text = Language.StringByID(StringId.youren);
+ }
+ else
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.wuren);
}
}
@@ -2057,7 +2061,10 @@
{
if (value == "true")
{
- button1.Text = Language.StringByID(StringId.shi);
+ button1.Text = Language.StringByID(StringId.youren);
+ }
+ else {
+ button1.Text = Language.StringByID(StringId.wuren);
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
index ca2a6d6..9810e45 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
@@ -192,10 +192,10 @@
else if(fanAttrValue == "auto")
{
text = Language.StringByID(StringId.Auto);
- iconPath = "FunctionIcon/AirFresh/Fan2.png";
+ iconPath = "FunctionIcon/AC/AutoIconGray.png";
if (this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "auto" )
{
- iconPath = "FunctionIcon/AirFresh/Fan2Select.png";
+ iconPath = "FunctionIcon/AC/AutoIcon.png";
isSelecte = true;
}
}
@@ -273,6 +273,11 @@
this.btnFan.UnSelectedImagePath = "FunctionIcon/AirFresh/Fan3.png";
this.btnFan.SelectedImagePath = "FunctionIcon/AirFresh/Fan3Select.png";
this.btnFanView.Text = Language.StringByID(StringId.HighWindSpeed);
+ }else if (this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "auto")
+ {
+ this.btnFan.UnSelectedImagePath = "FunctionIcon/AC/AutoIconGray.png";
+ this.btnFan.SelectedImagePath = "FunctionIcon/AC/AutoIcon.png";
+ this.btnFanView.Text = Language.StringByID(StringId.Auto);
}
this.btnFan.CanClick = this.btnFan.IsSelected = this.device.GetAttrState(FunctionAttributeKey.OnOff) == "on";
}
--
Gitblit v1.8.0