From 95d51dfc65299bdb735a855b515af84ca5b58252 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 十二月 2020 17:26:13 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/UI/MainPage.cs | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 324c146..0648202 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.1222";
+ public static string VersionString = "1.0.1223";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -119,7 +119,7 @@
//{ IsBackground = true }.Start();
Common.ApiUtlis.Ins.DownloadData();
- GoUserPage(true);
+ GoUserPage(false,true);
}
}
}
@@ -153,12 +153,12 @@
/// </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();
BaseView.AddChidren(waitPage);
- waitPage.Start("sdfghjkl");// (Language.StringByID(StringId.PleaseWait));
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
//褰撴病鏈変綇瀹呮椂,涓嶈兘璁╁畠寰�涓嬭蛋
if (UserInfo.Current.regionList.Count == 0)
@@ -229,8 +229,11 @@
{
Application.RunOnMainThread(() =>
{
- ///鍒濆鍖朼pp鏁版嵁
- InitializationData();
+ if (downloadData)
+ {
+ ///鍒濆鍖朼pp鏁版嵁
+ Common.ApiUtlis.Ins.DownloadData();
+ };
});
}
}).Start();
@@ -239,7 +242,7 @@
/// <summary>
/// 鍒濆鍖朼pp鎵�闇�瑕佺殑鏁版嵁
/// </summary>
- public static void InitializationData()
+ public static void InitializationData1()
{
//new System.Threading.Thread(() =>
//{
@@ -276,12 +279,6 @@
//})
//{ IsBackground = true }.Start();
- #region 璇诲彇鏈湴鏁版嵁
- //璇诲彇闊充箰淇℃伅
- UI.Music.A31MusicModel.ReadMusicStates();
- //鎼滅储缃戝叧
- DriverLayer.Control.Ins.SearchLoaclGateway();
- #endregion
}
/// <summary>
--
Gitblit v1.8.0