Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs

@@ -112,9 +112,9 @@
            ((ViewGroup)nowForm).AddChidren(MsgControlFrameLayout);

            MsgControlFrameLayout.MouseDownEventHandler += (sender, e) =>

            {

                if (msgType == DoorLockMsgType.InValid)
                {
                    return;
                if (msgType == DoorLockMsgType.InValid)

                {

                    return;

                }



                //移除界面

@@ -236,7 +236,7 @@
        /// <param name="frameBack"></param>

        private void InitInValidTimeDialog(FrameLayout frameBack)

        {

            //消息 
            //消息

            string[] msgArray = msgText.Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);

            var btnMsg1 = new Button()

            {

@@ -343,16 +343,16 @@
                this.InvalidClickEvent?.Invoke();

                this.InvalidClickEvent = null;

            };

        }

        }



        /// <summary>

        /// 失效时间的底部按钮

        /// </summary>

        /// <param name="frameMain"></param>

        /// <param name="frameBack"></param>

        private void InitBottomInvalidTimeButton(FrameLayout frameMain, FrameLayout frameBack)

        {
            //确定按钮
        {

            //确定按钮

            var btnConfirm = new BottomRightClickButton(frameBack.Width, Application.GetRealHeight(127));

            frameBack.AddChidren(btnConfirm);

            btnConfirm.InitControl(buttonOkText);