请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs

@@ -54,21 +54,21 @@
            this.frameTable = new FrameLayout();

            frameTable.Height = this.Height;

            frameTable.Width = this.Width;

            frameTable.Radius = 20;

            frameTable.Radius = (uint)Application.GetRealHeight(58);

            frameTable.BackgroundColor = UserCenterColor.Current.White;

            this.AddChidren(frameTable);



            //右上圆角背景

            var btnTopRight = new NormalViewControl(150, 60, true);

            btnTopRight.BackgroundColor = UserCenterColor.Current.White;

            btnTopRight.Radius = 6;

            btnTopRight.RadiusEx = 17;

            this.AddChidren(btnTopRight);

            btnTopRight.X = this.Width - btnTopRight.Width;



            //左下圆角背景

            var btnBottomRight = new NormalViewControl(150, 60, true);

            btnBottomRight.BackgroundColor = UserCenterColor.Current.White;

            btnBottomRight.Radius = 6;

            btnBottomRight.RadiusEx = 17;

            this.AddChidren(btnBottomRight);

            btnBottomRight.Y = this.Height - btnBottomRight.Height;