From 002a3f2e9d2f9579c01f88af12bd8a320003569f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 31 三月 2020 08:57:19 +0800
Subject: [PATCH] 20200331

---
 HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
index 69dd79c..1f15829 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -125,8 +125,8 @@
                 Y = Application.GetRealHeight(14),
                 Width = Application.GetMinRealAverage(40),
                 Height = Application.GetMinRealAverage(40),
-                UnSelectedImagePath = "Collection/CollectionIcon.png",
-                SelectedImagePath = "Collection/CollectionWhiteIcon.png",
+                SelectedImagePath = "Collection/CollectionIcon.png",
+                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                 IsSelected = light.collection
             };
             controlView.AddChidren(btnCollection);
@@ -179,9 +179,9 @@
                 ThumbImageHeight = Application.GetRealHeight(54),
                 ProgressTextColor = CSS_Color.FirstLevelTitleColor,
                 ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                ProgressBarColor = light.on_off == 1 ? CSS_Color.AuxiliaryColor1 : CSS_Color.DividingLineColor,
+                ProgressBarColor = light.on_off == "on" ? CSS_Color.AuxiliaryColor1 : CSS_Color.DividingLineColor,
                 MaxValue = 100,
-                Progress = 30,
+                Progress = light.brightness,
             };
             controlView.AddChidren(dimmerBar);
 

--
Gitblit v1.8.0