From 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 17:20:01 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index 3dbc699..531a78a 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -140,7 +140,7 @@
if (bodyView.roomListView.GetChildren(i).GetType() == typeof(FrameLayout))
{
var view1 = bodyView.roomListView.GetChildren(i) as FrameLayout;
- if (!function.roomIdList.Contains(view1.Tag.ToString()))
+ if (!function.roomIds.Contains(view1.Tag.ToString()))
continue;
for (int j = 0; j < view1.ChildrenCount; j++)
{
@@ -155,7 +155,7 @@
}
else
{
- foreach (var rId in function.roomIdList)
+ foreach (var rId in function.roomIds)
{
if(rId == null)
{
@@ -209,7 +209,7 @@
foreach (var m in Music.A31MusicModel.A31MusicModelList)
{
- if (m.roomIdList.Contains(room.sid))
+ if (m.roomIds.Contains(room.sid))
{
Music.SendMethod.Pause(m);
}
--
Gitblit v1.8.0