From 3c9ad99d4a5eeeb53f7380315197e7133f84d10c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 27 十月 2020 14:57:33 +0800
Subject: [PATCH] 2020-10-27 1V2.510271 1.密码规则修改,修改为:密码必须为8-20个字符,包含字母、数字和符号。 2.APP本地增加登录,密码错误锁定,连续错误5次登录锁定,锁定5分钟。 3.登录界面,增加登录账号的邮箱格式匹配检测。 4.增加iOS越狱和Androidr Root检测,强制关闭APP。

---
 Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs |   52 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
index dd9080a..5b5d836 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
@@ -141,8 +141,8 @@
             Button btnShowPassword = new Button () {
                 X = etPasswrod.Right,
                 Y = etPasswrod.Y + Application.GetRealHeight (12),
-                Width = Application.GetRealWidth (73),
-                Height = Application.GetRealHeight (60),
+                Width = Application.GetMinRealAverage (73),
+                Height = Application.GetMinRealAverage (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];
             //}
@@ -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