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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -125,6 +125,10 @@
            {

                btnTitle.TextID = R.MyInternationalizationString.NormalTip;

            }

            else if (msgType == ShowMsgType.Remind)

            {

                btnTitle.TextID = R.MyInternationalizationString.uRemind;

            }



            //消息

            var btnMsg = new NormalViewControl(frameBack.Width - Application.GetRealWidth(55 * 2), Application.GetRealHeight(180), false);