请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -66,15 +66,18 @@
        /// </summary>

        public void Show()

        {

            if (myTip != null)

            try

            {

                myTip.Show(Common.CommonPage.Instance);

                myTip = null;

                return;

                if (myTip != null)

                {

                    myTip.Show(Common.CommonPage.Instance);

                    myTip = null;

                    return;

                }

                //初始化控件

                this.InitMsgControl();

            }



            //初始化控件

            this.InitMsgControl();

            catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); }

        }



        #endregion

@@ -86,16 +89,16 @@
        /// </summary>

        private void InitMsgControl()

        {

            //添加界面

            var nowForm = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);

            if (nowForm == null || (nowForm is ViewGroup) == false)

            {

                return;

            }

            //主控件

            var frameMain = new FrameLayout();

            frameMain.BackgroundColor = UserCenterColor.Current.DialogBackColor;

            ((ViewGroup)nowForm).AddChidren(frameMain);

            Common.CommonPage.Instance.AddChidren(frameMain);

            frameMain.MouseUpEventHandler += (sender, e) =>

            {

                //移除界面

                frameMain.RemoveFromParent();

                this.ConfirmClickEvent = null;

            };



            //白色背景框

            var frameBack = new FrameLayout();