From 0186dbee186b2ebb0fe5e95b6835e8d84762cc50 Mon Sep 17 00:00:00 2001 From: gallonyin Date: Tue, 12 Sep 2023 23:35:41 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B8=85=E7=A9=BA=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=BE=85=E6=89=A7=E8=A1=8C=E6=8C=87=E4=BB=A4;=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=9C=B0=E5=9D=80=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/org/yameida/worktool/Constant.kt | 4 +++- .../java/org/yameida/worktool/model/WeworkMessageBean.java | 1 + app/src/main/java/org/yameida/worktool/service/MyLooper.kt | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/yameida/worktool/Constant.kt b/app/src/main/java/org/yameida/worktool/Constant.kt index e2814eb..21b6ce3 100644 --- a/app/src/main/java/org/yameida/worktool/Constant.kt +++ b/app/src/main/java/org/yameida/worktool/Constant.kt @@ -25,6 +25,8 @@ object Constant { var key = "9876543210abcdef".toByteArray() var iv = "0123456789abcdef".toByteArray() val transformation = "AES/CBC/PKCS7Padding" + val wssRegex = "^wss".toRegex() + val wsRegex = "^ws".toRegex() var weworkCorpName: String get() = SPUtils.getInstance().getString("weworkCorpName", "") set(value) { @@ -125,6 +127,6 @@ object Constant { fun getPushLocalFileUrl() = "${getBaseUrl()}/fileUpload/upload?robotId=$robotId" - private fun getBaseUrl() = host.replace("wss", "https").replace("ws", "http") + private fun getBaseUrl() = host.replace(wssRegex, "https").replace(wsRegex, "http") } 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 8f46745..c2c7296 100644 --- a/app/src/main/java/org/yameida/worktool/model/WeworkMessageBean.java +++ b/app/src/main/java/org/yameida/worktool/model/WeworkMessageBean.java @@ -104,6 +104,7 @@ public class WeworkMessageBean { public static final int ROBOT_LOG = 301; public static final int ROBOT_ERROR_LOG = 302; public static final int ROBOT_CONTROLLER_TEST = 303; + public static final int ROBOT_QUEUE_CLEAR = 304; public static final int GET_GROUP_INFO = 501; public static final int GET_FRIEND_INFO = 502; 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 ab65dfc..ba8bb4f 100644 --- a/app/src/main/java/org/yameida/worktool/service/MyLooper.kt +++ b/app/src/main/java/org/yameida/worktool/service/MyLooper.kt @@ -103,7 +103,10 @@ object MyLooper { val list = if (Constant.duplicationFilter) LinkedHashSet(messageList.list).toList() else messageList.list //去重处理 丢弃之前的重复指令 丢弃之前的获取新消息指令 for (message in list) { - if (message.type == WeworkMessageBean.LOOP_RECEIVE_NEW_MESSAGE) { + if (message.type == WeworkMessageBean.ROBOT_QUEUE_CLEAR) { + getInstance().removeCallbacksAndMessages(null) + LogUtils.i("清空全部待执行指令") + } else if (message.type == WeworkMessageBean.LOOP_RECEIVE_NEW_MESSAGE) { WeworkController.enableLoopRunning = true } else { WeworkController.mainLoopRunning = false