From d41f1d4a478c1afcc43f3a5abb0ba76e376bc7c1 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 09 三月 2021 15:23:25 +0800
Subject: [PATCH] 2

---
 HDL_ON/UI/UI1-Login/LoginPageBLL.cs |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index c5a084d..03ce998 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -174,7 +174,7 @@
         /// <param name="type">鏄惁閫夋嫨鎵嬫満鐧诲綍</param>
         void LoginTypeChange(bool isPhone)
         {
-            if(isPhone)
+            if (isPhone)
             {
                 if (loginType == 0)
                     return;
@@ -598,7 +598,7 @@
                             if (verAccount == etPassword.Text.Trim())
                             {
                                 //璺宠浆椤甸潰----
-                                MainPage.GoUserPage();
+                                MainPage.GoUserPage(true);
                                 return;
                             }
                         });
@@ -629,8 +629,10 @@
                             //}
                             Application.RunOnMainThread(() =>
                             {
+                                //20201223-鐧诲綍鎴愬姛涔嬪悗锛屽皢涓嬭浇鏁版嵁瀹屾垚鏍囪鏍囪涓篺alse锛岄槻姝富椤垫彁鍓嶅姞杞�
+                                Common.ApiUtlis.Ins.DownloadDataComplete = false;
                                 //璺宠浆椤甸潰----
-                                MainPage.GoUserPage();
+                                MainPage.GoUserPage(true);
                             });
                         }
                         else
@@ -764,7 +766,7 @@
                     IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
                 });
 
-            
+
             }
             return result;
         }
@@ -790,7 +792,7 @@
 
                     var unlockDatetime = Utlis.UnixToDateTimeMS(revertData.unlockTime);
                     var unlockTimeInt = unlockDatetime.Minute - DateTime.Now.Minute;
-                    if(unlockTimeInt <= 0)
+                    if (unlockTimeInt <= 0)
                     {
                         unlockTimeInt = 1;
                     }
@@ -835,6 +837,9 @@
         {
             btnRegister.MouseUpEventHandler += (sender, e) =>
             {
+                //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
+                Application.HideSoftInput();
+
                 //鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
                 if (CheckPrivacyPolicy() == false) return;
 
@@ -849,6 +854,7 @@
                         MainPage.Log($"login callBackAction : {ex.Message}");
                     }
                 };
+
 
                 var registerPage = new RegisterPage(autoLoginAction);
                 registerPage.Show();
@@ -863,6 +869,9 @@
         {
             btnForgetPassword.MouseUpEventHandler += (sender, e) =>
             {
+                //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
+                Application.HideSoftInput();
+
                 //鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
                 if (CheckPrivacyPolicy() == false) return;
 
@@ -878,6 +887,7 @@
                         MainPage.Log($"login callBackAction : {ex.Message}");
                     }
                 };
+
                 var forgetPasswordDialog = new ForgetPasswordPage(autoLoginAction);
                 forgetPasswordDialog.Show();
                 forgetPasswordDialog.ShowDialog();

--
Gitblit v1.8.0