From 8b4d79ca03495e522a1953e04ca17527f33c853a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 28 十月 2019 13:22:17 +0800
Subject: [PATCH] 合并完成代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs
index 521cd86..c7c8e13 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs
@@ -84,7 +84,8 @@
}
else
{
- roomName = Common.Room.CurrentRoom.GetRoomName(new List<string>());
+ //鏈垎閰嶅尯鍩�
+ roomName = Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
}
var btnRoom = frameTable.AddLeftCaption(roomName, 600, 50, true);
--
Gitblit v1.8.0