From eb51679c618d5027070fbd6f3c0519f0f17e7d7d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 23 十一月 2020 10:07:53 +0800
Subject: [PATCH] Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL
---
HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs | 50 +++++++++++++++-----------------------------------
1 files changed, 15 insertions(+), 35 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
index 33b5fa3..7f1cb99 100644
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
@@ -32,7 +32,6 @@
{
if (registerType == 0)
return;
- etAccount.IsNumberKeyboardType = true;
etAccount.Text = registerPhone;
etPassword.Text = "";
etRepeatPassword.Text = "";
@@ -61,7 +60,6 @@
{
if (registerType == 1)
return;
- etAccount.IsNumberKeyboardType = false;
etAccount.Text = registerEmail;
etPassword.Text = "";
etRepeatPassword.Text = "";
@@ -94,11 +92,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 (!Utlis.CheckPhoneNumber(etAccount.Text.Trim(), phoneZoneCode))
+ if (btnGlobalRoaming.Text == "+86" && etAccount.Text.Trim().Length != 11)
{
btnGetVerificationCode_Phone.IsSelected = false;
}
@@ -110,7 +108,7 @@
}
else//閭鑾峰彇楠岃瘉鐮佹寜閽敓鏁堟潯浠�
{
- if (!Utlis.CheckEmail(etAccount.Text.Trim()))
+ if (!mFalg.Success)
{
btnGetVerificationCode_Mail.IsSelected = false;
}
@@ -144,8 +142,10 @@
//鎵嬫満鏂瑰紡-楠岃瘉鎵嬫満鍙风爜鏄惁姝ｇ‘
if (registerType == 0)
{
- btnGetVerificationCode_Phone.IsSelected = false;
- if (!Utlis.CheckPhoneNumber(etAccount.Text.Trim(), phoneZoneCode))
+ 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))
{
btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
@@ -169,7 +169,9 @@
{
btnGetVerificationCode_Mail.IsSelected = false;
//閭鏂瑰紡-楠岃瘉閭鏄惁姝ｇ‘
- if (!Utlis.CheckEmail(etAccount.Text.Trim()))
+ 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 )
{
btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
@@ -289,25 +291,6 @@
}
/// <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()
@@ -324,15 +307,12 @@
var result = pm.GetRegionByAccount(account);
if (result.Code != StateCode.SUCCESS)
{
- IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
+ IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_GetRegionByAccount, result.Code);
return;
}
else
{
- //2.1妫�娴嬪綋鍓嶉厤缃煙鍚嶆槸鍚︿竴鑷达紝涓嶄竴鑷村垯鏇挎崲
- CheckAndSetUserRequestHost(result);
-
- //2.2宸茬粡娉ㄥ唽杩囷紝鍙戦�侀獙璇佺爜鎵惧洖瀵嗙爜
+ //2.宸茬粡娉ㄥ唽杩囷紝鍙戦�侀獙璇佺爜鎵惧洖瀵嗙爜
Application.RunOnMainThread(() =>
{
//鐭俊鍙戦�侀棿闅�60s
@@ -374,7 +354,7 @@
if (resultObj.Code != StateCode.SUCCESS)
{
// 鎻愮ず閿欒
- IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
+ IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Verification_Send, resultObj.Code);
}
}
})
@@ -443,7 +423,7 @@
waitPage.Hide();
});
// 鎻愮ず閿欒
- IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
+ IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Member_ForgetPwd, resultObj.Code);
}
});
}
--
Gitblit v1.8.0