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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

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

@@ -60,7 +60,7 @@
            this.Width = Application.GetRealWidth(width);
            this.Height = Application.GetRealHeight(height);

            this.Gravity = Gravity.CenterHorizontal;

            this.Radius = (uint)Application.GetMinRealAverage(6);
            this.Radius = 6;
            this.BackgroundColor = 0xfff8f7f7;
        }