From f6fd8acd7c53c44187e70b4709443318a628f4b5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 16 六月 2020 13:12:33 +0800
Subject: [PATCH] 2020-06-016
---
HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPage.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPage.cs
index 8a7cca1..01377dc 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPage.cs
@@ -65,7 +65,6 @@
RefreshFloorsListView(type, floor);
};
new TopViewDiv(bodyView, Language.StringByID(StringId.FloorsManagement)).LoadTopView("floors",refreshFloorList,backAction);
- //new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.FloorsManagement),"floors",topCallBcak);
int count = DB_ResidenceData.residenceData.floors.Count > 8 ? 8 : DB_ResidenceData.residenceData.floors.Count;
var contentViewHeight = (count + 1) * Application.GetRealHeight(50);
@@ -117,7 +116,7 @@
/// 鍔犺浇妤煎眰Row
/// </summary>
/// <param name="floor"></param>
- void LoadFloorRow(string floor)
+ void LoadFloorRow(Floor floor)
{
var row = new RowLayout()
{
@@ -134,23 +133,23 @@
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.TextualColor,
SelectedTextColor = CSS_Color.MainColor,
- Text = floor,
+ Text = floor.name,
};
row.AddChidren(btnFloor);
if (room == null)
{
- LoadEvent_FloorNamgeChange(btnFloor);
var btnDel = new Button()
{
TextID = StringId.Del,
BackgroundColor = CSS_Color.WarningColor,
TextColor = CSS_Color.MainBackgroundColor,
- Tag = DB_ResidenceData.residenceData.floors.IndexOf(floor)
+ Tag = floor
};
row.AddRightView(btnDel);
LoadEvent_DelFloor(btnDel);
+ LoadEvent_FloorNamgeChange(btnFloor,btnDel,row,floor);
}
else {
LoadEvent_FloorChoose(btnFloor);
@@ -164,8 +163,9 @@
case "add":
try
{
- DB_ResidenceData.residenceData.floors.Add(floorName);
- LoadFloorRow(floorName);
+ var f = new Floor() { sid = Guid.NewGuid().ToString(), name = floorName };
+ DB_ResidenceData.residenceData.floors.Add(f);
+ LoadFloorRow(f);
}
catch (Exception ex)
{
@@ -196,9 +196,9 @@
//璇ユゼ灞傚垹闄や箣鍚庯紝缁戝畾璇ユゼ灞傜殑鎴块棿瑕侀噸缃粦瀹氱殑妤煎眰
foreach (var r in DB_ResidenceData.residenceData.rooms)
{
- if (r.floorIndex == DB_ResidenceData.residenceData.floors.IndexOf(floorName))
+ if (r.floorId == DB_ResidenceData.residenceData.floors.Find((obj)=>obj.name == floorName).sid)
{
- r.floorIndex = -1;
+ r.floorId = "";
}
}
if (floorsListView.GetChildren(i).GetType() == typeof(Button))
@@ -221,7 +221,7 @@
row.RemoveFromParent();
}
}
- DB_ResidenceData.residenceData.floors.Remove(floorName);
+ DB_ResidenceData.residenceData.floors.Remove(DB_ResidenceData.residenceData.floors.Find((obj) => obj.name == floorName));
}
break;
}
--
Gitblit v1.8.0