合并了全部的代码

黄学彪

2019-10-18 97e259d966cb5cb5d73c105d5dbaadcc1f920614

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