From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 八月 2020 14:13:55 +0800
Subject: [PATCH] 20200811
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index 3bcfd3d..5642844 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -140,11 +140,11 @@
{
#if __IOS__
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(120+20),
+ Y = Application.GetRealHeight(120+25),
Width = Application.GetRealWidth(260-40),
Height = Application.GetRealWidth(260-40),
OpenAngle = 160,
- ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png",
+ ThumbImagePath = aC.on_off == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
ThumbImageHeight = Application.GetRealWidth(50),
ProgressBarColor = aC.on_off == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
MinValue = 16,
@@ -152,14 +152,14 @@
Progress = aC.curTemp,
IsClickable = true,
ArcColor = CSS_Color.BackgroundColor,
- SeekBarPadding = Application.GetRealWidth(2),
+ 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 = "FunctionIcon/AC/DiyThumbIconOn.png",
+ ThumbImagePath = aC.on_off == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
ThumbImageHeight = Application.GetRealWidth(50),
ProgressBarColor = aC.on_off == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2,
MinValue = 16,
@@ -167,7 +167,7 @@
Progress = aC.curTemp,
IsClickable = true,
ArcColor = CSS_Color.BackgroundColor,
- SeekBarPadding = Application.GetRealWidth(5),
+ SeekBarPadding = Application.GetRealWidth(7),
#endif
};
controlView.AddChidren(arcBar);
@@ -339,6 +339,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
SelectedTextColor = CSS_Color.MainColor,
IsSelected = aC.trait_mode.curValues == m,
+ TextSize = CSS_FontSize.TextFontSize,
};
modeChangeView.AddChidren(btnModeText);
@@ -462,6 +463,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
SelectedTextColor = CSS_Color.MainColor,
IsSelected = aC.trait_fan.curValues.ToString() == m,
+ TextSize = CSS_FontSize.TextFontSize,
};
modeChangeView.AddChidren(btnFanText);
@@ -489,7 +491,7 @@
break;
}
- if (aC.modeList.IndexOf(m) < aC.modeList.Count - 1)
+ if (aC.fan_List.IndexOf(m) < aC.fan_List.Count - 1)
{
modeChangeView.AddChidren(new Button()
{
--
Gitblit v1.8.0