请合并最新代码，（优化代码格式，完成开会后的细节测试）

xm

2020-01-15 f17bb6c60db1f24ce05df96aa27d4680e2df0ce6

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

@@ -6,7 +6,11 @@
{
    public class UserDoorLockPage : DoorLockCommonLayout, ZigBee.Common.IStatus
    {

        /// <summary>

        ///  构造函数

        /// </summary>

        /// <param name="room"></param>

        /// <param name="doorLock"></param>
        public UserDoorLockPage(Shared.Common.Room room, DeviceUI doorLock)
        {
            this.doorLock = doorLock.CommonDevice as ZigBee.Device.DoorLock;
@@ -16,12 +20,30 @@
            ZigBee.Device.ZbGateway.StatusList.Add(this);
        }

        #region ◆ 变量申明__________________________
        #region  变量申明
        /// <summary>

        /// 当前门锁

        /// </summary>
        ZigBee.Device.DoorLock doorLock;
        /// <summary>

        /// 底部布局

        /// </summary>
        FrameLayout bottomFrameLayout;
        /// <summary>

        /// 当前房间

        /// </summary>
        Shared.Common.Room currentRoom;
        /// <summary>

        /// 设备UI对象

        /// </summary>
        DeviceUI deviceUI;
        /// <summary>

        /// 设置二次验证Action

        /// </summary>
        Action action;
        /// <summary>

        /// 中部布局中门锁名称显示

        /// </summary>
        Button btnDoorLockTitle;
        #endregion

@@ -85,7 +107,9 @@
 
            MidFrameLayoutContent();
        }

        /// <summary>

        /// 中部布局

        /// </summary>
        public void MidFrameLayoutContent()
        {
            #region UI
@@ -326,9 +350,10 @@
                TextSize = 12,
                TextAlignment = TextAlignment.CenterLeft,
            };
            btnCurrentFrameLayout.AddChidren(btnCurrentRoomName);
            btnCurrentFrameLayout.AddChidren(btnCurrentRoomName);

            #endregion



            #region 数据处理
            EventHandler<MouseEventArgs> hander1 = async (sender, e) =>
            {
                openFrameLayout.Enable = false;
@@ -394,10 +419,11 @@
                progressButton.Y = Application.GetRealHeight(347);
            };
            closeFrameLayout.MouseUpEventHandler += hander2;
            btnDoorClosePic.MouseUpEventHandler += hander2;
            btnDoorClosePic.MouseUpEventHandler += hander2;

            #endregion
        }

        #region ◆ 接口实现__________________________
        #region  接口实现
        /// <summary>
        /// 处理变化事件 --将弃用 改用DeviceInfoChange()
        /// </summary>