Merge branch 'dev-tzy' into dev-2020xm

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

 ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceDoorLockRowControl.cs

@@ -25,9 +25,9 @@
        /// 初始化控件

        /// </summary>

        /// <param name="i_device"></param>

        public override void InitControl(CommonDevice i_device)

        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)

        {

            base.InitControl(i_device);

            base.InitControl(i_device, i_nowSelectRoom);



            //如果住宅为虚拟住宅,此功能无效

            if (Common.Config.Instance.Home.IsVirtually == false)

@@ -49,7 +49,7 @@
            //深度卡片信息

            this.frameTable.ButtonClickEvent += (sender, e) =>

            {

                var userDoorLockPage = new UserCenter.DoorLock.UserDoorLockPage(UserCenter.HdlRoomLogic.Current.CurrentRoom, i_device);

                var userDoorLockPage = new UserCenter.DoorLock.UserDoorLockPage(this.nowSelectRoom, i_device);

                UserView.HomePage.Instance.AddChidren(userDoorLockPage);

                UserView.HomePage.Instance.PageIndex += 1;

                userDoorLockPage.Show();