From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
index 54e7481..7747c86 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
@@ -167,12 +167,14 @@
Width = Application.GetRealWidth(300),
Gravity = Gravity.CenterHorizontal,
TextID = R.MyInternationalizationString.AppName,
- TextColor = ZigbeeColor.Current.GXCTextWhiteColor
+ TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
+ TextSize=16
};
midFrameLayout.AddChidren(logoName);
phoneEmailForm = new PhoneEmailForm();
phoneEmailForm.Init(midFrameLayout);
+
//閿欒鎻愮ずBtn
loginErrorBtn = new Button()
@@ -183,6 +185,8 @@
Height = Application.GetRealHeight(58),
TextColor = ZigbeeColor.Current.GXCTextRed,
TextAlignment = TextAlignment.CenterLeft,
+ TextSize=CommonFormResouce.TextSize,
+ IsBold=true
};
midFrameLayout.AddChidren(loginErrorBtn);
@@ -205,7 +209,7 @@
Y = Application.GetRealHeight(1198),
Width = Application.GetRealWidth(250),
Height = Application.GetRealHeight(58),
- TextID = R.MyInternationalizationString.ForgotPWD,
+ TextID = R.MyInternationalizationString.ForgotPWD_1,
TextSize = CommonFormResouce.loginTextSize,
TextColor = Shared.Common.ZigbeeColor.Current.GXCTextGrayColor,
TextAlignment = TextAlignment.CenterRight
@@ -219,14 +223,15 @@
Height = Application.GetRealHeight(127),
Gravity = Gravity.CenterHorizontal,
TextID = R.MyInternationalizationString.Login,
- TextSize = 15,
+ TextSize = 16,
TextColor = ZigbeeColor.Current.GXCTextGrayColor,
SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
SelectedBackgroundColor = ZigbeeColor.Current.GXCButtonBlackSelectedColor,
BackgroundColor = ZigbeeColor.Current.GXCButtonUnSelectedColor,
Radius = (uint)Application.GetRealHeight(127 / 2),
Enable = !string.IsNullOrEmpty(pwdRow.PasswrodET?.Text),
- IsSelected = !string.IsNullOrEmpty(pwdRow.PasswrodET?.Text)
+ IsSelected = !string.IsNullOrEmpty(pwdRow.PasswrodET?.Text),
+ IsBold=true
};
midFrameLayout.AddChidren(loginBtn);
@@ -280,6 +285,16 @@
#endregion
BindEvent();
+
+ if (string.IsNullOrEmpty(account) == false && AccountLogic.Instance.CheckEmail(account) == true)
+ {
+ SelectPhoneOrEmail_MouseUpEvent(phoneEmailForm.SelectedEmail, null);
+ this.account = string.Empty;
+ }
+ else
+ {
+ this.account = string.Empty;
+ }
}
#endregion
@@ -695,8 +710,6 @@
}
}
-
-
/// <summary>
/// phone/email 閫夋嫨
/// </summary>
@@ -705,9 +718,10 @@
private void SelectPhoneOrEmail_MouseUpEvent(object sender, MouseEventArgs mouseEventArgs)
{
phoneEmailForm.SelectedPhone.IsSelected = phoneEmailForm.SelectedEmail.IsSelected = false;
+ phoneEmailForm.SelectedPhone.IsBold = phoneEmailForm.SelectedEmail.IsBold = false;
loginBtn.Enable = loginBtn.IsSelected = false;
loginErrorBtn.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(accountPwdFL, "Phone");
@@ -794,7 +808,7 @@
private void Pwd_TextChange(object sender,string mouseEventArgs)
{
loginErrorBtn.Text = string.Empty;
- if (1 <= pwdRow.PasswrodET.Text.Trim().Length && pwdRow.PasswrodET.Text.Trim().Length <= 16 && (phoneRow.AccountET.Text.Trim().Length > 0 || emailRow.AccountET.Text.Trim().Length>0))
+ if (1 <= pwdRow.PasswrodET.Text.Trim().Length && pwdRow.PasswrodET.Text.Trim().Length <= 16 && (phoneRow.AccountET.Text.Trim().Length > 0 || emailRow?.AccountET.Text.Trim().Length>0))
{
loginBtn.Enable = loginBtn.IsSelected = true;
}
@@ -802,7 +816,7 @@
{
pwdRow.PasswrodET.Text = mouseEventArgs.Remove(16);
}
- else if (pwdRow.PasswrodET.Text.Trim().Length > 16 && phoneRow.AccountET.Text.Trim().Length > 0)
+ else if (pwdRow.PasswrodET.Text.Trim().Length > 16 && (phoneRow.AccountET.Text.Trim().Length > 0 || emailRow?.AccountET.Text.Trim().Length > 0))
{
loginBtn.Enable = loginBtn.IsSelected = true;
pwdRow.PasswrodET.Text = mouseEventArgs.Remove(16);
--
Gitblit v1.8.0