From d12e7730bb88d57763a6caaeacb0248a65bf3309 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 03 十二月 2019 13:10:32 +0800
Subject: [PATCH] 2019.12.3
---
ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
index 278128d..52ebd3b 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
@@ -18,17 +18,15 @@
private Button floorBtn;
- private FrameLayout itemView;
+ public FrameLayout itemView;
#endregion
public Action action;
-
public override void RemoveFromParent()
{
- //鏇存柊鐣岄潰
//action?.Invoke();
base.RemoveFromParent();
}
@@ -39,7 +37,7 @@
{
AddTop();
- AddBodyView();
+ AddBodyView(Config.Instance.Home.CurrentFloorId);
}
#region Add____________________________________
@@ -55,7 +53,7 @@
top.SetTopTitle(R.MyInternationalizationString.RoomList);
top.backButton.MouseUpEventHandler += (sender, e) =>
{
- RemoveFromParent();
+ CommonPage.Instance.CloseLeftMenu();
};
floorBtn = new Button()
@@ -93,16 +91,18 @@
{
var floors = new SelectFloor();
AddChidren(floors);
- floors.Init(599, 161);
- floors.FloorAction += (floorName) =>
+ floors.Init(599, 161,Direction.Right);
+ 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 +114,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);
@@ -173,7 +173,7 @@
}
/// <summary>
- ///
+ /// ShowUnallocatedRoom_MouseUpEvent
/// </summary>
/// <param name="sender"></param>
/// <param name="mouseEventArgs"></param>
--
Gitblit v1.8.0