From df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 15 三月 2021 14:55:49 +0800
Subject: [PATCH] 合并前上传一个版本
---
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
index bf0f284..1a9040b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
@@ -136,15 +136,10 @@
Y = Application.GetRealHeight(74 + 16),
Width = Application.GetRealWidth(168 - 40),
Height = Application.GetRealHeight(288 - 16 - 16),
- //WaveBorderColor = CSS_Color.PromptingColor2,
BorderColor = 0x00000000,
- CornerRadius = Application.GetRealWidth(40),
+ CornerRadius = Application.GetRealWidth(30),
BorderWidth = 0,
- //WavePadding = Application.GetRealWidth(-5),
- //BackgroundColor = CSS_Color.BackgroundColor,
- //Radius = (uint)Application.GetRealWidth(40),
Progress = light.brightness,
- //ProgressTextColor =0x00000000,
IsProgressTextShow = false,
};
controlView.AddChidren(dimmerBar);
@@ -170,7 +165,6 @@
};
controlView.AddChidren(btnBrightnessText);
-
#region 娓愬彉鏃堕棿璋冭妭
var btnGradualChangeText = new Button()
{
@@ -182,6 +176,8 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = StringId.SpeedOfChange,
+ Visible = light.HadFadeTime,
+ Enable = light.HadFadeTime,
};
controlView.AddChidren(btnGradualChangeText);
@@ -195,6 +191,8 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Visible = light.HadFadeTime,
+ Enable = light.HadFadeTime,
};
controlView.AddChidren(btnGradualChangeMinValuesText);
@@ -214,6 +212,8 @@
MaxValue = 10,
Progress = light.fadeTime,
SeekBarPadding = Application.GetRealWidth(20),
+ Visible = light.HadFadeTime,
+ Enable = light.HadFadeTime,
};
controlView.AddChidren(barFadeTime);
@@ -227,6 +227,8 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Visible = light.HadFadeTime,
+ Enable = light.HadFadeTime,
};
controlView.AddChidren(btnGradualChangeMaxValuesText);
#endregion
--
Gitblit v1.8.0