From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index d64ec3b..3bcfd3d 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+20),
+ Width = Application.GetRealWidth(260-40),
+ Height = Application.GetRealWidth(260-40),
OpenAngle = 160,
- ThumbColor = CSS_Color.AuxiliaryColor1,
- ThumbModeFill = true,
+ ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png",
+ ThumbImageHeight = Application.GetRealWidth(50),
ProgressBarColor = aC.on_off == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
- ThumbRadius = Application.GetRealWidth(12),
- ArcWidthWithDefaultStyle = Application.GetRealWidth(12),
MinValue = 16,
MaxValue = 38,
Progress = aC.curTemp,
- ProgressBarUnitSring = "掳C",
IsClickable = true,
- ProgressTextColor = 0x00000000,
ArcColor = CSS_Color.BackgroundColor,
+ SeekBarPadding = Application.GetRealWidth(2),
+#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",
+ ThumbImageHeight = Application.GetRealWidth(50),
+ ProgressBarColor = aC.on_off == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2,
+ MinValue = 16,
+ MaxValue = 38,
+ Progress = aC.curTemp,
+ IsClickable = true,
+ ArcColor = CSS_Color.BackgroundColor,
+ SeekBarPadding = Application.GetRealWidth(5),
+#endif
};
controlView.AddChidren(arcBar);
@@ -165,7 +179,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,
@@ -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,
@@ -251,7 +265,7 @@
controlView.AddChidren(btnSwitch);
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(aC, actionRefresh);
+ new TopViewDiv(bodyView,aC.name).LoadTopView(aC, actionRefresh);
}
/// <summary>
/// 鍔犺浇淇敼妯″紡鍖哄煙
@@ -491,7 +505,5 @@
dialog.Show();
}
-
-
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0