From ba275a7b58e56c61820ffccc86571447b2997e52 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 05 八月 2021 16:18:00 +0800
Subject: [PATCH] 2021-08-05 1.更新
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index b20523e..b0c2522 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -95,21 +95,12 @@
int circleR = colorPicker.Width / 2 - Application.GetRealWidth(12);
colorPicker.ColorChaged += (sender2, e2) => {
- if (function.trait_on_off.curValue.ToString() == "off"
- || pointIsRight == false)
+ if (function.trait_on_off.curValue.ToString() == "off" || pointIsRight == false)
{
//pointIsRight:鐐圭殑鍖哄煙涓嶆槸鍦嗙洏鍐�
return;
}
- if ((DateTime.Now - colorChangeTime).TotalMilliseconds > 200)
- {
- lightTemp.SetRGBcolor(e2,function);
- colorChangeTime = DateTime.Now;
- btnCurColor.BackgroundColor = (uint)(0xFF000000 + lightTemp.GetRGBcolor(function));
- 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 = e2;
};
colorPicker.MouseDownEventHandler += (sender, e) =>
{
@@ -131,11 +122,57 @@
btnWhiteRound.Visible = true;
}
};
+
colorPicker.MouseMoveEventHandler += (sender, e) =>
{
//褰撻紶鏍囩偣涓嬩簨浠跺鐞�
colorPicker.MouseDownEventHandler(sender, e);
+ //if (function.trait_on_off.curValue.ToString() == "off")
+ //{
+ // return;
+ //}
+ //pointIsRight = this.CheckPoint(circleR, colorPicker.Width / 2, colorPicker.Height / 2, (int)e.X, (int)e.Y);
+ //if (pointIsRight == false)
+ //{
+ // //鐐圭殑鍖哄煙涓嶆槸鍦嗙洏鍐�
+ // return;
+ //}
+ ////鏄剧ず鐧界偣
+ //btnWhiteRound.X = (int)e.X - btnWhiteRound.Width / 2;
+ //btnWhiteRound.Y = (int)e.Y - btnWhiteRound.Height / 2;
+ //if (btnWhiteRound.Visible == false)
+ //{
+ // btnWhiteRound.Visible = true;
+ //}
+ //btnCurColor.BackgroundColor = (uint)(0xFF000000 + lightTemp.GetRGBcolor(function));
};
+
+ var colorChangeEvent = new System.Threading.Thread(() => {
+ while (this.Parent != null)
+ {
+ if (function.trait_on_off.curValue.ToString() == "off" || pointIsRight == false)
+ {
+ //pointIsRight:鐐圭殑鍖哄煙涓嶆槸鍦嗙洏鍐�
+ continue;
+ }
+
+ for (int i = 0; i < 3; i++)
+ {
+ if (lightTemp.GetRGBbytes(function)[i] != lastColor[i])
+ {
+ function.SetAttrState(FunctionAttributeKey.RGB, lastColor);
+ lightTemp.SetRGBcolor(lastColor, function);
+ 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);
+ break;
+ }
+ }
+ System.Threading.Thread.Sleep(200);
+ }
+ });
+ colorChangeEvent.IsBackground = true;
+ colorChangeEvent.Start();
}
/// <summary>
--
Gitblit v1.8.0