From 330e3ae4cdd1e9facb14b6ea2b3e609166c04fd3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 12 一月 2021 16:00:27 +0800
Subject: [PATCH] 2021-1-12-1

---
 HDL_ON/UI/UI1-Login/LoginPageBLL.cs |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index c5a084d..63c32fc 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -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
@@ -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