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 84147d3..7756af8 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt @@ -636,7 +636,7 @@ object WeworkLoopImpl { * 检查首页-聊天列表是否有未读红点并点击进入 */ private fun checkUnreadChatRoom(list: AccessibilityNodeInfo): Boolean { - val spotNodeList = arrayListOf() + val unreadRowNodeList = arrayListOf() for (i in 0 until list.childCount) { val item = list.getChild(i) if (item != null && Views.RelativeLayout.equals(item.className)) { @@ -647,20 +647,22 @@ object WeworkLoopImpl { && spotNode.text != null && spotNode.text.toString().replace("+", "").isDigitsOnly() ) { - spotNodeList.add(spotNode) + unreadRowNodeList.add(item) } } } } - if (spotNodeList.size > 0) { - LogUtils.i("发现未读消息: " + spotNodeList.size + "条") - log("发现未读消息: " + spotNodeList.size + "条") - if (AccessibilityUtil.performClick(spotNodeList.firstOrNull())) { - //进入聊天页 下一步 getChatMessageList - } else { - AccessibilityUtil.clickByNode(WeworkController.weworkService, spotNodeList.firstOrNull()?.parent) + if (unreadRowNodeList.isNotEmpty()) { + LogUtils.i("发现未读消息: " + unreadRowNodeList.size + "条") + log("发现未读消息: " + unreadRowNodeList.size + "条") + val firstUnreadRow = unreadRowNodeList.firstOrNull() + val clicked = AccessibilityUtil.performClick(firstUnreadRow) + || AccessibilityUtil.clickByNode(WeworkController.weworkService, firstUnreadRow) + if (!clicked) { + return false } - return true + // 避免“点击红点但未实际进会话”的假成功 + return AccessibilityUtil.waitForPageMissing("WwMainActivity", "GlobalSearchActivity", timeout = 2000) } else { return false }