From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 80 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 32 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index af9f77b..ea9b15c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -25,7 +25,7 @@
/// <summary>
/// 绌鸿皟娓╁害鎺у埗鎺т欢
/// </summary>
- ArcSeekBar arcBar;
+ DiyArcSeekBar arcBar;
/// <summary>
/// 鍑忓彿鎸夐挳
/// </summary>
@@ -136,25 +136,39 @@
};
controlView.AddChidren(btnCollection);
- arcBar = new ArcSeekBar()
+ arcBar = new DiyArcSeekBar()
{
+#if __IOS__
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(120),
- Width = Application.GetRealWidth(280),
- Height = Application.GetRealWidth(280),
+ Y = Application.GetRealHeight(120+25),
+ Width = Application.GetRealWidth(260-40),
+ Height = Application.GetRealWidth(260-40),
OpenAngle = 160,
- ThumbColor = CSS_Color.AuxiliaryColor1,
- ThumbModeFill = true,
- ProgressBarColor = aC.on_off == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
- ThumbRadius = Application.GetRealWidth(12),
- ArcWidthWithDefaultStyle = Application.GetRealWidth(12),
+ ThumbImagePath = aC.trait_on_off.value.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,
MinValue = 16,
MaxValue = 38,
- Progress = aC.curTemp,
- ProgressBarUnitSring = "掳C",
- IsClickable = true,
- ProgressTextColor = 0x00000000,
+ Progress = Convert.ToInt32( aC.trait_temp.value),
+ IsClickable = aC.trait_on_off.value.ToString() == "on" ,
ArcColor = CSS_Color.BackgroundColor,
+ SeekBarPadding = Application.GetRealWidth(8),
+#else
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(120 + 40),
+ 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",
+ ThumbImageHeight = Application.GetRealWidth(50),
+ ProgressBarColor = aC.trait_on_off.value.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",
+ ArcColor = CSS_Color.BackgroundColor,
+ SeekBarPadding = Application.GetRealWidth(7),
+#endif
};
controlView.AddChidren(arcBar);
@@ -167,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);
@@ -177,7 +191,7 @@
X = btnTemp.Right,
Y = btnTemp.Y,
Width = Application.GetRealWidth(30),
- Height = Application.GetRealWidth(20),
+ Height = Application.GetRealHeight(30),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
IsBold = true,
@@ -246,12 +260,12 @@
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);
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(aC, actionRefresh);
+ new TopViewDiv(bodyView,aC.name).LoadTopView_FunctionTop(aC, actionRefresh);
}
/// <summary>
/// 鍔犺浇淇敼妯″紡鍖哄煙
@@ -274,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);
@@ -303,28 +317,29 @@
};
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.ToString() == 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.ToString() == m,
+ TextSize = CSS_FontSize.TextFontSize,
};
modeChangeView.AddChidren(btnModeText);
@@ -357,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()
{
@@ -398,7 +413,7 @@
Height = Application.GetRealHeight(243),
AnimateSpeed = 0.3f,
BackgroundImagePath = "FunctionIcon/AC/DivBg2.png",
- Animate = Animate.DownToUp,
+ Animate = Animate.UpToDown,
};
dialogView.AddChidren(modeChangeView);
@@ -426,28 +441,29 @@
};
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);
@@ -475,7 +491,7 @@
break;
}
- if (aC.modeList.IndexOf(m) < aC.modeList.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