From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

---
 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