From 135e148183e066795c487c62ef387ba40a621efd Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 23 十一月 2020 10:25:11 +0800
Subject: [PATCH] Merge branch 'CJL'
---
HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs | 232 ++++++++++++++++++++++++++-------------------------------
1 files changed, 105 insertions(+), 127 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
index 794f88a..33b5fa3 100644
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
@@ -30,6 +30,12 @@
//閫夋嫨鎵嬫満鏂瑰紡
btnPhoneLogin.MouseUpEventHandler += (sender, e) =>
{
+ if (registerType == 0)
+ return;
+ etAccount.IsNumberKeyboardType = true;
+ etAccount.Text = registerPhone;
+ etPassword.Text = "";
+ etRepeatPassword.Text = "";
#region 鍒囨崲閫変腑鎸夐挳
btnGetVerificationCode_Phone.Visible = true;
btnGetVerificationCode_Mail.Visible = false;
@@ -37,7 +43,7 @@
btnEmailLogin.TextSize = CSS_FontSize.TextFontSize;
btnPhoneLogin.TextColor = CSS_Color.MainColor;
btnPhoneLogin.TextSize = CSS_FontSize.EmphasisFontSize_Secondary;
- etAccount.PlaceholderText = Language.StringByID(StringId.PlsEntryAccount);
+ etAccount.PlaceholderText = Language.StringByID(StringId.PlsEntryPhoneNumber);
#endregion
#region 鍒囨崲鏂瑰紡鏂瑰紡鍙婂浘鏍�
@@ -53,6 +59,12 @@
//閫夋嫨閭鏂瑰紡
btnEmailLogin.MouseUpEventHandler += (sender, e) =>
{
+ if (registerType == 1)
+ return;
+ etAccount.IsNumberKeyboardType = false;
+ etAccount.Text = registerEmail;
+ etPassword.Text = "";
+ etRepeatPassword.Text = "";
#region 鍒囨崲閫変腑鎸夐挳
btnGetVerificationCode_Phone.Visible = false;
btnGetVerificationCode_Mail.Visible = true;
@@ -82,11 +94,11 @@
{
etAccount.TextChangeEventHandler += (sender, e) =>
{
- Regex reg = new Regex(@"^[1]+\d{10}");
- var mFalg = reg.Match(etAccount.Text.Trim());
+ //Regex reg = new Regex(@"^[1]+\d{10}");
+ //var mFalg = reg.Match(etAccount.Text.Trim());
if (registerType == 0)//鎵嬫満鑾峰彇楠岃瘉鐮佹寜閽敓鏁堟潯浠�
{
- if (btnGlobalRoaming.Text == "+86" && etAccount.Text.Trim().Length != 11)
+ if (!Utlis.CheckPhoneNumber(etAccount.Text.Trim(), phoneZoneCode))
{
btnGetVerificationCode_Phone.IsSelected = false;
}
@@ -98,7 +110,7 @@
}
else//閭鑾峰彇楠岃瘉鐮佹寜閽敓鏁堟潯浠�
{
- if (!mFalg.Success)
+ if (!Utlis.CheckEmail(etAccount.Text.Trim()))
{
btnGetVerificationCode_Mail.IsSelected = false;
}
@@ -132,16 +144,14 @@
//鎵嬫満鏂瑰紡-楠岃瘉鎵嬫満鍙风爜鏄惁姝ｇ‘
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))
+ btnGetVerificationCode_Phone.IsSelected = false;
+ if (!Utlis.CheckPhoneNumber(etAccount.Text.Trim(), phoneZoneCode))
{
btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
new Tip()
{
- CloseTime = 3,
+ CloseTime = 1,
Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
Direction = AMPopTipDirection.None,
}.Show(bodyView);
@@ -159,15 +169,13 @@
{
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());
- if (!mFalg.Success )
+ if (!Utlis.CheckEmail(etAccount.Text.Trim()))
{
btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
new Tip()
{
- CloseTime = 3,
+ CloseTime = 1,
Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
Direction = AMPopTipDirection.None,
}.Show(bodyView);
@@ -201,7 +209,7 @@
{
new Tip()
{
- CloseTime = 3,
+ CloseTime = 1,
Direction = AMPopTipDirection.None,
Text = Language.StringByID(StringId.PasswordIsUnqualified)
}.Show(bodyView);
@@ -228,7 +236,7 @@
btnRepeatPasswordViewBottomLine.Height = Application.GetRealHeight(2);
new Tip()
{
- CloseTime = 3,
+ CloseTime = 1,
Direction = AMPopTipDirection.None,
Text = Language.StringByID(StringId.IncorrectRepeatPassword)
}.Show(bodyView);
@@ -281,6 +289,25 @@
}
/// <summary>
+ /// 妫�娴嬪綋鍓嶉厤缃煙鍚嶆槸鍚︿竴鑷达紝涓嶄竴鑷村垯鏇挎崲
+ /// </summary>
+ /// <param name="result"></param>
+ void CheckAndSetUserRequestHost(ResponsePackNew result) {
+ try
+ {
+ var mGlobalRegionListObj = Newtonsoft.Json.JsonConvert.DeserializeObject<GlobalRegionListRes>(result.Data.ToString());
+ if (UserInfo.Current.RequestHttpsHost != mGlobalRegionListObj.regionUrl)
+ {
+ UserInfo.Current.RequestHttpsHost = mGlobalRegionListObj.regionUrl;
+ UserInfo.Current.GlobalRegion = mGlobalRegionListObj;
+ UserInfo.Current.SaveUserInfo();
+ }
+ }
+ catch { }
+ }
+
+
+ /// <summary>
/// 鑾峰彇楠岃瘉鐮�
/// </summary>
void LoadEvent_GetVerificationCode()
@@ -290,62 +317,65 @@
var account = etAccount.Text.Trim();
if ((sender as Button).IsSelected)
{
- //鐭俊鍙戦�侀棿闅�60s
- (sender as Button).IsSelected = false;
- etVerificationCode.Foucs = true;
- //鑾峰彇楠岃瘉鐮�
- int time = 60;
- new Thread(() => {
- while (time > 0)
- {
- time--;
- Application.RunOnMainThread(() =>
- {
- (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();
+ int time = 60;
new Thread(() =>
{
- var result = pm.SendSms(account);
- if (result.StateCode.ToUpper() == "SUCCESS")
+ //1.鍏堟鏌ヨ处鍙锋槸鍚︽敞鍐岃繃
+ var result = pm.GetRegionByAccount(account);
+ if (result.Code != StateCode.SUCCESS)
{
+ IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
+ return;
}
else
{
- string tipString = "Server error";
- switch (result.StateCode)
- {
- case "Exist":
- tipString = Language.StringByID(StringId.AccountAlreadyExists);
- break;
- case "SendFail":
- tipString = Language.StringByID(StringId.FailedToSendVerificationCode);
- break;
- case "AccountNoExists":
- tipString = Language.StringByID(StringId.AccountNotExist);
- break;
- case "Self:Net_Error":
- tipString = Language.StringByID(StringId.NetworkAnomaly);
- break;
- }
+ //2.1妫�娴嬪綋鍓嶉厤缃煙鍚嶆槸鍚︿竴鑷达紝涓嶄竴鑷村垯鏇挎崲
+ CheckAndSetUserRequestHost(result);
+ //2.2宸茬粡娉ㄥ唽杩囷紝鍙戦�侀獙璇佺爜鎵惧洖瀵嗙爜
Application.RunOnMainThread(() =>
{
- new Tip()
- {
- CloseTime = 3,
- Direction = AMPopTipDirection.None,
- Text = tipString
- }.Show(bodyView);
+ //鐭俊鍙戦�侀棿闅�60s
+ (sender as Button).IsSelected = false;
+ etVerificationCode.Foucs = true;
});
+ //2.1鑾峰彇楠岃瘉鐮佸�掕鏃�
+ new Thread(() =>
+ {
+ while (time > 0)
+ {
+ time--;
+ Application.RunOnMainThread(() =>
+ {
+ (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();
+
+ ResponsePackNew resultObj;
+ //2.1璇锋眰鑾峰彇楠岃瘉鐮�
+ if (registerType == 1)//閭
+ {
+ resultObj = pm.VerificationCodeSend(VerifyType.FIND_PASSWORD, account);
+ }
+ else
+ {
+ resultObj = pm.VerificationCodeSend(VerifyType.FIND_PASSWORD, account, true, phoneZoneCode);
+ }
+
+ if (resultObj.Code != StateCode.SUCCESS)
+ {
+ // 鎻愮ず閿欒
+ IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
+ }
}
})
{ IsBackground = true }.Start();
@@ -391,81 +421,29 @@
return new Thread(() =>
{
- var verResult = pm.ValidatorCode(account, verCode, countryIndex);
- if (verResult.StateCode.ToUpper() == "SUCCESS")
+ // 蹇樿瀵嗙爜
+ var isPhone = registerType == 0;
+ var resultObj = pm.ForgetPassword(account, password, verCode, isPhone);
+ if (resultObj.Code == StateCode.SUCCESS)
{
- var resetResult = pm.ResetPassword(account, password, repeatPassword, countryIndex);
- if (resetResult.StateCode.ToUpper() == "SUCCESS")
+ Application.RunOnMainThread(() =>
{
- Application.RunOnMainThread(() =>
- {
- LoadEvent_AutoLogin();
+ LoadEvent_AutoLogin();
+ callbackAction?.Invoke(account);
+ });
- callbackAction?.Invoke(account);
- });
- }
- else
- {
- string erorrInfo = "";
- switch (resetResult.StateCode)
- {
- case "PwdNoConfirm"://涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�
- erorrInfo = Language.StringByID(StringId.IncorrectRepeatPassword);
- break;
- case "AccountNoExists"://涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�
- erorrInfo = Language.StringByID(StringId.AccountNotExist);
- break;
- default:
- erorrInfo = "Server error";
- break;
- }
- Application.RunOnMainThread(() =>
- {
- waitPage.Hide();
- new Tip()
- {
- CloseTime = 3,
- Direction = AMPopTipDirection.None,
- Text = erorrInfo,
- }.Show(bodyView);
- });
- }
}
else
{
- string erorrInfo = "";
- switch (verResult.StateCode)
- {
- case "ValidCodeAndPhoneNoEqual"://楠岃瘉鐮侀敊璇�
- erorrInfo = Language.StringByID(StringId.VerificationCodeWrong);
- Application.RunOnMainThread(() =>
- {
- btnVerificationCodeViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- btnVerificationCodeViewBottomLine.Height = Application.GetRealHeight(2);
- });
- break;
- case "NoRecord":
- erorrInfo = Language.StringByID(StringId.PlsGetTheVerificationCode);
- Application.RunOnMainThread(() =>
- {
- btnVerificationCodeViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- btnVerificationCodeViewBottomLine.Height = Application.GetRealHeight(2);
- });
- break;
- default:
- erorrInfo = "Server error";
- break;
- }
+ // 2020-11-13 寰呬慨鏀� 楠岃瘉鐮侀敊璇� 璀﹀憡鎻愮ず
+ //btnVerificationCodeViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ //btnVerificationCodeViewBottomLine.Height = Application.GetRealHeight(2);
Application.RunOnMainThread(() =>
{
waitPage.Hide();
- new Tip()
- {
- CloseTime = 3,
- Direction = AMPopTipDirection.None,
- Text = erorrInfo,
- }.Show(bodyView);
});
+ // 鎻愮ず閿欒
+ IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
}
});
}
--
Gitblit v1.8.0