上传个东西

黄学彪

2020-04-13 3793a9a38ac6c4c4111c2bba3a35a71c30601e82

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs

@@ -307,10 +307,19 @@
        /// </summary>

        /// <returns>房间名</returns>

        /// <param name="device">设备对象</param>

        /// <param name="append">在楼层和房间名字的中间添加的字符(仅限有楼层的时候有效)</param>

        public string GetRoomNameByDevice(CommonDevice device, string append = " ")

        public string GetRoomNameByDevice(CommonDevice device)

        {

            var room = this.GetRoomByDevice(device);

            return this.GetFloorRoomName(room);

        }



        /// <summary>

        /// 获取房间名字(楼层+房间名)

        /// </summary>

        /// <returns>房间名</returns>

        /// <param name="room">房间对象</param>

        public string GetFloorRoomName(Room room)

        {

            if (room == null)

            {

                //未分配区域

@@ -319,7 +328,7 @@
            if (Config.Instance.Home.FloorDics.ContainsKey(room.FloorId) == true)

            {

                //(楼层+房间名)

                return Config.Instance.Home.FloorDics[room.FloorId] + append + room.Name;

                return Config.Instance.Home.FloorDics[room.FloorId] + " " + room.Name;

            }

            return room.Name;

        }