From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 11:43:47 +0800
Subject: [PATCH] 合并全部代码完成
---
ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
index 2b19869..585f178 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
@@ -18,13 +18,12 @@
private Button floorBtn;
- private FrameLayout itemView;
+ public FrameLayout itemView;
#endregion
public Action action;
-
public override void RemoveFromParent()
{
@@ -39,7 +38,7 @@
{
AddTop();
- AddBodyView();
+ AddBodyView(Config.Instance.Home.CurrentFloorId);
}
#region Add____________________________________
@@ -55,7 +54,7 @@
top.SetTopTitle(R.MyInternationalizationString.RoomList);
top.backButton.MouseUpEventHandler += (sender, e) =>
{
- RemoveFromParent();
+ CommonPage.Instance.CloseLeftMenu();
};
floorBtn = new Button()
@@ -94,15 +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