Merge branch 'dev-tzy' into dev-2020xm

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs

@@ -196,7 +196,7 @@
        {

#if Android

            //确认

            var frameConfirm = new FrameLayoutControl();

            var frameConfirm = new FrameLayoutStatuControl();

            frameConfirm.Height = Application.GetRealHeight(127);

            frameConfirm.Width = frameBack.Width;

            frameConfirm.Gravity = Gravity.BottomCenter;