From b5376e0c37f1aad3bcd48164494b88fc37bd22f6 Mon Sep 17 00:00:00 2001 From: gallonyin Date: Mon, 6 Mar 2023 11:48:30 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=9F=8B=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../worktool/service/WeworkLoopImpl.kt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt b/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt index 470e2c4..5092da0 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt @@ -172,16 +172,17 @@ object WeworkLoopImpl { } SPUtils.getInstance("lastSyncMessage").put(title, lastSyncMessage) LogUtils.v("lastSyncMessage: $lastSyncMessage") - if (Constant.pushImage && MultiFileObserver.saveSet.isNotEmpty()) { - val imageMessageList = messageList.filter { it.textType == WeworkMessageBean.TEXT_TYPE_IMAGE }.reversed() - MultiFileObserver.saveSet.reversed().forEachIndexed { index, targetPath -> - if (imageMessageList.size > index) { - val message = imageMessageList[index] - } - } - MultiFileObserver.saveSet.clear() - } if (Constant.pushImage) { + log("createSet: ${MultiFileObserver.createSet.joinToString()}\nsaveSet: ${MultiFileObserver.saveSet.joinToString()}") + if (MultiFileObserver.saveSet.isNotEmpty()) { + val imageMessageList = messageList.filter { it.textType == WeworkMessageBean.TEXT_TYPE_IMAGE }.reversed() + MultiFileObserver.saveSet.reversed().forEachIndexed { index, targetPath -> + if (imageMessageList.size > index) { + val message = imageMessageList[index] + } + } + MultiFileObserver.saveSet.clear() + } messageList.removeIf { it.textType == WeworkMessageBean.TEXT_TYPE_IMAGE } } WeworkController.weworkService.webSocketManager.send(