From b8e94316e41eba72d927d5ca7d931b26139ee8ff Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期一, 15 六月 2020 09:12:53 +0800 Subject: [PATCH] 20200612 --- HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPage.cs | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPage.cs index 3c2d5b7..01377dc 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPage.cs @@ -116,7 +116,7 @@ /// 鍔犺浇妤煎眰Row /// </summary> /// <param name="floor"></param> - void LoadFloorRow(string floor) + void LoadFloorRow(Floor floor) { var row = new RowLayout() { @@ -133,7 +133,7 @@ TextSize = CSS_FontSize.SubheadingFontSize, TextColor = CSS_Color.TextualColor, SelectedTextColor = CSS_Color.MainColor, - Text = floor, + Text = floor.name, }; row.AddChidren(btnFloor); @@ -149,7 +149,7 @@ }; row.AddRightView(btnDel); LoadEvent_DelFloor(btnDel); - LoadEvent_FloorNamgeChange(btnFloor,btnDel,row); + LoadEvent_FloorNamgeChange(btnFloor,btnDel,row,floor); } else { LoadEvent_FloorChoose(btnFloor); @@ -163,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) { @@ -195,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)) @@ -220,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