From 23ca39219c5075d829d14137cb54896a24ae513d Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 04 十二月 2020 13:57:08 +0800
Subject: [PATCH] 20201204
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs | 51 +++++++++++++++++++++++++--------------------------
1 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs
index 40b677c..66c3fa7 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs
@@ -63,15 +63,14 @@
/// </summary>
public void LoadPage(int titleId)
{
-
bodyView.RemoveAll();
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
refreshFloorList = (type,floorName) => {
RefreshFloorsListView(type, floorName);
};
- new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView("floors",refreshFloorList,backAction);
+ new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView_AddIcon_BackAction("floors",refreshFloorList,backAction);
- int count = DB_ResidenceData.residenceData.floors.Count > 8 ? 8 : DB_ResidenceData.residenceData.floors.Count;
+ int count = SpatialInfo.CurrentSpatial.FloorList.Count > 8 ? 8 : SpatialInfo.CurrentSpatial.FloorList.Count;
var contentViewHeight = (count + 1) * Application.GetRealHeight(50);
contentView = new FrameLayout()
@@ -111,7 +110,7 @@
};
contentView.AddChidren(floorsListView);
- foreach(var floor in DB_ResidenceData.residenceData.floors)
+ foreach(var floor in SpatialInfo.CurrentSpatial.FloorList)
{
LoadFloorRow(floor);
}
@@ -121,12 +120,12 @@
/// 鍔犺浇妤煎眰Row
/// </summary>
/// <param name="floor"></param>
- void LoadFloorRow(Floor floor)
+ void LoadFloorRow(SpatialInfo floor)
{
var row = new RowLayout()
{
Height = Application.GetRealHeight(50),
- Tag = floor.name,
+ Tag = floor.roomName,
LineColor = CSS_Color.DividingLineColor,
};
floorsListView.AddChidren(row);
@@ -138,8 +137,8 @@
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.TextualColor,
SelectedTextColor = CSS_Color.MainColor,
- Text = floor.name,
- Tag = floor.sid,
+ Text = floor.roomName,
+ Tag = floor.uid,
};
row.AddChidren(btnFloor);
@@ -150,15 +149,16 @@
TextID = StringId.Del,
BackgroundColor = CSS_Color.WarningColor,
TextColor = CSS_Color.MainBackgroundColor,
- Tag = floor.name
+ Tag = floor.roomName
};
row.AddRightView(btnDel);
LoadEvent_DelFloor(btnDel);
- LoadEvent_FloorNamgeChange(btnFloor,btnDel,row,floor);
+ LoadEvent_FloorNamgeChange(btnFloor, btnDel, row, floor);
}
- else {
+ else
+ {
LoadEvent_FloorChoose(btnFloor);
- if (room.floorId == floor.sid)
+ if (room.parentId == floor.uid)
{
lastButton = btnFloor;
btnFloor.IsSelected = true;
@@ -173,8 +173,8 @@
case "add":
try
{
- var f = new Floor() { sid = Guid.NewGuid().ToString(), name = floorName };
- DB_ResidenceData.residenceData.floors.Add(f);
+ var f = new SpatialInfo( "" ) { roomName = floorName };
+ SpatialInfo.CurrentSpatial.AddFloor(f);
LoadFloorRow(f);
}
catch (Exception ex)
@@ -183,17 +183,17 @@
}
break;
case "edit":
- for(int i=0;i<floorsListView.ChildrenCount;i++)
+ for (int i = 0; i < floorsListView.ChildrenCount; i++)
{
- if(floorsListView.GetChildren(i).GetType() == typeof(Button))
+ if (floorsListView.GetChildren(i).GetType() == typeof(Button))
{
Button btn = floorsListView.GetChildren(i) as Button;
- if(floorName == "")
+ if (floorName == "")
{
btn.Text = floorName;
return;
}
- if(btn.Tag.ToString() == floorName|| btn.Tag.ToString() == floorName + "line")
+ if (btn.Tag.ToString() == floorName || btn.Tag.ToString() == floorName + "line")
{
btn.RemoveFromParent();
}
@@ -202,11 +202,11 @@
break;
case "del":
//璇ユゼ灞傚垹闄や箣鍚庯紝缁戝畾璇ユゼ灞傜殑鎴块棿瑕侀噸缃粦瀹氱殑妤煎眰
- foreach (var r in DB_ResidenceData.rooms)
+ foreach (var r in DB_ResidenceData.residenceData.Rooms)
{
- if (r.floorId == DB_ResidenceData.residenceData.floors.Find((obj) => obj.name == floorName).sid)
+ if (r.parentId == SpatialInfo.CurrentSpatial.FloorList.Find((obj) => obj.roomName == floorName).uid)
{
- r.floorId = "";
+ r.parentId = "";
}
}
for (int i = 0; i < floorsListView.ChildrenCount; i++)
@@ -231,12 +231,11 @@
row.RemoveFromParent();
}
}
- DB_ResidenceData.residenceData.floors.Remove(DB_ResidenceData.residenceData.floors.Find((obj) => obj.name == floorName));
+ SpatialInfo.CurrentSpatial.DelFloor(SpatialInfo.CurrentSpatial.FloorList.Find((obj) => obj.roomName == floorName));
}
break;
}
- DB_ResidenceData.residenceData.SaveResidenceData();
- int count = DB_ResidenceData.residenceData.floors.Count > 10 ? 10 : DB_ResidenceData.residenceData.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));
}
@@ -254,8 +253,8 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(582),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealHeight(44),
- Radius = (uint)Application.GetRealHeight(22),
+ Height = Application.GetRealWidth(44),
+ Radius = (uint)Application.GetRealWidth(22),
BackgroundColor = CSS_Color .MainColor,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.SubheadingFontSize,
--
Gitblit v1.8.0