From 84fa7c9665d9bed9aef79237be9c5eb57c49f13d Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 05 三月 2021 10:54:37 +0800
Subject: [PATCH] Merge branch 'CJL' into ez-test
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs
old mode 100755
new mode 100644
index de061ea..b2ad4b7
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs
@@ -33,7 +33,7 @@
bodyView.AddChidren(contentView);
System.Collections.Generic.List<Room> rooms = new System.Collections.Generic.List<Room>();
- rooms.Add(new Room() { roomName = Language.StringByID(StringId.WholeHouseScene),parentId = "" });
+ rooms.Add(new Room() { roomName = Language.StringByID(StringId.WholeZone),parentId = "" });
rooms.AddRange(SpatialInfo.CurrentSpatial.RoomList);
foreach (var room in rooms)
{
@@ -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.roomId))
+
+ 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);
}
}
--
Gitblit v1.8.0