From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 02 十二月 2020 16:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs
index ff630c4..af22227 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs
@@ -83,9 +83,8 @@
Foucs = true
};
rowView.AddChidren(etPassword);
- var lineView = new LineView();
+ var lineView = new LineView(rowView.Height);
rowView.AddChidren(lineView);
- lineView.Y = rowView.Height - lineView.Height;
#endregion
#region 鍐嶆杈撳叆鏂板瘑鐮�
@@ -126,8 +125,8 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(224),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealHeight(44),
- Radius = (uint)Application.GetRealHeight(22),
+ Height = Application.GetRealWidth(44),
+ Radius = (uint)Application.GetRealWidth(22),
SelectedBackgroundColor = CSS_Color.MainColor,
BackgroundColor = CSS_Color.PromptingColor1,
TextID = StringId.Confirm,
@@ -191,8 +190,8 @@
}
var waitPage = new Loading();
- waitPage.Start("Please wait...");
-
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
+
new Thread(() =>
{
try
--
Gitblit v1.8.0