update 优化被动加好友

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()

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
             }
         }

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编辑框并输入文本