Merge branch 'DEV_GXC' of http://172.16.1.23:6688/r/~xm/HomeApp into DEV_GXC

gxc

2019-10-29 ed2f4a97aa48cdb4a013d2a389877f52eb3eccdf

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