diff --git a/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt b/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt index afd2da0..6867e7a 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt @@ -169,7 +169,7 @@ object WeworkLoopImpl { titleList = WeworkRoomUtil.getFriendName() } else if (Constant.fullGroupName && (roomType == WeworkMessageBean.ROOM_TYPE_INTERNAL_GROUP || roomType == WeworkMessageBean.ROOM_TYPE_EXTERNAL_GROUP)) { - titleList = WeworkRoomUtil.getGroupName() + titleList = WeworkRoomUtil.getFullGroupTitle() } } if (roomType != WeworkMessageBean.ROOM_TYPE_UNKNOWN && titleList.size > 0) { diff --git a/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt b/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt index d20efda..6c1a3ea 100644 --- a/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt +++ b/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt @@ -249,13 +249,16 @@ object WeworkRoomUtil { /** * 获取当前群名并返回房间 - * 解决title为对方正在输入中问题 + * 如果有群备注则列表先插入群备注 * @return name 单聊对方姓名 */ - fun getGroupName(): ArrayList { + fun getFullGroupTitle(): ArrayList { val titleList = arrayListOf() if (intoGroupManager()) { val groupInfo = WeworkGetImpl.getGroupInfoDetail() + if (!groupInfo.groupRemark.isNullOrEmpty()) { + titleList.add(groupInfo.groupRemark) + } titleList.add(groupInfo.groupName) } return titleList