From 6eb21769c74cfcd10084f73ff3f212355849a3c7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 17 五月 2021 15:00:13 +0800
Subject: [PATCH] 2021-5-17-2
---
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 67ceca9..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() { sid = "", name = Language.StringByID(StringId.WholeHouseScene),floorId = "" });
- 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.name,
- };
- 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.sid))
+
+ 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.sid);
+ scene.roomIds.Add(room.roomId);
this.RemoveFromParent();
backAction();
};
--
Gitblit v1.8.0