From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs | 216 +++++++++++++++++++++++-------------------------------
1 files changed, 92 insertions(+), 124 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
index ebbdac0..25b6fc5 100644
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
@@ -32,6 +32,7 @@
{
if (registerType == 0)
return;
+ etAccount.IsNumberKeyboardType = true;
etAccount.Text = registerPhone;
etPassword.Text = "";
etRepeatPassword.Text = "";
@@ -60,6 +61,7 @@
{
if (registerType == 1)
return;
+ etAccount.IsNumberKeyboardType = false;
etAccount.Text = registerEmail;
etPassword.Text = "";
etRepeatPassword.Text = "";
@@ -92,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;
}
@@ -108,7 +110,7 @@
}
else//閭鑾峰彇楠岃瘉鐮佹寜閽敓鏁堟潯浠�
{
- if (!mFalg.Success)
+ if (!Utlis.CheckEmail(etAccount.Text.Trim()))
{
btnGetVerificationCode_Mail.IsSelected = false;
}
@@ -142,10 +144,8 @@
//鎵嬫満鏂瑰紡-楠岃瘉鎵嬫満鍙风爜鏄惁姝ｇ‘
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);
@@ -169,9 +169,7 @@
{
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);
@@ -291,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()
@@ -300,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.GetLoginVerCode(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.AccountAlreadyUse);
- 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 = 1,
- 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();
@@ -401,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 = 1,
- 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 = 1,
- Direction = AMPopTipDirection.None,
- Text = erorrInfo,
- }.Show(bodyView);
});
+ // 鎻愮ず閿欒
+ IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
}
});
}
@@ -509,7 +477,7 @@
Width = Application.GetRealWidth(288),
Height = Application.GetRealHeight(206),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealWidth(12),
+ Radius = (uint)Application.GetRealHeight(12),
BorderWidth = 0,
BorderColor = 0x00000000,
};
@@ -558,7 +526,7 @@
Y = Application.GetRealHeight(150),
Width = Application.GetRealWidth(84),
Height = Application.GetRealWidth(84),
- Radius = (uint)Application.GetRealWidth(42),
+ Radius = (uint)Application.GetRealHeight(42),
BorderColor = 0x00000000,
BorderWidth = 0,
UnSelectedImagePath = "LoginIcon/2.png",
--
Gitblit v1.8.0