Merge branch 'Dev-Branch' into wjc

wjc

2023-07-19 1b56157e8edc3f502810820d99b607e3629c7171

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

@@ -62,8 +62,14 @@
        {
            if (bodyView != null)
            {
                bodyView.RemoveAll();
                LoadPage();
                try
                {
                    bodyView.RemoveAll();
                    LoadPage();
                }catch (Exception ex)
                {
                    MainPage.Log($"RoomPage ReloadPage error :\r\n {ex.Message}");
                }
            }
        }

@@ -95,7 +101,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)
                    {