From 9eec81850e418a3c16410b4870910bde142b06e3 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期三, 14 九月 2022 15:50:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/Dev-Branch' into wjc --- HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs | 51 +++++++++++++++++++++++++-------------------------- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs index 8b2c58c..ef576c6 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs @@ -20,7 +20,7 @@ return; bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = updateTemp.trait_on_off.curValue.ToString() == "on"; bodyView.barGradualChange.ProgressBarColor = updateTemp.trait_on_off.curValue.ToString() == "on" ? CSS.CSS_Color.MainColor : CSS.CSS_Color.PromptingColor2; - bodyView.barGradualChange.Progress = Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.OpenLevel)); + bodyView.barGradualChange.Progress = Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.fan_speed_percent)); } catch (Exception ex) { @@ -62,16 +62,16 @@ { btnSwitchIcon.MouseUpEventHandler += (sender, e) => { - //if (!function.online) - //{ - // new Tip() - // { - // CloseTime = 1, - // Text = Language.StringByID(StringId.DeviceOfflineCannotOption), - // Direction = AMPopTipDirection.None, - // }.Show(MainPage.BaseView); - // return; - //} + if (!function.online) + { + new Tip() + { + CloseTime = 1, + Text = Language.StringByID(StringId.DeviceOfflineCannotOption), + Direction = AMPopTipDirection.None, + }.Show(MainPage.BaseView); + return; + } btnSwitchIcon.IsSelected = btnSwitch.IsSelected = !btnSwitchIcon.IsSelected; new System.Threading.Thread(() => @@ -86,16 +86,16 @@ }; btnSwitch.MouseUpEventHandler += (sender, e) => { - //if (!function.online) - //{ - // new Tip() - // { - // CloseTime = 1, - // Text = Language.StringByID(StringId.DeviceOfflineCannotOption), - // Direction = AMPopTipDirection.None, - // }.Show(MainPage.BaseView); - // return; - //} + if (!function.online) + { + new Tip() + { + CloseTime = 1, + Text = Language.StringByID(StringId.DeviceOfflineCannotOption), + Direction = AMPopTipDirection.None, + }.Show(MainPage.BaseView); + return; + } btnSwitch.IsSelected = btnSwitchIcon.IsSelected = !btnSwitch.IsSelected; new System.Threading.Thread(() => @@ -108,16 +108,15 @@ { IsBackground = true }.Start(); }; - //if (function.online) + if (function.online) { - barGradualChange.OnProgressChangedEvent = (sender, e) => + barGradualChange.OnStopTrackingTouchEvent = (sender, e) => { - function.SetAttrState(FunctionAttributeKey.OpenLevel, e.ToString()); + function.SetAttrState(FunctionAttributeKey.fan_speed_percent, e.ToString()); new System.Threading.Thread(() => { - 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()); + d.Add("fan_speed_percent", e.ToString()); Control.Ins.SendWriteCommand(function, d); }) { IsBackground = true }.Start(); -- Gitblit v1.8.0