Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -34,7 +34,7 @@
        public SafeguardLogControl()

        {

            this.BackgroundColor = UserCenterColor.Current.White;

            this.Radius = (uint)Application.GetMinRealAverage(17);

            this.Radius = 17;

            this.Height = Application.GetRealHeight(260);

        }