一个新的版本

黄学彪

2019-12-05 b3e96fce4cc01113128ddf8e0a18fc19594a9e56

 ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs

@@ -87,6 +87,7 @@
        /// </summary>
        public AccountLoginByCode()
        {
            CommonPage.Instance.IsDrawerLockMode = true;
            Tag = "Login";
            BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
            t = new Timer();
@@ -430,7 +431,8 @@
        private void AddPhoneOrEmailFL(FrameLayout accountCodeFrameLayout, string phoneOrEmail)
        {
            accountCodeFrameLayout.RemoveAll();

            account = string.Empty;
            loginErrorBtn.Text = string.Empty;
            if (phoneOrEmail == "Phone")
            {
                phoneRow = new PhoneRowForm();
@@ -459,11 +461,12 @@
        /// <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;
                codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = true;
                account= (sender as EditText).Text.Trim();
            }
            else
            {
@@ -538,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
@@ -567,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
@@ -635,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 ◆ 验证验证码________________________