Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
05dfeb76
Commit
05dfeb76
authored
Jan 31, 2020
by
Him188
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
f1a5bc05
be7c5376
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
2 deletions
+37
-2
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
...ommonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
+1
-0
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
...moe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
+36
-2
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
View file @
05dfeb76
...
...
@@ -49,6 +49,7 @@ internal class QQImpl(bot: QQAndroidBot, override val coroutineContext: Coroutin
}
internal
class
MemberImpl
(
qq
:
QQImpl
,
group
:
GroupImpl
,
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
View file @
05dfeb76
...
...
@@ -7,6 +7,8 @@ import kotlinx.io.core.ByteReadPacket
import
kotlinx.io.core.Input
import
kotlinx.io.core.buildPacket
import
kotlinx.io.core.use
import
net.mamoe.mirai.contact.Contact
import
net.mamoe.mirai.contact.QQ
import
net.mamoe.mirai.data.MultiPacket
import
net.mamoe.mirai.data.Packet
import
net.mamoe.mirai.event.BroadcastControllable
...
...
@@ -15,6 +17,7 @@ import net.mamoe.mirai.event.Subscribable
import
net.mamoe.mirai.event.broadcast
import
net.mamoe.mirai.network.BotNetworkHandler
import
net.mamoe.mirai.qqandroid.QQAndroidBot
import
net.mamoe.mirai.qqandroid.QQImpl
import
net.mamoe.mirai.qqandroid.event.PacketReceivedEvent
import
net.mamoe.mirai.qqandroid.network.protocol.packet.*
import
net.mamoe.mirai.qqandroid.network.protocol.packet.list.FriendList
...
...
@@ -24,6 +27,7 @@ import net.mamoe.mirai.utils.*
import
net.mamoe.mirai.utils.cryptor.contentToString
import
net.mamoe.mirai.utils.io.*
import
kotlin.coroutines.CoroutineContext
import
kotlin.coroutines.EmptyCoroutineContext
@Suppress
(
"MemberVisibilityCanBePrivate"
)
@UseExperimental
(
MiraiInternalAPI
::
class
)
...
...
@@ -116,11 +120,41 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
println(data.contentToString())
*/
/*
* 开始加载Contact表
* */
var
currentFriendCount
=
0
var
totalFriendCount
:
Short
=
0
while
(
true
)
{
val
data
=
FriendList
.
GetFriendGroupList
(
bot
.
client
,
currentFriendCount
,
10
,
0
,
0
).
sendAndExpect
<
FriendList
.
GetFriendGroupList
.
Response
>()
totalFriendCount
=
data
.
totalFriendCount
bot
.
qqs
.
delegate
.
addAll
(
data
.
friendList
.
map
{
QQImpl
(
this
@QQAndroidBotNetworkHandler
.
bot
,
EmptyCoroutineContext
,
it
.
friendUin
!!
).
also
{
currentFriendCount
++
}
}
)
bot
.
logger
.
info
(
"正在加载好友信息 ${currentFriendCount}/${totalFriendCount}"
)
if
(
currentFriendCount
>=
totalFriendCount
)
{
break
}
}
bot
.
logger
.
info
(
"好友信息加载完成, 共 ${currentFriendCount}个"
)
//发送事件
/**
val data = FriendList.GetTroopList(
bot
.
client
bot.client
).sendAndExpect<FriendList.GetTroopList.Response>(100000)
println(data.contentToString())
*/
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment