From 271015c6e90c195103cc7f34eda87966acd74dcc Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期日, 13 十二月 2020 20:46:12 +0800
Subject: [PATCH] 2020121301
---
HDL_ON/UI/MainPage.cs | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 095d6f1..67babbc 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -109,16 +109,12 @@
{
var pm = new DAL.Server.HttpServerRequest();
pm.RefreshToken();//鍒锋柊Token
- pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
- pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
- })
+ pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
+ pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
+ })
{ IsBackground = true }.Start();
GoUserPage(true);
-
-
- ///鍒濆鍖朼pp鏁版嵁
- InitializationData();
}
}
}
@@ -182,6 +178,11 @@
}
}
}
+ else
+ {
+ Entity.FunctionList.List.Clear();
+ Entity.SpatialInfo.CurrentSpatial.Clear();
+ }
///绛夊緟鑾峰彇浣忓畢淇℃伅
Application.RunOnMainThread(() =>
{
@@ -228,6 +229,10 @@
catch (Exception ex)
{
MainPage.Log($"GoUserPage : {ex.Message}");
+ }finally
+ {
+ ///鍒濆鍖朼pp鏁版嵁
+ InitializationData();
}
}).Start();
}
@@ -241,7 +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);
}
@@ -250,6 +255,7 @@
break;
}
}
+ //System.Threading.Thread.Sleep(2000);
#region 璇诲彇浜戠鏁版嵁--
//todo鏁版嵁瑕嗙洊澶勭悊
//璇诲彇浜戠鎴块棿銆佹ゼ灞傛暟鎹�
--
Gitblit v1.8.0