tanjianbin/lzwcai-terminal-worktool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 合并发送

Browse Source
This commit is contained in:
gallonyin
2023-04-07 17:03:31 +08:00
parent fbdbdd6936
commit 0967f092f8
2 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/yameida/worktool/service/WeworkController.kt
View File

@@ -443,19 +443,16 @@ object WeworkController {
/** /**
* 批量发送 * 批量发送
* @see WeworkMessageBean.SEND_MULTI_MESSAGE * @see WeworkMessageBean.SEND_MULTI_MESSAGE
* @param message#titleList 房间名称 * @param message#weworkMessageList 消息列表
* @param message#messageList 消息列表
* @param message#nameList 待转发姓名列表 * @param message#nameList 待转发姓名列表
* @param message#extraText 附加留言 选填 * @param message#extraText 附加留言 选填
* @see WeworkMessageBean.TEXT_TYPE
*/ */
@RequestMapping @RequestMapping
fun sendMultiMessage(message: WeworkMessageBean): Boolean { 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( return WeworkOperationImpl.sendMultiMessage(
message, message,
message.titleList, message.weworkMessageList,
message.messageList,
message.nameList, message.nameList,
message.extraText message.extraText
) )
@@ -464,11 +461,9 @@ object WeworkController {
/** /**
* 合并发送 * 合并发送
* @see WeworkMessageBean.SEND_MERGE_MESSAGE * @see WeworkMessageBean.SEND_MERGE_MESSAGE
* @param message#titleList 房间名称
* @param message#weworkMessageList 消息列表 * @param message#weworkMessageList 消息列表
* @param message#nameList 待转发姓名列表 * @param message#nameList 待转发姓名列表
* @param message#extraText 附加留言 选填 * @param message#extraText 附加留言 选填
* @see WeworkMessageBean.TEXT_TYPE
*/ */
@RequestMapping @RequestMapping
fun sendMergeMessage(message: WeworkMessageBean): Boolean { fun sendMergeMessage(message: WeworkMessageBean): Boolean {

39
app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
View File

@@ -861,20 +861,18 @@ object WeworkOperationImpl {
/** /**
* 批量发送 * 批量发送
* @see WeworkMessageBean.SEND_MULTI_MESSAGE * @see WeworkMessageBean.SEND_MULTI_MESSAGE
* @param titleList 房间名称 * @param weworkMessageList 消息列表
* @param messageList 消息列表
* @param nameList 待转发姓名列表 * @param nameList 待转发姓名列表
* @param extraText 附加留言 选填 * @param extraText 附加留言 选填
* @see WeworkMessageBean.TEXT_TYPE * @see WeworkMessageBean.TEXT_TYPE
*/ */
fun sendMultiMessage( fun sendMultiMessage(
message: WeworkMessageBean, message: WeworkMessageBean,
titleList: List<String>, weworkMessageList: List<WeworkMessageBean>,
messageList: List<WeworkMessageBean.SubMessageBean>,
nameList: List<String>, nameList: List<String>,
extraText: String? = null extraText: String? = null
): Boolean { ): Boolean {
return relayMultiMessage(message, titleList, messageList, nameList, extraText, "逐条转发") return sendMultiMessage(message, weworkMessageList, nameList, extraText, "逐条转发")
} }
/** /**
@@ -890,10 +888,24 @@ object WeworkOperationImpl {
weworkMessageList: List<WeworkMessageBean>, weworkMessageList: List<WeworkMessageBean>,
nameList: List<String>, nameList: List<String>,
extraText: String? = null extraText: String? = null
): Boolean {
return sendMultiMessage(message, weworkMessageList, nameList, extraText, "合并转发")
}
/**
* 批量发送 合并发送
*/
private fun sendMultiMessage(
message: WeworkMessageBean,
weworkMessageList: List<WeworkMessageBean>,
nameList: List<String>,
extraText: String? = null,
key: String
): Boolean { ): Boolean {
val startTime = System.currentTimeMillis() val startTime = System.currentTimeMillis()
val groupName = "消息转发专用群" val groupName = "消息转发专用群"
message.titleList = arrayListOf(groupName) val titleList = arrayListOf(groupName)
message.titleList = titleList
if (!WeworkRoomUtil.isGroupExists(groupName)) { if (!WeworkRoomUtil.isGroupExists(groupName)) {
if (!createGroup()) { if (!createGroup()) {
uploadCommandResult(message, ExecCallbackBean.ERROR_CREATE_GROUP, "创建群失败", startTime, listOf(), listOf(groupName)) 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<String>,
extraText: String? = null,
key: String
): Boolean {
val titleList = arrayListOf(groupName)
if (WeworkRoomUtil.intoRoom(groupName)) { if (WeworkRoomUtil.intoRoom(groupName)) {
if (WeworkTextUtil.longClickMyMessageItem( if (WeworkTextUtil.longClickMyMessageItem(
//聊天消息列表 1ListView 0RecycleView xViewGroup //聊天消息列表 1ListView 0RecycleView xViewGroup