From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs
index bf86249..f9d213d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs
@@ -26,7 +26,7 @@
{
get
{
- return Common.Room.CurrentRoom.GetSceneUIBySceneId(SceneId);
+ return HdlSceneLogic.Current.GetSceneUIBySceneId(SceneId);
}
}
@@ -76,7 +76,7 @@
btnRoom.TextColor = UserCenterColor.Current.TextGrayColor1;
frameTable.AddChidren(btnRoom, ChidrenBindMode.BindEventOnly);
- var room = Common.Room.CurrentRoom.GetRoomBySceneId(this.SceneId);
+ var room = HdlRoomLogic.Current.GetRoomBySceneId(this.SceneId);
if (room != null)
{
btnRoom.Text = room.Name;
--
Gitblit v1.8.0