From bb6ad792b598927a5459a5fb6f6c27fb1aa9e94e Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 17 十二月 2020 14:06:36 +0800
Subject: [PATCH] 20201217-1
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 62 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 1734b13..15c1c32 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -23,9 +23,19 @@
{
bodyView.dimmerBar.Progress = uFunction.brightness;
}
- bodyView.dimmerBar.ProgressBarColor = uFunction.trait_on_off.curValue.ToString() == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
- bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.curValue.ToString() == "on";
- bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.redColor * 256 * 256 + bodyView.light.greenColor * 256 + bodyView.light.blueColor);
+ if (uFunction.trait_on_off.curValue.ToString() == "on")
+ {
+ bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheel.png";
+ bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
+ bodyView.btnSwitch.IsSelected = true;
+ bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.GetRGBcolor());
+ }
+ else
+ {
+ bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
+ bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.PromptingColor2;
+ bodyView.btnSwitch.IsSelected = false;
+ }
}
}
catch (Exception ex)
@@ -48,7 +58,7 @@
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
- light.SaveFunctionData(true);
+ //light.SaveFunctionData(true);
};
}
@@ -59,16 +69,18 @@
{
DateTime colorChangeTime = DateTime.MinValue;
colorPicker.ColorChaged += (sender2, e2) => {
+ if(light.trait_on_off.curValue.ToString() == "off")
+ {
+ return;
+ }
if ((DateTime.Now - colorChangeTime).TotalMilliseconds > 200)
{
- light.redColor = e2[0];
- light.greenColor = e2[1];
- light.blueColor = e2[2];
+ light.SetRGBcolor(e2);
colorChangeTime = DateTime.Now;
- btnCurColor.BackgroundColor = (uint)(0xFF000000 + light.redColor * 256 * 256 + light.greenColor * 256 + light.blueColor);
+ 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("color", (light.redColor * 256 * 256 + light.greenColor * 256 + light.blueColor).ToString());
+ d.Add(FunctionAttributeKey.RGB, light.GetRGBcolorString());
Control.Ins.SendWriteCommand(light, d);
}
};
@@ -100,13 +112,16 @@
onDimmerBar = true;
};
dimmerBar.OnStopTrackingTouchEvent = (sender, e) => {
- onDimmerBar = false;
+ new System.Threading.Thread(() => {
+ System.Threading.Thread.Sleep(100);
+ onDimmerBar = false;
+ })
+ { IsBackground = true }.Start();
light.brightness = dimmerBar.Progress;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("brightness", light.brightness.ToString());
+ d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
Control.Ins.SendWriteCommand(light, d);
light.fadeTime = barFadeTime.Progress;
- //Control.Send(CommandType_A.write, light);
};
dimmerBar.OnProgressChangedEvent = (sender, e) => {
light.fadeTime = 0;
@@ -122,7 +137,7 @@
{
//Control.Send(CommandType_A.write, this.light);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("brightness", light.brightness.ToString());
+ d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
Control.Ins.SendWriteCommand(light, d);
}
else
@@ -134,7 +149,7 @@
{
//Control.Send(CommandType_A.write, light);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("brightness", light.brightness.ToString());
+ d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
Control.Ins.SendWriteCommand(light, d);
})
{ IsBackground = true }.Start();
@@ -152,9 +167,9 @@
/// </summary>
void LoadEvet_ChangeFadeTime()
{
- barFadeTime.OnProgressChangedEvent = (sender, e) =>
+ barFadeTime.MouseUpEventHandler = (sender, e) =>
{
- light.fadeTime = e;
+ light.fadeTime = barFadeTime.Progress;
light.SaveFunctionData(true);
};
}
@@ -171,7 +186,15 @@
{
light.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", light.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.OnOff, light.trait_on_off.curValue.ToString());
+ if (btnSwitch.IsSelected)
+ {
+ d.Add(FunctionAttributeKey.Brightness, light.lastBrightness.ToString());
+ }
+ else
+ {
+ light.lastBrightness = light.brightness;
+ }
Control.Ins.SendWriteCommand(light, d);
})
{ IsBackground = true }.Start();
@@ -184,13 +207,12 @@
{
btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
{
- light.color = 0xFFFFFF;
+ light.SetRGBcolor(new byte[] { 255, 255, 255 });
btnCurColor.BackgroundColor = 0xFFFFFFFF;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("color", "FFFFFF");
+ d.Add(FunctionAttributeKey.RGB, light.GetRGBcolorString());
Control.Ins.SendWriteCommand(light, d);
};
}
-
}
}
--
Gitblit v1.8.0