Revert "1"

wxr

2021-07-01 43b0d5870d528f23ecd6aeceb6cfd4325188b46f

 HDL_ON/UI/MainPage.cs

@@ -18,9 +18,13 @@
        /// </summary>
        public static PageLayout BasePageView { get; set; }
        /// <summary>
        /// 用户控制父容器
        /// </summary>
        public static UserPage UserBasePage;
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.1.0324";
        public static string VersionString = "1.2.0629";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -67,6 +71,14 @@
        ///// </summary>
        //public static int Company = 0;

        /// <summary>
        /// 右滑后退提示按钮
        /// </summary>
        public static Button BtnBackIcon;
        /// <summary>
        /// 后退右滑了多少距离，超过一定距离才触发后退事件
        /// </summary>
        public static int StartX = 0;
        /// <summary>
        /// 是否全面屏手机
        /// </summary>
@@ -163,6 +175,115 @@
        /// <param name="pageShowEvent">主页显示之后触发的事件(没有住宅的话,则不会触发)</param>
        public static void GoUserPage(bool downloadData , bool isFirstOpen = false, Action pageShowEvent = null)
        {
            BaseView.RemoveAll();
            #region 后退事件
            BasePageView = new PageLayout();
            BasePageView.ScrollEnabled = false;
            BasePageView.IsShowPoint = false;
            BasePageView.PageChange = (sender, e) =>
            {
                if (e < BasePageView.ChildrenCount - 1)
                {
                    BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
                }
                try
                {
                    ReturnRefreshAction?.Invoke();
                    ReturnRefreshAction = null;
                }
                catch (Exception ex)
                {
                    Log($"后退事件异常:{ex.Message}");
                }
            };
            BaseView.AddChidren(BasePageView);
            var backView = new FrameLayout()
            {
                Y = Application.GetRealHeight(100),
                Width = Application.GetRealWidth(10),
                Height = Application.GetRealHeight(440),
            };
            BaseView.AddChidren(backView);

            BtnBackIcon = new Button()
            {
                X = -Application.GetRealWidth(100),
                Gravity = Gravity.CenterVertical,
                Width = Application.GetRealWidth(88 / 2),
                Height = Application.GetRealHeight(56 / 2),
                UnSelectedImagePath = "Public/RightSlideBackIcon.png"
            };
            BaseView.AddChidren(BtnBackIcon);
            backView.MouseMoveEventHandler = (sender, e) =>
            {
                if (BasePageView.ChildrenCount <= 1)
                {
                    return;
                }
                MainPage.Log($"move:{e.X}");
                if (StartX == 0 && e.X < 30)
                {
                    StartX = (int)e.X;
                }
                if (StartX < 30)
                {
                    if (e.X < Application.GetRealWidth(100))
                    {
                        BtnBackIcon.X = (int)e.X - Application.GetRealWidth(100);
                    }
                }
            };
            backView.MouseDownEventHandler = (sender, e) =>
            {
                if (BasePageView.ChildrenCount <= 1)
                {
                    return;
                }
                MainPage.Log($"down:{e.X}");
                StartX = (int)e.X;
                BtnBackIcon.Y = (int)e.Y + Application.GetRealHeight(50);
            };
            backView.MouseUpEventHandler = (sender, e) => {
                MainPage.Log($"up{e.X}");
                StartX = 0;
                BtnBackIcon.X = -Application.GetRealWidth(100);

                if (e.X > 70)
                {
                    if (BasePageView.ChildrenCount > 1)
                    {
                        BasePageView.PageIndex = BasePageView.ChildrenCount - 2;
                    }
                }
            };
            backView.MouseUpOutsideEventHandler = (sender, e) => {
                MainPage.Log($"up{e.X}");
                StartX = 0;
                BtnBackIcon.X = -Application.GetRealWidth(100);

                if (e.X > 70)
                {
                    if (BasePageView.ChildrenCount > 1)
                    {
                        BasePageView.PageIndex = BasePageView.ChildrenCount - 2;
                    }
                }
            };
            #endregion


            //体验模式
            if (NoLoginMode)
            {
                //跳转页面----
                UserBasePage = new UserPage();
                BasePageView.AddChidren(UserBasePage);
                UserBasePage.LoadPage();
                BasePageView.PageIndex = 0;

                return;
            }

            //加载Loading效果
            var waitPage = new Loading();
            BaseView.AddChidren(waitPage);
@@ -177,59 +298,23 @@
                addResidencePage.LoadView();
                return;
            }
            new System.Threading.Thread(() =>
            new System.Threading.Thread(async () =>
            {
                try
                {
                    Entity.FunctionList.List.Clear();
                    Entity.SpatialInfo.CurrentSpatial.Clear();
                    ///等待获取住宅信息
                    Application.RunOnMainThread(() =>
                    Application.RunOnMainThread( () =>
                    {
                        waitPage.Hide();
                        waitPage.RemoveFromParent();
                        BaseView.RemoveAll();
                        BasePageView = new PageLayout();
                        BasePageView.ScrollEnabled = true;
                        BasePageView.IsShowPoint = false;
                        BasePageView.PageChange = (sender, e) =>
                        {
                            if (e < BasePageView.ChildrenCount - 1)
                            {
                                BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
                            }
                            try
                            {
                                ReturnRefreshAction?.Invoke();
                                ReturnRefreshAction = null;
                            }
                            catch (Exception ex)
                            {
                                Log($"后退事件异常:{ex.Message}");
                            }
                            //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 UserBasePage = new UserPage();
                        UserBasePage = new UserPage();
                        BasePageView.AddChidren(UserBasePage);
                        UserBasePage.LoadPage();
                        BasePageView.PageIndex = 0;

                   

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

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

                       

                    });
                }
            }).Start();
@@ -274,12 +354,17 @@
            int result = 0;
            Application.RunOnMainThread(() =>
            {
                if (BaseView.ChildrenCount>1)
                if (BasePageView == null || BasePageView.ChildrenCount<=1 )
                {
                    var view = BaseView.GetChildren(BaseView.ChildrenCount - 1);
                    if(view.GetType() == typeof(Loading))
                    result = 2;//无法再后退，可以执行退到桌面
                }
                if (BasePageView.ChildrenCount > 1)
                {
                    int index = BasePageView.ChildrenCount - 1;
                    var view = BasePageView.GetChildren(index);
                    if (view.GetType() == typeof(Loading))
                    {
                        var loading  = view as Loading;
                        var loading = view as Loading;
                        if (loading.CurStatus == false)//有一些等待界面隐藏了，但是没有移除到，需要先移除
                        {
                            loading.RemoveFromParent();
@@ -290,22 +375,20 @@
                            result = 1;//正在等待某些操作
                        }
                    }
                    else
                    {
                        if (view != null)
                        {
                            if(view.Tag.ToString() != "unlockpage")
                            {
                                view.RemoveFromParent();
                            }
                        }
                    }
                }
                else
                {
                    if (BasePageView.ChildrenCount > 1)
                    {
                        int index = BasePageView.ChildrenCount - 1;
                        var view = BasePageView.GetChildren(index);
                        if (view != null)
                        {
                            view.RemoveFromParent();
                        }
                    }
                    else
                    {
                        result = 2;//无法再后退，可以执行退到桌面
                    }
                    result = 2;//无法再后退，可以执行退到桌面
                }
            });
            return result;