优化地暖界面、音乐入口界面

wei

2021-04-28 b13a98b48df67d902da843a3bd3d5659e3737d17

 HDL_ON/UI/MainPage.cs

@@ -18,15 +18,9 @@
        /// </summary>
        public static PageLayout BasePageView { get; set; }
        /// <summary>
        /// DisplayCompleted
        /// </summary>
        public static bool DisplayCompleted = false;

        //public static UserInfo LoginUser;
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.1.0317";
        public static string VersionString = "1.2.0428";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -40,6 +34,10 @@
        /// 天气刷新action
        /// </summary>
        public static Action RefreshAir;
        /// <summary>
        /// 回退页面action 没有需要可以不用
        /// </summary>
        public static Action ReturnRefreshAction;
        /// <summary>
        /// 无登录模式
        /// </summary>
@@ -69,6 +67,14 @@
        ///// </summary>
        //public static int Company = 0;

        /// <summary>
        /// 右滑后退提示按钮
        /// </summary>
        public static Button BtnBackIcon;
        /// <summary>
        /// 后退右滑了多少距离，超过一定距离才触发后退事件
        /// </summary>
        public static int StartX = 0;
        /// <summary>
        /// 是否全面屏手机
        /// </summary>
@@ -192,31 +198,103 @@
                        waitPage.RemoveFromParent();
                        BaseView.RemoveAll();
                        BasePageView = new PageLayout();
                        BasePageView.ScrollEnabled = true;
                        BasePageView.ScrollEnabled = false;
                        BasePageView.IsShowPoint = false;
                        BasePageView.PageChange = (sender, e) =>
                        {
                            if (e < BasePageView.ChildrenCount - 1)
                            {
                                MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
                            }

                            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;
                            try
                            {
                                ReturnRefreshAction?.Invoke();
                                ReturnRefreshAction = null;
                            }
                            catch (Exception ex)
                            {
                                Log($"后退事件异常:{ex.Message}");
                            }
                            //while (e < BasePageView.ChildrenCount - 1)
                            //{
                            //    BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
                            //}
                        };
                        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;
                                }
                            }
                        };


                        //跳转页面----
                        var UserBasePage = new UserPage();
                        BasePageView.AddChidren(UserBasePage);
@@ -268,12 +346,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();
@@ -284,22 +367,17 @@
                            result = 1;//正在等待某些操作
                        }
                    }
                }
                else
                {
                    if (BasePageView.ChildrenCount > 1)
                    else
                    {
                        int index = BasePageView.ChildrenCount - 1;
                        var view = BasePageView.GetChildren(index);
                        if (view != null)
                        {
                            view.RemoveFromParent();
                        }
                    }
                    else
                    {
                        result = 2;//无法再后退，可以执行退到桌面
                    }
                }
                else
                {
                    result = 2;//无法再后退，可以执行退到桌面
                }
            });
            return result;