From bbaae33cad1dadaad27eeac712d30fff248bffa5 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 17 三月 2020 17:46:25 +0800
Subject: [PATCH] 2020-03-17-2
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneSimpleSelectControl.cs | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneSimpleSelectControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneSimpleSelectControl.cs
index 80385a1..4f68e92 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneSimpleSelectControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneSimpleSelectControl.cs
@@ -20,7 +20,7 @@
/// </summary>
public Common.SceneUI Scene
{
- get { return Common.Room.CurrentRoom.GetSceneUIBySceneId(SceneId); }
+ get { return HdlSceneLogic.Current.GetSceneUIBySceneId(SceneId); }
}
/// <summary>
/// 閫夋嫨鎺т欢
@@ -87,20 +87,11 @@
btnIcon.UnSelectedImagePath = "Scene/SceneIcon.png";
//鍦烘櫙
- var btnScene = this.AddLeftCaption(SceneTemp.Name, 850, 60);
- btnScene.TextSize = 15;
- //杩欎釜鍧愭爣鏈夌偣鐗规畩
- btnScene.Y = Application.GetRealHeight(12) + this.chidrenYaxis;
- this.AddChidren(btnScene, ChidrenBindMode.BindEventOnly);
+ this.AddTopView(SceneTemp.Name, 850);
//鎴块棿
- string roomName = Common.Room.CurrentRoom.GetRoomNameBySceneId(SceneId);
- var btnRoom = this.AddLeftCaption(roomName, 850, 50, true);
- //杩欎釜鍧愭爣鏈夌偣鐗规畩
- btnRoom.Y = Application.GetRealHeight(72) + this.chidrenYaxis;
- btnRoom.TextSize = 12;
- btnRoom.TextColor = UserCenterColor.Current.TextGrayColor1;
- this.AddChidren(btnRoom, ChidrenBindMode.BindEventOnly);
+ string roomName = HdlRoomLogic.Current.GetRoomNameBySceneId(SceneId);
+ this.AddBottomView(roomName, 850);
btnSelect = this.AddMostRightEmptyIcon(58, 58);
btnSelect.Visible = false;
--
Gitblit v1.8.0