From 80debd962a0dfadb7dc261385558f4ac9f238870 Mon Sep 17 00:00:00 2001 From: Him188 Date: Tue, 18 Aug 2020 08:50:16 +0800 Subject: [PATCH] Migrate to new kotlinx-serialization-core; Embed JceKt as net.mamoe.mirai.qqandroid.utils.io.serialization.Tars (#489) --- CONTRIBUTING.md | 2 +- buildSrc/src/main/kotlin/Versions.kt | 12 +- docs/mirai.md | 14 +- mirai-core-qqandroid/build.gradle.kts | 6 +- .../network/protocol/data/jce/ConfigPush.kt | 188 +- .../network/protocol/data/jce/FriendList.kt | 262 +- .../network/protocol/data/jce/GroupMngReq.kt | 60 +- .../network/protocol/data/jce/MsgType0x210.kt | 234 +- .../protocol/data/jce/OnlinePushPack.kt | 298 +- .../protocol/data/jce/PushNotifyPack.kt | 84 +- .../data/jce/RequestMSFForceOffline.kt | 24 +- .../protocol/data/jce/RequestPacket.kt | 28 +- .../data/jce/RequestPushForceOffline.kt | 10 +- .../protocol/data/jce/SvcReqRegister.kt | 74 +- .../network/protocol/data/jce/TroopList.kt | 264 +- .../network/protocol/data/proto/Cmd0x352.kt | 234 +- .../network/protocol/data/proto/Cmd0x388.kt | 372 +- .../network/protocol/data/proto/Cmd0x857.kt | 488 +-- .../network/protocol/data/proto/Cmd0x858.kt | 98 +- .../network/protocol/data/proto/Define.kt | 658 ++-- .../protocol/data/proto/FriendListCommon.kt | 60 +- .../network/protocol/data/proto/Group.kt | 46 +- .../network/protocol/data/proto/Highway.kt | 476 +-- .../protocol/data/proto/HummerCommelem.kt | 288 +- .../protocol/data/proto/ImageRequest.kt | 30 +- .../network/protocol/data/proto/LongMsg.kt | 66 +- .../network/protocol/data/proto/Msg.kt | 1464 +++---- .../network/protocol/data/proto/MsgCommon.kt | 182 +- .../protocol/data/proto/MsgRevokeUserDef.kt | 22 +- .../network/protocol/data/proto/MsgSvc.kt | 832 ++-- .../protocol/data/proto/MsgTransmit.kt | 12 +- .../network/protocol/data/proto/MultiMsg.kt | 88 +- .../network/protocol/data/proto/OIDB.kt | 2456 ++++++------ .../network/protocol/data/proto/Oidb0x769.kt | 56 +- .../network/protocol/data/proto/OnlinePush.kt | 42 +- .../network/protocol/data/proto/PbReserve.kt | 182 +- .../protocol/data/proto/StatSvcGetOnline.kt | 22 +- .../network/protocol/data/proto/StructMsg.kt | 408 +- .../network/protocol/data/proto/SyncCookie.kt | 20 +- .../protocol/data/proto/msgType0x210.kt | 3504 ++++++++--------- .../packet/chat/receive/OnlinePush.ReqPush.kt | 33 +- .../protocol/packet/login/ConfigPushSvc.kt | 12 +- .../ProtoBufWithNullableSupport.kt | 48 +- .../utils/io/serialization/tars/Tars.kt | 70 + .../utils/io/serialization/tars/TarsId.kt | 13 + .../tars/internal/TarsDecoder.kt | 333 ++ .../serialization/tars/internal/TarsInput.kt | 260 ++ .../io/serialization/tars/internal/TarsOld.kt | 324 ++ .../io/serialization/tars/internal/TarsTag.kt | 107 + .../qqandroid/utils/io/serialization/utils.kt | 10 +- mirai-core/build.gradle.kts | 4 +- .../message/data/CustomMessage.kt | 8 +- .../net.mamoe.mirai/utils/DeviceInfo.kt | 20 +- 53 files changed, 8007 insertions(+), 6901 deletions(-) create mode 100644 mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/io/serialization/tars/Tars.kt create mode 100644 mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/io/serialization/tars/TarsId.kt create mode 100644 mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/io/serialization/tars/internal/TarsDecoder.kt create mode 100644 mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/io/serialization/tars/internal/TarsInput.kt create mode 100644 mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/io/serialization/tars/internal/TarsOld.kt create mode 100644 mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/io/serialization/tars/internal/TarsTag.kt diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 575984171..abe4ae21f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ mirai 欢迎一切形式的代码贡献。你可以通过以下几种途径向 m ### 注意事项 - 尽量不要引用新的库 - 遵守 Kotlin 官方代码规范（提交前使用 IDE 格式化代码 (commit 时勾选 'Reformat code')） -- 不要手动拆解数据包. 请一定使用 `kotlinx.serialization` 拆解 ProtoBuf, 使用 [`jcekt`](https://github.com/him188/jcekt) 拆解 Tars 数据包, 使用 `kotlinx.serialization` 拆解 Json 数据. +- 不要手动拆解数据包. 请一定使用 `kotlinx.serialization` 拆解 ProtoBuf, 使用 `net.mamoe.mirai.qqandroid.utils.io.serialization.Tars` 拆解 Tars 数据包, 使用 `kotlinx.serialization` 拆解 Json 数据. ## 社区 diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index c3736c931..2e51664d2 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -13,11 +13,11 @@ object Versions { } object Kotlin { - const val compiler = "1.4.0-rc" - const val stdlib = "1.4.0-rc" - const val coroutines = "1.3.8-1.4.0-rc" - const val atomicFU = "0.14.3-1.4.0-rc" - const val serialization = "1.0-M1-1.4.0-rc" + const val compiler = "1.4.0" + const val stdlib = "1.4.0" + const val coroutines = "1.3.9" + const val atomicFU = "0.14.4" + const val serialization = "1.0.0-RC" const val ktor = "1.3.2-1.4.0-rc" const val binaryValidator = "0.2.3" @@ -26,8 +26,6 @@ object Versions { const val dokka = "0.10.1" } - const val jcekt = "2.0.0-1.4.0-rc-4" - object Android { const val androidGradlePlugin = "3.5.3" } diff --git a/docs/mirai.md b/docs/mirai.md index f9c5a0f32..3b2ec87f5 100644 --- a/docs/mirai.md +++ b/docs/mirai.md @@ -121,15 +121,15 @@ Mirai 通过某种方式同时生成了桥梁方法 `public void sendMessage(Mes 在 `1.0.0` 及更新版本, mirai-core 通过 gradle 依赖的 `api` 方式暴露了如下依赖库: -- `kotlin-stdlib`: Kotlin 标准库, 版本至少为 1.3.72 -- `kotlin-reflect`: Kotlin 反射, 版本至少为 1.3.72 -- `kotlinx-coroutines-core`: Kotlin 协程, 版本至少为 1.3.7 -- `kotlinx-serialization-runtime`: Kotlin 序列化运行时, 和 JSON 序列化, 版本至少为 0.20.0 -- `kotlinx-serialization-protobuf`: Kotlin ProtocolBuffers 序列化, 版本至少为 0.20.0 +- `kotlin-stdlib`: Kotlin 标准库, 版本 1.4.0 +- `kotlin-reflect`: Kotlin 反射, 版本 1.4.0 +- `kotlinx-coroutines-core`: Kotlin 协程, 版本 1.3.9 +- `kotlinx-serialization-core`: Kotlin 序列化运行时, 和 JSON 序列化, 版本 1.0.0-RC (此库不稳定, 请不要用新版本覆盖) +- `kotlinx-serialization-protobuf`: Kotlin ProtocolBuffers 序列化, 版本 1.0.0-RC (此库不稳定, 请不要用新版本覆盖) - `kotlinx-io`: Kotlin IO, 版本至少为 0.1.16 (此库非常不稳定, 不建议使用它) - `kotlinx-coroutines-io`: Kotlin 异步 IO, 版本至少为 0.1.16 (此库非常不稳定, 不建议使用它) -- `kotlinx-atomicfu`: Kotlin 原子操作, 版本至少为 0.14.2 -- `ktor-client-core`, `ktor-network`, `ktor-client-cio`: Ktor HTTP, 版本至少为 1.3.2 +- `kotlinx-atomicfu`: Kotlin 原子操作, 版本至少为 0.14.4 +- `ktor-client-core`, `ktor-network`, `ktor-client-cio`: Ktor HTTP, 版本至少为 1.3.2-1.4.0-rc 在 JVM, mirai 使用 `"org.bouncycastle:bcprov-jdk15on:1.64"` 进行密匙计算. diff --git a/mirai-core-qqandroid/build.gradle.kts b/mirai-core-qqandroid/build.gradle.kts index 2ca01df42..f89cf9c03 100644 --- a/mirai-core-qqandroid/build.gradle.kts +++ b/mirai-core-qqandroid/build.gradle.kts @@ -47,6 +47,7 @@ kotlin { languageSettings.useExperimentalAnnotation("kotlin.experimental.ExperimentalTypeInference") languageSettings.useExperimentalAnnotation("kotlin.time.ExperimentalTime") languageSettings.useExperimentalAnnotation("kotlin.contracts.ExperimentalContracts") + languageSettings.useExperimentalAnnotation("kotlinx.serialization.ExperimentalSerializationApi") languageSettings.progressiveMode = true @@ -57,13 +58,11 @@ kotlin { val commonMain by getting { dependencies { - api(kotlinx("serialization-runtime", Versions.Kotlin.serialization)) + api(kotlinx("serialization-core", Versions.Kotlin.serialization)) implementation(kotlinx("serialization-protobuf", Versions.Kotlin.serialization)) api("org.jetbrains.kotlinx:atomicfu:${Versions.Kotlin.atomicFU}") implementation(kotlinx("io", Versions.Kotlin.io)) implementation(kotlinx("coroutines-io", Versions.Kotlin.coroutinesIo)) - //implementation("moe.him188:jcekt:${Versions.jcekt}") - implementation("moe.him188:jcekt:${Versions.jcekt}") } } @@ -95,6 +94,7 @@ kotlin { dependencies { runtimeOnly(files("build/classes/kotlin/jvm/main")) // classpath is not properly set by IDE implementation("org.bouncycastle:bcprov-jdk15on:1.64") + implementation(kotlinx("io-jvm", Versions.Kotlin.io)) // api(kotlinx("coroutines-debug", Versions.Kotlin.coroutines)) } } diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt index 564400295..6f43566e3 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt @@ -1,173 +1,173 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce import kotlinx.serialization.Serializable -import moe.him188.jcekt.JceId import net.mamoe.mirai.qqandroid.network.Packet import net.mamoe.mirai.qqandroid.utils.io.JceStruct +import net.mamoe.mirai.qqandroid.utils.io.serialization.tars.TarsId import kotlin.jvm.JvmField @Serializable internal class BigDataChannel( - @JceId(0) @JvmField val vBigdataIplists: List, - @JceId(1) @JvmField val sBigdataSigSession: ByteArray? = null, - @JceId(2) @JvmField val sBigdataKeySession: ByteArray? = null, - @JceId(3) @JvmField val uSigUin: Long? = null, - @JceId(4) @JvmField val iConnectFlag: Int? = 1, - @JceId(5) @JvmField val vBigdataPbBuf: ByteArray? = null + @TarsId(0) @JvmField val vBigdataIplists: List, + @TarsId(1) @JvmField val sBigdataSigSession: ByteArray? = null, + @TarsId(2) @JvmField val sBigdataKeySession: ByteArray? = null, + @TarsId(3) @JvmField val uSigUin: Long? = null, + @TarsId(4) @JvmField val iConnectFlag: Int? = 1, + @TarsId(5) @JvmField val vBigdataPbBuf: ByteArray? = null ) : JceStruct @Serializable internal class BigDataIpInfo( - @JceId(0) @JvmField val uType: Long, - @JceId(1) @JvmField val sIp: String = "", - @JceId(2) @JvmField val uPort: Long + @TarsId(0) @JvmField val uType: Long, + @TarsId(1) @JvmField val sIp: String = "", + @TarsId(2) @JvmField val uPort: Long ) : JceStruct @Serializable internal class BigDataIpList( - @JceId(0) @JvmField val uServiceType: Long, - @JceId(1) @JvmField val vIplist: List, - @JceId(2) @JvmField val netSegConfs: List? = null, - @JceId(3) @JvmField val ufragmentSize: Long? = null + @TarsId(0) @JvmField val uServiceType: Long, + @TarsId(1) @JvmField val vIplist: List, + @TarsId(2) @JvmField val netSegConfs: List? = null, + @TarsId(3) @JvmField val ufragmentSize: Long? = null ) : JceStruct @Serializable internal class ClientLogConfig( - @JceId(1) @JvmField val type: Int, - @JceId(2) @JvmField val timeStart: TimeStamp? = null, - @JceId(3) @JvmField val timeFinish: TimeStamp? = null, - @JceId(4) @JvmField val loglevel: Byte? = null, - @JceId(5) @JvmField val cookie: Int? = null, - @JceId(6) @JvmField val lseq: Long? = null + @TarsId(1) @JvmField val type: Int, + @TarsId(2) @JvmField val timeStart: TimeStamp? = null, + @TarsId(3) @JvmField val timeFinish: TimeStamp? = null, + @TarsId(4) @JvmField val loglevel: Byte? = null, + @TarsId(5) @JvmField val cookie: Int? = null, + @TarsId(6) @JvmField val lseq: Long? = null ) : JceStruct @Serializable internal class DomainIpChannel( - @JceId(0) @JvmField val vDomainIplists: List + @TarsId(0) @JvmField val vDomainIplists: List ) : JceStruct @Serializable internal class DomainIpInfo( - @JceId(1) @JvmField val uIp: Int, - @JceId(2) @JvmField val uPort: Int + @TarsId(1) @JvmField val uIp: Int, + @TarsId(2) @JvmField val uPort: Int ) : JceStruct @Serializable internal class DomainIpList( - @JceId(0) @JvmField val uDomainType: Int, - @JceId(1) @JvmField val vIplist: List, - @JceId(2) @JvmField val unknown: ByteArray? = null, - @JceId(4) @JvmField val int: Int? = null// added + @TarsId(0) @JvmField val uDomainType: Int, + @TarsId(1) @JvmField val vIplist: List, + @TarsId(2) @JvmField val unknown: ByteArray? = null, + @TarsId(4) @JvmField val int: Int? = null// added ) : JceStruct @Serializable internal class _340( - @JceId(1) @JvmField val field1315: List<_339>, - @JceId(3) @JvmField val field1316: List<_339>, - @JceId(4) @JvmField val field1317: Int, - @JceId(5) @JvmField val field1318: Byte? = 0, - @JceId(6) @JvmField val field1319: Byte? = 0, - @JceId(7) @JvmField val field1320: Int? = 1, - @JceId(8) @JvmField val field1321: List<_339>? = null, - @JceId(9) @JvmField val field1322: List<_339>? = null, - @JceId(10) @JvmField val field1323: List<_339>? = null, - @JceId(11) @JvmField val field1324: List<_339>? = null, - @JceId(12) @JvmField val field1325: List<_339>? = null, - @JceId(13) @JvmField val field1326: List<_339>? = null, - @JceId(14) @JvmField val netType: Byte? = 0, - @JceId(15) @JvmField val heThreshold: Int? = 0, - @JceId(16) @JvmField val policyId: String? = "" + @TarsId(1) @JvmField val field1315: List<_339>, + @TarsId(3) @JvmField val field1316: List<_339>, + @TarsId(4) @JvmField val field1317: Int, + @TarsId(5) @JvmField val field1318: Byte? = 0, + @TarsId(6) @JvmField val field1319: Byte? = 0, + @TarsId(7) @JvmField val field1320: Int? = 1, + @TarsId(8) @JvmField val field1321: List<_339>? = null, + @TarsId(9) @JvmField val field1322: List<_339>? = null, + @TarsId(10) @JvmField val field1323: List<_339>? = null, + @TarsId(11) @JvmField val field1324: List<_339>? = null, + @TarsId(12) @JvmField val field1325: List<_339>? = null, + @TarsId(13) @JvmField val field1326: List<_339>? = null, + @TarsId(14) @JvmField val netType: Byte? = 0, + @TarsId(15) @JvmField val heThreshold: Int? = 0, + @TarsId(16) @JvmField val policyId: String? = "" ) : JceStruct @Serializable internal class _339( - @JceId(1) @JvmField val field1298: String = "", - @JceId(2) @JvmField val field1299: Int = 0, - @JceId(3) @JvmField val field1300: Byte = 0, - @JceId(4) @JvmField val field1301: Byte = 0, - @JceId(5) @JvmField val field1302: Byte? = 0, - @JceId(6) @JvmField val field1303: Int? = 8, - @JceId(7) @JvmField val field1304: Byte? = 0, - @JceId(8) @JvmField val field1305: String = "", - @JceId(9) @JvmField val field1306: String = "" + @TarsId(1) @JvmField val field1298: String = "", + @TarsId(2) @JvmField val field1299: Int = 0, + @TarsId(3) @JvmField val field1300: Byte = 0, + @TarsId(4) @JvmField val field1301: Byte = 0, + @TarsId(5) @JvmField val field1302: Byte? = 0, + @TarsId(6) @JvmField val field1303: Int? = 8, + @TarsId(7) @JvmField val field1304: Byte? = 0, + @TarsId(8) @JvmField val field1305: String = "", + @TarsId(9) @JvmField val field1306: String = "" ) : JceStruct @Serializable internal class FileStoragePushFSSvcListFuckKotlin( - @JceId(0) @JvmField val vUpLoadList: List? = listOf(), - @JceId(1) @JvmField val vPicDownLoadList: List? = listOf(), - @JceId(2) @JvmField val vGPicDownLoadList: List? = null, - @JceId(3) @JvmField val vQzoneProxyServiceList: List? = null, - @JceId(4) @JvmField val vUrlEncodeServiceList: List? = null, - @JceId(5) @JvmField val bigDataChannel: BigDataChannel? = null, - @JceId(6) @JvmField val vVipEmotionList: List? = null, - @JceId(7) @JvmField val vC2CPicDownList: List? = null, - @JceId(8) @JvmField val fmtIPInfo: FmtIPInfo? = null, - @JceId(9) @JvmField val domainIpChannel: DomainIpChannel? = null, - @JceId(10) @JvmField val pttlist: ByteArray? = null + @TarsId(0) @JvmField val vUpLoadList: List? = listOf(), + @TarsId(1) @JvmField val vPicDownLoadList: List? = listOf(), + @TarsId(2) @JvmField val vGPicDownLoadList: List? = null, + @TarsId(3) @JvmField val vQzoneProxyServiceList: List? = null, + @TarsId(4) @JvmField val vUrlEncodeServiceList: List? = null, + @TarsId(5) @JvmField val bigDataChannel: BigDataChannel? = null, + @TarsId(6) @JvmField val vVipEmotionList: List? = null, + @TarsId(7) @JvmField val vC2CPicDownList: List? = null, + @TarsId(8) @JvmField val fmtIPInfo: FmtIPInfo? = null, + @TarsId(9) @JvmField val domainIpChannel: DomainIpChannel? = null, + @TarsId(10) @JvmField val pttlist: ByteArray? = null ) : JceStruct @Serializable internal class FileStorageServerListInfo( - @JceId(1) @JvmField val sIP: String = "", - @JceId(2) @JvmField val iPort: Int + @TarsId(1) @JvmField val sIP: String = "", + @TarsId(2) @JvmField val iPort: Int ) : JceStruct @Serializable internal class FmtIPInfo( - @JceId(0) @JvmField val sGateIp: String = "", - @JceId(1) @JvmField val iGateIpOper: Long + @TarsId(0) @JvmField val sGateIp: String = "", + @TarsId(1) @JvmField val iGateIpOper: Long ) : JceStruct @Serializable internal class NetSegConf( - @JceId(0) @JvmField val uint32NetType: Long? = null, - @JceId(1) @JvmField val uint32Segsize: Long? = null, - @JceId(2) @JvmField val uint32Segnum: Long? = null, - @JceId(3) @JvmField val uint32Curconnnum: Long? = null + @TarsId(0) @JvmField val uint32NetType: Long? = null, + @TarsId(1) @JvmField val uint32Segsize: Long? = null, + @TarsId(2) @JvmField val uint32Segnum: Long? = null, + @TarsId(3) @JvmField val uint32Curconnnum: Long? = null ) : JceStruct @Suppress("ArrayInDataClass") @Serializable internal class PushReq( - @JceId(1) @JvmField val type: Int, - @JceId(2) @JvmField val jcebuf: ByteArray, - @JceId(3) @JvmField val seq: Long + @TarsId(1) @JvmField val type: Int, + @TarsId(2) @JvmField val jcebuf: ByteArray, + @TarsId(3) @JvmField val seq: Long ) : JceStruct, Packet @Serializable internal class PushResp( - @JceId(1) @JvmField val type: Int, - @JceId(2) @JvmField val seq: Long, - @JceId(3) @JvmField val jcebuf: ByteArray? = null + @TarsId(1) @JvmField val type: Int, + @TarsId(2) @JvmField val seq: Long, + @TarsId(3) @JvmField val jcebuf: ByteArray? = null ) : JceStruct @Serializable internal class SsoServerList( - @JceId(1) @JvmField val v2G3GList: List, - @JceId(3) @JvmField val vWifiList: List, - @JceId(4) @JvmField val iReconnect: Int, - @JceId(5) @JvmField val testSpeed: Byte? = null, - @JceId(6) @JvmField val useNewList: Byte? = null, - @JceId(7) @JvmField val iMultiConn: Int? = 1, - @JceId(8) @JvmField val vHttp2g3glist: List? = null, - @JceId(9) @JvmField val vHttpWifilist: List? = null + @TarsId(1) @JvmField val v2G3GList: List, + @TarsId(3) @JvmField val vWifiList: List, + @TarsId(4) @JvmField val iReconnect: Int, + @TarsId(5) @JvmField val testSpeed: Byte? = null, + @TarsId(6) @JvmField val useNewList: Byte? = null, + @TarsId(7) @JvmField val iMultiConn: Int? = 1, + @TarsId(8) @JvmField val vHttp2g3glist: List? = null, + @TarsId(9) @JvmField val vHttpWifilist: List? = null ) : JceStruct @Serializable internal class SsoServerListInfo( - @JceId(1) @JvmField val sIP: String = "", - @JceId(2) @JvmField val iPort: Int, - @JceId(3) @JvmField val linkType: Byte, - @JceId(4) @JvmField val proxy: Byte, - @JceId(5) @JvmField val protocolType: Byte? = null, - @JceId(6) @JvmField val iTimeOut: Int? = 10 + @TarsId(1) @JvmField val sIP: String = "", + @TarsId(2) @JvmField val iPort: Int, + @TarsId(3) @JvmField val linkType: Byte, + @TarsId(4) @JvmField val proxy: Byte, + @TarsId(5) @JvmField val protocolType: Byte? = null, + @TarsId(6) @JvmField val iTimeOut: Int? = 10 ) : JceStruct @Serializable internal class TimeStamp( - @JceId(1) @JvmField val year: Int, - @JceId(2) @JvmField val month: Byte, - @JceId(3) @JvmField val day: Byte, - @JceId(4) @JvmField val hour: Byte + @TarsId(1) @JvmField val year: Int, + @TarsId(2) @JvmField val month: Byte, + @TarsId(3) @JvmField val day: Byte, + @TarsId(4) @JvmField val hour: Byte ) : JceStruct diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt index 205cdbd70..3f493efdc 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt @@ -1,175 +1,175 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce import kotlinx.serialization.Serializable -import moe.him188.jcekt.JceId import net.mamoe.mirai.qqandroid.utils.io.JceStruct +import net.mamoe.mirai.qqandroid.utils.io.serialization.tars.TarsId import kotlin.jvm.JvmField @Serializable internal class ModifyGroupCardReq( - @JceId(0) @JvmField val dwZero: Long, - @JceId(1) @JvmField val dwGroupCode: Long, - @JceId(2) @JvmField val dwNewSeq: Long, - @JceId(3) @JvmField val vecUinInfo: List + @TarsId(0) @JvmField val dwZero: Long, + @TarsId(1) @JvmField val dwGroupCode: Long, + @TarsId(2) @JvmField val dwNewSeq: Long, + @TarsId(3) @JvmField val vecUinInfo: List ) : JceStruct @Serializable internal class stUinInfo( - @JceId(0) @JvmField val dwuin: Long, - @JceId(1) @JvmField val dwFlag: Long, - @JceId(2) @JvmField val sName: String = "", - @JceId(3) @JvmField val gender: Byte, - @JceId(4) @JvmField val sPhone: String = "", - @JceId(5) @JvmField val sEmail: String = "", - @JceId(6) @JvmField val sRemark: String = "" + @TarsId(0) @JvmField val dwuin: Long, + @TarsId(1) @JvmField val dwFlag: Long, + @TarsId(2) @JvmField val sName: String = "", + @TarsId(3) @JvmField val gender: Byte, + @TarsId(4) @JvmField val sPhone: String = "", + @TarsId(5) @JvmField val sEmail: String = "", + @TarsId(6) @JvmField val sRemark: String = "" ) : JceStruct @Serializable internal class GetFriendListReq( - @JceId(0) @JvmField val reqtype: Int? = null, - @JceId(1) @JvmField val ifReflush: Byte? = null, - @JceId(2) @JvmField val uin: Long? = null, - @JceId(3) @JvmField val startIndex: Short? = null, - @JceId(4) @JvmField val getfriendCount: Short? = null, - @JceId(5) @JvmField val groupid: Byte? = null, - @JceId(6) @JvmField val ifGetGroupInfo: Byte? = null, - @JceId(7) @JvmField val groupstartIndex: Byte? = null, - @JceId(8) @JvmField val getgroupCount: Byte? = null, - @JceId(9) @JvmField val ifGetMSFGroup: Byte? = null, - @JceId(10) @JvmField val ifShowTermType: Byte? = null, - @JceId(11) @JvmField val version: Long? = null, - @JceId(12) @JvmField val uinList: List? = null, - @JceId(13) @JvmField val eAppType: Int = 0, - @JceId(14) @JvmField val ifGetDOVId: Byte? = null, - @JceId(15) @JvmField val ifGetBothFlag: Byte? = null, - @JceId(16) @JvmField val vec0xd50Req: ByteArray? = null, - @JceId(17) @JvmField val vec0xd6bReq: ByteArray? = null, - @JceId(18) @JvmField val vecSnsTypelist: List? = null + @TarsId(0) @JvmField val reqtype: Int? = null, + @TarsId(1) @JvmField val ifReflush: Byte? = null, + @TarsId(2) @JvmField val uin: Long? = null, + @TarsId(3) @JvmField val startIndex: Short? = null, + @TarsId(4) @JvmField val getfriendCount: Short? = null, + @TarsId(5) @JvmField val groupid: Byte? = null, + @TarsId(6) @JvmField val ifGetGroupInfo: Byte? = null, + @TarsId(7) @JvmField val groupstartIndex: Byte? = null, + @TarsId(8) @JvmField val getgroupCount: Byte? = null, + @TarsId(9) @JvmField val ifGetMSFGroup: Byte? = null, + @TarsId(10) @JvmField val ifShowTermType: Byte? = null, + @TarsId(11) @JvmField val version: Long? = null, + @TarsId(12) @JvmField val uinList: List? = null, + @TarsId(13) @JvmField val eAppType: Int = 0, + @TarsId(14) @JvmField val ifGetDOVId: Byte? = null, + @TarsId(15) @JvmField val ifGetBothFlag: Byte? = null, + @TarsId(16) @JvmField val vec0xd50Req: ByteArray? = null, + @TarsId(17) @JvmField val vec0xd6bReq: ByteArray? = null, + @TarsId(18) @JvmField val vecSnsTypelist: List? = null ) : JceStruct @Serializable internal class GetFriendListResp( - @JceId(0) @JvmField val reqtype: Int, - @JceId(1) @JvmField val ifReflush: Byte, - @JceId(2) @JvmField val uin: Long, - @JceId(3) @JvmField val startIndex: Short, - @JceId(4) @JvmField val getfriendCount: Short, - @JceId(5) @JvmField val totoalFriendCount: Short, - @JceId(6) @JvmField val friendCount: Short, - @JceId(7) @JvmField val vecFriendInfo: List? = null, - @JceId(8) @JvmField val groupid: Byte? = null, - @JceId(9) @JvmField val ifGetGroupInfo: Byte, - @JceId(10) @JvmField val groupstartIndex: Byte? = null, - @JceId(11) @JvmField val getgroupCount: Byte? = null, - @JceId(12) @JvmField val totoalGroupCount: Short? = null, - @JceId(13) @JvmField val groupCount: Byte? = null, - @JceId(14) @JvmField val vecGroupInfo: List? = null, - @JceId(15) @JvmField val result: Int, - @JceId(16) @JvmField val errorCode: Short? = null, - @JceId(17) @JvmField val onlineFriendCount: Short? = null, - @JceId(18) @JvmField val serverTime: Long? = null, - @JceId(19) @JvmField val sqqOnLineCount: Short? = null, - @JceId(20) @JvmField val vecMSFGroupInfo: List? = null, - @JceId(21) @JvmField val respType: Byte? = null, - @JceId(22) @JvmField val hasOtherRespFlag: Byte? = null, - @JceId(23) @JvmField val stSelfInfo: FriendInfo? = null, - @JceId(24) @JvmField val showPcIcon: Byte? = null, - @JceId(25) @JvmField val wGetExtSnsRspCode: Short? = null, - @JceId(26) @JvmField val stSubSrvRspCode: FriendListSubSrvRspCode? = null + @TarsId(0) @JvmField val reqtype: Int, + @TarsId(1) @JvmField val ifReflush: Byte, + @TarsId(2) @JvmField val uin: Long, + @TarsId(3) @JvmField val startIndex: Short, + @TarsId(4) @JvmField val getfriendCount: Short, + @TarsId(5) @JvmField val totoalFriendCount: Short, + @TarsId(6) @JvmField val friendCount: Short, + @TarsId(7) @JvmField val vecFriendInfo: List? = null, + @TarsId(8) @JvmField val groupid: Byte? = null, + @TarsId(9) @JvmField val ifGetGroupInfo: Byte, + @TarsId(10) @JvmField val groupstartIndex: Byte? = null, + @TarsId(11) @JvmField val getgroupCount: Byte? = null, + @TarsId(12) @JvmField val totoalGroupCount: Short? = null, + @TarsId(13) @JvmField val groupCount: Byte? = null, + @TarsId(14) @JvmField val vecGroupInfo: List? = null, + @TarsId(15) @JvmField val result: Int, + @TarsId(16) @JvmField val errorCode: Short? = null, + @TarsId(17) @JvmField val onlineFriendCount: Short? = null, + @TarsId(18) @JvmField val serverTime: Long? = null, + @TarsId(19) @JvmField val sqqOnLineCount: Short? = null, + @TarsId(20) @JvmField val vecMSFGroupInfo: List? = null, + @TarsId(21) @JvmField val respType: Byte? = null, + @TarsId(22) @JvmField val hasOtherRespFlag: Byte? = null, + @TarsId(23) @JvmField val stSelfInfo: FriendInfo? = null, + @TarsId(24) @JvmField val showPcIcon: Byte? = null, + @TarsId(25) @JvmField val wGetExtSnsRspCode: Short? = null, + @TarsId(26) @JvmField val stSubSrvRspCode: FriendListSubSrvRspCode? = null ) : JceStruct @Serializable internal class FriendListSubSrvRspCode( - @JceId(0) @JvmField val wGetMutualMarkRspCode: Short? = null, - @JceId(1) @JvmField val wGetIntimateInfoRspCode: Short? = null + @TarsId(0) @JvmField val wGetMutualMarkRspCode: Short? = null, + @TarsId(1) @JvmField val wGetIntimateInfoRspCode: Short? = null ) : JceStruct @Serializable internal class FriendInfo( - @JceId(0) @JvmField val friendUin: Long, - @JceId(1) @JvmField val groupId: Byte, - @JceId(2) @JvmField val faceId: Short, - @JceId(3) @JvmField val remark: String = "", - @JceId(4) @JvmField val sqqtype: Byte, - @JceId(5) @JvmField val status: Byte = 20, - @JceId(6) @JvmField val memberLevel: Byte? = null, - @JceId(7) @JvmField val isMqqOnLine: Byte? = null, - @JceId(8) @JvmField val sqqOnLineState: Byte? = null, - @JceId(9) @JvmField val isIphoneOnline: Byte? = null, - @JceId(10) @JvmField val detalStatusFlag: Byte? = null, - @JceId(11) @JvmField val sqqOnLineStateV2: Byte? = null, - @JceId(12) @JvmField val sShowName: String? = "", - @JceId(13) @JvmField val isRemark: Byte? = null, - @JceId(14) @JvmField val nick: String = "", - @JceId(15) @JvmField val specialFlag: Byte? = null, - @JceId(16) @JvmField val vecIMGroupID: ByteArray? = null, - @JceId(17) @JvmField val vecMSFGroupID: ByteArray? = null, - @JceId(18) @JvmField val iTermType: Int? = null, - @JceId(19) @JvmField val oVipInfo: VipBaseInfo? = null, //? bad - @JceId(20) @JvmField val network: Byte? = null, - @JceId(21) @JvmField val vecRing: ByteArray? = null, - @JceId(22) @JvmField val uAbiFlag: Long? = null, - @JceId(23) @JvmField val ulFaceAddonId: Long? = null, - @JceId(24) @JvmField val eNetworkType: Int? = 0, - @JceId(25) @JvmField val uVipFont: Long? = null, - @JceId(26) @JvmField val eIconType: Int? = 0, - @JceId(27) @JvmField val termDesc: String? = "", - @JceId(28) @JvmField val uColorRing: Long? = null, - @JceId(29) @JvmField val apolloFlag: Byte? = null, - @JceId(30) @JvmField val uApolloTimestamp: Long? = null, - @JceId(31) @JvmField val sex: Byte? = null, - @JceId(32) @JvmField val uFounderFont: Long? = null, - @JceId(33) @JvmField val eimId: String? = "", - @JceId(34) @JvmField val eimMobile: String? = "", - @JceId(35) @JvmField val olympicTorch: Byte? = null, - @JceId(36) @JvmField val uApolloSignTime: Long? = null, - @JceId(37) @JvmField val uLaviUin: Long? = null, - @JceId(38) @JvmField val uTagUpdateTime: Long? = null, - @JceId(39) @JvmField val uGameLastLoginTime: Long? = null, - @JceId(40) @JvmField val uGameAppid: Long? = null, - @JceId(41) @JvmField val vecCardID: ByteArray? = null, - @JceId(42) @JvmField val ulBitSet: Long? = null, - @JceId(43) @JvmField val kingOfGloryFlag: Byte? = null, - @JceId(44) @JvmField val ulKingOfGloryRank: Long? = null, - @JceId(45) @JvmField val masterUin: String? = "", - @JceId(46) @JvmField val uLastMedalUpdateTime: Long? = null, - @JceId(47) @JvmField val uFaceStoreId: Long? = null, - @JceId(48) @JvmField val uFontEffect: Long? = null, - @JceId(49) @JvmField val sDOVId: String? = "", - @JceId(50) @JvmField val uBothFlag: Long? = null, - @JceId(51) @JvmField val centiShow3DFlag: Byte? = null, - @JceId(52) @JvmField val vecIntimateInfo: ByteArray? = null, - @JceId(53) @JvmField val showNameplate: Byte? = null, - @JceId(54) @JvmField val newLoverDiamondFlag: Byte? = null, - @JceId(55) @JvmField val vecExtSnsFrdData: ByteArray? = null, - @JceId(56) @JvmField val vecMutualMarkData: ByteArray? = null + @TarsId(0) @JvmField val friendUin: Long, + @TarsId(1) @JvmField val groupId: Byte, + @TarsId(2) @JvmField val faceId: Short, + @TarsId(3) @JvmField val remark: String = "", + @TarsId(4) @JvmField val sqqtype: Byte, + @TarsId(5) @JvmField val status: Byte = 20, + @TarsId(6) @JvmField val memberLevel: Byte? = null, + @TarsId(7) @JvmField val isMqqOnLine: Byte? = null, + @TarsId(8) @JvmField val sqqOnLineState: Byte? = null, + @TarsId(9) @JvmField val isIphoneOnline: Byte? = null, + @TarsId(10) @JvmField val detalStatusFlag: Byte? = null, + @TarsId(11) @JvmField val sqqOnLineStateV2: Byte? = null, + @TarsId(12) @JvmField val sShowName: String? = "", + @TarsId(13) @JvmField val isRemark: Byte? = null, + @TarsId(14) @JvmField val nick: String = "", + @TarsId(15) @JvmField val specialFlag: Byte? = null, + @TarsId(16) @JvmField val vecIMGroupID: ByteArray? = null, + @TarsId(17) @JvmField val vecMSFGroupID: ByteArray? = null, + @TarsId(18) @JvmField val iTermType: Int? = null, + @TarsId(19) @JvmField val oVipInfo: VipBaseInfo? = null, //? bad + @TarsId(20) @JvmField val network: Byte? = null, + @TarsId(21) @JvmField val vecRing: ByteArray? = null, + @TarsId(22) @JvmField val uAbiFlag: Long? = null, + @TarsId(23) @JvmField val ulFaceAddonId: Long? = null, + @TarsId(24) @JvmField val eNetworkType: Int? = 0, + @TarsId(25) @JvmField val uVipFont: Long? = null, + @TarsId(26) @JvmField val eIconType: Int? = 0, + @TarsId(27) @JvmField val termDesc: String? = "", + @TarsId(28) @JvmField val uColorRing: Long? = null, + @TarsId(29) @JvmField val apolloFlag: Byte? = null, + @TarsId(30) @JvmField val uApolloTimestamp: Long? = null, + @TarsId(31) @JvmField val sex: Byte? = null, + @TarsId(32) @JvmField val uFounderFont: Long? = null, + @TarsId(33) @JvmField val eimId: String? = "", + @TarsId(34) @JvmField val eimMobile: String? = "", + @TarsId(35) @JvmField val olympicTorch: Byte? = null, + @TarsId(36) @JvmField val uApolloSignTime: Long? = null, + @TarsId(37) @JvmField val uLaviUin: Long? = null, + @TarsId(38) @JvmField val uTagUpdateTime: Long? = null, + @TarsId(39) @JvmField val uGameLastLoginTime: Long? = null, + @TarsId(40) @JvmField val uGameAppid: Long? = null, + @TarsId(41) @JvmField val vecCardID: ByteArray? = null, + @TarsId(42) @JvmField val ulBitSet: Long? = null, + @TarsId(43) @JvmField val kingOfGloryFlag: Byte? = null, + @TarsId(44) @JvmField val ulKingOfGloryRank: Long? = null, + @TarsId(45) @JvmField val masterUin: String? = "", + @TarsId(46) @JvmField val uLastMedalUpdateTime: Long? = null, + @TarsId(47) @JvmField val uFaceStoreId: Long? = null, + @TarsId(48) @JvmField val uFontEffect: Long? = null, + @TarsId(49) @JvmField val sDOVId: String? = "", + @TarsId(50) @JvmField val uBothFlag: Long? = null, + @TarsId(51) @JvmField val centiShow3DFlag: Byte? = null, + @TarsId(52) @JvmField val vecIntimateInfo: ByteArray? = null, + @TarsId(53) @JvmField val showNameplate: Byte? = null, + @TarsId(54) @JvmField val newLoverDiamondFlag: Byte? = null, + @TarsId(55) @JvmField val vecExtSnsFrdData: ByteArray? = null, + @TarsId(56) @JvmField val vecMutualMarkData: ByteArray? = null ) : JceStruct @Serializable internal class VipBaseInfo( - @JceId(0) @JvmField val mOpenInfo: Map? = null, + @TarsId(0) @JvmField val mOpenInfo: Map? = null, // 1, 2 are since 8.2.7 - @JceId(1) @JvmField val iNameplateVipType: Int? = 0, - @JceId(2) @JvmField val iGrayNameplateFlag: Int? = 0 + @TarsId(1) @JvmField val iNameplateVipType: Int? = 0, + @TarsId(2) @JvmField val iGrayNameplateFlag: Int? = 0 ) : JceStruct @Serializable internal class VipOpenInfo( - @JceId(0) @JvmField val open: Boolean? = false, - @JceId(1) @JvmField val iVipType: Int = -1, - @JceId(2) @JvmField val iVipLevel: Int = -1, - @JceId(3) @JvmField val iVipFlag: Int? = null, - @JceId(4) @JvmField val nameplateId: Long? = null + @TarsId(0) @JvmField val open: Boolean? = false, + @TarsId(1) @JvmField val iVipType: Int = -1, + @TarsId(2) @JvmField val iVipLevel: Int = -1, + @TarsId(3) @JvmField val iVipFlag: Int? = null, + @TarsId(4) @JvmField val nameplateId: Long? = null ) : JceStruct @Serializable internal class GroupInfo( - @JceId(0) @JvmField val groupId: Byte, - @JceId(1) @JvmField val groupname: String = "", - @JceId(2) @JvmField val friendCount: Int, - @JceId(3) @JvmField val onlineFriendCount: Int, - @JceId(4) @JvmField val seqid: Byte? = null, - @JceId(5) @JvmField val sqqOnLineCount: Int? = null + @TarsId(0) @JvmField val groupId: Byte, + @TarsId(1) @JvmField val groupname: String = "", + @TarsId(2) @JvmField val friendCount: Int, + @TarsId(3) @JvmField val onlineFriendCount: Int, + @TarsId(4) @JvmField val seqid: Byte? = null, + @TarsId(5) @JvmField val sqqOnLineCount: Int? = null ) : JceStruct diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/GroupMngReq.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/GroupMngReq.kt index aaf198b5a..5fd921d74 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/GroupMngReq.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/GroupMngReq.kt @@ -1,43 +1,43 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce import kotlinx.serialization.Serializable -import moe.him188.jcekt.JceId import net.mamoe.mirai.qqandroid.utils.io.JceStruct +import net.mamoe.mirai.qqandroid.utils.io.serialization.tars.TarsId import kotlin.jvm.JvmField @Serializable internal class GroupMngReqJce( - @JceId(0) @JvmField val reqtype: Int, - @JceId(1) @JvmField val uin: Long, - @JceId(2) @JvmField val vecBody: ByteArray, - @JceId(3) @JvmField val checkInGroup: Byte? = null, - @JceId(4) @JvmField val sGroupLocation: String? = "", - @JceId(5) @JvmField val statOption: Byte? = null, - @JceId(6) @JvmField val wSourceID: Int? = null, - @JceId(7) @JvmField val wSourceSubID: Int? = null, - @JceId(8) @JvmField val isSupportAuthQuestionJoin: Byte? = null, - @JceId(9) @JvmField val ifGetAuthInfo: Byte? = null, - @JceId(10) @JvmField val dwDiscussUin: Long? = null, - @JceId(11) @JvmField val sJoinGroupKey: String? = "", - @JceId(12) @JvmField val sJoinGroupPicUrl: String? = "", - @JceId(13) @JvmField val vecJoinGroupRichMsg: ByteArray? = null, - @JceId(14) @JvmField val sJoinGroupAuth: String? = "", - @JceId(15) @JvmField val sJoinGroupVerifyToken: String? = "", - @JceId(16) @JvmField val dwJoinVerifyType: Long? = null + @TarsId(0) @JvmField val reqtype: Int, + @TarsId(1) @JvmField val uin: Long, + @TarsId(2) @JvmField val vecBody: ByteArray, + @TarsId(3) @JvmField val checkInGroup: Byte? = null, + @TarsId(4) @JvmField val sGroupLocation: String? = "", + @TarsId(5) @JvmField val statOption: Byte? = null, + @TarsId(6) @JvmField val wSourceID: Int? = null, + @TarsId(7) @JvmField val wSourceSubID: Int? = null, + @TarsId(8) @JvmField val isSupportAuthQuestionJoin: Byte? = null, + @TarsId(9) @JvmField val ifGetAuthInfo: Byte? = null, + @TarsId(10) @JvmField val dwDiscussUin: Long? = null, + @TarsId(11) @JvmField val sJoinGroupKey: String? = "", + @TarsId(12) @JvmField val sJoinGroupPicUrl: String? = "", + @TarsId(13) @JvmField val vecJoinGroupRichMsg: ByteArray? = null, + @TarsId(14) @JvmField val sJoinGroupAuth: String? = "", + @TarsId(15) @JvmField val sJoinGroupVerifyToken: String? = "", + @TarsId(16) @JvmField val dwJoinVerifyType: Long? = null ) : JceStruct @Serializable internal class GroupMngRes( - @JceId(0) @JvmField val reqtype: Int, - @JceId(1) @JvmField val result: Byte, - @JceId(2) @JvmField val vecBody: ByteArray, - @JceId(3) @JvmField val errorString: String = "", - @JceId(4) @JvmField val errorCode: Short = 0, - @JceId(5) @JvmField val isInGroup: Byte? = null, - @JceId(6) @JvmField val sGroupLocation: String? = "", - @JceId(7) @JvmField val isMemInvite: Byte? = null, - @JceId(8) @JvmField val sAuthGrpInfo: String? = "", - @JceId(9) @JvmField val sJoinQuestion: String? = "", - @JceId(10) @JvmField val sJoinAnswer: String? = "", - @JceId(11) @JvmField val dwDis2GrpLimitType: Long? = null + @TarsId(0) @JvmField val reqtype: Int, + @TarsId(1) @JvmField val result: Byte, + @TarsId(2) @JvmField val vecBody: ByteArray, + @TarsId(3) @JvmField val errorString: String = "", + @TarsId(4) @JvmField val errorCode: Short = 0, + @TarsId(5) @JvmField val isInGroup: Byte? = null, + @TarsId(6) @JvmField val sGroupLocation: String? = "", + @TarsId(7) @JvmField val isMemInvite: Byte? = null, + @TarsId(8) @JvmField val sAuthGrpInfo: String? = "", + @TarsId(9) @JvmField val sJoinQuestion: String? = "", + @TarsId(10) @JvmField val sJoinAnswer: String? = "", + @TarsId(11) @JvmField val dwDis2GrpLimitType: Long? = null ) : JceStruct diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/MsgType0x210.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/MsgType0x210.kt index 72cba5272..63960a5cb 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/MsgType0x210.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/MsgType0x210.kt @@ -1,216 +1,216 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce import kotlinx.serialization.Serializable -import moe.him188.jcekt.JceId import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.qqandroid.utils.io.JceStruct +import net.mamoe.mirai.qqandroid.utils.io.serialization.tars.TarsId import kotlin.jvm.JvmField @Serializable internal class AddGroup( - @JceId(0) @JvmField val dwGroupID: Long? = null, - @JceId(1) @JvmField val dwSortID: Long? = null, - @JceId(2) @JvmField val groupName: String? = "" + @TarsId(0) @JvmField val dwGroupID: Long? = null, + @TarsId(1) @JvmField val dwSortID: Long? = null, + @TarsId(2) @JvmField val groupName: String? = "" ) : JceStruct @Serializable internal class DelGroup( - @JceId(0) @JvmField val dwGroupID: Long? = null + @TarsId(0) @JvmField val dwGroupID: Long? = null ) : JceStruct @Serializable internal class FriendGroup( - @JceId(0) @JvmField val dwFuin: Long? = null, - @JceId(1) @JvmField val vOldGroupID: List? = null, - @JceId(2) @JvmField val vNewGroupID: List? = null + @TarsId(0) @JvmField val dwFuin: Long? = null, + @TarsId(1) @JvmField val vOldGroupID: List? = null, + @TarsId(2) @JvmField val vNewGroupID: List? = null ) : JceStruct @Serializable internal class GroupSort( - @JceId(0) @JvmField val dwGroupID: Long? = null, - @JceId(1) @JvmField val dwSortID: Long? = null + @TarsId(0) @JvmField val dwGroupID: Long? = null, + @TarsId(1) @JvmField val dwSortID: Long? = null ) : JceStruct @Serializable internal class MarketFaceInfo( - @JceId(0) @JvmField val insertIdx: Long, - @JceId(1) @JvmField val marketFaceBuff: ByteArray + @TarsId(0) @JvmField val insertIdx: Long, + @TarsId(1) @JvmField val marketFaceBuff: ByteArray ) : JceStruct @Serializable internal class ModFriendGroup( - @JceId(0) @JvmField val vMsgFrdGroup: List? = null + @TarsId(0) @JvmField val vMsgFrdGroup: List? = null ) : JceStruct @Serializable internal class ModGroupName( - @JceId(0) @JvmField val dwGroupID: Long? = null, - @JceId(1) @JvmField val groupName: String? = "" + @TarsId(0) @JvmField val dwGroupID: Long? = null, + @TarsId(1) @JvmField val groupName: String? = "" ) : JceStruct @Serializable internal class ModGroupSort( - @JceId(0) @JvmField val vMsgGroupSort: List? = null + @TarsId(0) @JvmField val vMsgGroupSort: List? = null ) : JceStruct @Serializable internal class MsgType0x210( - @JceId(0) @JvmField val uSubMsgType: Long, - @JceId(1) @JvmField val stMsgInfo0x2: MsgType0x210SubMsgType0x2? = null, - @JceId(3) @JvmField val stMsgInfo0xa: MsgType0x210SubMsgType0xa? = null, - @JceId(4) @JvmField val stMsgInfo0xe: MsgType0x210SubMsgType0xe? = null, - @JceId(5) @JvmField val stMsgInfo0x13: MsgType0x210SubMsgType0x13? = null, - @JceId(6) @JvmField val stMsgInfo0x17: MsgType0x210SubMsgType0x17? = null, - @JceId(7) @JvmField val stMsgInfo0x20: MsgType0x210SubMsgType0x20? = null, - @JceId(8) @JvmField val stMsgInfo0x1d: MsgType0x210SubMsgType0x1d? = null, - @JceId(9) @JvmField val stMsgInfo0x24: MsgType0x210SubMsgType0x24? = null, - @JceId(10) @JvmField val vProtobuf: ByteArray = EMPTY_BYTE_ARRAY + @TarsId(0) @JvmField val uSubMsgType: Long, + @TarsId(1) @JvmField val stMsgInfo0x2: MsgType0x210SubMsgType0x2? = null, + @TarsId(3) @JvmField val stMsgInfo0xa: MsgType0x210SubMsgType0xa? = null, + @TarsId(4) @JvmField val stMsgInfo0xe: MsgType0x210SubMsgType0xe? = null, + @TarsId(5) @JvmField val stMsgInfo0x13: MsgType0x210SubMsgType0x13? = null, + @TarsId(6) @JvmField val stMsgInfo0x17: MsgType0x210SubMsgType0x17? = null, + @TarsId(7) @JvmField val stMsgInfo0x20: MsgType0x210SubMsgType0x20? = null, + @TarsId(8) @JvmField val stMsgInfo0x1d: MsgType0x210SubMsgType0x1d? = null, + @TarsId(9) @JvmField val stMsgInfo0x24: MsgType0x210SubMsgType0x24? = null, + @TarsId(10) @JvmField val vProtobuf: ByteArray = EMPTY_BYTE_ARRAY ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x13( - @JceId(0) @JvmField val uint32SrcAppId: Long? = null, - @JceId(1) @JvmField val uint32SrcInstId: Long? = null, - @JceId(2) @JvmField val uint32DstAppId: Long? = null, - @JceId(3) @JvmField val uint32DstInstId: Long? = null, - @JceId(4) @JvmField val uint64DstUin: Long? = null, - @JceId(5) @JvmField val uint64Sessionid: Long? = null, - @JceId(6) @JvmField val uint32Size: Long? = null, - @JceId(7) @JvmField val uint32Index: Long? = null, - @JceId(8) @JvmField val uint32Type: Long? = null, - @JceId(9) @JvmField val buf: ByteArray? = null + @TarsId(0) @JvmField val uint32SrcAppId: Long? = null, + @TarsId(1) @JvmField val uint32SrcInstId: Long? = null, + @TarsId(2) @JvmField val uint32DstAppId: Long? = null, + @TarsId(3) @JvmField val uint32DstInstId: Long? = null, + @TarsId(4) @JvmField val uint64DstUin: Long? = null, + @TarsId(5) @JvmField val uint64Sessionid: Long? = null, + @TarsId(6) @JvmField val uint32Size: Long? = null, + @TarsId(7) @JvmField val uint32Index: Long? = null, + @TarsId(8) @JvmField val uint32Type: Long? = null, + @TarsId(9) @JvmField val buf: ByteArray? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x13_MsgItem( - @JceId(0) @JvmField val uint32Type: Long? = null, - @JceId(1) @JvmField val text: ByteArray? = null + @TarsId(0) @JvmField val uint32Type: Long? = null, + @TarsId(1) @JvmField val text: ByteArray? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x17( - @JceId(0) @JvmField val dwOpType: Long? = null, - @JceId(1) @JvmField val stAddGroup: AddGroup? = null, - @JceId(2) @JvmField val stDelGroup: DelGroup? = null, - @JceId(3) @JvmField val stModGroupName: ModGroupName? = null, - @JceId(4) @JvmField val stModGroupSort: ModGroupSort? = null, - @JceId(5) @JvmField val stModFriendGroup: ModFriendGroup? = null + @TarsId(0) @JvmField val dwOpType: Long? = null, + @TarsId(1) @JvmField val stAddGroup: AddGroup? = null, + @TarsId(2) @JvmField val stDelGroup: DelGroup? = null, + @TarsId(3) @JvmField val stModGroupName: ModGroupName? = null, + @TarsId(4) @JvmField val stModGroupSort: ModGroupSort? = null, + @TarsId(5) @JvmField val stModFriendGroup: ModFriendGroup? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x1d( - @JceId(0) @JvmField val dwOpType: Long? = null, - @JceId(1) @JvmField val dwUin: Long? = null, - @JceId(2) @JvmField val dwID: Long? = null, - @JceId(3) @JvmField val value: String? = "" + @TarsId(0) @JvmField val dwOpType: Long? = null, + @TarsId(1) @JvmField val dwUin: Long? = null, + @TarsId(2) @JvmField val dwID: Long? = null, + @TarsId(3) @JvmField val value: String? = "" ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x2( - @JceId(0) @JvmField val uSrcAppId: Long? = null, - @JceId(1) @JvmField val uSrcInstId: Long? = null, - @JceId(2) @JvmField val uDstAppId: Long? = null, - @JceId(3) @JvmField val uDstInstId: Long? = null, - @JceId(4) @JvmField val uDstUin: Long? = null, - @JceId(5) @JvmField val fileName: ByteArray? = null, - @JceId(6) @JvmField val fileIndex: ByteArray? = null, - @JceId(7) @JvmField val fileMd5: ByteArray? = null, - @JceId(8) @JvmField val fileKey: ByteArray? = null, - @JceId(9) @JvmField val uServerIp: Long? = null, - @JceId(10) @JvmField val uServerPort: Long? = null, - @JceId(11) @JvmField val fileLen: Long? = null, - @JceId(12) @JvmField val sessionId: Long? = null, - @JceId(13) @JvmField val originfileMd5: ByteArray? = null, - @JceId(14) @JvmField val uOriginfiletype: Long? = null, - @JceId(15) @JvmField val uSeq: Long? = null + @TarsId(0) @JvmField val uSrcAppId: Long? = null, + @TarsId(1) @JvmField val uSrcInstId: Long? = null, + @TarsId(2) @JvmField val uDstAppId: Long? = null, + @TarsId(3) @JvmField val uDstInstId: Long? = null, + @TarsId(4) @JvmField val uDstUin: Long? = null, + @TarsId(5) @JvmField val fileName: ByteArray? = null, + @TarsId(6) @JvmField val fileIndex: ByteArray? = null, + @TarsId(7) @JvmField val fileMd5: ByteArray? = null, + @TarsId(8) @JvmField val fileKey: ByteArray? = null, + @TarsId(9) @JvmField val uServerIp: Long? = null, + @TarsId(10) @JvmField val uServerPort: Long? = null, + @TarsId(11) @JvmField val fileLen: Long? = null, + @TarsId(12) @JvmField val sessionId: Long? = null, + @TarsId(13) @JvmField val originfileMd5: ByteArray? = null, + @TarsId(14) @JvmField val uOriginfiletype: Long? = null, + @TarsId(15) @JvmField val uSeq: Long? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x20( - @JceId(0) @JvmField val dwOpType: Long? = null, - @JceId(1) @JvmField val dwType: Long? = null, - @JceId(2) @JvmField val dwUin: Long? = null, - @JceId(3) @JvmField val remaek: String? = "" + @TarsId(0) @JvmField val dwOpType: Long? = null, + @TarsId(1) @JvmField val dwType: Long? = null, + @TarsId(2) @JvmField val dwUin: Long? = null, + @TarsId(3) @JvmField val remaek: String? = "" ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x24( - @JceId(0) @JvmField val vPluginNumList: List? = null + @TarsId(0) @JvmField val vPluginNumList: List? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0xa( - @JceId(0) @JvmField val uSrcAppId: Long? = null, - @JceId(1) @JvmField val uSrcInstId: Long? = null, - @JceId(2) @JvmField val uDstAppId: Long? = null, - @JceId(3) @JvmField val uDstInstId: Long? = null, - @JceId(4) @JvmField val uDstUin: Long? = null, - @JceId(5) @JvmField val uType: Long? = null, - @JceId(6) @JvmField val uServerIp: Long? = null, - @JceId(7) @JvmField val uServerPort: Long? = null, - @JceId(8) @JvmField val vUrlNotify: ByteArray? = null, - @JceId(9) @JvmField val vTokenKey: ByteArray? = null, - @JceId(10) @JvmField val uFileLen: Long? = null, - @JceId(11) @JvmField val fileName: ByteArray? = null, - @JceId(12) @JvmField val vMd5: ByteArray? = null, - @JceId(13) @JvmField val sessionId: Long? = null, - @JceId(14) @JvmField val originfileMd5: ByteArray? = null, - @JceId(15) @JvmField val uOriginfiletype: Long? = null, - @JceId(16) @JvmField val uSeq: Long? = null + @TarsId(0) @JvmField val uSrcAppId: Long? = null, + @TarsId(1) @JvmField val uSrcInstId: Long? = null, + @TarsId(2) @JvmField val uDstAppId: Long? = null, + @TarsId(3) @JvmField val uDstInstId: Long? = null, + @TarsId(4) @JvmField val uDstUin: Long? = null, + @TarsId(5) @JvmField val uType: Long? = null, + @TarsId(6) @JvmField val uServerIp: Long? = null, + @TarsId(7) @JvmField val uServerPort: Long? = null, + @TarsId(8) @JvmField val vUrlNotify: ByteArray? = null, + @TarsId(9) @JvmField val vTokenKey: ByteArray? = null, + @TarsId(10) @JvmField val uFileLen: Long? = null, + @TarsId(11) @JvmField val fileName: ByteArray? = null, + @TarsId(12) @JvmField val vMd5: ByteArray? = null, + @TarsId(13) @JvmField val sessionId: Long? = null, + @TarsId(14) @JvmField val originfileMd5: ByteArray? = null, + @TarsId(15) @JvmField val uOriginfiletype: Long? = null, + @TarsId(16) @JvmField val uSeq: Long? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0xe( - @JceId(0) @JvmField val uint32SrcAppId: Long? = null, - @JceId(1) @JvmField val uint32SrcInstId: Long? = null, - @JceId(2) @JvmField val uint32DstAppId: Long? = null, - @JceId(3) @JvmField val uint32DstInstId: Long? = null, - @JceId(4) @JvmField val uint64DstUin: Long? = null, - @JceId(5) @JvmField val uint64Sessionid: Long? = null, - @JceId(6) @JvmField val uint32Operate: Long? = null, - @JceId(7) @JvmField val uint32Seq: Long? = null, - @JceId(8) @JvmField val uint32Code: Long? = null, - @JceId(9) @JvmField val msg: String? = "" + @TarsId(0) @JvmField val uint32SrcAppId: Long? = null, + @TarsId(1) @JvmField val uint32SrcInstId: Long? = null, + @TarsId(2) @JvmField val uint32DstAppId: Long? = null, + @TarsId(3) @JvmField val uint32DstInstId: Long? = null, + @TarsId(4) @JvmField val uint64DstUin: Long? = null, + @TarsId(5) @JvmField val uint64Sessionid: Long? = null, + @TarsId(6) @JvmField val uint32Operate: Long? = null, + @TarsId(7) @JvmField val uint32Seq: Long? = null, + @TarsId(8) @JvmField val uint32Code: Long? = null, + @TarsId(9) @JvmField val msg: String? = "" ) : JceStruct @Serializable internal class PersonInfoChange( - @JceId(0) @JvmField val type: Byte? = null, - @JceId(1) @JvmField val vChgField: List? = null + @TarsId(0) @JvmField val type: Byte? = null, + @TarsId(1) @JvmField val vChgField: List? = null ) : JceStruct @Serializable internal class PersonInfoField( - @JceId(0) @JvmField val uField: Long? = null + @TarsId(0) @JvmField val uField: Long? = null ) : JceStruct @Serializable internal class PluginNum( - @JceId(0) @JvmField val dwID: Long? = null, - @JceId(1) @JvmField val dwNUm: Long? = null, - @JceId(2) @JvmField val flag: Byte? = null + @TarsId(0) @JvmField val dwID: Long? = null, + @TarsId(1) @JvmField val dwNUm: Long? = null, + @TarsId(2) @JvmField val flag: Byte? = null ) : JceStruct @Serializable internal class SlaveMasterMsg( - @JceId(0) @JvmField val uMsgType: Long? = null, - @JceId(1) @JvmField val uCmd: Long? = null, - @JceId(2) @JvmField val uSeq: Long? = null, - @JceId(3) @JvmField val fromUin: Long? = null, - @JceId(4) @JvmField val wFromApp: Short? = null, - @JceId(5) @JvmField val uFromInstId: Long? = null, - @JceId(6) @JvmField val toUin: Long? = null, - @JceId(7) @JvmField val wToApp: Short? = null, - @JceId(8) @JvmField val uToInstId: Long? = null, - @JceId(9) @JvmField val vOrigMsg: ByteArray? = null, - @JceId(10) @JvmField val uLastChangeTime: Long? = null, - @JceId(11) @JvmField val vReserved: ByteArray? = null, - @JceId(12) @JvmField val vMarketFace: List? = null, - @JceId(13) @JvmField val uSuperQQBubbleId: Long? = null + @TarsId(0) @JvmField val uMsgType: Long? = null, + @TarsId(1) @JvmField val uCmd: Long? = null, + @TarsId(2) @JvmField val uSeq: Long? = null, + @TarsId(3) @JvmField val fromUin: Long? = null, + @TarsId(4) @JvmField val wFromApp: Short? = null, + @TarsId(5) @JvmField val uFromInstId: Long? = null, + @TarsId(6) @JvmField val toUin: Long? = null, + @TarsId(7) @JvmField val wToApp: Short? = null, + @TarsId(8) @JvmField val uToInstId: Long? = null, + @TarsId(9) @JvmField val vOrigMsg: ByteArray? = null, + @TarsId(10) @JvmField val uLastChangeTime: Long? = null, + @TarsId(11) @JvmField val vReserved: ByteArray? = null, + @TarsId(12) @JvmField val vMarketFace: List? = null, + @TarsId(13) @JvmField val uSuperQQBubbleId: Long? = null ) : JceStruct @Serializable internal class Type_1_QQDataTextMsg( - @JceId(0) @JvmField val msgItem: List? = null + @TarsId(0) @JvmField val msgItem: List? = null ) : JceStruct diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt index f06d8baec..4e0e6bfd6 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt @@ -1,250 +1,250 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce import kotlinx.serialization.Serializable -import moe.him188.jcekt.JceId import net.mamoe.mirai.qqandroid.utils.io.JceStruct +import net.mamoe.mirai.qqandroid.utils.io.serialization.tars.TarsId import kotlin.jvm.JvmField internal class OnlinePushPack { @Serializable internal class DelMsgInfo( - @JceId(0) @JvmField val fromUin: Long, - @JceId(1) @JvmField val uMsgTime: Long, - @JceId(2) @JvmField val shMsgSeq: Short, - @JceId(3) @JvmField val vMsgCookies: ByteArray? = null, - @JceId(4) @JvmField val wCmd: Short? = null, - @JceId(5) @JvmField val uMsgType: Long? = null, - @JceId(6) @JvmField val uAppId: Long? = null, - @JceId(7) @JvmField val sendTime: Long? = null, - @JceId(8) @JvmField val ssoSeq: Int? = null, - @JceId(9) @JvmField val ssoIp: Int? = null, - @JceId(10) @JvmField val clientIp: Int? = null + @TarsId(0) @JvmField val fromUin: Long, + @TarsId(1) @JvmField val uMsgTime: Long, + @TarsId(2) @JvmField val shMsgSeq: Short, + @TarsId(3) @JvmField val vMsgCookies: ByteArray? = null, + @TarsId(4) @JvmField val wCmd: Short? = null, + @TarsId(5) @JvmField val uMsgType: Long? = null, + @TarsId(6) @JvmField val uAppId: Long? = null, + @TarsId(7) @JvmField val sendTime: Long? = null, + @TarsId(8) @JvmField val ssoSeq: Int? = null, + @TarsId(9) @JvmField val ssoIp: Int? = null, + @TarsId(10) @JvmField val clientIp: Int? = null ) : JceStruct @Serializable internal class DeviceInfo( - @JceId(0) @JvmField val netType: Byte? = null, - @JceId(1) @JvmField val devType: String? = "", - @JceId(2) @JvmField val oSVer: String? = "", - @JceId(3) @JvmField val vendorName: String? = "", - @JceId(4) @JvmField val vendorOSName: String? = "", - @JceId(5) @JvmField val iOSIdfa: String? = "" + @TarsId(0) @JvmField val netType: Byte? = null, + @TarsId(1) @JvmField val devType: String? = "", + @TarsId(2) @JvmField val oSVer: String? = "", + @TarsId(3) @JvmField val vendorName: String? = "", + @TarsId(4) @JvmField val vendorOSName: String? = "", + @TarsId(5) @JvmField val iOSIdfa: String? = "" ) : JceStruct @Serializable internal class Name( - @JceId(0) @JvmField val fromUin: Long, - @JceId(1) @JvmField val uMsgTime: Long, - @JceId(2) @JvmField val shMsgType: Short, - @JceId(3) @JvmField val shMsgSeq: Short, - @JceId(4) @JvmField val msg: String = "", - @JceId(5) @JvmField val uRealMsgTime: Int? = null, - @JceId(6) @JvmField val vMsg: ByteArray? = null, - @JceId(7) @JvmField val uAppShareID: Long? = null, - @JceId(8) @JvmField val vMsgCookies: ByteArray? = null, - @JceId(9) @JvmField val vAppShareCookie: ByteArray? = null, - @JceId(10) @JvmField val msgUid: Long? = null, - @JceId(11) @JvmField val lastChangeTime: Long? = 1L, - @JceId(12) @JvmField val vCPicInfo: List? = null, - @JceId(13) @JvmField val stShareData: ShareData? = null, - @JceId(14) @JvmField val fromInstId: Long? = null, - @JceId(15) @JvmField val vRemarkOfSender: ByteArray? = null, - @JceId(16) @JvmField val fromMobile: String? = "", - @JceId(17) @JvmField val fromName: String? = "", - @JceId(18) @JvmField val vNickName: List? = null, - @JceId(19) @JvmField val stC2CTmpMsgHead: TempMsgHead? = null + @TarsId(0) @JvmField val fromUin: Long, + @TarsId(1) @JvmField val uMsgTime: Long, + @TarsId(2) @JvmField val shMsgType: Short, + @TarsId(3) @JvmField val shMsgSeq: Short, + @TarsId(4) @JvmField val msg: String = "", + @TarsId(5) @JvmField val uRealMsgTime: Int? = null, + @TarsId(6) @JvmField val vMsg: ByteArray? = null, + @TarsId(7) @JvmField val uAppShareID: Long? = null, + @TarsId(8) @JvmField val vMsgCookies: ByteArray? = null, + @TarsId(9) @JvmField val vAppShareCookie: ByteArray? = null, + @TarsId(10) @JvmField val msgUid: Long? = null, + @TarsId(11) @JvmField val lastChangeTime: Long? = 1L, + @TarsId(12) @JvmField val vCPicInfo: List? = null, + @TarsId(13) @JvmField val stShareData: ShareData? = null, + @TarsId(14) @JvmField val fromInstId: Long? = null, + @TarsId(15) @JvmField val vRemarkOfSender: ByteArray? = null, + @TarsId(16) @JvmField val fromMobile: String? = "", + @TarsId(17) @JvmField val fromName: String? = "", + @TarsId(18) @JvmField val vNickName: List? = null, + @TarsId(19) @JvmField val stC2CTmpMsgHead: TempMsgHead? = null ) : JceStruct @Serializable internal class SvcReqPushMsg( - @JceId(0) @JvmField val uin: Long, - @JceId(1) @JvmField val uMsgTime: Long, - @JceId(2) @JvmField val vMsgInfos: List, - @JceId(3) @JvmField val svrip: Int? = 0, - @JceId(4) @JvmField val vSyncCookie: ByteArray? = null, - @JceId(5) @JvmField val vUinPairMsg: List? = null, - @JceId(6) @JvmField val mPreviews: Map? = null + @TarsId(0) @JvmField val uin: Long, + @TarsId(1) @JvmField val uMsgTime: Long, + @TarsId(2) @JvmField val vMsgInfos: List, + @TarsId(3) @JvmField val svrip: Int? = 0, + @TarsId(4) @JvmField val vSyncCookie: ByteArray? = null, + @TarsId(5) @JvmField val vUinPairMsg: List? = null, + @TarsId(6) @JvmField val mPreviews: Map? = null // @SerialId(7) @JvmField val wUserActive: Int? = null, //@SerialId(12) @JvmField val wGeneralFlag: Int? = null ) : JceStruct @Serializable internal class SvcRespPushMsg( - @JceId(0) @JvmField val uin: Long, - @JceId(1) @JvmField val vDelInfos: List, - @JceId(2) @JvmField val svrip: Int = 0, - @JceId(3) @JvmField val pushToken: ByteArray? = null, - @JceId(4) @JvmField val serviceType: Int? = null, - @JceId(5) @JvmField val deviceInfo: DeviceInfo? = null + @TarsId(0) @JvmField val uin: Long, + @TarsId(1) @JvmField val vDelInfos: List, + @TarsId(2) @JvmField val svrip: Int = 0, + @TarsId(3) @JvmField val pushToken: ByteArray? = null, + @TarsId(4) @JvmField val serviceType: Int? = null, + @TarsId(5) @JvmField val deviceInfo: DeviceInfo? = null ) : JceStruct @Serializable internal class UinPairMsg( - @JceId(1) @JvmField val uLastReadTime: Long? = null, - @JceId(2) @JvmField val peerUin: Long? = null, - @JceId(3) @JvmField val uMsgCompleted: Long? = null, - @JceId(4) @JvmField val vMsgInfos: List? = null + @TarsId(1) @JvmField val uLastReadTime: Long? = null, + @TarsId(2) @JvmField val peerUin: Long? = null, + @TarsId(3) @JvmField val uMsgCompleted: Long? = null, + @TarsId(4) @JvmField val vMsgInfos: List? = null ) : JceStruct @Serializable internal class MsgType0x210( - @JceId(0) @JvmField val uSubMsgType: Long, - @JceId(1) @JvmField val stMsgInfo0x2: MsgType0x210SubMsgType0x2? = null, - @JceId(3) @JvmField val stMsgInfo0xa: MsgType0x210SubMsgType0xa? = null, - @JceId(4) @JvmField val stMsgInfo0xe: MsgType0x210SubMsgType0xe? = null, - @JceId(5) @JvmField val stMsgInfo0x13: MsgType0x210SubMsgType0x13? = null, - @JceId(6) @JvmField val stMsgInfo0x17: MsgType0x210SubMsgType0x17? = null, - @JceId(7) @JvmField val stMsgInfo0x20: MsgType0x210SubMsgType0x20? = null, - @JceId(8) @JvmField val stMsgInfo0x1d: MsgType0x210SubMsgType0x1d? = null, - @JceId(9) @JvmField val stMsgInfo0x24: MsgType0x210SubMsgType0x24? = null, - @JceId(10) @JvmField val vProtobuf: ByteArray? = null + @TarsId(0) @JvmField val uSubMsgType: Long, + @TarsId(1) @JvmField val stMsgInfo0x2: MsgType0x210SubMsgType0x2? = null, + @TarsId(3) @JvmField val stMsgInfo0xa: MsgType0x210SubMsgType0xa? = null, + @TarsId(4) @JvmField val stMsgInfo0xe: MsgType0x210SubMsgType0xe? = null, + @TarsId(5) @JvmField val stMsgInfo0x13: MsgType0x210SubMsgType0x13? = null, + @TarsId(6) @JvmField val stMsgInfo0x17: MsgType0x210SubMsgType0x17? = null, + @TarsId(7) @JvmField val stMsgInfo0x20: MsgType0x210SubMsgType0x20? = null, + @TarsId(8) @JvmField val stMsgInfo0x1d: MsgType0x210SubMsgType0x1d? = null, + @TarsId(9) @JvmField val stMsgInfo0x24: MsgType0x210SubMsgType0x24? = null, + @TarsId(10) @JvmField val vProtobuf: ByteArray? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x13( - @JceId(0) @JvmField val uint32SrcAppId: Long? = null, - @JceId(1) @JvmField val uint32SrcInstId: Long? = null, - @JceId(2) @JvmField val uint32DstAppId: Long? = null, - @JceId(3) @JvmField val uint32DstInstId: Long? = null, - @JceId(4) @JvmField val uint64DstUin: Long? = null, - @JceId(5) @JvmField val uint64Sessionid: Long? = null, - @JceId(6) @JvmField val uint32Size: Long? = null, - @JceId(7) @JvmField val uint32Index: Long? = null, - @JceId(8) @JvmField val uint32Type: Long? = null, - @JceId(9) @JvmField val buf: ByteArray? = null + @TarsId(0) @JvmField val uint32SrcAppId: Long? = null, + @TarsId(1) @JvmField val uint32SrcInstId: Long? = null, + @TarsId(2) @JvmField val uint32DstAppId: Long? = null, + @TarsId(3) @JvmField val uint32DstInstId: Long? = null, + @TarsId(4) @JvmField val uint64DstUin: Long? = null, + @TarsId(5) @JvmField val uint64Sessionid: Long? = null, + @TarsId(6) @JvmField val uint32Size: Long? = null, + @TarsId(7) @JvmField val uint32Index: Long? = null, + @TarsId(8) @JvmField val uint32Type: Long? = null, + @TarsId(9) @JvmField val buf: ByteArray? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x17( - @JceId(0) @JvmField val dwOpType: Long? = null, - @JceId(1) @JvmField val stAddGroup: AddGroup? = null, - @JceId(2) @JvmField val stDelGroup: DelGroup? = null, - @JceId(3) @JvmField val stModGroupName: ModGroupName? = null, - @JceId(4) @JvmField val stModGroupSort: ModGroupSort? = null, - @JceId(5) @JvmField val stModFriendGroup: ModFriendGroup? = null + @TarsId(0) @JvmField val dwOpType: Long? = null, + @TarsId(1) @JvmField val stAddGroup: AddGroup? = null, + @TarsId(2) @JvmField val stDelGroup: DelGroup? = null, + @TarsId(3) @JvmField val stModGroupName: ModGroupName? = null, + @TarsId(4) @JvmField val stModGroupSort: ModGroupSort? = null, + @TarsId(5) @JvmField val stModFriendGroup: ModFriendGroup? = null ) : JceStruct @Serializable internal class AddGroup( - @JceId(0) @JvmField val dwGroupID: Long? = null, - @JceId(1) @JvmField val dwSortID: Long? = null, - @JceId(2) @JvmField val groupName: String? = "" + @TarsId(0) @JvmField val dwGroupID: Long? = null, + @TarsId(1) @JvmField val dwSortID: Long? = null, + @TarsId(2) @JvmField val groupName: String? = "" ) : JceStruct @Serializable internal class DelGroup( - @JceId(0) @JvmField val dwGroupID: Long? = null + @TarsId(0) @JvmField val dwGroupID: Long? = null ) : JceStruct @Serializable internal class ModFriendGroup( - @JceId(0) @JvmField val vMsgFrdGroup: List? = null + @TarsId(0) @JvmField val vMsgFrdGroup: List? = null ) : JceStruct @Serializable internal class FriendGroup( - @JceId(0) @JvmField val dwFuin: Long? = null, - @JceId(1) @JvmField val vOldGroupID: List? = null, - @JceId(2) @JvmField val vNewGroupID: List? = null + @TarsId(0) @JvmField val dwFuin: Long? = null, + @TarsId(1) @JvmField val vOldGroupID: List? = null, + @TarsId(2) @JvmField val vNewGroupID: List? = null ) : JceStruct @Serializable internal class ModGroupName( - @JceId(0) @JvmField val dwGroupID: Long? = null, - @JceId(1) @JvmField val groupName: String? = "" + @TarsId(0) @JvmField val dwGroupID: Long? = null, + @TarsId(1) @JvmField val groupName: String? = "" ) : JceStruct @Serializable internal class ModGroupSort( - @JceId(0) @JvmField val vMsgGroupSort: List? = null + @TarsId(0) @JvmField val vMsgGroupSort: List? = null ) : JceStruct @Serializable internal class GroupSort( - @JceId(0) @JvmField val dwGroupID: Long? = null, - @JceId(1) @JvmField val dwSortID: Long? = null + @TarsId(0) @JvmField val dwGroupID: Long? = null, + @TarsId(1) @JvmField val dwSortID: Long? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x1d( - @JceId(0) @JvmField val dwOpType: Long? = null, - @JceId(1) @JvmField val dwUin: Long? = null, - @JceId(2) @JvmField val dwID: Long? = null, - @JceId(3) @JvmField val value: String? = "" + @TarsId(0) @JvmField val dwOpType: Long? = null, + @TarsId(1) @JvmField val dwUin: Long? = null, + @TarsId(2) @JvmField val dwID: Long? = null, + @TarsId(3) @JvmField val value: String? = "" ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x2( - @JceId(0) @JvmField val uSrcAppId: Long? = null, - @JceId(1) @JvmField val uSrcInstId: Long? = null, - @JceId(2) @JvmField val uDstAppId: Long? = null, - @JceId(3) @JvmField val uDstInstId: Long? = null, - @JceId(4) @JvmField val uDstUin: Long? = null, - @JceId(5) @JvmField val fileName: ByteArray? = null, - @JceId(6) @JvmField val fileIndex: ByteArray? = null, - @JceId(7) @JvmField val fileMd5: ByteArray? = null, - @JceId(8) @JvmField val fileKey: ByteArray? = null, - @JceId(9) @JvmField val uServerIp: Long? = null, - @JceId(10) @JvmField val uServerPort: Long? = null, - @JceId(11) @JvmField val fileLen: Long? = null, - @JceId(12) @JvmField val sessionId: Long? = null, - @JceId(13) @JvmField val originfileMd5: ByteArray? = null, - @JceId(14) @JvmField val uOriginfiletype: Long? = null, - @JceId(15) @JvmField val uSeq: Long? = null + @TarsId(0) @JvmField val uSrcAppId: Long? = null, + @TarsId(1) @JvmField val uSrcInstId: Long? = null, + @TarsId(2) @JvmField val uDstAppId: Long? = null, + @TarsId(3) @JvmField val uDstInstId: Long? = null, + @TarsId(4) @JvmField val uDstUin: Long? = null, + @TarsId(5) @JvmField val fileName: ByteArray? = null, + @TarsId(6) @JvmField val fileIndex: ByteArray? = null, + @TarsId(7) @JvmField val fileMd5: ByteArray? = null, + @TarsId(8) @JvmField val fileKey: ByteArray? = null, + @TarsId(9) @JvmField val uServerIp: Long? = null, + @TarsId(10) @JvmField val uServerPort: Long? = null, + @TarsId(11) @JvmField val fileLen: Long? = null, + @TarsId(12) @JvmField val sessionId: Long? = null, + @TarsId(13) @JvmField val originfileMd5: ByteArray? = null, + @TarsId(14) @JvmField val uOriginfiletype: Long? = null, + @TarsId(15) @JvmField val uSeq: Long? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x20( - @JceId(0) @JvmField val dwOpType: Long? = null, - @JceId(1) @JvmField val dwType: Long? = null, - @JceId(2) @JvmField val dwUin: Long? = null, - @JceId(3) @JvmField val remaek: String? = "" + @TarsId(0) @JvmField val dwOpType: Long? = null, + @TarsId(1) @JvmField val dwType: Long? = null, + @TarsId(2) @JvmField val dwUin: Long? = null, + @TarsId(3) @JvmField val remaek: String? = "" ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0x24( - @JceId(0) @JvmField val vPluginNumList: List? = null + @TarsId(0) @JvmField val vPluginNumList: List? = null ) : JceStruct @Serializable internal class PluginNum( - @JceId(0) @JvmField val dwID: Long? = null, - @JceId(1) @JvmField val dwNUm: Long? = null, - @JceId(2) @JvmField val flag: Byte? = null + @TarsId(0) @JvmField val dwID: Long? = null, + @TarsId(1) @JvmField val dwNUm: Long? = null, + @TarsId(2) @JvmField val flag: Byte? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0xa( - @JceId(0) @JvmField val uSrcAppId: Long? = null, - @JceId(1) @JvmField val uSrcInstId: Long? = null, - @JceId(2) @JvmField val uDstAppId: Long? = null, - @JceId(3) @JvmField val uDstInstId: Long? = null, - @JceId(4) @JvmField val uDstUin: Long? = null, - @JceId(5) @JvmField val uType: Long? = null, - @JceId(6) @JvmField val uServerIp: Long? = null, - @JceId(7) @JvmField val uServerPort: Long? = null, - @JceId(8) @JvmField val vUrlNotify: ByteArray? = null, - @JceId(9) @JvmField val vTokenKey: ByteArray? = null, - @JceId(10) @JvmField val uFileLen: Long? = null, - @JceId(11) @JvmField val fileName: ByteArray? = null, - @JceId(12) @JvmField val vMd5: ByteArray? = null, - @JceId(13) @JvmField val sessionId: Long? = null, - @JceId(14) @JvmField val originfileMd5: ByteArray? = null, - @JceId(15) @JvmField val uOriginfiletype: Long? = null, - @JceId(16) @JvmField val uSeq: Long? = null + @TarsId(0) @JvmField val uSrcAppId: Long? = null, + @TarsId(1) @JvmField val uSrcInstId: Long? = null, + @TarsId(2) @JvmField val uDstAppId: Long? = null, + @TarsId(3) @JvmField val uDstInstId: Long? = null, + @TarsId(4) @JvmField val uDstUin: Long? = null, + @TarsId(5) @JvmField val uType: Long? = null, + @TarsId(6) @JvmField val uServerIp: Long? = null, + @TarsId(7) @JvmField val uServerPort: Long? = null, + @TarsId(8) @JvmField val vUrlNotify: ByteArray? = null, + @TarsId(9) @JvmField val vTokenKey: ByteArray? = null, + @TarsId(10) @JvmField val uFileLen: Long? = null, + @TarsId(11) @JvmField val fileName: ByteArray? = null, + @TarsId(12) @JvmField val vMd5: ByteArray? = null, + @TarsId(13) @JvmField val sessionId: Long? = null, + @TarsId(14) @JvmField val originfileMd5: ByteArray? = null, + @TarsId(15) @JvmField val uOriginfiletype: Long? = null, + @TarsId(16) @JvmField val uSeq: Long? = null ) : JceStruct @Serializable internal class MsgType0x210SubMsgType0xe( - @JceId(0) @JvmField val uint32SrcAppId: Long? = null, - @JceId(1) @JvmField val uint32SrcInstId: Long? = null, - @JceId(2) @JvmField val uint32DstAppId: Long? = null, - @JceId(3) @JvmField val uint32DstInstId: Long? = null, - @JceId(4) @JvmField val uint64DstUin: Long? = null, - @JceId(5) @JvmField val uint64Sessionid: Long? = null, - @JceId(6) @JvmField val uint32Operate: Long? = null, - @JceId(7) @JvmField val uint32Seq: Long? = null, - @JceId(8) @JvmField val uint32Code: Long? = null, - @JceId(9) @JvmField val msg: String? = "" + @TarsId(0) @JvmField val uint32SrcAppId: Long? = null, + @TarsId(1) @JvmField val uint32SrcInstId: Long? = null, + @TarsId(2) @JvmField val uint32DstAppId: Long? = null, + @TarsId(3) @JvmField val uint32DstInstId: Long? = null, + @TarsId(4) @JvmField val uint64DstUin: Long? = null, + @TarsId(5) @JvmField val uint64Sessionid: Long? = null, + @TarsId(6) @JvmField val uint32Operate: Long? = null, + @TarsId(7) @JvmField val uint32Seq: Long? = null, + @TarsId(8) @JvmField val uint32Code: Long? = null, + @TarsId(9) @JvmField val msg: String? = "" ) : JceStruct } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt index 69c9e4f97..8ae5e7725 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt @@ -1,72 +1,72 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce import kotlinx.serialization.Serializable -import moe.him188.jcekt.JceId import net.mamoe.mirai.qqandroid.network.Packet import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.qqandroid.utils.io.JceStruct +import net.mamoe.mirai.qqandroid.utils.io.serialization.tars.TarsId import kotlin.jvm.JvmField @Suppress("ArrayInDataClass") @Serializable internal class RequestPushNotify( - @JceId(0) @JvmField val uin: Long? = 0L, - @JceId(1) @JvmField val ctype: Byte = 0, - @JceId(2) @JvmField val strService: String?, - @JceId(3) @JvmField val strCmd: String?, - @JceId(4) @JvmField val vNotifyCookie: ByteArray? = EMPTY_BYTE_ARRAY, - @JceId(5) @JvmField val usMsgType: Int?, - @JceId(6) @JvmField val wUserActive: Int?, - @JceId(7) @JvmField val wGeneralFlag: Int?, - @JceId(8) @JvmField val bindedUin: Long?, - @JceId(9) @JvmField val stMsgInfo: MsgInfo?, - @JceId(10) @JvmField val msgCtrlBuf: String?, - @JceId(11) @JvmField val serverBuf: ByteArray?, - @JceId(12) @JvmField val pingFlag: Long?, - @JceId(13) @JvmField val svrip: Int? + @TarsId(0) @JvmField val uin: Long? = 0L, + @TarsId(1) @JvmField val ctype: Byte = 0, + @TarsId(2) @JvmField val strService: String?, + @TarsId(3) @JvmField val strCmd: String?, + @TarsId(4) @JvmField val vNotifyCookie: ByteArray? = EMPTY_BYTE_ARRAY, + @TarsId(5) @JvmField val usMsgType: Int?, + @TarsId(6) @JvmField val wUserActive: Int?, + @TarsId(7) @JvmField val wGeneralFlag: Int?, + @TarsId(8) @JvmField val bindedUin: Long?, + @TarsId(9) @JvmField val stMsgInfo: MsgInfo?, + @TarsId(10) @JvmField val msgCtrlBuf: String?, + @TarsId(11) @JvmField val serverBuf: ByteArray?, + @TarsId(12) @JvmField val pingFlag: Long?, + @TarsId(13) @JvmField val svrip: Int? ) : JceStruct, Packet @Serializable internal class MsgInfo( - @JceId(0) @JvmField val lFromUin: Long = 0L, - @JceId(1) @JvmField val uMsgTime: Long = 0L, - @JceId(2) @JvmField val shMsgType: Short, - @JceId(3) @JvmField val shMsgSeq: Short, - @JceId(4) @JvmField val strMsg: String?, - @JceId(5) @JvmField val uRealMsgTime: Int?, - @JceId(6) @JvmField val vMsg: ByteArray, - @JceId(7) @JvmField val uAppShareID: Long?, - @JceId(8) @JvmField val vMsgCookies: ByteArray? = EMPTY_BYTE_ARRAY, - @JceId(9) @JvmField val vAppShareCookie: ByteArray? = EMPTY_BYTE_ARRAY, - @JceId(10) @JvmField val lMsgUid: Long?, - @JceId(11) @JvmField val lLastChangeTime: Long?, - @JceId(12) @JvmField val vCPicInfo: List?, - @JceId(13) @JvmField val stShareData: ShareData?, - @JceId(14) @JvmField val lFromInstId: Long?, - @JceId(15) @JvmField val vRemarkOfSender: ByteArray?, - @JceId(16) @JvmField val strFromMobile: String?, - @JceId(17) @JvmField val strFromName: String?, - @JceId(18) @JvmField val vNickName: List?//, + @TarsId(0) @JvmField val lFromUin: Long = 0L, + @TarsId(1) @JvmField val uMsgTime: Long = 0L, + @TarsId(2) @JvmField val shMsgType: Short, + @TarsId(3) @JvmField val shMsgSeq: Short, + @TarsId(4) @JvmField val strMsg: String?, + @TarsId(5) @JvmField val uRealMsgTime: Int?, + @TarsId(6) @JvmField val vMsg: ByteArray, + @TarsId(7) @JvmField val uAppShareID: Long?, + @TarsId(8) @JvmField val vMsgCookies: ByteArray? = EMPTY_BYTE_ARRAY, + @TarsId(9) @JvmField val vAppShareCookie: ByteArray? = EMPTY_BYTE_ARRAY, + @TarsId(10) @JvmField val lMsgUid: Long?, + @TarsId(11) @JvmField val lLastChangeTime: Long?, + @TarsId(12) @JvmField val vCPicInfo: List?, + @TarsId(13) @JvmField val stShareData: ShareData?, + @TarsId(14) @JvmField val lFromInstId: Long?, + @TarsId(15) @JvmField val vRemarkOfSender: ByteArray?, + @TarsId(16) @JvmField val strFromMobile: String?, + @TarsId(17) @JvmField val strFromName: String?, + @TarsId(18) @JvmField val vNickName: List?//, //@SerialId(19) @JvmField val stC2CTmpMsgHead: TempMsgHead? ) : JceStruct @Serializable internal class ShareData( - @JceId(0) @JvmField val pkgname: String = "", - @JceId(1) @JvmField val msgtail: String = "", - @JceId(2) @JvmField val picurl: String = "", - @JceId(3) @JvmField val url: String = "" + @TarsId(0) @JvmField val pkgname: String = "", + @TarsId(1) @JvmField val msgtail: String = "", + @TarsId(2) @JvmField val picurl: String = "", + @TarsId(3) @JvmField val url: String = "" ) : JceStruct @Serializable internal class TempMsgHead( - @JceId(0) @JvmField val c2c_type: Int? = 0, - @JceId(1) @JvmField val serviceType: Int? = 0 + @TarsId(0) @JvmField val c2c_type: Int? = 0, + @TarsId(1) @JvmField val serviceType: Int? = 0 ) : JceStruct @Serializable internal class CPicInfo( - @JceId(0) @JvmField val vPath: ByteArray = EMPTY_BYTE_ARRAY, - @JceId(1) @JvmField val vHost: ByteArray? = EMPTY_BYTE_ARRAY + @TarsId(0) @JvmField val vPath: ByteArray = EMPTY_BYTE_ARRAY, + @TarsId(1) @JvmField val vHost: ByteArray? = EMPTY_BYTE_ARRAY ) : JceStruct \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestMSFForceOffline.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestMSFForceOffline.kt index e9ebbf658..763e37c49 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestMSFForceOffline.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestMSFForceOffline.kt @@ -1,26 +1,26 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce import kotlinx.serialization.Serializable -import moe.him188.jcekt.JceId import net.mamoe.mirai.qqandroid.utils.io.JceStruct +import net.mamoe.mirai.qqandroid.utils.io.serialization.tars.TarsId import kotlin.jvm.JvmField @Serializable internal class RequestMSFForceOffline( - @JceId(0) @JvmField val uin: Long = 0L, - @JceId(1) @JvmField val iSeqno: Long = 0L, - @JceId(2) @JvmField val kickType: Byte = 0, - @JceId(3) @JvmField val info: String = "", - @JceId(4) @JvmField val title: String? = "", - @JceId(5) @JvmField val sigKick: Byte? = 0, - @JceId(6) @JvmField val vecSigKickData: ByteArray? = null, - @JceId(7) @JvmField val sameDevice: Byte? = 0 + @TarsId(0) @JvmField val uin: Long = 0L, + @TarsId(1) @JvmField val iSeqno: Long = 0L, + @TarsId(2) @JvmField val kickType: Byte = 0, + @TarsId(3) @JvmField val info: String = "", + @TarsId(4) @JvmField val title: String? = "", + @TarsId(5) @JvmField val sigKick: Byte? = 0, + @TarsId(6) @JvmField val vecSigKickData: ByteArray? = null, + @TarsId(7) @JvmField val sameDevice: Byte? = 0 ) : JceStruct @Serializable internal class RspMSFForceOffline( - @JceId(0) @JvmField val uin: Long, - @JceId(1) @JvmField val seq: Long, - @JceId(2) @JvmField val const: Byte = 0 + @TarsId(0) @JvmField val uin: Long, + @TarsId(1) @JvmField val seq: Long, + @TarsId(2) @JvmField val const: Byte = 0 ) : JceStruct \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPacket.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPacket.kt index e2dd08a36..5213de074 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPacket.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPacket.kt @@ -1,38 +1,38 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce import kotlinx.serialization.Serializable -import moe.him188.jcekt.JceId import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.qqandroid.utils.io.JceStruct +import net.mamoe.mirai.qqandroid.utils.io.serialization.tars.TarsId import kotlin.jvm.JvmField private val EMPTY_MAP = mapOf() @Serializable internal class RequestPacket( - @JceId(1) @JvmField val iVersion: Short? = 3, - @JceId(2) @JvmField val cPacketType: Byte = 0, - @JceId(3) @JvmField val iMessageType: Int = 0, - @JceId(4) @JvmField val iRequestId: Int = 0, - @JceId(5) @JvmField val sServantName: String = "", - @JceId(6) @JvmField val sFuncName: String = "", - @JceId(7) @JvmField val sBuffer: ByteArray = EMPTY_BYTE_ARRAY, - @JceId(8) @JvmField val iTimeout: Int? = 0, - @JceId(9) @JvmField val context: Map? = EMPTY_MAP, - @JceId(10) @JvmField val status: Map? = EMPTY_MAP + @TarsId(1) @JvmField val iVersion: Short? = 3, + @TarsId(2) @JvmField val cPacketType: Byte = 0, + @TarsId(3) @JvmField val iMessageType: Int = 0, + @TarsId(4) @JvmField val iRequestId: Int = 0, + @TarsId(5) @JvmField val sServantName: String = "", + @TarsId(6) @JvmField val sFuncName: String = "", + @TarsId(7) @JvmField val sBuffer: ByteArray = EMPTY_BYTE_ARRAY, + @TarsId(8) @JvmField val iTimeout: Int? = 0, + @TarsId(9) @JvmField val context: Map? = EMPTY_MAP, + @TarsId(10) @JvmField val status: Map? = EMPTY_MAP ) : JceStruct @Serializable internal class RequestDataVersion3( - @JceId(0) @JvmField val map: Map // 注意: ByteArray 不能直接放序列化的 JceStruct!! 要放类似 RequestDataStructSvcReqRegister 的 + @TarsId(0) @JvmField val map: Map // 注意: ByteArray 不能直接放序列化的 JceStruct!! 要放类似 RequestDataStructSvcReqRegister 的 ) : JceStruct @Serializable internal class RequestDataVersion2( - @JceId(0) @JvmField val map: Map> + @TarsId(0) @JvmField val map: Map> ) : JceStruct @Serializable internal class RequestDataStructSvcReqRegister( - @JceId(0) @JvmField val struct: SvcReqRegister + @TarsId(0) @JvmField val struct: SvcReqRegister ) : JceStruct \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPushForceOffline.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPushForceOffline.kt index 7e4984a20..41becb63a 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPushForceOffline.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPushForceOffline.kt @@ -1,14 +1,14 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce import kotlinx.serialization.Serializable -import moe.him188.jcekt.JceId import net.mamoe.mirai.qqandroid.utils.io.JceStruct +import net.mamoe.mirai.qqandroid.utils.io.serialization.tars.TarsId import kotlin.jvm.JvmField @Serializable internal class RequestPushForceOffline( - @JceId(0) @JvmField val uin: Long, - @JceId(1) @JvmField val title: String? = "", - @JceId(2) @JvmField val tips: String? = "", - @JceId(3) @JvmField val sameDevice: Byte? = null + @TarsId(0) @JvmField val uin: Long, + @TarsId(1) @JvmField val title: String? = "", + @TarsId(2) @JvmField val tips: String? = "", + @TarsId(3) @JvmField val sameDevice: Byte? = null ) : JceStruct \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/SvcReqRegister.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/SvcReqRegister.kt index 8adf62cf4..cbfd9362c 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/SvcReqRegister.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/SvcReqRegister.kt @@ -1,47 +1,47 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce import kotlinx.serialization.Serializable -import moe.him188.jcekt.JceId import net.mamoe.mirai.qqandroid.utils.io.JceStruct +import net.mamoe.mirai.qqandroid.utils.io.serialization.tars.TarsId import kotlin.jvm.JvmField @Serializable internal class SvcReqRegister( - @JceId(0) @JvmField val lUin: Long = 0L, - @JceId(1) @JvmField val lBid: Long = 0L, - @JceId(2) @JvmField val cConnType: Byte = 0, - @JceId(3) @JvmField val sOther: String = "", - @JceId(4) @JvmField val iStatus: Int = 11, - @JceId(5) @JvmField val bOnlinePush: Byte = 0, - @JceId(6) @JvmField val bIsOnline: Byte = 0, - @JceId(7) @JvmField val bIsShowOnline: Byte = 0, - @JceId(8) @JvmField val bKikPC: Byte = 0, - @JceId(9) @JvmField val bKikWeak: Byte = 0, - @JceId(10) @JvmField val timeStamp: Long = 0L, - @JceId(11) @JvmField val iOSVersion: Long = 0L, - @JceId(12) @JvmField val cNetType: Byte = 0, - @JceId(13) @JvmField val sBuildVer: String? = "", - @JceId(14) @JvmField val bRegType: Byte = 0, - @JceId(15) @JvmField val vecDevParam: ByteArray? = null, - @JceId(16) @JvmField val vecGuid: ByteArray? = null, - @JceId(17) @JvmField val iLocaleID: Int = 2052, - @JceId(18) @JvmField val bSlientPush: Byte = 0, - @JceId(19) @JvmField val strDevName: String? = null, - @JceId(20) @JvmField val strDevType: String? = null, - @JceId(21) @JvmField val strOSVer: String? = null, - @JceId(22) @JvmField val bOpenPush: Byte = 1, - @JceId(23) @JvmField val iLargeSeq: Long = 0L, - @JceId(24) @JvmField val iLastWatchStartTime: Long = 0L, - @JceId(26) @JvmField val uOldSSOIp: Long = 0L, - @JceId(27) @JvmField val uNewSSOIp: Long = 0L, - @JceId(28) @JvmField val sChannelNo: String? = null, - @JceId(29) @JvmField val lCpId: Long = 0L, - @JceId(30) @JvmField val strVendorName: String? = null, - @JceId(31) @JvmField val strVendorOSName: String? = null, - @JceId(32) @JvmField val strIOSIdfa: String? = null, - @JceId(33) @JvmField val bytes_0x769_reqbody: ByteArray? = null, - @JceId(34) @JvmField val bIsSetStatus: Byte = 0, - @JceId(35) @JvmField val vecServerBuf: ByteArray? = null, - @JceId(36) @JvmField val bSetMute: Byte = 0 + @TarsId(0) @JvmField val lUin: Long = 0L, + @TarsId(1) @JvmField val lBid: Long = 0L, + @TarsId(2) @JvmField val cConnType: Byte = 0, + @TarsId(3) @JvmField val sOther: String = "", + @TarsId(4) @JvmField val iStatus: Int = 11, + @TarsId(5) @JvmField val bOnlinePush: Byte = 0, + @TarsId(6) @JvmField val bIsOnline: Byte = 0, + @TarsId(7) @JvmField val bIsShowOnline: Byte = 0, + @TarsId(8) @JvmField val bKikPC: Byte = 0, + @TarsId(9) @JvmField val bKikWeak: Byte = 0, + @TarsId(10) @JvmField val timeStamp: Long = 0L, + @TarsId(11) @JvmField val iOSVersion: Long = 0L, + @TarsId(12) @JvmField val cNetType: Byte = 0, + @TarsId(13) @JvmField val sBuildVer: String? = "", + @TarsId(14) @JvmField val bRegType: Byte = 0, + @TarsId(15) @JvmField val vecDevParam: ByteArray? = null, + @TarsId(16) @JvmField val vecGuid: ByteArray? = null, + @TarsId(17) @JvmField val iLocaleID: Int = 2052, + @TarsId(18) @JvmField val bSlientPush: Byte = 0, + @TarsId(19) @JvmField val strDevName: String? = null, + @TarsId(20) @JvmField val strDevType: String? = null, + @TarsId(21) @JvmField val strOSVer: String? = null, + @TarsId(22) @JvmField val bOpenPush: Byte = 1, + @TarsId(23) @JvmField val iLargeSeq: Long = 0L, + @TarsId(24) @JvmField val iLastWatchStartTime: Long = 0L, + @TarsId(26) @JvmField val uOldSSOIp: Long = 0L, + @TarsId(27) @JvmField val uNewSSOIp: Long = 0L, + @TarsId(28) @JvmField val sChannelNo: String? = null, + @TarsId(29) @JvmField val lCpId: Long = 0L, + @TarsId(30) @JvmField val strVendorName: String? = null, + @TarsId(31) @JvmField val strVendorOSName: String? = null, + @TarsId(32) @JvmField val strIOSIdfa: String? = null, + @TarsId(33) @JvmField val bytes_0x769_reqbody: ByteArray? = null, + @TarsId(34) @JvmField val bIsSetStatus: Byte = 0, + @TarsId(35) @JvmField val vecServerBuf: ByteArray? = null, + @TarsId(36) @JvmField val bSetMute: Byte = 0 // @SerialId(25) var vecBindUin: ArrayList<*>? = null // ?? 未知泛型 ) : JceStruct \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/TroopList.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/TroopList.kt index d65a08a4b..5eb587bab 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/TroopList.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/TroopList.kt @@ -1,97 +1,97 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce import kotlinx.serialization.Serializable -import moe.him188.jcekt.JceId import net.mamoe.mirai.qqandroid.utils.io.JceStruct +import net.mamoe.mirai.qqandroid.utils.io.serialization.tars.TarsId import kotlin.jvm.JvmField @Serializable internal class GetTroopListReqV2Simplify( - @JceId(0) @JvmField val uin: Long, - @JceId(1) @JvmField val getMSFMsgFlag: Byte? = null, - @JceId(2) @JvmField val vecCookies: ByteArray? = null, - @JceId(3) @JvmField val vecGroupInfo: List? = null, - @JceId(4) @JvmField val groupFlagExt: Byte? = null, - @JceId(5) @JvmField val shVersion: Int? = null, - @JceId(6) @JvmField val dwCompanyId: Long? = null, - @JceId(7) @JvmField val versionNum: Long? = null, - @JceId(8) @JvmField val getLongGroupName: Byte? = null + @TarsId(0) @JvmField val uin: Long, + @TarsId(1) @JvmField val getMSFMsgFlag: Byte? = null, + @TarsId(2) @JvmField val vecCookies: ByteArray? = null, + @TarsId(3) @JvmField val vecGroupInfo: List? = null, + @TarsId(4) @JvmField val groupFlagExt: Byte? = null, + @TarsId(5) @JvmField val shVersion: Int? = null, + @TarsId(6) @JvmField val dwCompanyId: Long? = null, + @TarsId(7) @JvmField val versionNum: Long? = null, + @TarsId(8) @JvmField val getLongGroupName: Byte? = null ) : JceStruct @Serializable internal class StTroopNumSimplify( - @JceId(0) @JvmField val groupCode: Long, - @JceId(1) @JvmField val dwGroupInfoSeq: Long? = null, - @JceId(2) @JvmField val dwGroupFlagExt: Long? = null, - @JceId(3) @JvmField val dwGroupRankSeq: Long? = null + @TarsId(0) @JvmField val groupCode: Long, + @TarsId(1) @JvmField val dwGroupInfoSeq: Long? = null, + @TarsId(2) @JvmField val dwGroupFlagExt: Long? = null, + @TarsId(3) @JvmField val dwGroupRankSeq: Long? = null ) : JceStruct @Serializable internal class GetTroopListRespV2( - @JceId(0) @JvmField val uin: Long, - @JceId(1) @JvmField val troopCount: Short, - @JceId(2) @JvmField val result: Int, - @JceId(3) @JvmField val errorCode: Short? = null, - @JceId(4) @JvmField val vecCookies: ByteArray? = null, - @JceId(5) @JvmField val vecTroopList: List? = null, - @JceId(6) @JvmField val vecTroopListDel: List? = null, - @JceId(7) @JvmField val vecTroopRank: List? = null, - @JceId(8) @JvmField val vecFavGroup: List? = null, - @JceId(9) @JvmField val vecTroopListExt: List? = null + @TarsId(0) @JvmField val uin: Long, + @TarsId(1) @JvmField val troopCount: Short, + @TarsId(2) @JvmField val result: Int, + @TarsId(3) @JvmField val errorCode: Short? = null, + @TarsId(4) @JvmField val vecCookies: ByteArray? = null, + @TarsId(5) @JvmField val vecTroopList: List? = null, + @TarsId(6) @JvmField val vecTroopListDel: List? = null, + @TarsId(7) @JvmField val vecTroopRank: List? = null, + @TarsId(8) @JvmField val vecFavGroup: List? = null, + @TarsId(9) @JvmField val vecTroopListExt: List? = null ) : JceStruct @Serializable internal class StTroopNum( - @JceId(0) @JvmField val groupUin: Long, - @JceId(1) @JvmField val groupCode: Long, - @JceId(2) @JvmField val flag: Byte? = null, - @JceId(3) @JvmField val dwGroupInfoSeq: Long? = null, - @JceId(4) @JvmField val groupName: String = "", - @JceId(5) @JvmField val groupMemo: String = "", - @JceId(6) @JvmField val dwGroupFlagExt: Long? = null, - @JceId(7) @JvmField val dwGroupRankSeq: Long? = null, - @JceId(8) @JvmField val dwCertificationType: Long? = null, - @JceId(9) @JvmField val dwShutUpTimestamp: Long? = null, - @JceId(10) @JvmField val dwMyShutUpTimestamp: Long? = null, - @JceId(11) @JvmField val dwCmdUinUinFlag: Long? = null, - @JceId(12) @JvmField val dwAdditionalFlag: Long? = null, - @JceId(13) @JvmField val dwGroupTypeFlag: Long? = null, - @JceId(14) @JvmField val dwGroupSecType: Long? = null, - @JceId(15) @JvmField val dwGroupSecTypeInfo: Long? = null, - @JceId(16) @JvmField val dwGroupClassExt: Long? = null, - @JceId(17) @JvmField val dwAppPrivilegeFlag: Long? = null, - @JceId(18) @JvmField val dwSubscriptionUin: Long? = null, - @JceId(19) @JvmField val dwMemberNum: Long? = null, - @JceId(20) @JvmField val dwMemberNumSeq: Long? = null, - @JceId(21) @JvmField val dwMemberCardSeq: Long? = null, - @JceId(22) @JvmField val dwGroupFlagExt3: Long? = null, - @JceId(23) @JvmField val dwGroupOwnerUin: Long, - @JceId(24) @JvmField val isConfGroup: Byte? = null, - @JceId(25) @JvmField val isModifyConfGroupFace: Byte? = null, - @JceId(26) @JvmField val isModifyConfGroupName: Byte? = null, - @JceId(27) @JvmField val dwCmduinJoinTime: Long? = null, - @JceId(28) @JvmField val ulCompanyId: Long? = null, - @JceId(29) @JvmField val dwMaxGroupMemberNum: Long? = null, - @JceId(30) @JvmField val dwCmdUinGroupMask: Long? = null, - @JceId(31) @JvmField val udwHLGuildAppid: Long? = null, - @JceId(32) @JvmField val udwHLGuildSubType: Long? = null, - @JceId(33) @JvmField val udwCmdUinRingtoneID: Long? = null, - @JceId(34) @JvmField val udwCmdUinFlagEx2: Long? = null + @TarsId(0) @JvmField val groupUin: Long, + @TarsId(1) @JvmField val groupCode: Long, + @TarsId(2) @JvmField val flag: Byte? = null, + @TarsId(3) @JvmField val dwGroupInfoSeq: Long? = null, + @TarsId(4) @JvmField val groupName: String = "", + @TarsId(5) @JvmField val groupMemo: String = "", + @TarsId(6) @JvmField val dwGroupFlagExt: Long? = null, + @TarsId(7) @JvmField val dwGroupRankSeq: Long? = null, + @TarsId(8) @JvmField val dwCertificationType: Long? = null, + @TarsId(9) @JvmField val dwShutUpTimestamp: Long? = null, + @TarsId(10) @JvmField val dwMyShutUpTimestamp: Long? = null, + @TarsId(11) @JvmField val dwCmdUinUinFlag: Long? = null, + @TarsId(12) @JvmField val dwAdditionalFlag: Long? = null, + @TarsId(13) @JvmField val dwGroupTypeFlag: Long? = null, + @TarsId(14) @JvmField val dwGroupSecType: Long? = null, + @TarsId(15) @JvmField val dwGroupSecTypeInfo: Long? = null, + @TarsId(16) @JvmField val dwGroupClassExt: Long? = null, + @TarsId(17) @JvmField val dwAppPrivilegeFlag: Long? = null, + @TarsId(18) @JvmField val dwSubscriptionUin: Long? = null, + @TarsId(19) @JvmField val dwMemberNum: Long? = null, + @TarsId(20) @JvmField val dwMemberNumSeq: Long? = null, + @TarsId(21) @JvmField val dwMemberCardSeq: Long? = null, + @TarsId(22) @JvmField val dwGroupFlagExt3: Long? = null, + @TarsId(23) @JvmField val dwGroupOwnerUin: Long, + @TarsId(24) @JvmField val isConfGroup: Byte? = null, + @TarsId(25) @JvmField val isModifyConfGroupFace: Byte? = null, + @TarsId(26) @JvmField val isModifyConfGroupName: Byte? = null, + @TarsId(27) @JvmField val dwCmduinJoinTime: Long? = null, + @TarsId(28) @JvmField val ulCompanyId: Long? = null, + @TarsId(29) @JvmField val dwMaxGroupMemberNum: Long? = null, + @TarsId(30) @JvmField val dwCmdUinGroupMask: Long? = null, + @TarsId(31) @JvmField val udwHLGuildAppid: Long? = null, + @TarsId(32) @JvmField val udwHLGuildSubType: Long? = null, + @TarsId(33) @JvmField val udwCmdUinRingtoneID: Long? = null, + @TarsId(34) @JvmField val udwCmdUinFlagEx2: Long? = null ) : JceStruct @Serializable internal class StGroupRankInfo( - @JceId(0) @JvmField val dwGroupCode: Long, - @JceId(1) @JvmField val groupRankSysFlag: Byte? = null, - @JceId(2) @JvmField val groupRankUserFlag: Byte? = null, - @JceId(3) @JvmField val vecRankMap: List? = null, - @JceId(4) @JvmField val dwGroupRankSeq: Long? = null, - @JceId(5) @JvmField val ownerName: String? = "", - @JceId(6) @JvmField val adminName: String? = "", - @JceId(7) @JvmField val dwOfficeMode: Long? = null, - @JceId(9) @JvmField val fuckIssue405: List? = null // fake + @TarsId(0) @JvmField val dwGroupCode: Long, + @TarsId(1) @JvmField val groupRankSysFlag: Byte? = null, + @TarsId(2) @JvmField val groupRankUserFlag: Byte? = null, + @TarsId(3) @JvmField val vecRankMap: List? = null, + @TarsId(4) @JvmField val dwGroupRankSeq: Long? = null, + @TarsId(5) @JvmField val ownerName: String? = "", + @TarsId(6) @JvmField val adminName: String? = "", + @TarsId(7) @JvmField val dwOfficeMode: Long? = null, + @TarsId(9) @JvmField val fuckIssue405: List? = null // fake ) : JceStruct @Serializable @@ -99,89 +99,89 @@ internal class FuckIssue405 @Serializable internal class StFavoriteGroup( - @JceId(0) @JvmField val dwGroupCode: Long, - @JceId(1) @JvmField val dwTimestamp: Long? = null, - @JceId(2) @JvmField val dwSnsFlag: Long? = 1L, - @JceId(3) @JvmField val dwOpenTimestamp: Long? = null + @TarsId(0) @JvmField val dwGroupCode: Long, + @TarsId(1) @JvmField val dwTimestamp: Long? = null, + @TarsId(2) @JvmField val dwSnsFlag: Long? = 1L, + @TarsId(3) @JvmField val dwOpenTimestamp: Long? = null ) : JceStruct @Serializable internal class StLevelRankPair( - @JceId(0) @JvmField val dwLevel: Long? = null, - @JceId(1) @JvmField val rank: String? = "" + @TarsId(0) @JvmField val dwLevel: Long? = null, + @TarsId(1) @JvmField val rank: String? = "" ) : JceStruct @Serializable internal class GetTroopMemberListReq( - @JceId(0) @JvmField val uin: Long, - @JceId(1) @JvmField val groupCode: Long, - @JceId(2) @JvmField val nextUin: Long, - @JceId(3) @JvmField val groupUin: Long, - @JceId(4) @JvmField val version: Long? = null, - @JceId(5) @JvmField val reqType: Long? = null, - @JceId(6) @JvmField val getListAppointTime: Long? = null, - @JceId(7) @JvmField val richCardNameVer: Byte? = null + @TarsId(0) @JvmField val uin: Long, + @TarsId(1) @JvmField val groupCode: Long, + @TarsId(2) @JvmField val nextUin: Long, + @TarsId(3) @JvmField val groupUin: Long, + @TarsId(4) @JvmField val version: Long? = null, + @TarsId(5) @JvmField val reqType: Long? = null, + @TarsId(6) @JvmField val getListAppointTime: Long? = null, + @TarsId(7) @JvmField val richCardNameVer: Byte? = null ) : JceStruct @Serializable internal class GetTroopMemberListResp( - @JceId(0) @JvmField val uin: Long, - @JceId(1) @JvmField val groupCode: Long, - @JceId(2) @JvmField val groupUin: Long, - @JceId(3) @JvmField val vecTroopMember: List, - @JceId(4) @JvmField val nextUin: Long, - @JceId(5) @JvmField val result: Int, - @JceId(6) @JvmField val errorCode: Short? = null, - @JceId(7) @JvmField val officeMode: Long? = null, - @JceId(8) @JvmField val nextGetTime: Long? = null + @TarsId(0) @JvmField val uin: Long, + @TarsId(1) @JvmField val groupCode: Long, + @TarsId(2) @JvmField val groupUin: Long, + @TarsId(3) @JvmField val vecTroopMember: List, + @TarsId(4) @JvmField val nextUin: Long, + @TarsId(5) @JvmField val result: Int, + @TarsId(6) @JvmField val errorCode: Short? = null, + @TarsId(7) @JvmField val officeMode: Long? = null, + @TarsId(8) @JvmField val nextGetTime: Long? = null ) : JceStruct @Serializable internal class StTroopMemberInfo( - @JceId(0) @JvmField val memberUin: Long, - @JceId(1) @JvmField val faceId: Short, - @JceId(2) @JvmField val age: Byte, - @JceId(3) @JvmField val gender: Byte, - @JceId(4) @JvmField val nick: String = "", - @JceId(5) @JvmField val status: Byte = 20, - @JceId(6) @JvmField val sShowName: String? = null, - @JceId(8) @JvmField val sName: String? = null, - @JceId(9) @JvmField val cGender: Byte? = null, - @JceId(10) @JvmField val sPhone: String? = "", - @JceId(11) @JvmField val sEmail: String? = "", - @JceId(12) @JvmField val sMemo: String? = "", - @JceId(13) @JvmField val autoRemark: String? = "", - @JceId(14) @JvmField val dwMemberLevel: Long? = null, - @JceId(15) @JvmField val dwJoinTime: Long? = null, - @JceId(16) @JvmField val dwLastSpeakTime: Long? = null, - @JceId(17) @JvmField val dwCreditLevel: Long? = null, - @JceId(18) @JvmField val dwFlag: Long? = null, - @JceId(19) @JvmField val dwFlagExt: Long? = null, - @JceId(20) @JvmField val dwPoint: Long? = null, - @JceId(21) @JvmField val concerned: Byte? = null, - @JceId(22) @JvmField val shielded: Byte? = null, - @JceId(23) @JvmField val sSpecialTitle: String? = "", - @JceId(24) @JvmField val dwSpecialTitleExpireTime: Long? = null, - @JceId(25) @JvmField val job: String? = "", - @JceId(26) @JvmField val apolloFlag: Byte? = null, - @JceId(27) @JvmField val dwApolloTimestamp: Long? = null, - @JceId(28) @JvmField val dwGlobalGroupLevel: Long? = null, - @JceId(29) @JvmField val dwTitleId: Long? = null, - @JceId(30) @JvmField val dwShutupTimestap: Long? = null, - @JceId(31) @JvmField val dwGlobalGroupPoint: Long? = null, - @JceId(32) @JvmField val qzusrinfo: QzoneUserInfo? = null, - @JceId(33) @JvmField val richCardNameVer: Byte? = null, - @JceId(34) @JvmField val dwVipType: Long? = null, - @JceId(35) @JvmField val dwVipLevel: Long? = null, - @JceId(36) @JvmField val dwBigClubLevel: Long? = null, - @JceId(37) @JvmField val dwBigClubFlag: Long? = null, - @JceId(38) @JvmField val dwNameplate: Long? = null, - @JceId(39) @JvmField val vecGroupHonor: ByteArray? = null + @TarsId(0) @JvmField val memberUin: Long, + @TarsId(1) @JvmField val faceId: Short, + @TarsId(2) @JvmField val age: Byte, + @TarsId(3) @JvmField val gender: Byte, + @TarsId(4) @JvmField val nick: String = "", + @TarsId(5) @JvmField val status: Byte = 20, + @TarsId(6) @JvmField val sShowName: String? = null, + @TarsId(8) @JvmField val sName: String? = null, + @TarsId(9) @JvmField val cGender: Byte? = null, + @TarsId(10) @JvmField val sPhone: String? = "", + @TarsId(11) @JvmField val sEmail: String? = "", + @TarsId(12) @JvmField val sMemo: String? = "", + @TarsId(13) @JvmField val autoRemark: String? = "", + @TarsId(14) @JvmField val dwMemberLevel: Long? = null, + @TarsId(15) @JvmField val dwJoinTime: Long? = null, + @TarsId(16) @JvmField val dwLastSpeakTime: Long? = null, + @TarsId(17) @JvmField val dwCreditLevel: Long? = null, + @TarsId(18) @JvmField val dwFlag: Long? = null, + @TarsId(19) @JvmField val dwFlagExt: Long? = null, + @TarsId(20) @JvmField val dwPoint: Long? = null, + @TarsId(21) @JvmField val concerned: Byte? = null, + @TarsId(22) @JvmField val shielded: Byte? = null, + @TarsId(23) @JvmField val sSpecialTitle: String? = "", + @TarsId(24) @JvmField val dwSpecialTitleExpireTime: Long? = null, + @TarsId(25) @JvmField val job: String? = "", + @TarsId(26) @JvmField val apolloFlag: Byte? = null, + @TarsId(27) @JvmField val dwApolloTimestamp: Long? = null, + @TarsId(28) @JvmField val dwGlobalGroupLevel: Long? = null, + @TarsId(29) @JvmField val dwTitleId: Long? = null, + @TarsId(30) @JvmField val dwShutupTimestap: Long? = null, + @TarsId(31) @JvmField val dwGlobalGroupPoint: Long? = null, + @TarsId(32) @JvmField val qzusrinfo: QzoneUserInfo? = null, + @TarsId(33) @JvmField val richCardNameVer: Byte? = null, + @TarsId(34) @JvmField val dwVipType: Long? = null, + @TarsId(35) @JvmField val dwVipLevel: Long? = null, + @TarsId(36) @JvmField val dwBigClubLevel: Long? = null, + @TarsId(37) @JvmField val dwBigClubFlag: Long? = null, + @TarsId(38) @JvmField val dwNameplate: Long? = null, + @TarsId(39) @JvmField val vecGroupHonor: ByteArray? = null ) : JceStruct @Serializable internal class QzoneUserInfo( - @JceId(0) @JvmField val eStarState: Int? = null, - @JceId(1) @JvmField val extendInfo: Map? = null + @TarsId(0) @JvmField val eStarState: Int? = null, + @TarsId(1) @JvmField val extendInfo: Map? = null ) : JceStruct \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt index 4638dd2a9..285c8f854 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt @@ -1,7 +1,7 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId +import kotlinx.serialization.protobuf.ProtoNumber import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf import kotlin.jvm.JvmField @@ -10,118 +10,118 @@ import kotlin.jvm.JvmField internal class Cmd0x352 : ProtoBuf { @Serializable internal class DelImgReq( - @ProtoId(1) @JvmField val srcUin: Long = 0L, - @ProtoId(2) @JvmField val dstUin: Long = 0L, - @ProtoId(3) @JvmField val reqTerm: Int = 0, - @ProtoId(4) @JvmField val reqPlatformType: Int = 0, - @ProtoId(5) @JvmField val buType: Int = 0, - @ProtoId(6) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) @JvmField val picWidth: Int = 0, - @ProtoId(9) @JvmField val picHeight: Int = 0 + @ProtoNumber(1) @JvmField val srcUin: Long = 0L, + @ProtoNumber(2) @JvmField val dstUin: Long = 0L, + @ProtoNumber(3) @JvmField val reqTerm: Int = 0, + @ProtoNumber(4) @JvmField val reqPlatformType: Int = 0, + @ProtoNumber(5) @JvmField val buType: Int = 0, + @ProtoNumber(6) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(7) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(8) @JvmField val picWidth: Int = 0, + @ProtoNumber(9) @JvmField val picHeight: Int = 0 ) : ProtoBuf @Serializable internal class DelImgRsp( - @ProtoId(1) @JvmField val result: Int = 0, - @ProtoId(2) @JvmField val failMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val result: Int = 0, + @ProtoNumber(2) @JvmField val failMsg: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(3) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class GetImgUrlReq( - @ProtoId(1) @JvmField val srcUin: Long = 0L, - @ProtoId(2) @JvmField val dstUin: Long = 0L, - @ProtoId(3) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) @JvmField val urlFlag: Int = 0, - @ProtoId(6) @JvmField val urlType: Int = 0, - @ProtoId(7) @JvmField val reqTerm: Int = 0, - @ProtoId(8) @JvmField val reqPlatformType: Int = 0, - @ProtoId(9) @JvmField val srcFileType: Int = 0, - @ProtoId(10) @JvmField val innerIp: Int = 0, - @ProtoId(11) @JvmField val boolAddressBook: Boolean = false, - @ProtoId(12) @JvmField val buType: Int = 0, - @ProtoId(13) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(14) @JvmField val picUpTimestamp: Int = 0, - @ProtoId(15) @JvmField val reqTransferType: Int = 0 + @ProtoNumber(1) @JvmField val srcUin: Long = 0L, + @ProtoNumber(2) @JvmField val dstUin: Long = 0L, + @ProtoNumber(3) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(4) @JvmField val urlFlag: Int = 0, + @ProtoNumber(6) @JvmField val urlType: Int = 0, + @ProtoNumber(7) @JvmField val reqTerm: Int = 0, + @ProtoNumber(8) @JvmField val reqPlatformType: Int = 0, + @ProtoNumber(9) @JvmField val srcFileType: Int = 0, + @ProtoNumber(10) @JvmField val innerIp: Int = 0, + @ProtoNumber(11) @JvmField val boolAddressBook: Boolean = false, + @ProtoNumber(12) @JvmField val buType: Int = 0, + @ProtoNumber(13) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(14) @JvmField val picUpTimestamp: Int = 0, + @ProtoNumber(15) @JvmField val reqTransferType: Int = 0 ) : ProtoBuf @Serializable internal class GetImgUrlRsp( - @ProtoId(1) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) @JvmField val clientIp: Int = 0, - @ProtoId(3) @JvmField val result: Int = 0, - @ProtoId(4) @JvmField val failMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) @JvmField val bytesThumbDownUrl: List? = null, - @ProtoId(6) @JvmField val bytesOriginalDownUrl: List? = null, - @ProtoId(7) @JvmField val msgImgInfo: ImgInfo? = null, - @ProtoId(8) @JvmField val uint32DownIp: List? = null, - @ProtoId(9) @JvmField val uint32DownPort: List? = null, - @ProtoId(10) @JvmField val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(11) @JvmField val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(13) @JvmField val bytesBigDownUrl: List? = null, - @ProtoId(14) @JvmField val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(15) @JvmField val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(16) @JvmField val httpsUrlFlag: Int = 0, - @ProtoId(26) @JvmField val msgDownIp6: List? = null, - @ProtoId(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(2) @JvmField val clientIp: Int = 0, + @ProtoNumber(3) @JvmField val result: Int = 0, + @ProtoNumber(4) @JvmField val failMsg: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(5) @JvmField val bytesThumbDownUrl: List? = null, + @ProtoNumber(6) @JvmField val bytesOriginalDownUrl: List? = null, + @ProtoNumber(7) @JvmField val msgImgInfo: ImgInfo? = null, + @ProtoNumber(8) @JvmField val uint32DownIp: List? = null, + @ProtoNumber(9) @JvmField val uint32DownPort: List? = null, + @ProtoNumber(10) @JvmField val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(11) @JvmField val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(12) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(13) @JvmField val bytesBigDownUrl: List? = null, + @ProtoNumber(14) @JvmField val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(15) @JvmField val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(16) @JvmField val httpsUrlFlag: Int = 0, + @ProtoNumber(26) @JvmField val msgDownIp6: List? = null, + @ProtoNumber(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Suppress("ArrayInDataClass") @Serializable internal class ImgInfo( - @ProtoId(1) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) @JvmField val fileType: Int = 0, - @ProtoId(3) @JvmField val fileSize: Long = 0L, - @ProtoId(4) @JvmField val fileWidth: Int = 0, - @ProtoId(5) @JvmField val fileHeight: Int = 0, - @ProtoId(6) @JvmField val fileFlag: Long = 0L, - @ProtoId(7) @JvmField val fileCutPos: Int = 0 + @ProtoNumber(1) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(2) @JvmField val fileType: Int = 0, + @ProtoNumber(3) @JvmField val fileSize: Long = 0L, + @ProtoNumber(4) @JvmField val fileWidth: Int = 0, + @ProtoNumber(5) @JvmField val fileHeight: Int = 0, + @ProtoNumber(6) @JvmField val fileFlag: Long = 0L, + @ProtoNumber(7) @JvmField val fileCutPos: Int = 0 ) : ProtoBuf @Serializable internal class IPv6Info( - @ProtoId(1) @JvmField val ip6: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) @JvmField val port: Int = 0 + @ProtoNumber(1) @JvmField val ip6: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(2) @JvmField val port: Int = 0 ) : ProtoBuf @Serializable internal class ReqBody( - @ProtoId(1) @JvmField val subcmd: Int = 0, //2是GetImgUrlReq 1是UploadImgReq - @ProtoId(2) @JvmField val msgTryupImgReq: List? = null,// optional - @ProtoId(3) @JvmField val msgGetimgUrlReq: List? = null,// optional - @ProtoId(4) @JvmField val msgDelImgReq: List? = null, - @ProtoId(10) @JvmField val netType: Int = 3// 数据网络=5 + @ProtoNumber(1) @JvmField val subcmd: Int = 0, //2是GetImgUrlReq 1是UploadImgReq + @ProtoNumber(2) @JvmField val msgTryupImgReq: List? = null,// optional + @ProtoNumber(3) @JvmField val msgGetimgUrlReq: List? = null,// optional + @ProtoNumber(4) @JvmField val msgDelImgReq: List? = null, + @ProtoNumber(10) @JvmField val netType: Int = 3// 数据网络=5 ) : ProtoBuf @Serializable internal class RspBody( - @ProtoId(1) @JvmField val subcmd: Int = 0, - @ProtoId(2) @JvmField val msgTryupImgRsp: List? = null, - @ProtoId(3) @JvmField val msgGetimgUrlRsp: List? = null, - @ProtoId(4) @JvmField val boolNewBigchan: Boolean = false, - @ProtoId(5) @JvmField val msgDelImgRsp: List? = null, - @ProtoId(10) @JvmField val failMsg: String? = "" + @ProtoNumber(1) @JvmField val subcmd: Int = 0, + @ProtoNumber(2) @JvmField val msgTryupImgRsp: List? = null, + @ProtoNumber(3) @JvmField val msgGetimgUrlRsp: List? = null, + @ProtoNumber(4) @JvmField val boolNewBigchan: Boolean = false, + @ProtoNumber(5) @JvmField val msgDelImgRsp: List? = null, + @ProtoNumber(10) @JvmField val failMsg: String? = "" ) : ProtoBuf @Serializable internal class TryUpImgReq( - @ProtoId(1) @JvmField val srcUin: Int, - @ProtoId(2) @JvmField val dstUin: Int, - @ProtoId(3) @JvmField val fileId: Int = 0,//从0开始的自增数？貌似有一个连接就要自增1, 但是又会重置回0 - @ProtoId(4) @JvmField val fileMd5: ByteArray, - @ProtoId(5) @JvmField val fileSize: Int, - @ProtoId(6) @JvmField val fileName: String,//默认为md5+".jpg" - @ProtoId(7) @JvmField val srcTerm: Int = 5, - @ProtoId(8) @JvmField val platformType: Int = 9, - @ProtoId(9) @JvmField val innerIP: Int = 0, - @ProtoId(10) @JvmField val addressBook: Int = 0,//chatType == 1006为1 我觉得发0没问题 - @ProtoId(11) @JvmField val retry: Int = 0,//default - @ProtoId(12) @JvmField val buType: Int = 1,//1或96 不确定 - @ProtoId(13) @JvmField val imgOriginal: Int,//是否为原图 - @ProtoId(14) @JvmField val imgWidth: Int = 0, - @ProtoId(15) @JvmField val imgHeight: Int = 0, + @ProtoNumber(1) @JvmField val srcUin: Int, + @ProtoNumber(2) @JvmField val dstUin: Int, + @ProtoNumber(3) @JvmField val fileId: Int = 0,//从0开始的自增数？貌似有一个连接就要自增1, 但是又会重置回0 + @ProtoNumber(4) @JvmField val fileMd5: ByteArray, + @ProtoNumber(5) @JvmField val fileSize: Int, + @ProtoNumber(6) @JvmField val fileName: String,//默认为md5+".jpg" + @ProtoNumber(7) @JvmField val srcTerm: Int = 5, + @ProtoNumber(8) @JvmField val platformType: Int = 9, + @ProtoNumber(9) @JvmField val innerIP: Int = 0, + @ProtoNumber(10) @JvmField val addressBook: Int = 0,//chatType == 1006为1 我觉得发0没问题 + @ProtoNumber(11) @JvmField val retry: Int = 0,//default + @ProtoNumber(12) @JvmField val buType: Int = 1,//1或96 不确定 + @ProtoNumber(13) @JvmField val imgOriginal: Int,//是否为原图 + @ProtoNumber(14) @JvmField val imgWidth: Int = 0, + @ProtoNumber(15) @JvmField val imgHeight: Int = 0, /** * ImgType: * JPG: 1000 @@ -132,50 +132,50 @@ internal class Cmd0x352 : ProtoBuf { * APNG: 2001 * SHARPP: 1004 */ - @ProtoId(16) @JvmField val imgType: Int = 1000, - @ProtoId(17) @JvmField val buildVer: String = "8.2.7.4410",//版本号 - @ProtoId(18) @JvmField val fileIndex: ByteArray = EMPTY_BYTE_ARRAY,//default - @ProtoId(19) @JvmField val fileStoreDays: Int = 0,//default - @ProtoId(20) @JvmField val stepFlag: Int = 0,//default - @ProtoId(21) @JvmField val rejectTryFast: Int = 0,//bool - @ProtoId(22) @JvmField val srvUpload: Int = 1,//typeHotPic[1/2/3] - @ProtoId(23) @JvmField val transferUrl: ByteArray = EMPTY_BYTE_ARRAY//rawDownloadUrl, 如果没有就是EMPTY_BYTE_ARRAY + @ProtoNumber(16) @JvmField val imgType: Int = 1000, + @ProtoNumber(17) @JvmField val buildVer: String = "8.2.7.4410",//版本号 + @ProtoNumber(18) @JvmField val fileIndex: ByteArray = EMPTY_BYTE_ARRAY,//default + @ProtoNumber(19) @JvmField val fileStoreDays: Int = 0,//default + @ProtoNumber(20) @JvmField val stepFlag: Int = 0,//default + @ProtoNumber(21) @JvmField val rejectTryFast: Int = 0,//bool + @ProtoNumber(22) @JvmField val srvUpload: Int = 1,//typeHotPic[1/2/3] + @ProtoNumber(23) @JvmField val transferUrl: ByteArray = EMPTY_BYTE_ARRAY//rawDownloadUrl, 如果没有就是EMPTY_BYTE_ARRAY ) : ImgReq @Serializable internal class TryUpImgRsp( - @ProtoId(1) @JvmField val fileId: Long = 0L, - @ProtoId(2) @JvmField val clientIp: Int = 0, - @ProtoId(3) @JvmField val result: Int = 0, - @ProtoId(4) @JvmField val failMsg: String? = "", - @ProtoId(5) @JvmField val boolFileExit: Boolean = false, - @ProtoId(6) @JvmField val msgImgInfo: ImgInfo? = null, - @ProtoId(7) @JvmField val uint32UpIp: List? = null, - @ProtoId(8) @JvmField val uint32UpPort: List? = null, - @ProtoId(9) @JvmField val upUkey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) @JvmField val upResid: String = "", - @ProtoId(11) @JvmField val upUuid: String = "", - @ProtoId(12) @JvmField val upOffset: Long = 0L, - @ProtoId(13) @JvmField val blockSize: Long = 0L, - @ProtoId(14) @JvmField val encryptDstip: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(15) @JvmField val roamdays: Int = 0, - @ProtoId(26) @JvmField val msgUpIp6: List? = null, - @ProtoId(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(60) @JvmField val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(61) @JvmField val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(62) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(64) @JvmField val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(65) @JvmField val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(66) @JvmField val httpsUrlFlag: Int = 0, - @ProtoId(1001) @JvmField val msgInfo4busi: TryUpInfo4Busi? = null + @ProtoNumber(1) @JvmField val fileId: Long = 0L, + @ProtoNumber(2) @JvmField val clientIp: Int = 0, + @ProtoNumber(3) @JvmField val result: Int = 0, + @ProtoNumber(4) @JvmField val failMsg: String? = "", + @ProtoNumber(5) @JvmField val boolFileExit: Boolean = false, + @ProtoNumber(6) @JvmField val msgImgInfo: ImgInfo? = null, + @ProtoNumber(7) @JvmField val uint32UpIp: List? = null, + @ProtoNumber(8) @JvmField val uint32UpPort: List? = null, + @ProtoNumber(9) @JvmField val upUkey: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(10) @JvmField val upResid: String = "", + @ProtoNumber(11) @JvmField val upUuid: String = "", + @ProtoNumber(12) @JvmField val upOffset: Long = 0L, + @ProtoNumber(13) @JvmField val blockSize: Long = 0L, + @ProtoNumber(14) @JvmField val encryptDstip: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(15) @JvmField val roamdays: Int = 0, + @ProtoNumber(26) @JvmField val msgUpIp6: List? = null, + @ProtoNumber(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(60) @JvmField val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(61) @JvmField val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(62) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(64) @JvmField val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(65) @JvmField val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(66) @JvmField val httpsUrlFlag: Int = 0, + @ProtoNumber(1001) @JvmField val msgInfo4busi: TryUpInfo4Busi? = null ) : ProtoBuf @Serializable internal class TryUpInfo4Busi( - @ProtoId(1) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) @JvmField val thumbDownUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) @JvmField val originalDownUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) @JvmField val bigDownUrl: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(2) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(3) @JvmField val thumbDownUrl: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(4) @JvmField val originalDownUrl: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(5) @JvmField val bigDownUrl: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt index 086da30d1..8174dd523 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt @@ -1,7 +1,7 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId +import kotlinx.serialization.protobuf.ProtoNumber import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf import kotlin.jvm.JvmField @@ -10,141 +10,141 @@ import kotlin.jvm.JvmField internal class Cmd0x388 : ProtoBuf { @Serializable internal class DelImgReq( - @ProtoId(1) @JvmField val srcUin: Long = 0L, - @ProtoId(2) @JvmField val dstUin: Long = 0L, - @ProtoId(3) @JvmField val reqTerm: Int = 0, - @ProtoId(4) @JvmField val reqPlatformType: Int = 0, - @ProtoId(5) @JvmField val buType: Int = 0, - @ProtoId(6) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) @JvmField val picWidth: Int = 0, - @ProtoId(9) @JvmField val picHeight: Int = 0 + @ProtoNumber(1) @JvmField val srcUin: Long = 0L, + @ProtoNumber(2) @JvmField val dstUin: Long = 0L, + @ProtoNumber(3) @JvmField val reqTerm: Int = 0, + @ProtoNumber(4) @JvmField val reqPlatformType: Int = 0, + @ProtoNumber(5) @JvmField val buType: Int = 0, + @ProtoNumber(6) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(7) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(8) @JvmField val picWidth: Int = 0, + @ProtoNumber(9) @JvmField val picHeight: Int = 0 ) : ProtoBuf @Serializable internal class DelImgRsp( - @ProtoId(1) @JvmField val result: Int = 0, - @ProtoId(2) @JvmField val failMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val result: Int = 0, + @ProtoNumber(2) @JvmField val failMsg: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(3) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class ExpRoamExtendInfo( - @ProtoId(1) @JvmField val resid: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val resid: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class ExpRoamPicInfo( - @ProtoId(1) @JvmField val shopFlag: Int = 0, - @ProtoId(2) @JvmField val pkgId: Int = 0, - @ProtoId(3) @JvmField val picId: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val shopFlag: Int = 0, + @ProtoNumber(2) @JvmField val pkgId: Int = 0, + @ProtoNumber(3) @JvmField val picId: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class ExtensionCommPicTryUp( - @ProtoId(1) @JvmField val bytesExtinfo: List? = null + @ProtoNumber(1) @JvmField val bytesExtinfo: List? = null ) : ProtoBuf @Serializable internal class ExtensionExpRoamTryUp( - @ProtoId(1) @JvmField val msgExproamPicInfo: List? = null + @ProtoNumber(1) @JvmField val msgExproamPicInfo: List? = null ) : ProtoBuf @Serializable internal class GetImgUrlReq( - @ProtoId(1) @JvmField val groupCode: Long = 0L, - @ProtoId(2) @JvmField val dstUin: Long = 0L, - @ProtoId(3) @JvmField val fileid: Long = 0L, - @ProtoId(4) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) @JvmField val urlFlag: Int = 0, - @ProtoId(6) @JvmField val urlType: Int = 0, - @ProtoId(7) @JvmField val reqTerm: Int = 0, - @ProtoId(8) @JvmField val reqPlatformType: Int = 0, - @ProtoId(9) @JvmField val innerIp: Int = 0, - @ProtoId(10) @JvmField val buType: Int = 0, - @ProtoId(11) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) @JvmField val fileId: Long = 0L, - @ProtoId(13) @JvmField val fileSize: Long = 0L, - @ProtoId(14) @JvmField val originalPic: Int = 0, - @ProtoId(15) @JvmField val retryReq: Int = 0, - @ProtoId(16) @JvmField val fileHeight: Int = 0, - @ProtoId(17) @JvmField val fileWidth: Int = 0, - @ProtoId(18) @JvmField val picType: Int = 0, - @ProtoId(19) @JvmField val picUpTimestamp: Int = 0, - @ProtoId(20) @JvmField val reqTransferType: Int = 0 + @ProtoNumber(1) @JvmField val groupCode: Long = 0L, + @ProtoNumber(2) @JvmField val dstUin: Long = 0L, + @ProtoNumber(3) @JvmField val fileid: Long = 0L, + @ProtoNumber(4) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(5) @JvmField val urlFlag: Int = 0, + @ProtoNumber(6) @JvmField val urlType: Int = 0, + @ProtoNumber(7) @JvmField val reqTerm: Int = 0, + @ProtoNumber(8) @JvmField val reqPlatformType: Int = 0, + @ProtoNumber(9) @JvmField val innerIp: Int = 0, + @ProtoNumber(10) @JvmField val buType: Int = 0, + @ProtoNumber(11) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(12) @JvmField val fileId: Long = 0L, + @ProtoNumber(13) @JvmField val fileSize: Long = 0L, + @ProtoNumber(14) @JvmField val originalPic: Int = 0, + @ProtoNumber(15) @JvmField val retryReq: Int = 0, + @ProtoNumber(16) @JvmField val fileHeight: Int = 0, + @ProtoNumber(17) @JvmField val fileWidth: Int = 0, + @ProtoNumber(18) @JvmField val picType: Int = 0, + @ProtoNumber(19) @JvmField val picUpTimestamp: Int = 0, + @ProtoNumber(20) @JvmField val reqTransferType: Int = 0 ) : ProtoBuf @Serializable internal class GetImgUrlRsp( - @ProtoId(1) @JvmField val fileid: Long = 0L, - @ProtoId(2) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) @JvmField val result: Int = 0, - @ProtoId(4) @JvmField val failMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) @JvmField val msgImgInfo: ImgInfo? = null, - @ProtoId(6) @JvmField val bytesThumbDownUrl: List? = null, - @ProtoId(7) @JvmField val bytesOriginalDownUrl: List? = null, - @ProtoId(8) @JvmField val bytesBigDownUrl: List? = null, - @ProtoId(9) @JvmField val uint32DownIp: List? = null, - @ProtoId(10) @JvmField val uint32DownPort: List? = null, - @ProtoId(11) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) @JvmField val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(13) @JvmField val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(14) @JvmField val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(15) @JvmField val fileId: Long = 0L, - @ProtoId(16) @JvmField val autoDownType: Int = 0, - @ProtoId(17) @JvmField val uint32OrderDownType: List? = null, - @ProtoId(19) @JvmField val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(20) @JvmField val httpsUrlFlag: Int = 0, - @ProtoId(26) @JvmField val msgDownIp6: List? = null, - @ProtoId(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val fileid: Long = 0L, + @ProtoNumber(2) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(3) @JvmField val result: Int = 0, + @ProtoNumber(4) @JvmField val failMsg: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(5) @JvmField val msgImgInfo: ImgInfo? = null, + @ProtoNumber(6) @JvmField val bytesThumbDownUrl: List? = null, + @ProtoNumber(7) @JvmField val bytesOriginalDownUrl: List? = null, + @ProtoNumber(8) @JvmField val bytesBigDownUrl: List? = null, + @ProtoNumber(9) @JvmField val uint32DownIp: List? = null, + @ProtoNumber(10) @JvmField val uint32DownPort: List? = null, + @ProtoNumber(11) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(12) @JvmField val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(13) @JvmField val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(14) @JvmField val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(15) @JvmField val fileId: Long = 0L, + @ProtoNumber(16) @JvmField val autoDownType: Int = 0, + @ProtoNumber(17) @JvmField val uint32OrderDownType: List? = null, + @ProtoNumber(19) @JvmField val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(20) @JvmField val httpsUrlFlag: Int = 0, + @ProtoNumber(26) @JvmField val msgDownIp6: List? = null, + @ProtoNumber(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class GetPttUrlReq( - @ProtoId(1) @JvmField val groupCode: Long = 0L, - @ProtoId(2) @JvmField val dstUin: Long = 0L, - @ProtoId(3) @JvmField val fileid: Long = 0L, - @ProtoId(4) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) @JvmField val reqTerm: Int = 0, - @ProtoId(6) @JvmField val reqPlatformType: Int = 0, - @ProtoId(7) @JvmField val innerIp: Int = 0, - @ProtoId(8) @JvmField val buType: Int = 0, - @ProtoId(9) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) @JvmField val fileId: Long = 0L, - @ProtoId(11) @JvmField val fileKey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) @JvmField val codec: Int = 0, - @ProtoId(13) @JvmField val buId: Int = 0, - @ProtoId(14) @JvmField val reqTransferType: Int = 0, - @ProtoId(15) @JvmField val isAuto: Int = 0 + @ProtoNumber(1) @JvmField val groupCode: Long = 0L, + @ProtoNumber(2) @JvmField val dstUin: Long = 0L, + @ProtoNumber(3) @JvmField val fileid: Long = 0L, + @ProtoNumber(4) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(5) @JvmField val reqTerm: Int = 0, + @ProtoNumber(6) @JvmField val reqPlatformType: Int = 0, + @ProtoNumber(7) @JvmField val innerIp: Int = 0, + @ProtoNumber(8) @JvmField val buType: Int = 0, + @ProtoNumber(9) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(10) @JvmField val fileId: Long = 0L, + @ProtoNumber(11) @JvmField val fileKey: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(12) @JvmField val codec: Int = 0, + @ProtoNumber(13) @JvmField val buId: Int = 0, + @ProtoNumber(14) @JvmField val reqTransferType: Int = 0, + @ProtoNumber(15) @JvmField val isAuto: Int = 0 ) : ProtoBuf @Serializable internal class GetPttUrlRsp( - @ProtoId(1) @JvmField val fileid: Long = 0L, - @ProtoId(2) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) @JvmField val result: Int = 0, - @ProtoId(4) @JvmField val failMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) @JvmField val bytesDownUrl: List? = null, - @ProtoId(6) @JvmField val uint32DownIp: List? = null, - @ProtoId(7) @JvmField val uint32DownPort: List? = null, - @ProtoId(8) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(9) @JvmField val downPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) @JvmField val fileId: Long = 0L, - @ProtoId(11) @JvmField val transferType: Int = 0, - @ProtoId(12) @JvmField val allowRetry: Int = 0, - @ProtoId(26) @JvmField val msgDownIp6: List? = null, - @ProtoId(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(28) @JvmField val strDomain: String = "" + @ProtoNumber(1) @JvmField val fileid: Long = 0L, + @ProtoNumber(2) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(3) @JvmField val result: Int = 0, + @ProtoNumber(4) @JvmField val failMsg: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(5) @JvmField val bytesDownUrl: List? = null, + @ProtoNumber(6) @JvmField val uint32DownIp: List? = null, + @ProtoNumber(7) @JvmField val uint32DownPort: List? = null, + @ProtoNumber(8) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(9) @JvmField val downPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(10) @JvmField val fileId: Long = 0L, + @ProtoNumber(11) @JvmField val transferType: Int = 0, + @ProtoNumber(12) @JvmField val allowRetry: Int = 0, + @ProtoNumber(26) @JvmField val msgDownIp6: List? = null, + @ProtoNumber(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(28) @JvmField val strDomain: String = "" ) : ProtoBuf @Suppress("ArrayInDataClass") @Serializable internal class ImgInfo( - @ProtoId(1) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) @JvmField val fileType: Int = 0, - @ProtoId(3) @JvmField val fileSize: Long = 0L, - @ProtoId(4) @JvmField val fileWidth: Int = 0, - @ProtoId(5) @JvmField val fileHeight: Int = 0 + @ProtoNumber(1) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(2) @JvmField val fileType: Int = 0, + @ProtoNumber(3) @JvmField val fileSize: Long = 0L, + @ProtoNumber(4) @JvmField val fileWidth: Int = 0, + @ProtoNumber(5) @JvmField val fileHeight: Int = 0 ) : ProtoBuf { override fun toString(): String { return "ImgInfo(fileMd5=${fileMd5.contentToString()}, fileType=$fileType, fileSize=$fileSize, fileWidth=$fileWidth, fileHeight=$fileHeight)" @@ -153,128 +153,128 @@ internal class ImgInfo( @Serializable internal class IPv6Info( - @ProtoId(1) @JvmField val ip6: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) @JvmField val port: Int = 0 + @ProtoNumber(1) @JvmField val ip6: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(2) @JvmField val port: Int = 0 ) : ProtoBuf @Serializable internal class PicSize( - @ProtoId(1) @JvmField val original: Int = 0, - @ProtoId(2) @JvmField val thumb: Int = 0, - @ProtoId(3) @JvmField val high: Int = 0 + @ProtoNumber(1) @JvmField val original: Int = 0, + @ProtoNumber(2) @JvmField val thumb: Int = 0, + @ProtoNumber(3) @JvmField val high: Int = 0 ) : ProtoBuf @Serializable internal class ReqBody( - @ProtoId(1) @JvmField val netType: Int = 0, - @ProtoId(2) @JvmField val subcmd: Int = 0, - @ProtoId(3) @JvmField val msgTryupImgReq: List? = null, - @ProtoId(4) @JvmField val msgGetimgUrlReq: List? = null, - @ProtoId(5) @JvmField val msgTryupPttReq: List? = null, - @ProtoId(6) @JvmField val msgGetpttUrlReq: List? = null, - @ProtoId(7) @JvmField val commandId: Int = 0, - @ProtoId(8) @JvmField val msgDelImgReq: List? = null, - @ProtoId(1001) @JvmField val extension: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val netType: Int = 0, + @ProtoNumber(2) @JvmField val subcmd: Int = 0, + @ProtoNumber(3) @JvmField val msgTryupImgReq: List? = null, + @ProtoNumber(4) @JvmField val msgGetimgUrlReq: List? = null, + @ProtoNumber(5) @JvmField val msgTryupPttReq: List? = null, + @ProtoNumber(6) @JvmField val msgGetpttUrlReq: List? = null, + @ProtoNumber(7) @JvmField val commandId: Int = 0, + @ProtoNumber(8) @JvmField val msgDelImgReq: List? = null, + @ProtoNumber(1001) @JvmField val extension: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class RspBody( - @ProtoId(1) @JvmField val clientIp: Int = 0, - @ProtoId(2) @JvmField val subcmd: Int = 0, - @ProtoId(3) @JvmField val msgTryupImgRsp: List? = null, - @ProtoId(4) @JvmField val msgGetimgUrlRsp: List? = null, - @ProtoId(5) @JvmField val msgTryupPttRsp: List? = null, - @ProtoId(6) @JvmField val msgGetpttUrlRsp: List? = null, - @ProtoId(7) @JvmField val msgDelImgRsp: List? = null + @ProtoNumber(1) @JvmField val clientIp: Int = 0, + @ProtoNumber(2) @JvmField val subcmd: Int = 0, + @ProtoNumber(3) @JvmField val msgTryupImgRsp: List? = null, + @ProtoNumber(4) @JvmField val msgGetimgUrlRsp: List? = null, + @ProtoNumber(5) @JvmField val msgTryupPttRsp: List? = null, + @ProtoNumber(6) @JvmField val msgGetpttUrlRsp: List? = null, + @ProtoNumber(7) @JvmField val msgDelImgRsp: List? = null ) : ProtoBuf @Serializable internal class TryUpImgReq( - @ProtoId(1) @JvmField val groupCode: Long = 0L, - @ProtoId(2) @JvmField val srcUin: Long = 0L, - @ProtoId(3) @JvmField val fileId: Long = 0L, - @ProtoId(4) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) @JvmField val fileSize: Long = 0L, - @ProtoId(6) @JvmField val fileName: String = "", - @ProtoId(7) @JvmField val srcTerm: Int = 0, - @ProtoId(8) @JvmField val platformType: Int = 0, - @ProtoId(9) @JvmField val buType: Int = 0, - @ProtoId(10) @JvmField val picWidth: Int = 0, - @ProtoId(11) @JvmField val picHeight: Int = 0, - @ProtoId(12) @JvmField val picType: Int = 0, - @ProtoId(13) @JvmField val buildVer: String = "", - @ProtoId(14) @JvmField val innerIp: Int = 0, - @ProtoId(15) @JvmField val appPicType: Int = 0, - @ProtoId(16) @JvmField val originalPic: Int = 0, - @ProtoId(17) @JvmField val fileIndex: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(18) @JvmField val dstUin: Long = 0L, - @ProtoId(19) @JvmField val srvUpload: Int = 0, - @ProtoId(20) @JvmField val transferUrl: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val groupCode: Long = 0L, + @ProtoNumber(2) @JvmField val srcUin: Long = 0L, + @ProtoNumber(3) @JvmField val fileId: Long = 0L, + @ProtoNumber(4) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(5) @JvmField val fileSize: Long = 0L, + @ProtoNumber(6) @JvmField val fileName: String = "", + @ProtoNumber(7) @JvmField val srcTerm: Int = 0, + @ProtoNumber(8) @JvmField val platformType: Int = 0, + @ProtoNumber(9) @JvmField val buType: Int = 0, + @ProtoNumber(10) @JvmField val picWidth: Int = 0, + @ProtoNumber(11) @JvmField val picHeight: Int = 0, + @ProtoNumber(12) @JvmField val picType: Int = 0, + @ProtoNumber(13) @JvmField val buildVer: String = "", + @ProtoNumber(14) @JvmField val innerIp: Int = 0, + @ProtoNumber(15) @JvmField val appPicType: Int = 0, + @ProtoNumber(16) @JvmField val originalPic: Int = 0, + @ProtoNumber(17) @JvmField val fileIndex: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(18) @JvmField val dstUin: Long = 0L, + @ProtoNumber(19) @JvmField val srvUpload: Int = 0, + @ProtoNumber(20) @JvmField val transferUrl: ByteArray = EMPTY_BYTE_ARRAY ) : ImgReq @Serializable internal class TryUpImgRsp( - @ProtoId(1) @JvmField val fileId: Long = 0L, - @ProtoId(2) @JvmField val result: Int = 0, - @ProtoId(3) @JvmField val failMsg: String = "", - @ProtoId(4) @JvmField val boolFileExit: Boolean = false, - @ProtoId(5) @JvmField val msgImgInfo: ImgInfo? = null, - @ProtoId(6) @JvmField val uint32UpIp: List? = null, - @ProtoId(7) @JvmField val uint32UpPort: List? = null, - @ProtoId(8) @JvmField val upUkey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(9) @JvmField val fileid: Long = 0L, - @ProtoId(10) @JvmField val upOffset: Long = 0L, - @ProtoId(11) @JvmField val blockSize: Long = 0L, - @ProtoId(12) @JvmField val boolNewBigChan: Boolean = false, - @ProtoId(26) @JvmField val msgUpIp6: List? = null, - @ProtoId(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(1001) @JvmField val msgInfo4busi: TryUpInfo4Busi? = null + @ProtoNumber(1) @JvmField val fileId: Long = 0L, + @ProtoNumber(2) @JvmField val result: Int = 0, + @ProtoNumber(3) @JvmField val failMsg: String = "", + @ProtoNumber(4) @JvmField val boolFileExit: Boolean = false, + @ProtoNumber(5) @JvmField val msgImgInfo: ImgInfo? = null, + @ProtoNumber(6) @JvmField val uint32UpIp: List? = null, + @ProtoNumber(7) @JvmField val uint32UpPort: List? = null, + @ProtoNumber(8) @JvmField val upUkey: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(9) @JvmField val fileid: Long = 0L, + @ProtoNumber(10) @JvmField val upOffset: Long = 0L, + @ProtoNumber(11) @JvmField val blockSize: Long = 0L, + @ProtoNumber(12) @JvmField val boolNewBigChan: Boolean = false, + @ProtoNumber(26) @JvmField val msgUpIp6: List? = null, + @ProtoNumber(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(1001) @JvmField val msgInfo4busi: TryUpInfo4Busi? = null ) : ProtoBuf @Serializable internal class TryUpInfo4Busi( - @ProtoId(1) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) @JvmField val thumbDownUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) @JvmField val originalDownUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) @JvmField val bigDownUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(2) @JvmField val thumbDownUrl: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(3) @JvmField val originalDownUrl: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(4) @JvmField val bigDownUrl: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(5) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class TryUpPttReq( - @ProtoId(1) @JvmField val groupCode: Long = 0L, - @ProtoId(2) @JvmField val srcUin: Long = 0L, - @ProtoId(3) @JvmField val fileId: Long = 0L, - @ProtoId(4) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) @JvmField val fileSize: Long = 0L, - @ProtoId(6) @JvmField val fileName: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) @JvmField val srcTerm: Int = 0, - @ProtoId(8) @JvmField val platformType: Int = 0, - @ProtoId(9) @JvmField val buType: Int = 0, - @ProtoId(10) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(11) @JvmField val innerIp: Int = 0, - @ProtoId(12) @JvmField val voiceLength: Int = 0, - @ProtoId(13) @JvmField val boolNewUpChan: Boolean = false, - @ProtoId(14) @JvmField val codec: Int = 0, - @ProtoId(15) @JvmField val voiceType: Int = 0, - @ProtoId(16) @JvmField val buId: Int = 0 + @ProtoNumber(1) @JvmField val groupCode: Long = 0L, + @ProtoNumber(2) @JvmField val srcUin: Long = 0L, + @ProtoNumber(3) @JvmField val fileId: Long = 0L, + @ProtoNumber(4) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(5) @JvmField val fileSize: Long = 0L, + @ProtoNumber(6) @JvmField val fileName: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(7) @JvmField val srcTerm: Int = 0, + @ProtoNumber(8) @JvmField val platformType: Int = 0, + @ProtoNumber(9) @JvmField val buType: Int = 0, + @ProtoNumber(10) @JvmField val buildVer: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(11) @JvmField val innerIp: Int = 0, + @ProtoNumber(12) @JvmField val voiceLength: Int = 0, + @ProtoNumber(13) @JvmField val boolNewUpChan: Boolean = false, + @ProtoNumber(14) @JvmField val codec: Int = 0, + @ProtoNumber(15) @JvmField val voiceType: Int = 0, + @ProtoNumber(16) @JvmField val buId: Int = 0 ) : ProtoBuf @Serializable internal class TryUpPttRsp( - @ProtoId(1) @JvmField val fileId: Long = 0L, - @ProtoId(2) @JvmField val result: Int = 0, - @ProtoId(3) @JvmField val failMsg: ByteArray? = null, - @ProtoId(4) @JvmField val boolFileExit: Boolean = false, - @ProtoId(5) @JvmField val uint32UpIp: List? = null, - @ProtoId(6) @JvmField val uint32UpPort: List? = null, - @ProtoId(7) @JvmField val upUkey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) @JvmField val fileid: Long = 0L, - @ProtoId(9) @JvmField val upOffset: Long = 0L, - @ProtoId(10) @JvmField val blockSize: Long = 0L, - @ProtoId(11) @JvmField val fileKey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(12) @JvmField val channelType: Int = 0, - @ProtoId(26) @JvmField val msgUpIp6: List? = null, - @ProtoId(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val fileId: Long = 0L, + @ProtoNumber(2) @JvmField val result: Int = 0, + @ProtoNumber(3) @JvmField val failMsg: ByteArray? = null, + @ProtoNumber(4) @JvmField val boolFileExit: Boolean = false, + @ProtoNumber(5) @JvmField val uint32UpIp: List? = null, + @ProtoNumber(6) @JvmField val uint32UpPort: List? = null, + @ProtoNumber(7) @JvmField val upUkey: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(8) @JvmField val fileid: Long = 0L, + @ProtoNumber(9) @JvmField val upOffset: Long = 0L, + @ProtoNumber(10) @JvmField val blockSize: Long = 0L, + @ProtoNumber(11) @JvmField val fileKey: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(12) @JvmField val channelType: Int = 0, + @ProtoNumber(26) @JvmField val msgUpIp6: List? = null, + @ProtoNumber(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x857.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x857.kt index 2cc3d1fa0..a092966d1 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x857.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x857.kt @@ -3,8 +3,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId -import kotlinx.serialization.protobuf.ProtoNumberType +import kotlinx.serialization.protobuf.ProtoIntegerType +import kotlinx.serialization.protobuf.ProtoNumber import kotlinx.serialization.protobuf.ProtoType import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf @@ -13,50 +13,50 @@ import kotlin.jvm.JvmField internal class GroupOpenSysMsg : ProtoBuf { @Serializable internal class LightApp( - @ProtoId(1) @JvmField val app: String = "", - @ProtoId(2) @JvmField val view: String = "", - @ProtoId(3) @JvmField val desc: String = "", - @ProtoId(4) @JvmField val prompt: String = "", - @ProtoId(5) @JvmField val ver: String = "", - @ProtoId(6) @JvmField val meta: String = "", - @ProtoId(7) @JvmField val config: String = "", - @ProtoId(8) @JvmField val source: Source? = null + @ProtoNumber(1) @JvmField val app: String = "", + @ProtoNumber(2) @JvmField val view: String = "", + @ProtoNumber(3) @JvmField val desc: String = "", + @ProtoNumber(4) @JvmField val prompt: String = "", + @ProtoNumber(5) @JvmField val ver: String = "", + @ProtoNumber(6) @JvmField val meta: String = "", + @ProtoNumber(7) @JvmField val config: String = "", + @ProtoNumber(8) @JvmField val source: Source? = null ) : ProtoBuf @Serializable internal class RichMsg( - @ProtoId(1) @JvmField val title: String = "", - @ProtoId(2) @JvmField val desc: String = "", - @ProtoId(3) @JvmField val brief: String = "", - @ProtoId(4) @JvmField val cover: String = "", - @ProtoId(5) @JvmField val url: String = "", - @ProtoId(6) @JvmField val source: Source? = null + @ProtoNumber(1) @JvmField val title: String = "", + @ProtoNumber(2) @JvmField val desc: String = "", + @ProtoNumber(3) @JvmField val brief: String = "", + @ProtoNumber(4) @JvmField val cover: String = "", + @ProtoNumber(5) @JvmField val url: String = "", + @ProtoNumber(6) @JvmField val source: Source? = null ) : ProtoBuf @Serializable internal class Sender( - @ProtoId(1) @JvmField val uin: Long = 0L, - @ProtoId(2) @JvmField val nick: String = "", - @ProtoId(3) @JvmField val avatar: String = "", - @ProtoId(4) @JvmField val url: String = "" + @ProtoNumber(1) @JvmField val uin: Long = 0L, + @ProtoNumber(2) @JvmField val nick: String = "", + @ProtoNumber(3) @JvmField val avatar: String = "", + @ProtoNumber(4) @JvmField val url: String = "" ) : ProtoBuf @Serializable internal class Source( - @ProtoId(1) @JvmField val name: String = "", - @ProtoId(2) @JvmField val icon: String = "", - @ProtoId(3) @JvmField val url: String = "" + @ProtoNumber(1) @JvmField val name: String = "", + @ProtoNumber(2) @JvmField val icon: String = "", + @ProtoNumber(3) @JvmField val url: String = "" ) : ProtoBuf @Serializable internal class SysMsgBody( - @ProtoId(1) @JvmField val groupId: Long = 0L, - @ProtoId(2) @JvmField val appid: Long = 0L, - @ProtoId(3) @JvmField val sender: Sender? = null, - @ProtoId(4) @JvmField val msgType: Int = 0, - @ProtoId(5) @JvmField val content: String = "", - @ProtoId(6) @JvmField val richMsg: RichMsg? = null, - @ProtoId(7) @JvmField val lightApp: LightApp? = null + @ProtoNumber(1) @JvmField val groupId: Long = 0L, + @ProtoNumber(2) @JvmField val appid: Long = 0L, + @ProtoNumber(3) @JvmField val sender: Sender? = null, + @ProtoNumber(4) @JvmField val msgType: Int = 0, + @ProtoNumber(5) @JvmField val content: String = "", + @ProtoNumber(6) @JvmField val richMsg: RichMsg? = null, + @ProtoNumber(7) @JvmField val lightApp: LightApp? = null ) : ProtoBuf } @@ -64,337 +64,337 @@ internal class GroupOpenSysMsg : ProtoBuf { internal class TroopTips0x857 : ProtoBuf { @Serializable internal class AIOGrayTipsInfo( - @ProtoId(1) @JvmField val optUint32ShowLastest: Int = 0, - @ProtoId(2) @JvmField val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) @JvmField val optUint32Remind: Int = 0, - @ProtoId(4) @JvmField val optBytesBrief: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) @JvmField val receiverUin: Long = 0L, - @ProtoId(6) @JvmField val reliaoAdminOpt: Int = 0, - @ProtoId(7) @JvmField val robotGroupOpt: Int = 0 + @ProtoNumber(1) @JvmField val optUint32ShowLastest: Int = 0, + @ProtoNumber(2) @JvmField val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(3) @JvmField val optUint32Remind: Int = 0, + @ProtoNumber(4) @JvmField val optBytesBrief: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(5) @JvmField val receiverUin: Long = 0L, + @ProtoNumber(6) @JvmField val reliaoAdminOpt: Int = 0, + @ProtoNumber(7) @JvmField val robotGroupOpt: Int = 0 ) : ProtoBuf @Serializable internal class AIOTopTipsInfo( - @ProtoId(1) @JvmField val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) @JvmField val optUint32Icon: Int = 0, - @ProtoId(3) @JvmField val optEnumAction: Int /* enum */ = 1, - @ProtoId(4) @JvmField val optBytesUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) @JvmField val optBytesData: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) @JvmField val optBytesDataI: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) @JvmField val optBytesDataA: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) @JvmField val optBytesDataP: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(2) @JvmField val optUint32Icon: Int = 0, + @ProtoNumber(3) @JvmField val optEnumAction: Int /* enum */ = 1, + @ProtoNumber(4) @JvmField val optBytesUrl: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(5) @JvmField val optBytesData: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(6) @JvmField val optBytesDataI: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(7) @JvmField val optBytesDataA: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(8) @JvmField val optBytesDataP: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class FloatedTipsInfo( - @ProtoId(1) @JvmField val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class GeneralGrayTipInfo( - @ProtoId(1) @JvmField val busiType: Long = 0L, - @ProtoId(2) @JvmField val busiId: Long = 0L, - @ProtoId(3) @JvmField val ctrlFlag: Int = 0, - @ProtoId(4) @JvmField val c2cType: Int = 0, - @ProtoId(5) @JvmField val serviceType: Int = 0, - @ProtoId(6) @JvmField val templId: Long = 0L, - @ProtoId(7) @JvmField val msgTemplParam: List? = null, - @ProtoId(8) @JvmField val content: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(10) @JvmField val tipsSeqId: Long = 0L, - @ProtoId(100) @JvmField val pbReserv: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val busiType: Long = 0L, + @ProtoNumber(2) @JvmField val busiId: Long = 0L, + @ProtoNumber(3) @JvmField val ctrlFlag: Int = 0, + @ProtoNumber(4) @JvmField val c2cType: Int = 0, + @ProtoNumber(5) @JvmField val serviceType: Int = 0, + @ProtoNumber(6) @JvmField val templId: Long = 0L, + @ProtoNumber(7) @JvmField val msgTemplParam: List? = null, + @ProtoNumber(8) @JvmField val content: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(10) @JvmField val tipsSeqId: Long = 0L, + @ProtoNumber(100) @JvmField val pbReserv: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class GoldMsgTipsElem( - @ProtoId(1) @JvmField val type: Int = 0, - @ProtoId(2) @JvmField val billno: String = "", - @ProtoId(3) @JvmField val result: Int = 0, - @ProtoId(4) @JvmField val amount: Int = 0, - @ProtoId(5) @JvmField val total: Int = 0, - @ProtoId(6) @JvmField val interval: Int = 0, - @ProtoId(7) @JvmField val finish: Int = 0, - @ProtoId(8) @JvmField val uin: List? = null, - @ProtoId(9) @JvmField val action: Int = 0 + @ProtoNumber(1) @JvmField val type: Int = 0, + @ProtoNumber(2) @JvmField val billno: String = "", + @ProtoNumber(3) @JvmField val result: Int = 0, + @ProtoNumber(4) @JvmField val amount: Int = 0, + @ProtoNumber(5) @JvmField val total: Int = 0, + @ProtoNumber(6) @JvmField val interval: Int = 0, + @ProtoNumber(7) @JvmField val finish: Int = 0, + @ProtoNumber(8) @JvmField val uin: List? = null, + @ProtoNumber(9) @JvmField val action: Int = 0 ) : ProtoBuf @Serializable internal class GroupInfoChange( - @ProtoId(1) @JvmField val groupHonorSwitch: Int = 0 + @ProtoNumber(1) @JvmField val groupHonorSwitch: Int = 0 ) : ProtoBuf @Serializable internal class GroupNotifyInfo( - @ProtoId(1) @JvmField val optUint32AutoPullFlag: Int = 0, - @ProtoId(2) @JvmField val optBytesFeedsId: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val optUint32AutoPullFlag: Int = 0, + @ProtoNumber(2) @JvmField val optBytesFeedsId: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class InstCtrl( - @ProtoId(1) @JvmField val msgSendToInst: List? = null, - @ProtoId(2) @JvmField val msgExcludeInst: List? = null, - @ProtoId(3) @JvmField val msgFromInst: InstInfo? = null + @ProtoNumber(1) @JvmField val msgSendToInst: List? = null, + @ProtoNumber(2) @JvmField val msgExcludeInst: List? = null, + @ProtoNumber(3) @JvmField val msgFromInst: InstInfo? = null ) : ProtoBuf @Serializable internal class InstInfo( - @ProtoId(1) @JvmField val apppid: Int = 0, - @ProtoId(2) @JvmField val instid: Int = 0, - @ProtoId(3) @JvmField val platform: Int = 0, - @ProtoId(4) @JvmField val openAppid: Int = 0, - @ProtoId(5) @JvmField val productid: Int = 0, - @ProtoId(6) @JvmField val ssoBid: Int = 0, - @ProtoId(7) @JvmField val guid: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(8) @JvmField val verMin: Int = 0, - @ProtoId(9) @JvmField val verMax: Int = 0 + @ProtoNumber(1) @JvmField val apppid: Int = 0, + @ProtoNumber(2) @JvmField val instid: Int = 0, + @ProtoNumber(3) @JvmField val platform: Int = 0, + @ProtoNumber(4) @JvmField val openAppid: Int = 0, + @ProtoNumber(5) @JvmField val productid: Int = 0, + @ProtoNumber(6) @JvmField val ssoBid: Int = 0, + @ProtoNumber(7) @JvmField val guid: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(8) @JvmField val verMin: Int = 0, + @ProtoNumber(9) @JvmField val verMax: Int = 0 ) : ProtoBuf @Serializable internal class LbsShareChangePushInfo( - @ProtoId(1) @JvmField val msgType: Int = 0, - @ProtoId(2) @JvmField val msgInfo: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) @JvmField val versionCtrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) @JvmField val groupId: Long = 0L, - @ProtoId(5) @JvmField val operUin: Long = 0L, - @ProtoId(6) @JvmField val grayTips: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) @JvmField val msgSeq: Long = 0L, - @ProtoId(8) @JvmField val joinNums: Int = 0, - @ProtoId(99) @JvmField val pushType: Int = 0, - @ProtoId(100) @JvmField val extInfo: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val msgType: Int = 0, + @ProtoNumber(2) @JvmField val msgInfo: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(3) @JvmField val versionCtrl: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(4) @JvmField val groupId: Long = 0L, + @ProtoNumber(5) @JvmField val operUin: Long = 0L, + @ProtoNumber(6) @JvmField val grayTips: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(7) @JvmField val msgSeq: Long = 0L, + @ProtoNumber(8) @JvmField val joinNums: Int = 0, + @ProtoNumber(99) @JvmField val pushType: Int = 0, + @ProtoNumber(100) @JvmField val extInfo: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class LuckyBagNotify( - @ProtoId(1) @JvmField val msgTips: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val msgTips: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class MediaChangePushInfo( - @ProtoId(1) @JvmField val msgType: Int = 0, - @ProtoId(2) @JvmField val msgInfo: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) @JvmField val versionCtrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) @JvmField val groupId: Long = 0L, - @ProtoId(5) @JvmField val operUin: Long = 0L, - @ProtoId(6) @JvmField val grayTips: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(7) @JvmField val msgSeq: Long = 0L, - @ProtoId(8) @JvmField val joinNums: Int = 0, - @ProtoId(9) @JvmField val msgPerSetting: PersonalSetting? = null, - @ProtoId(10) @JvmField val playMode: Int = 0, - @ProtoId(99) @JvmField val mediaType: Int = 0, - @ProtoId(100) @JvmField val extInfo: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val msgType: Int = 0, + @ProtoNumber(2) @JvmField val msgInfo: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(3) @JvmField val versionCtrl: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(4) @JvmField val groupId: Long = 0L, + @ProtoNumber(5) @JvmField val operUin: Long = 0L, + @ProtoNumber(6) @JvmField val grayTips: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(7) @JvmField val msgSeq: Long = 0L, + @ProtoNumber(8) @JvmField val joinNums: Int = 0, + @ProtoNumber(9) @JvmField val msgPerSetting: PersonalSetting? = null, + @ProtoNumber(10) @JvmField val playMode: Int = 0, + @ProtoNumber(99) @JvmField val mediaType: Int = 0, + @ProtoNumber(100) @JvmField val extInfo: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf { @Serializable internal class PersonalSetting( - @ProtoId(1) @JvmField val themeId: Int = 0, - @ProtoId(2) @JvmField val playerId: Int = 0, - @ProtoId(3) @JvmField val fontId: Int = 0 + @ProtoNumber(1) @JvmField val themeId: Int = 0, + @ProtoNumber(2) @JvmField val playerId: Int = 0, + @ProtoNumber(3) @JvmField val fontId: Int = 0 ) : ProtoBuf } @Serializable internal class MessageBoxInfo( - @ProtoId(1) @JvmField val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) @JvmField val optBytesTitle: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) @JvmField val optBytesButton: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(2) @JvmField val optBytesTitle: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(3) @JvmField val optBytesButton: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class MessageRecallReminder( - @ProtoId(1) @JvmField val uin: Long = 0L, - @ProtoId(2) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) @JvmField val recalledMsgList: List = listOf(), - @ProtoId(4) @JvmField val reminderContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) @JvmField val userdef: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) @JvmField val groupType: Int = 0, - @ProtoId(7) @JvmField val opType: Int = 0 + @ProtoNumber(1) @JvmField val uin: Long = 0L, + @ProtoNumber(2) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(3) @JvmField val recalledMsgList: List = listOf(), + @ProtoNumber(4) @JvmField val reminderContent: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(5) @JvmField val userdef: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(6) @JvmField val groupType: Int = 0, + @ProtoNumber(7) @JvmField val opType: Int = 0 ) : ProtoBuf { @Serializable internal class MessageMeta( - @ProtoId(1) @JvmField val seq: Int = 0, - @ProtoId(2) @JvmField val time: Int = 0, - @ProtoId(3) @JvmField val msgRandom: Int = 0, - @ProtoId(4) @JvmField val msgType: Int = 0, - @ProtoId(5) @JvmField val msgFlag: Int = 0, - @ProtoId(6) @JvmField val authorUin: Long = 0L + @ProtoNumber(1) @JvmField val seq: Int = 0, + @ProtoNumber(2) @JvmField val time: Int = 0, + @ProtoNumber(3) @JvmField val msgRandom: Int = 0, + @ProtoNumber(4) @JvmField val msgType: Int = 0, + @ProtoNumber(5) @JvmField val msgFlag: Int = 0, + @ProtoNumber(6) @JvmField val authorUin: Long = 0L ) : ProtoBuf } @Serializable internal class MiniAppNotify( - @ProtoId(1) @JvmField val msg: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val msg: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class NotifyMsgBody( - @ProtoId(1) @JvmField val optEnumType: Int /* enum */ = 1, - @ProtoId(2) @JvmField val optUint64MsgTime: Long = 0L, - @ProtoId(3) @JvmField val optUint64MsgExpires: Long = 0L, - @ProtoId(4) @JvmField val optUint64GroupCode: Long = 0L, - @ProtoId(5) @JvmField val optMsgGraytips: AIOGrayTipsInfo? = null, - @ProtoId(6) @JvmField val optMsgMessagebox: MessageBoxInfo? = null, - @ProtoId(7) @JvmField val optMsgFloatedtips: FloatedTipsInfo? = null, - @ProtoId(8) @JvmField val optMsgToptips: AIOTopTipsInfo? = null, - @ProtoId(9) @JvmField val optMsgRedtips: RedGrayTipsInfo? = null, - @ProtoId(10) @JvmField val optMsgGroupNotify: GroupNotifyInfo? = null, - @ProtoId(11) @JvmField val optMsgRecall: MessageRecallReminder? = null, - @ProtoId(12) @JvmField val optMsgThemeNotify: ThemeStateNotify? = null, - @ProtoId(13) @JvmField val serviceType: Int = 0, - @ProtoId(14) @JvmField val optMsgObjmsgUpdate: NotifyObjmsgUpdate? = null, - @ProtoId(15) @JvmField val optMsgWerewolfPush: WereWolfPush? = null, + @ProtoNumber(1) @JvmField val optEnumType: Int /* enum */ = 1, + @ProtoNumber(2) @JvmField val optUint64MsgTime: Long = 0L, + @ProtoNumber(3) @JvmField val optUint64MsgExpires: Long = 0L, + @ProtoNumber(4) @JvmField val optUint64GroupCode: Long = 0L, + @ProtoNumber(5) @JvmField val optMsgGraytips: AIOGrayTipsInfo? = null, + @ProtoNumber(6) @JvmField val optMsgMessagebox: MessageBoxInfo? = null, + @ProtoNumber(7) @JvmField val optMsgFloatedtips: FloatedTipsInfo? = null, + @ProtoNumber(8) @JvmField val optMsgToptips: AIOTopTipsInfo? = null, + @ProtoNumber(9) @JvmField val optMsgRedtips: RedGrayTipsInfo? = null, + @ProtoNumber(10) @JvmField val optMsgGroupNotify: GroupNotifyInfo? = null, + @ProtoNumber(11) @JvmField val optMsgRecall: MessageRecallReminder? = null, + @ProtoNumber(12) @JvmField val optMsgThemeNotify: ThemeStateNotify? = null, + @ProtoNumber(13) @JvmField val serviceType: Int = 0, + @ProtoNumber(14) @JvmField val optMsgObjmsgUpdate: NotifyObjmsgUpdate? = null, + @ProtoNumber(15) @JvmField val optMsgWerewolfPush: WereWolfPush? = null, // @SerialId(16) @JvmField val optStcmGameState: ApolloGameStatus.STCMGameMessage? = null, // @SerialId(17) @JvmField val aplloMsgPush: ApolloPushMsgInfo.STPushMsgElem? = null, - @ProtoId(18) @JvmField val optMsgGoldtips: GoldMsgTipsElem? = null, - @ProtoId(20) @JvmField val optMsgMiniappNotify: MiniAppNotify? = null, - @ProtoId(21) @JvmField val optUint64SenderUin: Long = 0L, - @ProtoId(22) @JvmField val optMsgLuckybagNotify: LuckyBagNotify? = null, - @ProtoId(23) @JvmField val optMsgTroopformtipsPush: TroopFormGrayTipsInfo? = null, - @ProtoId(24) @JvmField val optMsgMediaPush: MediaChangePushInfo? = null, - @ProtoId(26) @JvmField val optGeneralGrayTip: GeneralGrayTipInfo? = null, - @ProtoId(27) @JvmField val optMsgVideoPush: VideoChangePushInfo? = null, - @ProtoId(28) @JvmField val optLbsShareChangePlusInfo: LbsShareChangePushInfo? = null, - @ProtoId(29) @JvmField val optMsgSingPush: SingChangePushInfo? = null, - @ProtoId(30) @JvmField val optMsgGroupInfoChange: GroupInfoChange? = null + @ProtoNumber(18) @JvmField val optMsgGoldtips: GoldMsgTipsElem? = null, + @ProtoNumber(20) @JvmField val optMsgMiniappNotify: MiniAppNotify? = null, + @ProtoNumber(21) @JvmField val optUint64SenderUin: Long = 0L, + @ProtoNumber(22) @JvmField val optMsgLuckybagNotify: LuckyBagNotify? = null, + @ProtoNumber(23) @JvmField val optMsgTroopformtipsPush: TroopFormGrayTipsInfo? = null, + @ProtoNumber(24) @JvmField val optMsgMediaPush: MediaChangePushInfo? = null, + @ProtoNumber(26) @JvmField val optGeneralGrayTip: GeneralGrayTipInfo? = null, + @ProtoNumber(27) @JvmField val optMsgVideoPush: VideoChangePushInfo? = null, + @ProtoNumber(28) @JvmField val optLbsShareChangePlusInfo: LbsShareChangePushInfo? = null, + @ProtoNumber(29) @JvmField val optMsgSingPush: SingChangePushInfo? = null, + @ProtoNumber(30) @JvmField val optMsgGroupInfoChange: GroupInfoChange? = null ) : ProtoBuf @Serializable internal class NotifyObjmsgUpdate( - @ProtoId(1) @JvmField val objmsgId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) @JvmField val updateType: Int = 0, - @ProtoId(3) @JvmField val extMsg: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val objmsgId: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(2) @JvmField val updateType: Int = 0, + @ProtoNumber(3) @JvmField val extMsg: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class RedGrayTipsInfo( - @ProtoId(1) @JvmField val optUint32ShowLastest: Int = 0, - @ProtoId(2) @JvmField val senderUin: Long = 0L, - @ProtoId(3) @JvmField val receiverUin: Long = 0L, - @ProtoId(4) @JvmField val senderRichContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) @JvmField val receiverRichContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) @JvmField val authkey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoType(ProtoNumberType.SIGNED) @ProtoId(7) @JvmField val sint32Msgtype: Int = 0, - @ProtoId(8) @JvmField val luckyFlag: Int = 0, - @ProtoId(9) @JvmField val hideFlag: Int = 0, - @ProtoId(10) @JvmField val pcBody: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(11) @JvmField val icon: Int = 0, - @ProtoId(12) @JvmField val luckyUin: Long = 0L, - @ProtoId(13) @JvmField val time: Int = 0, - @ProtoId(14) @JvmField val random: Int = 0, - @ProtoId(15) @JvmField val broadcastRichContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(16) @JvmField val idiom: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(17) @JvmField val idiomSeq: Int = 0, - @ProtoId(18) @JvmField val idiomAlpha: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(19) @JvmField val jumpurl: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val optUint32ShowLastest: Int = 0, + @ProtoNumber(2) @JvmField val senderUin: Long = 0L, + @ProtoNumber(3) @JvmField val receiverUin: Long = 0L, + @ProtoNumber(4) @JvmField val senderRichContent: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(5) @JvmField val receiverRichContent: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(6) @JvmField val authkey: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoType(ProtoIntegerType.SIGNED) @ProtoNumber(7) @JvmField val sint32Msgtype: Int = 0, + @ProtoNumber(8) @JvmField val luckyFlag: Int = 0, + @ProtoNumber(9) @JvmField val hideFlag: Int = 0, + @ProtoNumber(10) @JvmField val pcBody: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(11) @JvmField val icon: Int = 0, + @ProtoNumber(12) @JvmField val luckyUin: Long = 0L, + @ProtoNumber(13) @JvmField val time: Int = 0, + @ProtoNumber(14) @JvmField val random: Int = 0, + @ProtoNumber(15) @JvmField val broadcastRichContent: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(16) @JvmField val idiom: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(17) @JvmField val idiomSeq: Int = 0, + @ProtoNumber(18) @JvmField val idiomAlpha: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(19) @JvmField val jumpurl: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class ReqBody( - @ProtoId(1) @JvmField val optUint64GroupCode: Long = 0L, - @ProtoId(2) @JvmField val uint64Memberuins: List? = null, - @ProtoId(3) @JvmField val optUint32Offline: Int = 0, - @ProtoId(4) @JvmField val msgInstCtrl: InstCtrl? = null, - @ProtoId(5) @JvmField val optBytesMsg: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) @JvmField val optUint32BusiType: Int = 0 + @ProtoNumber(1) @JvmField val optUint64GroupCode: Long = 0L, + @ProtoNumber(2) @JvmField val uint64Memberuins: List? = null, + @ProtoNumber(3) @JvmField val optUint32Offline: Int = 0, + @ProtoNumber(4) @JvmField val msgInstCtrl: InstCtrl? = null, + @ProtoNumber(5) @JvmField val optBytesMsg: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(6) @JvmField val optUint32BusiType: Int = 0 ) : ProtoBuf @Serializable internal class RspBody( - @ProtoId(1) @JvmField val optUint64GroupCode: Long = 0L + @ProtoNumber(1) @JvmField val optUint64GroupCode: Long = 0L ) : ProtoBuf @Serializable internal class SingChangePushInfo( - @ProtoId(1) @JvmField val seq: Long = 0L, - @ProtoId(2) @JvmField val actionType: Int = 0, - @ProtoId(3) @JvmField val groupId: Long = 0L, - @ProtoId(4) @JvmField val operUin: Long = 0L, - @ProtoId(5) @JvmField val grayTips: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) @JvmField val joinNums: Int = 0 + @ProtoNumber(1) @JvmField val seq: Long = 0L, + @ProtoNumber(2) @JvmField val actionType: Int = 0, + @ProtoNumber(3) @JvmField val groupId: Long = 0L, + @ProtoNumber(4) @JvmField val operUin: Long = 0L, + @ProtoNumber(5) @JvmField val grayTips: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(6) @JvmField val joinNums: Int = 0 ) : ProtoBuf @Serializable internal class TemplParam( - @ProtoId(1) @JvmField val name: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) @JvmField val value: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val name: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(2) @JvmField val value: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class ThemeStateNotify( - @ProtoId(1) @JvmField val state: Int = 0, - @ProtoId(2) @JvmField val feedsId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) @JvmField val themeName: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) @JvmField val actionUin: Long = 0L, - @ProtoId(5) @JvmField val createUin: Long = 0L + @ProtoNumber(1) @JvmField val state: Int = 0, + @ProtoNumber(2) @JvmField val feedsId: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(3) @JvmField val themeName: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(4) @JvmField val actionUin: Long = 0L, + @ProtoNumber(5) @JvmField val createUin: Long = 0L ) : ProtoBuf @Serializable internal class TroopFormGrayTipsInfo( - @ProtoId(1) @JvmField val writerUin: Long = 0L, - @ProtoId(2) @JvmField val creatorUin: Long = 0L, - @ProtoId(3) @JvmField val richContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) @JvmField val optBytesUrl: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) @JvmField val creatorNick: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val writerUin: Long = 0L, + @ProtoNumber(2) @JvmField val creatorUin: Long = 0L, + @ProtoNumber(3) @JvmField val richContent: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(4) @JvmField val optBytesUrl: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(5) @JvmField val creatorNick: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class VideoChangePushInfo( - @ProtoId(1) @JvmField val seq: Long = 0L, - @ProtoId(2) @JvmField val actionType: Int = 0, - @ProtoId(3) @JvmField val groupId: Long = 0L, - @ProtoId(4) @JvmField val operUin: Long = 0L, - @ProtoId(5) @JvmField val grayTips: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) @JvmField val joinNums: Int = 0, - @ProtoId(100) @JvmField val extInfo: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val seq: Long = 0L, + @ProtoNumber(2) @JvmField val actionType: Int = 0, + @ProtoNumber(3) @JvmField val groupId: Long = 0L, + @ProtoNumber(4) @JvmField val operUin: Long = 0L, + @ProtoNumber(5) @JvmField val grayTips: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(6) @JvmField val joinNums: Int = 0, + @ProtoNumber(100) @JvmField val extInfo: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class WereWolfPush( - @ProtoId(1) @JvmField val pushType: Int = 0, - @ProtoId(2) @JvmField val gameRoom: Long = 0L, - @ProtoId(3) @JvmField val enumGameState: Int = 0, - @ProtoId(4) @JvmField val gameRound: Int = 0, - @ProtoId(5) @JvmField val roles: List? = null, - @ProtoId(6) @JvmField val speaker: Long = 0L, - @ProtoId(7) @JvmField val judgeUin: Long = 0L, - @ProtoId(8) @JvmField val judgeWords: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(9) @JvmField val enumOperation: Int = 0, - @ProtoId(10) @JvmField val srcUser: Long = 0L, - @ProtoId(11) @JvmField val dstUser: Long = 0L, - @ProtoId(12) @JvmField val deadUsers: List? = null, - @ProtoId(13) @JvmField val gameResult: Int = 0, - @ProtoId(14) @JvmField val timeoutSec: Int = 0, - @ProtoId(15) @JvmField val killConfirmed: Int = 0, - @ProtoId(16) @JvmField val judgeNickname: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(17) @JvmField val votedTieUsers: List? = null + @ProtoNumber(1) @JvmField val pushType: Int = 0, + @ProtoNumber(2) @JvmField val gameRoom: Long = 0L, + @ProtoNumber(3) @JvmField val enumGameState: Int = 0, + @ProtoNumber(4) @JvmField val gameRound: Int = 0, + @ProtoNumber(5) @JvmField val roles: List? = null, + @ProtoNumber(6) @JvmField val speaker: Long = 0L, + @ProtoNumber(7) @JvmField val judgeUin: Long = 0L, + @ProtoNumber(8) @JvmField val judgeWords: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(9) @JvmField val enumOperation: Int = 0, + @ProtoNumber(10) @JvmField val srcUser: Long = 0L, + @ProtoNumber(11) @JvmField val dstUser: Long = 0L, + @ProtoNumber(12) @JvmField val deadUsers: List? = null, + @ProtoNumber(13) @JvmField val gameResult: Int = 0, + @ProtoNumber(14) @JvmField val timeoutSec: Int = 0, + @ProtoNumber(15) @JvmField val killConfirmed: Int = 0, + @ProtoNumber(16) @JvmField val judgeNickname: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(17) @JvmField val votedTieUsers: List? = null ) : ProtoBuf { @Serializable internal class GameRecord( - @ProtoId(1) @JvmField val total: Int = 0, - @ProtoId(2) @JvmField val win: Int = 0, - @ProtoId(3) @JvmField val lose: Int = 0, - @ProtoId(4) @JvmField val draw: Int = 0 + @ProtoNumber(1) @JvmField val total: Int = 0, + @ProtoNumber(2) @JvmField val win: Int = 0, + @ProtoNumber(3) @JvmField val lose: Int = 0, + @ProtoNumber(4) @JvmField val draw: Int = 0 ) : ProtoBuf @Serializable internal class Role( - @ProtoId(1) @JvmField val uin: Long = 0L, - @ProtoId(2) @JvmField val enumType: Int = 0, - @ProtoId(3) @JvmField val enumState: Int = 0, - @ProtoId(4) @JvmField val canSpeak: Int = 0, - @ProtoId(5) @JvmField val canListen: Int = 0, - @ProtoId(6) @JvmField val position: Int = 0, - @ProtoId(7) @JvmField val canVote: Int = 0, - @ProtoId(8) @JvmField val canVoted: Int = 0, - @ProtoId(9) @JvmField val alreadyChecked: Int = 0, - @ProtoId(10) @JvmField val alreadySaved: Int = 0, - @ProtoId(11) @JvmField val alreadyPoisoned: Int = 0, - @ProtoId(12) @JvmField val playerState: Int = 0, - @ProtoId(13) @JvmField val enumDeadOp: Int = 0, - @ProtoId(14) @JvmField val enumOperation: Int = 0, - @ProtoId(15) @JvmField val dstUser: Long = 0L, - @ProtoId(16) @JvmField val operationRound: Int = 0, - @ProtoId(17) @JvmField val msgGameRecord: GameRecord? = null, - @ProtoId(18) @JvmField val isWerewolf: Int = 0, - @ProtoId(19) @JvmField val defendedUser: Long = 0L, - @ProtoId(20) @JvmField val isSheriff: Int = 0 + @ProtoNumber(1) @JvmField val uin: Long = 0L, + @ProtoNumber(2) @JvmField val enumType: Int = 0, + @ProtoNumber(3) @JvmField val enumState: Int = 0, + @ProtoNumber(4) @JvmField val canSpeak: Int = 0, + @ProtoNumber(5) @JvmField val canListen: Int = 0, + @ProtoNumber(6) @JvmField val position: Int = 0, + @ProtoNumber(7) @JvmField val canVote: Int = 0, + @ProtoNumber(8) @JvmField val canVoted: Int = 0, + @ProtoNumber(9) @JvmField val alreadyChecked: Int = 0, + @ProtoNumber(10) @JvmField val alreadySaved: Int = 0, + @ProtoNumber(11) @JvmField val alreadyPoisoned: Int = 0, + @ProtoNumber(12) @JvmField val playerState: Int = 0, + @ProtoNumber(13) @JvmField val enumDeadOp: Int = 0, + @ProtoNumber(14) @JvmField val enumOperation: Int = 0, + @ProtoNumber(15) @JvmField val dstUser: Long = 0L, + @ProtoNumber(16) @JvmField val operationRound: Int = 0, + @ProtoNumber(17) @JvmField val msgGameRecord: GameRecord? = null, + @ProtoNumber(18) @JvmField val isWerewolf: Int = 0, + @ProtoNumber(19) @JvmField val defendedUser: Long = 0L, + @ProtoNumber(20) @JvmField val isSheriff: Int = 0 ) : ProtoBuf } } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x858.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x858.kt index 9bb4ddeb7..87b8fe022 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x858.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x858.kt @@ -3,8 +3,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId -import kotlinx.serialization.protobuf.ProtoNumberType +import kotlinx.serialization.protobuf.ProtoIntegerType +import kotlinx.serialization.protobuf.ProtoNumber import kotlinx.serialization.protobuf.ProtoType import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf @@ -14,74 +14,74 @@ import kotlin.jvm.JvmField internal class Oidb0x858 : ProtoBuf { @Serializable internal class GoldMsgTipsElem( - @ProtoId(1) @JvmField val type: Int = 0, - @ProtoId(2) @JvmField val billno: String = "", - @ProtoId(3) @JvmField val result: Int = 0, - @ProtoId(4) @JvmField val amount: Int = 0, - @ProtoId(5) @JvmField val total: Int = 0, - @ProtoId(6) @JvmField val interval: Int = 0, - @ProtoId(7) @JvmField val finish: Int = 0, - @ProtoId(8) @JvmField val uin: List? = null, - @ProtoId(9) @JvmField val action: Int = 0 + @ProtoNumber(1) @JvmField val type: Int = 0, + @ProtoNumber(2) @JvmField val billno: String = "", + @ProtoNumber(3) @JvmField val result: Int = 0, + @ProtoNumber(4) @JvmField val amount: Int = 0, + @ProtoNumber(5) @JvmField val total: Int = 0, + @ProtoNumber(6) @JvmField val interval: Int = 0, + @ProtoNumber(7) @JvmField val finish: Int = 0, + @ProtoNumber(8) @JvmField val uin: List? = null, + @ProtoNumber(9) @JvmField val action: Int = 0 ) : ProtoBuf @Serializable internal class MessageRecallReminder( - @ProtoId(1) @JvmField val uin: Long = 0L, - @ProtoId(2) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) @JvmField val recalledMsgList: List = listOf(), - @ProtoId(4) @JvmField val reminderContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) @JvmField val userdef: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val uin: Long = 0L, + @ProtoNumber(2) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(3) @JvmField val recalledMsgList: List = listOf(), + @ProtoNumber(4) @JvmField val reminderContent: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(5) @JvmField val userdef: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf { @Serializable internal class MessageMeta( - @ProtoId(1) @JvmField val seq: Int = 0, - @ProtoId(2) @JvmField val time: Int = 0, - @ProtoId(3) @JvmField val msgRandom: Int = 0 + @ProtoNumber(1) @JvmField val seq: Int = 0, + @ProtoNumber(2) @JvmField val time: Int = 0, + @ProtoNumber(3) @JvmField val msgRandom: Int = 0 ) : ProtoBuf } @Serializable internal class NotifyMsgBody( - @ProtoId(1) @JvmField val optEnumType: Int /* enum */ = 5, - @ProtoId(2) @JvmField val optUint64MsgTime: Long = 0L, - @ProtoId(3) @JvmField val optUint64MsgExpires: Long = 0L, - @ProtoId(4) @JvmField val optUint64ConfUin: Long = 0L, - @ProtoId(5) @JvmField val optMsgRedtips: RedGrayTipsInfo? = null, - @ProtoId(6) @JvmField val optMsgRecallReminder: MessageRecallReminder? = null, - @ProtoId(7) @JvmField val optMsgObjUpdate: NotifyObjmsgUpdate? = null, + @ProtoNumber(1) @JvmField val optEnumType: Int /* enum */ = 5, + @ProtoNumber(2) @JvmField val optUint64MsgTime: Long = 0L, + @ProtoNumber(3) @JvmField val optUint64MsgExpires: Long = 0L, + @ProtoNumber(4) @JvmField val optUint64ConfUin: Long = 0L, + @ProtoNumber(5) @JvmField val optMsgRedtips: RedGrayTipsInfo? = null, + @ProtoNumber(6) @JvmField val optMsgRecallReminder: MessageRecallReminder? = null, + @ProtoNumber(7) @JvmField val optMsgObjUpdate: NotifyObjmsgUpdate? = null, // @SerialId(8) @JvmField val optStcmGameState: ApolloGameStatus.STCMGameMessage? = null, // @SerialId(9) @JvmField val aplloMsgPush: ApolloPushMsgInfo.STPushMsgElem? = null, - @ProtoId(10) @JvmField val optMsgGoldtips: GoldMsgTipsElem? = null + @ProtoNumber(10) @JvmField val optMsgGoldtips: GoldMsgTipsElem? = null ) : ProtoBuf @Serializable internal class NotifyObjmsgUpdate( - @ProtoId(1) @JvmField val objmsgId: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) @JvmField val updateType: Int = 0, - @ProtoId(3) @JvmField val extMsg: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val objmsgId: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(2) @JvmField val updateType: Int = 0, + @ProtoNumber(3) @JvmField val extMsg: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class RedGrayTipsInfo( - @ProtoId(1) @JvmField val optUint32ShowLastest: Int = 0, - @ProtoId(2) @JvmField val senderUin: Long = 0L, - @ProtoId(3) @JvmField val receiverUin: Long = 0L, - @ProtoId(4) @JvmField val senderRichContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(5) @JvmField val receiverRichContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(6) @JvmField val authkey: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoType(ProtoNumberType.SIGNED) @ProtoId(7) @JvmField val sint32Msgtype: Int = 0, - @ProtoId(8) @JvmField val luckyFlag: Int = 0, - @ProtoId(9) @JvmField val hideFlag: Int = 0, - @ProtoId(10) @JvmField val pcBody: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(11) @JvmField val icon: Int = 0, - @ProtoId(12) @JvmField val luckyUin: Long = 0L, - @ProtoId(13) @JvmField val time: Int = 0, - @ProtoId(14) @JvmField val random: Int = 0, - @ProtoId(15) @JvmField val broadcastRichContent: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(16) @JvmField val idiom: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(17) @JvmField val idiomSeq: Int = 0, - @ProtoId(18) @JvmField val idiomAlpha: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(19) @JvmField val jumpurl: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val optUint32ShowLastest: Int = 0, + @ProtoNumber(2) @JvmField val senderUin: Long = 0L, + @ProtoNumber(3) @JvmField val receiverUin: Long = 0L, + @ProtoNumber(4) @JvmField val senderRichContent: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(5) @JvmField val receiverRichContent: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(6) @JvmField val authkey: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoType(ProtoIntegerType.SIGNED) @ProtoNumber(7) @JvmField val sint32Msgtype: Int = 0, + @ProtoNumber(8) @JvmField val luckyFlag: Int = 0, + @ProtoNumber(9) @JvmField val hideFlag: Int = 0, + @ProtoNumber(10) @JvmField val pcBody: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(11) @JvmField val icon: Int = 0, + @ProtoNumber(12) @JvmField val luckyUin: Long = 0L, + @ProtoNumber(13) @JvmField val time: Int = 0, + @ProtoNumber(14) @JvmField val random: Int = 0, + @ProtoNumber(15) @JvmField val broadcastRichContent: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(16) @JvmField val idiom: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(17) @JvmField val idiomSeq: Int = 0, + @ProtoNumber(18) @JvmField val idiomAlpha: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(19) @JvmField val jumpurl: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Define.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Define.kt index 00131d963..0f65443f2 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Define.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Define.kt @@ -1,7 +1,7 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId +import kotlinx.serialization.protobuf.ProtoNumber import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf import kotlin.jvm.JvmField @@ -9,56 +9,56 @@ import kotlin.jvm.JvmField internal class Common : ProtoBuf { @Serializable internal class BindInfo( - @ProtoId(1) @JvmField val friUin: Long = 0L, - @ProtoId(2) @JvmField val friNick: String = "", - @ProtoId(3) @JvmField val time: Long = 0L, - @ProtoId(4) @JvmField val bindStatus: Int = 0 + @ProtoNumber(1) @JvmField val friUin: Long = 0L, + @ProtoNumber(2) @JvmField val friNick: String = "", + @ProtoNumber(3) @JvmField val time: Long = 0L, + @ProtoNumber(4) @JvmField val bindStatus: Int = 0 ) : ProtoBuf @Serializable internal class MedalInfo( - @ProtoId(1) @JvmField val id: Int = 0, - @ProtoId(2) @JvmField val type: Int = 0, - @ProtoId(4) @JvmField val seq: Long = 0, - @ProtoId(5) @JvmField val name: String = "", - @ProtoId(6) @JvmField val newflag: Int = 0, - @ProtoId(7) @JvmField val time: Long = 0L, - @ProtoId(8) @JvmField val msgBindFri: BindInfo? = null, - @ProtoId(11) @JvmField val desc: String = "", - @ProtoId(31) @JvmField val level: Int = 0, - @ProtoId(36) @JvmField val taskinfos: List? = null, - @ProtoId(40) @JvmField val point: Int = 0, - @ProtoId(41) @JvmField val pointLevel2: Int = 0, - @ProtoId(42) @JvmField val pointLevel3: Int = 0, - @ProtoId(43) @JvmField val seqLevel2: Long = 0, - @ProtoId(44) @JvmField val seqLevel3: Long = 0, - @ProtoId(45) @JvmField val timeLevel2: Long = 0L, - @ProtoId(46) @JvmField val timeLevel3: Long = 0L, - @ProtoId(47) @JvmField val descLevel2: String = "", - @ProtoId(48) @JvmField val descLevel3: String = "", - @ProtoId(49) @JvmField val endtime: Int = 0, - @ProtoId(50) @JvmField val detailUrl: String = "", - @ProtoId(51) @JvmField val detailUrl2: String = "", - @ProtoId(52) @JvmField val detailUrl3: String = "", - @ProtoId(53) @JvmField val taskDesc: String = "", - @ProtoId(54) @JvmField val taskDesc2: String = "", - @ProtoId(55) @JvmField val taskDesc3: String = "", - @ProtoId(56) @JvmField val levelCount: Int = 0, - @ProtoId(57) @JvmField val noProgress: Int = 0, - @ProtoId(58) @JvmField val resource: String = "", - @ProtoId(59) @JvmField val fromuinLevel: Int = 0, - @ProtoId(60) @JvmField val unread: Int = 0, - @ProtoId(61) @JvmField val unread2: Int = 0, - @ProtoId(62) @JvmField val unread3: Int = 0 + @ProtoNumber(1) @JvmField val id: Int = 0, + @ProtoNumber(2) @JvmField val type: Int = 0, + @ProtoNumber(4) @JvmField val seq: Long = 0, + @ProtoNumber(5) @JvmField val name: String = "", + @ProtoNumber(6) @JvmField val newflag: Int = 0, + @ProtoNumber(7) @JvmField val time: Long = 0L, + @ProtoNumber(8) @JvmField val msgBindFri: BindInfo? = null, + @ProtoNumber(11) @JvmField val desc: String = "", + @ProtoNumber(31) @JvmField val level: Int = 0, + @ProtoNumber(36) @JvmField val taskinfos: List? = null, + @ProtoNumber(40) @JvmField val point: Int = 0, + @ProtoNumber(41) @JvmField val pointLevel2: Int = 0, + @ProtoNumber(42) @JvmField val pointLevel3: Int = 0, + @ProtoNumber(43) @JvmField val seqLevel2: Long = 0, + @ProtoNumber(44) @JvmField val seqLevel3: Long = 0, + @ProtoNumber(45) @JvmField val timeLevel2: Long = 0L, + @ProtoNumber(46) @JvmField val timeLevel3: Long = 0L, + @ProtoNumber(47) @JvmField val descLevel2: String = "", + @ProtoNumber(48) @JvmField val descLevel3: String = "", + @ProtoNumber(49) @JvmField val endtime: Int = 0, + @ProtoNumber(50) @JvmField val detailUrl: String = "", + @ProtoNumber(51) @JvmField val detailUrl2: String = "", + @ProtoNumber(52) @JvmField val detailUrl3: String = "", + @ProtoNumber(53) @JvmField val taskDesc: String = "", + @ProtoNumber(54) @JvmField val taskDesc2: String = "", + @ProtoNumber(55) @JvmField val taskDesc3: String = "", + @ProtoNumber(56) @JvmField val levelCount: Int = 0, + @ProtoNumber(57) @JvmField val noProgress: Int = 0, + @ProtoNumber(58) @JvmField val resource: String = "", + @ProtoNumber(59) @JvmField val fromuinLevel: Int = 0, + @ProtoNumber(60) @JvmField val unread: Int = 0, + @ProtoNumber(61) @JvmField val unread2: Int = 0, + @ProtoNumber(62) @JvmField val unread3: Int = 0 ) : ProtoBuf @Serializable internal class MedalTaskInfo( - @ProtoId(1) @JvmField val taskid: Int = 0, - @ProtoId(32) @JvmField val int32TaskValue: Int = 0, - @ProtoId(33) @JvmField val tarValue: Int = 0, - @ProtoId(34) @JvmField val tarValueLevel2: Int = 0, - @ProtoId(35) @JvmField val tarValueLevel3: Int = 0 + @ProtoNumber(1) @JvmField val taskid: Int = 0, + @ProtoNumber(32) @JvmField val int32TaskValue: Int = 0, + @ProtoNumber(33) @JvmField val tarValue: Int = 0, + @ProtoNumber(34) @JvmField val tarValueLevel2: Int = 0, + @ProtoNumber(35) @JvmField val tarValueLevel3: Int = 0 ) : ProtoBuf } @@ -66,475 +66,475 @@ internal class Common : ProtoBuf { internal class AppointDefine : ProtoBuf { @Serializable internal class ADFeedContent( - @ProtoId(1) @JvmField val msgUserInfo: UserInfo? = null, - @ProtoId(2) @JvmField val strPicUrl: List = listOf(), - @ProtoId(3) @JvmField val msgText: RichText? = null, - @ProtoId(4) @JvmField val attendInfo: String = "", - @ProtoId(5) @JvmField val actionUrl: String = "", - @ProtoId(6) @JvmField val publishTime: Int = 0, - @ProtoId(7) @JvmField val msgHotTopicList: HotTopicList? = null, - @ProtoId(8) @JvmField val moreUrl: String = "", - @ProtoId(9) @JvmField val recordDuration: String = "" + @ProtoNumber(1) @JvmField val msgUserInfo: UserInfo? = null, + @ProtoNumber(2) @JvmField val strPicUrl: List = listOf(), + @ProtoNumber(3) @JvmField val msgText: RichText? = null, + @ProtoNumber(4) @JvmField val attendInfo: String = "", + @ProtoNumber(5) @JvmField val actionUrl: String = "", + @ProtoNumber(6) @JvmField val publishTime: Int = 0, + @ProtoNumber(7) @JvmField val msgHotTopicList: HotTopicList? = null, + @ProtoNumber(8) @JvmField val moreUrl: String = "", + @ProtoNumber(9) @JvmField val recordDuration: String = "" ) : ProtoBuf @Serializable internal class RichText( - @ProtoId(1) @JvmField val msgElems: List? = null + @ProtoNumber(1) @JvmField val msgElems: List? = null ) : ProtoBuf @Serializable internal class RankEvent( - @ProtoId(1) @JvmField val listtype: Int = 0, - @ProtoId(2) @JvmField val notifytype: Int = 0, - @ProtoId(3) @JvmField val eventtime: Int = 0, - @ProtoId(4) @JvmField val seq: Int = 0, - @ProtoId(5) @JvmField val notifyTips: String = "" + @ProtoNumber(1) @JvmField val listtype: Int = 0, + @ProtoNumber(2) @JvmField val notifytype: Int = 0, + @ProtoNumber(3) @JvmField val eventtime: Int = 0, + @ProtoNumber(4) @JvmField val seq: Int = 0, + @ProtoNumber(5) @JvmField val notifyTips: String = "" ) : ProtoBuf @Serializable internal class Wifi( - @ProtoId(1) @JvmField val mac: Long = 0L, - @ProtoId(2) @JvmField val int32Rssi: Int = 0 + @ProtoNumber(1) @JvmField val mac: Long = 0L, + @ProtoNumber(2) @JvmField val int32Rssi: Int = 0 ) : ProtoBuf @Serializable internal class InterestItem( - @ProtoId(1) @JvmField val tagId: Long = 0L, - @ProtoId(2) @JvmField val tagName: String = "", - @ProtoId(3) @JvmField val tagIconUrl: String = "", - @ProtoId(4) @JvmField val tagHref: String = "", - @ProtoId(5) @JvmField val tagBackColor: String = "", - @ProtoId(6) @JvmField val tagFontColor: String = "", - @ProtoId(7) @JvmField val tagVid: String = "", - @ProtoId(8) @JvmField val tagType: Int = 0, - @ProtoId(9) @JvmField val addTime: Int = 0, - @ProtoId(10) @JvmField val tagCategory: String = "", - @ProtoId(11) @JvmField val tagOtherUrl: String = "", - @ProtoId(12) @JvmField val bid: Int = 0 + @ProtoNumber(1) @JvmField val tagId: Long = 0L, + @ProtoNumber(2) @JvmField val tagName: String = "", + @ProtoNumber(3) @JvmField val tagIconUrl: String = "", + @ProtoNumber(4) @JvmField val tagHref: String = "", + @ProtoNumber(5) @JvmField val tagBackColor: String = "", + @ProtoNumber(6) @JvmField val tagFontColor: String = "", + @ProtoNumber(7) @JvmField val tagVid: String = "", + @ProtoNumber(8) @JvmField val tagType: Int = 0, + @ProtoNumber(9) @JvmField val addTime: Int = 0, + @ProtoNumber(10) @JvmField val tagCategory: String = "", + @ProtoNumber(11) @JvmField val tagOtherUrl: String = "", + @ProtoNumber(12) @JvmField val bid: Int = 0 ) : ProtoBuf @Serializable internal class ShopID( - @ProtoId(1) @JvmField val shopid: String = "", - @ProtoId(2) @JvmField val sp: Int = 0 + @ProtoNumber(1) @JvmField val shopid: String = "", + @ProtoNumber(2) @JvmField val sp: Int = 0 ) : ProtoBuf @Serializable internal class FeedComment( - @ProtoId(1) @JvmField val commentId: String = "", - @ProtoId(2) @JvmField val feedId: String = "", - @ProtoId(3) @JvmField val msgPublisherInfo: StrangerInfo? = null, - @ProtoId(4) @JvmField val time: Int = 0, - @ProtoId(6) @JvmField val msgReplyInfo: ReplyInfo? = null, - @ProtoId(7) @JvmField val flag: Int = 0, - @ProtoId(8) @JvmField val msgContent: RichText? = null, - @ProtoId(9) @JvmField val hot: Int = 0 + @ProtoNumber(1) @JvmField val commentId: String = "", + @ProtoNumber(2) @JvmField val feedId: String = "", + @ProtoNumber(3) @JvmField val msgPublisherInfo: StrangerInfo? = null, + @ProtoNumber(4) @JvmField val time: Int = 0, + @ProtoNumber(6) @JvmField val msgReplyInfo: ReplyInfo? = null, + @ProtoNumber(7) @JvmField val flag: Int = 0, + @ProtoNumber(8) @JvmField val msgContent: RichText? = null, + @ProtoNumber(9) @JvmField val hot: Int = 0 ) : ProtoBuf @Serializable internal class ADFeed( - @ProtoId(1) @JvmField val taskId: Int = 0, - @ProtoId(2) @JvmField val style: Int = 0, - @ProtoId(3) @JvmField val content: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val taskId: Int = 0, + @ProtoNumber(2) @JvmField val style: Int = 0, + @ProtoNumber(3) @JvmField val content: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class Cell( - @ProtoId(1) @JvmField val int32Mcc: Int = -1, - @ProtoId(2) @JvmField val int32Mnc: Int = -1, - @ProtoId(3) @JvmField val int32Lac: Int = -1, - @ProtoId(4) @JvmField val int32Cellid: Int = -1, - @ProtoId(5) @JvmField val int32Rssi: Int = 0 + @ProtoNumber(1) @JvmField val int32Mcc: Int = -1, + @ProtoNumber(2) @JvmField val int32Mnc: Int = -1, + @ProtoNumber(3) @JvmField val int32Lac: Int = -1, + @ProtoNumber(4) @JvmField val int32Cellid: Int = -1, + @ProtoNumber(5) @JvmField val int32Rssi: Int = 0 ) : ProtoBuf @Serializable internal class RecentVistorEvent( - @ProtoId(1) @JvmField val eventtype: Int = 0, - @ProtoId(2) @JvmField val eventTinyid: Long = 0L, - @ProtoId(3) @JvmField val unreadCount: Int = 0 + @ProtoNumber(1) @JvmField val eventtype: Int = 0, + @ProtoNumber(2) @JvmField val eventTinyid: Long = 0L, + @ProtoNumber(3) @JvmField val unreadCount: Int = 0 ) : ProtoBuf @Serializable internal class OrganizerInfo( - @ProtoId(1) @JvmField val hostName: String = "", - @ProtoId(2) @JvmField val hostUrl: String = "", - @ProtoId(3) @JvmField val hostCover: String = "" + @ProtoNumber(1) @JvmField val hostName: String = "", + @ProtoNumber(2) @JvmField val hostUrl: String = "", + @ProtoNumber(3) @JvmField val hostCover: String = "" ) : ProtoBuf @Serializable internal class InterestTag( - @ProtoId(1) @JvmField val tagType: Int = 0, - @ProtoId(2) @JvmField val msgTagList: List? = null + @ProtoNumber(1) @JvmField val tagType: Int = 0, + @ProtoNumber(2) @JvmField val msgTagList: List? = null ) : ProtoBuf @Serializable internal class AppointInfoEx( - @ProtoId(1) @JvmField val feedsPicUrl: String = "", - @ProtoId(2) @JvmField val feedsUrl: String = "", - @ProtoId(3) @JvmField val detailTitle: String = "", - @ProtoId(4) @JvmField val detailDescribe: String = "", - @ProtoId(5) @JvmField val showPublisher: Int = 0, - @ProtoId(6) @JvmField val detailPicUrl: String = "", - @ProtoId(7) @JvmField val detailUrl: String = "", - @ProtoId(8) @JvmField val showAttend: Int = 0 + @ProtoNumber(1) @JvmField val feedsPicUrl: String = "", + @ProtoNumber(2) @JvmField val feedsUrl: String = "", + @ProtoNumber(3) @JvmField val detailTitle: String = "", + @ProtoNumber(4) @JvmField val detailDescribe: String = "", + @ProtoNumber(5) @JvmField val showPublisher: Int = 0, + @ProtoNumber(6) @JvmField val detailPicUrl: String = "", + @ProtoNumber(7) @JvmField val detailUrl: String = "", + @ProtoNumber(8) @JvmField val showAttend: Int = 0 ) : ProtoBuf @Serializable internal class DateComment( - @ProtoId(1) @JvmField val commentId: String = "", - @ProtoId(2) @JvmField val msgAppointId: AppointID? = null, - @ProtoId(3) @JvmField val msgPublisherInfo: StrangerInfo? = null, - @ProtoId(4) @JvmField val time: Int = 0, - @ProtoId(6) @JvmField val msgReplyInfo: ReplyInfo? = null, - @ProtoId(7) @JvmField val flag: Int = 0, - @ProtoId(8) @JvmField val msgContent: RichText? = null + @ProtoNumber(1) @JvmField val commentId: String = "", + @ProtoNumber(2) @JvmField val msgAppointId: AppointID? = null, + @ProtoNumber(3) @JvmField val msgPublisherInfo: StrangerInfo? = null, + @ProtoNumber(4) @JvmField val time: Int = 0, + @ProtoNumber(6) @JvmField val msgReplyInfo: ReplyInfo? = null, + @ProtoNumber(7) @JvmField val flag: Int = 0, + @ProtoNumber(8) @JvmField val msgContent: RichText? = null ) : ProtoBuf @Serializable internal class AppointContent( - @ProtoId(1) @JvmField val appointSubject: Int = 0, - @ProtoId(2) @JvmField val payType: Int = 0, - @ProtoId(3) @JvmField val appointDate: Int = 0, - @ProtoId(4) @JvmField val appointGender: Int = 0, - @ProtoId(5) @JvmField val appointIntroduce: String = "", - @ProtoId(6) @JvmField val msgAppointAddress: AddressInfo? = null, - @ProtoId(7) @JvmField val msgTravelInfo: TravelInfo? = null + @ProtoNumber(1) @JvmField val appointSubject: Int = 0, + @ProtoNumber(2) @JvmField val payType: Int = 0, + @ProtoNumber(3) @JvmField val appointDate: Int = 0, + @ProtoNumber(4) @JvmField val appointGender: Int = 0, + @ProtoNumber(5) @JvmField val appointIntroduce: String = "", + @ProtoNumber(6) @JvmField val msgAppointAddress: AddressInfo? = null, + @ProtoNumber(7) @JvmField val msgTravelInfo: TravelInfo? = null ) : ProtoBuf @Serializable internal class FeedInfo( - @ProtoId(1) @JvmField val feedType: Long = 0L, - @ProtoId(2) @JvmField val feedId: String = "", - @ProtoId(3) @JvmField val msgFeedContent: FeedContent? = null, - @ProtoId(4) @JvmField val msgTopicInfo: NearbyTopic? = null, - @ProtoId(5) @JvmField val publishTime: Long = 0, - @ProtoId(6) @JvmField val praiseCount: Int = 0, - @ProtoId(7) @JvmField val praiseFlag: Int = 0, - @ProtoId(8) @JvmField val msgPraiseUser: List? = null, - @ProtoId(9) @JvmField val commentCount: Int = 0, - @ProtoId(10) @JvmField val msgCommentList: List? = null, - @ProtoId(11) @JvmField val commentRetAll: Int = 0, - @ProtoId(12) @JvmField val hotFlag: Int = 0, - @ProtoId(13) @JvmField val svrReserved: Long = 0L, - @ProtoId(14) @JvmField val msgHotEntry: HotEntry? = null + @ProtoNumber(1) @JvmField val feedType: Long = 0L, + @ProtoNumber(2) @JvmField val feedId: String = "", + @ProtoNumber(3) @JvmField val msgFeedContent: FeedContent? = null, + @ProtoNumber(4) @JvmField val msgTopicInfo: NearbyTopic? = null, + @ProtoNumber(5) @JvmField val publishTime: Long = 0, + @ProtoNumber(6) @JvmField val praiseCount: Int = 0, + @ProtoNumber(7) @JvmField val praiseFlag: Int = 0, + @ProtoNumber(8) @JvmField val msgPraiseUser: List? = null, + @ProtoNumber(9) @JvmField val commentCount: Int = 0, + @ProtoNumber(10) @JvmField val msgCommentList: List? = null, + @ProtoNumber(11) @JvmField val commentRetAll: Int = 0, + @ProtoNumber(12) @JvmField val hotFlag: Int = 0, + @ProtoNumber(13) @JvmField val svrReserved: Long = 0L, + @ProtoNumber(14) @JvmField val msgHotEntry: HotEntry? = null ) : ProtoBuf @Serializable internal class HotTopicList( - @ProtoId(1) @JvmField val topicList: List? = null + @ProtoNumber(1) @JvmField val topicList: List? = null ) : ProtoBuf @Serializable internal class FeedContent( - @ProtoId(1) @JvmField val strPicUrl: List = listOf(), - @ProtoId(2) @JvmField val msgText: RichText? = null, - @ProtoId(3) @JvmField val hrefUrl: String = "", - @ProtoId(5) @JvmField val groupName: String = "", - @ProtoId(6) @JvmField val groupBulletin: String = "", - @ProtoId(7) @JvmField val feedType: Int = 0, - @ProtoId(8) @JvmField val poiId: String = "", - @ProtoId(9) @JvmField val poiTitle: String = "", - @ProtoId(20) @JvmField val effectiveTime: Int = 0, - @ProtoId(21) @JvmField val expiationTime: Int = 0, - @ProtoId(22) @JvmField val msgLocale: LocaleInfo? = null, - @ProtoId(23) @JvmField val feedsIndex: Int = 0, - @ProtoId(24) @JvmField val msgAd: ADFeed? = null, - @ProtoId(25) @JvmField val privateData: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val strPicUrl: List = listOf(), + @ProtoNumber(2) @JvmField val msgText: RichText? = null, + @ProtoNumber(3) @JvmField val hrefUrl: String = "", + @ProtoNumber(5) @JvmField val groupName: String = "", + @ProtoNumber(6) @JvmField val groupBulletin: String = "", + @ProtoNumber(7) @JvmField val feedType: Int = 0, + @ProtoNumber(8) @JvmField val poiId: String = "", + @ProtoNumber(9) @JvmField val poiTitle: String = "", + @ProtoNumber(20) @JvmField val effectiveTime: Int = 0, + @ProtoNumber(21) @JvmField val expiationTime: Int = 0, + @ProtoNumber(22) @JvmField val msgLocale: LocaleInfo? = null, + @ProtoNumber(23) @JvmField val feedsIndex: Int = 0, + @ProtoNumber(24) @JvmField val msgAd: ADFeed? = null, + @ProtoNumber(25) @JvmField val privateData: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class TravelInfo( - @ProtoId(1) @JvmField val msgDepartLocale: LocaleInfo? = null, - @ProtoId(2) @JvmField val msgDestination: LocaleInfo? = null, - @ProtoId(3) @JvmField val vehicle: Int = 0, - @ProtoId(4) @JvmField val partnerCount: Int = 0, - @ProtoId(5) @JvmField val placePicUrl: String = "", - @ProtoId(6) @JvmField val placeUrl: String = "" + @ProtoNumber(1) @JvmField val msgDepartLocale: LocaleInfo? = null, + @ProtoNumber(2) @JvmField val msgDestination: LocaleInfo? = null, + @ProtoNumber(3) @JvmField val vehicle: Int = 0, + @ProtoNumber(4) @JvmField val partnerCount: Int = 0, + @ProtoNumber(5) @JvmField val placePicUrl: String = "", + @ProtoNumber(6) @JvmField val placeUrl: String = "" ) : ProtoBuf @Serializable internal class RecentFreshFeed( - @ProtoId(1) @JvmField val freshFeedInfo: List? = null, - @ProtoId(2) @JvmField val uid: Long = 0L + @ProtoNumber(1) @JvmField val freshFeedInfo: List? = null, + @ProtoNumber(2) @JvmField val uid: Long = 0L ) : ProtoBuf @Serializable internal class GPS( - @ProtoId(1) @JvmField val int32Lat: Int = 900000000, - @ProtoId(2) @JvmField val int32Lon: Int = 900000000, - @ProtoId(3) @JvmField val int32Alt: Int = -10000000, - @ProtoId(4) @JvmField val int32Type: Int = 0 + @ProtoNumber(1) @JvmField val int32Lat: Int = 900000000, + @ProtoNumber(2) @JvmField val int32Lon: Int = 900000000, + @ProtoNumber(3) @JvmField val int32Alt: Int = -10000000, + @ProtoNumber(4) @JvmField val int32Type: Int = 0 ) : ProtoBuf @Serializable internal class AppointID( - @ProtoId(1) @JvmField val requestId: String = "" + @ProtoNumber(1) @JvmField val requestId: String = "" ) : ProtoBuf @Serializable internal class LocaleInfo( - @ProtoId(1) @JvmField val name: String = "", - @ProtoId(2) @JvmField val country: String = "", - @ProtoId(3) @JvmField val province: String = "", - @ProtoId(4) @JvmField val city: String = "", - @ProtoId(5) @JvmField val region: String = "", - @ProtoId(6) @JvmField val poi: String = "", - @ProtoId(7) @JvmField val msgGps: GPS? = null, - @ProtoId(8) @JvmField val address: String = "" + @ProtoNumber(1) @JvmField val name: String = "", + @ProtoNumber(2) @JvmField val country: String = "", + @ProtoNumber(3) @JvmField val province: String = "", + @ProtoNumber(4) @JvmField val city: String = "", + @ProtoNumber(5) @JvmField val region: String = "", + @ProtoNumber(6) @JvmField val poi: String = "", + @ProtoNumber(7) @JvmField val msgGps: GPS? = null, + @ProtoNumber(8) @JvmField val address: String = "" ) : ProtoBuf @Serializable internal class LBSInfo( - @ProtoId(1) @JvmField val msgGps: GPS? = null, - @ProtoId(2) @JvmField val msgWifis: List? = null, - @ProtoId(3) @JvmField val msgCells: List? = null + @ProtoNumber(1) @JvmField val msgGps: GPS? = null, + @ProtoNumber(2) @JvmField val msgWifis: List? = null, + @ProtoNumber(3) @JvmField val msgCells: List? = null ) : ProtoBuf @Serializable internal class FeedEvent( - @ProtoId(1) @JvmField val eventId: Long = 0L, - @ProtoId(2) @JvmField val time: Int = 0, - @ProtoId(3) @JvmField val eventtype: Int = 0, - @ProtoId(4) @JvmField val msgUserInfo: StrangerInfo? = null, - @ProtoId(5) @JvmField val msgFeedInfo: FeedInfo? = null, - @ProtoId(6) @JvmField val eventTips: String = "", - @ProtoId(7) @JvmField val msgComment: FeedComment? = null, - @ProtoId(8) @JvmField val cancelEventId: Long = 0L + @ProtoNumber(1) @JvmField val eventId: Long = 0L, + @ProtoNumber(2) @JvmField val time: Int = 0, + @ProtoNumber(3) @JvmField val eventtype: Int = 0, + @ProtoNumber(4) @JvmField val msgUserInfo: StrangerInfo? = null, + @ProtoNumber(5) @JvmField val msgFeedInfo: FeedInfo? = null, + @ProtoNumber(6) @JvmField val eventTips: String = "", + @ProtoNumber(7) @JvmField val msgComment: FeedComment? = null, + @ProtoNumber(8) @JvmField val cancelEventId: Long = 0L ) : ProtoBuf @Serializable internal class FeedsCookie( - @ProtoId(1) @JvmField val strList: List = listOf(), - @ProtoId(2) @JvmField val pose: Int = 0, - @ProtoId(3) @JvmField val cookie: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) @JvmField val uint64Topics: List? = null + @ProtoNumber(1) @JvmField val strList: List = listOf(), + @ProtoNumber(2) @JvmField val pose: Int = 0, + @ProtoNumber(3) @JvmField val cookie: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(4) @JvmField val uint64Topics: List? = null ) : ProtoBuf @Serializable internal class NearbyTopic( - @ProtoId(1) @JvmField val topicId: Long = 0L, - @ProtoId(2) @JvmField val topic: String = "", - @ProtoId(3) @JvmField val foreword: String = "", - @ProtoId(4) @JvmField val createTime: Int = 0, - @ProtoId(5) @JvmField val updateTime: Int = 0, - @ProtoId(6) @JvmField val hotFlag: Int = 0, - @ProtoId(7) @JvmField val buttonStyle: Int = 0, - @ProtoId(8) @JvmField val buttonSrc: String = "", - @ProtoId(9) @JvmField val backgroundSrc: String = "", - @ProtoId(10) @JvmField val attendeeInfo: String = "", - @ProtoId(11) @JvmField val index: Int = 0, - @ProtoId(12) @JvmField val publishScope: Int = 0, - @ProtoId(13) @JvmField val effectiveTime: Int = 0, - @ProtoId(14) @JvmField val expiationTime: Int = 0, - @ProtoId(15) @JvmField val pushedUsrCount: Int = 0, - @ProtoId(16) @JvmField val timerangeLeft: Int = 0, - @ProtoId(17) @JvmField val timerangeRight: Int = 0, - @ProtoId(18) @JvmField val area: String = "" + @ProtoNumber(1) @JvmField val topicId: Long = 0L, + @ProtoNumber(2) @JvmField val topic: String = "", + @ProtoNumber(3) @JvmField val foreword: String = "", + @ProtoNumber(4) @JvmField val createTime: Int = 0, + @ProtoNumber(5) @JvmField val updateTime: Int = 0, + @ProtoNumber(6) @JvmField val hotFlag: Int = 0, + @ProtoNumber(7) @JvmField val buttonStyle: Int = 0, + @ProtoNumber(8) @JvmField val buttonSrc: String = "", + @ProtoNumber(9) @JvmField val backgroundSrc: String = "", + @ProtoNumber(10) @JvmField val attendeeInfo: String = "", + @ProtoNumber(11) @JvmField val index: Int = 0, + @ProtoNumber(12) @JvmField val publishScope: Int = 0, + @ProtoNumber(13) @JvmField val effectiveTime: Int = 0, + @ProtoNumber(14) @JvmField val expiationTime: Int = 0, + @ProtoNumber(15) @JvmField val pushedUsrCount: Int = 0, + @ProtoNumber(16) @JvmField val timerangeLeft: Int = 0, + @ProtoNumber(17) @JvmField val timerangeRight: Int = 0, + @ProtoNumber(18) @JvmField val area: String = "" ) : ProtoBuf @Serializable internal class NearbyEvent( - @ProtoId(1) @JvmField val eventtype: Int = 0, - @ProtoId(2) @JvmField val msgRankevent: RankEvent? = null, - @ProtoId(3) @JvmField val eventUin: Long = 0L, - @ProtoId(4) @JvmField val eventTinyid: Long = 0L + @ProtoNumber(1) @JvmField val eventtype: Int = 0, + @ProtoNumber(2) @JvmField val msgRankevent: RankEvent? = null, + @ProtoNumber(3) @JvmField val eventUin: Long = 0L, + @ProtoNumber(4) @JvmField val eventTinyid: Long = 0L ) : ProtoBuf @Serializable internal class Feed( - @ProtoId(1) @JvmField val msgUserInfo: PublisherInfo? = null, - @ProtoId(2) @JvmField val msgFeedInfo: FeedInfo? = null, - @ProtoId(3) @JvmField val ownerFlag: Int = 0 + @ProtoNumber(1) @JvmField val msgUserInfo: PublisherInfo? = null, + @ProtoNumber(2) @JvmField val msgFeedInfo: FeedInfo? = null, + @ProtoNumber(3) @JvmField val ownerFlag: Int = 0 ) : ProtoBuf @Serializable internal class ActivityInfo( - @ProtoId(2) @JvmField val name: String = "", - @ProtoId(3) @JvmField val cover: String = "", - @ProtoId(4) @JvmField val url: String = "", - @ProtoId(5) @JvmField val startTime: Int = 0, - @ProtoId(6) @JvmField val endTime: Int = 0, - @ProtoId(7) @JvmField val locName: String = "", - @ProtoId(8) @JvmField val enroll: Long = 0L, - @ProtoId(9) @JvmField val createUin: Long = 0L, - @ProtoId(10) @JvmField val createTime: Int = 0, - @ProtoId(11) @JvmField val organizerInfo: OrganizerInfo = OrganizerInfo(), - @ProtoId(12) @JvmField val flag: Long? = null + @ProtoNumber(2) @JvmField val name: String = "", + @ProtoNumber(3) @JvmField val cover: String = "", + @ProtoNumber(4) @JvmField val url: String = "", + @ProtoNumber(5) @JvmField val startTime: Int = 0, + @ProtoNumber(6) @JvmField val endTime: Int = 0, + @ProtoNumber(7) @JvmField val locName: String = "", + @ProtoNumber(8) @JvmField val enroll: Long = 0L, + @ProtoNumber(9) @JvmField val createUin: Long = 0L, + @ProtoNumber(10) @JvmField val createTime: Int = 0, + @ProtoNumber(11) @JvmField val organizerInfo: OrganizerInfo = OrganizerInfo(), + @ProtoNumber(12) @JvmField val flag: Long? = null ) : ProtoBuf @Serializable internal class HotEntry( - @ProtoId(1) @JvmField val openFlag: Int = 0, - @ProtoId(2) @JvmField val restTime: Int = 0, - @ProtoId(3) @JvmField val foreword: String = "", - @ProtoId(4) @JvmField val backgroundSrc: String = "" + @ProtoNumber(1) @JvmField val openFlag: Int = 0, + @ProtoNumber(2) @JvmField val restTime: Int = 0, + @ProtoNumber(3) @JvmField val foreword: String = "", + @ProtoNumber(4) @JvmField val backgroundSrc: String = "" ) : ProtoBuf @Serializable internal class UserFeed( - @ProtoId(1) @JvmField val msgUserInfo: PublisherInfo? = null, - @ProtoId(2) @JvmField val msgFeedInfo: FeedInfo? = null, - @ProtoId(3) @JvmField val ownerFlag: Int = 0, - @ProtoId(4) @JvmField val msgActivityInfo: ActivityInfo? = null + @ProtoNumber(1) @JvmField val msgUserInfo: PublisherInfo? = null, + @ProtoNumber(2) @JvmField val msgFeedInfo: FeedInfo? = null, + @ProtoNumber(3) @JvmField val ownerFlag: Int = 0, + @ProtoNumber(4) @JvmField val msgActivityInfo: ActivityInfo? = null ) : ProtoBuf @Serializable internal class Elem( - @ProtoId(1) @JvmField val content: String = "", - @ProtoId(2) @JvmField val msgFaceInfo: Face? = null + @ProtoNumber(1) @JvmField val content: String = "", + @ProtoNumber(2) @JvmField val msgFaceInfo: Face? = null ) : ProtoBuf @Serializable internal class HotFreshFeedList( - @ProtoId(1) @JvmField val msgFeeds: List? = null, - @ProtoId(2) @JvmField val updateTime: Int = 0 + @ProtoNumber(1) @JvmField val msgFeeds: List? = null, + @ProtoNumber(2) @JvmField val updateTime: Int = 0 ) : ProtoBuf @Serializable internal class RptInterestTag( - @ProtoId(1) @JvmField val interestTags: List? = null + @ProtoNumber(1) @JvmField val interestTags: List? = null ) : ProtoBuf @Serializable internal class AddressInfo( - @ProtoId(1) @JvmField val companyZone: String = "", - @ProtoId(2) @JvmField val companyName: String = "", - @ProtoId(3) @JvmField val companyAddr: String = "", - @ProtoId(4) @JvmField val companyPicUrl: String = "", - @ProtoId(5) @JvmField val companyUrl: String = "", - @ProtoId(6) @JvmField val msgCompanyId: ShopID? = null + @ProtoNumber(1) @JvmField val companyZone: String = "", + @ProtoNumber(2) @JvmField val companyName: String = "", + @ProtoNumber(3) @JvmField val companyAddr: String = "", + @ProtoNumber(4) @JvmField val companyPicUrl: String = "", + @ProtoNumber(5) @JvmField val companyUrl: String = "", + @ProtoNumber(6) @JvmField val msgCompanyId: ShopID? = null ) : ProtoBuf @Serializable internal class PublisherInfo( - @ProtoId(1) @JvmField val tinyid: Long = 0L, - @ProtoId(2) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) @JvmField val age: Int = 0, - @ProtoId(4) @JvmField val gender: Int = 0, - @ProtoId(5) @JvmField val constellation: String = "", - @ProtoId(6) @JvmField val profession: Int = 0, - @ProtoId(7) @JvmField val distance: String = "", - @ProtoId(8) @JvmField val marriage: Int = 0, - @ProtoId(9) @JvmField val vipinfo: String = "", - @ProtoId(10) @JvmField val recommend: Int = 0, - @ProtoId(11) @JvmField val godflag: Int = 0, - @ProtoId(12) @JvmField val chatflag: Int = 0, - @ProtoId(13) @JvmField val chatupCount: Int = 0, - @ProtoId(14) @JvmField val charm: Int = 0, - @ProtoId(15) @JvmField val charmLevel: Int = 0, - @ProtoId(16) @JvmField val pubNumber: Int = 0, - @ProtoId(17) @JvmField val msgCommonLabel: CommonLabel? = null, - @ProtoId(18) @JvmField val recentVistorTime: Int = 0, - @ProtoId(19) @JvmField val strangerDeclare: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(20) @JvmField val friendUin: Long = 0L, - @ProtoId(21) @JvmField val historyFlag: Int = 0, - @ProtoId(22) @JvmField val followflag: Long = 0L + @ProtoNumber(1) @JvmField val tinyid: Long = 0L, + @ProtoNumber(2) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(3) @JvmField val age: Int = 0, + @ProtoNumber(4) @JvmField val gender: Int = 0, + @ProtoNumber(5) @JvmField val constellation: String = "", + @ProtoNumber(6) @JvmField val profession: Int = 0, + @ProtoNumber(7) @JvmField val distance: String = "", + @ProtoNumber(8) @JvmField val marriage: Int = 0, + @ProtoNumber(9) @JvmField val vipinfo: String = "", + @ProtoNumber(10) @JvmField val recommend: Int = 0, + @ProtoNumber(11) @JvmField val godflag: Int = 0, + @ProtoNumber(12) @JvmField val chatflag: Int = 0, + @ProtoNumber(13) @JvmField val chatupCount: Int = 0, + @ProtoNumber(14) @JvmField val charm: Int = 0, + @ProtoNumber(15) @JvmField val charmLevel: Int = 0, + @ProtoNumber(16) @JvmField val pubNumber: Int = 0, + @ProtoNumber(17) @JvmField val msgCommonLabel: CommonLabel? = null, + @ProtoNumber(18) @JvmField val recentVistorTime: Int = 0, + @ProtoNumber(19) @JvmField val strangerDeclare: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(20) @JvmField val friendUin: Long = 0L, + @ProtoNumber(21) @JvmField val historyFlag: Int = 0, + @ProtoNumber(22) @JvmField val followflag: Long = 0L ) : ProtoBuf @Serializable internal class HotUserFeed( - @ProtoId(1) @JvmField val feedId: String = "", - @ProtoId(2) @JvmField val praiseCount: Int = 0, - @ProtoId(3) @JvmField val publishUid: Long = 0L, - @ProtoId(4) @JvmField val publishTime: Int = 0 + @ProtoNumber(1) @JvmField val feedId: String = "", + @ProtoNumber(2) @JvmField val praiseCount: Int = 0, + @ProtoNumber(3) @JvmField val publishUid: Long = 0L, + @ProtoNumber(4) @JvmField val publishTime: Int = 0 ) : ProtoBuf @Serializable internal class FreshFeedInfo( - @ProtoId(1) @JvmField val uin: Long = 0L, - @ProtoId(2) @JvmField val time: Int = 0, - @ProtoId(3) @JvmField val feedId: String = "", - @ProtoId(4) @JvmField val feedType: Long = 0L + @ProtoNumber(1) @JvmField val uin: Long = 0L, + @ProtoNumber(2) @JvmField val time: Int = 0, + @ProtoNumber(3) @JvmField val feedId: String = "", + @ProtoNumber(4) @JvmField val feedType: Long = 0L ) : ProtoBuf @Serializable internal class CommonLabel( - @ProtoId(1) @JvmField val lableId: Int = 0, - @ProtoId(2) @JvmField val lableMsgPre: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) @JvmField val lableMsgLast: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) @JvmField val interstName: List? = null, - @ProtoId(5) @JvmField val interstType: List? = null + @ProtoNumber(1) @JvmField val lableId: Int = 0, + @ProtoNumber(2) @JvmField val lableMsgPre: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(3) @JvmField val lableMsgLast: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(4) @JvmField val interstName: List? = null, + @ProtoNumber(5) @JvmField val interstType: List? = null ) : ProtoBuf @Serializable internal class Face( - @ProtoId(1) @JvmField val index: Int = 0 + @ProtoNumber(1) @JvmField val index: Int = 0 ) : ProtoBuf @Serializable internal class StrangerInfo( - @ProtoId(1) @JvmField val tinyid: Long = 0L, - @ProtoId(2) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) @JvmField val age: Int = 0, - @ProtoId(4) @JvmField val gender: Int = 0, - @ProtoId(5) @JvmField val dating: Int = 0, - @ProtoId(6) @JvmField val listIdx: Int = 0, - @ProtoId(7) @JvmField val constellation: String = "", - @ProtoId(8) @JvmField val profession: Int = 0, - @ProtoId(9) @JvmField val marriage: Int = 0, - @ProtoId(10) @JvmField val vipinfo: String = "", - @ProtoId(11) @JvmField val recommend: Int = 0, - @ProtoId(12) @JvmField val godflag: Int = 0, - @ProtoId(13) @JvmField val charm: Int = 0, - @ProtoId(14) @JvmField val charmLevel: Int = 0, - @ProtoId(15) @JvmField val uin: Long = 0L + @ProtoNumber(1) @JvmField val tinyid: Long = 0L, + @ProtoNumber(2) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(3) @JvmField val age: Int = 0, + @ProtoNumber(4) @JvmField val gender: Int = 0, + @ProtoNumber(5) @JvmField val dating: Int = 0, + @ProtoNumber(6) @JvmField val listIdx: Int = 0, + @ProtoNumber(7) @JvmField val constellation: String = "", + @ProtoNumber(8) @JvmField val profession: Int = 0, + @ProtoNumber(9) @JvmField val marriage: Int = 0, + @ProtoNumber(10) @JvmField val vipinfo: String = "", + @ProtoNumber(11) @JvmField val recommend: Int = 0, + @ProtoNumber(12) @JvmField val godflag: Int = 0, + @ProtoNumber(13) @JvmField val charm: Int = 0, + @ProtoNumber(14) @JvmField val charmLevel: Int = 0, + @ProtoNumber(15) @JvmField val uin: Long = 0L ) : ProtoBuf @Serializable internal class HotTopic( - @ProtoId(1) @JvmField val id: Long = 0L, - @ProtoId(2) @JvmField val title: String = "", - @ProtoId(3) @JvmField val topicType: Long = 0L, - @ProtoId(4) @JvmField val total: Long = 0L, - @ProtoId(5) @JvmField val times: Long = 0L, - @ProtoId(6) @JvmField val historyTimes: Long = 0L, - @ProtoId(7) @JvmField val bgUrl: String = "", - @ProtoId(8) @JvmField val url: String = "", - @ProtoId(9) @JvmField val extraInfo: String = "" + @ProtoNumber(1) @JvmField val id: Long = 0L, + @ProtoNumber(2) @JvmField val title: String = "", + @ProtoNumber(3) @JvmField val topicType: Long = 0L, + @ProtoNumber(4) @JvmField val total: Long = 0L, + @ProtoNumber(5) @JvmField val times: Long = 0L, + @ProtoNumber(6) @JvmField val historyTimes: Long = 0L, + @ProtoNumber(7) @JvmField val bgUrl: String = "", + @ProtoNumber(8) @JvmField val url: String = "", + @ProtoNumber(9) @JvmField val extraInfo: String = "" ) : ProtoBuf @Serializable internal class DateEvent( - @ProtoId(1) @JvmField val eventId: Long = 0L, - @ProtoId(2) @JvmField val time: Int = 0, - @ProtoId(3) @JvmField val type: Int = 0, - @ProtoId(4) @JvmField val msgUserInfo: StrangerInfo? = null, - @ProtoId(5) @JvmField val msgDateInfo: AppointInfo? = null, - @ProtoId(6) @JvmField val attendIdx: Int = 0, - @ProtoId(7) @JvmField val eventTips: String = "", - @ProtoId(8) @JvmField val msgComment: DateComment? = null, - @ProtoId(9) @JvmField val cancelEventId: Long = 0L + @ProtoNumber(1) @JvmField val eventId: Long = 0L, + @ProtoNumber(2) @JvmField val time: Int = 0, + @ProtoNumber(3) @JvmField val type: Int = 0, + @ProtoNumber(4) @JvmField val msgUserInfo: StrangerInfo? = null, + @ProtoNumber(5) @JvmField val msgDateInfo: AppointInfo? = null, + @ProtoNumber(6) @JvmField val attendIdx: Int = 0, + @ProtoNumber(7) @JvmField val eventTips: String = "", + @ProtoNumber(8) @JvmField val msgComment: DateComment? = null, + @ProtoNumber(9) @JvmField val cancelEventId: Long = 0L ) : ProtoBuf @Serializable internal class AppointInfo( - @ProtoId(1) @JvmField val msgAppointId: AppointID? = null, - @ProtoId(2) @JvmField val msgAppointment: AppointContent? = null, - @ProtoId(3) @JvmField val appointStatus: Int = 0, - @ProtoId(4) @JvmField val joinWording: String = "", - @ProtoId(5) @JvmField val viewWording: String = "", - @ProtoId(6) @JvmField val unreadCount: Int = 0, - @ProtoId(7) @JvmField val owner: Int = 0, - @ProtoId(8) @JvmField val join: Int = 0, - @ProtoId(9) @JvmField val view: Int = 0, - @ProtoId(10) @JvmField val commentWording: String = "", - @ProtoId(11) @JvmField val commentNum: Int = 0, - @ProtoId(12) @JvmField val attendStatus: Int = 0, - @ProtoId(13) @JvmField val msgAppointmentEx: AppointInfoEx? = null + @ProtoNumber(1) @JvmField val msgAppointId: AppointID? = null, + @ProtoNumber(2) @JvmField val msgAppointment: AppointContent? = null, + @ProtoNumber(3) @JvmField val appointStatus: Int = 0, + @ProtoNumber(4) @JvmField val joinWording: String = "", + @ProtoNumber(5) @JvmField val viewWording: String = "", + @ProtoNumber(6) @JvmField val unreadCount: Int = 0, + @ProtoNumber(7) @JvmField val owner: Int = 0, + @ProtoNumber(8) @JvmField val join: Int = 0, + @ProtoNumber(9) @JvmField val view: Int = 0, + @ProtoNumber(10) @JvmField val commentWording: String = "", + @ProtoNumber(11) @JvmField val commentNum: Int = 0, + @ProtoNumber(12) @JvmField val attendStatus: Int = 0, + @ProtoNumber(13) @JvmField val msgAppointmentEx: AppointInfoEx? = null ) : ProtoBuf @Serializable internal class UserInfo( - @ProtoId(1) @JvmField val uin: Long = 0L, - @ProtoId(2) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(3) @JvmField val age: Int = 0, - @ProtoId(4) @JvmField val gender: Int = 0, - @ProtoId(5) @JvmField val avatar: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val uin: Long = 0L, + @ProtoNumber(2) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(3) @JvmField val age: Int = 0, + @ProtoNumber(4) @JvmField val gender: Int = 0, + @ProtoNumber(5) @JvmField val avatar: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class ReplyInfo( - @ProtoId(1) @JvmField val commentId: String = "", - @ProtoId(2) @JvmField val msgStrangerInfo: StrangerInfo? = null + @ProtoNumber(1) @JvmField val commentId: String = "", + @ProtoNumber(2) @JvmField val msgStrangerInfo: StrangerInfo? = null ) : ProtoBuf } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/FriendListCommon.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/FriendListCommon.kt index 9c2b47df7..42ba5954d 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/FriendListCommon.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/FriendListCommon.kt @@ -3,7 +3,7 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId +import kotlinx.serialization.protobuf.ProtoNumber import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf import kotlin.jvm.JvmField @@ -12,40 +12,40 @@ import kotlin.jvm.JvmField internal class Vec0xd50 : ProtoBuf { @Serializable internal class ExtSnsFrdData( - @ProtoId(1) @JvmField val frdUin: Long = 0L, - @ProtoId(91001) @JvmField val musicSwitch: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(101001) @JvmField val mutualmarkAlienation: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(141001) @JvmField val mutualmarkScore: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(151001) @JvmField val ksingSwitch: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(181001) @JvmField val lbsShare: ByteArray = EMPTY_BYTE_ARRAY + @ProtoNumber(1) @JvmField val frdUin: Long = 0L, + @ProtoNumber(91001) @JvmField val musicSwitch: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(101001) @JvmField val mutualmarkAlienation: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(141001) @JvmField val mutualmarkScore: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(151001) @JvmField val ksingSwitch: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(181001) @JvmField val lbsShare: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class RspBody( - @ProtoId(1) @JvmField val msgUpdateData: List? = null, - @ProtoId(11) @JvmField val over: Int = 0, - @ProtoId(12) @JvmField val nextStart: Int = 0, - @ProtoId(13) @JvmField val uint64UnfinishedUins: List? = null + @ProtoNumber(1) @JvmField val msgUpdateData: List? = null, + @ProtoNumber(11) @JvmField val over: Int = 0, + @ProtoNumber(12) @JvmField val nextStart: Int = 0, + @ProtoNumber(13) @JvmField val uint64UnfinishedUins: List? = null ) : ProtoBuf @Serializable internal class ReqBody( - @ProtoId(1) @JvmField val appid: Long = 0L, - @ProtoId(2) @JvmField val maxPkgSize: Int = 0, - @ProtoId(3) @JvmField val startTime: Int = 0, - @ProtoId(4) @JvmField val startIndex: Int = 0, - @ProtoId(5) @JvmField val reqNum: Int = 0, - @ProtoId(6) @JvmField val uinList: List? = null, - @ProtoId(91001) @JvmField val reqMusicSwitch: Int = 0, - @ProtoId(101001) @JvmField val reqMutualmarkAlienation: Int = 0, - @ProtoId(141001) @JvmField val reqMutualmarkScore: Int = 0, - @ProtoId(151001) @JvmField val reqKsingSwitch: Int = 0, - @ProtoId(181001) @JvmField val reqMutualmarkLbsshare: Int = 0 + @ProtoNumber(1) @JvmField val appid: Long = 0L, + @ProtoNumber(2) @JvmField val maxPkgSize: Int = 0, + @ProtoNumber(3) @JvmField val startTime: Int = 0, + @ProtoNumber(4) @JvmField val startIndex: Int = 0, + @ProtoNumber(5) @JvmField val reqNum: Int = 0, + @ProtoNumber(6) @JvmField val uinList: List? = null, + @ProtoNumber(91001) @JvmField val reqMusicSwitch: Int = 0, + @ProtoNumber(101001) @JvmField val reqMutualmarkAlienation: Int = 0, + @ProtoNumber(141001) @JvmField val reqMutualmarkScore: Int = 0, + @ProtoNumber(151001) @JvmField val reqKsingSwitch: Int = 0, + @ProtoNumber(181001) @JvmField val reqMutualmarkLbsshare: Int = 0 ) : ProtoBuf @Serializable internal class KSingRelationInfo( - @ProtoId(1) @JvmField val flag: Int = 0 + @ProtoNumber(1) @JvmField val flag: Int = 0 ) : ProtoBuf } @@ -53,21 +53,21 @@ internal class Vec0xd50 : ProtoBuf { internal class Vec0xd6b : ProtoBuf { @Serializable internal class ReqBody( - @ProtoId(1) @JvmField val maxPkgSize: Int = 0, - @ProtoId(2) @JvmField val startTime: Int = 0, - @ProtoId(11) @JvmField val uinList: List? = null + @ProtoNumber(1) @JvmField val maxPkgSize: Int = 0, + @ProtoNumber(2) @JvmField val startTime: Int = 0, + @ProtoNumber(11) @JvmField val uinList: List? = null ) : ProtoBuf @Serializable internal class RspBody( - @ProtoId(11) @JvmField val msgMutualmarkData: List? = null, - @ProtoId(12) @JvmField val uint64UnfinishedUins: List? = null + @ProtoNumber(11) @JvmField val msgMutualmarkData: List? = null, + @ProtoNumber(12) @JvmField val uint64UnfinishedUins: List? = null ) : ProtoBuf @Serializable internal class MutualMarkData( - @ProtoId(1) @JvmField val frdUin: Long = 0L, - @ProtoId(2) @JvmField val result: Int = 0 + @ProtoNumber(1) @JvmField val frdUin: Long = 0L, + @ProtoNumber(2) @JvmField val result: Int = 0 // @SerialId(11) @JvmField val mutualmarkInfo: List? = null ) : ProtoBuf } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Group.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Group.kt index e91ac1bf1..5e1affba7 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Group.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Group.kt @@ -1,7 +1,7 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto import kotlinx.serialization.Serializable -import kotlinx.serialization.protobuf.ProtoId +import kotlinx.serialization.protobuf.ProtoNumber import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf import kotlin.jvm.JvmField @@ -10,51 +10,51 @@ import kotlin.jvm.JvmField internal class GroupLabel : ProtoBuf { @Serializable internal class Label( - @ProtoId(1) @JvmField val name: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) @JvmField val enumType: Int /* enum */ = 1, - @ProtoId(3) @JvmField val textColor: Color? = null, - @ProtoId(4) @JvmField val edgingColor: Color? = null, - @ProtoId(5) @JvmField val labelAttr: Int = 0, - @ProtoId(6) @JvmField val labelType: Int = 0 + @ProtoNumber(1) @JvmField val name: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(2) @JvmField val enumType: Int /* enum */ = 1, + @ProtoNumber(3) @JvmField val textColor: Color? = null, + @ProtoNumber(4) @JvmField val edgingColor: Color? = null, + @ProtoNumber(5) @JvmField val labelAttr: Int = 0, + @ProtoNumber(6) @JvmField val labelType: Int = 0 ) : ProtoBuf @Serializable internal class RspBody( - @ProtoId(1) @JvmField val error: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(2) @JvmField val groupInfo: List? = null + @ProtoNumber(1) @JvmField val error: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoNumber(2) @JvmField val groupInfo: List? = null ) : ProtoBuf @Serializable internal class SourceId( - @ProtoId(1) @JvmField val sourceId: Int = 0 + @ProtoNumber(1) @JvmField val sourceId: Int = 0 ) : ProtoBuf @Serializable internal class GroupInfo( - @ProtoId(1) @JvmField val int32Result: Int = 0, - @ProtoId(2) @JvmField val groupCode: Long = 0L, - @ProtoId(3) @JvmField val groupLabel: List