From a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 06 三月 2020 15:31:36 +0800
Subject: [PATCH] 删除了郭雪城的 DeviceUi 这个类
---
ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs
index fb9e247..191ddbd 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs
@@ -203,7 +203,7 @@
RoomButton curBtn = new RoomButton(0,0);
- foreach (var room in Common.Room.CurrentRoom.GetRoomsByFloorIdAppendLoveRoom(floorId))
+ foreach (var room in UserCenter.HdlRoomLogic.Current.GetRoomsByFloorIdAppendLoveRoom(floorId))
{
var row = new FrameLayout()
{
@@ -249,7 +249,7 @@
public void RefreshScene(Common.Room room)
{
functionSceneBodyView.RemoveAll();
- var sceneList = room.SceneUIList;
+ var sceneList = room.ListSceneId;
if (sceneList.Count == 0)
{
ShowNoSceneTip();
@@ -274,8 +274,8 @@
for (int i = 0; i < sceneList.Count; i++)
{
- var scene = sceneList[i];
- if (currentSceneUI?.Id == scene.Id)
+ var scene = UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(sceneList[i]);
+ if (scene == null || currentSceneUI?.Id == scene.Id)
{
continue;
}
--
Gitblit v1.8.0