From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:32 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index 3dbc699..6e5a4e0 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,13 +155,13 @@
}
else
{
- foreach (var rId in function.roomIdList)
+ foreach (var rId in function.roomIds)
{
if(rId == null)
{
continue;
}
- var r = DB_ResidenceData.rooms.Find(s => s.sid == rId);
+ var r = DB_ResidenceData.residenceData.Rooms.Find(s => s.roomId == rId);
if(r == null)
{
continue;
@@ -209,7 +209,7 @@
foreach (var m in Music.A31MusicModel.A31MusicModelList)
{
- if (m.roomIdList.Contains(room.sid))
+ if (m.roomIds.Contains(room.roomId))
{
Music.SendMethod.Pause(m);
}
--
Gitblit v1.8.0