diff --git a/app/src/main/java/org/yameida/worktool/model/WeworkMessageBean.java b/app/src/main/java/org/yameida/worktool/model/WeworkMessageBean.java index c2c7296..e0eef54 100644 --- a/app/src/main/java/org/yameida/worktool/model/WeworkMessageBean.java +++ b/app/src/main/java/org/yameida/worktool/model/WeworkMessageBean.java @@ -179,6 +179,8 @@ public class WeworkMessageBean { //消息id(解析指令时同步) public String messageId; + //meta自定义信息(解析指令时同步) + public String meta; //api类型(解析指令时同步) 0=后台消息 1=API指令调用 public Integer apiSend; diff --git a/app/src/main/java/org/yameida/worktool/model/WeworkMessageListBean.kt b/app/src/main/java/org/yameida/worktool/model/WeworkMessageListBean.kt index ec15c4a..2b4bcd0 100644 --- a/app/src/main/java/org/yameida/worktool/model/WeworkMessageListBean.kt +++ b/app/src/main/java/org/yameida/worktool/model/WeworkMessageListBean.kt @@ -28,6 +28,8 @@ class WeworkMessageListBean { //消息id var messageId = TimeUtils.date2String(Date()).replace(" ", "#") + "#" + UUID.randomUUID() + var meta: String? = null + //api类型 0=后台消息 1=API指令调用 var apiSend: Int? = null @@ -40,7 +42,7 @@ class WeworkMessageListBean { //消息加密 0不加密 1AES 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) { list.add(weworkMessageBean) } else if (encryptType == 1) { @@ -53,6 +55,7 @@ class WeworkMessageListBean { } this.socketType = type if (messageId != null) this.messageId = messageId + if (meta != null) this.meta = meta } constructor(messageId: String, type: Int) { diff --git a/app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt b/app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt index 4fadab6..b210023 100644 --- a/app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt +++ b/app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt @@ -230,7 +230,8 @@ fun uploadCommandResult(message: WeworkMessageBean, errorCode: Int, errorReason: WeworkMessageListBean( ExecCallbackBean(GsonUtils.toJson(message), errorCode, errorReason, startTime, (System.currentTimeMillis() - startTime) / 1000.0, successList, failList), WeworkMessageListBean.SOCKET_TYPE_RAW_CONFIRM, - messageId = message.messageId + messageId = message.messageId, + meta = message.meta ), true ) if (errorCode != 0) { diff --git a/app/src/main/java/org/yameida/worktool/service/MyLooper.kt b/app/src/main/java/org/yameida/worktool/service/MyLooper.kt index ba8bb4f..f6f41ee 100644 --- a/app/src/main/java/org/yameida/worktool/service/MyLooper.kt +++ b/app/src/main/java/org/yameida/worktool/service/MyLooper.kt @@ -119,6 +119,7 @@ object MyLooper { what = messageWhat obj = message.apply { messageId = messageList.messageId + meta = messageList.meta apiSend = messageList.apiSend } }) 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 ed1d9ec..da1b02a 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt @@ -1093,6 +1093,7 @@ object WeworkOperationImpl { for (weworkMessage in weworkMessageList) { weworkMessage.titleList = message.titleList weworkMessage.messageId = message.messageId + weworkMessage.meta = message.meta when (weworkMessage.type) { WeworkMessageBean.SEND_MESSAGE -> { WeworkController.sendMessage(weworkMessage) @@ -1138,6 +1139,7 @@ object WeworkOperationImpl { for (weworkMessage in weworkMessageList) { weworkMessage.titleList = titleList weworkMessage.messageId = message.messageId + weworkMessage.meta = message.meta when (weworkMessage.type) { WeworkMessageBean.SEND_MESSAGE -> { WeworkController.sendMessage(weworkMessage) diff --git a/app/src/main/java/org/yameida/worktool/utils/WebSocketManager.java b/app/src/main/java/org/yameida/worktool/utils/WebSocketManager.java index 253f5fa..5882f0f 100644 --- a/app/src/main/java/org/yameida/worktool/utils/WebSocketManager.java +++ b/app/src/main/java/org/yameida/worktool/utils/WebSocketManager.java @@ -53,7 +53,7 @@ public class WebSocketManager { } 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)); } /**