From 8e5ba5665861b29a4b8da0335c81d620aa891862 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 08 三月 2021 09:23:54 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index 41f25de..2b9b5f8 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -482,7 +482,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,
@@ -513,11 +513,15 @@
/// </summary>
interpretationSettingsView = new FrameLayout()
{
- //Y = optionListView.Bottom + Application.GetRealHeight(8),
BackgroundColor = CSS_Color.MainBackgroundColor,
Height = Application.GetRealHeight(66),
};
bodyScrolView.AddChidren(interpretationSettingsView);
+ if(Language.CurrentLanguage != "Chinese")
+ {
+ interpretationSettingsView.Height = Application.GetRealHeight(80);
+ }
+
btnInterpretationSettingsTitle = new Button()
{
X = Application.GetRealWidth(16),
@@ -532,12 +536,14 @@
btnInterpretationSettingsTip = new Button()
{
X = Application.GetRealWidth(16),
- Y = btnInterpretationSettingsTitle.Bottom + Application.GetRealHeight(4),
+ Y = btnInterpretationSettingsTitle.Bottom,
Height = Application.GetRealHeight(32),
+ Width = Application.GetRealWidth(290),
TextAlignment = TextAlignment.TopLeft,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.AppUnlockSettingsTip
+ TextID = StringId.AppUnlockSettingsTip,
+ IsMoreLines = true,
};
interpretationSettingsView.AddChidren(btnInterpretationSettingsTip);
--
Gitblit v1.8.0