From 5de5a26d3825b3182a7d3a18ed1cbdbb78a3f9aa Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 23 七月 2020 16:39:59 +0800
Subject: [PATCH] 2020-07-23
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index 24a1dd9..0a3904f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -142,7 +142,7 @@
Y = Application.GetRealHeight(120),
Width = Application.GetRealWidth(280),
Height = Application.GetRealWidth(280),
- Angle = 160,
+ OpenAngle = 160,
ThumbColor = CSS_Color.AuxiliaryColor1,
ThumbModeFill = true,
ProgressBarColor = aC.on_off == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
@@ -165,7 +165,7 @@
Width = Application.GetRealWidth(71),
Height = Application.GetRealWidth(60),
TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = 56,
+ TextSize = 50,
IsBold = true,
Text = aC.curTemp.ToString(),
TextAlignment = TextAlignment.Center,
@@ -251,7 +251,7 @@
controlView.AddChidren(btnSwitch);
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(aC, actionRefresh);
+ new TopViewDiv(bodyView,aC.name).LoadTopView(aC, actionRefresh);
}
/// <summary>
/// 鍔犺浇淇敼妯″紡鍖哄煙
@@ -275,6 +275,7 @@
Height = Application.GetRealHeight(287),
BackgroundImagePath = "FunctionIcon/AC/DivBg1.png",
Animate = Animate.DownToUp,
+ AnimateSpeed = 0.3f
};
dialogView.AddChidren(modeChangeView);
@@ -302,28 +303,28 @@
};
modeChangeView.AddChidren(btnLine);
- foreach(var m in aC.mode)
+ foreach(var m in aC.modeList)
{
Button btnModeIcon = new Button()
{
X = btnTitle.X,
- Y = Application.GetRealHeight(44 * (aC.mode.IndexOf(m) + 1) + 10 + 8),
+ Y = Application.GetRealHeight(44 * (aC.modeList.IndexOf(m) + 1) + 10 + 8),
Width = Application.GetRealWidth(24),
Height = Application.GetRealWidth(24),
- IsSelected = aC.curMode == m,
+ IsSelected = aC.trait_mode.curValues == m,
};
modeChangeView.AddChidren(btnModeIcon);
Button btnModeText = new Button()
{
X = Application.GetRealWidth(12) + btnModeIcon.Right,
- Y = Application.GetRealHeight(44 * (aC.mode.IndexOf(m) + 1) + 8),
+ Y = Application.GetRealHeight(44 * (aC.modeList.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.curMode == m,
+ IsSelected = aC.trait_mode.curValues == m,
};
modeChangeView.AddChidren(btnModeText);
@@ -356,7 +357,7 @@
break;
}
- if(aC.mode.IndexOf(m) < aC.mode.Count-1)
+ if(aC.modeList.IndexOf(m) < aC.modeList.Count-1)
{
modeChangeView.AddChidren(new Button()
{
@@ -395,6 +396,7 @@
Y = Application.GetRealHeight(172),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(243),
+ AnimateSpeed = 0.3f,
BackgroundImagePath = "FunctionIcon/AC/DivBg2.png",
Animate = Animate.DownToUp,
};
@@ -424,28 +426,28 @@
};
modeChangeView.AddChidren(btnLine);
- foreach (var m in aC.fan)
+ foreach (var m in aC.fan_List)
{
Button btnFanIcon = new Button()
{
X = btnTitle.X,
- Y = Application.GetRealHeight(44 * (aC.fan.IndexOf(m) + 1) + 10 + 8),
+ Y = Application.GetRealHeight(44 * (aC.fan_List.IndexOf(m) + 1) + 10 + 8),
Width = Application.GetRealWidth(24),
Height = Application.GetRealWidth(24),
- IsSelected = aC.curFan == m,
+ IsSelected = aC.trait_fan.curValues.ToString() == m,
};
modeChangeView.AddChidren(btnFanIcon);
Button btnFanText = new Button()
{
X = Application.GetRealWidth(12) + btnFanIcon.Right,
- Y = Application.GetRealHeight(44 * (aC.fan.IndexOf(m) + 1) + 8),
+ Y = Application.GetRealHeight(44 * (aC.fan_List.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.curFan == m,
+ IsSelected = aC.trait_fan.curValues.ToString() == m,
};
modeChangeView.AddChidren(btnFanText);
@@ -473,7 +475,7 @@
break;
}
- if (aC.mode.IndexOf(m) < aC.mode.Count - 1)
+ if (aC.modeList.IndexOf(m) < aC.modeList.Count - 1)
{
modeChangeView.AddChidren(new Button()
{
@@ -489,7 +491,5 @@
dialog.Show();
}
-
-
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0