Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -53,7 +53,7 @@
        {

            this.frameTable = new FrameLayout();

            frameTable.Gravity = Gravity.CenterHorizontal;

            frameTable.Radius = 8;

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

            frameTable.Height= Application.GetRealHeight(260);

            frameTable.Width = Application.GetRealWidth(968);

            frameTable.BackgroundColor = UserCenterColor.Current.White;