From 8df24b0a3dfd5b6f39c5393ef24eab25b70ab858 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 九月 2020 13:18:33 +0800
Subject: [PATCH] 202009111
---
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
index a2f3649..f7cc34d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
@@ -29,7 +29,11 @@
/// <summary>
/// 璋冨厜鎺т欢
/// </summary>
- WaveSeekBar dimmerBar;
+ WaveSeekBarOn dimmerBar;
+ /// <summary>
+ /// 浜害鏄剧ず鎸夐挳
+ /// </summary>
+ Button btnBrightnessText;
/// <summary>
/// 寮�鍏虫寜閽�
/// </summary>
@@ -117,23 +121,25 @@
};
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),
- 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,
+ //ProgressTextColor =0x00000000,
+ IsProgressTextShow = false,
};
controlView.AddChidren(dimmerBar);
- if(light.on_off == "on")
+ if(light.trait_on_off.value.ToString() == "on")
{
dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
}
@@ -141,7 +147,20 @@
{
dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
}
-
+ dimmerBar.Progress = light.brightness;
+ btnBrightnessText = new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y =( (100 - dimmerBar.Progress) * Application.GetRealHeight(288 - 16 - 16) /100)+ Application.GetRealWidth(40),
+ Width = Application.GetRealWidth(56),
+ Height = Application.GetRealWidth(46),
+ UnSelectedImagePath = "FunctionIcon/Light/BrightnessBg.png",
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
+ Text = light.brightness + "%",
+ };
+ controlView.AddChidren(btnBrightnessText);
+
#region 娓愬彉鏃堕棿璋冭妭
var btnGradualChangeText = new Button()
@@ -185,6 +204,7 @@
ProgressBarUnitSring = "s",
MaxValue = 10,
Progress = 0,
+ SeekBarPadding = Application.GetRealWidth(20),
};
controlView.AddChidren(barGradualChange);
@@ -210,8 +230,7 @@
Height = Application.GetMinRealAverage(40),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = light.on_off == "on",
- //Tag =
+ IsSelected = light.trait_on_off.value.ToString() == "on",
};
controlView.AddChidren(btnSwitch);
--
Gitblit v1.8.0