From 6a9ad7ec93218913a2ce3b898bb036f18f8f0da4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 13 八月 2020 17:06:36 +0800
Subject: [PATCH] 20200813
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index 3bcfd3d..aed9839 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -140,34 +140,34 @@
{
#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,
MaxValue = 38,
Progress = aC.curTemp,
- IsClickable = true,
+ IsClickable = aC.on_off == "on" ,
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,
MaxValue = 38,
Progress = aC.curTemp,
- IsClickable = true,
+ IsClickable = aC.on_off == "on",
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