合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/ScenePictrueControl.cs

@@ -17,7 +17,7 @@
        public ScenePictrueControl()

        {

            this.UseClickStatu = false;

            this.Height = Application.GetRealHeight(470);

            this.Height = Application.GetRealHeight(420);

        }



        /// <summary>

@@ -30,7 +30,7 @@
            var btnPic = new ImageView();

            btnPic.X = Application.GetRealWidth(179);

            btnPic.Width = Application.GetRealWidth(844);

            btnPic.Height = Application.GetRealHeight(420);

            btnPic.Height = Application.GetRealHeight(397);

            if (sceneUI.IconPathType == 0)

            {

                btnPic.ImagePath = sceneUI.IconPath;