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/2-Classification/ClassificationPage.cs |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 5672ac9..048edbb 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.residenceData.Rooms);
         }
 
         public void LoadPage()
@@ -815,10 +815,10 @@
                 };
                 dispalyView.AddChidren(contentView);
 
-                if (Floor.InsFloor.Floors.Count < 2)
+                if (SpatialInfo.CurrentSpatial.FloorList.Count < 2)
                 {
                 }
-                else if (Floor.InsFloor.Floors.Count < 3)
+                else if (SpatialInfo.CurrentSpatial.FloorList.Count < 3)
                 {
                     dispalyView = new FrameLayout()
                     {
@@ -833,7 +833,7 @@
                     contentView.Height = Application.GetRealHeight(45 * 3);
                     dispalyView.AddChidren(contentView);
                 }
-                else if (Floor.InsFloor.Floors.Count < 4)
+                else if (SpatialInfo.CurrentSpatial.FloorList.Count < 4)
                 {
                     dispalyView = new FrameLayout()
                     {
@@ -868,7 +868,7 @@
 
                 List<string> chooseList = new List<string>();
                 chooseList.Add(Language.StringByID(StringId.All));
-                foreach (var f in Floor.InsFloor.Floors)
+                foreach (var f in SpatialInfo.CurrentSpatial.FloorList)
                 {
                     chooseList.Add(f.roomName);
                 }
@@ -908,11 +908,11 @@
                         roomsShowed.Clear();
                         if (floor == Language.StringByID(StringId.All))
                         {
-                            roomsShowed.AddRange(DB_ResidenceData.Rooms);
+                            roomsShowed.AddRange(DB_ResidenceData.residenceData.Rooms);
                         }
                         else
                         {
-                            foreach (var room in DB_ResidenceData.Rooms)
+                            foreach (var room in DB_ResidenceData.residenceData.Rooms)
                             {
                                 if (room.floorName == floor)
                                 {

--
Gitblit v1.8.0