请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

 ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs

@@ -13,7 +13,7 @@
        /// <summary>

        /// 主菜单背景框

        /// </summary>

        private FrameLayout frameMainMenuBack = null;

        private NormalFrameLayout frameMainMenuBack = null;

        /// <summary>

        /// 其他菜单的容器控件

        /// </summary>

@@ -50,10 +50,14 @@
        /// </summary>

        public void ShowForm()

        {

            this.FormID = "UserMainForm";



            //特殊处理：恢复可关闭进度条，别问为什么，我也不知道为什么，以防万一而已

            ProgressBar.SetCloseBarFlag(false);

            //初始化框架

            this.InitForm();

            //初始化头部控件

            this.InitTopFrameLayout();

            //初始化中部控件

            this.InitBodyFrameLayout();

            //移除返回键

            base.RemoveBackButton();



@@ -214,7 +218,7 @@
            else

            {

                //背景框

                frameMainMenuBack = new FrameLayout();

                frameMainMenuBack = new NormalFrameLayout();

                frameMainMenuBack.Y = Application.GetRealHeight(288);

                frameMainMenuBack.Gravity = Gravity.CenterHorizontal;

                frameMainMenuBack.Height = Application.GetRealHeight(371);