From bbaae33cad1dadaad27eeac712d30fff248bffa5 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 17 三月 2020 17:46:25 +0800
Subject: [PATCH] 2020-03-17-2
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 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..0557f56 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
@@ -61,7 +61,7 @@
/// <param name="i_device">璁惧瀵硅薄</param>
public void InitControl(string i_caption, ZigBee.Device.CommonDevice i_device)
{
- var room = Common.Room.CurrentRoom.GetRoomByDevice(i_device);
+ var room = HdlRoomLogic.Current.GetRoomByDevice(i_device);
this.InitControl(i_caption, room);
}
@@ -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);
}
@@ -158,10 +158,10 @@
/// </summary>
private void InitData()
{
- var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
+ var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
if (dicFloor.Count == 0)
{
- var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(string.Empty, false);
+ var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(string.Empty, false);
if (listRoom.Count > 0)
{
//鎴块棿鍚嶅瓧鍜屼富閿敹闆�
@@ -180,7 +180,7 @@
{
foreach (string fKeys in dicFloor.Keys)
{
- var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(fKeys, false);
+ var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(fKeys, false);
if (listRoom.Count > 0)
{
//妤煎眰鍚嶅瓧鍜屼富閿敹闆�
--
Gitblit v1.8.0