From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
index 585f178..c6f94e4 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
@@ -27,7 +27,6 @@
public override void RemoveFromParent()
{
- //鏇存柊鐣岄潰
//action?.Invoke();
base.RemoveFromParent();
}
@@ -65,6 +64,8 @@
Gravity = Gravity.CenterVertical,
TextAlignment = TextAlignment.CenterRight,
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+ TextSize=14,
+ IsBold=true
};
var selectFloorBtn = new Button()
@@ -77,8 +78,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;
}
@@ -174,15 +178,14 @@
}
/// <summary>
- ///
+ /// ShowUnallocatedRoom_MouseUpEvent
/// </summary>
/// <param name="sender"></param>
/// <param name="mouseEventArgs"></param>
private void ShowUnallocatedRoom_MouseUpEvent(object sender,MouseEventArgs mouseEventArgs)
{
var unalloctedRoom = new UnallocatedRoom();
- HomePage.Instance.AddChidren(unalloctedRoom);
- HomePage.Instance.PageIndex += 1;
+ AddChidren(unalloctedRoom);
unalloctedRoom.Show();
}
}
--
Gitblit v1.8.0