From d07d62be7111d78b2aaa44c9cdee23a7d22b4dda Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 10:38:15 +0800
Subject: [PATCH] 20201222-1
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index e032084..e6aa12a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -62,7 +62,6 @@
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
- //light.SaveFunctionData(true);
};
}
@@ -217,11 +216,13 @@
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(FunctionAttributeKey.OnOff, light.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.FadeTime, light.fadeTime.ToString());
if (btnSwitch.IsSelected)
{
if(light.lastBrightness == 0)
{
light.lastBrightness = 100;
+ dimmerBar.Progress = 100;
}
d.Add(FunctionAttributeKey.Brightness, light.lastBrightness.ToString());
}
@@ -241,7 +242,10 @@
{
btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
{
- btnWhiteRound.Visible = false;
+ if(light.trait_on_off.curValue.ToString() == "off")
+ {
+ return;
+ }
light.SetRGBcolor(new byte[] { 255, 255, 255 });
btnCurColor.BackgroundColor = 0xFFFFFFFF;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
--
Gitblit v1.8.0