Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 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



@@ -66,6 +74,7 @@
            BackgroundColor = Shared.Common.ZigbeeColor.Current.MainColor;
            Shared.Application.LocationAction += (lon, lat) =>
            {
                //上报经纬度
                Login.AccountLogic.Instance.ReceiveAppLatAndLon(lon.ToString(), lat.ToString());
            };
        }

@@ -229,20 +238,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;

@@ -252,6 +261,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();

@@ -265,6 +281,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();