From 1b56157e8edc3f502810820d99b607e3629c7171 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 七月 2023 09:42:00 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 697f09c..b222e1b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -148,24 +148,7 @@
{
//褰撻紶鏍囩偣涓嬩簨浠跺鐞�
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(() => {
@@ -287,6 +270,9 @@
barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
{
function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString());
+ var d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.FadeTime, e.ToString());
+ Control.Ins.SendWriteCommand(function, d);
function.SaveFunctionFile();
};
}
--
Gitblit v1.8.0