From dfa6733793434bdcfd394f978ae72f1628b2260f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 22 四月 2020 16:50:03 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
old mode 100755
new mode 100644
index 49fbae3..d0b4550
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
@@ -13,6 +13,7 @@
#region 鈼� 鍙橀噺鐢虫槑__________________________
public FrameLayout topFrameLayout = new FrameLayout { Height = Application.GetRealHeight(184), BackgroundColor = ZigbeeColor.Current.XMTopFrameLayout };
public FrameLayout midFrameLayout = new FrameLayout { Height = Application.GetRealHeight(1925 - 184), BackgroundColor = ZigbeeColor.Current.XMMidFrameLayout };
+
public FrameLayout bottomRadiusFrameLayout = new FrameLayout()
{
Height = Application.GetRealHeight(100),
@@ -20,35 +21,47 @@
Radius = 17,
BackgroundColor = ZigbeeColor.Current.XMWhite,
};
+
public FrameLayout titleFrameLayout = new FrameLayout
{
Y = Application.GetRealHeight(92),
+ X = Application.GetRealWidth(161),
+ Width = Application.GetRealWidth(1080 - 161),//919
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),
+ Width = Application.GetRealWidth(1080 - 161),//919
Height = Application.GetRealWidth(69),
- IsBold = true,
TextSize = 17,
+ IsBold = true,
+ //X = Application.GetRealWidth(161 - 116),
};
+ /// <summary>
+ /// 鏍囬杩斿洖甯冨眬
+ /// </summary>
public FrameLayout btnBackFrameLayout = new FrameLayout
{
- X = Application.GetRealWidth(58),
- Height = Application.GetRealHeight(58),
- Width = Application.GetRealWidth(58),
+ Width = Application.GetRealWidth(58 * 2),//116
};
+ /// <summary>
+ /// 鏍囬杩斿洖鎸夐敭
+ /// </summary>
public Button btnBack = new Button
{
- Height = Application.GetMinReal(51),
- Width = Application.GetMinReal(30),
+ Height = Application.GetRealHeight(51),
+ Width = Application.GetRealWidth(30),
+ X = Application.GetRealWidth(58),
+ Y = Application.GetRealHeight(98),
UnSelectedImagePath = "DoorLock/Left.png",
};
+ /// <summary>
+ /// 鏍囬涓嬬嚎
+ /// </summary>
public Button btnTitleLine = new Button
{
Y = Application.GetRealHeight(181),
@@ -58,18 +71,18 @@
#endregion
/// <summary>
- /// 闂ㄩ攣椤堕儴甯冨眬
+ /// 椤堕儴甯冨眬
/// </summary>
/// <param name="frameLayout"></param>
public void TopFrameLayout(FrameLayout frameLayout, string titleText)
{
this.AddChidren(topFrameLayout);
+ topFrameLayout.AddChidren(btnBackFrameLayout);
topFrameLayout.AddChidren(titleFrameLayout);
topFrameLayout.AddChidren(btnTitleLine);
+ btnBackFrameLayout.AddChidren(btnBack);
titleFrameLayout.AddChidren(btnTitle);
btnTitle.Text = titleText;
- titleFrameLayout.AddChidren(btnBackFrameLayout);
- btnBackFrameLayout.AddChidren(btnBack);
}
/// <summary>
/// 闂ㄩ攣涓儴甯冨眬
--
Gitblit v1.8.0