From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 02 十二月 2020 16:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 09d3f5d..5672ac9 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -71,7 +71,7 @@
{
bodyView = this;
roomsShowed = new List<Room>();
- roomsShowed.AddRange(DB_ResidenceData.rooms);
+ roomsShowed.AddRange(DB_ResidenceData.Rooms);
}
public void LoadPage()
@@ -226,7 +226,7 @@
Width = Application.GetRealWidth(343),
Height = Application.GetRealWidth(192),//2020-12-01 鎴块棿鍥剧墖姣斾緥鏀瑰洖16:9
Radius = (uint)Application.GetRealWidth(12),
- Tag = room.sid,
+ Tag = room.uid,
};
roomListView.AddChidren(roomView);
@@ -252,7 +252,7 @@
Y = Application.GetRealHeight(12 - 2),
Width = Application.GetRealWidth(266),
Height = Application.GetRealHeight(22 + 2 + 2),
- Text = room.floorName + room.name,
+ Text = room.floorName + room.roomName,
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.SubheadingFontSize,
@@ -341,7 +341,7 @@
var btnAllClose = new Button()
{
X = Application.GetRealWidth(282),
- Y = Application.GetRealHeight(126),
+ Y = Application.GetRealWidth(126),
Width = Application.GetMinRealAverage(58),
Height = Application.GetMinRealAverage(58),
UnSelectedImagePath = "Classification/Room/AllCloseIcon.png",
@@ -359,11 +359,16 @@
roomViewbgColor.MouseUpEventHandler += (sender, e) =>
{
- Action<Room > ReloadRoomName = (obj) => {
- btnFloorAndRoomName.Text = obj.floorName + obj.name;
+ Action ReloadRoomName = () => {
+ btnFloorAndRoomName.Text = room.floorName + room.roomName;
};
- var view = new RoomPage(room, ReloadRoomName);
+ //鎴块棿鍒犻櫎浜嬩欢
+ Action deleteAction = () => {
+ roomView.RemoveFromParent();
+ };
+
+ var view = new RoomPage(room, ReloadRoomName, deleteAction);
MainPage.BasePageView.AddChidren(view);
view.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -810,10 +815,10 @@
};
dispalyView.AddChidren(contentView);
- if (DB_ResidenceData.residenceData.floors.Count < 2)
+ if (Floor.InsFloor.Floors.Count < 2)
{
}
- else if (DB_ResidenceData.residenceData.floors.Count < 3)
+ else if (Floor.InsFloor.Floors.Count < 3)
{
dispalyView = new FrameLayout()
{
@@ -828,7 +833,7 @@
contentView.Height = Application.GetRealHeight(45 * 3);
dispalyView.AddChidren(contentView);
}
- else if (DB_ResidenceData.residenceData.floors.Count < 4)
+ else if (Floor.InsFloor.Floors.Count < 4)
{
dispalyView = new FrameLayout()
{
@@ -863,9 +868,9 @@
List<string> chooseList = new List<string>();
chooseList.Add(Language.StringByID(StringId.All));
- foreach (var f in DB_ResidenceData.residenceData.floors)
+ foreach (var f in Floor.InsFloor.Floors)
{
- chooseList.Add(f.name);
+ chooseList.Add(f.roomName);
}
foreach (var floor in chooseList)
@@ -903,11 +908,11 @@
roomsShowed.Clear();
if (floor == Language.StringByID(StringId.All))
{
- roomsShowed.AddRange(DB_ResidenceData.rooms);
+ roomsShowed.AddRange(DB_ResidenceData.Rooms);
}
else
{
- foreach (var room in DB_ResidenceData.rooms)
+ foreach (var room in DB_ResidenceData.Rooms)
{
if (room.floorName == floor)
{
--
Gitblit v1.8.0