Merge branch 'CJL-NEW'

wxr

2020-12-11 1bb8683aef25143048e572b65734de4772bfc712

 HDL_ON/UI/MainPage.cs

@@ -99,11 +99,6 @@
                        var pm = new DAL.Server.HttpServerRequest();
                        pm.RefreshToken();//刷新Token
                        pm.GetHomePager();//刷新住宅信息
                    })
                    { IsBackground = true }.Start();
                    new System.Threading.Thread(() =>
                    {
                        var pm =new DAL.Server.HttpServerRequest();
                        pm.GetUserInfo();//刷新个人信息
                    })
                    { IsBackground = true }.Start();
@@ -115,6 +110,8 @@
                    ///初始化app数据
                    InitializationData();
                }


            }
            catch (Exception ex)
            {
@@ -146,34 +143,70 @@
        /// </summary>
        public static void GoUserPage()
        {
            BaseView.RemoveAll();
            BasePageView = new PageLayout();
            BasePageView.ScrollEnabled = false;
            BasePageView.IsShowPoint = false;
            BasePageView.PageChange = (sender, e) => {
                if (e < BasePageView.ChildrenCount - 1)
            //加载Loading效果
            var waitPage = new Loading();
            BaseView.AddChidren(waitPage);
            waitPage.Start(Language.StringByID(StringId.PleaseWait));
            new System.Threading.Thread(() =>
            {
                if (UserInfo.Current.regionList.Count == 0)
                {
                    MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
                    bool loadPage = true;
                    var pm = new DAL.Server.HttpServerRequest();
                    while (UserInfo.Current.regionList.Count == 0)
                    {
                        pm.GetHomePager();//刷新住宅信息
                        System.Threading.Thread.Sleep(1000);
                        if (loadPage)
                        {
                            loadPage = false;
                            Application.RunOnMainThread(() =>
                            {
                                waitPage.Hide();
                                var addResidencePage = new BindingResidencePage();
                                BaseView.AddChidren(addResidencePage);
                                addResidencePage.LoadDialog();
                            });
                        }
                    }
                }

                while (e < BasePageView.ChildrenCount - 1)
                ///等待获取住宅信息
                Application.RunOnMainThread(() =>
                {
                    BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
                }
            };
            BasePageView.MouseDownEventHandler += (sender, e) => {
                BasePageView.ScrollEnabled = true;
            };
            BasePageView.MouseUpEventHandler += (sender, e) => {
                BasePageView.ScrollEnabled = false;
            };
            BaseView.AddChidren(BasePageView);
                    waitPage.Hide();
                    BaseView.RemoveAll();
                    BasePageView = new PageLayout();
                    BasePageView.ScrollEnabled = false;
                    BasePageView.IsShowPoint = false;
                    BasePageView.PageChange = (sender, e) =>
                    {
                        if (e < BasePageView.ChildrenCount - 1)
                        {
                            MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
                        }

            //跳转页面----
            var userPage = new UserPage();
            BasePageView.AddChidren(userPage);
            userPage.LoadPage();
            BasePageView.PageIndex = 0;
                        while (e < BasePageView.ChildrenCount - 1)
                        {
                            BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
                        }
                    };
                    BasePageView.MouseDownEventHandler += (sender, e) =>
                    {
                        BasePageView.ScrollEnabled = true;
                    };
                    BasePageView.MouseUpEventHandler += (sender, e) =>
                    {
                        BasePageView.ScrollEnabled = false;
                    };
                    BaseView.AddChidren(BasePageView);

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

        /// <summary>