From 5da99fed2eb0d08b6338064da5f998891252c7b8 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期一, 18 五月 2020 16:39:59 +0800 Subject: [PATCH] 2020-05-18-2 --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs | 6 +++--- 1 files changed, 3 insertions(+), 3 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..a1719ae 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); } } @@ -39,7 +39,7 @@ /// </summary> /// <param name="i_SceneId">鍦烘櫙ID</param> /// <param name="i_SceneName">鍦烘櫙鍚�</param> - /// <param name="i_chidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param> + /// <param name="i_chidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param> public SceneRoomControl(int i_SceneId, string i_SceneName, int i_chidrenYaxis) : base(i_chidrenYaxis) { this.SceneId = i_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