From e6a26ee148587327478d9a82624a820c907b6e16 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 04 十一月 2020 14:58:15 +0800
Subject: [PATCH] 20201104
---
HDL_ON/UI/UI1-Login/RegisterPageBLL.cs | 211 +++++++++++++++++++++++++++++-----------------------
1 files changed, 118 insertions(+), 93 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
index 859b7d6..d997321 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
@@ -46,7 +46,7 @@
}
else//閭娉ㄥ唽鑾峰彇楠岃瘉鐮佹寜閽敓鏁堟潯浠�
{
- if (!mFalg.Success )
+ if (!mFalg.Success)
{
btnGetVerificationCode_Mail.IsSelected = false;
}
@@ -68,10 +68,13 @@
//閫夋嫨鎵嬫満娉ㄥ唽
btnPhoneLogin.MouseUpEventHandler = (sender, e) =>
{
-#if DEBUG
- etAccount.Text = "17576024298";
-#endif
-
+ if(registerType == 0)
+ {
+ return;
+ }
+ etAccount.Text = registerPhone;
+ etPassword.Text = "";
+ etRepeatPassword.Text = "";
#region 鍒囨崲閫変腑鎸夐挳
btnGetVerificationCode_Mail.Visible = false;
btnGetVerificationCode_Phone.Visible = true;
@@ -95,10 +98,11 @@
//閫夋嫨閭娉ㄥ唽
btnEmailLogin.MouseUpEventHandler = (sender, e) =>
{
-
-#if DEBUG
- etAccount.Text = "979412578@qq.com";
-#endif
+ if (registerType == 1)
+ return;
+ etAccount.Text = registerEmail;
+ etPassword.Text = "";
+ etRepeatPassword.Text = "";
#region 鍒囨崲閫変腑鎸夐挳
btnGetVerificationCode_Mail.Visible = true;
btnGetVerificationCode_Phone.Visible = false;
@@ -153,7 +157,7 @@
btnGetVerificationCode_Phone.IsSelected = false;
new Tip()
{
- CloseTime = 3,
+ CloseTime = 1,
Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
Direction = AMPopTipDirection.None,
}.Show(bodyView);
@@ -185,7 +189,7 @@
btnGetVerificationCode_Mail.IsSelected = false;
new Tip()
{
- CloseTime = 3,
+ CloseTime = 1,
Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
Direction = AMPopTipDirection.None,
}.Show(bodyView);
@@ -204,6 +208,14 @@
}
}
}
+ if(accountType ==0)
+ {
+ registerPhone = etAccount.Text.Trim();
+ }
+ else
+ {
+ registerEmail = etAccount.Text.Trim();
+ }
}
};
@@ -218,16 +230,20 @@
else
{
if (etPassword.Text.Length == 0)
+ {
+ btnPasswordViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
+ btnPasswordViewBottomLine.Height = Application.GetRealHeight(1);
return;
+ }
//闇�瑕佽緭鍏�6浣嶄互涓婄殑瀵嗙爜
- if (etPassword.Text.Length < 6|| etPassword.Text.Length >13)
+ if (etPassword.Text.Length < 6 || etPassword.Text.Length > 13)
{
btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
new Tip()
{
- CloseTime = 3,
+ CloseTime = 1,
Direction = AMPopTipDirection.None,
Text = Language.StringByID(StringId.PlsRegisterPassword)
}.Show(bodyView);
@@ -250,8 +266,6 @@
}
else
{
- if (etRepeatPassword.Text.Length == 0)
- return;
btnRepeatPasswordViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
btnRepeatPasswordViewBottomLine.Height = Application.GetRealHeight(1);
//鏍￠獙涓ゆ杈撳叆鐨勫瘑鐮佹槸鍚︿竴鑷�
@@ -263,7 +277,7 @@
btnRepeatPasswordViewBottomLine.Height = Application.GetRealHeight(2);
new Tip()
{
- CloseTime = 3,
+ CloseTime = 1,
Direction = AMPopTipDirection.None,
Text = Language.StringByID(StringId.IncorrectRepeatPassword)
}.Show(bodyView);
@@ -310,14 +324,16 @@
/// </summary>
void LoadEvent_LimtPasswordLength()
{
- etPassword.TextChangeEventHandler = (sender, e) => {
- if(etPassword.Text.Length>16)
+ etPassword.TextChangeEventHandler = (sender, e) =>
+ {
+ if (etPassword.Text.Length > 16)
{
etPassword.Text = etPassword.Text.Remove(15);
}
};
- etRepeatPassword.TextChangeEventHandler = (sender, e) => {
+ etRepeatPassword.TextChangeEventHandler = (sender, e) =>
+ {
if (etRepeatPassword.Text.Length > 16)
{
etRepeatPassword.Text = etRepeatPassword.Text.Remove(15);
@@ -355,8 +371,8 @@
{
(sender as Button).IsSelected = false;
string account = etAccount.Text.Trim();
- //鐭俊鍙戦�侀棿闅�60s
- int time = 60;
+ //鐭俊鍙戦�侀棿闅�60s
+ int time = 60;
new Thread(() =>
{
while (time > 0)
@@ -370,16 +386,16 @@
}
Application.RunOnMainThread(() =>
{
- //鍥炲鑾峰彇鐭俊鎸夐挳浜嬩欢
- (sender as Button).IsSelected = true;
+ //鍥炲鑾峰彇鐭俊鎸夐挳浜嬩欢
+ (sender as Button).IsSelected = true;
(sender as Button).TextID = StringId.GetVerificationCode;
});
})
{ IsBackground = true }.Start();
new Thread(() =>
{
- //鑾峰彇楠岃瘉鐮�
- var result = pm.GetPhoneRegisterVerCode(account);
+ //鑾峰彇楠岃瘉鐮�
+ var result = pm.GetRegisterVerCode(account);
if (result.StateCode.ToUpper() == "SUCCESS")
{
}
@@ -389,7 +405,7 @@
switch (result.StateCode)
{
case "Exist":
- tipString = Language.StringByID(StringId.AccountAlreadyExists);
+ tipString = Language.StringByID(StringId.AccountAlreadyUse);
break;
case "SendFail":
tipString = Language.StringByID(StringId.FailedToSendVerificationCode);
@@ -408,7 +424,7 @@
{
new Tip()
{
- CloseTime = 3,
+ CloseTime = 1,
Direction = AMPopTipDirection.None,
Text = tipString
}.Show(bodyView);
@@ -430,6 +446,16 @@
{
btnRegister.MouseUpEventHandler = (sender, e) =>
{
+ if(etPassword.Text.Trim().Length > 13 || etPassword.Text.Trim().Length<6)
+ {
+ new Tip()
+ {
+ CloseTime = 1,
+ Direction = AMPopTipDirection.None,
+ Text = Language.StringByID(StringId.PlsRegisterPassword)
+ }.Show(bodyView);
+ return;
+ }
if (btnRegister.IsSelected)
{
waitPage = new Loading();
@@ -448,73 +474,72 @@
string entryPassword = etRepeatPassword.Text.Trim();
string verCode = etVerificationCode.Text.Trim();
return new Thread(() =>
- {
- try
- {
- //鏍￠獙楠岃瘉鐮�/娉ㄥ唽璐﹀彿
- var validateSmsResult = pm.ValidataCodeAndRegister(account, password, entryPassword, verCode, 86);
- //楠岃瘉鐮佹牎楠屾垚鍔�
- if (validateSmsResult.StateCode.ToUpper() == "SUCCESS")
- {
- //娉ㄥ唽鎴愬姛
- //鎵ц鍥炶皟浜嬩欢
- //callbackAction?.Invoke(account);
- Application.RunOnMainThread(() =>
- {
+ {
+ try
+ {
+ //鏍￠獙楠岃瘉鐮�/娉ㄥ唽璐﹀彿
+ var validateSmsResult = pm.ValidataCodeAndRegister(account, password, entryPassword, verCode, 86);
+ //楠岃瘉鐮佹牎楠屾垚鍔�
+ if (validateSmsResult.StateCode.ToUpper() == "SUCCESS")
+ {
+ //娉ㄥ唽鎴愬姛
+ //鎵ц鍥炶皟浜嬩欢
+ //callbackAction?.Invoke(account);
+ Application.RunOnMainThread(() =>
+ {
this.Close();
- LoadEvent_AutoLogin(account, password);
- });
- }
- else//娉ㄥ唽澶辫触
- {
- string erorrInfo = "";
- switch (validateSmsResult.StateCode)
- {
- case "Exist":
- erorrInfo = Language.StringByID(StringId.AccountAlreadyExists);
- break;
- case "PwdNoConfirm":
- erorrInfo = Language.StringByID(StringId.IncorrectRepeatPassword);
- break;
- 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;
- }
- Application.RunOnMainThread(() =>
- {
- new Tip()
- {
- CloseTime = 3,
- Direction = AMPopTipDirection.None,
- Text = erorrInfo,
- }.Show(bodyView);
- });
- }
- }
- catch (Exception ex)
- {
- MainPage.Log("Exception 1 : " + ex.Message);
- }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- waitPage.Hide();
- });
- }
- });
+ LoadEvent_AutoLogin(account, password);
+ });
+ }
+ else//娉ㄥ唽澶辫触
+ {
+ string erorrInfo = "";
+ switch (validateSmsResult.StateCode)
+ {
+ case "Exist":
+ erorrInfo = Language.StringByID(StringId.AccountAlreadyUse);
+ break;
+ case "PwdNoConfirm":
+ erorrInfo = Language.StringByID(StringId.IncorrectRepeatPassword);
+ break;
+ 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;
+ }
+ Application.RunOnMainThread(() =>
+ {
+ new Tip()
+ {
+ CloseTime = 1,
+ Direction = AMPopTipDirection.None,
+ Text = erorrInfo,
+ }.Show(bodyView);
+ });
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log("Exception 1 : " + ex.Message);
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ waitPage.Hide();
+ });
+ }
+ });
}
-
}
}
\ No newline at end of file
--
Gitblit v1.8.0