代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -172,6 +172,7 @@
        {
            phoneEmailForm.SelectedPhone.IsSelected = phoneEmailForm.SelectedEmail.IsSelected = false;
            resetBtn.Enable = resetBtn.IsSelected = false;
            errorBtn.Text = string.Empty;
            (sender as Button).IsSelected = true;
            if ((sender as Button).Tag.ToString() == "Phone")
            {
@@ -330,10 +331,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
@@ -465,6 +466,10 @@
                        //操作失败
                        errorBtn.TextID = R.MyInternationalizationString.FAIL;
                    }
                    else if(stateStr == "NEWPASSWORDANDOLDPASSWORDEQUAL")
                    {
                        errorBtn.TextID = R.MyInternationalizationString.NEWPASSWORDANDOLDPASSWORDEQUAL;
                    }
                    else
                    {
                        errorBtn.TextID = R.MyInternationalizationString.RequestServerFailed;