From 9e9f864d0f630cacd36107e3960025f454c6881d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 24 八月 2021 14:44:33 +0800
Subject: [PATCH] 2021-08-24 1.优化更新
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 69 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index 1b00994..36b8206 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -147,6 +147,20 @@
Button btnResetPasswordText;
Button btnResetPasswordRight;
#endregion
+
+
+ #region 涓汉閫夐」-鏂板浣忓畢
+ /// <summary>
+ /// 涓汉閫夐」-鏂板浣忓畢鍖哄煙
+ /// </summary>
+ FrameLayout addResidenceView;
+ /// <summary>
+ /// 鏂板浣忓畢鎻愮ず鏂囨湰
+ /// </summary>
+ Button btnAddResidenceText;
+ Button btnAddResidenceScan;
+ #endregion
+
#endregion
#endregion
@@ -232,7 +246,6 @@
/// </summary>
optionListView = new VerticalScrolViewLayout()
{
- //Y = headPortraitView.Bottom + Application.GetRealHeight(8),
Height = Application.GetRealHeight(51 * 6),
BackgroundColor = CSS_Color.MainBackgroundColor,
ScrollEnabled = false,
@@ -434,6 +447,7 @@
optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
#endregion
#region 涓汉閫夐」-绗笁鏂规巿鏉冨尯鍩�
+ //2020-12-08 鏆傛椂闅愯棌绗笁鏂规巿鏉冨姛鑳�
/// <summary>
/// 涓汉閫夐」-绗笁鏂规巿鏉冨尯鍩�
/// </summary>
@@ -441,7 +455,7 @@
{
Height = Application.GetRealHeight(50),
};
- optionListView.AddChidren(thirdPartyAuthorizationView);
+ //optionListView.AddChidren(thirdPartyAuthorizationView);
/// <summary>
/// 绗笁鏂规巿鏉冩枃鏈彁绀轰俊鎭寜閽�
/// </summary>
@@ -464,7 +478,6 @@
UnSelectedImagePath = "Public/Right.png",
};
thirdPartyAuthorizationView.AddChidren(btnThirdPartyAuthorizationRight);
- optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
#endregion
#region 涓汉閫夐」-淇敼鐧诲綍瀵嗙爜鍖哄煙
/// <summary>
@@ -481,7 +494,7 @@
btnResetPasswordText = new Button()
{
X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(120),
+ Width = Application.GetRealWidth(220),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
@@ -497,8 +510,46 @@
UnSelectedImagePath = "Public/Right.png",
};
resetPasswordView.AddChidren(btnResetPasswordRight);
- //optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
+ optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
#endregion
+
+ #region 涓汉閫夐」-娣诲姞浣忓畢
+ addResidenceView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(50),
+ };
+ optionListView.AddChidren(addResidenceView);
+ btnAddResidenceScan = new Button()
+ {
+ X = Application.GetRealWidth(319),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(30),
+ Height = Application.GetMinRealAverage(30),
+ UnSelectedImagePath = "Public/ScanGrey.png",
+ };
+ addResidenceView.AddChidren(btnAddResidenceScan);
+ btnAddResidenceText = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextID = StringId.AddResidence,
+ };
+ addResidenceView.AddChidren(btnAddResidenceText);
+
+ btnAddResidenceText.MouseUpEventHandler = (sender, e) =>
+ {
+ Scan.OpenScan((scanString) =>
+ {
+ //鎵ц缁戝畾浣忓畢
+ new BindingResidencePage().DoBindResidence(scanString);
+ });
+ };
+
+ #endregion
+
+
#endregion
#region 瑙i攣璁剧疆鍖哄煙
@@ -512,11 +563,15 @@
/// </summary>
interpretationSettingsView = new FrameLayout()
{
- //Y = optionListView.Bottom + Application.GetRealHeight(8),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Height = Application.GetRealHeight(66),
+ Height = Application.GetRealHeight(70),
};
bodyScrolView.AddChidren(interpretationSettingsView);
+ if(Language.CurrentLanguage != "Chinese")
+ {
+ interpretationSettingsView.Height = Application.GetRealHeight(80);
+ }
+
btnInterpretationSettingsTitle = new Button()
{
X = Application.GetRealWidth(16),
@@ -531,12 +586,14 @@
btnInterpretationSettingsTip = new Button()
{
X = Application.GetRealWidth(16),
- Y = btnInterpretationSettingsTitle.Bottom + Application.GetRealHeight(4),
+ Y = btnInterpretationSettingsTitle.Bottom,
Height = Application.GetRealHeight(32),
+ Width = Application.GetRealWidth(310),
TextAlignment = TextAlignment.TopLeft,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.AppUnlockSettingsTip
+ TextID = StringId.AppUnlockSettingsTip,
+ IsMoreLines = true,
};
interpretationSettingsView.AddChidren(btnInterpretationSettingsTip);
@@ -565,9 +622,9 @@
myServerInfoPage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- myServerInfoCellView.goAction = selectAction;
- myServerInfoCellView.btnTilte.Text = Language.StringByID(StringId.ServerInformation);
- myServerInfoCellView.lineView.RemoveFromParent();
+ myServerInfoCellView.GoAction = selectAction;
+ myServerInfoCellView.BtnTilte.Text = Language.StringByID(StringId.ServerInformation);
+ myServerInfoCellView.LineView.RemoveFromParent();
#endregion
--
Gitblit v1.8.0