From f718d23a262a5a8e1241fdeaeb4153399f95e79d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 21 四月 2020 09:19:05 +0800
Subject: [PATCH] 20200421

---
 HDL_ON/UI/UI1-Login/LoginPageBLL.cs |  102 +++++++++++++++++++++++++--------------------------
 1 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 70526e5..b3399d7 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -33,7 +33,7 @@
         {
             btnGetVerificationCode.MouseUpEventHandler += (sender, e) =>
             {
-                if (!btnGetVerificationCode.IsSelected)
+                if (btnGetVerificationCode.IsSelected)
                 {
                     string phoneNumber = etAccount.Text.Trim();
                     if (string.IsNullOrEmpty(phoneNumber))
@@ -50,7 +50,7 @@
                         btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
                         return;
                     }
-                    if (!Regex.IsMatch(account, @"^[1]+\d{10}"))
+                    if (!Regex.IsMatch(account, @"^[1]+\d{10}") || (account.Length != 11))
                     {
                         var tip = new Tip()
                         {
@@ -64,12 +64,12 @@
                         btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
                         return;
                     }
-                    btnGetVerificationCode.IsSelected = true;
+                    btnGetVerificationCode.IsSelected = false ;
                     btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
                     int time = 60;
                     new Thread(() =>
                     {
-                        while (time < 0)
+                        while (time > 0)
                         {
                             time--;
                             Application.RunOnMainThread(() =>
@@ -80,7 +80,7 @@
                         }
                         Application.RunOnMainThread(() =>
                         {
-                            btnGetVerificationCode.IsSelected = false;
+                            btnGetVerificationCode.IsSelected = true;
                             btnGetVerificationCode.TextID = StringId.GetVerificationCode;
                         });
                     })
@@ -89,17 +89,12 @@
                     {
                         //鑾峰彇楠岃瘉鐮�
                         var result = pm.GetPhoneLoginVerCode(phoneNumber);
-                        if (result.StateCode == "SUCCESS")
+                        if (result.StateCode.ToUpper() == "SUCCESS")
                         {
                         }
                         //鐧诲綍澶辫触
                         else
                         {
-                            Application.RunOnMainThread(() =>
-                            {
-                                btnGetVerificationCode.IsSelected = false;
-                                btnGetVerificationCode.TextID = StringId.GetVerificationCode;
-                            });
                             string tipStr = "Sever erorr";
                             switch (result.StateCode.ToUpper())
                             {
@@ -136,13 +131,11 @@
                                 //鎻愮ず鍘熷洜
                                 var tip = new Tip()
                                 {
-
                                     Text = tipStr,
                                     CloseTime = 3,
                                     Direction = AMPopTipDirection.None
                                 };
                                 tip.Show(bodyView);
-                                btnGetVerificationCode.IsSelected = false;
                             });
                         }
                     })
@@ -168,7 +161,7 @@
                 #endregion
 
                 #region 鍒囨崲鐧诲綍鏂瑰紡鍙婂浘鏍�
-                logintType = 0;
+                loginType = 0;
                 if (btnAccountIcon.Parent != null)
                 {
                     btnAccountIcon.RemoveFromParent();
@@ -191,7 +184,7 @@
                 #endregion
 
                 #region 鍒囨崲鐧诲綍绫诲瀷鍙婂浘鏍�
-                logintType = 1;
+                loginType = 1;
                 if (btnGlobalRoaming.Parent != null)
                 {
                     btnGlobalRoaming.RemoveFromParent();
@@ -236,6 +229,7 @@
                     btnSwitchLoginMode.TextID = StringId.VerificationCodeLogin;
                     passwordView.AddChidren(btnVisiblePassword);
                     passwordView.AddChidren(btnDividingLineVertical_PasswordView2);
+                    etPassword.PlaceholderText = Language.StringByID(StringId.PlsEntryPassword);
                     passwordView.AddChidren(btnForgetPassword);
                     btnPasswordIcon.IsSelected = false;
                     if (btnGetVerificationCode.Parent != null)
@@ -248,6 +242,10 @@
                 //楠岃瘉鐮佺櫥褰�
                 else if (logintMode == 1)
                 {
+                    if (Regex.IsMatch(account, @"^[1]+\d{10}") && (account.Length == 11))
+                    {
+                        btnGetVerificationCode.IsSelected = true;
+                    }
                     btnSwitchLoginMode.TextID = StringId.PasswordLogin;
                     passwordView.AddChidren(btnGetVerificationCode);
                     etPassword.PlaceholderText = Language.StringByID(StringId.PlsEntryVerificationCode);
@@ -290,9 +288,9 @@
                     account = etAccount.Text.Trim();
                     if (account.Length == 0)
                         return;
-                    if (logintType == 0)
+                    if (loginType == 0)
                     {
-                        if (!Regex.IsMatch(account, @"^[1]+\d{10}"))
+                        if (!Regex.IsMatch(account, @"^[1]+\d{10}") || (account.Length != 11))
                         {
                             var tip = new Tip()
                             {
@@ -304,6 +302,13 @@
 
                             btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                             btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
+                        }
+                        else
+                        {
+                            if (btnGetVerificationCode.Text == Language.StringByID(StringId.GetVerificationCode))
+                            {
+                                btnGetVerificationCode.IsSelected = true;
+                            }
                         }
                     }
                     else
@@ -381,9 +386,9 @@
                     account = etAccount.Text.Trim();
                     password = etPassword.Text.Trim();
 
-                    if (logintType == 0)
+                    if (loginType == 0)
                     {
-                        if (!Regex.IsMatch(account, @"^[1]+\d{10}"))
+                        if (!Regex.IsMatch(account, @"^[1]+\d{10}") && (account.Length == 11))
                         {
                             var tip = new Tip()
                             {
@@ -466,9 +471,6 @@
 
                             Application.RunOnMainThread(() =>
                             {
-                                waitPage.RemoveFromParent();
-                                waitPage = null;
-
                                 //璺宠浆椤甸潰----
                                 MainPage.GoUserPage();
                             });
@@ -478,6 +480,18 @@
                 catch (Exception ex)
                 {
                     MainPage.Log($"LoginPage : {ex.Message}");
+                }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
+
+                    });
                 }
             })
             { IsBackground = true };
@@ -500,7 +514,7 @@
                 //璋冪敤鐧诲綍鎺ュ彛
                 loginResult = pm.LoginValidCode(account, password);
             }
-            if (loginResult.StateCode == "SUCCESS")
+            if (loginResult.StateCode.ToUpper() == "SUCCESS")
             {
                 var loginDataStr = Newtonsoft.Json.Linq.JObject.FromObject(loginResult.ResponseData);
 
@@ -532,6 +546,14 @@
                 string tipStr = "Sever erorr";
                 switch (loginResult.StateCode)
                 {
+                    case "ValidCodeAndPhoneNoEqual":
+                        tipStr = Language.StringByID(StringId.VerificationCodeError);
+                        Application.RunOnMainThread(() =>
+                        {
+                            btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+                            btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
+                        });
+                        break;
                     case "USERNAMEORPWDERROR":
                         tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
                         Application.RunOnMainThread(() =>
@@ -579,39 +601,16 @@
         {
             var result = false;
             var responsePack = pm.GetHomePager();
-            if (responsePack.StateCode == "Success")
-            {
-                var dataStr = Newtonsoft.Json.Linq.JObject.FromObject(responsePack.ResponseData);
-                //娌℃湁浣忓畢
-                if (dataStr.GetValue("PageData").ToString() == "[]")
-                {
 
-                }
-                else
-                {
-                    MainPage.LoginUser.regionList = new List<RegionInfoRes>();
-                    foreach (var jsonData in dataStr.GetValue("PageData"))
-                    {
-                        var homeJsonStr = Newtonsoft.Json.Linq.JObject.FromObject(jsonData);
-                        var home = new RegionInfoRes()
-                        {
-                            RegionID = homeJsonStr.GetValue("Id").ToString(),
-                            RegionName = homeJsonStr.GetValue("RegionName").ToString(),
-                            Name = homeJsonStr.GetValue("Name").ToString(),
-                            Address = homeJsonStr.GetValue("Address").ToString(),
-                        };
-                        MainPage.LoginUser.regionList.Add(home);
-                    }
-                    DB_ResidenceData.residenceData.residecenInfo = MainPage.LoginUser.regionList[0];
-                    DB_ResidenceData.residenceData.SaveResidenceData();
-                    MainPage.LoginUser.SaveUserInfo();
-                }
+
+            if (responsePack == "Success")
+            {
                 result = true;
             }
             else
             {
                 var tipStr = "Server erorr";
-                switch (responsePack.StateCode)
+                switch (responsePack)
                 {
                     case "NoLogin":
                         tipStr = Language.StringByID(StringId.InvalidLoginCertificate);
@@ -628,7 +627,6 @@
                     };
                     tip.Show(bodyView);
                 });
-
             }
             return result;
         }
@@ -689,4 +687,4 @@
             };
         }
     }
-}
+}
\ No newline at end of file

--
Gitblit v1.8.0