From 34e965100d635346e2d4cd6e6013bdaed66b3004 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:52:13 +0800
Subject: [PATCH] 2019.1.2-3
---
ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
index 132599d..cae7db4 100644
--- 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);
@@ -174,7 +186,7 @@
itemView.AddChidren(roomView);
roomView.Init(this,room);
roomView.SetRoomName(room.Name);
- roomView.SetRoomIcon(room.BackgroundImage);
+ roomView.SetRoomIcon(room.BackgroundImageType == 0 ? room.BackgroundImage : System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage));
roomView.ClickBtn.MouseUpEventHandler += (sender, e) =>
{
if (CanClick == false)
--
Gitblit v1.8.0