Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

 ZigbeeApp/Shared/Common/DeviceUI.cs

@@ -312,5 +312,28 @@
        }

        #endregion

        #region ◆ 通过id获取设备区域_____________

        /// <summary>
        /// GetZone
        /// </summary>
        /// <returns></returns>
        public string GetZone()
        {
            var room = Room.CurrentRoom.GetRoomByDevice(CommonDevice);
            if (room == null)
            {
                return null;
            }
            var floorName = Shared.Common.Config.Instance.Home.GetFloorNameById(room.FloorId);
            if (floorName == null)
            {
                return room.Name;
            }
            return $"{floorName},{room.Name}";
        }

        #endregion
    }
}