From 388ece21a0c608c2571775137a89ad32ca0cedd8 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 一月 2021 14:35:23 +0800
Subject: [PATCH] 2021-1-11-2

---
 HDL_ON/UI/MainPage.cs |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 324c146..89e3557 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,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