From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期五, 12 六月 2020 09:22:04 +0800
Subject: [PATCH] 2020.06.12
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 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..5582faa 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;
@@ -66,7 +66,7 @@
btnSceneName.TextSize = 15;
//杩欎釜鍧愭爣鏈夌偣鐗规畩
btnSceneName.Y = Application.GetRealHeight(12) + this.chidrenYaxis;
- frameTable.AddChidren(btnSceneName, ChidrenBindMode.BindEventOnly);
+ frameTable.AddChidren(btnSceneName, ChidrenBindMode.BindEvent);
//鎴块棿
var btnRoom = frameTable.AddLeftCaption("", 600, 50, true);
@@ -74,9 +74,9 @@
btnRoom.Y = Application.GetRealHeight(72) + this.chidrenYaxis;
btnRoom.TextSize = 12;
btnRoom.TextColor = UserCenterColor.Current.TextGrayColor1;
- frameTable.AddChidren(btnRoom, ChidrenBindMode.BindEventOnly);
+ frameTable.AddChidren(btnRoom, ChidrenBindMode.BindEvent);
- 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