代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

 ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs

@@ -65,11 +65,11 @@
            framePic.Width = Application.GetMinRealAverage(887);

            framePic.Height = Application.GetMinRealAverage(444);

            framePic.Gravity = Gravity.CenterHorizontal;

            framePic.Radius = 8;

            framePic.Radius = (uint)Application.GetRealHeight(17);

            framePic.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;

            bodyFrameLayout.AddChidren(framePic);

            var btnPic = new ImageView();

            btnPic.Radius = 8;

            btnPic.Radius = (uint)Application.GetRealHeight(17);

            framePic.AddChidren(btnPic);

            if (this.editorRoom.BackgroundImageType == 0)

            {