一个新的版本

黄学彪

2019-12-05 b3e96fce4cc01113128ddf8e0a18fc19594a9e56

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

@@ -83,6 +83,7 @@
        /// </summary>
        public AccountLogin()
        {
            CommonPage.Instance.IsDrawerLockMode = true;
            BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
            Tag = "Login";
        }
@@ -342,6 +343,11 @@
            {
                try
                {
                    if(CheckAccount(accountStr)==false)
                    {
                        return;
                    }

                    CommonPage.Loading.Start(Language.StringByID(R.MyInternationalizationString.Logining));

                    var requestObj = new SendDataToServer.LoginObj
@@ -459,6 +465,32 @@
                //});
            };
            action();
        }

        /// <summary>
        /// CheckAccount
        /// </summary>
        /// <param name="accountStr"></param>
        /// <returns></returns>
        private bool CheckAccount(string accountStr)
        {
            if (phoneEmailForm.SelectedEmail.IsSelected)
            {
                if (AccountLogic.Instance.CheckEmail(accountStr) == false)
                {
                    loginErrorBtn.TextID = R.MyInternationalizationString.TheEmailError;
                    return false;
                }
            }
            else
            {
                if (AccountLogic.Instance.CheckPhone(accountStr) == false)
                {
                    loginErrorBtn.TextID = R.MyInternationalizationString.ThePhoneError;
                    return false;
                }
            }
            return true;
        }

        /// <summary>
@@ -660,6 +692,7 @@
        {
            phoneEmailForm.SelectedPhone.IsSelected = phoneEmailForm.SelectedEmail.IsSelected = false;
            loginBtn.Enable = loginBtn.IsSelected = false;
            loginErrorBtn.Text = string.Empty;
            (sender as Button).IsSelected = true;
            if((sender as Button).Tag.ToString()=="Phone")
            {
@@ -695,8 +728,6 @@
            pwdRow = new PwdLoginRowForm();
            pwdRow.Init(accountPwdFrameLayout, 29, 225);
            pwdRow.PasswrodET.TextChangeEventHandler += Pwd_TextChange;


        }
        #endregion

@@ -724,7 +755,7 @@
        private void Register(object sender,MouseEventArgs mouseEventArgs)
        {
            var registerPage = new AccountRegister();
            Shared.Common.CommonPage.Instance.AddChidren(registerPage);
            CommonPage.Instance.AddChidren(registerPage);
            registerPage.Show();
        }

@@ -738,7 +769,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;
        }

        /// <summary>
@@ -748,7 +779,7 @@
        /// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
        private void Pwd_TextChange(object sender,string mouseEventArgs)
        {
            loginErrorBtn.Text = "";
            loginErrorBtn.Text = string.Empty;
            if (1 <= pwdRow.PasswrodET.Text.Trim().Length && pwdRow.PasswrodET.Text.Trim().Length <= 16 && (phoneRow.AccountET.Text.Trim().Length > 0 || emailRow.AccountET.Text.Trim().Length>0))
            {
                loginBtn.Enable = loginBtn.IsSelected = true;