2019.10.29-2

gxc

2019-10-29 d6b4e510f1430d19bc48da6894cf707bbe3c226d

 ZigbeeApp/Shared/Common/DeviceUI.cs

@@ -313,7 +313,7 @@

        #endregion

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

        /// <summary>
        /// GetZone
@@ -324,9 +324,9 @@
            var room = Room.CurrentRoom.GetRoomByDevice(CommonDevice);
            if (room == null)
            {
                return null;
                return Language.StringByID(R.MyInternationalizationString.UnallocatedArea);
            }
            var floorName = Shared.Common.Config.Instance.Home.GetFloorNameById(room.FloorId);
            var floorName = Config.Instance.Home.GetFloorNameById(room.FloorId);
            if (floorName == null)
            {
                return room.Name;