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

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

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

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

            {