From 51f5f7a47d394163dccf2441cd04c2a19ceeda34 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 08 一月 2024 09:41:59 +0800
Subject: [PATCH] Merge branch 'Dev-Google-V2.4.3' into Google-2023-11-17-1
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index d5f0715..6d7eb87 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -446,7 +446,7 @@
d.Add(FunctionAttributeKey.Mode, m);
Control.Ins.SendWriteCommand(device, d);
dialog.Close();
- if (device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
+ if (device.GetAttrState(FunctionAttributeKey.Mode) == "fan" || device.GetAttrState(FunctionAttributeKey.Mode) == "dry")
{
setTempBar.IsClickable = false;
@@ -1069,18 +1069,19 @@
if (device.trait_on_off.curValue.ToString() == "on")
{
btnMode.IsSelected = btnSwing.IsSelected = btnWindSpeed.IsSelected = true;
- setTempBar.Enable = true;
+ //setTempBar.Enable = true;
setTempBar.ProgressBarColor = CSS_Color.MainColor;
btnSwitch.IsSelected = true;
- if (device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
- {
- setTempBar.IsClickable = false;
- }
- else
- {
- setTempBar.IsClickable = true;
- }
+ //if (device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
+ //{
+ // setTempBar.IsClickable = false;
+ //}
+ //else
+ //{
+ // setTempBar.IsClickable = true;
+ //}
+
}
else
{
@@ -1092,13 +1093,12 @@
setTempBar.IsClickable = false;
}
- if (device.GetAttrState(FunctionAttributeKey.Mode) == "dry")
+ if (device.GetAttrState(FunctionAttributeKey.Mode) == "dry" || device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
{
setTempBar.IsOffline = true;
setTempBar.IsClickable = false;
- }
- else
+ }else
{
setTempBar.IsOffline = false;
setTempBar.IsClickable = true;
--
Gitblit v1.8.0