From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 九月 2020 15:22:09 +0800
Subject: [PATCH] 2020-09-01
---
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
index 796ced9..cc40ad1 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
@@ -29,7 +29,7 @@
/// <summary>
/// 璋冨厜鎺т欢
/// </summary>
- WaveSeekBar dimmerBar;
+ WaveSeekBarOn dimmerBar;
/// <summary>
/// 寮�鍏虫寜閽�
/// </summary>
@@ -117,23 +117,31 @@
};
controlView.AddChidren(btnCollection);
- dimmerBar = new WaveSeekBar()
+ dimmerBar = new WaveSeekBarOn()
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(74 + 16),
Width = Application.GetRealWidth(168 - 40),
Height = Application.GetRealHeight(288 - 16 - 16),
- WaveColor = light.on_off == "on" ? CSS_Color.AuxiliaryColor1 : CSS_Color.DividingLineColor,
- WaveBorderColor = CSS_Color.PromptingColor2,
+ //WaveBorderColor = CSS_Color.PromptingColor2,
BorderColor = 0x00000000,
- CornerRadius = Application.GetRealWidth(1),
+ CornerRadius = Application.GetRealWidth(40),
BorderWidth = 0,
- WavePadding = Application.GetRealWidth(-5),
- BackgroundColor = CSS_Color.BackgroundColor,
- Radius = (uint)Application.GetRealWidth(40),
+ //WavePadding = Application.GetRealWidth(-5),
+ //BackgroundColor = CSS_Color.BackgroundColor,
+ //Radius = (uint)Application.GetRealWidth(40),
Progress = light.brightness,
};
controlView.AddChidren(dimmerBar);
+ if(light.trait_on_off.value.ToString() == "on")
+ {
+ dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
+ }
+ else
+ {
+ dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
+ }
+
#region 娓愬彉鏃堕棿璋冭妭
var btnGradualChangeText = new Button()
@@ -202,7 +210,7 @@
Height = Application.GetMinRealAverage(40),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = light.on_off == "on",
+ IsSelected = light.trait_on_off.value.ToString() == "on",
//Tag =
};
controlView.AddChidren(btnSwitch);
--
Gitblit v1.8.0