Merge branch 'release0123'

wxr

2022-08-04 eb76239882830f3960b8800bb0f2c90ca7b3f378

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

@@ -104,10 +104,10 @@
                    function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());
                    if(dimmerBar.Progress > 0)
                    {
                        d.Add(FunctionAttributeKey.OnOff, "on");
                    }
                    //if(dimmerBar.Progress > 0)
                    //{
                    //    d.Add(FunctionAttributeKey.OnOff, "on");
                    //}
                    Control.Ins.SendWriteCommand(function, d);
                    btnBrightnessText.Text = dimmerBar.Progress + "%";
                };
@@ -131,7 +131,7 @@
                    }
                    else
                    {
                        if (500 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
                        if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
                        {
                            function.refreshTime = DateTime.Now;
                            new System.Threading.Thread(() =>
@@ -181,7 +181,7 @@
                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                    if (btnSwitch.IsSelected)
                    {
                        if(function.lastBrightness == 0)
                        if (function.lastBrightness == 0)
                        {
                            function.lastBrightness = 100;
                        }
@@ -189,7 +189,7 @@
                    }
                    else
                    {
                        function.lastBrightness = Convert.ToInt32( function.GetAttrState(FunctionAttributeKey.Brightness));
                        function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));
                    }
                    Control.Ins.SendWriteCommand(function, d);
                })