2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

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

@@ -139,6 +139,8 @@
                Height = Application.GetRealHeight(58),
                TextColor = ZigbeeColor.Current.GXCTextRed,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = CommonFormResouce.TextSize,
                IsBold = true
            };
            bodyFrameLayout.AddChidren(errorBtn);

@@ -155,7 +157,9 @@
                BackgroundColor = ZigbeeColor.Current.GXCButtonUnSelectedColor,
                Radius = (uint)Application.GetRealHeight(127 / 2),
                Enable = !string.IsNullOrEmpty(codeRow.VerificationCodeET?.Text),
                IsSelected = !string.IsNullOrEmpty(codeRow.VerificationCodeET?.Text)
                IsSelected = !string.IsNullOrEmpty(codeRow.VerificationCodeET?.Text),
                TextSize = 16,
                IsBold = true,
            };
            bodyFrameLayout.AddChidren(resetBtn);
        }
@@ -171,8 +175,10 @@
        private void SelectPhoneOrEmail_MouseUpEvent(object sender, MouseEventArgs mouseEventArgs)
        {
            phoneEmailForm.SelectedPhone.IsSelected = phoneEmailForm.SelectedEmail.IsSelected = false;
            phoneEmailForm.SelectedPhone.IsBold = phoneEmailForm.SelectedEmail.IsBold = false;
            resetBtn.Enable = resetBtn.IsSelected = false;
            (sender as Button).IsSelected = true;
            errorBtn.Text = string.Empty;
            (sender as Button).IsSelected = (sender as Button).IsBold = true;
            if ((sender as Button).Tag.ToString() == "Phone")
            {
                AddPhoneOrEmailFL(accountCodeFL, "Phone");
@@ -241,7 +247,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 +267,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;
@@ -284,18 +290,6 @@
        {
            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;
            }

@@ -342,10 +336,10 @@
                    errorBtn.TextID = R.MyInternationalizationString.SENDFAIL;
                    (sender as Button).Enable = (sender as Button).IsSelected = true;
                }
                else if (stateCodeStr == "EXIST")
                else if (stateCodeStr == "ACCOUNTNOEXISTS")
                {
                    //账号存在
                    errorBtn.TextID = R.MyInternationalizationString.AccountHasBeenRegistered;
                    //账号不存在
                    errorBtn.TextID = R.MyInternationalizationString.ACCOUNTNOEXISTS;
                    (sender as Button).Enable = (sender as Button).IsSelected = true;
                }
                else
@@ -464,24 +458,24 @@
                    }
                    else if (stateStr == "PARAMETEROREMPTY")
                    {
                        //提供的参数错误
                        errorBtn.TextID = R.MyInternationalizationString.PARAMETEROREMPTY;
                    }
                    else if (stateStr == "ACCOUNTNOEXISTS")
                    {
                        //账号不存在
                        errorBtn.TextID = R.MyInternationalizationString.ACCOUNTNOEXISTS;
                    }
                    else if (stateStr == "FAIL")
                    {
                        //操作失败
                        errorBtn.TextID = R.MyInternationalizationString.FAIL;
                    }
                    else if(stateStr == "NEWPASSWORDANDOLDPASSWORDEQUAL")
                    {
                        errorBtn.TextID = R.MyInternationalizationString.NEWPASSWORDANDOLDPASSWORDEQUAL;
                    }
                    else
                    {
                        errorBtn.TextID = R.MyInternationalizationString.RequestServerFailed;
                    }

                }
                else if (stateCodeStr == "PARAMETEROREMPTY")
                {
@@ -493,6 +487,11 @@
                    //验证码错误
                    errorBtn.TextID = R.MyInternationalizationString.VALIDCODEANDPHONENOEQUAL;
                }
                else if (stateCodeStr == "NORECORD")
                {
                    errorBtn.TextID = R.MyInternationalizationString.NORECORD;
                }

                else
                {
                    errorBtn.TextID = R.MyInternationalizationString.RequestServerFailed;