Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs

@@ -149,14 +149,10 @@
            UserView.HomePage.Instance.PageIndex += 1;



            //初始化界面框架

            this.InitForm();

            //强制显示界面,初始化完框架后,就直接显示界面
            HdlThreadLogic.Current.RunMainInThread(() =>

            {

                //执行ShowForm()方法

                this.LoadShowFormMethod(parameter);

            });

            this.InitForm();



            //执行ShowForm()方法

            this.LoadShowFormMethod(parameter);

        }



        #endregion

@@ -239,8 +235,38 @@


        #endregion

        #region ■ 清空BodyFrame______________________
        #region ■ 显示没有数据的图像显示特效_________

        /// <summary>

        /// 显示没有数据的图像显示特效

        /// </summary>

        /// <param name="frameTable">容器</param>

        /// <param name="i_Text">显示文字</param>

        /// <param name="Imagepath">图像地址</param>

        /// <param name="imageWith">图像宽度(非真实值)</param>

        /// <param name="imageHeight">图像高度(非真实值)</param>
        public void ShowNotDataImage(FrameLayout frameTable, string i_Text, string Imagepath = "Item/NoFunction.png", int imageWith = 683, int imageHeight = 392)

        {

            //还没有绑定网关哦

            var btnPic = new PicViewControl(imageWith, imageHeight);

            btnPic.UnSelectedImagePath = Imagepath;

            btnPic.Y = (int)(frameTable.Height * 0.382) - Application.GetRealHeight(imageHeight / 2);

            btnPic.Gravity = Gravity.CenterHorizontal;

            frameTable.AddChidren(btnPic);



            var btnView = new NormalViewControl(frameTable.Width, Application.GetRealHeight(50), false);

            btnView.Y = btnPic.Bottom + Application.GetRealHeight(32);

            btnView.Text = i_Text;

            btnView.TextAlignment = TextAlignment.Center;

            btnView.TextSize = 12;

            btnView.TextColor = UserCenterColor.Current.TextGrayColor1;

            frameTable.AddChidren(btnView);

            return;

        }

        #endregion


        #region ■ 清空BodyFrame______________________


        /// <summary>
        /// 清空BodyFrame
        /// </summary>