From 0891d90cd0d435338cc2851fd0830cd318a17fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 14:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 78 +++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 36 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index e032084..0d7de11 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);
};
}
@@ -129,7 +128,7 @@
{
btnCollection.MouseUpEventHandler += (sender, e) => {
btnCollection.IsSelected = light.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- light.SaveFunctionData(true);
+ light.CollectFunction();
};
}
@@ -154,40 +153,40 @@
light.fadeTime = barFadeTime.Progress;
};
dimmerBar.OnProgressChangedEvent = (sender, e) => {
- light.fadeTime = 0;
- if (!btnSwitch.IsSelected)
- {
- dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
- }
- btnSwitch.IsSelected = e > 0 ? true : false;
- light.brightness = e;
- light.trait_on_off.curValue = e > 0 ? "on" : "off";
+ //light.fadeTime = 0;
+ //if (!btnSwitch.IsSelected)
+ //{
+ // dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
+ //}
+ //btnSwitch.IsSelected = e > 0 ? true : false;
+ //light.brightness = e;
+ //light.trait_on_off.curValue = e > 0 ? "on" : "off";
- if (e == 0 || e == 100)
- {
- 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);
- }
- else
- {
- if (200 < (DateTime.Now - light.refreshTime).TotalMilliseconds)
- {
- light.refreshTime = DateTime.Now;
- new System.Threading.Thread(() =>
- {
- //Control.Send(CommandType_A.write, 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);
- })
- { IsBackground = true }.Start();
- }
- else
- {
- MainPage.Log("skip dimmer control!!");
- }
- }
+ //if (e == 0 || e == 100)
+ //{
+ // 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);
+ //}
+ //else
+ //{
+ // if (200 < (DateTime.Now - light.refreshTime).TotalMilliseconds)
+ // {
+ // light.refreshTime = DateTime.Now;
+ // new System.Threading.Thread(() =>
+ // {
+ // //Control.Send(CommandType_A.write, 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);
+ // })
+ // { IsBackground = true }.Start();
+ // }
+ // else
+ // {
+ // MainPage.Log("skip dimmer control!!");
+ // }
+ //}
};
}
@@ -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,12 @@
{
btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
{
- btnWhiteRound.Visible = false;
+ if(light.trait_on_off.curValue.ToString() == "off")
+ {
+ return;
+ }
+ btnWhiteRound.Gravity = Gravity.Center;
+
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