From 30b5770f56f99c1f92e933ad31cf7d2af58b033c Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 02 十二月 2020 16:31:48 +0800
Subject: [PATCH] 20201202

---
 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs |   43 +++++++++++++++++++++----------------------
 1 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs
index a3ffcd4..7e3efea 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs
@@ -63,7 +63,6 @@
         /// </summary>
         public void LoadPage(int titleId)
         {
-
             bodyView.RemoveAll();
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
             refreshFloorList = (type,floorName) => {
@@ -71,7 +70,7 @@
             };
             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 = Floor.InsFloor.Floors.Count > 8 ? 8 : Floor.InsFloor.Floors.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 Floor.InsFloor.Floors)
             {
                 LoadFloorRow(floor);
             }
@@ -126,7 +125,7 @@
             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 Floor() { roomName = floorName };
+                        Floor.InsFloor.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.Rooms)
                     {
-                        if (r.floorId == DB_ResidenceData.residenceData.floors.Find((obj) => obj.name == floorName).sid)
+                        if (r.parentId == Floor.InsFloor.Floors.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));
+                        Floor.InsFloor.DelFloor(Floor.InsFloor.Floors.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 = Floor.InsFloor.Floors.Count > 10 ? 10 : Floor.InsFloor.Floors.Count;
             floorsListView.Height = Application.GetRealHeight(50 * count);
             contentView.Height = Application.GetRealHeight(50 * (count + 1));
         }

--
Gitblit v1.8.0