From 136b9e2fc48249a5ff89874f1080ba94130e7a9e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 19 五月 2020 11:12:29 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDoorLockCardControl.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDoorLockCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDoorLockCardControl.cs
index fdc89bc..bc8a1b5 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDoorLockCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDoorLockCardControl.cs
@@ -16,9 +16,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)
{
@@ -41,7 +41,7 @@
{
Common.CommonPage.Instance.IsDrawerLockMode = true;
- var userDoorLockPage = new UserCenter.DoorLock.UserDoorLockPage(UserCenter.HdlRoomLogic.Current.CurrentRoom, i_device);
+ var userDoorLockPage = new UserCenter.DoorLock.UserDoorLockPage(this.nowSelectRoom, i_device);
userDoorLockPage.IsDrawerLockMode = true;
UserView.HomePage.Instance.AddChidren(userDoorLockPage);
UserView.HomePage.Instance.PageIndex += 1;
--
Gitblit v1.8.0