From 68da199012015b122dd4572ae5352a178c2599f7 Mon Sep 17 00:00:00 2001
From: gallonyin <gallonyin@gmail.com>
Date: Tue, 13 Jun 2023 18:29:53 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=82=AE=E4=BB=B6=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/org/yameida/worktool/Constant.kt          | 3 ++-
 .../org/yameida/worktool/service/WeworkOperationImpl.kt     | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/yameida/worktool/Constant.kt b/app/src/main/java/org/yameida/worktool/Constant.kt
index c904cb4..baa549f 100644
--- a/app/src/main/java/org/yameida/worktool/Constant.kt
+++ b/app/src/main/java/org/yameida/worktool/Constant.kt
@@ -13,7 +13,8 @@ object Constant {
     private const val DEFAULT_HOST = "wss://worktool.asrtts.cn"
 
     var myName = ""
-//    var regTrimTitle = "(…$)|(-.*$)|(\\(.*?\\)$)".toRegex()
+    //    var regTrimTitle = "(…$)|(-.*$)|(\\(.*?\\)$)".toRegex()
+    var regMail = "\\S+@\\S+\\.\\S+".toRegex()
     var regTrimTitle = "(…$)".toRegex()
     var key = "9876543210abcdef".toByteArray()
     var iv = "0123456789abcdef".toByteArray()
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 1abe132..fc7333d 100644
--- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
+++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
@@ -1987,12 +1987,12 @@ object WeworkOperationImpl {
                             timeout = 2000,
                             root = false
                         )
-                        if (selectListView != null && matchSelect != null) {
+                        if (selectListView != null && (matchSelect != null || reverseRegexTitle.matches(Constant.regMail))) {
                             var flag = false
                             for (i in 0 until selectListView.childCount) {
                                 val item = selectListView.getChild(i)
-                                val searchResult = AccessibilityUtil.findOnceByTextRegex(item, regex)
-                                if (searchResult != null) {
+                                if ((matchSelect == null && item.className == Views.RelativeLayout)
+                                    || AccessibilityUtil.findOnceByTextRegex(item, regex) != null) {
                                     item.refresh()
                                     val imageView =
                                         AccessibilityUtil.findOneByClazz(item, Views.ImageView, root = false)