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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

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

@@ -36,7 +36,7 @@
        {

            this.Height = Application.GetRealHeight(256);

            this.BackgroundColor = UserCenterColor.Current.White;

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

            this.Radius = 6;

        }



        /// <summary>