From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
index 1e1babd..b0aca49 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
@@ -72,7 +72,7 @@
/// <param name="i_listDevice">璁惧瀵硅薄</param>
public void InitControl(string i_caption, List<ZigBee.Device.CommonDevice> i_listDevice)
{
- var room = Common.Room.CurrentRoom.GetRoomById(i_listDevice[0].DeviceRoomId);
+ var room = Common.LocalDevice.Current.GeteRealDeviceRoom(i_listDevice[0]);
this.InitControl(i_caption, room);
}
--
Gitblit v1.8.0