From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI1-Login/RegisterPageBLL.cs | 389 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 246 insertions(+), 143 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
index 1c8ae6d..4e2b8ce 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
@@ -24,6 +24,27 @@
LoadEvent_Server();
//var areaCodeList = pm.GetAreaCode();
}
+
+
+
+ /// <summary>
+ /// 浣胯兘淇敼娉ㄥ唽鎸夐挳
+ /// 鏈夊唴瀹规墠鏄剧ず娉ㄥ唽鎸夐挳
+ /// </summary>
+ void CheckEnableRegisterButton()
+ {
+ if (!string.IsNullOrEmpty(etAccount.Text) && !string.IsNullOrEmpty(etPassword.Text) && !string.IsNullOrEmpty(etVerificationCode.Text) && (etPassword.Text.Trim() == etRepeatPassword.Text.Trim()))
+ {
+ btnRegister.IsSelected = true;
+ }
+ else
+ {
+ btnRegister.IsSelected = false;
+ }
+
+ //Utlis.WriteLine(" btnRegister.IsSelected:" + btnRegister.IsSelected.ToString());
+ }
+
/// <summary>
/// 鍔犺浇鏂囨湰鍙樺寲浜嬩欢
/// </summary>
@@ -57,7 +78,12 @@
btnGetVerificationCode_Mail.IsSelected = true;
}
}
+ CheckEnableRegisterButton();
+ };
+ etVerificationCode.TextChangeEventHandler = (sender, e) =>
+ {
+ CheckEnableRegisterButton();
};
}
@@ -73,6 +99,13 @@
{
return;
}
+
+ if (!string.IsNullOrEmpty(etAccount.Text.Trim()))
+ {
+ //璁板綍涔嬪墠鐨勯偖绠�
+ registerEmail = etAccount.Text.Trim();
+ }
+
etAccount.IsNumberKeyboardType = true;
etAccount.Text = registerPhone;
etPassword.Text = "";
@@ -103,7 +136,13 @@
if (registerType == 1)
return;
+ if (!string.IsNullOrEmpty(etAccount.Text.Trim()))
+ {
+ //璁板綍涔嬪墠鐨勬墜鏈哄彿
+ registerPhone = etAccount.Text.Trim();
+ }
etAccount.IsNumberKeyboardType = false;
+ etAccount.SecureTextEntry = false;//2020-12-10 瑙ｅ喅Android鏁板瓧鍒囨崲鍥炶矾鏅�氶敭鐩樺彉鍔犲瘑闂
etAccount.Text = registerEmail;
etPassword.Text = "";
etRepeatPassword.Text = "";
@@ -139,14 +178,14 @@
{
if (etAccount.Foucs)
{
- btnAccountViewBottomLine.BackgroundColor = CSS_Color.MainColor;
- btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
+ HDLCommon.Current.BottomLineShowType(btnAccountViewBottomLine, BottomLineType.GotFocus);
}
else
{
+ if (isHitBack) return;//鐐瑰嚮杩斿洖鍏抽棴椤甸潰涓嶆娴嬫彁绀�
+
//鏍囪鎵嬫満鍙风爜鏃犳晥
- btnAccountViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
- btnAccountViewBottomLine.Height = Application.GetRealHeight(1);
+ HDLCommon.Current.BottomLineShowType(btnAccountViewBottomLine, BottomLineType.Normal);
//鎵嬫満娉ㄥ唽-楠岃瘉鎵嬫満鍙风爜鏄惁姝ｇ‘
if (etAccount.Text.Trim().Length > 0)
{
@@ -154,8 +193,7 @@
{
if (!Utlis.CheckPhoneNumber(etAccount.Text.Trim(), phoneZoneCode))
{
- btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
+ HDLCommon.Current.BottomLineShowType(btnAccountViewBottomLine, BottomLineType.Error);
btnGetVerificationCode_Phone.IsSelected = false;
new Tip()
{
@@ -183,8 +221,7 @@
//閭娉ㄥ唽-楠岃瘉閭鏄惁姝ｇ‘
if (!Utlis.CheckEmail(etAccount.Text.Trim()))
{
- btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
+ HDLCommon.Current.BottomLineShowType(btnAccountViewBottomLine, BottomLineType.Error);
btnGetVerificationCode_Mail.IsSelected = false;
new Tip()
{
@@ -207,14 +244,7 @@
}
}
}
- if (accountType == 0)
- {
- registerPhone = etAccount.Text.Trim();
- }
- else
- {
- registerEmail = etAccount.Text.Trim();
- }
+
}
};
@@ -223,23 +253,19 @@
{
if (etPassword.Foucs)
{
- btnPasswordViewBottomLine.BackgroundColor = CSS_Color.MainColor;
- btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
+ HDLCommon.Current.BottomLineShowType(btnPasswordViewBottomLine, BottomLineType.GotFocus);
}
else
{
- if (etPassword.Text.Length == 0)
- {
- btnPasswordViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
- btnPasswordViewBottomLine.Height = Application.GetRealHeight(1);
- return;
- }
+ if (isHitBack) return;//鐐瑰嚮杩斿洖鍏抽棴椤甸潰涓嶆娴嬫彁绀�
+
+ HDLCommon.Current.BottomLineShowType(btnPasswordViewBottomLine, BottomLineType.Normal);
+ if (etPassword.Text.Length == 0) return;//娌¤緭鍏ヤ笉妫�娴嬫彁绀�
+
//闇�瑕佽緭鍏�6浣嶄互涓婄殑瀵嗙爜
if (etPassword.Text.Length < 6 || etPassword.Text.Length > 13)
{
- btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
-
+ HDLCommon.Current.BottomLineShowType(btnPasswordViewBottomLine, BottomLineType.Error);
new Tip()
{
CloseTime = 1,
@@ -247,11 +273,7 @@
Text = Language.StringByID(StringId.PlsRegisterPassword)
}.Show(bodyView);
}
- else
- {
- btnPasswordViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
- btnPasswordViewBottomLine.Height = Application.GetRealHeight(1);
- }
+
}
};
@@ -260,25 +282,25 @@
{
if (etRepeatPassword.Foucs)
{
- btnRepeatPasswordViewBottomLine.BackgroundColor = CSS_Color.MainColor;
- btnRepeatPasswordViewBottomLine.Height = Application.GetRealHeight(2);
+ HDLCommon.Current.BottomLineShowType(btnRepeatPasswordViewBottomLine, BottomLineType.GotFocus);
}
else
{
- btnRepeatPasswordViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
- btnRepeatPasswordViewBottomLine.Height = Application.GetRealHeight(1);
+ if (isHitBack) return;//鐐瑰嚮杩斿洖鍏抽棴椤甸潰涓嶆娴嬫彁绀�
+
+ HDLCommon.Current.BottomLineShowType(btnRepeatPasswordViewBottomLine, BottomLineType.Normal);
//鏍￠獙涓ゆ杈撳叆鐨勫瘑鐮佹槸鍚︿竴鑷�
if (etPassword.Text.Trim().Length > 5)
{
if (etPassword.Text.Trim() != etRepeatPassword.Text.Trim())
{
- btnRepeatPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- btnRepeatPasswordViewBottomLine.Height = Application.GetRealHeight(2);
+ HDLCommon.Current.BottomLineShowType(btnRepeatPasswordViewBottomLine, BottomLineType.Error);
new Tip()
{
CloseTime = 1,
Direction = AMPopTipDirection.None,
- Text = Language.StringByID(StringId.IncorrectRepeatPassword)
+ Text = Language.StringByID(StringId.IncorrectRepeatPassword),
+ MaxWidth = Application.GetRealWidth(300),
}.Show(bodyView);
}
else
@@ -299,13 +321,13 @@
{
if (etVerificationCode.Foucs)
{
- btnVerificationCodeViewBottomLine.BackgroundColor = CSS_Color.MainColor;
- btnVerificationCodeViewBottomLine.Height = Application.GetRealHeight(2);
+ HDLCommon.Current.BottomLineShowType(btnVerificationCodeViewBottomLine, BottomLineType.GotFocus);
}
else
{
- btnVerificationCodeViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
- btnVerificationCodeViewBottomLine.Height = Application.GetRealHeight(1);
+ if (isHitBack) return;//鐐瑰嚮杩斿洖鍏抽棴椤甸潰涓嶆娴嬫彁绀�
+
+ HDLCommon.Current.BottomLineShowType(btnVerificationCodeViewBottomLine, BottomLineType.Normal);
if (etVerificationCode.Text.Length > 1)
{
//璐﹀彿鏈夋晥銆佸瘑鐮佹湁鏁堛�侀獙璇佺爜杈撳叆浜嗭紝鎵嶈兘鐐瑰嚮娉ㄥ唽
@@ -316,6 +338,7 @@
}
}
};
+
}
/// <summary>
@@ -329,6 +352,7 @@
{
etPassword.Text = etPassword.Text.Remove(15);
}
+ CheckEnableRegisterButton();
};
etRepeatPassword.TextChangeEventHandler = (sender, e) =>
@@ -337,6 +361,7 @@
{
etRepeatPassword.Text = etRepeatPassword.Text.Remove(15);
}
+ CheckEnableRegisterButton();
};
}
@@ -373,68 +398,91 @@
string account = etAccount.Text.Trim();
int time = 60;
+ //鍔犺浇Loading鏁堟灉
+ var waitPage = new Loading();
+ bodyView.AddChidren(waitPage);
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
+
new Thread(() =>
{
- //1.鍏堟鏌ヨ处鍙锋槸鍚︽敞鍐岃繃
- var result = pm.GetRegionByAccount(account);
- //2.璐﹀彿涓嶅瓨鍦紝鎵嶅厑璁哥户缁敞鍐�
- if (result.Code == StateCode.ACCOUNT_NOT_EXIST)
+ try
{
- //璐﹀彿涓嶅瓨鍦� 鏈敞鍐屽厑璁稿彂閫侀獙璇佺爜娉ㄥ唽
- Application.RunOnMainThread(() =>
+ //1.鍏堟鏌ヨ处鍙锋槸鍚︽敞鍐岃繃
+ var result = pm.GetRegionByAccount(account);
+ //2.璐﹀彿涓嶅瓨鍦紝鎵嶅厑璁哥户缁敞鍐�
+ if (result.Code == StateCode.ACCOUNT_NOT_EXIST)
{
- //鐭俊鍙戦�侀棿闅�60s
- (sender as Button).IsSelected = false;
+ //璐﹀彿涓嶅瓨鍦� 鏈敞鍐屽厑璁稿彂閫侀獙璇佺爜娉ㄥ唽
- });
- //2.1 寮�濮嬪�掕鏃�
- new Thread(() =>
- {
- while (time > 0)
+ //2.2 鑾峰彇楠岃瘉鐮�
+ ResponsePackNew resultObj;
+ if (registerType == 1)//閭
{
- time--;
+ resultObj = pm.VerificationCodeSend(VerifyType.REGISTER_USER, account);
+ }
+ else
+ {
+ resultObj = pm.VerificationCodeSend(VerifyType.REGISTER_USER, account, true, phoneZoneCode);
+ }
+
+ if (resultObj.Code != StateCode.SUCCESS)
+ {
+ // 鎻愮ず閿欒
+ IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
+ }
+ else
+ {
+ //2.1 寮�濮嬪�掕鏃�
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();
+ //鐭俊鍙戦�侀棿闅�60s
+ (sender as Button).IsSelected = false;
- //2.2 鑾峰彇楠岃瘉鐮�
- ResponsePackNew resultObj;
- if (registerType == 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();
+ }
+
+ }
+ else if (result.Code.ToUpper() == StateCode.SUCCESS)
{
- resultObj = pm.VerificationCodeSend(VerifyType.REGISTER_USER, account);
+ //3.鎻愮ず璐﹀彿宸插瓨鍦紝鏃犳硶閲嶅娉ㄥ唽
+ Utlis.ShowAlertOnMainThread(Language.StringByID(StringId.AccountAlreadyUse));
}
else
{
- resultObj = pm.VerificationCodeSend(VerifyType.REGISTER_USER, account, true, phoneZoneCode);
+ //4.鎻愮ず鍏跺畠寮傚父閿欒
+ IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
}
-
- if (resultObj.Code != StateCode.SUCCESS)
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
{
- // 鎻愮ず閿欒
- IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
- }
-
- }
- else if (result.Code.ToUpper() == StateCode.SUCCESS)
- {
- //3.鎻愮ず璐﹀彿宸插瓨鍦紝鏃犳硶閲嶅娉ㄥ唽
- Utlis.ShowAlertOnMainThread(Language.StringByID(StringId.AccountAlreadyUse));
- }
- else
- {
- //4.鎻愮ず鍏跺畠寮傚父閿欒
- IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ });
}
})
{ IsBackground = true }.Start();
@@ -496,20 +544,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)
{
//鍒ゆ柇鏄惁閫夋嫨浜嗘湇鍔″櫒锛岄�夋嫨浜嗘墠鑳藉彂閫侀獙璇佺爜
if (CheckIfSelectServer() == false) return;
+ //妫�娴嬭处鍙�
+ if (!CheckAccount()) return;
+ //妫�娴嬪瘑鐮�
+ if (!CheckPassword()) return;
+ //妫�娴嬮獙璇佺爜
+ if (!CheckVerificationCode()) return;
waitPage = new Loading();
new PublicAssmebly().LoadPage_WaitPage(LoadMethod_RegisterThread(), bodyView, waitPage);
@@ -540,7 +584,7 @@
//callbackAction?.Invoke(account);
Application.RunOnMainThread(() =>
{
- this.Close();
+ Close();
LoadEvent_AutoLogin(account, password);
});
}
@@ -549,40 +593,13 @@
// 鎻愮ず閿欒
IMessageCommon.Current.ShowErrorInfoAlter(validateSmsResult.Code);
- //2020-11-13 寰呬慨鏀�
- //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);
- //});
+ Application.RunOnMainThread(() =>
+ {
+ if (validateSmsResult.Code == StateCode.VERIFICATION_CODE_WRONG)
+ {
+ HDLCommon.Current.BottomLineShowType(btnVerificationCodeViewBottomLine, BottomLineType.Error);
+ }
+ });
}
}
catch (Exception ex)
@@ -594,6 +611,7 @@
Application.RunOnMainThread(() =>
{
waitPage.Hide();
+ waitPage.RemoveFromParent();
});
}
});
@@ -604,15 +622,19 @@
/// </summary>
void LoadEvent_Server()
{
+ //鍒ゆ柇涔嬪墠鏄惁閫夋嫨杩�
+ if (OnAppConfig.Instance.GlobalRegion != null && !string.IsNullOrEmpty(OnAppConfig.Instance.GlobalRegion.regionUrl))
+ {
+
+ SetServerText();
+ }
+
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
Action selectAction = () =>
{
//鏈嶅姟鍣ㄩ�夋嫨杩囨爣璁颁负true
- isSelectServer = true;
- ShowServerBottomLineState(false);
- btnServerText.TextColor = CSS_Color.FirstLevelTitleColor;
- btnServerText.Text = UserInfo.Current.GlobalRegion.regionName;
+ SetServerText();
};
new SelectServerDialog(selectAction).LoadPage();
@@ -646,14 +668,95 @@
{
if (isError)
{
- btnServerBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- btnServerBottomLine.Height = Application.GetRealHeight(2);
+ HDLCommon.Current.BottomLineShowType(btnServerBottomLine, BottomLineType.Error);
}
else
{
- btnServerBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
- btnServerBottomLine.Height = Application.GetRealHeight(1);
+ HDLCommon.Current.BottomLineShowType(btnServerBottomLine, BottomLineType.Normal);
}
}
+
+ /// <summary>
+ ///
+ /// </summary>
+ void SetServerText()
+ {
+ //鏈嶅姟鍣ㄩ�夋嫨杩囨爣璁颁负true
+ isSelectServer = true;
+ ShowServerBottomLineState(false);
+ btnServerText.TextColor = CSS_Color.FirstLevelTitleColor;
+ btnServerText.Text = OnAppConfig.Instance.GlobalRegion.regionName;
+ }
+
+
+ /// <summary>
+ /// 妫�娴嬭处鍙�
+ /// </summary>
+ /// <returns></returns>
+ bool CheckAccount()
+ {
+ //鎵嬫満鏂瑰紡-楠岃瘉鎵嬫満鍙风爜鏄惁姝ｇ‘
+ if (registerType == 0)
+ {
+ if (!Utlis.CheckPhoneNumber(etAccount.Text.Trim(), phoneZoneCode))
+ {
+ Utlis.ShowTip(Language.StringByID(StringId.PlsEntryCorrectMobilNeumber));
+ }
+ else
+ {
+ return true;
+ }
+
+ }
+ else if (registerType == 1)
+ {
+ //閭鏂瑰紡-楠岃瘉閭鏄惁姝ｇ‘
+ if (!Utlis.CheckEmail(etAccount.Text.Trim()))
+ {
+ Utlis.ShowTip(Language.StringByID(StringId.PlsEntryCorrectEmailAddress));
+ }
+ else
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /// <summary>
+ /// 妫�娴嬪瘑鐮佹槸鍚︽纭�
+ /// </summary>
+ /// <returns></returns>
+ bool CheckPassword()
+ {
+ //鏍￠獙瀵嗙爜鏄惁绗﹀悎瑕佹眰
+ if (etPassword.Text.Trim().Length < 6 || etPassword.Text.Trim().Length > 13)
+ {
+ Utlis.ShowTip(Language.StringByID(StringId.PasswordIsUnqualified));
+ return false;
+ }
+
+ if (etPassword.Text.Trim() != etRepeatPassword.Text.Trim())
+ {
+ Utlis.ShowTip(Language.StringByID(StringId.IncorrectRepeatPassword));
+ return false;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 妫�娴嬮獙璇佺爜鏄惁杈撳叆
+ /// </summary>
+ /// <returns></returns>
+ bool CheckVerificationCode()
+ {
+ if (string.IsNullOrEmpty(etVerificationCode.Text))
+ {
+ Utlis.ShowTip(Language.StringByID(StringId.PlsEntryVerificationCode));
+ return false;
+ }
+ return true;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0