From 3db5c3218f405795dc9a2d0f6afdde8ab8ac9e73 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期二, 23 十一月 2021 09:11:30 +0800 Subject: [PATCH] Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC --- HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs index 9b05c24..b2138df 100644 --- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs +++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs @@ -77,7 +77,7 @@ foreach (var function in room.GetRoomFunctions(false)) { - if (function.Spk_Prefix == FunctionCategory.Sensor || function.spk == SPK.ElectricEnergy) + if (MainPage.RoomNotSupportFunctionList.Contains( function.spk)) { continue; } -- Gitblit v1.8.0