From 3f575a315d22c225e7241cdeab252ccf71d3fd41 Mon Sep 17 00:00:00 2001 From: gallonyin Date: Thu, 8 Jun 2023 19:07:51 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=94=AF=E6=8C=81=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yameida/worktool/service/WeworkOperationImpl.kt | 12 ++++++------ .../org/yameida/worktool/utils/WeworkRoomUtil.kt | 2 +- 2 files changed, 7 insertions(+), 7 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 66314a8..4f535d7 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt @@ -1337,7 +1337,7 @@ object WeworkOperationImpl { //消息页搜索结果列表 val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView) val reverseRegexTitle = RegexHelper.reverseRegexTitle(trimTitle) - val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)|((企业)?邮箱:)?$reverseRegexTitle") + (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex = "($regex1)|($regex2)" @@ -1451,7 +1451,7 @@ object WeworkOperationImpl { //消息页搜索结果列表 val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView) val reverseRegexTitle = RegexHelper.reverseRegexTitle(trimTitle) - val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)|((企业)?邮箱:)?$reverseRegexTitle") + (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex = "($regex1)|($regex2)" @@ -1786,7 +1786,7 @@ 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 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)|((企业)?邮箱:)?$reverseRegexTitle") + (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex = "($regex1)|($regex2)" @@ -1977,7 +1977,7 @@ 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 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)|((企业)?邮箱:)?$reverseRegexTitle") + (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex = "($regex1)|($regex2)" @@ -2094,7 +2094,7 @@ 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 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)|((企业)?邮箱:)?$reverseRegexTitle") + (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex = "($regex1)|($regex2)" @@ -2392,7 +2392,7 @@ object WeworkOperationImpl { //消息页搜索结果列表 val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView) val reverseRegexTitle = RegexHelper.reverseRegexTitle(trimTitle) - val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)|((企业)?邮箱:)?$reverseRegexTitle") + (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex = "($regex1)|($regex2)" 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 91aa4f5..a07d767 100644 --- a/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt +++ b/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt @@ -122,7 +122,7 @@ object WeworkRoomUtil { //消息页搜索结果列表 val selectListView = findOneByClazz(getRoot(), Views.ListView) val reverseRegexTitle = RegexHelper.reverseRegexTitle(trimTitle) - val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)|((企业)?邮箱:)?$reverseRegexTitle") + (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex = "($regex1)|($regex2)"