2020-06-16-1

陈嘉乐

2020-06-16 7167334c0e89dd84827d59e726123d14776e3a09

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

@@ -19,7 +19,7 @@
                    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;
                       // bodyView.dimmerBar.WaveColor = uFunction.on_off == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
                        bodyView.btnSwitch.IsSelected = uFunction.on_off == "on";
                    }
                }
@@ -58,11 +58,18 @@
        /// </summary>
        void LoadEvent_DimmerBar()
        {
            DateTime dimmerTime = DateTime.MinValue;
            dimmerBar.OnStartTrackingTouchEvent = (sender, e) => {
                onDimmerBar = true;
            };
            dimmerBar.OnStopTrackingTouchEvent = (sender, e) => {
                onDimmerBar = false;
                light.brightness = dimmerBar.Progress;
                Control.Send(CommandType_A.write, light);
            };
            dimmerBar.OnProgressChangedEvent = (sender, e) => {
                if (!btnSwitch.IsSelected)
                {
                    dimmerBar.WaveColor = CSS.CSS_Color.AuxiliaryColor1;
                    //dimmerBar.WaveColor = CSS.CSS_Color.AuxiliaryColor1;
                }
                btnSwitch.IsSelected = e > 0 ? true : false;
                light.brightness = e;
@@ -74,9 +81,9 @@
                }
                else
                {
                    if (dimmerTime.AddMilliseconds(500) < DateTime.Now)
                    if (200 < (DateTime.Now - light.refreshTime).TotalMilliseconds)
                    {
                        dimmerTime = DateTime.Now;
                        light.refreshTime = DateTime.Now;
                        new System.Threading.Thread(() =>
                        {
                            Control.Send(CommandType_A.write, light);
@@ -99,7 +106,7 @@
            btnSwitch.MouseUpEventHandler += (sender, e) =>
            {
                btnSwitch.IsSelected = !btnSwitch.IsSelected;
                dimmerBar.WaveColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
                //dimmerBar.WaveColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
                new System.Threading.Thread(() =>
                {
                    light.on_off = btnSwitch.IsSelected ? "on" : "off";