From 271faaf6664166dc368639b9f2e577f63f901be5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 22:23:57 +0800
Subject: [PATCH] 20201223-99

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

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 0d7de11..857f841 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -19,13 +19,12 @@
                         return;
                     if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
                     {
-                        
+
                         if (uFunction.trait_on_off.curValue.ToString() == "on")
                         {
                             bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheel.png";
                             bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
                             bodyView.btnSwitch.IsSelected = true;
-                            bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.GetRGBcolor());
                             if (!bodyView.onDimmerBar)
                             {
                                 bodyView.dimmerBar.Progress = uFunction.brightness;
@@ -40,6 +39,7 @@
                             //鑹茬洏鐨勫渾鐐归殣钘�
                             bodyView.btnWhiteRound.Visible = false;
                         }
+                        bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.GetRGBcolor());
                     }
                 }
                 catch (Exception ex)
@@ -198,7 +198,7 @@
             barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
             {
                 light.fadeTime = barFadeTime.Progress;
-                light.SaveFunctionData(true);
+                light.UpdataFuncitonInfo();
             };
         }
         /// <summary>
@@ -246,6 +246,7 @@
                 {
                     return;
                 }
+                btnWhiteRound.Visible = true;
                 btnWhiteRound.Gravity = Gravity.Center;
 
                 light.SetRGBcolor(new byte[] { 255, 255, 255 });

--
Gitblit v1.8.0