From c26d742cef5ac268ca902b6605512b6476a26bc2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 05 十二月 2019 15:22:27 +0800
Subject: [PATCH] 2019.12.5
---
ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
index 8d99dea..3cb3282 100644
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
@@ -432,6 +432,7 @@
{
accountCodeFrameLayout.RemoveAll();
account = string.Empty;
+ loginErrorBtn.Text = string.Empty;
if (phoneOrEmail == "Phone")
{
phoneRow = new PhoneRowForm();
@@ -460,7 +461,7 @@
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private void Account_TextChange(object sender, string mouseEventArgs)
{
- loginErrorBtn.Text = "";
+ loginErrorBtn.Text = string.Empty;
if ((sender as EditText).Text.Trim().Length > 0)
{
IsRightAccount = true;
@@ -540,9 +541,9 @@
private void Register(object sender, MouseEventArgs mouseEventArgs)
{
this.RemoveFromParent();
- var login = new AccountLogin();
- CommonPage.Instance.AddChidren(login);
- login.Show();
+ var registerPage = new AccountRegister();
+ CommonPage.Instance.AddChidren(registerPage);
+ registerPage.Show();
}
#endregion
@@ -569,6 +570,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
@@ -637,6 +643,34 @@
CommonPage.Loading.Hide();
}
}
+
+ /// <summary>
+ /// CheckAccount
+ /// </summary>
+ /// <param name="accountStr"></param>
+ /// <returns></returns>
+ private bool CheckAccount(string accountStr)
+ {
+ loginErrorBtn.Text = string.Empty;
+ if (phoneEmailForm.SelectedEmail.IsSelected)
+ {
+ if (AccountLogic.Instance.CheckEmail(accountStr) == false)
+ {
+ loginErrorBtn.TextID = R.MyInternationalizationString.TheEmailError;
+ return false;
+ }
+ }
+ else
+ {
+ if (AccountLogic.Instance.CheckPhoneWithZone(accountStr, CommonPage.PhoneZoneStr) == false)
+ {
+ loginErrorBtn.TextID = R.MyInternationalizationString.ThePhoneError;
+ return false;
+ }
+ }
+ return true;
+ }
+
#endregion
#region 鈼� 楠岃瘉楠岃瘉鐮乢_______________________
--
Gitblit v1.8.0