From 130a9b9cf4f5cd6ed8c11cb9cd4780f8b7da8bec Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 24 十二月 2020 23:17:59 +0800
Subject: [PATCH] Update ColorTureLampPageBLL.cs

---
 HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
index 71f1190..26276ea 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
@@ -19,16 +19,16 @@
                     if (bodyView == null)
                         return;
                     if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
-                    {
-                        bodyView.btnBrightnessText.Text = uFunction.brightness + "%";
-                        bodyView.btnBrightnessText.Y = ((100 - uFunction.brightness) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
+                    {
                         if (uFunction.trait_on_off.curValue.ToString() == "on")
                         {
                             bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                             if (!bodyView.onDimmerBar)
                             {
                                 bodyView.dimmerBar.Progress = uFunction.brightness;
-                            }
+                            }
+                            bodyView.btnBrightnessText.Text = uFunction.brightness + "%";
+                            bodyView.btnBrightnessText.Y = ((100 - uFunction.brightness) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
                         }
                         else
                         {
@@ -38,7 +38,7 @@
                         bodyView.barColorTemplatrue.Enable = uFunction.trait_on_off.curValue.ToString() == "on";
                         var cct = 27;
                         int.TryParse(uFunction.Attr_CCT.curValue.ToString(), out cct);
-                        bodyView.barColorTemplatrue.Progress = cct;
+                        bodyView.barColorTemplatrue.Progress = cct / 100;
                         //璁剧疆鍒濆鍊�
                         bodyView.barColorTemplatrue.SetCustomText(bodyView.barColorTemplatrue.Progress * 100 + "K");
 

--
Gitblit v1.8.0