合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

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

@@ -159,7 +161,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(registerBtn);

@@ -168,7 +172,7 @@
                Y = registerBtn.Bottom + Application.GetRealHeight(50),
                Width = Application.GetRealWidth(400),
                Height = Application.GetRealHeight(58),
                TextID = R.MyInternationalizationString.LoginByAccountPWD,
                TextID = R.MyInternationalizationString.LoginByAccountPWD_1,
                TextColor = ZigbeeColor.Current.GXCTextGrayColor,
                TextSize = CommonFormResouce.loginTextSize,
                Gravity=Gravity.CenterHorizontal
@@ -188,8 +192,9 @@
        private void SelectPhoneOrEmail_MouseUpEvent(object sender, MouseEventArgs mouseEventArgs)
        {
            phoneEmailForm.SelectedPhone.IsSelected = phoneEmailForm.SelectedEmail.IsSelected = false;
            phoneEmailForm.SelectedPhone.IsBold = phoneEmailForm.SelectedEmail.IsBold = false;
            registerBtn.Enable = registerBtn.IsSelected = false;
            (sender as Button).IsSelected = true;
            (sender as Button).IsSelected = (sender as Button).IsBold = true;
            account = string.Empty;
            errorBtn.Text = string.Empty;
            if ((sender as Button).Tag.ToString() == "Phone")
@@ -325,6 +330,10 @@
                    //验证码错误
                    errorBtn.TextID = R.MyInternationalizationString.VALIDCODEANDPHONENOEQUAL;
                }
                else if (stateCodeStr == "NORECORD")
                {
                    errorBtn.TextID = R.MyInternationalizationString.NORECORD;
                }
                else
                {
                    errorBtn.TextID = R.MyInternationalizationString.RequestServerFailed;