From 64dbbfe1d6488635e160189a704afccffc7d34d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 07 十二月 2020 11:33:06 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs
index 7e3efea..66c3fa7 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs
@@ -70,7 +70,7 @@
};
new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView_AddIcon_BackAction("floors",refreshFloorList,backAction);
- int count = Floor.InsFloor.Floors.Count > 8 ? 8 : Floor.InsFloor.Floors.Count;
+ int count = SpatialInfo.CurrentSpatial.FloorList.Count > 8 ? 8 : SpatialInfo.CurrentSpatial.FloorList.Count;
var contentViewHeight = (count + 1) * Application.GetRealHeight(50);
contentView = new FrameLayout()
@@ -110,7 +110,7 @@
};
contentView.AddChidren(floorsListView);
- foreach(var floor in Floor.InsFloor.Floors)
+ foreach(var floor in SpatialInfo.CurrentSpatial.FloorList)
{
LoadFloorRow(floor);
}
@@ -120,7 +120,7 @@
/// 鍔犺浇妤煎眰Row
/// </summary>
/// <param name="floor"></param>
- void LoadFloorRow(Floor floor)
+ void LoadFloorRow(SpatialInfo floor)
{
var row = new RowLayout()
{
@@ -173,8 +173,8 @@
case "add":
try
{
- var f = new Floor() { roomName = floorName };
- Floor.InsFloor.AddFloor(f);
+ var f = new SpatialInfo( "" ) { roomName = floorName };
+ SpatialInfo.CurrentSpatial.AddFloor(f);
LoadFloorRow(f);
}
catch (Exception ex)
@@ -202,9 +202,9 @@
break;
case "del":
//璇ユゼ灞傚垹闄や箣鍚庯紝缁戝畾璇ユゼ灞傜殑鎴块棿瑕侀噸缃粦瀹氱殑妤煎眰
- foreach (var r in DB_ResidenceData.Rooms)
+ foreach (var r in DB_ResidenceData.residenceData.Rooms)
{
- if (r.parentId == Floor.InsFloor.Floors.Find((obj) => obj.roomName == floorName).uid)
+ if (r.parentId == SpatialInfo.CurrentSpatial.FloorList.Find((obj) => obj.roomName == floorName).uid)
{
r.parentId = "";
}
@@ -231,11 +231,11 @@
row.RemoveFromParent();
}
}
- Floor.InsFloor.DelFloor(Floor.InsFloor.Floors.Find((obj) => obj.roomName == floorName));
+ SpatialInfo.CurrentSpatial.DelFloor(SpatialInfo.CurrentSpatial.FloorList.Find((obj) => obj.roomName == floorName));
}
break;
}
- int count = Floor.InsFloor.Floors.Count > 10 ? 10 : Floor.InsFloor.Floors.Count;
+ int count = SpatialInfo.CurrentSpatial.FloorList.Count > 10 ? 10 : SpatialInfo.CurrentSpatial.FloorList.Count;
floorsListView.Height = Application.GetRealHeight(50 * count);
contentView.Height = Application.GetRealHeight(50 * (count + 1));
}
--
Gitblit v1.8.0