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/RegisterPageBLL.cs | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
index 25fd27b..ce1f7a3 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
@@ -30,11 +30,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;
}
@@ -46,7 +46,7 @@
}
else//閭娉ㄥ唽鑾峰彇楠岃瘉鐮佹寜閽敓鏁堟潯浠�
{
- if (!Utlis.CheckEmail(etAccount.Text.Trim()))
+ if (!mFalg.Success)
{
btnGetVerificationCode_Mail.IsSelected = false;
}
@@ -72,7 +72,6 @@
{
return;
}
- etAccount.IsNumberKeyboardType = true;
etAccount.Text = registerPhone;
etPassword.Text = "";
etRepeatPassword.Text = "";
@@ -101,8 +100,6 @@
{
if (registerType == 1)
return;
-
- etAccount.IsNumberKeyboardType = false;
etAccount.Text = registerEmail;
etPassword.Text = "";
etRepeatPassword.Text = "";
@@ -151,7 +148,9 @@
{
if (registerType == 0)
{
- if (!Utlis.CheckPhoneNumber(etAccount.Text.Trim(), phoneZoneCode))
+ 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))
{
btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
@@ -180,7 +179,10 @@
else if (registerType == 1)
{
//閭娉ㄥ唽-楠岃瘉閭鏄惁姝ｇ‘
- if (!Utlis.CheckEmail(etAccount.Text.Trim()))
+ var reg = new Regex("^\\s*([A-Za-z0-9_-]+(\\.\\w+)*@(\\w+\\.)+\\w{2,5})\\s*$");
+ //Regex.IsMatch(etAccount.Text.Trim(), "([a-zA-Z0-9_\\.\\-])+\\@(([a-zA-Z0-9\\-])+\\.)+([a-zA-Z0-9]{2,5})+");
+ var mFalg = reg.Match(etAccount.Text.Trim());
+ if (!mFalg.Success)
{
btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
@@ -418,17 +420,17 @@
if (resultObj.Code != StateCode.SUCCESS)
{
// 鎻愮ず閿欒
- IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
+ IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Verification_Send, resultObj.Code);
}
}else if (result.Code.ToUpper() == StateCode.SUCCESS)
{
//3.鎻愮ず璐﹀彿宸插瓨鍦紝鏃犳硶閲嶅娉ㄥ唽
- Utlis.ShowAlertOnMainThread(Language.StringByID(StringId.AccountAlreadyUse));
+ MainPage.ShowAlertOnMainThread(Language.StringByID(StringId.AccountAlreadyUse));
} else
{
//4.鎻愮ず鍏跺畠寮傚父閿欒
- IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
+ IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_GetRegionByAccount, result.Code);
}
})
{ IsBackground = true }.Start();
@@ -538,7 +540,7 @@
else// 娉ㄥ唽澶辫触
{
// 鎻愮ず閿欒
- IMessageCommon.Current.ShowErrorInfoAlter(validateSmsResult.Code);
+ IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Member_Register, validateSmsResult.Code);
//2020-11-13 寰呬慨鏀�
//string erorrInfo = "";
--
Gitblit v1.8.0