From 16bea1d248f0010049bceaa562939297fa26b130 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 25 七月 2024 15:27:21 +0800 Subject: [PATCH] Merge branch 'Dev-Branch-2024' into wjc --- HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs index 2837dd2..a8048f1 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs @@ -97,9 +97,6 @@ // function.CollectFunction(); //}; - - - //鍥為��鍒锋柊淇℃伅浜嬩欢 new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl)).LoadTopView_SettingIcon( () => { var page = new AddGroupControlPage(function, @@ -310,18 +307,26 @@ attrView.AddChidren(btnSwitchIcon); btnSwitchIcon.MouseUpEventHandler = (sender, e) => { + btnSwitchIcon.IsSelected = !btnSwitchIcon.IsSelected; if (btnSwitchIcon.IsSelected) - { - var d = new Dictionary<string, string>(); - d.Add(FunctionAttributeKey.OnOff, "off"); - function.Control(d); - } - else { var d = new Dictionary<string, string>(); d.Add(FunctionAttributeKey.OnOff, "on"); function.Control(d); } + else + { + var d = new Dictionary<string, string>(); + d.Add(FunctionAttributeKey.OnOff, "off"); + function.Control(d); + } + }; + + btnOn.MouseUpEventHandler += (sender, e) => { + btnSwitchIcon.IsSelected = true; + }; + btnOff.MouseUpEventHandler += (sender, e) => { + btnSwitchIcon.IsSelected = false; }; } @@ -835,8 +840,8 @@ dimmerBar.OnProgressChangedEvent = (sender, e) => { - btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100); - btnBrightnessText.Text = dimmerBar.Progress + "%"; + //btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100); + //btnBrightnessText.Text = dimmerBar.Progress + "%"; return; if (e == 0 && lastBrightness != 0) { @@ -1085,13 +1090,13 @@ btnOn.MouseUpEventHandler += (sender, e) => { dimmerBar.Progress = 100; - btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100); - btnBrightnessText.Text = dimmerBar.Progress + "%"; + //btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100); + //btnBrightnessText.Text = dimmerBar.Progress + "%"; }; btnOff.MouseUpEventHandler += (sender, e) => { dimmerBar.Progress = 0; - btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100); - btnBrightnessText.Text = dimmerBar.Progress + "%"; + //btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100); + //btnBrightnessText.Text = dimmerBar.Progress + "%"; }; -- Gitblit v1.8.0