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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 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);

        }