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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomLeftClickButton.cs

@@ -42,14 +42,14 @@
        /// <param name="i_width">宽度,真实值</param>

        /// <param name="i_height">高度,真实值</param>

        /// <param name="i_radius">圆角度(只对安卓有效)</param>

        public BottomLeftClickButton(int i_width, int i_height, uint i_radius = 8)

        public BottomLeftClickButton(int i_width, int i_height, int i_radius = 17)

        {

            this.Height = i_height;

            this.Width = i_width;

            this.Gravity = Gravity.BottomLeft;



#if Android

            this.Radius = i_radius;

            this.RadiusEx = i_radius;

#endif

        }