From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneSimpleSelectControl.cs | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 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..4c2b4d5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneSimpleSelectControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneSimpleSelectControl.cs
@@ -5,7 +5,7 @@
namespace Shared.Phone.UserCenter
{
/// <summary>
- /// 鍋氭垚涓�涓畝鍗曞満鏅�夋嫨鐨勮鎺т欢
+ /// 鍋氭垚涓�涓畝鍗曞満鏅�夋嫨鐨勮鎺т欢(瀹冧細鑷姩璁剧疆閫夋嫨鐘舵��)
/// </summary>
public class SceneSimpleSelectControl : FrameRowControl
{
@@ -20,7 +20,7 @@
/// </summary>
public Common.SceneUI Scene
{
- get { return Common.Room.CurrentRoom.GetSceneUIBySceneId(SceneId); }
+ get { return HdlSceneLogic.Current.GetSceneUIBySceneId(SceneId); }
}
/// <summary>
/// 閫夋嫨鎺т欢
@@ -62,10 +62,10 @@
#region 鈻� 鍒濆鍖朹____________________________
/// <summary>
- /// 鍋氭垚涓�涓畝鍗曞満鏅�夋嫨鐨勮鎺т欢
+ /// 鍋氭垚涓�涓畝鍗曞満鏅�夋嫨鐨勮鎺т欢(瀹冧細鑷姩璁剧疆閫夋嫨鐘舵��)
/// </summary>
/// <param name="i_Scene">鍦烘櫙瀵硅薄</param>
- /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param>
+ /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
public SceneSimpleSelectControl(Common.SceneUI i_Scene, int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
{
this.SceneId = i_Scene.Id;
@@ -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