From db45c85a6ddebc5018b32a9d9dc04f839db3fa76 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 28 九月 2021 15:59:34 +0800
Subject: [PATCH] 组合调光
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index a097bcd..8ad7ace 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -110,7 +110,7 @@
};
FrameWhiteCentet1.AddChidren(arcBar);
-
+
arcBar.ThumbImagePath = device.GetAttrState(FunctionAttributeKey.OnOff) == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png";
arcBar.IsOffline = device.GetAttrState(FunctionAttributeKey.OnOff) == "off";
arcBar.MinValue = device.GetAttribute(FunctionAttributeKey.SetTemp).min;
@@ -410,9 +410,9 @@
Button btnModeIcon = new Button()
{
X = btnTitle.X,
- Y = Application.GetRealHeight(41 * (modeList.IndexOf(m) + 1) + 10 + 8),
- Width = Application.GetRealWidth(30),
- Height = Application.GetRealWidth(30),
+ Y = Application.GetRealHeight(44 * (modeList.IndexOf(m) + 1) + 10 + 8),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
IsSelected = device.GetAttrState(FunctionAttributeKey.Swing) == m,
};
modeChangeView.AddChidren(btnModeIcon);
@@ -431,10 +431,6 @@
};
modeChangeView.AddChidren(btnModeText);
- btnModeIcon.UnSelectedImagePath = acFunction.GetSwingIconPath(m, false);
- btnModeIcon.SelectedImagePath = acFunction.GetSwingIconPath(m);
- btnModeText.Text = acFunction.GetSwingAttrText(m);
-
if (modeList.IndexOf(m) < modeList.Count - 1)
{
modeChangeView.AddChidren(new Button()
@@ -446,6 +442,11 @@
BackgroundColor = CSS_Color.BackgroundColor,
});
}
+
+ btnModeIcon.UnSelectedImagePath = acFunction.GetSwingIconPath(m, false);
+ btnModeIcon.SelectedImagePath = acFunction.GetSwingIconPath(m);
+ btnModeText.Text = acFunction.GetSwingAttrText(m);
+
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
dialog.Close();
@@ -934,12 +935,16 @@
{
btnTemp.Text = Convert.ToDouble( device.GetAttrState(FunctionAttributeKey.SetTemp)).ToString();
btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp))) + "掳C";
- btnMode.UnSelectedImagePath = acFunction.GetModeIconPath(device.GetAttrState(FunctionAttributeKey.Mode));
- btnSwing.UnSelectedImagePath = acFunction.GetSwingIconPath(device.GetAttrState(FunctionAttributeKey.Swing));
- btnWindSpeed.UnSelectedImagePath = acFunction.GetFanIconPath(device.GetAttrState(FunctionAttributeKey.FanSpeed));
+ btnMode.SelectedImagePath = acFunction.GetModeIconPath(device.GetAttrState(FunctionAttributeKey.Mode));
+ btnSwing.SelectedImagePath = acFunction.GetSwingIconPath(device.GetAttrState(FunctionAttributeKey.Swing));
+ btnWindSpeed.SelectedImagePath = acFunction.GetFanIconPath(device.GetAttrState(FunctionAttributeKey.FanSpeed));
+ btnMode.UnSelectedImagePath = acFunction.GetModeIconPath(device.GetAttrState(FunctionAttributeKey.Mode),false);
+ btnSwing.UnSelectedImagePath = acFunction.GetSwingIconPath(device.GetAttrState(FunctionAttributeKey.Swing),false);
+ btnWindSpeed.UnSelectedImagePath = acFunction.GetFanIconPath(device.GetAttrState(FunctionAttributeKey.FanSpeed),false);
arcBar.Progress = Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.SetTemp)));
if (device.trait_on_off.curValue.ToString() == "on")
{
+ btnMode.IsSelected = btnSwing.IsSelected = btnWindSpeed.IsSelected = true;
arcBar.IsOffline = false;
btnSwitch.IsSelected = true;
arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png";
@@ -954,6 +959,7 @@
}
else
{
+ btnMode.IsSelected = btnSwing.IsSelected = btnWindSpeed.IsSelected = false;
arcBar.IsOffline = true;
btnSwitch.IsSelected = false;
arcBar.IsClickable = false;
--
Gitblit v1.8.0