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 | 419 ++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 253 insertions(+), 166 deletions(-) diff --git a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs index 947b4f2..6996dec 100644 --- a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs +++ b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs @@ -14,27 +14,54 @@ /// </summary> void LoadEventList() { - LoadPage_SwitchLoginType(); + LoadPage_SwitchRegisterType(); LoadEvent_EditTextFcousChange(); LoadEvent_ChangeTextVisble(); LoadEvent_GetVerificationCode(); LoadEvent_Register(); + + LoadEvent_TextChange(); + //var areaCodeList = pm.GetAreaCode(); + } + /// <summary> + /// 鍔犺浇鏂囨湰鍙樺寲浜嬩欢 + /// </summary> + void LoadEvent_TextChange() + { + etAccount.TextChangeEventHandler += (sender, e) => + { + 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)) + { + btnGetVerificationCode.IsSelected = false; + } + else + { + if (btnGetVerificationCode.Text == Language.StringByID(StringId.GetVerificationCode)) + btnGetVerificationCode.IsSelected = true; + } + }; } /// <summary> /// 鍒囨崲娉ㄥ唽绫诲瀷 /// </summary> - void LoadPage_SwitchLoginType() + void LoadPage_SwitchRegisterType() { //閫夋嫨鎵嬫満娉ㄥ唽 btnPhoneLogin.MouseUpEventHandler += (sender, e) => { +#if DEBUG + etAccount.Text = "17576024298"; +#endif + #region 鍒囨崲閫変腑鎸夐挳 btnEmailLogin.TextColor = CSS_Color.PromptingColor1; btnEmailLogin.TextSize = CSS_FontSize.TextFontSize; btnPhoneLogin.TextColor = CSS_Color.MainColor; btnPhoneLogin.TextSize = CSS_FontSize.EmphasisFontSize_Secondary; - etAccount.PlaceholderText = Language.StringByID(R.InternationalizationString.PlsEntryCorrectMobilNeumber); + etAccount.PlaceholderText = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber); #endregion #region 鍒囨崲娉ㄥ唽鏂瑰紡鍙婂浘鏍� @@ -50,12 +77,16 @@ //閫夋嫨閭娉ㄥ唽 btnEmailLogin.MouseUpEventHandler += (sender, e) => { + +#if DEBUG + etAccount.Text = "979412578@qq.com"; +#endif #region 鍒囨崲閫変腑鎸夐挳 btnPhoneLogin.TextColor = CSS_Color.PromptingColor1; btnPhoneLogin.TextSize = CSS_FontSize.TextFontSize; btnEmailLogin.TextColor = CSS_Color.MainColor; btnEmailLogin.TextSize = CSS_FontSize.EmphasisFontSize_Secondary; - etAccount.PlaceholderText = Language.StringByID(R.InternationalizationString.PlsEntryEmailAddress); + etAccount.PlaceholderText = Language.StringByID(StringId.PlsEntryEmailAddress); #endregion #region 鍒囨崲娉ㄥ唽绫诲瀷鍙婂浘鏍� @@ -69,7 +100,6 @@ }; } - /// <summary> /// 鍔犺浇鏂囨湰妗嗙劍鐐瑰彉鍖栦簨浠� @@ -91,56 +121,66 @@ btnAccountViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor; btnAccountViewBottomLine.Height = Application.GetRealHeight(1); //鎵嬫満娉ㄥ唽-楠岃瘉鎵嬫満鍙风爜鏄惁姝g‘ - if (registerType == 0) + if (etAccount.Text.Trim().Length > 0) { - Regex reg = new Regex("^\\d+$"); - var mFalg = reg.Match(etAccount.Text.Trim()); - if (!mFalg.Success || (btnGlobalRoaming.Text == "+86" && etAccount.Text.Trim().Length != 11)) + if (registerType == 0) { - btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2; - btnAccountViewBottomLine.Height = Application.GetRealHeight(2); - new Tip() + + 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)) { - CloseTime = 3, - Text = Language.StringByID(R.InternationalizationString.PlsEntryCorrectMobilNeumber), - Direction = AMPopTipDirection.None, - }.Show(bodyView); - } - else - { - //鏍囪鎵嬫満鍙风爜鏈夋晥 - btnGetVerificationCode.IsSelected = true; - //璐﹀彿鏈夋晥銆佸瘑鐮佹湁鏁堛�侀獙璇佺爜杈撳叆浜嗭紝鎵嶈兘鐐瑰嚮娉ㄥ唽 - if (btnGetVerificationCode.IsSelected && ValidPassword && string.IsNullOrEmpty(etVerificationCode.Text.Trim())) + btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2; + btnAccountViewBottomLine.Height = Application.GetRealHeight(2); + new Tip() + { + CloseTime = 3, + Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber), + Direction = AMPopTipDirection.None, + }.Show(bodyView); + } + else { - btnRegister.IsSelected = true; + if (btnGetVerificationCode.Text == Language.StringByID(StringId.GetVerificationCode)) + { + //鏍囪鎵嬫満鍙风爜鏈夋晥 + btnGetVerificationCode.IsSelected = true; + } + //璐﹀彿鏈夋晥銆佸瘑鐮佹湁鏁堛�侀獙璇佺爜杈撳叆浜嗭紝鎵嶈兘鐐瑰嚮娉ㄥ唽 + if (btnGetVerificationCode.IsSelected && ValidPassword && !string.IsNullOrEmpty(etVerificationCode.Text.Trim())) + { + btnRegister.IsSelected = true; + } } } - } - else if (registerType == 1) - { - //閭娉ㄥ唽-楠岃瘉閭鏄惁姝g‘ - 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 || (btnGlobalRoaming.Text == "+86" && etAccount.Text.Trim().Length != 11)) + else if (registerType == 1) { - btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2; - btnAccountViewBottomLine.Height = Application.GetRealHeight(2); - new Tip() + //閭娉ㄥ唽-楠岃瘉閭鏄惁姝g‘ + 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) { - CloseTime = 3, - Text = Language.StringByID(R.InternationalizationString.PlsEntryCorrectEmailAddress), - Direction = AMPopTipDirection.None, - }.Show(bodyView); - } - else - { - //鏍囪鎵嬫満鍙风爜鏈夋晥 - btnGetVerificationCode.IsSelected = true; - //璐﹀彿鏈夋晥銆佸瘑鐮佹湁鏁堛�侀獙璇佺爜杈撳叆浜嗭紝鎵嶈兘鐐瑰嚮娉ㄥ唽 - if (btnGetVerificationCode.IsSelected && ValidPassword && string.IsNullOrEmpty(etVerificationCode.Text.Trim())) + btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2; + btnAccountViewBottomLine.Height = Application.GetRealHeight(2); + new Tip() + { + CloseTime = 3, + Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress), + Direction = AMPopTipDirection.None, + }.Show(bodyView); + } + else { - btnRegister.IsSelected = true; + if (btnGetVerificationCode.Text == Language.StringByID(StringId.GetVerificationCode)) + {//鏍囪鎵嬫満鍙风爜鏈夋晥 + btnGetVerificationCode.IsSelected = true; + } + //璐﹀彿鏈夋晥銆佸瘑鐮佹湁鏁堛�侀獙璇佺爜杈撳叆浜嗭紝鎵嶈兘鐐瑰嚮娉ㄥ唽 + if (btnGetVerificationCode.IsSelected && ValidPassword && string.IsNullOrEmpty(etVerificationCode.Text.Trim())) + { + btnRegister.IsSelected = true; + } } } } @@ -148,7 +188,8 @@ }; //瀵嗙爜鏂囨湰妗嗙劍鐐瑰彉鍖栦簨浠� - etPassword.FoucsChanged += (sender, e) => { + etPassword.FoucsChanged += (sender, e) => + { if (etPassword.Foucs) { btnPasswordViewBottomLine.BackgroundColor = CSS_Color.MainColor; @@ -156,23 +197,31 @@ } else { - btnPasswordViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor; - btnPasswordViewBottomLine.Height = Application.GetRealHeight(1); - //鏍¢獙瀵嗙爜鏄惁绗﹀悎瑕佹眰 - if (etPassword.Text.Trim().Length < 6) + //闇�瑕佽緭鍏�6浣嶄互涓婄殑瀵嗙爜 + if (etPassword.Text.Length < 6|| etPassword.Text.Length >13) { + + btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2; + btnPasswordViewBottomLine.Height = Application.GetRealHeight(2); + new Tip() { CloseTime = 3, Direction = AMPopTipDirection.None, - Text = Language.StringByID(R.InternationalizationString.IncorrectRepeatPassword) + Text = Language.StringByID(StringId.PlsRegisterPassword) }.Show(bodyView); + } + else + { + btnPasswordViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor; + btnPasswordViewBottomLine.Height = Application.GetRealHeight(1); } } }; //纭瀵嗙爜鏂囨湰妗嗙劍鐐瑰彉鍖栦簨浠� - etRepeatPassword.FoucsChanged += (sender, e) => { + etRepeatPassword.FoucsChanged += (sender, e) => + { if (etRepeatPassword.Foucs) { btnRepeatPasswordViewBottomLine.BackgroundColor = CSS_Color.MainColor; @@ -183,31 +232,35 @@ btnRepeatPasswordViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor; btnRepeatPasswordViewBottomLine.Height = Application.GetRealHeight(1); //鏍¢獙涓ゆ杈撳叆鐨勫瘑鐮佹槸鍚︿竴鑷� - if (etPassword.Text.Trim() != etRepeatPassword.Text.Trim()) + if (etPassword.Text.Trim().Length > 5) { - btnRepeatPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2; - btnRepeatPasswordViewBottomLine.Height = Application.GetRealHeight(2); - new Tip() + if (etPassword.Text.Trim() != etRepeatPassword.Text.Trim()) { - CloseTime = 3, - Direction = AMPopTipDirection.None, - Text = Language.StringByID(R.InternationalizationString.IncorrectRepeatPassword) - }.Show(bodyView); - } - else - { - ValidPassword = true; - //璐﹀彿鏈夋晥銆佸瘑鐮佹湁鏁堛�侀獙璇佺爜杈撳叆浜嗭紝鎵嶈兘鐐瑰嚮娉ㄥ唽 - if (btnGetVerificationCode.IsSelected && ValidPassword && string.IsNullOrEmpty(etVerificationCode.Text.Trim())) + btnRepeatPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2; + btnRepeatPasswordViewBottomLine.Height = Application.GetRealHeight(2); + new Tip() + { + CloseTime = 3, + Direction = AMPopTipDirection.None, + Text = Language.StringByID(StringId.IncorrectRepeatPassword) + }.Show(bodyView); + } + else { - btnRegister.IsSelected = true; + ValidPassword = true; + //璐﹀彿鏈夋晥銆佸瘑鐮佹湁鏁堛�侀獙璇佺爜杈撳叆浜嗭紝鎵嶈兘鐐瑰嚮娉ㄥ唽 + if (btnGetVerificationCode.IsSelected && ValidPassword && !string.IsNullOrEmpty(etVerificationCode.Text.Trim())) + { + btnRegister.IsSelected = true; + } } } } }; //楠岃瘉鐮佹枃鏈鐒︾偣鍙樺寲浜嬩欢 - etVerificationCode.FoucsChanged += (sender, e) => { + etVerificationCode.FoucsChanged += (sender, e) => + { if (etVerificationCode.Foucs) { btnVerificationCodeViewBottomLine.BackgroundColor = CSS_Color.MainColor; @@ -217,10 +270,10 @@ { btnVerificationCodeViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor; btnVerificationCodeViewBottomLine.Height = Application.GetRealHeight(1); - if (etVerificationCode.Text.Length > 4) + if (etVerificationCode.Text.Length > 1) { //璐﹀彿鏈夋晥銆佸瘑鐮佹湁鏁堛�侀獙璇佺爜杈撳叆浜嗭紝鎵嶈兘鐐瑰嚮娉ㄥ唽 - if (btnGetVerificationCode.IsSelected && ValidPassword && string.IsNullOrEmpty(etVerificationCode.Text.Trim())) + if (ValidPassword) { btnRegister.IsSelected = true; } @@ -235,12 +288,14 @@ void LoadEvent_ChangeTextVisble() { //瀵嗙爜鏂囨湰鍙鎬у彉鍖� - btnVisiblePassword.MouseUpEventHandler += (sender, e) => { + btnVisiblePassword.MouseUpEventHandler += (sender, e) => + { btnVisiblePassword.IsSelected = !btnVisiblePassword.IsSelected; etPassword.SecureTextEntry = !btnVisiblePassword.IsSelected; }; //閲嶅瀵嗙爜鏂囨湰鍙鎬у彉鍖� - btnRepeatVisiblePassword.MouseUpEventHandler += (sender, e) => { + btnRepeatVisiblePassword.MouseUpEventHandler += (sender, e) => + { btnRepeatVisiblePassword.IsSelected = !btnRepeatVisiblePassword.IsSelected; etRepeatPassword.SecureTextEntry = !btnRepeatVisiblePassword.IsSelected; }; @@ -251,15 +306,17 @@ /// </summary> void LoadEvent_GetVerificationCode() { - btnGetVerificationCode.MouseUpEventHandler += (sender, e) => { + btnGetVerificationCode.MouseUpEventHandler += (sender, e) => + { if (btnGetVerificationCode.IsSelected) { - //鐭俊鍙戦�侀棿闅�60s btnGetVerificationCode.IsSelected = false; + string account = etAccount.Text.Trim(); + //鐭俊鍙戦�侀棿闅�60s int time = 60; new Thread(() => { - while (time == 0) + while (time > 0) { time--; Application.RunOnMainThread(() => @@ -272,27 +329,50 @@ { //鍥炲鑾峰彇鐭俊鎸夐挳浜嬩欢 btnGetVerificationCode.IsSelected = true; + btnGetVerificationCode.TextID = StringId.GetVerificationCode; }); }) { IsBackground = true }.Start(); - //妫�鏌ユ墜鏈烘槸鍚﹀凡缁忚娉ㄥ唽 - var checkPhoneResult = pm.IsExistingAccount(etAccount.Text.Trim()); - //鎵嬫満鏈娉ㄥ唽 - if (checkPhoneResult.StateCode != HttpRequesResult.SUCCESS.ToString()) + new Thread(() => { //鑾峰彇楠岃瘉鐮� - pm.GetPhoneVerificationCode(etAccount.Text.Trim(), MainPage.Company); - } - else - { - //鎻愮ず鎵嬫満鍙风爜宸茬粡娉ㄥ唽 - new Tip() + var result = pm.GetPhoneRegisterVerCode(account); + if (result.StateCode.ToUpper() == "SUCCESS") { - CloseTime = 3, - Direction = AMPopTipDirection.None, - Text = Language.StringByID(R.InternationalizationString.AccountAlreadyExists) - }.Show(bodyView); - } + } + 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(() => + { + new Tip() + { + CloseTime = 3, + Direction = AMPopTipDirection.None, + Text = tipString + }.Show(bodyView); + }); + } + }) + { IsBackground = true }.Start(); } }; } @@ -304,84 +384,91 @@ { btnRegister.MouseUpEventHandler += (sender, e) => { - //鎵嬫満娉ㄥ唽 - if (registerType == 0) + if (btnRegister.IsSelected) { - //鏍¢獙楠岃瘉鐮� - var validateSmsResult = pm.ValidateSmsCode(etAccount.Text.Trim(), etVerificationCode.Text.Trim()); - //楠岃瘉鐮佹牎楠屾垚鍔� - if (validateSmsResult.StateCode == HttpRequesResult.SUCCESS.ToString()) - { - //娉ㄥ唽璐﹀彿 - var registerPhoneResult = pm.RegisterPhone(etAccount.Text.Trim(), etPassword.Text.Trim(), Language.CurrentLanguage); - if (registerPhoneResult.StateCode == HttpRequesResult.SUCCESS.ToString()) - { - //娉ㄥ唽鎴愬姛 - //鎵ц鍥炶皟浜嬩欢 - callbackAction?.Invoke(etAccount.Text.Trim()); - } - else - { - //娉ㄥ唽澶辫触 - new Tip() - { - CloseTime = 3, - Text = registerPhoneResult.ErrorInfo, - Direction = AMPopTipDirection.None, - }.Show(bodyView); - } - } - else - { - //楠岃瘉鐮佹牎楠屽け璐� - new Tip() - { - CloseTime = 3, - Direction = AMPopTipDirection.None, - Text = Language.StringByID(R.InternationalizationString.VerificationCodeWrong) - }.Show(bodyView); - } - } - else if(registerType == 1) - { - //閭娉ㄥ唽 - //鏍¢獙楠岃瘉鐮� - var validateSmsResult = pm.ValidateSmsCode(etAccount.Text.Trim(), etVerificationCode.Text.Trim()); - //楠岃瘉鐮佹牎楠屾垚鍔� - if (validateSmsResult.StateCode == HttpRequesResult.SUCCESS.ToString()) - { - //娉ㄥ唽璐﹀彿 - var registerPhoneResult = pm.RegisterPhone(etAccount.Text.Trim(), etPassword.Text.Trim(), Language.CurrentLanguage); - if (registerPhoneResult.StateCode == HttpRequesResult.SUCCESS.ToString()) - { - //娉ㄥ唽鎴愬姛 - //鎵ц鍥炶皟浜嬩欢 - callbackAction?.Invoke(etAccount.Text.Trim()); - } - else - { - //娉ㄥ唽澶辫触 - new Tip() - { - CloseTime = 3, - Text = registerPhoneResult.ErrorInfo, - Direction = AMPopTipDirection.None, - }.Show(bodyView); - } - } - else - { - //楠岃瘉鐮佹牎楠屽け璐� - new Tip() - { - CloseTime = 3, - Direction = AMPopTipDirection.None, - Text = Language.StringByID(R.InternationalizationString.VerificationCodeWrong) - }.Show(bodyView); - } + waitPage = new Loading(); + new PublicAssmebly().LoadPage_WaitPage(LoadMethod_RegisterThread(), bodyView, waitPage); } }; } + /// <summary> + /// 鍔犺浇娉ㄥ唽鏂规硶 + /// </summary> + Thread LoadMethod_RegisterThread() + { + string account = etAccount.Text.Trim(); + string password = etPassword.Text.Trim(); + 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(() => + { + 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(); + }); + } + }); + } + } -} +} \ No newline at end of file -- Gitblit v1.8.0