github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-11 07:24:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix heartbeat

Browse Source
This commit is contained in:
Him188 2020-02-20 11:33:10 +08:00
parent c04a00414e
commit 797dd598b3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
View File

@ -100,7 +100,7 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
BotOfflineEvent.Dropped(bot).broadcast() BotOfflineEvent.Dropped(bot).broadcast()
} }
} }
} }.also { heartbeatJob = it }
} }
override suspend fun relogin() { override suspend fun relogin() {
@ -171,6 +171,7 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
// println("d2key=${bot.client.wLoginSigInfo.d2Key.toUHexString()}") // println("d2key=${bot.client.wLoginSigInfo.d2Key.toUHexString()}")
registerClientOnline() registerClientOnline()
startHeartbeatJobOrKill()
} }
private suspend fun registerClientOnline(timeoutMillis: Long = 3000) { private suspend fun registerClientOnline(timeoutMillis: Long = 3000) {
@ -290,8 +291,6 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
} }
} }
heartbeatJob = startHeartbeatJobOrKill()
joinAll(friendListJob, groupJob) joinAll(friendListJob, groupJob)
withTimeoutOrNull(5000) { withTimeoutOrNull(5000) {