From 95a7e380db583108d9716c56fe6d298ca08f8f23 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 九月 2021 10:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jpush_tst' into wxr7

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

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 37d1cfa..24e1b3b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -204,8 +204,8 @@
                 function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);
                 System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                 d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());
+               
                 Control.Ins.SendWriteCommand(function, d);
-                function.SetAttrState(FunctionAttributeKey.FadeTime, barFadeTime.Progress);
             };
             dimmerBar.OnProgressChangedEvent = (sender, e) => {
                 //function.fadeTime = 0;
@@ -310,6 +310,7 @@
                 System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                 d.Add(FunctionAttributeKey.RGB, lightTemp.GetRGBcolorString(function));
                 Control.Ins.SendWriteCommand(function, d);
+                lastColor = new byte[] { 255, 255, 255 };
             };
         }
 

--
Gitblit v1.8.0