Merge branch 'Dev-Wxr' into wjc

wjc

2023-04-11 e74f8bfbe6c52f220deef5fc99a53c3a7872808d

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

@@ -39,7 +39,7 @@
        {

            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            if (titleId == StringId.Lights && !DB_ResidenceData.Instance.CurrentRegion.isSupportGroupControl)
            if (titleId == StringId.Lights && !DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
            {
                Action action = () =>
                {
@@ -142,6 +142,9 @@
            if (titleId == StringId.Lights)
            {
                functionList.AddRange(FunctionList.List.GetLightList());
                functionList.AddRange(FunctionList.List.groupControls);


                var lightScene = FunctionList.List.scenes.FindAll((obj) => obj.sceneType == SceneType.LightScene);

                foreach (var scene in lightScene)