Merge branch 'wxr-2.2' into Dev-Branch

wxr

2023-10-20 4e4f9c3ee4ff6d05d5a431626901fbf43eb368a9

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

@@ -220,11 +220,6 @@
                    Enable = function.GetAttribute(FunctionAttributeKey.FadeTime) != null,
                };
                controlView.AddChidren(barFadeTime);
                barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
                {
                    function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString());
                    function.UpdataFuncitonInfo();
                };

                var btnGradualChangeMaxValuesText = new Button()
                {