From f77a3add1e7ab266e473da9128bbe5758ba3a890 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 20 十二月 2020 19:29:03 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL

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

diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 50bde1c..eb24336 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -725,8 +725,7 @@
                 //鑾峰彇鐢ㄦ埛淇℃伅
                 new Thread(() =>
                 {
-                    pm.GetUserHeadImage(revertData.userId);
-                    pm.GetUserInfo(false);
+                    pm.GetUserInfo();
                 })
                 { IsBackground = true }.Start();
             }
@@ -736,6 +735,8 @@
                 //璐﹀彿鎴栬�呭瘑鐮侀敊璇�
                 Application.RunOnMainThread(() =>
                 {
+                    waitPage.Hide();
+
                     if (loginResult.Code == "10008")
                     {
                         //鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒
@@ -753,10 +754,16 @@
                         btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                         btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
                     }
-                    waitPage.Hide();
+                    else if (loginResult.Code == "10019")
+                    {
+                        var tipStr = Language.StringByID(StringId.AccountLoginLock) + "\r\n" + Language.StringByID(StringId.PleaseTryToForgetPassword);
+                        Utlis.ShowTip(tipStr);
+                        return;
+                    }
+                    IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
                 });
 
-                IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
+            
             }
             return result;
         }

--
Gitblit v1.8.0