From af9c3e0b3b1eb370e966b3ca9db3f62848d4189b Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期六, 21 八月 2021 13:03:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC --- HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs index b0c2522..d46bdd0 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs @@ -49,6 +49,7 @@ bodyView.btnWhiteRound.Visible = false; } bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.lightTemp.GetRGBcolor(updateTemp)); + bodyView.lastColor = bodyView.lightTemp.GetRGBbytes(updateTemp); if (bodyView.lightTemp.GetRGBcolor(updateTemp) == 16777215 && bodyView.btnCurColor.BorderColor != 0x00000000) { bodyView.btnCurColor.BorderColor = CSS.CSS_Color.PromptingColor2; @@ -158,7 +159,7 @@ for (int i = 0; i < 3; i++) { - if (lightTemp.GetRGBbytes(function)[i] != lastColor[i]) + if (lightTemp.GetRGBbytes(function)[i].ToString() != lastColor[i].ToString()) { function.SetAttrState(FunctionAttributeKey.RGB, lastColor); lightTemp.SetRGBcolor(lastColor, function); @@ -309,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