全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

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

@@ -186,12 +186,28 @@
                {

                    var frameContr = new FrameLayout();

                    frameContr.Height = Application.GetRealHeight(470);

                    frameContr.Gravity = Gravity.CenterHorizontal;

                    listView.AddChidrenFrame(frameContr);



                    //场景图片

                    var btnPic = new PicViewControl(878, 470, true);

                    btnPic.Gravity = Gravity.CenterHorizontal;

                    btnPic.UnSelectedImagePath = data.IconPath;

                    var btnPic = new ImageView();

                    btnPic.X = Application.GetRealWidth(179);

                    btnPic.Width = Application.GetRealWidth(844);

                    btnPic.Height = Application.GetRealHeight(420);

                    btnPic.ImagePath = data.IconPath;

                    btnPic.Radius = 17;

                    frameContr.AddChidren(btnPic);



                    var btnName = new NormalViewControl(251, 282, true);

                    btnName.X = ControlCommonResourse.XXLeft;

                    btnName.Gravity = Gravity.CenterVertical;

                    btnName.BackgroundColor = 0xff333333;

                    btnName.Radius = 17;

                    btnName.Text = data.Name;

                    btnName.TextSize = 15;

                    btnName.TextColor = UserCenterColor.Current.White;

                    btnName.TextAlignment = TextAlignment.Center;

                    frameContr.AddChidren(btnName);

                }

            });

        }