diff --git a/app/src/main/java/org/yameida/worktool/service/WeworkController.kt b/app/src/main/java/org/yameida/worktool/service/WeworkController.kt index 8339ff4..4ad618e 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkController.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkController.kt @@ -443,19 +443,16 @@ object WeworkController { /** * 批量发送 * @see WeworkMessageBean.SEND_MULTI_MESSAGE - * @param message#titleList 房间名称 - * @param message#messageList 消息列表 + * @param message#weworkMessageList 消息列表 * @param message#nameList 待转发姓名列表 * @param message#extraText 附加留言 选填 - * @see WeworkMessageBean.TEXT_TYPE */ @RequestMapping fun sendMultiMessage(message: WeworkMessageBean): Boolean { - LogUtils.d("sendMultiMessage(): ${message.titleList} ${message.messageList} ${message.nameList} ${message.extraText}") + LogUtils.d("sendMultiMessage(): ${message.weworkMessageList} ${message.nameList} ${message.extraText}") return WeworkOperationImpl.sendMultiMessage( message, - message.titleList, - message.messageList, + message.weworkMessageList, message.nameList, message.extraText ) @@ -464,11 +461,9 @@ object WeworkController { /** * 合并发送 * @see WeworkMessageBean.SEND_MERGE_MESSAGE - * @param message#titleList 房间名称 * @param message#weworkMessageList 消息列表 * @param message#nameList 待转发姓名列表 * @param message#extraText 附加留言 选填 - * @see WeworkMessageBean.TEXT_TYPE */ @RequestMapping fun sendMergeMessage(message: WeworkMessageBean): Boolean { diff --git a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt index 0f6256d..b04c869 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt @@ -861,20 +861,18 @@ object WeworkOperationImpl { /** * 批量发送 * @see WeworkMessageBean.SEND_MULTI_MESSAGE - * @param titleList 房间名称 - * @param messageList 消息列表 + * @param weworkMessageList 消息列表 * @param nameList 待转发姓名列表 * @param extraText 附加留言 选填 * @see WeworkMessageBean.TEXT_TYPE */ fun sendMultiMessage( message: WeworkMessageBean, - titleList: List, - messageList: List, + weworkMessageList: List, nameList: List, extraText: String? = null ): Boolean { - return relayMultiMessage(message, titleList, messageList, nameList, extraText, "逐条转发") + return sendMultiMessage(message, weworkMessageList, nameList, extraText, "逐条转发") } /** @@ -890,10 +888,24 @@ object WeworkOperationImpl { weworkMessageList: List, nameList: List, extraText: String? = null + ): Boolean { + return sendMultiMessage(message, weworkMessageList, nameList, extraText, "合并转发") + } + + /** + * 批量发送 合并发送 + */ + private fun sendMultiMessage( + message: WeworkMessageBean, + weworkMessageList: List, + nameList: List, + extraText: String? = null, + key: String ): Boolean { val startTime = System.currentTimeMillis() val groupName = "消息转发专用群" - message.titleList = arrayListOf(groupName) + val titleList = arrayListOf(groupName) + message.titleList = titleList if (!WeworkRoomUtil.isGroupExists(groupName)) { if (!createGroup()) { uploadCommandResult(message, ExecCallbackBean.ERROR_CREATE_GROUP, "创建群失败", startTime, listOf(), listOf(groupName)) @@ -932,21 +944,6 @@ object WeworkOperationImpl { } } } - return sendMultiMessage(message, groupName, startTime, nameList, extraText, "合并转发") - } - - /** - * 批量发送 合并发送 - */ - private fun sendMultiMessage( - message: WeworkMessageBean, - groupName: String, - startTime: Long, - nameList: List, - extraText: String? = null, - key: String - ): Boolean { - val titleList = arrayListOf(groupName) if (WeworkRoomUtil.intoRoom(groupName)) { if (WeworkTextUtil.longClickMyMessageItem( //聊天消息列表 1ListView 0RecycleView xViewGroup