From eaaa2635f9ef5e431e00df922731a54c20cf7016 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期一, 31 七月 2023 19:41:58 +0800 Subject: [PATCH] 三相空开备份 --- HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs | 102 +++++++++++++++++++++++++++----------------------- 1 files changed, 55 insertions(+), 47 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs index 47800c8..3aff8a7 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs @@ -27,8 +27,11 @@ { bodyView.dimmerBar.Progress = Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness)); } - bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%"; - bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80); + if (updataTemp.GetAttrState(FunctionAttributeKey.Brightness) != "0") + { + bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%"; + bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80); + } } else { @@ -75,7 +78,10 @@ { barFadeTime.OnStopTrackingTouchEvent = (sender, e) => { - function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString()); + function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString()); + var d = new System.Collections.Generic.Dictionary<string, string>(); + d.Add(FunctionAttributeKey.FadeTime, e.ToString()); + Control.Ins.SendWriteCommand(function, d); function.SaveFunctionFile(); }; } @@ -134,6 +140,7 @@ }; } + bool curDimmerStatus = false; /// <summary> /// 鐏厜璋冨厜浜嬩欢 /// </summary> @@ -150,8 +157,9 @@ Direction = AMPopTipDirection.None, }.Show(MainPage.BaseView); return; - } - onDimmerBar = false; + } + //onDimmerBar = false; + curDimmerStatus = false; function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress); System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString()); @@ -166,49 +174,45 @@ dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1); }; - if (function.online) + //if (function.online) { dimmerBar.OnStartTrackingTouchEvent = (sender, e) => { - onDimmerBar = true; + curDimmerStatus = onDimmerBar = true; }; dimmerBar.OnProgressChangedEvent = (sender, e) => { - dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1); - //function.fadeTime = 0; - //if (!btnSwitch.IsSelected) - //{ - // dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1); - //} - //btnSwitch.IsSelected = e > 0 ? true : false; - //function.brightness = e; - //function.trait_on_off.curValue = e > 0 ? "on" : "off"; + //dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1); + if (!btnSwitch.IsSelected) + { + dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1); + } + btnSwitch.IsSelected = e > 0 ? true : false; + function.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, function.brightness.ToString()); - // Control.Ins.SendWriteCommand(function, d); - //} - //else - //{ - // if (200 < (DateTime.Now - function.refreshTime).TotalMilliseconds) - // { - // function.refreshTime = DateTime.Now; - // new System.Threading.Thread(() => - // { - // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); - // d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString()); - // Control.Ins.SendWriteCommand(function, d); - // }) - // { IsBackground = true }.Start(); - // } - //} + if (e == 0 || e == 100) + { + System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); + d.Add(FunctionAttributeKey.Brightness, e.ToString()); + Control.Ins.SendWriteCommand(function, d); + } + else + { + if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds) + { + function.refreshTime = DateTime.Now; + new System.Threading.Thread(() => + { + System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); + d.Add(FunctionAttributeKey.Brightness, e.ToString()); + Control.Ins.SendWriteCommand(function, d); + }) + { IsBackground = true }.Start(); + } + } - //btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16 - 16) / 100) + Application.GetRealWidth(40); - //btnBrightnessText.Text = function.brightness + "%"; - btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80); + btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80); btnBrightnessText.Text = dimmerBar.Progress + "%"; }; @@ -247,14 +251,18 @@ function.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, function.trait_on_off.curValue.ToString()); - if (btnSwitch.IsSelected) - { - d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString()); - } - else - { - function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness)); - } + if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null) + { + d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString()); + } + //if (btnSwitch.IsSelected) + //{ + // d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString()); + //} + //else + //{ + // function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness)); + //} Control.Ins.SendWriteCommand(function, d); }) { IsBackground = true }.Start(); -- Gitblit v1.8.0