From c7698e163e43cea9e7f8ee45f8e3f91c9265cca4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 19:11:41 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs
index c7c8e13..bf86249 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs
@@ -22,18 +22,11 @@
/// <summary>
/// 鍦烘櫙
/// </summary>
- public Common.SceneRoomUI Scene
+ public Common.SceneUI Scene
{
get
{
- for (int i = 0; i < Common.SceneRoomUI.AllSceneRoomUIList.Count; i++)
- {
- if (Common.SceneRoomUI.AllSceneRoomUIList[i].sceneUI.Id == SceneId)
- {
- return Common.SceneRoomUI.AllSceneRoomUIList[i];
- }
- }
- return null;
+ return Common.Room.CurrentRoom.GetSceneUIBySceneId(SceneId);
}
}
@@ -55,7 +48,7 @@
var sceneTemp = this.Scene;
if (sceneTemp != null && string.IsNullOrEmpty(i_SceneName) == false)
{
- sceneTemp.sceneUI.Name = i_SceneName;
+ sceneTemp.Name = i_SceneName;
}
}
@@ -66,7 +59,7 @@
{
//鍥炬爣
var btnIcon = frameTable.AddLeftIcon(81);
- btnIcon.UnSelectedImagePath = "Item/Scene.png";
+ btnIcon.UnSelectedImagePath = "Scene/SceneIcon.png";
//鍦烘櫙
var btnSceneName = frameTable.AddLeftCaption(this.SceneName, 600, 60);
@@ -76,24 +69,24 @@
frameTable.AddChidren(btnSceneName, ChidrenBindMode.BindEventOnly);
//鎴块棿
- string roomName = string.Empty;
- var secneTemp = this.Scene;
- if (secneTemp != null)
- {
- roomName = secneTemp.room.Name;
- }
- else
- {
- //鏈垎閰嶅尯鍩�
- roomName = Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
- }
-
- var btnRoom = frameTable.AddLeftCaption(roomName, 600, 50, true);
+ var btnRoom = frameTable.AddLeftCaption("", 600, 50, true);
//杩欎釜鍧愭爣鏈夌偣鐗规畩
btnRoom.Y = Application.GetRealHeight(72) + this.chidrenYaxis;
btnRoom.TextSize = 12;
btnRoom.TextColor = UserCenterColor.Current.TextGrayColor1;
frameTable.AddChidren(btnRoom, ChidrenBindMode.BindEventOnly);
+
+ var room = Common.Room.CurrentRoom.GetRoomBySceneId(this.SceneId);
+ if (room != null)
+ {
+ btnRoom.Text = room.Name;
+ }
+ else
+ {
+ //鏈垎閰嶅尯鍩�
+ btnRoom.Text = Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
+ }
+
}
#endregion
--
Gitblit v1.8.0