新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

 ZigbeeApp/Shared/Phone/UserView/UserPage.cs

@@ -52,7 +52,15 @@
        /// <summary>

        /// 如果设置此变量为true,则在单击底部菜单时,强制无条件全部刷新

        /// </summary>

        public bool RefreshForm = false;

        public bool RefreshAllForm = false;

        /// <summary>

        /// 刷新主页

        /// </summary>

        public bool RefreshMainPageForm = false;

        /// <summary>

        /// 刷新分类

        /// </summary>

        public bool RefreshCategoryForm = false;



        #endregion



@@ -64,11 +72,8 @@
        public UserPage()
        {
            BackgroundColor = Shared.Common.ZigbeeColor.Current.MainColor;
            Shared.Application.LocationAction += (lon, lat) =>
            {
                //上报经纬度
                Login.AccountLogic.Instance.ReceiveAppLatAndLon(lon.ToString(), lat.ToString());
            };
            //添加App的经纬度上报事件
            HdlOtherFunctionLogic.Current.AddAppLatAndLonEvent();
        }



        /// <summary>
@@ -84,23 +89,23 @@
            if (Shared.Application.IsFullScreen == true)

            {

                //高版本的苹果机型，屏幕底部会有一个黑色的杠

                ControlCommonResourse.BottomFrameHeight = Application.GetRealHeight(242);

                ControlCommonResourse.BottomFrameHeight = Application.GetRealHeight(180);

            }

#endif

            //用户主体界面（中间部分）

            this.bodyFrameView = new NormalFrameLayout();

            bodyFrameView.Height = this.Height - UserCenter.ControlCommonResourse.BottomFrameHeight;

            bodyFrameView.Height = this.Height - HdlControlResourse.BottomFrameHeight;

            bodyFrameView.BackgroundColor = Shared.Common.ZigbeeColor.Current.MainColor;

            this.AddChidren(bodyFrameView);



            //用户菜单界面（底部部分）
            var bottomMenuFrame = new FrameLayout();

            bottomMenuFrame.Gravity = Gravity.BottomCenter;
            bottomMenuFrame.Height = ControlCommonResourse.BottomFrameHeight;

            bottomMenuFrame.Height = HdlControlResourse.BottomFrameHeight;

            bottomMenuFrame.BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCBottomColor;

            this.AddChidren(bottomMenuFrame);
            //底部菜单的头部线
            var bottomLine = new NormalViewControl(bottomMenuFrame.Width, ControlCommonResourse.BottomLineHeight, false);

            var bottomLine = new NormalViewControl(bottomMenuFrame.Width, HdlControlResourse.BottomLineHeight, false);

            bottomLine.BackgroundColor = 0xffc8c8c9;

            bottomMenuFrame.AddChidren(bottomLine);



@@ -230,20 +235,20 @@
        /// <param name="handClick">是否是手动点击</param>
        private void BottomMenuClickEvent(MenuSelectEnum selectEnum, bool handClick)

        {

            if (this.RefreshForm == false && selectEnum == this.nowSelectMenu && handClick == true)

            if (this.RefreshAllForm == false && selectEnum == this.nowSelectMenu && handClick == true)

            {

                //手动点击同一个菜单,则不做处理

                return;

            }



            //如果强制指定刷新界面的话

            if (this.RefreshForm == true)

            if (this.RefreshAllForm == true)

            {

                //全部刷新

                this.listForm = new List<EditorCommonForm>() { null, null, null };

                this.bodyFrameView.RemoveAll();



                this.RefreshForm = false;

                this.RefreshAllForm = false;

            }



            this.nowSelectMenu = selectEnum;

@@ -253,6 +258,13 @@
            {

                //左滑菜单可

                CommonPage.Instance.IsDrawerLockMode = false;
                if (this.RefreshMainPageForm == true)

                {

                    //刷新主页

                    listForm[0]?.CloseForm();

                    listForm[0] = null;

                    this.RefreshMainPageForm = false;

                }
                if (listForm[0] == null)

                {

                    var form = new MainPage.HomeMainPageForm();

@@ -266,6 +278,13 @@
            {

                //左滑菜单不可

                CommonPage.Instance.IsDrawerLockMode = true;

                if (this.RefreshCategoryForm == true)

                {

                    //刷新分类

                    listForm[1]?.CloseForm();

                    listForm[1] = null;

                    this.RefreshCategoryForm = false;

                }

                if (listForm[1] == null)

                {

                    var form = new Category.CategoryMainForm();

@@ -328,9 +347,9 @@
        public void ShowCategoryAutoListForm()
        {
            //关闭全部界面,直到主页为止
            UserCenterLogic.CloseAllOpenForm();
            HdlFormLogic.Current.CloseAllOpenForm(null, false);
            //强制显示自动化列表界面
            UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 2;

            HdlUserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 2;



            this.nowSelectMenu = MenuSelectEnum.A分类;