From f534d41c36d5895322bf691784a10435b64609fe Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 25 十二月 2020 13:52:00 +0800
Subject: [PATCH] 修复添加、删除楼层时候，界面刷新异常问题
---
HDL_ON/UI/MainPage.cs | 109 +++++++++++++++++++++++++++++-------------------------
1 files changed, 58 insertions(+), 51 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 8a03892..ff4f6b3 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.0.1220";
+ public static string VersionString = "1.0.1225";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -44,10 +44,10 @@
/// 鏃犵櫥褰曟ā寮�
/// </summary>
public static bool NoLoginMode = false;
- /// <summary>
- /// 杩滅▼妯″紡
- /// </summary>
- public static bool IsRemote = false;
+ ///// <summary>
+ ///// 杩滅▼妯″紡
+ ///// </summary>
+ //public static bool IsRemote = false;
/// <summary>
/// 缃戠粶杩炴帴鐘舵��
/// 0:鏃犵綉缁�
@@ -109,16 +109,17 @@
}
else
{
- new System.Threading.Thread(() =>
- {
- var pm = new DAL.Server.HttpServerRequest();
- pm.RefreshToken();//鍒锋柊Token
- pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
- pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
- })
- { IsBackground = true }.Start();
+ //new System.Threading.Thread(() =>
+ //{
+ // var pm = new DAL.Server.HttpServerRequest();
+ // pm.RefreshToken();//鍒锋柊Token
+ // pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
+ // pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
+ //})
+ //{ IsBackground = true }.Start();
+ Common.ApiUtlis.Ins.DownloadData();
- GoUserPage(true);
+ GoUserPage(false,true);
}
}
}
@@ -152,7 +153,7 @@
/// </summary>
/// <param name="isFirstOpen">濡傛灉鏄涓�娆″惎鍔� 妫�娴嬫牎楠屽瘑鐮�</param>
/// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
- public static void GoUserPage(bool isFirstOpen = false, Action pageShowEvent = null)
+ public static void GoUserPage(bool downloadData , bool isFirstOpen = false, Action pageShowEvent = null)
{
//鍔犺浇Loading鏁堟灉
var waitPage = new Loading();
@@ -226,8 +227,14 @@
MainPage.Log($"GoUserPage : {ex.Message}");
}finally
{
- ///鍒濆鍖朼pp鏁版嵁
- InitializationData();
+ Application.RunOnMainThread(() =>
+ {
+ if (downloadData)
+ {
+ ///鍒濆鍖朼pp鏁版嵁
+ Common.ApiUtlis.Ins.DownloadData();
+ };
+ });
}
}).Start();
}
@@ -235,43 +242,43 @@
/// <summary>
/// 鍒濆鍖朼pp鎵�闇�瑕佺殑鏁版嵁
/// </summary>
- public static void InitializationData()
+ public static void InitializationData1()
{
- new System.Threading.Thread(() =>
- {
- while (true)
- {
- if (Entity.DB_ResidenceData.Instance == null )//|| Entity.DB_ResidenceData.residenceData.HomeGateway == null)
- {
- System.Threading.Thread.Sleep(100);
- }
- else
- {
- break;
- }
- }
- //System.Threading.Thread.Sleep(2000);
- #region 璇诲彇浜戠鏁版嵁--
- //todo鏁版嵁瑕嗙洊澶勭悊
- //璇诲彇浜戠鎴块棿銆佹ゼ灞傛暟鎹�
- Entity.SpatialInfo.CurrentSpatial.DownloadRoomList();
- //璇诲彇浜戠璁惧鏁版嵁
- Entity.FunctionList.List.DownloadFunctionList();
- //璇诲彇浜戠鍦烘櫙鏁版嵁
- Entity.FunctionList.List.DownloadSceneList();
- //璇诲彇閫昏緫鍒楄〃
- UI.UI2.Intelligence.Automation.MainView.GetLogicList();
- #endregion
+ //new System.Threading.Thread(() =>
+ //{
+ // int count = 0;
+ // while (count< 10)
+ // {
+ // if (Entity.DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull() )//|| Entity.DB_ResidenceData.residenceData.HomeGateway == null)
+ // {
+ // System.Threading.Thread.Sleep(200);
+ // }
+ // else
+ // {
+ // break;
+ // }
+ // count++;
+ // }
+ // if(Entity.DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
+ // {
+ // return;
+ // }
+ // //System.Threading.Thread.Sleep(2000);
+ // #region 璇诲彇浜戠鏁版嵁--
+ // //todo鏁版嵁瑕嗙洊澶勭悊
+ // //璇诲彇浜戠鎴块棿銆佹ゼ灞傛暟鎹�
+ // Entity.SpatialInfo.CurrentSpatial.DownloadRoomList();
+ // //璇诲彇浜戠璁惧鏁版嵁
+ // Entity.FunctionList.List.DownloadFunctionList();
+ // //璇诲彇浜戠鍦烘櫙鏁版嵁
+ // Entity.FunctionList.List.DownloadSceneList();
+ // //璇诲彇閫昏緫鍒楄〃
+ // UI.UI2.Intelligence.Automation.MainView.GetLogicList();
+ // #endregion
- })
- { IsBackground = true }.Start();
+ //})
+ //{ IsBackground = true }.Start();
- #region 璇诲彇鏈湴鏁版嵁
- //璇诲彇闊充箰淇℃伅
- UI.Music.A31MusicModel.ReadMusicStates();
- //鎼滅储缃戝叧
- DriverLayer.Control.Ins.SearchLoaclGateway();
- #endregion
}
/// <summary>
--
Gitblit v1.8.0