Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into De...

Davin

2023-07-26 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2

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

@@ -1,5 +1,6 @@

using System;
using System.Collections.Generic;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -62,8 +63,14 @@
        {
            if (bodyView != null)
            {
                bodyView.RemoveAll();
                LoadPage();
                try
                {
                    bodyView.RemoveAll();
                    LoadPage();
                }catch (Exception ex)
                {
                    MainPage.Log($"RoomPage ReloadPage error :\r\n {ex.Message}");
                }
            }
        }

@@ -83,6 +90,7 @@

            var list = room.GetRoomFunctions(false);


            foreach (var function in list)
            {
                if (MainPage.RoomNotSupportFunctionList.Contains(function.spk))
@@ -95,7 +103,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)
                    {