From 1802b849f0dadc81644fb0a706d6fb45efdf2a20 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 24 十一月 2021 16:13:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs | 131 ++++++++++++++++++++++---------------------
1 files changed, 68 insertions(+), 63 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
index 2c3be59..a40ee00 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
@@ -37,7 +37,7 @@
/// <summary>
/// 娓愬彉鏃堕棿淇敼
/// </summary>
- //DiyImageSeekBar barFadeTime;
+ DiyImageSeekBar barFadeTime;
/// <summary>
/// 鑹叉俯鐨勬粦鍔ㄦ帶浠�
/// </summary>
@@ -170,7 +170,72 @@
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
Text = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness)) + "%",
};
- controlView.AddChidren(btnBrightnessText);
+ controlView.AddChidren(btnBrightnessText);
+
+
+ #region 娓愬彉鏃堕棿璋冭妭
+ if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
+ {
+ var btnGradualChangeText = new Button()
+ {
+ X = Application.GetRealWidth(35),
+ Y = Application.GetRealHeight(306 + 40),
+ Width = Application.GetRealWidth(224),
+ Height = Application.GetRealHeight(21),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextID = StringId.SpeedOfChange,
+ };
+ controlView.AddChidren(btnGradualChangeText);
+
+ var btnGradualChangeMinValuesText = new Button()
+ {
+ X = Application.GetRealWidth(35),
+ Y = btnGradualChangeText.Bottom + Application.GetRealHeight(5),
+ Width = Application.GetRealWidth(22),
+ Height = Application.GetRealHeight(21),
+ Text = "0s",
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ };
+ controlView.AddChidren(btnGradualChangeMinValuesText);
+
+ barFadeTime = new DiyImageSeekBar()
+ {
+ X = btnGradualChangeMinValuesText.Right,
+ Y = Application.GetRealHeight(360),
+ Width = Application.GetRealWidth(210),
+ Height = Application.GetRealHeight(54),
+ SeekBarViewHeight = Application.GetRealHeight(8),
+ ThumbImagePath = "Public/ThumbImage.png",
+ ThumbImageHeight = Application.GetRealHeight(54),
+ ProgressBarColor = CSS_Color.MainColor,
+ ProgressTextColor = CSS_Color.FirstLevelTitleColor,
+ ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ ProgressBarUnitSring = "s",
+ MaxValue = 10,
+ Progress = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.FadeTime)),
+ SeekBarPadding = Application.GetRealWidth(20),
+ };
+ controlView.AddChidren(barFadeTime);
+
+ var btnGradualChangeMaxValuesText = new Button()
+ {
+ X = barFadeTime.Right,
+ Y = btnGradualChangeText.Bottom + Application.GetRealHeight(5),
+ Width = Application.GetRealWidth(35),
+ Height = Application.GetRealHeight(21),
+ Text = "10s",
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ };
+ controlView.AddChidren(btnGradualChangeMaxValuesText);
+ }
+ #endregion
+
#region 鑹叉俯
var cctAttr = function.GetAttribute(FunctionAttributeKey.CCT);
@@ -186,7 +251,7 @@
//鑹叉俯
var btnTempClolor = new Button();
btnTempClolor.X = Application.GetRealWidth(35);
- btnTempClolor.Y = Application.GetRealHeight(306 + 60);
+ btnTempClolor.Y = Application.GetRealHeight(395);
btnTempClolor.Width = Application.GetRealWidth(224);
btnTempClolor.Height = Application.GetRealHeight(21);
btnTempClolor.TextAlignment = TextAlignment.CenterLeft;
@@ -249,66 +314,6 @@
btnTempClolorMax.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;
controlView.AddChidren(btnTempClolorMax);
- #endregion
-
- #region 娓愬彉鏃堕棿璋冭妭
- //var btnGradualChangeText = new Button()
- //{
- // X = Application.GetRealWidth(35),
- // Y = Application.GetRealHeight(385),
- // Width = Application.GetRealWidth(224),
- // Height = Application.GetRealHeight(21),
- // TextAlignment = TextAlignment.CenterLeft,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // TextID = StringId.SpeedOfChange,
- //};
- //controlView.AddChidren(btnGradualChangeText);
-
- //var btnGradualChangeMinValuesText = new Button()
- //{
- // X = Application.GetRealWidth(35),
- // Y = btnGradualChangeText.Bottom + Application.GetRealHeight(8),
- // Width = Application.GetRealWidth(22),
- // Height = Application.GetRealHeight(21),
- // Text = "0s",
- // TextAlignment = TextAlignment.CenterLeft,
- // TextColor = CSS_Color.PromptingColor1,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- //};
- //controlView.AddChidren(btnGradualChangeMinValuesText);
-
- //barFadeTime = new DiyImageSeekBar()
- //{
- // X = btnGradualChangeMinValuesText.Right,
- // Y = Application.GetRealHeight(412 - 21) + Application.GetRealHeight(8),
- // Width = Application.GetRealWidth(210),
- // Height = Application.GetRealHeight(54),
- // SeekBarViewHeight = Application.GetRealHeight(8),
- // ThumbImagePath = "Public/ThumbImage.png",
- // ThumbImageHeight = Application.GetRealHeight(54),
- // ProgressBarColor = CSS_Color.MainColor,
- // ProgressTextColor = CSS_Color.FirstLevelTitleColor,
- // ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // ProgressBarUnitSring = "s",
- // MaxValue = 10,
- // Progress = function.fadeTime,
- // SeekBarPadding = Application.GetRealWidth(20),
- //};
- //controlView.AddChidren(barFadeTime);
-
- //var btnGradualChangeMaxValuesText = new Button()
- //{
- // X = barFadeTime.Right,
- // Y = btnGradualChangeText.Bottom + Application.GetRealHeight(8),
- // Width = Application.GetRealWidth(35),
- // Height = Application.GetRealHeight(21),
- // Text = "10s",
- // TextAlignment = TextAlignment.CenterLeft,
- // TextColor = CSS_Color.PromptingColor1,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- //};
- //controlView.AddChidren(btnGradualChangeMaxValuesText);
#endregion
btnSwitch = new Button()
--
Gitblit v1.8.0