From b9c9c77fe50a9098f62a338c44c8598690177b90 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期三, 23 十二月 2020 10:58:23 +0800 Subject: [PATCH] Merge branch 'NewFilePath' into CJL --- HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs index 3758142..a97feb3 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs @@ -63,7 +63,7 @@ /// </summary> void LoadEvet_ChangeFadeTime() { - barFadeTime.OnProgressChangedEvent = (sender, e) => + barFadeTime.OnStopTrackingTouchEvent = (sender, e) => { light.fadeTime = e; light.SaveFunctionData(true); @@ -157,8 +157,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; + } d.Add(FunctionAttributeKey.Brightness, light.lastBrightness.ToString()); } else -- Gitblit v1.8.0