From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码

---
 ZigbeeApp/Shared/Common/DeviceUI.cs |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ZigbeeApp/Shared/Common/DeviceUI.cs b/ZigbeeApp/Shared/Common/DeviceUI.cs
index e217927..b5fc014 100755
--- a/ZigbeeApp/Shared/Common/DeviceUI.cs
+++ b/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)
             {

--
Gitblit v1.8.0