From 23ee4f8c373f9abecf079ef9d4297d8b6cd8d5e6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 15:16:00 +0800
Subject: [PATCH] Merge branch 'NewFilePath'
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs
index 67ceca9..de061ea 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() { sid = "", name = Language.StringByID(StringId.WholeHouseScene),floorId = "" });
- rooms.AddRange(DB_ResidenceData.rooms);
+ rooms.Add(new Room() { roomName = Language.StringByID(StringId.WholeHouseScene),parentId = "" });
+ rooms.AddRange(SpatialInfo.CurrentSpatial.RoomList);
foreach (var room in rooms)
{
var roomView = new FrameLayout()
@@ -52,7 +52,7 @@
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
- Text = room.floorName + room.name,
+ Text = room.floorName + room.roomName,
};
roomView.AddChidren(btnRoomText);
@@ -67,7 +67,7 @@
Tag = "ChooseIcon"
};
roomView.AddChidren(btnChoose);
- if(scene.roomIds.Contains(room.sid))
+ if(scene.roomIds.Contains(room.roomId))
{
btnChoose.IsSelected = true;
lastButton = btnChoose;
@@ -105,7 +105,7 @@
lastButton = btn;
btn.IsSelected = true;
scene.roomIds = new System.Collections.Generic.List<string>();
- scene.roomIds.Add(room.sid);
+ scene.roomIds.Add(room.roomId);
this.RemoveFromParent();
backAction();
};
--
Gitblit v1.8.0