From 33656fa9abd15ed00a390024b439568d2713ca1a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 06 十二月 2020 17:44:36 +0800
Subject: [PATCH] 2020-12-06 1.修改挤下线判断标记。2.修改房间和场景加载云端图片路径
---
HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
index 68f4547..cb64da5 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
@@ -47,19 +47,19 @@
}
}
function.roomIds.Clear();
- foreach (var room in Entity.DB_ResidenceData.rooms)
+ foreach (var room in Entity.DB_ResidenceData.residenceData.Rooms)
{
if (btnChooseAll.IsSelected)
{
- function.roomIds.Add(room.sid);
+ function.roomIds.Add(room.uid);
}
else
{
- function.roomIds.Remove(room.sid);
+ function.roomIds.Remove(room.uid);
}
function.SaveFunctionData();
}
- Entity.DB_ResidenceData.InitRoomFunction();
+ Entity.SpatialInfo.CurrentSpatial.InitRoomFunction();
};
}
@@ -70,16 +70,16 @@
{
if (isAdd)
{
- function.roomIds.Add(room.sid);
+ function.roomIds.Add(room.uid);
room.AddRoomFunction(function);
}
else
{
- function.roomIds.Remove(room.sid);
+ function.roomIds.Remove(room.uid);
room.RemoveRoomFunction(function);
}
function.SaveFunctionData();
- if (function.roomIds.Count == Entity.DB_ResidenceData.rooms.Count)
+ if (function.roomIds.Count == Entity.DB_ResidenceData.residenceData.Rooms.Count)
{
btnChooseAll.IsSelected = true;
}
--
Gitblit v1.8.0