From eb424d24e39bab4a245725f35deab3f234ea0f13 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 13 十二月 2019 10:48:50 +0800
Subject: [PATCH] 2019.12.13
---
ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs
index 2a07059..9d5bd88 100644
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs
@@ -172,6 +172,7 @@
{
phoneEmailForm.SelectedPhone.IsSelected = phoneEmailForm.SelectedEmail.IsSelected = false;
resetBtn.Enable = resetBtn.IsSelected = false;
+ errorBtn.Text = string.Empty;
(sender as Button).IsSelected = true;
if ((sender as Button).Tag.ToString() == "Phone")
{
@@ -241,7 +242,7 @@
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private void Account_TextChange(object sender, string mouseEventArgs)
{
- errorBtn.Text = "";
+ errorBtn.Text = string.Empty;
if ((sender as EditText).Text.Trim().Length > 0)
{
@@ -261,7 +262,7 @@
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private void Code_TextChange(object sender, string mouseEventArgs)
{
- errorBtn.Text = "";
+ errorBtn.Text = string.Empty;
if ((sender as EditText).Text.Trim().Length > 0)
{
resetBtn.Enable = resetBtn.IsSelected = true;
@@ -282,6 +283,11 @@
/// <param name="mouseEventArgs"></param>
private async void SendCode_MouseUpEventAsync(object sender, MouseEventArgs mouseEventArgs)
{
+ if (CheckAccount(account) == false)
+ {
+ return;
+ }
+
(sender as Button).Enable = (sender as Button).IsSelected = false;
CommonPage.Loading.Start();
try
@@ -347,6 +353,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 +393,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