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

update at列表优化

Browse Source
This commit is contained in:
gallonyin
2023-03-28 23:29:19 +08:00
parent d4df1c414b
commit 49e78a76b8
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/yameida/worktool/service/WeworkGetImpl.kt
View File

@@ -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) {

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

@@ -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)
}
}
}
}