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

update meta自定义信息

Browse Source
This commit is contained in:
gallonyin
2023-09-17 01:20:31 +08:00
parent c6774ad211
commit e761434440
6 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/yameida/worktool/model/WeworkMessageBean.java
View File

@@ -179,6 +179,8 @@ public class WeworkMessageBean {
//消息id(解析指令时同步) //消息id(解析指令时同步)
public String messageId; public String messageId;
//meta自定义信息(解析指令时同步)
public String meta;
//api类型(解析指令时同步) 0=后台消息 1=API指令调用 //api类型(解析指令时同步) 0=后台消息 1=API指令调用
public Integer apiSend; public Integer apiSend;

5
app/src/main/java/org/yameida/worktool/model/WeworkMessageListBean.kt
View File

@@ -28,6 +28,8 @@ class WeworkMessageListBean<T> {
//消息id //消息id
var messageId = TimeUtils.date2String(Date()).replace(" ", "#") + "#" + UUID.randomUUID() var messageId = TimeUtils.date2String(Date()).replace(" ", "#") + "#" + UUID.randomUUID()
var meta: String? = null
//api类型 0=后台消息 1=API指令调用 //api类型 0=后台消息 1=API指令调用
var apiSend: Int? = null var apiSend: Int? = null
@@ -40,7 +42,7 @@ class WeworkMessageListBean<T> {
//消息加密 0不加密 1AES //消息加密 0不加密 1AES
var encryptType = Constant.encryptType var encryptType = Constant.encryptType
constructor(weworkMessageBean: T, type: Int, messageId: String? = null) { constructor(weworkMessageBean: T, type: Int, messageId: String? = null, meta: String? = null) {
if (encryptType == 0) { if (encryptType == 0) {
list.add(weworkMessageBean) list.add(weworkMessageBean)
} else if (encryptType == 1) { } else if (encryptType == 1) {
@@ -53,6 +55,7 @@ class WeworkMessageListBean<T> {
} }
this.socketType = type this.socketType = type
if (messageId != null) this.messageId = messageId if (messageId != null) this.messageId = messageId
if (meta != null) this.meta = meta
} }
constructor(messageId: String, type: Int) { constructor(messageId: String, type: Int) {

3
app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt
View File

@@ -230,7 +230,8 @@ fun uploadCommandResult(message: WeworkMessageBean, errorCode: Int, errorReason:
WeworkMessageListBean( WeworkMessageListBean(
ExecCallbackBean(GsonUtils.toJson(message), errorCode, errorReason, startTime, (System.currentTimeMillis() - startTime) / 1000.0, successList, failList), ExecCallbackBean(GsonUtils.toJson(message), errorCode, errorReason, startTime, (System.currentTimeMillis() - startTime) / 1000.0, successList, failList),
WeworkMessageListBean.SOCKET_TYPE_RAW_CONFIRM, WeworkMessageListBean.SOCKET_TYPE_RAW_CONFIRM,
messageId = message.messageId messageId = message.messageId,
meta = message.meta
), true ), true
) )
if (errorCode != 0) { if (errorCode != 0) {

1
app/src/main/java/org/yameida/worktool/service/MyLooper.kt
View File

@@ -119,6 +119,7 @@ object MyLooper {
what = messageWhat what = messageWhat
obj = message.apply { obj = message.apply {
messageId = messageList.messageId messageId = messageList.messageId
meta = messageList.meta
apiSend = messageList.apiSend apiSend = messageList.apiSend
} }
}) })

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

@@ -1093,6 +1093,7 @@ object WeworkOperationImpl {
for (weworkMessage in weworkMessageList) { for (weworkMessage in weworkMessageList) {
weworkMessage.titleList = message.titleList weworkMessage.titleList = message.titleList
weworkMessage.messageId = message.messageId weworkMessage.messageId = message.messageId
weworkMessage.meta = message.meta
when (weworkMessage.type) { when (weworkMessage.type) {
WeworkMessageBean.SEND_MESSAGE -> { WeworkMessageBean.SEND_MESSAGE -> {
WeworkController.sendMessage(weworkMessage) WeworkController.sendMessage(weworkMessage)
@@ -1138,6 +1139,7 @@ object WeworkOperationImpl {
for (weworkMessage in weworkMessageList) { for (weworkMessage in weworkMessageList) {
weworkMessage.titleList = titleList weworkMessage.titleList = titleList
weworkMessage.messageId = message.messageId weworkMessage.messageId = message.messageId
weworkMessage.meta = message.meta
when (weworkMessage.type) { when (weworkMessage.type) {
WeworkMessageBean.SEND_MESSAGE -> { WeworkMessageBean.SEND_MESSAGE -> {
WeworkController.sendMessage(weworkMessage) WeworkController.sendMessage(weworkMessage)

2
app/src/main/java/org/yameida/worktool/utils/WebSocketManager.java
View File

@@ -53,7 +53,7 @@ public class WebSocketManager {
} }
public void send(WeworkMessageBean msg) { public void send(WeworkMessageBean msg) {
send(new WeworkMessageListBean(msg, WeworkMessageListBean.SOCKET_TYPE_MESSAGE_LIST, null)); send(new WeworkMessageListBean(msg, WeworkMessageListBean.SOCKET_TYPE_MESSAGE_LIST, null, null));
} }
/** /**