From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 25 十二月 2019 11:21:06 +0800
Subject: [PATCH] 2019.12.25
---
ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
index 52ebd3b..132599d 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
@@ -20,10 +20,30 @@
public FrameLayout itemView;
+ static RoomManagement roomManagement;
+ public static RoomManagement Instance
+ {
+ get
+ {
+ if (roomManagement == null)
+ {
+ roomManagement = new RoomManagement { };
+ }
+ return roomManagement;
+ }
+ }
+
+ /// <summary>
+ /// 鏄惁鍙互瑙﹀彂鐐瑰嚮浜嬩欢--鏄惁鍙互璺宠浆涓婚〉鎴块棿
+ /// </summary>
+ public bool CanClick = true;
+
#endregion
public Action action;
+
+
public override void RemoveFromParent()
{
@@ -35,6 +55,8 @@
/// </summary>
public void Show()
{
+ RemoveAll();
+
AddTop();
AddBodyView(Config.Instance.Home.CurrentFloorId);
@@ -64,6 +86,8 @@
Gravity = Gravity.CenterVertical,
TextAlignment = TextAlignment.CenterRight,
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+ TextSize=14,
+ IsBold=true
};
var selectFloorBtn = new Button()
@@ -76,8 +100,11 @@
};
floorBtn.Text = Config.Instance.Home.GetCurrentFloorName;
- top.topView.AddChidren(floorBtn);
- top.topView.AddChidren(selectFloorBtn);
+ if(Config.Instance.Home.FloorDics.Count>0)
+ {
+ top.topView.AddChidren(floorBtn);
+ top.topView.AddChidren(selectFloorBtn);
+ }
selectFloorBtn.MouseUpEventHandler += SelectedFloor_MouseUpEventHandler;
floorBtn.MouseUpEventHandler += SelectedFloor_MouseUpEventHandler;
}
@@ -145,9 +172,20 @@
var room = roomList[i];
var roomView = new RoomMainView(xx, yy);
itemView.AddChidren(roomView);
- roomView.Init();
+ roomView.Init(this,room);
roomView.SetRoomName(room.Name);
roomView.SetRoomIcon(room.BackgroundImage);
+ roomView.ClickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ if (CanClick == false)
+ {
+ return;
+ }
+ CommonPage.Instance.CloseLeftMenu();
+ Common.Room.CurrentRoom = room;
+ Config.Instance.Home.CurrentFloorId = room.FloorId;
+ UserPage.Instance.Fresh();
+ };
}
else
{
@@ -167,9 +205,10 @@
/// <summary>
/// 鎴块棿绠＄悊鐣岄潰
/// </summary>
- void RoomPage()
+ public RoomManagement()
{
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
+ roomManagement = this;
}
/// <summary>
@@ -179,9 +218,12 @@
/// <param name="mouseEventArgs"></param>
private void ShowUnallocatedRoom_MouseUpEvent(object sender,MouseEventArgs mouseEventArgs)
{
+ if(CanClick==false)
+ {
+ return;
+ }
var unalloctedRoom = new UnallocatedRoom();
- HomePage.Instance.AddChidren(unalloctedRoom);
- HomePage.Instance.PageIndex += 1;
+ AddChidren(unalloctedRoom);
unalloctedRoom.Show();
}
}
--
Gitblit v1.8.0