From 9064c76e6a795ae735cac52d98bed178a27c2a87 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 10 一月 2020 16:38:16 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs | 101 +++++++++++++++++++++++++++-----------------------
1 files changed, 54 insertions(+), 47 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
index cae7db4..a6c927f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
@@ -149,67 +149,74 @@
var roomScrolView = new VerticalScrolViewLayout { };
bodyFrameLayout.AddChidren(roomScrolView);
- var roomList = Common.Room.CurrentRoom.GetRoomsByFloorId(floorId);
- if (roomList == null)
+ try
{
- return;
- }
- for (int i = 0; i < roomList.Count+1; i++)
- {
- int xx = 43 + i % 2 * (20 + 487);
- int yy = 0;
- if (i == 0 || i == 1)
+ var roomList = Common.Room.CurrentRoom.GetRoomsByFloorId(floorId);
+ if (roomList == null || roomList.Count == 0)
{
- if (i % 2 == 0)
+ return;
+ }
+ for (int i = 0; i < roomList.Count + 1; i++)
+ {
+ int xx = 43 + i % 2 * (20 + 487);
+ int yy = 0;
+ if (i == 0 || i == 1)
+ {
+ if (i % 2 == 0)
+ {
+ itemView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(354 + 58)
+ };
+ roomScrolView.AddChidren(itemView);
+ }
+ yy = 58;
+ }
+ else if (i % 2 == 0)
{
itemView = new FrameLayout()
{
- Height = Application.GetRealHeight(354 + 58)
+ Height = Application.GetRealHeight(354)
};
roomScrolView.AddChidren(itemView);
}
- yy = 58;
- }
- else if (i % 2 == 0)
- {
- itemView = new FrameLayout()
- {
- Height = Application.GetRealHeight(354)
- };
- roomScrolView.AddChidren(itemView);
- }
- if (i< roomList.Count)
- {
- var room = roomList[i];
- var roomView = new RoomMainView(xx, yy);
- itemView.AddChidren(roomView);
- roomView.Init(this,room);
- roomView.SetRoomName(room.Name);
- roomView.SetRoomIcon(room.BackgroundImageType == 0 ? room.BackgroundImage : System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage));
- roomView.ClickBtn.MouseUpEventHandler += (sender, e) =>
+ if (i < roomList.Count)
{
- if (CanClick == false)
+ var room = roomList[i];
+ var roomView = new RoomMainView(xx, yy);
+ itemView.AddChidren(roomView);
+ roomView.Init(this, room);
+ roomView.SetRoomName(room.Name);
+ roomView.SetRoomIcon(room.BackgroundImageType == 0 ? room.BackgroundImage : System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage));
+ roomView.ClickBtn.MouseUpEventHandler += (sender, e) =>
{
- return;
- }
- CommonPage.Instance.CloseLeftMenu();
- Common.Room.CurrentRoom = room;
- Config.Instance.Home.CurrentFloorId = room.FloorId;
- UserPage.Instance.Fresh();
- };
- }
- else
- {
- var roomView = new RoomNoNameMainView(xx, yy);
- itemView.AddChidren(roomView);
- roomView.Init();
+ if (CanClick == false)
+ {
+ return;
+ }
+ CommonPage.Instance.CloseLeftMenu();
+ Common.Room.CurrentRoom = room;
+ Config.Instance.Home.CurrentFloorId = room.FloorId;
+ UserPage.Instance.Fresh();
+ };
+ }
+ else
+ {
+ var roomView = new RoomNoNameMainView(xx, yy);
+ itemView.AddChidren(roomView);
+ roomView.Init();
- roomView.Icon.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
- roomView.RoomNameButton.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
- roomView.iconFL.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
+ roomView.Icon.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
+ roomView.RoomNameButton.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
+ roomView.iconFL.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
+ }
}
}
+ catch (Exception ex)
+ {
+ string tt=ex.Message;
+ }
}
#endregion
--
Gitblit v1.8.0