From bb6ad792b598927a5459a5fb6f6c27fb1aa9e94e Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 17 十二月 2020 14:06:36 +0800
Subject: [PATCH] 20201217-1
---
HDL_ON/UI/MainPage.cs | 71 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index dbc4eed..51f1f50 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -91,32 +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();
- //鍚姩瀵嗙爜楠岃瘉
- new AppUnlockPage().LoadPage();
-
- ///鍒濆鍖朼pp鏁版嵁
- InitializationData();
+ GoUserPage(true);
+ }
}
-
-
}
catch (Exception ex)
{
@@ -146,7 +146,8 @@
/// <summary>
/// 杩涘叆涓婚〉
/// </summary>
- public static void GoUserPage()
+ /// <param name="isFirstOpen">濡傛灉鏄涓�娆″惎鍔� 妫�娴嬫牎楠屽瘑鐮�</param>
+ public static void GoUserPage(bool isFirstOpen = false)
{
//鍔犺浇Loading鏁堟灉
var waitPage = new Loading();
@@ -163,7 +164,7 @@
while (UserInfo.Current.regionList.Count == 0)
{
pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
- System.Threading.Thread.Sleep(3000);
+ System.Threading.Thread.Sleep(2000);
if (loadPage)
{
loadPage = false;
@@ -172,10 +173,15 @@
waitPage.Hide();
var addResidencePage = new BindingResidencePage();
BaseView.AddChidren(addResidencePage);
- addResidencePage.LoadDialog();
+ addResidencePage.LoadView();
});
}
}
+ }
+ else
+ {
+ Entity.FunctionList.List.Clear();
+ Entity.SpatialInfo.CurrentSpatial.Clear();
}
///绛夊緟鑾峰彇浣忓畢淇℃伅
Application.RunOnMainThread(() =>
@@ -207,15 +213,26 @@
};
BaseView.AddChidren(BasePageView);
- //璺宠浆椤甸潰----
- var userPage = new UserPage();
+ //璺宠浆椤甸潰----
+ var userPage = new UserPage();
BasePageView.AddChidren(userPage);
userPage.LoadPage();
BasePageView.PageIndex = 0;
+
+ if (isFirstOpen)
+ {
+ //鍚姩瀵嗙爜楠岃瘉
+ new AppUnlockPage().LoadPage(isFirstOpen);
+ }
});
- }catch(Exception ex)
+ }
+ catch (Exception ex)
{
MainPage.Log($"GoUserPage : {ex.Message}");
+ }finally
+ {
+ ///鍒濆鍖朼pp鏁版嵁
+ InitializationData();
}
}).Start();
}
@@ -229,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);
}
@@ -239,6 +255,7 @@
break;
}
}
+ //System.Threading.Thread.Sleep(2000);
#region 璇诲彇浜戠鏁版嵁--
//todo鏁版嵁瑕嗙洊澶勭悊
//璇诲彇浜戠鎴块棿銆佹ゼ灞傛暟鎹�
--
Gitblit v1.8.0