From e6a26ee148587327478d9a82624a820c907b6e16 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 04 十一月 2020 14:58:15 +0800
Subject: [PATCH] 20201104
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
index d912967..f4e0269 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -41,6 +41,10 @@
/// 璋冨厜杩涘害鏉�
/// </summary>
DiyImageSeekBar dimmerBar;
+ /// <summary>
+ /// 娓愬彉鏃堕棿杩涘害鏉�
+ /// </summary>
+ DiyImageSeekBar barFadeTime;
#endregion
#region 鍖哄煙鍙橀噺
@@ -106,6 +110,10 @@
};
controlView.AddChidren(btnFromFoorAndRoom);
+ if(light.redColor==0&&light.greenColor == 0&& light.blueColor == 0)
+ {
+ }
+
btnCurColor = new Button()
{
X = Application.GetRealWidth(16),
@@ -117,6 +125,11 @@
BorderWidth = 1,
BackgroundColor = (uint)(0xFF000000 + light.redColor * 256 * 256 + light.greenColor * 256 + light.blueColor)
};
+
+ if (light.redColor == 0 && light.greenColor == 0 && light.blueColor == 0)
+ {
+ btnCurColor.BackgroundColor = 0x00000000;
+ }
controlView.AddChidren(btnCurColor);
btnCollection = new Button()
@@ -227,7 +240,7 @@
};
controlView.AddChidren(btnGradualChangeMinValuesText);
- var barGradualChange = new DiyImageSeekBar()
+ barFadeTime = new DiyImageSeekBar()
{
X = btnGradualChangeMinValuesText.Right,
Y = Application.GetRealHeight(412 - 21),
@@ -242,14 +255,14 @@
ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
ProgressBarUnitSring = "s",
MaxValue = 10,
- Progress = 0,
+ Progress = light.fadeTime,
SeekBarPadding = Application.GetRealWidth(20),
};
- controlView.AddChidren(barGradualChange);
+ controlView.AddChidren(barFadeTime);
var btnGradualChangeMaxValuesText = new Button()
{
- X = barGradualChange.Right,
+ X = barFadeTime.Right,
Y = btnGradualChangeText.Bottom+ Application.GetRealHeight(10),
Width = Application.GetRealWidth(35),
Height = Application.GetRealHeight(21),
--
Gitblit v1.8.0