请合并代码，优化面板问题

xm

2020-05-18 cf0bffdf072bae11bdb8c780d0a355818700f713

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

@@ -83,7 +83,7 @@
        /// <summary>
        /// 中部布局中门锁名称显示
        /// </summary>
        Button btnDoorLockTitle;
        NormalViewControl btnDoorLockTitle;
        /// <summary>
        /// 分享
        /// </summary>
@@ -252,18 +252,15 @@
            };
            this.midFrameLayout.AddChidren(midTopFrameLayout);

            //门锁标题
            btnDoorLockTitle = new Button()
            {
                Width = Application.GetRealWidth(250),
                Height = Application.GetRealHeight(60),
                X = Application.GetRealWidth(372),
                Y = Application.GetRealHeight(46),
                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextSize = 15,
                TextAlignment = TextAlignment.Center,
                IsBold = true,
            };
            //设备名称
            btnDoorLockTitle = new NormalViewControl(100, 60, true);

            btnDoorLockTitle.Y = Application.GetRealHeight(46);

            btnDoorLockTitle.TextSize = 15;

            btnDoorLockTitle.IsBold = true;
            btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);

            btnDoorLockTitle.Width = btnDoorLockTitle.GetRealWidthByText();

            btnDoorLockTitle.TextAlignment = TextAlignment.Center;

            btnDoorLockTitle.Gravity = Gravity.CenterHorizontal;

            midTopFrameLayout.AddChidren(btnDoorLockTitle);

            //记录