From 2294816f28804660a441038b5cc89921703f4f41 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 26 十一月 2019 17:57:28 +0800
Subject: [PATCH] 2019.11.26
---
ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
index 066e524..585f178 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
@@ -38,7 +38,7 @@
{
AddTop();
- AddBodyView();
+ AddBodyView(Config.Instance.Home.CurrentFloorId);
}
#region Add____________________________________
@@ -93,16 +93,17 @@
var floors = new SelectFloor();
AddChidren(floors);
floors.Init(599, 161,Direction.Right);
- floors.FloorAction += (floorName) =>
+ floors.FloorAction += (floorId) =>
{
- floorBtn.Text = floorName;
+ floorBtn.Text = Config.Instance.Home.GetFloorNameById(floorId);
+ AddBodyView(floorId);
};
}
/// <summary>
/// AddBodyView
/// </summary>
- public void AddBodyView()
+ public void AddBodyView(string floorId)
{
bodyFrameLayout = new FrameLayout()
{
@@ -114,7 +115,7 @@
var roomScrolView = new VerticalScrolViewLayout { };
bodyFrameLayout.AddChidren(roomScrolView);
- var roomList = Shared.Common.Room.Lists;
+ var roomList = Common.Room.CurrentRoom.GetRoomsByFloorId(floorId);
for (int i = 0; i < roomList.Count+1; i++)
{
int xx = 43 + i % 2 * (20 + 487);
--
Gitblit v1.8.0