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

fix 群名过长发不出消息

Browse Source
This commit is contained in:
gallonyin
2023-06-28 18:24:31 +08:00
parent 8f6e87c31d
commit 67db15ca92
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,7 +77,7 @@ object WeworkRoomUtil {
* 进入房间（单聊或群聊） * 进入房间（单聊或群聊）
*/ */
fun intoRoom(title: String, fastIn: Boolean = true): Boolean { fun intoRoom(title: String, fastIn: Boolean = true): Boolean {
if (checkRoom(title)) { if (checkRoom(title, strict = true)) {
return true return true
} }
goHome() goHome()
@@ -93,7 +93,7 @@ object WeworkRoomUtil {
LogUtils.d("快捷进入房间: $title") LogUtils.d("快捷进入房间: $title")
AccessibilityUtil.waitForPageMissing("WwMainActivity", "GlobalSearchActivity") AccessibilityUtil.waitForPageMissing("WwMainActivity", "GlobalSearchActivity")
sleep(Constant.CHANGE_PAGE_INTERVAL) sleep(Constant.CHANGE_PAGE_INTERVAL)
return checkRoom(title) return checkRoom(title, strict = false)
} }
} }
} }
@@ -136,7 +136,7 @@ object WeworkRoomUtil {
LogUtils.d("进入房间: $title") LogUtils.d("进入房间: $title")
AccessibilityUtil.waitForPageMissing("WwMainActivity", "GlobalSearchActivity") AccessibilityUtil.waitForPageMissing("WwMainActivity", "GlobalSearchActivity")
sleep(Constant.CHANGE_PAGE_INTERVAL) sleep(Constant.CHANGE_PAGE_INTERVAL)
return checkRoom(title) return checkRoom(title, strict = false)
} else { } else {
LogUtils.e("搜索到已退出群聊") LogUtils.e("搜索到已退出群聊")
} }
@@ -247,15 +247,16 @@ object WeworkRoomUtil {
/** /**
* 检查当前房间 * 检查当前房间
*/ */
private fun checkRoom(title: String): Boolean { private fun checkRoom(title: String, strict: Boolean = false): Boolean {
LogUtils.d("checkRoom(): $title") LogUtils.d("checkRoom(): $title")
val titleList = getRoomTitle(false) val titleList = getRoomTitle(false)
val roomType = getRoomType() val roomType = getRoomType()
if (roomType != WeworkMessageBean.ROOM_TYPE_UNKNOWN if (roomType != WeworkMessageBean.ROOM_TYPE_UNKNOWN
&& titleList.count { && (titleList.count {
it.replace("…", "").replace("\\(.*?\\)".toRegex(), "") == title.replace("…", "") it.replace("…", "").replace("\\(.*?\\)".toRegex(), "") == title.replace("…", "")
.replace("\\(.*?\\)".toRegex(), "") .replace("\\(.*?\\)".toRegex(), "")
} > 0 } > 0
|| (!strict && titleList.count { title.contains(it.replace("…", "").replace("\\(.*?\\)".toRegex(), "")) } > 0))
) { ) {
intoRoomPreInit() intoRoomPreInit()
LogUtils.d("当前正在房间") LogUtils.d("当前正在房间")