From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
index ea6ea22..cae7db4 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
@@ -17,6 +17,10 @@
private FrameLayout bodyFrameLayout;
private Button floorBtn;
+ /// <summary>
+ /// 褰撳墠妤煎眰id
+ /// </summary>
+ private string curFloorId;
public FrameLayout itemView;
@@ -102,6 +106,7 @@
floorBtn.Text = Config.Instance.Home.GetCurrentFloorName;
if(Config.Instance.Home.FloorDics.Count>0)
{
+ curFloorId = Config.Instance.Home.CurrentFloorId;
top.topView.AddChidren(floorBtn);
top.topView.AddChidren(selectFloorBtn);
}
@@ -118,9 +123,12 @@
{
var floors = new SelectFloor();
AddChidren(floors);
+ floors.changeFloor = false;
+ floors.CurFloorId = curFloorId;
floors.Init(599, 161,Direction.Right);
floors.FloorAction += (floorId) =>
{
+ curFloorId = floorId;
floorBtn.Text = Config.Instance.Home.GetFloorNameById(floorId);
AddBodyView(floorId);
};
@@ -142,6 +150,10 @@
var roomScrolView = new VerticalScrolViewLayout { };
bodyFrameLayout.AddChidren(roomScrolView);
var roomList = Common.Room.CurrentRoom.GetRoomsByFloorId(floorId);
+ if (roomList == null)
+ {
+ return;
+ }
for (int i = 0; i < roomList.Count+1; i++)
{
int xx = 43 + i % 2 * (20 + 487);
--
Gitblit v1.8.0