From e6a26ee148587327478d9a82624a820c907b6e16 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 04 十一月 2020 14:58:15 +0800 Subject: [PATCH] 20201104 --- HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs index 4f4e38d..41a0ab6 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs @@ -1,4 +1,5 @@ 锘縰sing System; +using HDL_ON.DriverLayer; using HDL_ON.Entity; using Shared; namespace HDL_ON.UI @@ -42,6 +43,7 @@ LoadSwitchEvent(); LoadEvent_BackCenterColor(); LoadEvent_DimmerBar(); + LoadEvet_ChangeFadeTime(); //鍥為��鍒锋柊淇℃伅浜嬩欢 actionRefresh = () => { btnFunctionName.Text = btnFunctionName_Out.Text = light.name; @@ -66,7 +68,7 @@ //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()); - Control.SendWriteCommand(light, d); + Control.ins.SendWriteCommand(light, d); } }; colorPicker.MouseUpEventHandler = (sender, e) => @@ -101,10 +103,12 @@ light.brightness = dimmerBar.Progress; System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); d.Add("brightness", light.brightness.ToString()); - Control.SendWriteCommand(light, d); + Control.ins.SendWriteCommand(light, d); + light.fadeTime = barFadeTime.Progress; //Control.Send(CommandType_A.write, light); }; dimmerBar.OnProgressChangedEvent = (sender, e) => { + light.fadeTime = 0; if (!btnSwitch.IsSelected) { dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1; @@ -118,7 +122,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()); - Control.SendWriteCommand(light, d); + Control.ins.SendWriteCommand(light, d); } else { @@ -130,7 +134,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()); - Control.SendWriteCommand(light, d); + Control.ins.SendWriteCommand(light, d); }) { IsBackground = true }.Start(); } @@ -142,6 +146,17 @@ }; } + /// <summary> + /// 淇敼鐏厜娓愬彉鏃堕棿 + /// </summary> + void LoadEvet_ChangeFadeTime() + { + barFadeTime.OnProgressChangedEvent = (sender, e) => + { + light.fadeTime = e; + light.SaveFunctionData(); + }; + } /// <summary> /// 鍔犺浇寮�鍏充簨浠� /// </summary> @@ -156,8 +171,7 @@ light.trait_on_off.value = 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.value.ToString()); - Control.SendWriteCommand(light, d); - //Control.Send(CommandType_A.write, this.light); + Control.ins.SendWriteCommand(light, d); }) { IsBackground = true }.Start(); }; @@ -171,10 +185,9 @@ { light.color = 0xFFFFFF; btnCurColor.BackgroundColor = 0xFFFFFFFF; - //Control.Send(CommandType_A.write, this.light); System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); d.Add("color", "FFFFFF"); - Control.SendWriteCommand(light, d); + Control.ins.SendWriteCommand(light, d); }; } -- Gitblit v1.8.0