From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1

---
 HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs
index 09266fb..b2ad4b7 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs
@@ -33,8 +33,8 @@
             bodyView.AddChidren(contentView);
 
             System.Collections.Generic.List<Room> rooms = new System.Collections.Generic.List<Room>();
-            rooms.Add(new Room() { uid = "", roomName = Language.StringByID(StringId.WholeHouseScene),parentId = ""  });
-            rooms.AddRange(DB_ResidenceData.Rooms);
+            rooms.Add(new Room() { roomName = Language.StringByID(StringId.WholeZone),parentId = ""  });
+            rooms.AddRange(SpatialInfo.CurrentSpatial.RoomList);
             foreach (var room in rooms)
             {
                 var roomView = new FrameLayout()
@@ -45,17 +45,6 @@
                 };
                 contentView.AddChidren(roomView);
                
-                Button btnRoomText = new Button()
-                {
-                    X = Application.GetRealWidth(16),
-                    Width = Application.GetRealWidth(280),
-                    TextSize = CSS_FontSize.SubheadingFontSize,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    Text = room.floorName + room.roomName,
-                };
-                roomView.AddChidren(btnRoomText);
-
                 Button btnChoose = new Button()
                 {
                     X = Application.GetRealWidth(331),
@@ -67,7 +56,19 @@
                     Tag = "ChooseIcon"
                 };
                 roomView.AddChidren(btnChoose);
-                if(scene.roomIds.Contains(room.uid))
+
+                Button btnRoomText = new Button()
+                {
+                    X = Application.GetRealWidth(16),
+                    //Width = Application.GetRealWidth(280),
+                    TextSize = CSS_FontSize.SubheadingFontSize,
+                    TextColor = CSS_Color.FirstLevelTitleColor,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    Text = room.floorName + room.roomName,
+                };
+                roomView.AddChidren(btnRoomText);
+
+                if (scene.roomIds.Contains(room.roomId))
                 {
                     btnChoose.IsSelected = true;
                     lastButton = btnChoose;
@@ -86,7 +87,7 @@
                 };
                 roomView.AddChidren(btnLine);
 
-                LoadEvent_ChangeSceneLocation(room, btnChoose);
+                LoadEvent_ChangeSceneLocation(room, btnRoomText);
 
             }
         }
@@ -105,7 +106,7 @@
                 lastButton = btn;
                 btn.IsSelected = true;
                 scene.roomIds = new System.Collections.Generic.List<string>();
-                scene.roomIds.Add(room.uid);
+                scene.roomIds.Add(room.roomId);
                 this.RemoveFromParent();
                 backAction();
             };

--
Gitblit v1.8.0