From 5efaaab958a0f4a91ad9d76b5d5fea0ea3fc3f41 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 01 十二月 2020 16:24:19 +0800
Subject: [PATCH] 2020-12-01 1.请求路径修改。 2.切换住宅或者查询住宅列表增加获取网关列表。 3.房间增加默认图片选择、比例调整为16:9。4.优化图片裁剪。

---
 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