From bc7cc5029414597799e117b968ade75b647a8c3d Mon Sep 17 00:00:00 2001
From: gallonyin <gallonyin@gmail.com>
Date: Mon, 26 Jun 2023 18:26:37 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=B8=BB=E5=BE=AA=E7=8E=AF=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E7=BB=A7=E7=BB=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/org/yameida/worktool/service/MyLooper.kt  | 5 +++--
 .../java/org/yameida/worktool/service/WeworkLoopImpl.kt     | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

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 3c6a6a2..e7abb7b 100644
--- a/app/src/main/java/org/yameida/worktool/service/MyLooper.kt
+++ b/app/src/main/java/org/yameida/worktool/service/MyLooper.kt
@@ -107,9 +107,10 @@ object MyLooper {
                 } else {
                     WeworkController.mainLoopRunning = false
                     LogUtils.v("加入指令到执行队列", if (message.fileBase64.isNullOrEmpty()) GsonUtils.toJson(message) else message.type)
-                    getInstance().removeMessages(message.type * message.hashCode() + (System.currentTimeMillis() / 10000).toInt())
+                    val messageWhat = message.type * message.hashCode() + (System.currentTimeMillis() / 10000).toInt()
+                    getInstance().removeMessages(messageWhat)
                     getInstance().sendMessage(Message.obtain().apply {
-                        what = message.type * message.hashCode() + (System.currentTimeMillis() / 10000).toInt()
+                        what = messageWhat
                         obj = message.apply {
                             messageId = messageList.messageId
                             apiSend = messageList.apiSend
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 6edf293..c762217 100644
--- a/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt
+++ b/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt
@@ -55,10 +55,10 @@ object WeworkLoopImpl {
                 sleep(300)
             }
         } catch (e: Exception) {
-            mainLoopRunning = false
             LogUtils.e("ERROR mainLoop: " + e.message, e)
             error("ERROR mainLoop: $e")
             sleep(Constant.LONG_INTERVAL)
+            MyLooper.getInstance().removeMessages(WeworkMessageBean.LOOP_RECEIVE_NEW_MESSAGE)
             MyLooper.getInstance().sendMessage(Message.obtain().apply {
                 what = WeworkMessageBean.LOOP_RECEIVE_NEW_MESSAGE
                 obj = WeworkMessageBean().apply { type = WeworkMessageBean.LOOP_RECEIVE_NEW_MESSAGE }
@@ -526,10 +526,10 @@ object WeworkLoopImpl {
         if (spotNodeList.size > 0) {
             LogUtils.i("发现未读消息: " + spotNodeList.size + "条")
             log("发现未读消息: " + spotNodeList.size + "条")
-            if (AccessibilityUtil.performClick(spotNodeList.first())) {
+            if (AccessibilityUtil.performClick(spotNodeList.firstOrNull())) {
                 //进入聊天页 下一步 getChatMessageList
             } else {
-                AccessibilityUtil.clickByNode(WeworkController.weworkService, spotNodeList.first().parent)
+                AccessibilityUtil.clickByNode(WeworkController.weworkService, spotNodeList.firstOrNull()?.parent)
             }
             return true
         } else {