From f500e14c0a994487070380c50c85e0929cbc8e63 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 05 一月 2021 10:48:04 +0800
Subject: [PATCH] 2021-01-05 1.更新
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs | 74 ++++++++++++++++++++++++-------------
1 files changed, 48 insertions(+), 26 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
index dd9080a..5601ccf 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
@@ -57,8 +57,8 @@
logoView.AddChidren (btnLogo);
var accountView = new FrameLayout () {
- Width = Application.GetMinRealAverage (500),
- Height = Application.GetMinRealAverage (85),
+ Width = Application.GetRealWidth (500),
+ Height = Application.GetRealWidth (85),
X = Application.GetRealWidth (70),
Y = btnLogo.Bottom + Application.GetRealHeight (30),
BackgroundImagePath = "Register/Register_Email_Address.png",
@@ -114,10 +114,10 @@
};
var passwrodView = new FrameLayout () {
- Width = Application.GetMinRealAverage (500),
- Height = Application.GetMinRealAverage (85),
+ Width = Application.GetRealWidth (500),
+ Height = Application.GetRealWidth (85),
X = Application.GetRealWidth (70),
- Y = accountView.Bottom + Application.GetRealHeight (50),
+ Y = accountView.Bottom + Application.GetRealWidth (50),
BackgroundImagePath = "Register/Register_Password_kuang.png",
};
bodyView.AddChidren (passwrodView);
@@ -140,9 +140,9 @@
Button btnShowPassword = new Button () {
X = etPasswrod.Right,
- Y = etPasswrod.Y + Application.GetRealHeight (12),
+ Y = etPasswrod.Y + Application.GetRealWidth (12),
Width = Application.GetRealWidth (73),
- Height = Application.GetRealHeight (60),
+ Height = Application.GetRealWidth (60),
UnSelectedImagePath = "CrabtreeAdd/HidePW.png",
SelectedImagePath = "CrabtreeAdd/ShowPW.png",
BorderColor = SkinStyle.Current.Transparent,
@@ -155,19 +155,19 @@
etPasswrod.SecureTextEntry = !btnShowPassword.IsSelected;
};
-#if DEBUG
- int NigelLoginPass = 0;
- btnLogo.MouseUpEventHandler += (sender, e) => {
- if (NigelLoginPass == 3) {
- etAccount.Text = @"464027401@qq.com";
- etPasswrod.Text = "qqqqqq";
- } else if (NigelLoginPass == 5) {
- etAccount.Text = @"Jai.singh@havells.com";
- etPasswrod.Text = "123456";
- }
- NigelLoginPass++;
- };
-#endif
+//#if DEBUG
+// int NigelLoginPass = 0;
+// btnLogo.MouseUpEventHandler += (sender, e) => {
+// if (NigelLoginPass == 3) {
+// etAccount.Text = @"464027401@qq.com";
+// etPasswrod.Text = "qqqqqq";
+// } else if (NigelLoginPass == 5) {
+// etAccount.Text = @"Jai.singh@havells.com";
+// etPasswrod.Text = "123456";
+// }
+// NigelLoginPass++;
+// };
+//#endif
//if (accountList.Count > 0) {
// etAccount.Text = accountList [accountList.Count-1];
//}
@@ -182,9 +182,9 @@
Button btnRegister = new Button () {
Width = Application.GetRealWidth (200),
- Height = Application.GetRealHeight (85),
+ Height = Application.GetRealWidth (85),
X = Application.GetRealWidth (70),
- Y = passwrodView.Bottom + Application.GetRealHeight (10),
+ Y = passwrodView.Bottom + Application.GetRealWidth (10),
Text = "Sign up",
TextSize = 15,
TextColor = SkinStyle.Current.TextColor1,
@@ -198,9 +198,9 @@
Button btnForgotPassword = new Button () {
Width = Application.GetRealWidth (500 / 2),
- Height = Application.GetRealHeight (85),
+ Height = Application.GetRealWidth (85),
X = btnRegister.Right + Application.GetRealWidth (50),
- Y = passwrodView.Bottom + Application.GetRealHeight (10),
+ Y = passwrodView.Bottom + Application.GetRealWidth (10),
Text = "Forgot password?",
TextSize = 15,
TextColor = SkinStyle.Current.TextColor1,
@@ -214,9 +214,9 @@
Button btnLogin = new Button () {
Width = Application.GetRealWidth (504),
- Height = Application.GetRealHeight (89),
+ Height = Application.GetRealWidth (89),
X = Application.GetRealWidth (60),
- Y = btnRegister.Bottom + Application.GetRealHeight (70),
+ Y = btnRegister.Bottom + Application.GetRealWidth (70),
BackgroundColor = SkinStyle.Current.MainColor,
SelectedBackgroundColor = SkinStyle.Current.SelectedColor,
TextID = R.MyInternationalizationString.Login,
@@ -247,12 +247,27 @@
});
return;
}
+
+ //閭鏍煎紡涓嶅
+ if (!CommonUtlis.Current.CheckEmail(account)) {
+ Application.RunOnMainThread (() => {
+ new Tip () { Text = Language.StringByID (R.MyInternationalizationString.PleaseCheckEmailAddressCorrectly), Direction = AMPopTipDirection.Up, CloseTime = 3 }.Show (btnLogo);
+ });
+ return;
+ }
+
if (string.IsNullOrEmpty (password)) {
Application.RunOnMainThread (() => {
new Tip () { Text = "Please enter your password.", Direction = AMPopTipDirection.Up, CloseTime = 3 }.Show (btnLogo);
});
return;
}
+
+ //妫�娴嬭处鍙锋槸鍚﹂攣瀹�
+ if (CommonConfig.Current.CheckIfLock (account)) {
+ return;
+ }
+
System.Threading.Tasks.Task.Run (() => {
try {
Application.RunOnMainThread (() => {
@@ -565,6 +580,10 @@
else if (stateCodeStr == "USERNAMEORPWDERROR") {
//璐﹀彿鎴栧瘑鐮侀敊璇�
mes = ErrorCode.USERNAMEORPWDERROR;
+ if (CommonConfig.Current.ErrorLockListUpdate (account)) {
+ return;
+ }
+
} else if (stateCodeStr == "ACCOUNTNOEXISTS") {
//璐﹀彿涓嶅瓨鍦�
mes = ErrorCode.ACCOUNTNOEXISTS;
@@ -636,6 +655,9 @@
}
+
+
+
///// <summary>
///// 鏌ヨ褰撳墠浣忓畢 缃戝叧鍒楄〃
///// </summary>
--
Gitblit v1.8.0