From 163777d8a2cb7cfa469f54a7042528870ebc10a3 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 09 十二月 2019 17:46:20 +0800 Subject: [PATCH] 一个新版本 --- ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 58 insertions(+), 2 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs index 2a07059..9a7efab 100755 --- a/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs +++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs @@ -282,6 +282,23 @@ /// <param name="mouseEventArgs"></param> private async void SendCode_MouseUpEventAsync(object sender, MouseEventArgs mouseEventArgs) { + if (CheckAccount(account) == false) + { + return; + } + //鍏堝垽鏂�2娆″瘑鐮佽緭鍏ユ槸鍚︿竴鑷� + if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim()) + { + errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency; + return; + } + + if (AccountLogic.Instance.CheckPwdLength(pwdRow.PasswrodET.Text.Trim()) == false) + { + errorBtn.TextID = R.MyInternationalizationString.ThePWDLengthError; + return; + } + (sender as Button).Enable = (sender as Button).IsSelected = false; CommonPage.Loading.Start(); try @@ -347,6 +364,35 @@ CommonPage.Loading.Hide(); } } + + + /// <summary> + /// CheckAccount + /// </summary> + /// <param name="accountStr"></param> + /// <returns></returns> + private bool CheckAccount(string accountStr) + { + errorBtn.Text = string.Empty; + if (phoneEmailForm.SelectedEmail.IsSelected) + { + if (AccountLogic.Instance.CheckEmail(accountStr) == false) + { + errorBtn.TextID = R.MyInternationalizationString.TheEmailError; + return false; + } + } + else + { + if (AccountLogic.Instance.CheckPhoneWithZone(accountStr, CommonPage.PhoneZoneStr) == false) + { + errorBtn.TextID = R.MyInternationalizationString.ThePhoneError; + return false; + } + } + return true; + } + #endregion #region 鈼� 纭淇敼__________________________ @@ -358,13 +404,23 @@ /// <param name="mouseEventArgs"></param> private async void Reset(object sender,MouseEventArgs mouseEventArgs) { + + if (CheckAccount(account) == false) + { + return; + } //鍏堝垽鏂�2娆″瘑鐮佽緭鍏ユ槸鍚︿竴鑷� if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim()) { - var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.TwoPasswordInconsistency), Language.StringByID(R.MyInternationalizationString.Confrim)); - alert.Show(); + errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency; return; } + if (AccountLogic.Instance.CheckPwdLength(pwdRow.PasswrodET.Text.Trim()) == false) + { + errorBtn.TextID = R.MyInternationalizationString.ThePWDLengthError; + return; + } + CommonPage.Loading.Start(); try { -- Gitblit v1.8.0