20200813

wxr

2020-08-13 6a9ad7ec93218913a2ce3b898bb036f18f8f0da4

 HDL_ON/UI/MainPage.cs

@@ -74,7 +74,7 @@
                //判断需不需要登录，有没有登录，或者登录是否过期，
                if (LoginUser == null || !LoginUser.IsLogin)
                {
                    GoLoginPage();
                    GoLoginPage(LoginUser);
                }
                else
                {
@@ -112,14 +112,14 @@
        /// <summary>
        /// 进入登录界面
        /// </summary>
        public static void GoLoginPage(string account ="")
        public static void GoLoginPage(UserInfo userInfo =null)
        {
            BaseView.RemoveAll();
            BaseView.BackgroundColor = CSS_Color.BackgroundColor;
            var fisrtView = new UI.UI1Login.LoginPage();
            fisrtView.BackgroundColor = CSS_Color.MainBackgroundColor;
            BaseView.AddChidren(fisrtView);
            fisrtView.LoadView(account);
            fisrtView.LoadView(userInfo);
        }

        /// <summary>
@@ -131,18 +131,16 @@
            BasePageView = new PageLayout();
            BasePageView.ScrollEnabled = false;
            BasePageView.IsShowPoint = false;
            BasePageView.PageChange += (sender, e) => {
            BasePageView.PageChange = (sender, e) => {
                if (e < BasePageView.ChildrenCount - 1)
                {
                    MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
                    //BasePageView.RemoveAt(BasePageView.ChildrenCount - 1);
                }

                while (e < BasePageView.ChildrenCount - 1)
                {
                    BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
                }
                //MainPage.Log($"MainPage.BasePageView.PageIndex : { MainPage.BasePageView.PageIndex} \r MainPage.BasePageView.ChildrenCount : {MainPage.BasePageView.ChildrenCount}");
            };
            BasePageView.MouseDownEventHandler += (sender, e) => {
                BasePageView.ScrollEnabled = true;
@@ -157,7 +155,6 @@
            BasePageView.AddChidren(userPage);
            userPage.LoadPage();
            BasePageView.PageIndex = 0;

        }

        /// <summary>