From ed2f4a97aa48cdb4a013d2a389877f52eb3eccdf Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期二, 29 十月 2019 13:15:59 +0800 Subject: [PATCH] Merge branch 'DEV_GXC' of http://172.16.1.23:6688/r/~xm/HomeApp into DEV_GXC --- ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs index 3779405..b9d0c89 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs @@ -25,15 +25,7 @@ Y = Application.GetRealHeight(92), Height = Application.GetRealHeight(69), }; - public Button btnTitle = new Button - { - TextAlignment = TextAlignment.CenterLeft, - TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText, - X = Application.GetRealWidth(161), - Width = Application.GetRealWidth(1080 - 161), - Height = Application.GetRealWidth(69), - TextSize = 17, - }; + public FrameLayout btnBackFrameLayout = new FrameLayout { X = Application.GetRealWidth(58), @@ -65,8 +57,17 @@ this.AddChidren(topFrameLayout); topFrameLayout.AddChidren(titleFrameLayout); topFrameLayout.AddChidren(btnTitleLine); - titleFrameLayout.AddChidren(btnTitle); - btnTitle.Text = titleText; + var title = new Button() + { + TextAlignment = TextAlignment.CenterLeft, + Text = titleText, + TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText, + X = Application.GetRealWidth(161), + Width = Application.GetRealWidth(1080 - 161), + Height = Application.GetRealWidth(69), + TextSize = 17, + }; + titleFrameLayout.AddChidren(title); titleFrameLayout.AddChidren(btnBackFrameLayout); btnBackFrameLayout.AddChidren(btnBack); } -- Gitblit v1.8.0