From 1f6f024bddf48dea1c17c54ade1535a10ef7b39b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 23 三月 2020 17:16:37 +0800
Subject: [PATCH] 2020-03-23-2
---
ZigbeeApp/Shared/Common/SceneRoomUI.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/SceneRoomUI.cs b/ZigbeeApp/Shared/Common/SceneRoomUI.cs
index b0b7717..b6e5613 100755
--- a/ZigbeeApp/Shared/Common/SceneRoomUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneRoomUI.cs
@@ -26,15 +26,17 @@
{
//閫夋嫨鍦烘櫙--鎵�鏈夋埧闂寸殑鎵�鏈夊満鏅�
AllSceneRoomUIList.Clear();
- List<int> sceneIdList = new List<int> { };
- foreach (var r in Shared.Common.Room.Lists)
+ List<int> sceneIdList = new List<int> { };
+ var listAllRoom = Phone.UserCenter.HdlRoomLogic.Current.GetAllListRooms();
+ foreach (var r in listAllRoom)
{
- if (r.SceneUIList.Count == 0)
+ if (r.ListSceneId.Count == 0)
{
continue;
}
- foreach (var scene in r.SceneUIList)
+ foreach (var sceneId in r.ListSceneId)
{
+ var scene = Phone.UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
if (scene == null)
{
continue;
@@ -55,6 +57,6 @@
[Newtonsoft.Json.JsonIgnore]
public static List<SceneRoomUI> AllSceneRoomUIList = new List<SceneRoomUI> { };
-
+
}
}
--
Gitblit v1.8.0