From 154c91e73bd4d731c58035b7dfcd202fbff5d73a Mon Sep 17 00:00:00 2001 From: "jiahua.liu" Date: Mon, 27 Jan 2020 17:42:04 +0800 Subject: [PATCH] PushNotify --- .../packet/chat/receive/MessageSvc.PushNotify.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.PushNotify.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.PushNotify.kt index 12ae416b5..d429fc72b 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.PushNotify.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.PushNotify.kt @@ -6,17 +6,24 @@ import net.mamoe.mirai.qqandroid.QQAndroidBot import net.mamoe.mirai.qqandroid.network.io.JceInput import net.mamoe.mirai.qqandroid.network.io.JceOutput import net.mamoe.mirai.qqandroid.network.io.JceStruct +import net.mamoe.mirai.qqandroid.network.protocol.jce.RequestPacket import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.qqandroid.network.protocol.packet.PacketFactory import net.mamoe.mirai.utils.io.discardExact import net.mamoe.mirai.utils.io.readIoBuffer +import net.mamoe.mirai.utils.io.toReadPacket import net.mamoe.mirai.utils.io.toUHexString internal object PushNotify : PacketFactory("MessageSvc.PushNotify") { override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): MessageNotification { - return MessageNotification.newInstanceFrom(JceInput(this.apply { discardExact(4) }.readIoBuffer())) + val pk = RequestPacket.newInstanceFrom(JceInput(this.apply { discardExact(4) }.readIoBuffer())) + println(pk.sFuncName) + println(pk.sServantName) + println(pk.sBuffer.toUHexString()) + return MessageNotification.newInstanceFrom(JceInput(pk.sBuffer.toReadPacket(4))) } + class MessageNotification( val luni: Long, val ctype: Byte,