From 7167334c0e89dd84827d59e726123d14776e3a09 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 六月 2020 11:14:13 +0800
Subject: [PATCH] 2020-06-16-1
---
HDL_ON/UI/UI1-Login/RegisterPageBLL.cs | 156 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 96 insertions(+), 60 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
index fc724b3..6996dec 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
@@ -14,7 +14,7 @@
/// </summary>
void LoadEventList()
{
- LoadPage_SwitchLoginType();
+ LoadPage_SwitchRegisterType();
LoadEvent_EditTextFcousChange();
LoadEvent_ChangeTextVisble();
LoadEvent_GetVerificationCode();
@@ -30,7 +30,7 @@
{
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))
{
@@ -38,7 +38,8 @@
}
else
{
- btnGetVerificationCode.IsSelected = true;
+ if (btnGetVerificationCode.Text == Language.StringByID(StringId.GetVerificationCode))
+ btnGetVerificationCode.IsSelected = true;
}
};
}
@@ -46,7 +47,7 @@
/// <summary>
/// 鍒囨崲娉ㄥ唽绫诲瀷
/// </summary>
- void LoadPage_SwitchLoginType()
+ void LoadPage_SwitchRegisterType()
{
//閫夋嫨鎵嬫満娉ㄥ唽
btnPhoneLogin.MouseUpEventHandler += (sender, e) =>
@@ -76,6 +77,10 @@
//閫夋嫨閭娉ㄥ唽
btnEmailLogin.MouseUpEventHandler += (sender, e) =>
{
+
+#if DEBUG
+ etAccount.Text = "979412578@qq.com";
+#endif
#region 鍒囨崲閫変腑鎸夐挳
btnPhoneLogin.TextColor = CSS_Color.PromptingColor1;
btnPhoneLogin.TextSize = CSS_FontSize.TextFontSize;
@@ -121,7 +126,7 @@
if (registerType == 0)
{
- 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))
{
@@ -136,8 +141,11 @@
}
else
{
- //鏍囪鎵嬫満鍙风爜鏈夋晥
- btnGetVerificationCode.IsSelected = true;
+ if (btnGetVerificationCode.Text == Language.StringByID(StringId.GetVerificationCode))
+ {
+ //鏍囪鎵嬫満鍙风爜鏈夋晥
+ btnGetVerificationCode.IsSelected = true;
+ }
//璐﹀彿鏈夋晥銆佸瘑鐮佹湁鏁堛�侀獙璇佺爜杈撳叆浜嗭紝鎵嶈兘鐐瑰嚮娉ㄥ唽
if (btnGetVerificationCode.IsSelected && ValidPassword && !string.IsNullOrEmpty(etVerificationCode.Text.Trim()))
{
@@ -149,7 +157,7 @@
{
//閭娉ㄥ唽-楠岃瘉閭鏄惁姝ｇ‘
var reg = new Regex("^\\s*([A-Za-z0-9_-]+(\\.\\w+)*@(\\w+\\.)+\\w{2,5})\\s*$");
- Regex.IsMatch(etAccount.Text.Trim(), "^[\\w-]+@[\\w-]+\\.(com|net|org|edu|mil|tv|biz|info)$");
+ //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)
{
@@ -164,8 +172,10 @@
}
else
{
- //鏍囪鎵嬫満鍙风爜鏈夋晥
- btnGetVerificationCode.IsSelected = true;
+ if (btnGetVerificationCode.Text == Language.StringByID(StringId.GetVerificationCode))
+ {//鏍囪鎵嬫満鍙风爜鏈夋晥
+ btnGetVerificationCode.IsSelected = true;
+ }
//璐﹀彿鏈夋晥銆佸瘑鐮佹湁鏁堛�侀獙璇佺爜杈撳叆浜嗭紝鎵嶈兘鐐瑰嚮娉ㄥ唽
if (btnGetVerificationCode.IsSelected && ValidPassword && string.IsNullOrEmpty(etVerificationCode.Text.Trim()))
{
@@ -188,10 +198,11 @@
else
{
//闇�瑕佽緭鍏�6浣嶄互涓婄殑瀵嗙爜
- if (etPassword.Text.Length < 6)
+ if (etPassword.Text.Length < 6|| etPassword.Text.Length >13)
{
- btnRepeatPasswordViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
- btnRepeatPasswordViewBottomLine.Height = Application.GetRealHeight(1);
+
+ btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
new Tip()
{
@@ -262,7 +273,7 @@
if (etVerificationCode.Text.Length > 1)
{
//璐﹀彿鏈夋晥銆佸瘑鐮佹湁鏁堛�侀獙璇佺爜杈撳叆浜嗭紝鎵嶈兘鐐瑰嚮娉ㄥ唽
- if (btnGetVerificationCode.IsSelected && ValidPassword)
+ if (ValidPassword)
{
btnRegister.IsSelected = true;
}
@@ -299,56 +310,69 @@
{
if (btnGetVerificationCode.IsSelected)
{
- //鑾峰彇楠岃瘉鐮�
- var result = pm.GetPhoneRegisterVerCode(etAccount.Text.Trim());
- if (result.StateCode == "Success")
+ btnGetVerificationCode.IsSelected = false;
+ string account = etAccount.Text.Trim();
+ //鐭俊鍙戦�侀棿闅�60s
+ int time = 60;
+ new Thread(() =>
{
- //鐭俊鍙戦�侀棿闅�60s
- btnGetVerificationCode.IsSelected = false;
- int time = 60;
- new Thread(() =>
+ while (time > 0)
{
- while (time > 0)
+ time--;
+ Application.RunOnMainThread(() =>
{
- time--;
- Application.RunOnMainThread(() =>
- {
- btnGetVerificationCode.Text = time.ToString() + "s";
- });
- Thread.Sleep(1000);
+ btnGetVerificationCode.Text = time.ToString() + "s";
+ });
+ Thread.Sleep(1000);
+ }
+ Application.RunOnMainThread(() =>
+ {
+ //鍥炲鑾峰彇鐭俊鎸夐挳浜嬩欢
+ btnGetVerificationCode.IsSelected = true;
+ btnGetVerificationCode.TextID = StringId.GetVerificationCode;
+ });
+ })
+ { IsBackground = true }.Start();
+ new Thread(() =>
+ {
+ //鑾峰彇楠岃瘉鐮�
+ var result = pm.GetPhoneRegisterVerCode(account);
+ if (result.StateCode.ToUpper() == "SUCCESS")
+ {
+ }
+ 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 "Self:Net_Error":
+ tipString = Language.StringByID(StringId.NetworkAnomaly);
+ break;
+ case "ParameterOrEmpty":
+ if (registerType == 0)
+ tipString = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber);
+ else
+ tipString = Language.StringByID(StringId.PlsEntryCorrectEmailAddress);
+ break;
}
Application.RunOnMainThread(() =>
{
- //鍥炲鑾峰彇鐭俊鎸夐挳浜嬩欢
- btnGetVerificationCode.IsSelected = true;
- btnGetVerificationCode.TextID = StringId.GetVerificationCode;
+ new Tip()
+ {
+ CloseTime = 3,
+ Direction = AMPopTipDirection.None,
+ Text = tipString
+ }.Show(bodyView);
});
- })
- { IsBackground = true }.Start();
- }
- 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 "Self:Net_Error":
- tipString = Language.StringByID(StringId.NetworkAnomaly);
- break;
}
-
- new Tip()
- {
- CloseTime = 3,
- Direction = AMPopTipDirection.None,
- Text = tipString
- }.Show(bodyView);
- }
+ })
+ { IsBackground = true }.Start();
}
};
}
@@ -363,7 +387,7 @@
if (btnRegister.IsSelected)
{
waitPage = new Loading();
- new WaitPageMothed().LoadPage_WaitPage(LoadMethod_RegisterThread(), bodyView, waitPage);
+ new PublicAssmebly().LoadPage_WaitPage(LoadMethod_RegisterThread(), bodyView, waitPage);
}
};
}
@@ -384,12 +408,16 @@
//鏍￠獙楠岃瘉鐮�/娉ㄥ唽璐﹀彿
var validateSmsResult = pm.ValidataCodeAndRegister(account, password, entryPassword, verCode, 86);
//楠岃瘉鐮佹牎楠屾垚鍔�
- if (validateSmsResult.StateCode == "Success")
+ if (validateSmsResult.StateCode.ToUpper() == "SUCCESS")
{
//娉ㄥ唽鎴愬姛
//鎵ц鍥炶皟浜嬩欢
- this.Close();
- callbackAction?.Invoke(account);
+ //callbackAction?.Invoke(account);
+ Application.RunOnMainThread(() =>
+ {
+ this.Close();
+ LoadEvent_AutoLogin(account, password);
+ });
}
else//娉ㄥ唽澶辫触
{
@@ -405,6 +433,14 @@
case "ValidCodeAndPhoneNoEqual":
erorrInfo = Language.StringByID(StringId.VerificationCodeWrong);
break;
+ case "NoRecord":
+ erorrInfo = Language.StringByID(StringId.PlsGetTheVerificationCode);
+ Application.RunOnMainThread(() =>
+ {
+ btnVerificationCodeViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ btnVerificationCodeViewBottomLine.Height = Application.GetRealHeight(2);
+ });
+ break;
default:
erorrInfo = Language.StringByID(StringId.RegistrationFailedPleaseTryAgain);
break;
--
Gitblit v1.8.0