Merge branch 'dev-hxb' into Dev-Wxr-1.8.1

wxr

2023-06-14 313e9339114e672eb2b281ee323f9f480f980679

 HDL_ON/UI/UI2/2-Classification/RoomPage.cs

@@ -95,7 +95,7 @@

                functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });

                if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
                if (function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
                {
                    var functionDiv = new FunctionControlZone(function, null)
                    {