合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs

@@ -190,14 +190,14 @@
                    btnPic.Width = Application.GetRealWidth(844);

                    btnPic.Height = Application.GetRealHeight(420);

                    btnPic.ImagePath = data.IconPath;

                    btnPic.Radius = 17;

                    btnPic.Radius = 8;

                    frameContr.AddChidren(btnPic);



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

                    btnName.X = ControlCommonResourse.XXLeft;

                    btnName.Gravity = Gravity.CenterVertical;

                    btnName.Y = Application.GetRealHeight(58);

                    btnName.BackgroundColor = 0xff333333;

                    btnName.Radius = 17;

                    btnName.Radius = 8;

                    btnName.Text = data.Name;

                    btnName.TextSize = 15;

                    btnName.TextColor = UserCenterColor.Current.White;

@@ -264,13 +264,13 @@
                }

                else

                {

                    var frameBack = new FrameLayoutControl(false);

                    var frameBack = new FrameLayout();

                    frameBack.X = ControlCommonResourse.XXLeft;

                    frameBack.Y = Application.GetRealHeight(178);

                    frameBack.BackgroundColor = UserCenterColor.Current.White;

                    frameBack.Width = bodyFrameLayout.Width;

                    frameBack.Height = Application.GetRealHeight(1650);

                    frameBack.RadiusEx = 20;

                    frameBack.Radius = 20;

                    frameDeviceTable.AddChidren(frameBack);



                    var listView = new VerticalListControl(23);