~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -44,7 +44,7 @@
			{
			get
			{
			return GetFloorNameById(FloorId);
			return Config.Instance.Home.GetFloorNameById(FloorId);
			}
			}
			/// <summary>
			@@ -462,6 +462,17 @@
			return Lists.Find((obj) => obj.Id == roomId);
			}


			/// <summary>
			/// 根据房间名字，获取房间对象
			/// </summary>
			/// <returns>The room by name.</returns>
			/// <param name="roomName">房间名</param>
			public Room GetRoomByName(string roomName)
			{
			return Lists.Find((obj) => obj.Name == roomName);
			}

			/// <summary>
			/// 根据设备获取房间名字(楼层+房间名)
			/// </summary>
			@@ -532,6 +543,20 @@
			return null;
			}

			/// <summary>
			/// 获取多个房间的连接起来的名字
			/// </summary>
			/// <param name="listName"></param>
			/// <returns></returns>
			public string GetRoomName(List<string> listName)
			{
			if (listName.Count == 0)
			{
			//未分配区域
			return Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
			}
			return string.Join(",", listName);
			}

			#endregion

			@@ -702,7 +727,6 @@
			#endregion

			#region ◆ 删除设备_________________________

			/// <summary>
			/// 删除功能-设备
			/// </summary>
			@@ -1323,33 +1347,6 @@
			}

			#endregion

			#region ◆ 楼层___________________________

			/// <summary>
			/// 获取楼层名称
			/// </summary>
			/// <param name="floorId"></param>
			/// <returns></returns>
			public string GetFloorNameById(string floorId)
			{
			if (Config.Instance.Home.FloorDics.Count == 0)
			{
			return null;
			}

			foreach (var floor in Config.Instance.Home.FloorDics)
			{
			if (floorId == floor.Key)
			{
			return floor.Value;
			}
			}
			return null;
			}

			#endregion


			}
			}