2021-12-01-01

xm

2021-12-01 6d73bf6e816570291865674bef8bce8972e4de3f

 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs

@@ -130,10 +130,23 @@

            foreach (var function in FunctionList.List.Functions)
            {
                if (!MainPage.SceneSupportFunctionList.Contains(function.spk))
                {
                    continue;
                }
                if (function == null)
                {
                    continue;
                }
                //如果场景是灯光场景，只能加载灯光功能
                if (scene.sceneType == SceneType.LightScene)
                {
                    if (!SPK.LightSpkList().Contains(function.spk))
                    {
                        continue;
                    }
                }

                function.roomIds.Remove(null);
                if (scene.functions.Find((obj) => obj.sid == function.sid) != null)
                {
@@ -153,7 +166,6 @@
        /// <summary>
        /// 显示功能Row
        /// </summary>
        /// <param name="showUnallocated">是否是显示未分配</param>
        void LoadFunctionListRow(List<Function> functions)
        {
            functionListView.RemoveAll();
@@ -166,11 +178,7 @@
            }
            foreach (var function in functions)
            {
                if (function.Spk_Prefix != FunctionCategory.Light &&
                    function.Spk_Prefix != FunctionCategory.AC &&
                    function.Spk_Prefix != FunctionCategory.FloorHeat &&
                    function.Spk_Prefix != FunctionCategory.Curtain
                    )
                if (!MainPage.SceneSupportFunctionList.Contains(function.spk))
                {
                    continue;
                }