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/Category/CategorySceneSelectLightSetting.cs | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectLightSetting.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectLightSetting.cs
index c3ba396..bf0f7cd 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectLightSetting.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectLightSetting.cs
@@ -17,6 +17,10 @@
BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor;
Tag = "categoryAddScene";
}
+ public override void RemoveFromParent()
+ {
+ base.RemoveFromParent();
+ }
/// <summary>
/// 鏄剧ず鐏厜鐨勮缁嗚缃晫闈� 榛樿-1(鏂板-榛樿寮�)锛�0鍏� 锛�1寮�
/// </summary>
@@ -27,7 +31,19 @@
public void Show(DeviceUI device, string targetDeviceID="", int state=-1, bool isFromRoom = false)
{
#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()
{
@@ -38,7 +54,8 @@
Gravity = Gravity.CenterHorizontal
};
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();
@@ -163,7 +180,7 @@
};
dimmingRowView.AddChidren(dimmingNextBtn);
- var confirmBtn = new CommonForm.CompleteButton() { };
+ var confirmBtn = new CommonForm.CompleteButton(1,2,3);
AddChidren(confirmBtn);
if (state == -1)
{
--
Gitblit v1.8.0