From fb49279fd0e36e1ed2bd7332eecee9f963c13649 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期日, 20 十二月 2020 19:33:29 +0800
Subject: [PATCH] 20201220-1
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index b2fd650..b88c843 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -90,7 +90,6 @@
light.SetRGBcolor(e2);
colorChangeTime = DateTime.Now;
btnCurColor.BackgroundColor = (uint)(0xFF000000 + light.GetRGBcolor());
- //Control.Send(CommandType_A.write, this.light);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.RGB, light.GetRGBcolorString());
Control.Ins.SendWriteCommand(light, d);
@@ -144,7 +143,7 @@
};
dimmerBar.OnStopTrackingTouchEvent = (sender, e) => {
new System.Threading.Thread(() => {
- System.Threading.Thread.Sleep(100);
+ System.Threading.Thread.Sleep(200);
onDimmerBar = false;
})
{ IsBackground = true }.Start();
@@ -166,7 +165,6 @@
if (e == 0 || e == 100)
{
- //Control.Send(CommandType_A.write, this.light);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
Control.Ins.SendWriteCommand(light, d);
@@ -198,7 +196,7 @@
/// </summary>
void LoadEvet_ChangeFadeTime()
{
- barFadeTime.MouseUpEventHandler = (sender, e) =>
+ barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
{
light.fadeTime = barFadeTime.Progress;
light.SaveFunctionData(true);
@@ -213,7 +211,7 @@
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
dimmerBar.ProgressBarColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
- bodyView.colorPicker.ColorImagePath = btnSwitch.IsSelected ? "FunctionIcon/Light/ColorWheel.png" : "FunctionIcon /Light/ColorWheelGray.png";
+ bodyView.colorPicker.ColorImagePath = btnSwitch.IsSelected ? "FunctionIcon/Light/ColorWheel.png" : "FunctionIcon/Light/ColorWheelGray.png";
new System.Threading.Thread(() =>
{
light.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
--
Gitblit v1.8.0