From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 九月 2020 15:22:09 +0800
Subject: [PATCH] 2020-09-01
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index aed9839..64b91d0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -149,7 +149,7 @@
ProgressBarColor = aC.on_off == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
MinValue = 16,
MaxValue = 38,
- Progress = aC.curTemp,
+ Progress = Convert.ToInt32( aC.trait_temp.value),
IsClickable = aC.on_off == "on" ,
ArcColor = CSS_Color.BackgroundColor,
SeekBarPadding = Application.GetRealWidth(8),
@@ -159,13 +159,13 @@
Width = Application.GetRealWidth(260 - 40),
Height = Application.GetRealWidth(260 - 40),
OpenAngle = 160,
- ThumbImagePath = aC.on_off == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
+ ThumbImagePath = aC.trait_on_off.value.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
ThumbImageHeight = Application.GetRealWidth(50),
- ProgressBarColor = aC.on_off == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2,
+ ProgressBarColor = aC.trait_on_off.value.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2,
MinValue = 16,
MaxValue = 38,
- Progress = aC.curTemp,
- IsClickable = aC.on_off == "on",
+ Progress = Convert.ToInt32( aC.trait_temp.value),
+ IsClickable = aC.trait_on_off.value.ToString() == "on",
ArcColor = CSS_Color.BackgroundColor,
SeekBarPadding = Application.GetRealWidth(7),
#endif
@@ -181,7 +181,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 50,
IsBold = true,
- Text = aC.curTemp.ToString(),
+ Text = aC.trait_temp.value.ToString(),
TextAlignment = TextAlignment.Center,
};
controlView.AddChidren(btnTemp);
@@ -260,7 +260,7 @@
Height = Application.GetRealWidth(40),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = aC.on_off == "on"
+ IsSelected = aC.trait_on_off.value.ToString() == "on"
};
controlView.AddChidren(btnSwitch);
@@ -317,28 +317,28 @@
};
modeChangeView.AddChidren(btnLine);
- foreach(var m in aC.modeList)
+ foreach(var m in aC.trait_mode.value_key)
{
Button btnModeIcon = new Button()
{
X = btnTitle.X,
- Y = Application.GetRealHeight(44 * (aC.modeList.IndexOf(m) + 1) + 10 + 8),
+ Y = Application.GetRealHeight(44 * (aC.trait_mode.value_key.IndexOf(m) + 1) + 10 + 8),
Width = Application.GetRealWidth(24),
Height = Application.GetRealWidth(24),
- IsSelected = aC.trait_mode.curValues == m,
+ IsSelected = aC.trait_mode.value == m,
};
modeChangeView.AddChidren(btnModeIcon);
Button btnModeText = new Button()
{
X = Application.GetRealWidth(12) + btnModeIcon.Right,
- Y = Application.GetRealHeight(44 * (aC.modeList.IndexOf(m) + 1) + 8),
+ Y = Application.GetRealHeight(44 * (aC.trait_mode.value_key.IndexOf(m) + 1) + 8),
Height = Application.GetRealHeight(44),
Width = Application.GetRealWidth(70),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
SelectedTextColor = CSS_Color.MainColor,
- IsSelected = aC.trait_mode.curValues == m,
+ IsSelected = aC.trait_mode.value == m,
TextSize = CSS_FontSize.TextFontSize,
};
modeChangeView.AddChidren(btnModeText);
@@ -372,7 +372,7 @@
break;
}
- if(aC.modeList.IndexOf(m) < aC.modeList.Count-1)
+ if(aC.trait_mode.value_key.IndexOf(m) < aC.trait_mode.value_key.Count-1)
{
modeChangeView.AddChidren(new Button()
{
@@ -441,28 +441,28 @@
};
modeChangeView.AddChidren(btnLine);
- foreach (var m in aC.fan_List)
+ foreach (var m in aC.trait_fan.value_key)
{
Button btnFanIcon = new Button()
{
X = btnTitle.X,
- Y = Application.GetRealHeight(44 * (aC.fan_List.IndexOf(m) + 1) + 10 + 8),
+ Y = Application.GetRealHeight(44 * (aC.trait_fan.value_key.IndexOf(m) + 1) + 10 + 8),
Width = Application.GetRealWidth(24),
Height = Application.GetRealWidth(24),
- IsSelected = aC.trait_fan.curValues.ToString() == m,
+ IsSelected = aC.trait_fan.value.ToString() == m,
};
modeChangeView.AddChidren(btnFanIcon);
Button btnFanText = new Button()
{
X = Application.GetRealWidth(12) + btnFanIcon.Right,
- Y = Application.GetRealHeight(44 * (aC.fan_List.IndexOf(m) + 1) + 8),
+ Y = Application.GetRealHeight(44 * (aC.trait_fan.value_key.IndexOf(m) + 1) + 8),
Height = Application.GetRealHeight(44),
Width = Application.GetRealWidth(70),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
SelectedTextColor = CSS_Color.MainColor,
- IsSelected = aC.trait_fan.curValues.ToString() == m,
+ IsSelected = aC.trait_fan.value.ToString() == m,
TextSize = CSS_FontSize.TextFontSize,
};
modeChangeView.AddChidren(btnFanText);
@@ -491,7 +491,7 @@
break;
}
- if (aC.fan_List.IndexOf(m) < aC.fan_List.Count - 1)
+ if (aC.trait_fan.value_key.IndexOf(m) < aC.trait_fan.value_key.Count - 1)
{
modeChangeView.AddChidren(new Button()
{
--
Gitblit v1.8.0