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

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

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

old mode 100644
new mode 100755
@@ -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()

            {