From 2ed75b8b337048e5d75e6d9ec8307633134f02fd Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 10 十月 2019 11:33:04 +0800 Subject: [PATCH] 个人中心添加楼层和创建房间,实装二级验证 --- ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs index 8c802bc..06a43b9 100755 --- a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs +++ b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs @@ -15,7 +15,7 @@ ///// <summary> ///// The top view. ///// </summary> - private CommonForm.TopFrameLayout topFL; + private CommonForm.TopFrameLayout top; /// <summary> /// 鏇村璁剧疆 /// </summary> @@ -217,6 +217,8 @@ { ZbGateway.StatusList.Remove(this); UserView.HomePage.Instance.ScrollEnabled = true; + action(); + action = null; base.RemoveFromParent(); } @@ -286,8 +288,13 @@ /// </summary> private void AddTopView() { - topFL = new CommonForm.TopFrameLayout(this) { }; - AddChidren(topFL); + top = new CommonForm.TopFrameLayout(); + AddChidren(top); + top.InitTopview(); + top.backButton.MouseUpEventHandler += (sender, e) => + { + RemoveFromParent(); + }; AddMoreview(); } @@ -306,7 +313,7 @@ UnSelectedImagePath = "Item/More.png", SelectedImagePath = "Item/MoreSelected.png", }; - topFL.topView.AddChidren(moreBtn); + top.topView.AddChidren(moreBtn); moreBtn.MouseUpEventHandler += MoreEvent; } @@ -339,7 +346,7 @@ midFL = new FrameLayout() { Height = Application.GetRealHeight(CommonPage.AppRealHeight - CommonPage.Navigation_Height), - Y = topFL.Bottom, + Y = top.Bottom, BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor }; AddChidren(midFL); @@ -541,7 +548,6 @@ Shared.Common.Room.Lists[0].AddDevice(device.FileName); collectionBtn.IsSelected = true; } - action?.Invoke(); } #endregion -- Gitblit v1.8.0