Merge branch 'Dev-Branch' into wjc

wjc

2023-06-05 a19e58425e44c8a83c3d1b23de292659c38a6b1e

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

@@ -307,7 +307,10 @@
                    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());
                    if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
                    {
                    d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
                    }
                    if (btnSwitch.IsSelected)
                    {
                        if (function.lastBrightness == 0)