From 9c8baf7e7e1169ebdf7d5f7ed33ab29dd5fcbf18 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 14 十二月 2020 17:45:17 +0800
Subject: [PATCH] 2020-12-14 1.解锁设置问题修复,增加面容ID验证。2.错误码对接增加。

---
 HDL_ON/UI/MainPage.cs |   50 ++++++++++++++++++++++++++++++--------------------
 1 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index fdb0e3d..67babbc 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -91,31 +91,32 @@
                 BaseView = Application.MainPage;
                 Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
 
-                //LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("UserInfo_File")));
-                //鍒ゆ柇闇�涓嶉渶瑕佺櫥褰曪紝鏈夋病鏈夌櫥褰曪紝鎴栬�呯櫥褰曟槸鍚﹁繃鏈燂紝
-                if (UserInfo.Current == null || !UserInfo.Current.IsLogin)
+
+                if (string.IsNullOrEmpty(OnAppConfig.Instance.LastLoginUserId))
                 {
-                    GoLoginPage(UserInfo.Current);
+                    GoLoginPage();
                 }
                 else
                 {
-                    new System.Threading.Thread(() =>
+                    //鍒ゆ柇闇�涓嶉渶瑕佺櫥褰曪紝鏈夋病鏈夌櫥褰曪紝鎴栬�呯櫥褰曟槸鍚﹁繃鏈燂紝
+                    if (UserInfo.Current == null || !UserInfo.Current.IsLogin)
                     {
-                        var pm = new DAL.Server.HttpServerRequest();
-                        pm.RefreshToken();//鍒锋柊Token
-                        pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
-                        pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
-                    })
-                    { IsBackground = true }.Start();
+                        GoLoginPage(UserInfo.Current);
+                    }
+                    else
+                    {
+                        new System.Threading.Thread(() =>
+                        {
+                            var pm = new DAL.Server.HttpServerRequest();
+                            pm.RefreshToken();//鍒锋柊Token
+                            pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
+                            pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
+                        })
+                        { IsBackground = true }.Start();
 
-                    GoUserPage(true);
-                  
-
-                    ///鍒濆鍖朼pp鏁版嵁
-                    InitializationData();
+                        GoUserPage(true);
+                    }
                 }
-
-
             }
             catch (Exception ex)
             {
@@ -177,6 +178,11 @@
                             }
                         }
                     }
+                    else
+                    {
+                        Entity.FunctionList.List.Clear();
+                        Entity.SpatialInfo.CurrentSpatial.Clear();
+                    }
                     ///绛夊緟鑾峰彇浣忓畢淇℃伅
                     Application.RunOnMainThread(() =>
                     {
@@ -223,6 +229,10 @@
                 catch (Exception ex)
                 {
                     MainPage.Log($"GoUserPage : {ex.Message}");
+                }finally
+                {
+                    ///鍒濆鍖朼pp鏁版嵁
+                    InitializationData();
                 }
             }).Start();
         }
@@ -236,8 +246,7 @@
             {
                 while (true)
                 {
-                    if (Entity.DB_ResidenceData.residenceData == null ||
-                    Entity.DB_ResidenceData.residenceData.HomeGateway == null)
+                    if (Entity.DB_ResidenceData.Instance == null )//|| Entity.DB_ResidenceData.residenceData.HomeGateway == null)
                     {
                         System.Threading.Thread.Sleep(100);
                     }
@@ -246,6 +255,7 @@
                         break;
                     }
                 }
+                //System.Threading.Thread.Sleep(2000);
                 #region 璇诲彇浜戠鏁版嵁--
                 //todo鏁版嵁瑕嗙洊澶勭悊
                 //璇诲彇浜戠鎴块棿銆佹ゼ灞傛暟鎹�

--
Gitblit v1.8.0