From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs
old mode 100755
new mode 100644
index 4227c91..08a6705
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs
@@ -9,7 +9,7 @@
/// <summary>
/// 杩斿洖閿�
/// </summary>
- public BackButton backButton;
+ public UserCenter.BackViewControl backButton;
/// <summary>
/// 鐘舵�佹爮-楂樺害涓�80
/// </summary>
@@ -65,7 +65,8 @@
{
Y = Application.GetRealHeight(CommonFormResouce.TopStatuFrameLayout_Height),
Height = Application.GetRealHeight(CommonFormResouce.Topview_Height),
- Width = Application.GetRealWidth(CommonPage.AppRealWidth)
+ Width = Application.GetRealWidth(CommonPage.AppRealWidth),
+ BackgroundColor=ZigbeeColor.Current.GXCTopViewBackgroundColor
};
AddChidren(topView);
@@ -73,7 +74,7 @@
{
Y=Height-1,
Height=1,
- BackgroundColor=ZigbeeColor.Current.GXCGrayLineColor3
+ BackgroundColor= UserCenter.UserCenterColor.Current.ButtomLine
};
AddChidren(line);
}
@@ -87,8 +88,11 @@
/// <returns>The back button.</returns>
private void AddBackBtn()
{
- backButton = new BackButton { };
+ backButton = new UserCenter.BackViewControl();
topView.AddChidren(backButton);
+ backButton.InitControl();
+ //鍚庣画鍐嶈皟鏁�
+ backButton.Y = backButton.Y - Application.GetRealHeight(4);
}
#endregion
@@ -116,15 +120,16 @@
/// </summary>
private void AddTitle()
{
- topTitle = new Button
- {
- X=Application.GetRealWidth(164),
- Height = Application.GetRealHeight(CommonFormResouce.TopFrameLayout_Height - CommonFormResouce.TopStatuFrameLayout_Height),
- Width = Application.GetRealWidth(CommonFormResouce.TopTitle_Width),
- TextSize = CommonFormResouce.TopTitle_TextSize,
- TextColor = ZigbeeColor.Current.GXCTitleBlackTitle,
- TextAlignment=TextAlignment.CenterLeft
- };
+ topTitle = new Button();
+ topTitle.TextSize = 17;
+ topTitle.X = Application.GetRealWidth(161);
+ topTitle.Height = Application.GetRealHeight(75);
+ topTitle.Width = Application.GetRealWidth(850);
+ topTitle.Gravity = Gravity.CenterVertical;
+ topTitle.TextColor = UserCenter.UserCenterColor.Current.TopLayoutTitleText;
+ topTitle.TextAlignment = TextAlignment.CenterLeft;
+ topTitle.IsBold = true;
+
topView.AddChidren(topTitle);
}
/// <summary>
--
Gitblit v1.8.0