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(