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/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
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