From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 03 十二月 2020 15:35:42 +0800
Subject: [PATCH] 2020-12-03-1

---
 HDL_ON/UI/UI0-Public/AppUnlockPage.cs |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
index 8aee834..c5bd852 100644
--- a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
+++ b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
@@ -9,7 +9,7 @@
     {
         void LoadOption()
         {
-            if (MainPage.LoginUser == null)
+            if ( UserInfo.Current == null)
             {
                 return;
             }
@@ -97,6 +97,10 @@
 
         public void LoadPage()
         {
+            if (OnAppConfig.Instance.unlockTime.AddSeconds(60) > DateTime.Now || OnAppConfig.Instance.appUnlockPasswrod == "" || OnAppConfig.Instance.appUnlockPage.Count == 0)
+            {
+                return;
+            }
             LoadOption();
         }
 
@@ -105,15 +109,6 @@
         /// </summary>
         public void LoadGesturePage(string optionType, Action fingerAction)
         {
-            //Dialog dialog = new Dialog();
-
-            if (optionType == "7")
-            {
-                if (OnAppConfig.Instance.unlockTime.AddSeconds(60) > DateTime.Now || OnAppConfig.Instance.appUnlockPasswrod == "" || OnAppConfig.Instance.appUnlockPage.Count == 0)
-                {
-                    return;
-                }
-            }
             var bodyView = new FrameLayout()
             {
                 BackgroundColor = CSS.CSS_Color.MainBackgroundColor

--
Gitblit v1.8.0