From c9a987ced5454cfc6b9363eadcad038191706f5b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 12 十二月 2020 16:37:09 +0800
Subject: [PATCH] 2020-12-12 1.解锁设置优化

---
 HDL_ON/UI/UI0-Public/AppUnlockPage.cs |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
index 2fcd6b6..4edda15 100644
--- a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
+++ b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
@@ -9,7 +9,8 @@
     {
         void LoadOption()
         {
-            if ( UserInfo.Current == null)
+            //2020-12-12 鏈櫥褰曟垨鑰匒PP鏈惎鍔ㄩ兘杩斿洖锛岃В鍐抽棯閫�闂
+            if ( UserInfo.Current == null || !UserInfo.Current.IsLogin || MainPage.BasePageView == null)
             {
                 return;
             }
@@ -59,7 +60,7 @@
             else if (UserInfo.Current.appUnlockType.Contains("4"))
             {
                 //Face ID楠岃瘉
-                //
+                //2020-12-11 寰呭鍔犻潰瀹瑰け璐ラ獙璇侀〉闈紝涓嶇劧浼氬鑷撮攣灞忓姞瀵嗘棤鏁�
             }
             else if (UserInfo.Current.appUnlockType.Contains("1"))
             {
@@ -95,13 +96,27 @@
 
         }
 
-        public void LoadPage()
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="isFirstOpen">濡傛灉鏄涓�娆″惎鍔ㄧ洿鎺ュ脊绐楅獙璇佸瘑鐮�</param>
+        public void LoadPage(bool isFirstOpen = false)
         {
-            if (UserInfo.Current.unlockTime.AddSeconds(60) > DateTime.Now || UserInfo.Current.appUnlockPasswrod == "" || UserInfo.Current.appUnlockPage.Count == 0)
+            try
             {
-                return;
+                if (!isFirstOpen)
+                {
+                    if (UserInfo.Current.unlockTime.AddSeconds(5) > DateTime.Now || UserInfo.Current.appUnlockPasswrod == "" || UserInfo.Current.appUnlockPage.Count == 0)
+                    {
+                        return;
+                    }
+                }
+                LoadOption();
             }
-            LoadOption();
+            catch
+            {
+                Utlis.WriteLine("AppUnlockPage error");
+            }
         }
 
         /// <summary>

--
Gitblit v1.8.0