From 014abc547ffd1a9f23c58fd7a471dffc5933fdd3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 14:27:56 +0800
Subject: [PATCH] Merge branch 'master' into NewFilePath
---
HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
index b08c915..d91c3d4 100644
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
@@ -145,8 +145,10 @@
HttpServerRequest pm;
/// <summary>
/// 鍥炶皟浜嬩欢
+ /// 璐﹀彿锛屽瘑鐮侊紝鏄惁鎵嬫満
+ /// account锛宲assword锛宨sPhone
/// </summary>
- Action<string> callbackAction;
+ Action<string, string, bool> AutoLoginAction;
/// <summary>
/// 淇敼绫诲瀷
/// 0:鎵嬫満
@@ -163,13 +165,22 @@
/// </summary>
string registerPhone;
string registerEmail;
+ /// <summary>
+ /// 鏄惁鐐瑰嚮浜嗚繑鍥烇紝鐢ㄤ簬灞忚斀EditText澶卞幓鐒︾偣妫�娴嬩簨浠�
+ /// </summary>
+ bool isHitBack;
#endregion
- public ForgetPasswordPage(Action<string> action)
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="autoLoginAction">鑷姩鐧诲綍鍥炶皟浜嬩欢</param>
+ public ForgetPasswordPage(Action<string, string, bool> autoLoginAction)
{
- callbackAction = action;
+ AutoLoginAction = autoLoginAction;
bodyView = new FrameLayout()
{
- BackgroundColor = CSS_Color.BackgroundColor,
+ BackgroundColor = CSS_Color.MainBackgroundColor,
};
AddChidren(bodyView);
@@ -178,7 +189,11 @@
public void ShowDialog()
{
- new TopViewDiv(this,bodyView, Language.StringByID(StringId.ForgetPassword)).LoadTopView();
+ Action backAction = () =>
+ {
+ isHitBack = true;
+ };
+ new TopViewDiv(this, bodyView, Language.StringByID(StringId.ForgetPassword)).LoadTopView(backAction);
//new PublicAssmebly().LoadTopView(this, bodyView, Language.StringByID(StringId.ForgetPassword));
#region 淇敼鏂瑰紡閫夋嫨
@@ -225,24 +240,25 @@
X = Application.GetRealWidth(9),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = "+86",
+ Text = "+" + phoneZoneCode,
TextSize = CSS_FontSize.TextFontSize,
};
+
+ //璺宠浆鍥藉鍖哄彿閫夋嫨鐣岄潰
+ EventHandler<MouseEventArgs> eHandler = (sender, e) => {
+ JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
+ if (!string.IsNullOrEmpty(code))
+ {
+ phoneZoneCode = code;
+ btnGlobalRoaming.Text = "+" + phoneZoneCode;
+ }
+ });
+ };
+ btnGlobalRoaming.MouseUpEventHandler += eHandler;
+
if (accountType == 0)
{
accountView.AddChidren(btnGlobalRoaming);
-
- EventHandler<MouseEventArgs> eHandler = (sender, e) => {
- JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
- if (!string.IsNullOrEmpty(code))
- {
- phoneZoneCode = code;
- btnGlobalRoaming.Text = "+" + phoneZoneCode;
-
- }
- });
- };
- btnGlobalRoaming.MouseUpEventHandler += eHandler;
}
etAccount = new EditText()
@@ -254,6 +270,7 @@
TextSize = CSS_FontSize.TextFontSize,
PlaceholderTextColor = CSS_Color.PromptingColor1,
PlaceholderText = Language.StringByID(StringId.PlsEntryPhoneNumber),
+ IsNumberKeyboardType = true
};
accountView.AddChidren(etAccount);
@@ -497,8 +514,8 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(421),
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.ConfirmReset,
--
Gitblit v1.8.0