合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

 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,9 +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;
            errorBtn.Text = string.Empty;
            (sender as Button).IsSelected = true;
            (sender as Button).IsSelected = (sender as Button).IsBold = true;
            if ((sender as Button).Tag.ToString() == "Phone")
            {
                AddPhoneOrEmailFL(accountCodeFL, "Phone");
@@ -453,17 +458,14 @@
                    }
                    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")
@@ -474,7 +476,6 @@
                    {
                        errorBtn.TextID = R.MyInternationalizationString.RequestServerFailed;
                    }

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

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