From eeede84600c7db36f1886e8107344d48320736c4 Mon Sep 17 00:00:00 2001 From: gallonyin Date: Mon, 25 Sep 2023 23:23:51 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E7=BE=A4=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E5=90=8D=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/yameida/worktool/service/WeworkLoopImpl.kt | 2 +- .../main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) 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