Merge branch 'temp-wxr' into WJC

陈嘉乐

2021-03-17 dbc23459fdf4e8b74a5f955fbb9fc631b4babc70

 HDL_ON/UI/MainPage.cs

@@ -26,7 +26,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.0.1225";
        public static string VersionString = "1.1.0310";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -53,6 +53,14 @@
        /// 是否进入后台
        /// </summary>
        public static bool IsEnterBackground = false;
        /// <summary>
        /// 当前分页索引
        /// 0:收藏
        /// 1:分类
        /// 2:智能
        /// 3:个人
        /// </summary>
        public static int CurPageIndex = 9999;

        ///// <summary>
        ///// 公司代码
@@ -91,6 +99,12 @@
                BaseView = Application.MainPage;
                Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;


                //#region 测试
                //var ddd = new UI.test.TestDialog();
                //ddd.InitView();
                //return;
                //#endregion

                if (string.IsNullOrEmpty(OnAppConfig.Instance.LastLoginUserId))
                {
@@ -165,7 +179,6 @@
                addResidencePage.LoadView();
                return;
            }

            new System.Threading.Thread(() =>
            {
                try
@@ -179,7 +192,7 @@
                        waitPage.RemoveFromParent();
                        BaseView.RemoveAll();
                        BasePageView = new PageLayout();
                        BasePageView.ScrollEnabled = false;
                        BasePageView.ScrollEnabled = true;
                        BasePageView.IsShowPoint = false;
                        BasePageView.PageChange = (sender, e) =>
                        {
@@ -203,11 +216,14 @@
                        };
                        BaseView.AddChidren(BasePageView);

                      
                        //跳转页面----
                        var UserBasePage = new UserPage();
                        BasePageView.AddChidren(UserBasePage);
                        UserBasePage.LoadPage();
                        BasePageView.PageIndex = 0;

                   

                        if (isFirstOpen)
                        {
@@ -226,11 +242,16 @@
                {
                    Application.RunOnMainThread(() =>
                    {
                      

                        if (downloadData)
                        {
                            ///初始化app数据
                            Common.ApiUtlis.Ins.DownloadData();
                        };

                       

                    });
                }
            }).Start();