From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs | 87 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 79 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
index 881efa8..d3f6244 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
@@ -24,14 +24,6 @@
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),
- Y = Application.GetRealHeight(930),
- Radius = 17,
- BackgroundColor = ZigbeeColor.Current.XMWhite,
- };
-
public FrameLayout titleFrameLayout = new FrameLayout
{
Y = Application.GetRealHeight(92),
@@ -78,6 +70,71 @@
Height = 1,
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMTitleLine,
};
+
+ #region 搴曢儴鏈夊渾瑙掑竷灞�
+ /// 鑳屾櫙闃村奖鐣岄潰
+ /// </summary>
+ public FrameLayout shadowRadiusFrameLayout = new FrameLayout { BackgroundColor = 0x0f000000 };
+ /// <summary>
+ /// 璁剧疆鍦嗚鐨勭晫闈�
+ /// </summary>
+ public FrameLayout bottomRadiusFrameLayout = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(806),
+ Y = Application.GetRealHeight(930),
+ BackgroundColor = ZigbeeColor.Current.XMWhite,
+ };
+ /// <summary>
+ /// 搴曢儴鍦嗚涓殑鍙栨秷鎸夐挳
+ /// </summary>
+ public Button btnCancel = new Button
+ {
+ X = Application.GetRealWidth(81),
+ Y = Application.GetRealHeight(40),
+ Height = Application.GetRealHeight(58),
+ Width = Application.GetRealWidth(101),
+ Text = Language.StringByID(R.MyInternationalizationString.Cancel),
+ TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ TextSize = 14,
+ };
+ /// <summary>
+ /// 搴曢儴鍦嗚涓殑鏍囬鏍�
+ /// </summary>
+ public Button btnBottomTitle = new Button
+ {
+ X = Application.GetRealWidth(446 - 50),
+ Y = Application.GetRealHeight(35),
+ Height = Application.GetRealHeight(63),
+ Width = Application.GetRealWidth(284),
+ Text = Language.StringByID(R.MyInternationalizationString.MatchPerson),
+ TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
+ TextSize = 16,
+ };
+ /// <summary>
+ /// 搴曢儴鍦嗚涓殑纭鎸夐挳
+ /// </summary>
+ public Button btnFinish = new Button
+ {
+ X = Application.GetRealWidth(919),
+ Y = Application.GetRealHeight(40),
+ Height = Application.GetRealHeight(58),
+ Width = Application.GetRealWidth(101),
+ Text = Language.StringByID(R.MyInternationalizationString.Complete),
+ TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
+ TextSize = 14,
+ };
+ /// <summary>
+ /// 搴曢儴鍦嗚涓殑鏍囬鏍忎笅鐨勭嚎鏉�
+ /// </summary>
+ public Button line = new Button()
+ {
+ Y = Application.GetRealHeight(138),
+ Height = 1,
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+ };
+
+ #endregion
+
#endregion
/// <summary>
@@ -145,6 +202,20 @@
}
/// <summary>
+ /// 闂ㄩ攣搴曢儴甯﹀渾瑙掑竷灞�
+ /// </summary>
+ /// <param name="frameLayout"></param>
+ public void BottomRadiusFrameLayout(FrameLayout frameLayout)
+ {
+ this.shadowRadiusFrameLayout.AddChidren(this.bottomRadiusFrameLayout);
+ this.bottomRadiusFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ this.bottomRadiusFrameLayout.AddChidren(btnCancel);
+ this.bottomRadiusFrameLayout.AddChidren(btnBottomTitle);
+ this.bottomRadiusFrameLayout.AddChidren(btnFinish);
+ this.bottomRadiusFrameLayout.AddChidren(line);
+ }
+
+ /// <summary>
/// 鏄剧ず閲嶆柊鍔犺浇鐨勭晫闈�(涓昏鏄敤鍦ㄧ晫闈㈠姞杞介敊璇椂锛屽啀娆″姞杞�)
/// </summary>
public void ShowReLoadView()
--
Gitblit v1.8.0