20200612

wxr

2020-06-15 b8e94316e41eba72d927d5ca7d931b26139ee8ff

 HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs

@@ -1,5 +1,6 @@
using System;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
namespace HDL_ON.UI
{
@@ -19,7 +20,16 @@
                    if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
                    {
                        bodyView.dimmerBar.Progress = uFunction.brightness;
                        bodyView.dimmerBar.WaveColor = uFunction.on_off == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;

                        if (uFunction.on_off == "on")
                        {
                            bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                        }
                        else
                        {
                            bodyView.dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
                        }
                        //bodyView.dimmerBar.WaveColor = uFunction.on_off == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
                        bodyView.btnSwitch.IsSelected = uFunction.on_off == "on";
                    }
                }
@@ -69,8 +79,8 @@
            dimmerBar.OnProgressChangedEvent = (sender, e) => {
                if (!btnSwitch.IsSelected)
                {
                    dimmerBar.WaveColor = CSS.CSS_Color.AuxiliaryColor1;
                }
                    dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                }   
                btnSwitch.IsSelected = e > 0 ? true : false;
                light.brightness = e;
                light.on_off = e > 0 ? "on" : "off";
@@ -106,7 +116,14 @@
            btnSwitch.MouseUpEventHandler += (sender, e) =>
            {
                btnSwitch.IsSelected = !btnSwitch.IsSelected;
                dimmerBar.WaveColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
                if (light.on_off == "on")
                {
                    dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                }
                else
                {
                    dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
                }
                new System.Threading.Thread(() =>
                {
                    light.on_off = btnSwitch.IsSelected ? "on" : "off";