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
2023-06-08 19:07:51 +08:00
parent 0e18a604b9
commit 3f575a315d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1337,7 +1337,7 @@ 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 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)|((企业)?邮箱:)?$reverseRegexTitle") +
(if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$")
val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex2 = ".*?\\($reverseRegexTitle\\)$"
val regex = "($regex1)|($regex2)" val regex = "($regex1)|($regex2)"
@@ -1451,7 +1451,7 @@ 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 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)|((企业)?邮箱:)?$reverseRegexTitle") +
(if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$")
val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex2 = ".*?\\($reverseRegexTitle\\)$"
val regex = "($regex1)|($regex2)" val regex = "($regex1)|($regex2)"
@@ -1786,7 +1786,7 @@ 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 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)|((企业)?邮箱:)?$reverseRegexTitle") +
(if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$")
val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex2 = ".*?\\($reverseRegexTitle\\)$"
val regex = "($regex1)|($regex2)" val regex = "($regex1)|($regex2)"
@@ -1977,7 +1977,7 @@ 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 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)|((企业)?邮箱:)?$reverseRegexTitle") +
(if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$")
val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex2 = ".*?\\($reverseRegexTitle\\)$"
val regex = "($regex1)|($regex2)" val regex = "($regex1)|($regex2)"
@@ -2094,7 +2094,7 @@ 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 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)|((企业)?邮箱:)?$reverseRegexTitle") +
(if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$")
val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex2 = ".*?\\($reverseRegexTitle\\)$"
val regex = "($regex1)|($regex2)" val regex = "($regex1)|($regex2)"
@@ -2392,7 +2392,7 @@ 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 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)|((企业)?邮箱:)?$reverseRegexTitle") +
(if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$")
val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex2 = ".*?\\($reverseRegexTitle\\)$"
val regex = "($regex1)|($regex2)" val regex = "($regex1)|($regex2)"

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

@@ -122,7 +122,7 @@ 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 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)?$reverseRegexTitle") + val regex1 = (if (Constant.friendRemarkStrict) "^$reverseRegexTitle" else "^(微信昵称:)|((企业)?邮箱:)?$reverseRegexTitle") +
(if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$") (if (needTrim) ".*?" else "(-.*)?(…)?(\\(.*?\\))?$")
val regex2 = ".*?\\($reverseRegexTitle\\)$" val regex2 = ".*?\\($reverseRegexTitle\\)$"
val regex = "($regex1)|($regex2)" val regex = "($regex1)|($regex2)"