From 95a7e380db583108d9716c56fe6d298ca08f8f23 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 九月 2021 10:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jpush_tst' into wxr7
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs
index 0200f20..3293e0d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs
@@ -164,6 +164,10 @@
foreach (var function in FunctionList.List.GetDeviceFunctionList())
{
function.roomIds.Remove(null);
+ if(MainPage.RoomNotSupportFunctionList.Contains(function.spk))
+ {
+ continue;
+ }
if (function.roomIds.Count > 0 )
{
allocatedList.Add(function);
--
Gitblit v1.8.0