From 264f86c363a6a019fac8eb138877fee9e4734e2d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 21 八月 2021 17:45:44 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
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