From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期五, 27 八月 2021 13:21:21 +0800 Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1 --- HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs index 4df4dd8..05c2a9c 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs @@ -157,7 +157,6 @@ /// <summary> /// 鏄剧ず鍔熻兘Row /// </summary> - /// <param name="showUnallocated">鏄惁鏄樉绀烘湭鍒嗛厤</param> void LoadFunctionListRow(List<Function> functions) { functionListView.RemoveAll(); @@ -170,11 +169,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; } -- Gitblit v1.8.0