From 9dd50a7681329319d3083603659c4a39453f861b Mon Sep 17 00:00:00 2001
From: gallonyin <gallonyin@gmail.com>
Date: Tue, 13 Dec 2022 14:41:22 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E8=A2=AB=E5=8A=A8?=
 =?UTF-8?q?=E5=8A=A0=E5=A5=BD=E5=8F=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/yameida/worktool/service/WeworkLoopImpl.kt  | 9 +++++++--
 .../org/yameida/worktool/service/WeworkOperationImpl.kt  | 5 ++++-
 .../java/org/yameida/worktool/utils/AccessibilityUtil.kt | 3 ++-
 3 files changed, 13 insertions(+), 4 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 16486a4..9595a5c 100644
--- a/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt
+++ b/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt
@@ -5,6 +5,7 @@ import androidx.core.text.isDigitsOnly
 import com.blankj.utilcode.util.LogUtils
 import com.blankj.utilcode.util.SPUtils
 import org.yameida.worktool.Constant
+import org.yameida.worktool.Demo
 import org.yameida.worktool.model.WeworkMessageBean
 import org.yameida.worktool.service.WeworkController.mainLoopRunning
 import org.yameida.worktool.utils.*
@@ -188,8 +189,12 @@ object WeworkLoopImpl {
                     WeworkOperationImpl.setFriendTags(arrayListOf("worktool自动通过"))
                 }
                 AccessibilityUtil.findTextAndClick(getRoot(), "通过验证")
-                AccessibilityUtil.findTextAndClick(getRoot(), "完成")
-                if (AccessibilityUtil.findTextAndClick(getRoot(), "确定")) {
+                var textNode = AccessibilityUtil.findOneByText(getRoot(), "完成", "发消息", "添加请求已过期，添加失败", exact = true)
+                if (textNode?.text == "完成") {
+                    AccessibilityUtil.performClick(textNode)
+                }
+                textNode = AccessibilityUtil.findOneByText(getRoot(), "发消息", "添加请求已过期，添加失败", exact = true)
+                if (textNode?.text == "添加请求已过期，添加失败") {
                     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 d6ac7ed..6e15a30 100644
--- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
+++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
@@ -1823,7 +1823,10 @@ object WeworkOperationImpl {
             if (AccessibilityUtil.findTextAndClick(getRoot(), "确定")) {
                 sleep(Constant.POP_WINDOW_INTERVAL)
                 //可能有两次确定 另一次为添加新tag
-                AccessibilityUtil.findTextAndClick(getRoot(), "确定")
+                val textNode = AccessibilityUtil.findOneByText(getRoot(), "确定", "个人信息")
+                if (textNode?.text == "确定") {
+                    AccessibilityUtil.performClick(textNode)
+                }
                 return true
             }
         }
diff --git a/app/src/main/java/org/yameida/worktool/utils/AccessibilityUtil.kt b/app/src/main/java/org/yameida/worktool/utils/AccessibilityUtil.kt
index 7e2257a..67a2067 100644
--- a/app/src/main/java/org/yameida/worktool/utils/AccessibilityUtil.kt
+++ b/app/src/main/java/org/yameida/worktool/utils/AccessibilityUtil.kt
@@ -102,7 +102,8 @@ object AccessibilityUtil {
         root: Boolean = true
     ): Boolean {
         val textView = findOneByText(nodeInfo, *textList, exact = exact, timeout = timeout, root = root) ?: return false
-        return performClick(textView)
+        performClick(textView)
+        return true
     }
 
     //寻找第一个EditView编辑框并输入文本