合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

 ZigbeeApp/Shared/Common/DeviceUI.cs

@@ -339,6 +339,10 @@
            {
                return Language.StringByID(R.MyInternationalizationString.UnallocatedArea);
            }
            if(string.IsNullOrEmpty(room.FloorId))
            {
                return room.Name;
            }
            var floorName = Config.Instance.Home.GetFloorNameById(room.FloorId);
            if (floorName == null)
            {