From 49e78a76b8efb0b4e8aca04ccb883b137dc53186 Mon Sep 17 00:00:00 2001
From: gallonyin <gallonyin@gmail.com>
Date: Tue, 28 Mar 2023 23:29:19 +0800
Subject: [PATCH] =?UTF-8?q?update=20at=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/yameida/worktool/service/WeworkGetImpl.kt    |  4 ++--
 .../yameida/worktool/service/WeworkOperationImpl.kt  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/yameida/worktool/service/WeworkGetImpl.kt b/app/src/main/java/org/yameida/worktool/service/WeworkGetImpl.kt
index 7ccf5c7..10245f6 100644
--- a/app/src/main/java/org/yameida/worktool/service/WeworkGetImpl.kt
+++ b/app/src/main/java/org/yameida/worktool/service/WeworkGetImpl.kt
@@ -299,7 +299,7 @@ object WeworkGetImpl {
                 LogUtils.d("群主: " + tvOwnerName.text)
                 weworkMessageBean.groupOwner = tvOwnerName.text.toString()
             }
-            if (!saveMembers && weworkMessageBean.groupNumber ?: 0 <= 8) {
+            if (weworkMessageBean.groupNumber ?: 0 <= 8) {
                 val set = linkedSetOf<String>()
                 for (i in 0 until gridView.childCount) {
                     val item = gridView.getChild(i)
@@ -323,7 +323,7 @@ object WeworkGetImpl {
             LogUtils.d("群备注: " + tvRemark.text)
             weworkMessageBean.groupRemark = tvRemark.text.toString()
         }
-        if (saveMembers) {
+        if (saveMembers && weworkMessageBean.nameList.isNullOrEmpty()) {
             if (AccessibilityUtil.findTextAndClick(getRoot(), "查看全部群成员", exact = true, timeout = 0)) {
                 val userList = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView)
                 if (userList != null) {
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 b150e63..a772487 100644
--- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
+++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
@@ -1829,14 +1829,14 @@ object WeworkOperationImpl {
         var atFailed = false
         val atList = if (!at.isNullOrEmpty()) arrayListOf(at) else atList?.toMutableList()
         if (!atList.isNullOrEmpty() && (roomType == WeworkMessageBean.ROOM_TYPE_INTERNAL_GROUP || roomType == WeworkMessageBean.ROOM_TYPE_EXTERNAL_GROUP)) {
-            val nameList = arrayListOf<String>()
             if (atList.count { it.startsWith("#regex#") } > 0 && WeworkRoomUtil.intoGroupManager()) {
-                val groupInfo = WeworkGetImpl.getGroupInfoDetail(saveAddress = false, saveMembers = false)
-                nameList.addAll(groupInfo.nameList)
+                val groupInfo = WeworkGetImpl.getGroupInfoDetail(saveAddress = false, saveMembers = true)
                 val regex = atList.first { it.startsWith("#regex#") }.split("#regex#").last().toRegex()
-                for (name in groupInfo.nameList) {
-                    if (name != Constant.myName && name.matches(regex)) {
-                        atList.add(name)
+                if (groupInfo.nameList != null) {
+                    for (name in groupInfo.nameList) {
+                        if (name != Constant.myName && name.matches(regex)) {
+                            atList.add(name)
+                        }
                     }
                 }
             }