From 587c36e27131f2d028fcabc13b296a8de7470034 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 08 一月 2020 08:59:19 +0800
Subject: [PATCH] 2019.1.8
---
ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
index da5814b..ed300a9 100644
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
+++ b/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")
@@ -266,7 +271,6 @@
{
return;
}
- //鍏堝垽鏂�2娆″瘑鐮佽緭鍏ユ槸鍚︿竴鑷�
if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim())
{
errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency;
@@ -326,6 +330,10 @@
//楠岃瘉鐮侀敊璇�
errorBtn.TextID = R.MyInternationalizationString.VALIDCODEANDPHONENOEQUAL;
}
+ else if (stateCodeStr == "NORECORD")
+ {
+ errorBtn.TextID = R.MyInternationalizationString.NORECORD;
+ }
else
{
errorBtn.TextID = R.MyInternationalizationString.RequestServerFailed;
--
Gitblit v1.8.0