From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1
---
HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs | 94 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 68 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
index fa2cae8..0242066 100644
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
@@ -30,12 +30,19 @@
//閫夋嫨鎵嬫満鏂瑰紡
btnPhoneLogin.MouseUpEventHandler += (sender, e) =>
{
+ if (registerType == 0)
+ return;
+ etAccount.Text = registerPhone;
+ etPassword.Text = "";
+ etRepeatPassword.Text = "";
#region 鍒囨崲閫変腑鎸夐挳
+ btnGetVerificationCode_Phone.Visible = true;
+ btnGetVerificationCode_Mail.Visible = false;
btnEmailLogin.TextColor = CSS_Color.PromptingColor1;
btnEmailLogin.TextSize = CSS_FontSize.TextFontSize;
btnPhoneLogin.TextColor = CSS_Color.MainColor;
btnPhoneLogin.TextSize = CSS_FontSize.EmphasisFontSize_Secondary;
- etAccount.PlaceholderText = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber);
+ etAccount.PlaceholderText = Language.StringByID(StringId.PlsEntryAccount);
#endregion
#region 鍒囨崲鏂瑰紡鏂瑰紡鍙婂浘鏍�
@@ -51,7 +58,14 @@
//閫夋嫨閭鏂瑰紡
btnEmailLogin.MouseUpEventHandler += (sender, e) =>
{
+ if (registerType == 1)
+ return;
+ etAccount.Text = registerEmail;
+ etPassword.Text = "";
+ etRepeatPassword.Text = "";
#region 鍒囨崲閫変腑鎸夐挳
+ btnGetVerificationCode_Phone.Visible = false;
+ btnGetVerificationCode_Mail.Visible = true;
btnPhoneLogin.TextColor = CSS_Color.PromptingColor1;
btnPhoneLogin.TextSize = CSS_FontSize.TextFontSize;
btnEmailLogin.TextColor = CSS_Color.MainColor;
@@ -78,15 +92,31 @@
{
etAccount.TextChangeEventHandler += (sender, e) =>
{
- Regex reg = new Regex(@"^[1]+\d{9}");
+ Regex reg = new Regex(@"^[1]+\d{10}");
var mFalg = reg.Match(etAccount.Text.Trim());
- if (!mFalg.Success || (btnGlobalRoaming.Text == "+86" && etAccount.Text.Trim().Length != 11))
+ if (registerType == 0)//鎵嬫満鑾峰彇楠岃瘉鐮佹寜閽敓鏁堟潯浠�
{
- btnGetVerificationCode.IsSelected = false;
+ if (btnGlobalRoaming.Text == "+86" && etAccount.Text.Trim().Length != 11)
+ {
+ btnGetVerificationCode_Phone.IsSelected = false;
+ }
+ else
+ {
+ if (btnGetVerificationCode_Phone.Text == Language.StringByID(StringId.GetVerificationCode))
+ btnGetVerificationCode_Phone.IsSelected = true;
+ }
}
- else
+ else//閭鑾峰彇楠岃瘉鐮佹寜閽敓鏁堟潯浠�
{
- btnGetVerificationCode.IsSelected = true;
+ if (!mFalg.Success)
+ {
+ btnGetVerificationCode_Mail.IsSelected = false;
+ }
+ else
+ {
+ if (btnGetVerificationCode_Mail.Text == Language.StringByID(StringId.GetVerificationCode))
+ btnGetVerificationCode_Mail.IsSelected = true;
+ }
}
};
}
@@ -107,12 +137,12 @@
else
{
//鏍囪鎵嬫満鍙风爜鏃犳晥
- btnGetVerificationCode.IsSelected = false;
btnAccountViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
btnAccountViewBottomLine.Height = Application.GetRealHeight(1);
//鎵嬫満鏂瑰紡-楠岃瘉鎵嬫満鍙风爜鏄惁姝ｇ‘
if (registerType == 0)
{
+ btnGetVerificationCode_Phone.IsSelected = false;
Regex reg = new Regex(@"^[1]+\d{9}");
var mFalg = reg.Match(etAccount.Text.Trim());
if (!mFalg.Success || (btnGlobalRoaming.Text == "+86" && etAccount.Text.Trim().Length != 11))
@@ -128,12 +158,16 @@
}
else
{
- btnGetVerificationCode.IsSelected = true;
+ if (btnGetVerificationCode_Phone.Text == Language.StringByID( StringId.GetVerificationCode))
+ {
+ btnGetVerificationCode_Phone.IsSelected = true;
+ }
LoadMothed_EnableResetButton();
}
}
else if (registerType == 1)
{
+ btnGetVerificationCode_Mail.IsSelected = false;
//閭鏂瑰紡-楠岃瘉閭鏄惁姝ｇ‘
var reg = new Regex("^\\s*([A-Za-z0-9_-]+(\\.\\w+)*@(\\w+\\.)+\\w{2,5})\\s*$");
var mFalg = reg.Match(etAccount.Text.Trim());
@@ -150,7 +184,10 @@
}
else
{
- btnGetVerificationCode.IsSelected = true;
+ if (btnGetVerificationCode_Mail.Text == Language.StringByID(StringId.GetVerificationCode))
+ {
+ btnGetVerificationCode_Mail.IsSelected = true;
+ }
LoadMothed_EnableResetButton();
}
}
@@ -176,7 +213,7 @@
{
CloseTime = 3,
Direction = AMPopTipDirection.None,
- Text = Language.StringByID(StringId.IncorrectRepeatPassword)
+ Text = Language.StringByID(StringId.PasswordIsUnqualified)
}.Show(bodyView);
}
}
@@ -258,12 +295,13 @@
/// </summary>
void LoadEvent_GetVerificationCode()
{
- btnGetVerificationCode.MouseUpEventHandler += (sender, e) =>
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- if (btnGetVerificationCode.IsSelected)
+ var account = etAccount.Text.Trim();
+ if ((sender as Button).IsSelected)
{
//鐭俊鍙戦�侀棿闅�60s
- btnGetVerificationCode.IsSelected = false;
+ (sender as Button).IsSelected = false;
etVerificationCode.Foucs = true;
//鑾峰彇楠岃瘉鐮�
int time = 60;
@@ -273,22 +311,22 @@
time--;
Application.RunOnMainThread(() =>
{
- btnGetVerificationCode.Text = time.ToString() + "s";
+ (sender as Button).Text = time.ToString() + "s";
});
Thread.Sleep(1000);
}
+ Application.RunOnMainThread(() =>
+ {
+ //鍥炲鑾峰彇鐭俊鎸夐挳浜嬩欢
+ (sender as Button).IsSelected = true;
+ (sender as Button).TextID = StringId.GetVerificationCode;
+ });
}){ IsBackground = true}.Start();
new Thread(() =>
{
- var result = pm.SendSms(etAccount.Text.Trim());
- if (result.StateCode == "Success")
+ var result = pm.SendSms(account);
+ if (result.StateCode.ToUpper() == "SUCCESS")
{
- Application.RunOnMainThread(() =>
- {
- //鍥炲鑾峰彇鐭俊鎸夐挳浜嬩欢
- btnGetVerificationCode.IsSelected = true;
- btnGetVerificationCode.TextID = StringId.GetVerificationCode;
- });
}
else
{
@@ -323,6 +361,9 @@
{ IsBackground = true }.Start();
}
};
+
+ btnGetVerificationCode_Mail.MouseUpEventHandler = eventHandler;
+ btnGetVerificationCode_Phone.MouseUpEventHandler = eventHandler;
}
/// <summary>
@@ -361,10 +402,10 @@
return new Thread(() =>
{
var verResult = pm.ValidatorCode(account, verCode, countryIndex);
- if (verResult.StateCode == "Success")
+ if (verResult.StateCode.ToUpper() == "SUCCESS")
{
var resetResult = pm.ResetPassword(account, password, repeatPassword, countryIndex);
- if (resetResult.StateCode == "Success")
+ if (resetResult.StateCode.ToUpper() == "SUCCESS")
{
Application.RunOnMainThread(() =>
{
@@ -483,7 +524,7 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
- Text = "s鏄敓鐢熶笘涓�",
+ //Text = "s鏄敓鐢熶笘涓�",
};
frame.AddChidren(btnAccountText);
@@ -509,7 +550,7 @@
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = StringId.AutomaticallyLogin,
};
- frame.AddChidren(btnAutoLoginTip);
+ //frame.AddChidren(btnAutoLoginTip);
Button btnHeadImage = new Button()
{
@@ -531,6 +572,7 @@
Thread.Sleep(1500);
Application.RunOnMainThread(() =>
{
+ dialog.Close();
this.Close();
});
})
--
Gitblit v1.8.0