From 0891d90cd0d435338cc2851fd0830cd318a17fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 14:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index 9f79e80..6f0fee4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -143,37 +143,30 @@
arcBar = new DiyArcSeekBar()
{
-#if __IOS__
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(120+25),
- Width = Application.GetRealWidth(260-40),
- Height = Application.GetRealWidth(260-40),
OpenAngle = 160,
ThumbImagePath = aC.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
ThumbImageHeight = Application.GetRealWidth(50),
- ProgressBarColor = aC.trait_on_off.curValue.ToString() == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
+ ProgressBarColor = CSS_Color.MainColor,
+ OfflineProgressBarColor = CSS_Color.PromptingColor2,
+ IsOffline = aC.trait_on_off.curValue.ToString() == "off",
MinValue = 16,
- MaxValue = 38,
- Progress = Convert.ToInt32( aC.trait_temp.curValue),
- IsClickable = aC.trait_on_off.curValue.ToString() == "on" ,
+ MaxValue = 32,
+ //IsClickable = aC.trait_on_off.curValue.ToString() == "on",
ArcColor = CSS_Color.BackgroundColor,
+ Progress = Convert.ToInt32(aC.trait_temp.curValue),
+#if __IOS__
+ Y = Application.GetRealHeight(120 + 25),
+ Width = Application.GetRealWidth(260 - 40),
+ Height = Application.GetRealWidth(260 - 40),
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.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
- ThumbImageHeight = Application.GetRealWidth(50),
- ProgressBarColor = aC.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2,
- MinValue = 16,
- MaxValue = 38,
- Progress = Convert.ToInt32( aC.trait_temp.curValue),
- IsClickable = aC.trait_on_off.curValue.ToString() == "on",
- ArcColor = CSS_Color.BackgroundColor,
SeekBarPadding = Application.GetRealWidth(7),
#endif
+
};
controlView.AddChidren(arcBar);
@@ -298,8 +291,6 @@
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(287),
BackgroundImagePath = "FunctionIcon/AC/DivBg1.png",
- Animate = Animate.UpToDown,
- AnimateSpeed = 0.3f
};
dialogView.AddChidren(modeChangeView);
@@ -421,9 +412,7 @@
Y = Application.GetRealHeight(172),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(243),
- AnimateSpeed = 0.3f,
BackgroundImagePath = "FunctionIcon/AC/DivBg2.png",
- Animate = Animate.UpToDown,
};
dialogView.AddChidren(modeChangeView);
--
Gitblit v1.8.0