From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
index b9d0c89..49fbae3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
@@ -12,7 +12,7 @@
}
#region 鈼� 鍙橀噺鐢虫槑__________________________
public FrameLayout topFrameLayout = new FrameLayout { Height = Application.GetRealHeight(184), BackgroundColor = ZigbeeColor.Current.XMTopFrameLayout };
- public FrameLayout midFrameLayout = new FrameLayout { Height = Application.GetRealHeight(1921 - 184), BackgroundColor = ZigbeeColor.Current.XMMidFrameLayout };
+ public FrameLayout midFrameLayout = new FrameLayout { Height = Application.GetRealHeight(1925 - 184), BackgroundColor = ZigbeeColor.Current.XMMidFrameLayout };
public FrameLayout bottomRadiusFrameLayout = new FrameLayout()
{
Height = Application.GetRealHeight(100),
@@ -25,7 +25,16 @@
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),
+ IsBold = true,
+ TextSize = 17,
+ };
public FrameLayout btnBackFrameLayout = new FrameLayout
{
X = Application.GetRealWidth(58),
@@ -35,8 +44,8 @@
public Button btnBack = new Button
{
- Height = Application.GetRealHeight(51),
- Width = Application.GetRealWidth(30),
+ Height = Application.GetMinReal(51),
+ Width = Application.GetMinReal(30),
UnSelectedImagePath = "DoorLock/Left.png",
};
@@ -57,17 +66,8 @@
this.AddChidren(topFrameLayout);
topFrameLayout.AddChidren(titleFrameLayout);
topFrameLayout.AddChidren(btnTitleLine);
- 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(btnTitle);
+ btnTitle.Text = titleText;
titleFrameLayout.AddChidren(btnBackFrameLayout);
btnBackFrameLayout.AddChidren(btnBack);
}
--
Gitblit v1.8.0