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 |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
index cc40ad1..f7cc34d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
@@ -31,6 +31,10 @@
         /// </summary>
         WaveSeekBarOn dimmerBar;
         /// <summary>
+        /// 浜害鏄剧ず鎸夐挳
+        /// </summary>
+        Button btnBrightnessText;
+        /// <summary>
         /// 寮�鍏虫寜閽�
         /// </summary>
         Button btnSwitch;
@@ -131,6 +135,8 @@
                 //BackgroundColor = CSS_Color.BackgroundColor,
                 //Radius = (uint)Application.GetRealWidth(40),
                 Progress = light.brightness,
+                //ProgressTextColor =0x00000000,
+                IsProgressTextShow = false,
             };
             controlView.AddChidren(dimmerBar);
             if(light.trait_on_off.value.ToString() == "on")
@@ -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);
 
@@ -211,7 +231,6 @@
                 UnSelectedImagePath = "Public/PowerClose.png",
                 SelectedImagePath = "Public/PowerOpen.png",
                 IsSelected = light.trait_on_off.value.ToString() == "on",
-                //Tag = 
             };
             controlView.AddChidren(btnSwitch);
 

--
Gitblit v1.8.0