JLChen
2021-01-06 f60ce72c3c29c7d31a046795c88ec39a69e73d45
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs
@@ -226,8 +226,8 @@
            };
            btnOK.MouseUpEventHandler += (sender, e) => {
                var reg = new Regex ("^\\s*([A-Za-z0-9_-]+(\\.\\w+)*@(\\w+\\.)+\\w{2,5})\\s*$");
                var ss = reg.Match (etEmailAddress.Text);
                //var reg = new Regex ("^\\s*([A-Za-z0-9_-]+(\\.\\w+)*@(\\w+\\.)+\\w{2,5})\\s*$");
                //var ss = reg.Match (etEmailAddress.Text);
                string account = etEmailAddress.Text.Trim ();
                string passwordText = etPasswrod.Text.Trim ();
@@ -240,15 +240,25 @@
                } else if (regName.Match (userName).Success) {
                    new Alert ("", "Protect Your Illegal Characters in Name", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                    return;
                } else if (!ss.Success) {
                } else if (!CommonUtlis.Current.CheckEmail (account)) {
                    new Alert ("", Language.StringByID (R.MyInternationalizationString.PleaseCheckEmailAddressCorrectly),
                                                       Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                    return;
                } else if (etPasswrod.Text.Trim ().Length < 6) {
                    new Alert ("", Language.StringByID (R.MyInternationalizationString.PasswordLenghtTip), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                    return;
                } else if (etPasswrod.Text == "" && etConfirmPassword.Text == "") {
                }
                if (etPasswrod.Text == "" && etConfirmPassword.Text == "") {
                    new Alert ("", Language.StringByID (R.MyInternationalizationString.PleaseWriteTheCompleteContent), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                    return;
                } else if (passwordText.Contains(userName)) {
                    //密码不能包含用户名
                    new Alert ("", ErrorCode.PasswordNotUsername,
                               Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                    return;
                } else if (!CommonUtlis.Current.CheckPassword(etPasswrod.Text.Trim ())) {
                    new Alert ("", ErrorCode.PasswordStrengthNotMatch,
                               Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                    return;
                } else if (etPasswrod.Text.Trim () != etConfirmPassword.Text.Trim ()) {
                    new Alert ("", Language.StringByID (R.MyInternationalizationString.RepeatPasswordsDidNotmatch),
@@ -278,7 +288,7 @@
                            var requestObj = new YdRegisterAccountObj () { Account = account, Password = passwordText, Contact = userName, Language = Language.CurrentLanguage, Company = MainPage.SoftSmsType };
                            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
                            var revertObj = MainPage.RequestHttps (API.YdRegisterAccount, requestJson);
                            if (revertObj.StateCode.ToUpper() == "SUCCESS") {
                            if (revertObj.StateCode.ToUpper() == StateCode.SUCCESS) {
                                Application.RunOnMainThread (() => {
                                    new Alert ("", Language.StringByID (R.MyInternationalizationString.AuthenticationMail), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                                    Close ();