From 46a5de6e9871c5c52ba4195576c1c2a4725abb08 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 八月 2021 09:11:51 +0800
Subject: [PATCH] Merge branch 'WJC' 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 b0c2522..37d1cfa 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);
--
Gitblit v1.8.0