Adjust class package

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt

@@ -6,7 +6,6 @@ import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.event.Subscribable
 import net.mamoe.mirai.qqandroid.QQAndroidBot
 import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.TroopManagement
-import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.image.ImageUpPacket
 import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.image.ImgStore
 import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.image.LongConn
 import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.receive.MessageSvc
@@ -120,7 +119,7 @@ internal object KnownPacketFactories {
         FriendList.GetTroopListSimplify,
         FriendList.GetTroopMemberList,
         ImgStore.GroupPicUp,
-        ImageUpPacket,
+        LongConn.OffPicUp,
         LongConn.OffPicDown,
         TroopManagement.EditSpecialTitle,
         TroopManagement.Mute,

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/ImageUpPacket.kt

-package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.image
-
-import kotlinx.io.core.ByteReadPacket
-import kotlinx.io.core.writeFully
-import net.mamoe.mirai.data.Packet
-import net.mamoe.mirai.qqandroid.QQAndroidBot
-import net.mamoe.mirai.qqandroid.io.serialization.ProtoBufWithNullableSupport
-import net.mamoe.mirai.qqandroid.network.QQAndroidClient
-import net.mamoe.mirai.qqandroid.network.protocol.data.proto.Cmd0x352Packet
-import net.mamoe.mirai.qqandroid.network.protocol.data.proto.UploadImgReq
-import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacket
-import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacketFactory
-import net.mamoe.mirai.qqandroid.network.protocol.packet.buildOutgoingUniPacket
-
-internal object ImageUpPacket : OutgoingPacketFactory<ImageUpPacket.ImageUpPacketResponse>("LongConn.OffPicUp") {
-
-    operator fun invoke(client: QQAndroidClient, req: UploadImgReq): OutgoingPacket {
-        // TODO: 2020/1/24 测试: bodyType, subAppId
-        return buildOutgoingUniPacket(client) {
-            val data = ProtoBufWithNullableSupport.dump(
-                Cmd0x352Packet.serializer(),
-                Cmd0x352Packet.createByImageRequest(req)
-            )
-            writeInt(data.size + 4)
-            writeFully(data)
-        }
-    }
-
-    override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): ImageUpPacketResponse {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-
-    sealed class ImageUpPacketResponse : Packet {
-        object Success : ImageUpPacketResponse()
-    }
-
-
-}
\ No newline at end of file

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/LongConn.kt

@@ -5,21 +5,48 @@ import kotlinx.io.core.writeFully
 import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.qqandroid.QQAndroidBot
 import net.mamoe.mirai.qqandroid.io.serialization.ProtoBufWithNullableSupport
+import net.mamoe.mirai.qqandroid.io.serialization.writeProtoBuf
 import net.mamoe.mirai.qqandroid.network.QQAndroidClient
 import net.mamoe.mirai.qqandroid.network.protocol.data.proto.Cmd0x352Packet
 import net.mamoe.mirai.qqandroid.network.protocol.data.proto.GetImgUrlReq
+import net.mamoe.mirai.qqandroid.network.protocol.data.proto.UploadImgReq
 import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacket
 import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacketFactory
-import net.mamoe.mirai.qqandroid.network.protocol.packet.buildLoginOutgoingPacket
-import net.mamoe.mirai.qqandroid.network.protocol.packet.writeSsoPacket
+import net.mamoe.mirai.qqandroid.network.protocol.packet.buildOutgoingUniPacket
+import net.mamoe.mirai.utils.io.debugPrintThis
 
 internal class LongConn {
 
-    object OffPicDown : OutgoingPacketFactory<OffPicDown.ImageDownPacketResponse>("LongConn.OffPicDown"){
+    internal object OffPicUp : OutgoingPacketFactory<OffPicUp.ImageUpPacketResponse>("LongConn.OffPicUp") {
+
+        operator fun invoke(client: QQAndroidClient, req: UploadImgReq): OutgoingPacket {
+            return buildOutgoingUniPacket(client) {
+                //  val data = ProtoBufWithNullableSupport.dump(
+//
+                //  )
+                // writeInt(data.size + 4)
+                writeProtoBuf(
+                    Cmd0x352Packet.serializer(),
+                    Cmd0x352Packet.createByImageRequest(req)
+                )
+            }
+        }
+
+        override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): ImageUpPacketResponse {
+            this.debugPrintThis()
+            TODO()
+        }
+
+
+        sealed class ImageUpPacketResponse : Packet {
+            object Success : ImageUpPacketResponse()
+        }
+
+    }
+
+    object OffPicDown : OutgoingPacketFactory<OffPicDown.ImageDownPacketResponse>("LongConn.OffPicDown") {
         operator fun invoke(client: QQAndroidClient, req: GetImgUrlReq): OutgoingPacket {
-            // TODO: 2020/1/24 测试: bodyType, subAppId
-            return buildLoginOutgoingPacket(client, key = client.wLoginSigInfo.d2Key, bodyType = 1) {
-                writeSsoPacket(client, subAppId = 0, commandName = commandName, sequenceId = it) {
+            return buildOutgoingUniPacket(client) {
                 val data = ProtoBufWithNullableSupport.dump(
                     Cmd0x352Packet.serializer(),
                     Cmd0x352Packet.createByImageRequest(req)
@@ -28,7 +55,6 @@ internal class LongConn {
                 writeFully(data)
             }
         }
-        }
 
         override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): ImageDownPacketResponse {
             TODO("not implemented") //To change body of created functions use File | Settings | File Templates.