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

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -19,6 +19,10 @@
        /// </summary>

        public Action CancelClickEvent = null;

        /// <summary>

        /// 点击背景是否关闭弹窗

        /// </summary>

        public bool CloseByClickBack = true;

        /// <summary>

        /// 信息类型

        /// </summary>

        private ShowMsgType msgType = ShowMsgType.Confirm;

@@ -105,9 +109,12 @@
            Common.CommonPage.Instance.AddChidren(frameMain);

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

            {

                //移除界面

                frameMain.RemoveFromParent();

                this.ConfirmClickEvent = null;

                if (this.CloseByClickBack == true)

                {

                    //移除界面

                    frameMain.RemoveFromParent();

                    this.ConfirmClickEvent = null;

                }

            };



            //白色背景框