From b4312dc4fc0b37955322058937fea6a1845de3bf Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期五, 25 十月 2019 17:53:45 +0800
Subject: [PATCH] 2019-10-25-3
---
ZigbeeApp/Shared/Phone/Device/Room/AddRoomContent.cs | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/AddRoomContent.cs b/ZigbeeApp/Shared/Phone/Device/Room/AddRoomContent.cs
old mode 100644
new mode 100755
index 0744335..e3409b6
--- a/ZigbeeApp/Shared/Phone/Device/Room/AddRoomContent.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/AddRoomContent.cs
@@ -59,6 +59,10 @@
instance = this;
}
+ public override void RemoveFromParent()
+ {
+ base.RemoveFromParent();
+ }
#endregion
#region 鈼� 鏄剧ず瑙嗗浘_________________________
@@ -70,7 +74,19 @@
{
CurrentRoom = room;
#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()
{
@@ -83,7 +99,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) =>
{
this.RemoveFromParent();
--
Gitblit v1.8.0