tanjianbin/lzwcai-terminal-worktool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 支持严格匹配备注

Browse Source
This commit is contained in:
gallonyin
2022-11-29 18:23:34 +08:00
parent b349a74d6f
commit 559db62e8e
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/yameida/worktool/Constant.kt
View File

@@ -20,6 +20,7 @@ object Constant {
var encryptType = SPUtils.getInstance().getInt("encryptType", 1) var encryptType = SPUtils.getInstance().getInt("encryptType", 1)
var autoReply = SPUtils.getInstance().getInt("autoReply", 1) var autoReply = SPUtils.getInstance().getInt("autoReply", 1)
var groupStrict = false var groupStrict = false
var friendRemarkStrict = false
var host: String var host: String
get() = SPUtils.getInstance().getString("host", DEFAULT_HOST) get() = SPUtils.getInstance().getString("host", DEFAULT_HOST)
set(value) { set(value) {

15
app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
View File

@@ -809,7 +809,8 @@ object WeworkOperationImpl {
//消息页搜索结果列表 //消息页搜索结果列表
val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView) val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView)
val reverseRegexTitle = RegexHelper.reverseRegexTitle(trimTitle) 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 regex2 = ".*?\\($reverseRegexTitle\\)$"
val regex = "($regex1)|($regex2)" val regex = "($regex1)|($regex2)"
val matchSelect = AccessibilityUtil.findOneByTextRegex( val matchSelect = AccessibilityUtil.findOneByTextRegex(
@@ -1053,7 +1054,8 @@ object WeworkOperationImpl {
sleep(Constant.CHANGE_PAGE_INTERVAL) sleep(Constant.CHANGE_PAGE_INTERVAL)
val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView, Views.RecyclerView, Views.ViewGroup, minChildCount = 2) val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView, Views.RecyclerView, Views.ViewGroup, minChildCount = 2)
val reverseRegexTitle = RegexHelper.reverseRegexTitle(trimTitle) 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 regex2 = ".*?\\($reverseRegexTitle\\)$"
val regex = "($regex1)|($regex2)" val regex = "($regex1)|($regex2)"
val matchSelect = AccessibilityUtil.findOneByTextRegex( val matchSelect = AccessibilityUtil.findOneByTextRegex(
@@ -1220,7 +1222,8 @@ object WeworkOperationImpl {
sleep(Constant.POP_WINDOW_INTERVAL) sleep(Constant.POP_WINDOW_INTERVAL)
val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView, Views.RecyclerView, Views.ViewGroup, minChildCount = 2, firstChildClazz = Views.TextView) val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView, Views.RecyclerView, Views.ViewGroup, minChildCount = 2, firstChildClazz = Views.TextView)
val reverseRegexTitle = RegexHelper.reverseRegexTitle(trimTitle) 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 regex2 = ".*?\\($reverseRegexTitle\\)$"
val regex = "($regex1)|($regex2)" val regex = "($regex1)|($regex2)"
val matchSelect = AccessibilityUtil.findOneByTextRegex( val matchSelect = AccessibilityUtil.findOneByTextRegex(
@@ -1332,7 +1335,8 @@ object WeworkOperationImpl {
sleep(Constant.POP_WINDOW_INTERVAL) sleep(Constant.POP_WINDOW_INTERVAL)
val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView, Views.RecyclerView, Views.ViewGroup, minChildCount = 2, firstChildClazz = Views.RelativeLayout) val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView, Views.RecyclerView, Views.ViewGroup, minChildCount = 2, firstChildClazz = Views.RelativeLayout)
val reverseRegexTitle = RegexHelper.reverseRegexTitle(trimTitle) 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 regex2 = ".*?\\($reverseRegexTitle\\)$"
val regex = "($regex1)|($regex2)" val regex = "($regex1)|($regex2)"
val matchSelect = AccessibilityUtil.findOneByTextRegex( val matchSelect = AccessibilityUtil.findOneByTextRegex(
@@ -1610,7 +1614,8 @@ object WeworkOperationImpl {
//消息页搜索结果列表 //消息页搜索结果列表
val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView) val selectListView = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView)
val reverseRegexTitle = RegexHelper.reverseRegexTitle(trimTitle) 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 regex2 = ".*?\\($reverseRegexTitle\\)$"
val regex = "($regex1)|($regex2)" val regex = "($regex1)|($regex2)"
val matchSelect = AccessibilityUtil.findOneByTextRegex( val matchSelect = AccessibilityUtil.findOneByTextRegex(

3
app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt
View File

@@ -105,7 +105,8 @@ object WeworkRoomUtil {
//消息页搜索结果列表 //消息页搜索结果列表
val selectListView = findOneByClazz(getRoot(), Views.ListView) val selectListView = findOneByClazz(getRoot(), Views.ListView)
val reverseRegexTitle = RegexHelper.reverseRegexTitle(trimTitle) 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 regex2 = ".*?\\($reverseRegexTitle\\)$"
val regex = "($regex1)|($regex2)" val regex = "($regex1)|($regex2)"
val searchResult = AccessibilityUtil.findAllByTextRegex( val searchResult = AccessibilityUtil.findAllByTextRegex(