From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 03 十二月 2020 15:35:42 +0800
Subject: [PATCH] 2020-12-03-1
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index 64b91d0..8361ea9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -132,7 +132,7 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = aC.collection
+ IsSelected = aC.collect
};
controlView.AddChidren(btnCollection);
@@ -144,13 +144,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.curValue.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.curValue.ToString() == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
MinValue = 16,
MaxValue = 38,
- Progress = Convert.ToInt32( aC.trait_temp.value),
- IsClickable = aC.on_off == "on" ,
+ Progress = Convert.ToInt32( aC.trait_temp.curValue),
+ IsClickable = aC.trait_on_off.curValue.ToString() == "on" ,
ArcColor = CSS_Color.BackgroundColor,
SeekBarPadding = Application.GetRealWidth(8),
#else
@@ -159,13 +159,13 @@
Width = Application.GetRealWidth(260 - 40),
Height = Application.GetRealWidth(260 - 40),
OpenAngle = 160,
- ThumbImagePath = aC.trait_on_off.value.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
+ ThumbImagePath = aC.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
ThumbImageHeight = Application.GetRealWidth(50),
- ProgressBarColor = aC.trait_on_off.value.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2,
+ ProgressBarColor = aC.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2,
MinValue = 16,
MaxValue = 38,
- Progress = Convert.ToInt32( aC.trait_temp.value),
- IsClickable = aC.trait_on_off.value.ToString() == "on",
+ Progress = Convert.ToInt32( aC.trait_temp.curValue),
+ IsClickable = aC.trait_on_off.curValue.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.trait_temp.value.ToString(),
+ Text = aC.trait_temp.curValue.ToString(),
TextAlignment = TextAlignment.Center,
};
controlView.AddChidren(btnTemp);
@@ -260,12 +260,12 @@
Height = Application.GetRealWidth(40),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = aC.trait_on_off.value.ToString() == "on"
+ IsSelected = aC.trait_on_off.curValue.ToString() == "on"
};
controlView.AddChidren(btnSwitch);
LoadEventList();
- new TopViewDiv(bodyView,aC.name).LoadTopView(aC, actionRefresh);
+ new TopViewDiv(bodyView,aC.name).LoadTopView_FunctionTop(aC, actionRefresh);
}
/// <summary>
/// 鍔犺浇淇敼妯″紡鍖哄煙
@@ -288,7 +288,7 @@
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(287),
BackgroundImagePath = "FunctionIcon/AC/DivBg1.png",
- Animate = Animate.DownToUp,
+ Animate = Animate.UpToDown,
AnimateSpeed = 0.3f
};
dialogView.AddChidren(modeChangeView);
@@ -317,28 +317,28 @@
};
modeChangeView.AddChidren(btnLine);
- foreach(var m in aC.trait_mode.value_key)
+ foreach(var m in aC.trait_mode.value)
{
Button btnModeIcon = new Button()
{
X = btnTitle.X,
- Y = Application.GetRealHeight(44 * (aC.trait_mode.value_key.IndexOf(m) + 1) + 10 + 8),
+ Y = Application.GetRealHeight(44 * (aC.trait_mode.value.IndexOf(m) + 1) + 10 + 8),
Width = Application.GetRealWidth(24),
Height = Application.GetRealWidth(24),
- IsSelected = aC.trait_mode.value == m,
+ IsSelected = aC.trait_mode.curValue.ToString() == m,
};
modeChangeView.AddChidren(btnModeIcon);
Button btnModeText = new Button()
{
X = Application.GetRealWidth(12) + btnModeIcon.Right,
- Y = Application.GetRealHeight(44 * (aC.trait_mode.value_key.IndexOf(m) + 1) + 8),
+ Y = Application.GetRealHeight(44 * (aC.trait_mode.value.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.value == m,
+ IsSelected = aC.trait_mode.curValue.ToString() == m,
TextSize = CSS_FontSize.TextFontSize,
};
modeChangeView.AddChidren(btnModeText);
@@ -372,7 +372,7 @@
break;
}
- if(aC.trait_mode.value_key.IndexOf(m) < aC.trait_mode.value_key.Count-1)
+ if(aC.trait_mode.value.IndexOf(m) < aC.trait_mode.value.Count-1)
{
modeChangeView.AddChidren(new Button()
{
@@ -413,7 +413,7 @@
Height = Application.GetRealHeight(243),
AnimateSpeed = 0.3f,
BackgroundImagePath = "FunctionIcon/AC/DivBg2.png",
- Animate = Animate.DownToUp,
+ Animate = Animate.UpToDown,
};
dialogView.AddChidren(modeChangeView);
@@ -441,28 +441,28 @@
};
modeChangeView.AddChidren(btnLine);
- foreach (var m in aC.trait_fan.value_key)
+ foreach (var m in aC.trait_fan.value)
{
Button btnFanIcon = new Button()
{
X = btnTitle.X,
- Y = Application.GetRealHeight(44 * (aC.trait_fan.value_key.IndexOf(m) + 1) + 10 + 8),
+ Y = Application.GetRealHeight(44 * (aC.trait_fan.value.IndexOf(m) + 1) + 10 + 8),
Width = Application.GetRealWidth(24),
Height = Application.GetRealWidth(24),
- IsSelected = aC.trait_fan.value.ToString() == m,
+ IsSelected = aC.trait_fan.curValue.ToString() == m,
};
modeChangeView.AddChidren(btnFanIcon);
Button btnFanText = new Button()
{
X = Application.GetRealWidth(12) + btnFanIcon.Right,
- Y = Application.GetRealHeight(44 * (aC.trait_fan.value_key.IndexOf(m) + 1) + 8),
+ Y = Application.GetRealHeight(44 * (aC.trait_fan.value.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.value.ToString() == m,
+ IsSelected = aC.trait_fan.curValue.ToString() == m,
TextSize = CSS_FontSize.TextFontSize,
};
modeChangeView.AddChidren(btnFanText);
@@ -491,7 +491,7 @@
break;
}
- if (aC.trait_fan.value_key.IndexOf(m) < aC.trait_fan.value_key.Count - 1)
+ if (aC.trait_fan.value.IndexOf(m) < aC.trait_fan.value.Count - 1)
{
modeChangeView.AddChidren(new Button()
{
--
Gitblit v1.8.0