From 559db62e8eb06333b6933847a31c2f4b4b1c2429 Mon Sep 17 00:00:00 2001 From: gallonyin Date: Tue, 29 Nov 2022 18:23:34 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=94=AF=E6=8C=81=E4=B8=A5=E6=A0=BC?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/yameida/worktool/Constant.kt | 1 + .../worktool/service/WeworkOperationImpl.kt | 15 ++++++++++----- .../org/yameida/worktool/utils/WeworkRoomUtil.kt | 3 ++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/yameida/worktool/Constant.kt b/app/src/main/java/org/yameida/worktool/Constant.kt index c6ac418..f8093b8 100644 --- a/app/src/main/java/org/yameida/worktool/Constant.kt +++ b/app/src/main/java/org/yameida/worktool/Constant.kt @@ -20,6 +20,7 @@ object Constant { var encryptType = SPUtils.getInstance().getInt("encryptType", 1) var autoReply = SPUtils.getInstance().getInt("autoReply", 1) var groupStrict = false + var friendRemarkStrict = false var host: String get() = SPUtils.getInstance().getString("host", DEFAULT_HOST) set(value) { 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 5b1a12f..9d1d4b3 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt @@ -809,7 +809,8 @@ object WeworkOperationImpl { //消息页搜索结果列表 val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView) val reverseRegexTitle = RegexHelper.reverseRegexTitle(trimTitle) - val regex1 = "^(微信昵称:)?$reverseRegexTitle" + if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$" + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + + (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex = "($regex1)|($regex2)" val matchSelect = AccessibilityUtil.findOneByTextRegex( @@ -1053,7 +1054,8 @@ object WeworkOperationImpl { sleep(Constant.CHANGE_PAGE_INTERVAL) val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView, Views.RecyclerView, Views.ViewGroup, minChildCount = 2) val reverseRegexTitle = RegexHelper.reverseRegexTitle(trimTitle) - val regex1 = "^(微信昵称:)?$reverseRegexTitle" + if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$" + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + + (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex = "($regex1)|($regex2)" val matchSelect = AccessibilityUtil.findOneByTextRegex( @@ -1220,7 +1222,8 @@ object WeworkOperationImpl { sleep(Constant.POP_WINDOW_INTERVAL) val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView, Views.RecyclerView, Views.ViewGroup, minChildCount = 2, firstChildClazz = Views.TextView) val reverseRegexTitle = RegexHelper.reverseRegexTitle(trimTitle) - val regex1 = "^(微信昵称:)?$reverseRegexTitle" + if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$" + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + + (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex = "($regex1)|($regex2)" val matchSelect = AccessibilityUtil.findOneByTextRegex( @@ -1332,7 +1335,8 @@ object WeworkOperationImpl { sleep(Constant.POP_WINDOW_INTERVAL) val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView, Views.RecyclerView, Views.ViewGroup, minChildCount = 2, firstChildClazz = Views.RelativeLayout) val reverseRegexTitle = RegexHelper.reverseRegexTitle(trimTitle) - val regex1 = "^(微信昵称:)?$reverseRegexTitle" + if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$" + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + + (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex = "($regex1)|($regex2)" val matchSelect = AccessibilityUtil.findOneByTextRegex( @@ -1610,7 +1614,8 @@ object WeworkOperationImpl { //消息页搜索结果列表 val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView) val reverseRegexTitle = RegexHelper.reverseRegexTitle(trimTitle) - val regex1 = "^(微信昵称:)?$reverseRegexTitle" + if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$" + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + + (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex = "($regex1)|($regex2)" val matchSelect = AccessibilityUtil.findOneByTextRegex( diff --git a/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt b/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt index ffd6f05..4e28d03 100644 --- a/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt +++ b/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt @@ -105,7 +105,8 @@ object WeworkRoomUtil { //消息页搜索结果列表 val selectListView = findOneByClazz(getRoot(), Views.ListView) val reverseRegexTitle = RegexHelper.reverseRegexTitle(trimTitle) - val regex1 = "^(微信昵称:)?$reverseRegexTitle" + if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$" + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + + (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex = "($regex1)|($regex2)" val searchResult = AccessibilityUtil.findAllByTextRegex(