2020-07-10-01

陈嘉乐

2020-07-10 48ba446936b51fffafa7c3600c0dadc6ac0e8c20

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

@@ -50,17 +50,20 @@
        /// </summary>

        public void ShowForm()

        {

            this.FormID = "UserMainForm";



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

            ProgressBar.SetCloseBarFlag(false);

            //初始化框架

            this.InitForm();

            //初始化头部控件

            this.InitTopFrameLayout();

            //初始化中部控件

            this.InitBodyFrameLayout();

            //移除返回键

            base.RemoveBackButton();



            //body占完整个屏幕,除了底部菜单

            bodyFrameLayout.Y = 0;

            bodyFrameLayout.Height = ControlCommonResourse.TopMenuFrameHeight + ControlCommonResourse.TopFrameHeight

                + ControlCommonResourse.BodyFrameHeight - ControlCommonResourse.BottomFrameHeight;

            bodyFrameLayout.Height = this.Height;

            bodyFrameLayout.BackgroundColor = UserCenterColor.Current.BlackBackGround;



            //初始化中部控件

@@ -132,9 +135,9 @@
        {

            //用户头像

            this.btnUserIcon = new ImageView();

            btnUserIcon.Height = Application.GetMinRealAverage(280);

            btnUserIcon.Width = Application.GetMinRealAverage(280);

            btnUserIcon.Radius = (uint)Application.GetMinRealAverage(280) / 2;

            btnUserIcon.Height = this.GetPictrueRealSize(280);

            btnUserIcon.Width = this.GetPictrueRealSize(280);

            btnUserIcon.Radius = (uint)this.GetPictrueRealSize(280) / 2;

            btnUserIcon.X = Application.GetRealWidth(121);

            if (Common.Config.Instance.Home.IsVirtually == false)

            {

@@ -285,15 +288,16 @@
                frame.ButtonClickEvent += (sender, e) =>

                {

                    HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();

                    //拥有网关,或者是虚拟住宅,则进入设备列表界面

                    if (string.IsNullOrEmpty(GatewayResourse.AppOldSelectGatewayId) == false

                    || Common.Config.Instance.Home.IsVirtually == true)

                    {

                        //虚拟住宅固定进入这个界面

                        var form = new Device.DeviceListMainForm();

                        form.AddForm();

                    }

                    else

                    {

                        //没有网关,则进入网关列表界面

                        var form = new GatewayManage.GatewayListForm();

                        form.AddForm();

                    }