From af0266fa5570b6adcdb22f631bf13170e8646ca5 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:15:21 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectRoomList.cs | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectRoomList.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectRoomList.cs
old mode 100755
new mode 100644
index a67e1b4..ef55886
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectRoomList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectRoomList.cs
@@ -9,10 +9,26 @@
{
BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor;
}
+ public override void RemoveFromParent()
+ {
+ base.RemoveFromParent();
+ }
public void Show()
{
#region topview
- var topBGView = new FrameLayout()鈥� {鈥� Height = Application.GetRealHeight(CommonPage.Navigation_Height),鈥� BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor鈥� };鈥� AddChidren(topBGView);鈥� var topView = new FrameLayout()鈥� {鈥� Y = Application.GetRealHeight(CommonPage.NavigationTitle_Y),鈥� Height = Application.GetRealHeight(CommonPage.Navigation_Height - CommonPage.NavigationTitle_Y),鈥� BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor,鈥� };鈥� AddChidren(topView);
+ var topBGView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(CommonPage.Navigation_Height),
+ BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor
+ };
+ AddChidren(topBGView);
+ var topView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(CommonPage.NavigationTitle_Y),
+ Height = Application.GetRealHeight(CommonPage.Navigation_Height - CommonPage.NavigationTitle_Y),
+ BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor,
+ };
+ AddChidren(topView);
var title = new Button()
{
@@ -24,7 +40,8 @@
};
topView.AddChidren(title);
- var back = new Device.CommonForm.BackButton() { };鈥� topView.AddChidren(back);
+ var back = new Device.CommonForm.BackButton() { };
+ topView.AddChidren(back);
back.MouseUpEventHandler += (sender, e) =>
{
--
Gitblit v1.8.0