合并了代码

黄学彪

2019-10-28 1f5636d69332170ea3a41c76c9519f6ff6f0a8d9

 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);