From a12144c3fe1efb5dd19343477513ba72592ccd35 Mon Sep 17 00:00:00 2001 From: gallonyin Date: Tue, 13 Dec 2022 16:01:54 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/yameida/worktool/service/WeworkLoopImpl.kt | 4 ++-- .../org/yameida/worktool/service/WeworkOperationImpl.kt | 6 +++--- 2 files changed, 5 insertions(+), 5 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 9595a5c..f52703f 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt @@ -190,11 +190,11 @@ object WeworkLoopImpl { } AccessibilityUtil.findTextAndClick(getRoot(), "通过验证") var textNode = AccessibilityUtil.findOneByText(getRoot(), "完成", "发消息", "添加请求已过期,添加失败", exact = true) - if (textNode?.text == "完成") { + if (textNode?.text?.toString() == "完成") { AccessibilityUtil.performClick(textNode) } textNode = AccessibilityUtil.findOneByText(getRoot(), "发消息", "添加请求已过期,添加失败", exact = true) - if (textNode?.text == "添加请求已过期,添加失败") { + if (textNode?.text?.toString() == "添加请求已过期,添加失败") { LogUtils.d("添加好友失败") } else { val weworkMessageBean = WeworkMessageBean() 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 6e15a30..82ca65b 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt @@ -1615,7 +1615,7 @@ object WeworkOperationImpl { if (AccessibilityUtil.findTextInput(getRoot(), content, append = append)) { AccessibilityUtil.findOneByText(getRoot(), "发送", exact = true, timeout = 2000) val sendButton = AccessibilityUtil.findAllByClazz(getRoot(), Views.Button) - .firstOrNull { it.text == "发送" } + .firstOrNull { it.text?.toString() == "发送" } if (sendButton != null) { LogUtils.d("发送消息: \n$content") log("发送消息: \n$content") @@ -1808,7 +1808,7 @@ object WeworkOperationImpl { val text = child.text val selected = child.isSelected LogUtils.v("text: $text selected: $selected") - if (tagList.count { it == text } > 0) { + if (tagList.count { it == text?.toString() } > 0) { if (!selected) { AccessibilityUtil.performClick(child) } @@ -1824,7 +1824,7 @@ object WeworkOperationImpl { sleep(Constant.POP_WINDOW_INTERVAL) //可能有两次确定 另一次为添加新tag val textNode = AccessibilityUtil.findOneByText(getRoot(), "确定", "个人信息") - if (textNode?.text == "确定") { + if (textNode?.text?.toString() == "确定") { AccessibilityUtil.performClick(textNode) } return true