From 58beee272e47fdbf814e0c8fe625e09c5b844d4d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 十二月 2020 13:38:27 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/UI/MainPage.cs | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 14fe9bd..c58e805 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -119,7 +119,7 @@
//{ IsBackground = true }.Start();
Common.ApiUtlis.Ins.DownloadData();
- GoUserPage(true);
+ GoUserPage(false,true);
}
}
}
@@ -153,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();
@@ -227,11 +227,11 @@
MainPage.Log($"GoUserPage : {ex.Message}");
}finally
{
- Application.RunOnMainThread(() =>
- {
- ///鍒濆鍖朼pp鏁版嵁
- InitializationData();
- });
+ //Application.RunOnMainThread(() =>
+ //{
+ // ///鍒濆鍖朼pp鏁版嵁
+ // Common.ApiUtlis.Ins.DownloadData();
+ //});
}
}).Start();
}
@@ -239,7 +239,7 @@
/// <summary>
/// 鍒濆鍖朼pp鎵�闇�瑕佺殑鏁版嵁
/// </summary>
- public static void InitializationData()
+ public static void InitializationData1()
{
//new System.Threading.Thread(() =>
//{
@@ -276,12 +276,6 @@
//})
//{ IsBackground = true }.Start();
- #region 璇诲彇鏈湴鏁版嵁
- //璇诲彇闊充箰淇℃伅
- UI.Music.A31MusicModel.ReadMusicStates();
- //鎼滅储缃戝叧
- DriverLayer.Control.Ins.SearchLoaclGateway();
- #endregion
}
/// <summary>
--
Gitblit v1.8.0