Merge branch 'NewFilePath' into CJL

JLChen

2020-12-23 58beee272e47fdbf814e0c8fe625e09c5b844d4d

 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(() =>
                    {
                        ///初始化app数据
                        InitializationData();
                    });
                    //Application.RunOnMainThread(() =>
                    //{
                    //    ///初始化app数据
                    //    Common.ApiUtlis.Ins.DownloadData();
                    //});
                }
            }).Start();
        }
@@ -239,7 +239,7 @@
        /// <summary>
        /// 初始化app所需要的数据
        /// </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>