From 2408871b041e7999445f76b78669953eb51dfe79 Mon Sep 17 00:00:00 2001 From: gallonyin Date: Thu, 8 Jun 2023 19:59:35 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96at=E5=86=85=E9=83=A8?= =?UTF-8?q?=E6=88=90=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/yameida/worktool/service/WeworkOperationImpl.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 4f535d7..d0f3d13 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt @@ -2321,12 +2321,12 @@ object WeworkOperationImpl { val searchFlag = AccessibilityUtil.findOneByText(getRoot(), "搜索", exact = true) val container = AccessibilityUtil.findBackNode(searchFlag, minChildCount = 2)?.parent if (container != null) { - val atNode = AccessibilityUtil.findOnceByTextRegex(container, "${RegexHelper.reverseRegexTitle(at)}(@.*)?") + val atNode = AccessibilityUtil.findOnceByTextRegex(container, "${RegexHelper.reverseRegexTitle(at)}(@.*)?(\\(.*\\))?") if (atNode != null && !at.matches("^[A-Z#]$".toRegex())) { AccessibilityUtil.performClick(atNode) } else { AccessibilityUtil.findTextInput(getRoot(), at) - val atNodeList = AccessibilityUtil.findAllByTextRegex(container, "${RegexHelper.reverseRegexTitle(at)}(@.*)?", root = false, minSize = 2) + val atNodeList = AccessibilityUtil.findAllByTextRegex(container, "${RegexHelper.reverseRegexTitle(at)}(@.*)?(\\(.*\\))?", root = false, minSize = 2) if (atNodeList.size > 1 && at != "@所有人") { AccessibilityUtil.performClick(atNodeList[1]) } else {