From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs
index 8147fd7..ae8adc4 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs
+++ b/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;
--
Gitblit v1.8.0