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/FoolHeating/FloorHeatingPage.cs | 61 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
index 36d4ec5..49307d5 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
@@ -25,7 +25,7 @@
/// <summary>
/// 绌鸿皟娓╁害鎺у埗鎺т欢
/// </summary>
- ArcSeekBar arcBar;
+ DiyArcSeekBar arcBar;
/// <summary>
/// 鍑忓彿鎸夐挳
/// </summary>
@@ -132,33 +132,38 @@
};
controlView.AddChidren(btnCollection);
- arcBar = new ArcSeekBar()
+ arcBar = new DiyArcSeekBar()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(120),
- Width = Application.GetRealWidth(280),
- Height = Application.GetRealWidth(280),
OpenAngle = 160,
- ThumbColor = CSS_Color.AuxiliaryColor1,
- ThumbModeFill = true,
- ProgressBarColor = fh.on_off == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2,
- ThumbRadius = Application.GetRealWidth(12),
- ArcWidthWithDefaultStyle = Application.GetRealWidth(12),
+ ThumbImagePath = fh.trait_on_off.value.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIcon2On.png" : "FunctionIcon/AC/DiyThumbIcon.png",
+ ThumbImageHeight = Application.GetRealWidth(50),
+ ProgressBarColor = fh.trait_on_off.value.ToString() == "on" ? 0xFFFC9C04 : CSS_Color.PromptingColor2,
MinValue = 5,
MaxValue = 35,
- Progress = fh.curTemp,
- ProgressBarUnitSring = "掳C",
- IsClickable = true,
- ProgressTextColor = 0x00000000,
+ IsClickable = fh.trait_on_off.value.ToString() == "on",
ArcColor = CSS_Color.BackgroundColor,
+ Progress = Convert.ToInt32(fh.curTemp),
+#if __IOS__
+ Y = Application.GetRealHeight(120+25),
+ Width = Application.GetRealWidth(260-40),
+ Height = Application.GetRealWidth(260-40),
+ SeekBarPadding = Application.GetRealWidth(8),
+#else
+ Y = Application.GetRealHeight(120 + 40),
+ Width = Application.GetRealWidth(260 - 40),
+ Height = Application.GetRealWidth(260 - 40),
+ SeekBarPadding = Application.GetRealWidth(7),
+#endif
+
};
controlView.AddChidren(arcBar);
btnTemp = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(206),
- Width = Application.GetRealWidth(71),
+ Y = Application.GetRealHeight(200),
+ Width = Application.GetRealWidth(80),
Height = Application.GetRealWidth(60),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 56,
@@ -173,19 +178,19 @@
X = btnTemp.Right,
Y = btnTemp.Y,
Width = Application.GetRealWidth(30),
- Height = Application.GetRealWidth(20),
+ Height = Application.GetRealWidth(25),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
IsBold = true,
TextAlignment = TextAlignment.CenterLeft,
- Text = "掳C",
+ Text = fh.tempUnitString
};
controlView.AddChidren(btnTempUint);
btnIndoorTemp = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = btnTemp.Bottom,
+ Y = btnTemp.Bottom+ Application.GetRealWidth(10),
Width = Application.GetRealWidth(100),
Height = Application.GetRealHeight(20),
Text = Language.StringByID(StringId.IndoorTemp) + "20掳C",
@@ -232,7 +237,7 @@
Height = Application.GetRealWidth(40),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = fh.on_off == "on"
+ IsSelected = fh.trait_on_off.value.ToString() == "on"
};
controlView.AddChidren(btnSwitch);
@@ -289,28 +294,28 @@
};
modeChangeView.AddChidren(btnLine);
- foreach (var m in fh.modeList)
+ foreach (var m in fh.trait_mode.value_key)
{
Button btnModeIcon = new Button()
{
X = btnTitle.X,
- Y = Application.GetRealHeight(44 * (fh.modeList.IndexOf(m) + 1) + 10 + 8),
+ Y = Application.GetRealHeight(44 * (fh.trait_mode.value_key.IndexOf(m) + 1) + 10 + 8),
Width = Application.GetRealWidth(24),
Height = Application.GetRealWidth(24),
- IsSelected = fh.curMode == m,
+ IsSelected = fh.trait_mode.value.ToString() == m,
};
modeChangeView.AddChidren(btnModeIcon);
Button btnModeText = new Button()
{
X = Application.GetRealWidth(12) + btnModeIcon.Right,
- Y = Application.GetRealHeight(44 * (fh.modeList.IndexOf(m) + 1) + 8),
+ Y = Application.GetRealHeight(44 * (fh.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 = fh.curMode == m,
+ IsSelected = fh.trait_mode.value.ToString() == m,
};
modeChangeView.AddChidren(btnModeText);
@@ -336,14 +341,14 @@
btnModeIcon.UnSelectedImagePath = "FunctionIcon/AC/AutoIconGray.png";
btnModeText.TextID = StringId.Auto;
break;
- case "ordinary":
+ case "normal":
btnModeIcon.SelectedImagePath = "FunctionIcon/FloorHeating/OrdinaryIcon.png";
btnModeIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/OrdinaryIconGray.png";
- btnModeText.TextID = StringId.Ordinary;
+ btnModeText.TextID = StringId.Normal;
break;
}
- if (fh.modeList.IndexOf(m) < fh.modeList.Count - 1)
+ if (fh.trait_mode.value_key.IndexOf(m) < fh.trait_mode.value_key.Count - 1)
{
modeChangeView.AddChidren(new Button()
{
--
Gitblit v1.8.0