Optimize useless getters, fix #236

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt

@@ -13,169 +13,170 @@ import kotlinx.serialization.Serializable
 import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
 import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
+import kotlin.jvm.JvmField
 
 @Serializable
 internal class BigDataChannel(
-    @JceId(0) val vBigdataIplists: List<BigDataIpList>,
-    @JceId(1) val sBigdataSigSession: ByteArray? = null,
-    @JceId(2) val sBigdataKeySession: ByteArray? = null,
-    @JceId(3) val uSigUin: Long? = null,
-    @JceId(4) val iConnectFlag: Int? = 1,
-    @JceId(5) val vBigdataPbBuf: ByteArray? = null
+    @JceId(0) @JvmField val vBigdataIplists: List<BigDataIpList>,
+    @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
 ) : JceStruct
 
 @Serializable
 internal class BigDataIpInfo(
-    @JceId(0) val uType: Long,
-    @JceId(1) val sIp: String = "",
-    @JceId(2) val uPort: Long
+    @JceId(0) @JvmField val uType: Long,
+    @JceId(1) @JvmField val sIp: String = "",
+    @JceId(2) @JvmField val uPort: Long
 ) : JceStruct
 
 @Serializable
 internal class BigDataIpList(
-    @JceId(0) val uServiceType: Long,
-    @JceId(1) val vIplist: List<BigDataIpInfo>,
-    @JceId(2) val netSegConfs: List<NetSegConf>? = null,
-    @JceId(3) val ufragmentSize: Long? = null
+    @JceId(0) @JvmField val uServiceType: Long,
+    @JceId(1) @JvmField val vIplist: List<BigDataIpInfo>,
+    @JceId(2) @JvmField val netSegConfs: List<NetSegConf>? = null,
+    @JceId(3) @JvmField val ufragmentSize: Long? = null
 ) : JceStruct
 
 @Serializable
 internal class ClientLogConfig(
-    @JceId(1) val type: Int,
-    @JceId(2) val timeStart: TimeStamp? = null,
-    @JceId(3) val timeFinish: TimeStamp? = null,
-    @JceId(4) val loglevel: Byte? = null,
-    @JceId(5) val cookie: Int? = null,
-    @JceId(6) val lseq: Long? = null
+    @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
 ) : JceStruct
 
 @Serializable
 internal class DomainIpChannel(
-    @JceId(0) val vDomainIplists: List<DomainIpList>
+    @JceId(0) @JvmField val vDomainIplists: List<DomainIpList>
 ) : JceStruct
 
 @Serializable
 internal class DomainIpInfo(
-    @JceId(1) val uIp: Int,
-    @JceId(2) val uPort: Int
+    @JceId(1) @JvmField val uIp: Int,
+    @JceId(2) @JvmField val uPort: Int
 ) : JceStruct
 
 @Serializable
 internal class DomainIpList(
-    @JceId(0) val uDomainType: Int,
-    @JceId(1) val vIplist: List<DomainIpInfo>,
-    @JceId(2) val unknown: ByteArray? = null,
-    @JceId(4) val int: Int? = null// added
+    @JceId(0) @JvmField val uDomainType: Int,
+    @JceId(1) @JvmField val vIplist: List<DomainIpInfo>,
+    @JceId(2) @JvmField val unknown: ByteArray? = null,
+    @JceId(4) @JvmField val int: Int? = null// added
 ) : JceStruct
 
 @Serializable
 internal class _340(
-    @JceId(1) val field1315: List<_339>,
-    @JceId(3) val field1316: List<_339>,
-    @JceId(4) val field1317: Int,
-    @JceId(5) val field1318: Byte? = 0,
-    @JceId(6) val field1319: Byte? = 0,
-    @JceId(7) val field1320: Int? = 1,
-    @JceId(8) val field1321: List<_339>? = null,
-    @JceId(9) val field1322: List<_339>? = null,
-    @JceId(10) val field1323: List<_339>? = null,
-    @JceId(11) val field1324: List<_339>? = null,
-    @JceId(12) val field1325: List<_339>? = null,
-    @JceId(13) val field1326: List<_339>? = null,
-    @JceId(14) val netType: Byte? = 0,
-    @JceId(15) val heThreshold: Int? = 0,
-    @JceId(16) val policyId: String? = ""
+    @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? = ""
 ) : JceStruct
 
 @Serializable
 internal class _339(
-    @JceId(1) val field1298: String = "",
-    @JceId(2) val field1299: Int = 0,
-    @JceId(3) val field1300: Byte = 0,
-    @JceId(4) val field1301: Byte = 0,
-    @JceId(5) val field1302: Byte? = 0,
-    @JceId(6) val field1303: Int? = 8,
-    @JceId(7) val field1304: Byte? = 0,
-    @JceId(8) val field1305: String = "",
-    @JceId(9) val field1306: String = ""
+    @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 = ""
 ) : JceStruct
 
 @Serializable
 internal class FileStoragePushFSSvcListFuckKotlin(
-    @JceId(0) val vUpLoadList: List<FileStorageServerListInfo>? = listOf(),
-    @JceId(1) val vPicDownLoadList: List<FileStorageServerListInfo>? = listOf(),
-    @JceId(2) val vGPicDownLoadList: List<FileStorageServerListInfo>? = null,
-    @JceId(3) val vQzoneProxyServiceList: List<FileStorageServerListInfo>? = null,
-    @JceId(4) val vUrlEncodeServiceList: List<FileStorageServerListInfo>? = null,
-    @JceId(5) val bigDataChannel: BigDataChannel? = null,
-    @JceId(6) val vVipEmotionList: List<FileStorageServerListInfo>? = null,
-    @JceId(7) val vC2CPicDownList: List<FileStorageServerListInfo>? = null,
-    @JceId(8) val fmtIPInfo: FmtIPInfo? = null,
-    @JceId(9) val domainIpChannel: DomainIpChannel? = null,
-    @JceId(10) val pttlist: ByteArray? = null
+    @JceId(0) @JvmField val vUpLoadList: List<FileStorageServerListInfo>? = listOf(),
+    @JceId(1) @JvmField val vPicDownLoadList: List<FileStorageServerListInfo>? = listOf(),
+    @JceId(2) @JvmField val vGPicDownLoadList: List<FileStorageServerListInfo>? = null,
+    @JceId(3) @JvmField val vQzoneProxyServiceList: List<FileStorageServerListInfo>? = null,
+    @JceId(4) @JvmField val vUrlEncodeServiceList: List<FileStorageServerListInfo>? = null,
+    @JceId(5) @JvmField val bigDataChannel: BigDataChannel? = null,
+    @JceId(6) @JvmField val vVipEmotionList: List<FileStorageServerListInfo>? = null,
+    @JceId(7) @JvmField val vC2CPicDownList: List<FileStorageServerListInfo>? = null,
+    @JceId(8) @JvmField val fmtIPInfo: FmtIPInfo? = null,
+    @JceId(9) @JvmField val domainIpChannel: DomainIpChannel? = null,
+    @JceId(10) @JvmField val pttlist: ByteArray? = null
 ) : JceStruct
 
 @Serializable
 internal class FileStorageServerListInfo(
-    @JceId(1) val sIP: String = "",
-    @JceId(2) val iPort: Int
+    @JceId(1) @JvmField val sIP: String = "",
+    @JceId(2) @JvmField val iPort: Int
 ) : JceStruct
 
 @Serializable
 internal class FmtIPInfo(
-    @JceId(0) val sGateIp: String = "",
-    @JceId(1) val iGateIpOper: Long
+    @JceId(0) @JvmField val sGateIp: String = "",
+    @JceId(1) @JvmField val iGateIpOper: Long
 ) : JceStruct
 
 @Serializable
 internal class NetSegConf(
-    @JceId(0) val uint32NetType: Long? = null,
-    @JceId(1) val uint32Segsize: Long? = null,
-    @JceId(2) val uint32Segnum: Long? = null,
-    @JceId(3) val uint32Curconnnum: Long? = null
+    @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
 ) : JceStruct
 
 @Suppress("ArrayInDataClass")
 @Serializable
 internal class PushReq(
-    @JceId(1) val type: Int,
-    @JceId(2) val jcebuf: ByteArray,
-    @JceId(3) val seq: Long
+    @JceId(1) @JvmField val type: Int,
+    @JceId(2) @JvmField val jcebuf: ByteArray,
+    @JceId(3) @JvmField val seq: Long
 ) : JceStruct, Packet
 
 @Serializable
 internal class PushResp(
-    @JceId(1) val type: Int,
-    @JceId(2) val seq: Long,
-    @JceId(3) val jcebuf: ByteArray? = null
+    @JceId(1) @JvmField val type: Int,
+    @JceId(2) @JvmField val seq: Long,
+    @JceId(3) @JvmField val jcebuf: ByteArray? = null
 ) : JceStruct
 
 @Serializable
 internal class SsoServerList(
-    @JceId(1) val v2G3GList: List<SsoServerListInfo>,
-    @JceId(3) val vWifiList: List<SsoServerListInfo>,
-    @JceId(4) val iReconnect: Int,
-    @JceId(5) val testSpeed: Byte? = null,
-    @JceId(6) val useNewList: Byte? = null,
-    @JceId(7) val iMultiConn: Int? = 1,
-    @JceId(8) val vHttp2g3glist: List<SsoServerListInfo>? = null,
-    @JceId(9) val vHttpWifilist: List<SsoServerListInfo>? = null
+    @JceId(1) @JvmField val v2G3GList: List<SsoServerListInfo>,
+    @JceId(3) @JvmField val vWifiList: List<SsoServerListInfo>,
+    @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<SsoServerListInfo>? = null,
+    @JceId(9) @JvmField val vHttpWifilist: List<SsoServerListInfo>? = null
 ) : JceStruct
 
 @Serializable
 internal class SsoServerListInfo(
-    @JceId(1) val sIP: String = "",
-    @JceId(2) val iPort: Int,
-    @JceId(3) val linkType: Byte,
-    @JceId(4) val proxy: Byte,
-    @JceId(5) val protocolType: Byte? = null,
-    @JceId(6) val iTimeOut: Int? = 10
+    @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
 ) : JceStruct
 
 @Serializable
 internal class TimeStamp(
-    @JceId(1) val year: Int,
-    @JceId(2) val month: Byte,
-    @JceId(3) val day: Byte,
-    @JceId(4) val hour: Byte
+    @JceId(1) @JvmField val year: Int,
+    @JceId(2) @JvmField val month: Byte,
+    @JceId(3) @JvmField val day: Byte,
+    @JceId(4) @JvmField val hour: Byte
 ) : JceStruct

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt

@@ -12,172 +12,173 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 import kotlinx.serialization.Serializable
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
 import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
+import kotlin.jvm.JvmField
 
 @Serializable
 internal class ModifyGroupCardReq(
-    @JceId(0) val dwZero: Long,
-    @JceId(1) val dwGroupCode: Long,
-    @JceId(2) val dwNewSeq: Long,
-    @JceId(3) val vecUinInfo: List<stUinInfo>
+    @JceId(0) @JvmField val dwZero: Long,
+    @JceId(1) @JvmField val dwGroupCode: Long,
+    @JceId(2) @JvmField val dwNewSeq: Long,
+    @JceId(3) @JvmField val vecUinInfo: List<stUinInfo>
 ) : JceStruct
 
 @Serializable
 internal class stUinInfo(
-    @JceId(0) val dwuin: Long,
-    @JceId(1) val dwFlag: Long,
-    @JceId(2) val sName: String = "",
-    @JceId(3) val gender: Byte,
-    @JceId(4) val sPhone: String = "",
-    @JceId(5) val sEmail: String = "",
-    @JceId(6) val sRemark: String = ""
+    @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 = ""
 ) : JceStruct
 
 @Serializable
 internal class GetFriendListReq(
-    @JceId(0) val reqtype: Int? = null,
-    @JceId(1) val ifReflush: Byte? = null,
-    @JceId(2) val uin: Long? = null,
-    @JceId(3) val startIndex: Short? = null,
-    @JceId(4) val getfriendCount: Short? = null,
-    @JceId(5) val groupid: Byte? = null,
-    @JceId(6) val ifGetGroupInfo: Byte? = null,
-    @JceId(7) val groupstartIndex: Byte? = null,
-    @JceId(8) val getgroupCount: Byte? = null,
-    @JceId(9) val ifGetMSFGroup: Byte? = null,
-    @JceId(10) val ifShowTermType: Byte? = null,
-    @JceId(11) val version: Long? = null,
-    @JceId(12) val uinList: List<Long>? = null,
-    @JceId(13) val eAppType: Int = 0,
-    @JceId(14) val ifGetDOVId: Byte? = null,
-    @JceId(15) val ifGetBothFlag: Byte? = null,
-    @JceId(16) val vec0xd50Req: ByteArray? = null,
-    @JceId(17) val vec0xd6bReq: ByteArray? = null,
-    @JceId(18) val vecSnsTypelist: List<Long>? = null
+    @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<Long>? = 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<Long>? = null
 ) : JceStruct
 
 
 @Serializable
 internal class GetFriendListResp(
-    @JceId(0) val reqtype: Int,
-    @JceId(1) val ifReflush: Byte,
-    @JceId(2) val uin: Long,
-    @JceId(3) val startIndex: Short,
-    @JceId(4) val getfriendCount: Short,
-    @JceId(5) val totoalFriendCount: Short,
-    @JceId(6) val friendCount: Short,
-    @JceId(7) val vecFriendInfo: List<FriendInfo>? = null,
-    @JceId(8) val groupid: Byte? = null,
-    @JceId(9) val ifGetGroupInfo: Byte,
-    @JceId(10) val groupstartIndex: Byte? = null,
-    @JceId(11) val getgroupCount: Byte? = null,
-    @JceId(12) val totoalGroupCount: Short? = null,
-    @JceId(13) val groupCount: Byte? = null,
-    @JceId(14) val vecGroupInfo: List<GroupInfo>? = null,
-    @JceId(15) val result: Int,
-    @JceId(16) val errorCode: Short? = null,
-    @JceId(17) val onlineFriendCount: Short? = null,
-    @JceId(18) val serverTime: Long? = null,
-    @JceId(19) val sqqOnLineCount: Short? = null,
-    @JceId(20) val vecMSFGroupInfo: List<GroupInfo>? = null,
-    @JceId(21) val respType: Byte? = null,
-    @JceId(22) val hasOtherRespFlag: Byte? = null,
-    @JceId(23) val stSelfInfo: FriendInfo? = null,
-    @JceId(24) val showPcIcon: Byte? = null,
-    @JceId(25) val wGetExtSnsRspCode: Short? = null,
-    @JceId(26) val stSubSrvRspCode: FriendListSubSrvRspCode? = null
+    @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<FriendInfo>? = 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<GroupInfo>? = 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<GroupInfo>? = 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
 ) : JceStruct
 
 @Serializable
 internal class FriendListSubSrvRspCode(
-    @JceId(0) val wGetMutualMarkRspCode: Short? = null,
-    @JceId(1) val wGetIntimateInfoRspCode: Short? = null
+    @JceId(0) @JvmField val wGetMutualMarkRspCode: Short? = null,
+    @JceId(1) @JvmField val wGetIntimateInfoRspCode: Short? = null
 ) : JceStruct
 
 @Serializable
 internal class FriendInfo(
-    @JceId(0) val friendUin: Long,
-    @JceId(1) val groupId: Byte,
-    @JceId(2) val faceId: Short,
-    @JceId(3) val remark: String = "",
-    @JceId(4) val sqqtype: Byte,
-    @JceId(5) val status: Byte = 20,
-    @JceId(6) val memberLevel: Byte? = null,
-    @JceId(7) val isMqqOnLine: Byte? = null,
-    @JceId(8) val sqqOnLineState: Byte? = null,
-    @JceId(9) val isIphoneOnline: Byte? = null,
-    @JceId(10) val detalStatusFlag: Byte? = null,
-    @JceId(11) val sqqOnLineStateV2: Byte? = null,
-    @JceId(12) val sShowName: String? = "",
-    @JceId(13) val isRemark: Byte? = null,
-    @JceId(14) val nick: String = "",
-    @JceId(15) val specialFlag: Byte? = null,
-    @JceId(16) val vecIMGroupID: ByteArray? = null,
-    @JceId(17) val vecMSFGroupID: ByteArray? = null,
-    @JceId(18) val iTermType: Int? = null,
-    @JceId(19) val oVipInfo: VipBaseInfo? = null, //? bad
-    @JceId(20) val network: Byte? = null,
-    @JceId(21) val vecRing: ByteArray? = null,
-    @JceId(22) val uAbiFlag: Long? = null,
-    @JceId(23) val ulFaceAddonId: Long? = null,
-    @JceId(24) val eNetworkType: Int? = 0,
-    @JceId(25) val uVipFont: Long? = null,
-    @JceId(26) val eIconType: Int? = 0,
-    @JceId(27) val termDesc: String? = "",
-    @JceId(28) val uColorRing: Long? = null,
-    @JceId(29) val apolloFlag: Byte? = null,
-    @JceId(30) val uApolloTimestamp: Long? = null,
-    @JceId(31) val sex: Byte? = null,
-    @JceId(32) val uFounderFont: Long? = null,
-    @JceId(33) val eimId: String? = "",
-    @JceId(34) val eimMobile: String? = "",
-    @JceId(35) val olympicTorch: Byte? = null,
-    @JceId(36) val uApolloSignTime: Long? = null,
-    @JceId(37) val uLaviUin: Long? = null,
-    @JceId(38) val uTagUpdateTime: Long? = null,
-    @JceId(39) val uGameLastLoginTime: Long? = null,
-    @JceId(40) val uGameAppid: Long? = null,
-    @JceId(41) val vecCardID: ByteArray? = null,
-    @JceId(42) val ulBitSet: Long? = null,
-    @JceId(43) val kingOfGloryFlag: Byte? = null,
-    @JceId(44) val ulKingOfGloryRank: Long? = null,
-    @JceId(45) val masterUin: String? = "",
-    @JceId(46) val uLastMedalUpdateTime: Long? = null,
-    @JceId(47) val uFaceStoreId: Long? = null,
-    @JceId(48) val uFontEffect: Long? = null,
-    @JceId(49) val sDOVId: String? = "",
-    @JceId(50) val uBothFlag: Long? = null,
-    @JceId(51) val centiShow3DFlag: Byte? = null,
-    @JceId(52) val vecIntimateInfo: ByteArray? = null,
-    @JceId(53) val showNameplate: Byte? = null,
-    @JceId(54) val newLoverDiamondFlag: Byte? = null,
-    @JceId(55) val vecExtSnsFrdData: ByteArray? = null,
-    @JceId(56) val vecMutualMarkData: ByteArray? = null
+    @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
 ) : JceStruct
 
 @Serializable
 internal class VipBaseInfo(
-    @JceId(0) val mOpenInfo: Map<Int, VipOpenInfo>? = null,
+    @JceId(0) @JvmField val mOpenInfo: Map<Int, VipOpenInfo>? = null,
     // 1, 2 are since 8.2.7
-    @JceId(1) val iNameplateVipType: Int? = 0,
-    @JceId(2) val iGrayNameplateFlag: Int? = 0
+    @JceId(1) @JvmField val iNameplateVipType: Int? = 0,
+    @JceId(2) @JvmField val iGrayNameplateFlag: Int? = 0
 ) : JceStruct
 
 @Serializable
 internal class VipOpenInfo(
-    @JceId(0) val open: Boolean? = false,
-    @JceId(1) val iVipType: Int = -1,
-    @JceId(2) val iVipLevel: Int = -1,
-    @JceId(3) val iVipFlag: Int? = null,
-    @JceId(4) val nameplateId: Long? = null
+    @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
 ) : JceStruct
 
 @Serializable
 internal class GroupInfo(
-    @JceId(0) val groupId: Byte,
-    @JceId(1) val groupname: String = "",
-    @JceId(2) val friendCount: Int,
-    @JceId(3) val onlineFriendCount: Int,
-    @JceId(4) val seqid: Byte? = null,
-    @JceId(5) val sqqOnLineCount: Int? = null
+    @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
 ) : JceStruct
 

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/GroupMngReq.kt

@@ -3,40 +3,41 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 import kotlinx.serialization.Serializable
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
 import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
+import kotlin.jvm.JvmField
 
 @Serializable
 internal class GroupMngReqJce(
-    @JceId(0) val reqtype: Int,
-    @JceId(1) val uin: Long,
-    @JceId(2) val vecBody: ByteArray,
-    @JceId(3) val checkInGroup: Byte? = null,
-    @JceId(4) val sGroupLocation: String? = "",
-    @JceId(5) val statOption: Byte? = null,
-    @JceId(6) val wSourceID: Int? = null,
-    @JceId(7) val wSourceSubID: Int? = null,
-    @JceId(8) val isSupportAuthQuestionJoin: Byte? = null,
-    @JceId(9) val ifGetAuthInfo: Byte? = null,
-    @JceId(10) val dwDiscussUin: Long? = null,
-    @JceId(11) val sJoinGroupKey: String? = "",
-    @JceId(12) val sJoinGroupPicUrl: String? = "",
-    @JceId(13) val vecJoinGroupRichMsg: ByteArray? = null,
-    @JceId(14) val sJoinGroupAuth: String? = "",
-    @JceId(15) val sJoinGroupVerifyToken: String? = "",
-    @JceId(16) val dwJoinVerifyType: Long? = null
+    @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
 ) : JceStruct
 
 @Serializable
 internal class GroupMngRes(
-    @JceId(0) val reqtype: Int,
-    @JceId(1) val result: Byte,
-    @JceId(2) val vecBody: ByteArray,
-    @JceId(3) val errorString: String = "",
-    @JceId(4) val errorCode: Short = 0,
-    @JceId(5) val isInGroup: Byte? = null,
-    @JceId(6) val sGroupLocation: String? = "",
-    @JceId(7) val isMemInvite: Byte? = null,
-    @JceId(8) val sAuthGrpInfo: String? = "",
-    @JceId(9) val sJoinQuestion: String? = "",
-    @JceId(10) val sJoinAnswer: String? = "",
-    @JceId(11) val dwDis2GrpLimitType: Long? = null
+    @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
 ) : JceStruct

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/MsgType0x210.kt

@@ -4,212 +4,213 @@ import kotlinx.serialization.Serializable
 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.jce.JceId
+import kotlin.jvm.JvmField
 
 @Serializable
 internal class AddGroup(
-    @JceId(0) val dwGroupID: Long? = null,
-    @JceId(1) val dwSortID: Long? = null,
-    @JceId(2) val groupName: String? = ""
+    @JceId(0) @JvmField val dwGroupID: Long? = null,
+    @JceId(1) @JvmField val dwSortID: Long? = null,
+    @JceId(2) @JvmField val groupName: String? = ""
 ) : JceStruct
 
 @Serializable
 internal class DelGroup(
-    @JceId(0) val dwGroupID: Long? = null
+    @JceId(0) @JvmField val dwGroupID: Long? = null
 ) : JceStruct
 
 @Serializable
 internal class FriendGroup(
-    @JceId(0) val dwFuin: Long? = null,
-    @JceId(1) val vOldGroupID: List<Long>? = null,
-    @JceId(2) val vNewGroupID: List<Long>? = null
+    @JceId(0) @JvmField val dwFuin: Long? = null,
+    @JceId(1) @JvmField val vOldGroupID: List<Long>? = null,
+    @JceId(2) @JvmField val vNewGroupID: List<Long>? = null
 ) : JceStruct
 
 @Serializable
 internal class GroupSort(
-    @JceId(0) val dwGroupID: Long? = null,
-    @JceId(1) val dwSortID: Long? = null
+    @JceId(0) @JvmField val dwGroupID: Long? = null,
+    @JceId(1) @JvmField val dwSortID: Long? = null
 ) : JceStruct
 
 @Serializable
 internal class MarketFaceInfo(
-    @JceId(0) val insertIdx: Long,
-    @JceId(1) val marketFaceBuff: ByteArray
+    @JceId(0) @JvmField val insertIdx: Long,
+    @JceId(1) @JvmField val marketFaceBuff: ByteArray
 ) : JceStruct
 
 @Serializable
 internal class ModFriendGroup(
-    @JceId(0) val vMsgFrdGroup: List<FriendGroup>? = null
+    @JceId(0) @JvmField val vMsgFrdGroup: List<FriendGroup>? = null
 ) : JceStruct
 
 @Serializable
 internal class ModGroupName(
-    @JceId(0) val dwGroupID: Long? = null,
-    @JceId(1) val groupName: String? = ""
+    @JceId(0) @JvmField val dwGroupID: Long? = null,
+    @JceId(1) @JvmField val groupName: String? = ""
 ) : JceStruct
 
 @Serializable
 internal class ModGroupSort(
-    @JceId(0) val vMsgGroupSort: List<GroupSort>? = null
+    @JceId(0) @JvmField val vMsgGroupSort: List<GroupSort>? = null
 ) : JceStruct
 
 @Serializable
 internal class MsgType0x210(
-    @JceId(0) val uSubMsgType: Long,
-    @JceId(1) val stMsgInfo0x2: MsgType0x210SubMsgType0x2? = null,
-    @JceId(3) val stMsgInfo0xa: MsgType0x210SubMsgType0xa? = null,
-    @JceId(4) val stMsgInfo0xe: MsgType0x210SubMsgType0xe? = null,
-    @JceId(5) val stMsgInfo0x13: MsgType0x210SubMsgType0x13? = null,
-    @JceId(6) val stMsgInfo0x17: MsgType0x210SubMsgType0x17? = null,
-    @JceId(7) val stMsgInfo0x20: MsgType0x210SubMsgType0x20? = null,
-    @JceId(8) val stMsgInfo0x1d: MsgType0x210SubMsgType0x1d? = null,
-    @JceId(9) val stMsgInfo0x24: MsgType0x210SubMsgType0x24? = null,
-    @JceId(10) val vProtobuf: ByteArray = EMPTY_BYTE_ARRAY
+    @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
 ) : JceStruct
 
 @Serializable
 internal class MsgType0x210SubMsgType0x13(
-    @JceId(0) val uint32SrcAppId: Long? = null,
-    @JceId(1) val uint32SrcInstId: Long? = null,
-    @JceId(2) val uint32DstAppId: Long? = null,
-    @JceId(3) val uint32DstInstId: Long? = null,
-    @JceId(4) val uint64DstUin: Long? = null,
-    @JceId(5) val uint64Sessionid: Long? = null,
-    @JceId(6) val uint32Size: Long? = null,
-    @JceId(7) val uint32Index: Long? = null,
-    @JceId(8) val uint32Type: Long? = null,
-    @JceId(9) val buf: ByteArray? = null
+    @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
 ) : JceStruct
 
 @Serializable
 internal class MsgType0x210SubMsgType0x13_MsgItem(
-    @JceId(0) val uint32Type: Long? = null,
-    @JceId(1) val text: ByteArray? = null
+    @JceId(0) @JvmField val uint32Type: Long? = null,
+    @JceId(1) @JvmField val text: ByteArray? = null
 ) : JceStruct
 
 @Serializable
 internal class MsgType0x210SubMsgType0x17(
-    @JceId(0) val dwOpType: Long? = null,
-    @JceId(1) val stAddGroup: AddGroup? = null,
-    @JceId(2) val stDelGroup: DelGroup? = null,
-    @JceId(3) val stModGroupName: ModGroupName? = null,
-    @JceId(4) val stModGroupSort: ModGroupSort? = null,
-    @JceId(5) val stModFriendGroup: ModFriendGroup? = null
+    @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
 ) : JceStruct
 
 @Serializable
 internal class MsgType0x210SubMsgType0x1d(
-    @JceId(0) val dwOpType: Long? = null,
-    @JceId(1) val dwUin: Long? = null,
-    @JceId(2) val dwID: Long? = null,
-    @JceId(3) val value: String? = ""
+    @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? = ""
 ) : JceStruct
 
 @Serializable
 internal class MsgType0x210SubMsgType0x2(
-    @JceId(0) val uSrcAppId: Long? = null,
-    @JceId(1) val uSrcInstId: Long? = null,
-    @JceId(2) val uDstAppId: Long? = null,
-    @JceId(3) val uDstInstId: Long? = null,
-    @JceId(4) val uDstUin: Long? = null,
-    @JceId(5) val fileName: ByteArray? = null,
-    @JceId(6) val fileIndex: ByteArray? = null,
-    @JceId(7) val fileMd5: ByteArray? = null,
-    @JceId(8) val fileKey: ByteArray? = null,
-    @JceId(9) val uServerIp: Long? = null,
-    @JceId(10) val uServerPort: Long? = null,
-    @JceId(11) val fileLen: Long? = null,
-    @JceId(12) val sessionId: Long? = null,
-    @JceId(13) val originfileMd5: ByteArray? = null,
-    @JceId(14) val uOriginfiletype: Long? = null,
-    @JceId(15) val uSeq: Long? = null
+    @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
 ) : JceStruct
 
 @Serializable
 internal class MsgType0x210SubMsgType0x20(
-    @JceId(0) val dwOpType: Long? = null,
-    @JceId(1) val dwType: Long? = null,
-    @JceId(2) val dwUin: Long? = null,
-    @JceId(3) val remaek: String? = ""
+    @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? = ""
 ) : JceStruct
 
 @Serializable
 internal class MsgType0x210SubMsgType0x24(
-    @JceId(0) val vPluginNumList: List<PluginNum>? = null
+    @JceId(0) @JvmField val vPluginNumList: List<PluginNum>? = null
 ) : JceStruct
 
 @Serializable
 internal class MsgType0x210SubMsgType0xa(
-    @JceId(0) val uSrcAppId: Long? = null,
-    @JceId(1) val uSrcInstId: Long? = null,
-    @JceId(2) val uDstAppId: Long? = null,
-    @JceId(3) val uDstInstId: Long? = null,
-    @JceId(4) val uDstUin: Long? = null,
-    @JceId(5) val uType: Long? = null,
-    @JceId(6) val uServerIp: Long? = null,
-    @JceId(7) val uServerPort: Long? = null,
-    @JceId(8) val vUrlNotify: ByteArray? = null,
-    @JceId(9) val vTokenKey: ByteArray? = null,
-    @JceId(10) val uFileLen: Long? = null,
-    @JceId(11) val fileName: ByteArray? = null,
-    @JceId(12) val vMd5: ByteArray? = null,
-    @JceId(13) val sessionId: Long? = null,
-    @JceId(14) val originfileMd5: ByteArray? = null,
-    @JceId(15) val uOriginfiletype: Long? = null,
-    @JceId(16) val uSeq: Long? = null
+    @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
 ) : JceStruct
 
 @Serializable
 internal class MsgType0x210SubMsgType0xe(
-    @JceId(0) val uint32SrcAppId: Long? = null,
-    @JceId(1) val uint32SrcInstId: Long? = null,
-    @JceId(2) val uint32DstAppId: Long? = null,
-    @JceId(3) val uint32DstInstId: Long? = null,
-    @JceId(4) val uint64DstUin: Long? = null,
-    @JceId(5) val uint64Sessionid: Long? = null,
-    @JceId(6) val uint32Operate: Long? = null,
-    @JceId(7) val uint32Seq: Long? = null,
-    @JceId(8) val uint32Code: Long? = null,
-    @JceId(9) val msg: String? = ""
+    @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? = ""
 ) : JceStruct
 
 @Serializable
 internal class PersonInfoChange(
-    @JceId(0) val type: Byte? = null,
-    @JceId(1) val vChgField: List<PersonInfoField>? = null
+    @JceId(0) @JvmField val type: Byte? = null,
+    @JceId(1) @JvmField val vChgField: List<PersonInfoField>? = null
 ) : JceStruct
 
 @Serializable
 internal class PersonInfoField(
-    @JceId(0) val uField: Long? = null
+    @JceId(0) @JvmField val uField: Long? = null
 ) : JceStruct
 
 @Serializable
 internal class PluginNum(
-    @JceId(0) val dwID: Long? = null,
-    @JceId(1) val dwNUm: Long? = null,
-    @JceId(2) val flag: Byte? = null
+    @JceId(0) @JvmField val dwID: Long? = null,
+    @JceId(1) @JvmField val dwNUm: Long? = null,
+    @JceId(2) @JvmField val flag: Byte? = null
 ) : JceStruct
 
 @Serializable
 internal class SlaveMasterMsg(
-    @JceId(0) val uMsgType: Long? = null,
-    @JceId(1) val uCmd: Long? = null,
-    @JceId(2) val uSeq: Long? = null,
-    @JceId(3) val fromUin: Long? = null,
-    @JceId(4) val wFromApp: Short? = null,
-    @JceId(5) val uFromInstId: Long? = null,
-    @JceId(6) val toUin: Long? = null,
-    @JceId(7) val wToApp: Short? = null,
-    @JceId(8) val uToInstId: Long? = null,
-    @JceId(9) val vOrigMsg: ByteArray? = null,
-    @JceId(10) val uLastChangeTime: Long? = null,
-    @JceId(11) val vReserved: ByteArray? = null,
-    @JceId(12) val vMarketFace: List<MarketFaceInfo>? = null,
-    @JceId(13) val uSuperQQBubbleId: Long? = null
+    @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<MarketFaceInfo>? = null,
+    @JceId(13) @JvmField val uSuperQQBubbleId: Long? = null
 ) : JceStruct
 
 @Serializable
 internal class Type_1_QQDataTextMsg(
-    @JceId(0) val msgItem: List<MsgType0x210SubMsgType0x13_MsgItem>? = null
+    @JceId(0) @JvmField val msgItem: List<MsgType0x210SubMsgType0x13_MsgItem>? = null
 ) : JceStruct
 

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt

@@ -12,247 +12,248 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 import kotlinx.serialization.Serializable
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
 import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
+import kotlin.jvm.JvmField
 
 internal class OnlinePushPack {
     @Serializable
     internal class DelMsgInfo(
-        @JceId(0) val fromUin: Long,
-        @JceId(1) val uMsgTime: Long,
-        @JceId(2) val shMsgSeq: Short,
-        @JceId(3) val vMsgCookies: ByteArray? = null,
-        @JceId(4) val wCmd: Short? = null,
-        @JceId(5) val uMsgType: Long? = null,
-        @JceId(6) val uAppId: Long? = null,
-        @JceId(7) val sendTime: Long? = null,
-        @JceId(8) val ssoSeq: Int? = null,
-        @JceId(9) val ssoIp: Int? = null,
-        @JceId(10) val clientIp: Int? = null
+        @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
     ) : JceStruct
 
     @Serializable
     internal class DeviceInfo(
-        @JceId(0) val netType: Byte? = null,
-        @JceId(1) val devType: String? = "",
-        @JceId(2) val oSVer: String? = "",
-        @JceId(3) val vendorName: String? = "",
-        @JceId(4) val vendorOSName: String? = "",
-        @JceId(5) val iOSIdfa: String? = ""
+        @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? = ""
     ) : JceStruct
 
     @Serializable
     internal class Name(
-        @JceId(0) val fromUin: Long,
-        @JceId(1) val uMsgTime: Long,
-        @JceId(2) val shMsgType: Short,
-        @JceId(3) val shMsgSeq: Short,
-        @JceId(4) val msg: String = "",
-        @JceId(5) val uRealMsgTime: Int? = null,
-        @JceId(6) val vMsg: ByteArray? = null,
-        @JceId(7) val uAppShareID: Long? = null,
-        @JceId(8) val vMsgCookies: ByteArray? = null,
-        @JceId(9) val vAppShareCookie: ByteArray? = null,
-        @JceId(10) val msgUid: Long? = null,
-        @JceId(11) val lastChangeTime: Long? = 1L,
-        @JceId(12) val vCPicInfo: List<CPicInfo>? = null,
-        @JceId(13) val stShareData: ShareData? = null,
-        @JceId(14) val fromInstId: Long? = null,
-        @JceId(15) val vRemarkOfSender: ByteArray? = null,
-        @JceId(16) val fromMobile: String? = "",
-        @JceId(17) val fromName: String? = "",
-        @JceId(18) val vNickName: List<String>? = null,
-        @JceId(19) val stC2CTmpMsgHead: TempMsgHead? = null
+        @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<CPicInfo>? = 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<String>? = null,
+        @JceId(19) @JvmField val stC2CTmpMsgHead: TempMsgHead? = null
     ) : JceStruct
 
     @Serializable
     internal class SvcReqPushMsg(
-        @JceId(0) val uin: Long,
-        @JceId(1) val uMsgTime: Long,
-        @JceId(2) val vMsgInfos: List<MsgInfo>,
-        @JceId(3) val svrip: Int? = 0,
-        @JceId(4) val vSyncCookie: ByteArray? = null,
-        @JceId(5) val vUinPairMsg: List<UinPairMsg>? = null,
-        @JceId(6) val mPreviews: Map<String, ByteArray>? = null
-        // @SerialId(7) val wUserActive: Int? = null,
-        //@SerialId(12) val wGeneralFlag: Int? = null
+        @JceId(0) @JvmField val uin: Long,
+        @JceId(1) @JvmField val uMsgTime: Long,
+        @JceId(2) @JvmField val vMsgInfos: List<MsgInfo>,
+        @JceId(3) @JvmField val svrip: Int? = 0,
+        @JceId(4) @JvmField val vSyncCookie: ByteArray? = null,
+        @JceId(5) @JvmField val vUinPairMsg: List<UinPairMsg>? = null,
+        @JceId(6) @JvmField val mPreviews: Map<String, ByteArray>? = null
+        // @SerialId(7) @JvmField val wUserActive: Int? = null,
+        //@SerialId(12) @JvmField val wGeneralFlag: Int? = null
     ) : JceStruct
 
     @Serializable
     internal class SvcRespPushMsg(
-        @JceId(0) val uin: Long,
-        @JceId(1) val vDelInfos: List<DelMsgInfo>,
-        @JceId(2) val svrip: Int = 0,
-        @JceId(3) val pushToken: ByteArray? = null,
-        @JceId(4) val serviceType: Int? = null,
-        @JceId(5) val deviceInfo: DeviceInfo? = null
+        @JceId(0) @JvmField val uin: Long,
+        @JceId(1) @JvmField val vDelInfos: List<DelMsgInfo>,
+        @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
     ) : JceStruct
 
     @Serializable
     internal class UinPairMsg(
-        @JceId(1) val uLastReadTime: Long? = null,
-        @JceId(2) val peerUin: Long? = null,
-        @JceId(3) val uMsgCompleted: Long? = null,
-        @JceId(4) val vMsgInfos: List<MsgInfo>? = null
+        @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<MsgInfo>? = null
     ) : JceStruct
 
     @Serializable
     internal class MsgType0x210(
-        @JceId(0) val uSubMsgType: Long,
-        @JceId(1) val stMsgInfo0x2: MsgType0x210SubMsgType0x2? = null,
-        @JceId(3) val stMsgInfo0xa: MsgType0x210SubMsgType0xa? = null,
-        @JceId(4) val stMsgInfo0xe: MsgType0x210SubMsgType0xe? = null,
-        @JceId(5) val stMsgInfo0x13: MsgType0x210SubMsgType0x13? = null,
-        @JceId(6) val stMsgInfo0x17: MsgType0x210SubMsgType0x17? = null,
-        @JceId(7) val stMsgInfo0x20: MsgType0x210SubMsgType0x20? = null,
-        @JceId(8) val stMsgInfo0x1d: MsgType0x210SubMsgType0x1d? = null,
-        @JceId(9) val stMsgInfo0x24: MsgType0x210SubMsgType0x24? = null,
-        @JceId(10) val vProtobuf: ByteArray? = null
+        @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
     ) : JceStruct
 
     @Serializable
     internal class MsgType0x210SubMsgType0x13(
-        @JceId(0) val uint32SrcAppId: Long? = null,
-        @JceId(1) val uint32SrcInstId: Long? = null,
-        @JceId(2) val uint32DstAppId: Long? = null,
-        @JceId(3) val uint32DstInstId: Long? = null,
-        @JceId(4) val uint64DstUin: Long? = null,
-        @JceId(5) val uint64Sessionid: Long? = null,
-        @JceId(6) val uint32Size: Long? = null,
-        @JceId(7) val uint32Index: Long? = null,
-        @JceId(8) val uint32Type: Long? = null,
-        @JceId(9) val buf: ByteArray? = null
+        @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
     ) : JceStruct
 
     @Serializable
     internal class MsgType0x210SubMsgType0x17(
-        @JceId(0) val dwOpType: Long? = null,
-        @JceId(1) val stAddGroup: AddGroup? = null,
-        @JceId(2) val stDelGroup: DelGroup? = null,
-        @JceId(3) val stModGroupName: ModGroupName? = null,
-        @JceId(4) val stModGroupSort: ModGroupSort? = null,
-        @JceId(5) val stModFriendGroup: ModFriendGroup? = null
+        @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
     ) : JceStruct
 
     @Serializable
     internal class AddGroup(
-        @JceId(0) val dwGroupID: Long? = null,
-        @JceId(1) val dwSortID: Long? = null,
-        @JceId(2) val groupName: String? = ""
+        @JceId(0) @JvmField val dwGroupID: Long? = null,
+        @JceId(1) @JvmField val dwSortID: Long? = null,
+        @JceId(2) @JvmField val groupName: String? = ""
     ) : JceStruct
 
     @Serializable
     internal class DelGroup(
-        @JceId(0) val dwGroupID: Long? = null
+        @JceId(0) @JvmField val dwGroupID: Long? = null
     ) : JceStruct
 
     @Serializable
     internal class ModFriendGroup(
-        @JceId(0) val vMsgFrdGroup: List<FriendGroup>? = null
+        @JceId(0) @JvmField val vMsgFrdGroup: List<FriendGroup>? = null
     ) : JceStruct
 
     @Serializable
     internal class FriendGroup(
-        @JceId(0) val dwFuin: Long? = null,
-        @JceId(1) val vOldGroupID: List<Long>? = null,
-        @JceId(2) val vNewGroupID: List<Long>? = null
+        @JceId(0) @JvmField val dwFuin: Long? = null,
+        @JceId(1) @JvmField val vOldGroupID: List<Long>? = null,
+        @JceId(2) @JvmField val vNewGroupID: List<Long>? = null
     ) : JceStruct
 
     @Serializable
     internal class ModGroupName(
-        @JceId(0) val dwGroupID: Long? = null,
-        @JceId(1) val groupName: String? = ""
+        @JceId(0) @JvmField val dwGroupID: Long? = null,
+        @JceId(1) @JvmField val groupName: String? = ""
     ) : JceStruct
 
     @Serializable
     internal class ModGroupSort(
-        @JceId(0) val vMsgGroupSort: List<GroupSort>? = null
+        @JceId(0) @JvmField val vMsgGroupSort: List<GroupSort>? = null
     ) : JceStruct
 
     @Serializable
     internal class GroupSort(
-        @JceId(0) val dwGroupID: Long? = null,
-        @JceId(1) val dwSortID: Long? = null
+        @JceId(0) @JvmField val dwGroupID: Long? = null,
+        @JceId(1) @JvmField val dwSortID: Long? = null
     ) : JceStruct
 
     @Serializable
     internal class MsgType0x210SubMsgType0x1d(
-        @JceId(0) val dwOpType: Long? = null,
-        @JceId(1) val dwUin: Long? = null,
-        @JceId(2) val dwID: Long? = null,
-        @JceId(3) val value: String? = ""
+        @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? = ""
     ) : JceStruct
 
     @Serializable
     internal class MsgType0x210SubMsgType0x2(
-        @JceId(0) val uSrcAppId: Long? = null,
-        @JceId(1) val uSrcInstId: Long? = null,
-        @JceId(2) val uDstAppId: Long? = null,
-        @JceId(3) val uDstInstId: Long? = null,
-        @JceId(4) val uDstUin: Long? = null,
-        @JceId(5) val fileName: ByteArray? = null,
-        @JceId(6) val fileIndex: ByteArray? = null,
-        @JceId(7) val fileMd5: ByteArray? = null,
-        @JceId(8) val fileKey: ByteArray? = null,
-        @JceId(9) val uServerIp: Long? = null,
-        @JceId(10) val uServerPort: Long? = null,
-        @JceId(11) val fileLen: Long? = null,
-        @JceId(12) val sessionId: Long? = null,
-        @JceId(13) val originfileMd5: ByteArray? = null,
-        @JceId(14) val uOriginfiletype: Long? = null,
-        @JceId(15) val uSeq: Long? = null
+        @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
     ) : JceStruct
 
     @Serializable
     internal class MsgType0x210SubMsgType0x20(
-        @JceId(0) val dwOpType: Long? = null,
-        @JceId(1) val dwType: Long? = null,
-        @JceId(2) val dwUin: Long? = null,
-        @JceId(3) val remaek: String? = ""
+        @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? = ""
     ) : JceStruct
 
     @Serializable
     internal class MsgType0x210SubMsgType0x24(
-        @JceId(0) val vPluginNumList: List<PluginNum>? = null
+        @JceId(0) @JvmField val vPluginNumList: List<PluginNum>? = null
     ) : JceStruct
 
     @Serializable
     internal class PluginNum(
-        @JceId(0) val dwID: Long? = null,
-        @JceId(1) val dwNUm: Long? = null,
-        @JceId(2) val flag: Byte? = null
+        @JceId(0) @JvmField val dwID: Long? = null,
+        @JceId(1) @JvmField val dwNUm: Long? = null,
+        @JceId(2) @JvmField val flag: Byte? = null
     ) : JceStruct
 
     @Serializable
     internal class MsgType0x210SubMsgType0xa(
-        @JceId(0) val uSrcAppId: Long? = null,
-        @JceId(1) val uSrcInstId: Long? = null,
-        @JceId(2) val uDstAppId: Long? = null,
-        @JceId(3) val uDstInstId: Long? = null,
-        @JceId(4) val uDstUin: Long? = null,
-        @JceId(5) val uType: Long? = null,
-        @JceId(6) val uServerIp: Long? = null,
-        @JceId(7) val uServerPort: Long? = null,
-        @JceId(8) val vUrlNotify: ByteArray? = null,
-        @JceId(9) val vTokenKey: ByteArray? = null,
-        @JceId(10) val uFileLen: Long? = null,
-        @JceId(11) val fileName: ByteArray? = null,
-        @JceId(12) val vMd5: ByteArray? = null,
-        @JceId(13) val sessionId: Long? = null,
-        @JceId(14) val originfileMd5: ByteArray? = null,
-        @JceId(15) val uOriginfiletype: Long? = null,
-        @JceId(16) val uSeq: Long? = null
+        @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
     ) : JceStruct
 
     @Serializable
     internal class MsgType0x210SubMsgType0xe(
-        @JceId(0) val uint32SrcAppId: Long? = null,
-        @JceId(1) val uint32SrcInstId: Long? = null,
-        @JceId(2) val uint32DstAppId: Long? = null,
-        @JceId(3) val uint32DstInstId: Long? = null,
-        @JceId(4) val uint64DstUin: Long? = null,
-        @JceId(5) val uint64Sessionid: Long? = null,
-        @JceId(6) val uint32Operate: Long? = null,
-        @JceId(7) val uint32Seq: Long? = null,
-        @JceId(8) val uint32Code: Long? = null,
-        @JceId(9) val msg: String? = ""
+        @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? = ""
     ) : JceStruct
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt

@@ -14,67 +14,68 @@ 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.jce.JceId
+import kotlin.jvm.JvmField
 
 @Suppress("ArrayInDataClass")
 @Serializable
 internal class RequestPushNotify(
-    @JceId(0) val uin: Long? = 0L,
-    @JceId(1) val ctype: Byte = 0,
-    @JceId(2) val strService: String?,
-    @JceId(3) val strCmd: String?,
-    @JceId(4) val vNotifyCookie: ByteArray? = EMPTY_BYTE_ARRAY,
-    @JceId(5) val usMsgType: Int?,
-    @JceId(6) val wUserActive: Int?,
-    @JceId(7) val wGeneralFlag: Int?,
-    @JceId(8) val bindedUin: Long?,
-    @JceId(9) val stMsgInfo: MsgInfo?,
-    @JceId(10) val msgCtrlBuf: String?,
-    @JceId(11) val serverBuf: ByteArray?,
-    @JceId(12) val pingFlag: Long?,
-    @JceId(13) val svrip: Int?
+    @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?
 ) : JceStruct, Packet
 
 @Serializable
 internal class MsgInfo(
-    @JceId(0) val lFromUin: Long = 0L,
-    @JceId(1) val uMsgTime: Long = 0L,
-    @JceId(2) val shMsgType: Short,
-    @JceId(3) val shMsgSeq: Short,
-    @JceId(4) val strMsg: String?,
-    @JceId(5) val uRealMsgTime: Int?,
-    @JceId(6) val vMsg: ByteArray,
-    @JceId(7) val uAppShareID: Long?,
-    @JceId(8) val vMsgCookies: ByteArray? = EMPTY_BYTE_ARRAY,
-    @JceId(9) val vAppShareCookie: ByteArray? = EMPTY_BYTE_ARRAY,
-    @JceId(10) val lMsgUid: Long?,
-    @JceId(11) val lLastChangeTime: Long?,
-    @JceId(12) val vCPicInfo: List<CPicInfo>?,
-    @JceId(13) val stShareData: ShareData?,
-    @JceId(14) val lFromInstId: Long?,
-    @JceId(15) val vRemarkOfSender: ByteArray?,
-    @JceId(16) val strFromMobile: String?,
-    @JceId(17) val strFromName: String?,
-    @JceId(18) val vNickName: List<String>?//,
-    //@SerialId(19) val stC2CTmpMsgHead: TempMsgHead?
+    @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<CPicInfo>?,
+    @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<String>?//,
+    //@SerialId(19) @JvmField val stC2CTmpMsgHead: TempMsgHead?
 ) : JceStruct
 
 
 @Serializable
 internal class ShareData(
-    @JceId(0) val pkgname: String = "",
-    @JceId(1) val msgtail: String = "",
-    @JceId(2) val picurl: String = "",
-    @JceId(3) val url: String = ""
+    @JceId(0) @JvmField val pkgname: String = "",
+    @JceId(1) @JvmField val msgtail: String = "",
+    @JceId(2) @JvmField val picurl: String = "",
+    @JceId(3) @JvmField val url: String = ""
 ) : JceStruct
 
 @Serializable
 internal class TempMsgHead(
-    @JceId(0) val c2c_type: Int? = 0,
-    @JceId(1) val serviceType: Int? = 0
+    @JceId(0) @JvmField val c2c_type: Int? = 0,
+    @JceId(1) @JvmField val serviceType: Int? = 0
 ) : JceStruct
 
 @Serializable
 internal class CPicInfo(
-    @JceId(0) val vPath: ByteArray = EMPTY_BYTE_ARRAY,
-    @JceId(1) val vHost: ByteArray? = EMPTY_BYTE_ARRAY
+    @JceId(0) @JvmField val vPath: ByteArray = EMPTY_BYTE_ARRAY,
+    @JceId(1) @JvmField val vHost: ByteArray? = EMPTY_BYTE_ARRAY
 ) : JceStruct

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestMSFForceOffline.kt

@@ -3,23 +3,24 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 import kotlinx.serialization.Serializable
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
 import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
+import kotlin.jvm.JvmField
 
 @Serializable
 internal class RequestMSFForceOffline(
-    @JceId(0) val uin: Long = 0L,
-    @JceId(1) val iSeqno: Long = 0L,
-    @JceId(2) val kickType: Byte = 0,
-    @JceId(3) val info: String = "",
-    @JceId(4) val title: String? = "",
-    @JceId(5) val sigKick: Byte? = 0,
-    @JceId(6) val vecSigKickData: ByteArray? = null,
-    @JceId(7) val sameDevice: Byte? = 0
+    @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
 ) : JceStruct
 
 
 @Serializable
 internal class RspMSFForceOffline(
-    @JceId(0) val uin: Long,
-    @JceId(1) val seq: Long,
-    @JceId(2) val const: Byte = 0
+    @JceId(0) @JvmField val uin: Long,
+    @JceId(1) @JvmField val seq: Long,
+    @JceId(2) @JvmField val const: Byte = 0
 ) : JceStruct

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPacket.kt

@@ -13,34 +13,35 @@ import kotlinx.serialization.Serializable
 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.jce.JceId
+import kotlin.jvm.JvmField
 
 private val EMPTY_MAP = mapOf<String, String>()
 
 @Serializable
 internal class RequestPacket(
-    @JceId(1) val iVersion: Short? = 3,
-    @JceId(2) val cPacketType: Byte = 0,
-    @JceId(3) val iMessageType: Int = 0,
-    @JceId(4) val iRequestId: Int = 0,
-    @JceId(5) val sServantName: String = "",
-    @JceId(6) val sFuncName: String = "",
-    @JceId(7) val sBuffer: ByteArray = EMPTY_BYTE_ARRAY,
-    @JceId(8) val iTimeout: Int? = 0,
-    @JceId(9) val context: Map<String, String>? = EMPTY_MAP,
-    @JceId(10) val status: Map<String, String>? = EMPTY_MAP
+    @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<String, String>? = EMPTY_MAP,
+    @JceId(10) @JvmField val status: Map<String, String>? = EMPTY_MAP
 ) : JceStruct
 
 @Serializable
 internal class RequestDataVersion3(
-    @JceId(0) val map: Map<String, ByteArray> // 注意: ByteArray 不能直接放序列化的 JceStruct!! 要放类似 RequestDataStructSvcReqRegister 的
+    @JceId(0) @JvmField val map: Map<String, ByteArray> // 注意: ByteArray 不能直接放序列化的 JceStruct!! 要放类似 RequestDataStructSvcReqRegister 的
 ) : JceStruct
 
 @Serializable
 internal class RequestDataVersion2(
-    @JceId(0) val map: Map<String, Map<String, ByteArray>>
+    @JceId(0) @JvmField val map: Map<String, Map<String, ByteArray>>
 ) : JceStruct
 
 @Serializable
 internal class RequestDataStructSvcReqRegister(
-    @JceId(0) val struct: SvcReqRegister
+    @JceId(0) @JvmField val struct: SvcReqRegister
 ) : JceStruct

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPushForceOffline.kt

@@ -12,11 +12,12 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 import kotlinx.serialization.Serializable
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
 import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
+import kotlin.jvm.JvmField
 
 @Serializable
 internal class RequestPushForceOffline(
-    @JceId(0) val uin: Long,
-    @JceId(1) val title: String? = "",
-    @JceId(2) val tips: String? = "",
-    @JceId(3) val sameDevice: Byte? = null
+    @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
 ) : JceStruct

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/SvcReqRegister.kt

@@ -12,44 +12,45 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 import kotlinx.serialization.Serializable
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
 import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
+import kotlin.jvm.JvmField
 
 @Serializable
 internal class SvcReqRegister(
-    @JceId(0) val lUin: Long = 0L,
-    @JceId(1) val lBid: Long = 0L,
-    @JceId(2) val cConnType: Byte = 0,
-    @JceId(3) val sOther: String = "",
-    @JceId(4) val iStatus: Int = 11,
-    @JceId(5) val bOnlinePush: Byte = 0,
-    @JceId(6) val bIsOnline: Byte = 0,
-    @JceId(7) val bIsShowOnline: Byte = 0,
-    @JceId(8) val bKikPC: Byte = 0,
-    @JceId(9) val bKikWeak: Byte = 0,
-    @JceId(10) val timeStamp: Long = 0L,
-    @JceId(11) val iOSVersion: Long = 0L,
-    @JceId(12) val cNetType: Byte = 0,
-    @JceId(13) val sBuildVer: String? = "",
-    @JceId(14) val bRegType: Byte = 0,
-    @JceId(15) val vecDevParam: ByteArray? = null,
-    @JceId(16) val vecGuid: ByteArray? = null,
-    @JceId(17) val iLocaleID: Int = 2052,
-    @JceId(18) val bSlientPush: Byte = 0,
-    @JceId(19) val strDevName: String? = null,
-    @JceId(20) val strDevType: String? = null,
-    @JceId(21) val strOSVer: String? = null,
-    @JceId(22) val bOpenPush: Byte = 1,
-    @JceId(23) val iLargeSeq: Long = 0L,
-    @JceId(24) val iLastWatchStartTime: Long = 0L,
-    @JceId(26) val uOldSSOIp: Long = 0L,
-    @JceId(27) val uNewSSOIp: Long = 0L,
-    @JceId(28) val sChannelNo: String? = null,
-    @JceId(29) val lCpId: Long = 0L,
-    @JceId(30) val strVendorName: String? = null,
-    @JceId(31) val strVendorOSName: String? = null,
-    @JceId(32) val strIOSIdfa: String? = null,
-    @JceId(33) val bytes_0x769_reqbody: ByteArray? = null,
-    @JceId(34) val bIsSetStatus: Byte = 0,
-    @JceId(35) val vecServerBuf: ByteArray? = null,
-    @JceId(36) val bSetMute: Byte = 0
+    @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
     // @SerialId(25) var vecBindUin: ArrayList<*>? = null // ?? 未知泛型
 ) : JceStruct

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/TroopList.kt

@@ -12,180 +12,181 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 import kotlinx.serialization.Serializable
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
 import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
+import kotlin.jvm.JvmField
 
 @Serializable
 internal class GetTroopListReqV2Simplify(
-    @JceId(0) val uin: Long,
-    @JceId(1) val getMSFMsgFlag: Byte? = null,
-    @JceId(2) val vecCookies: ByteArray? = null,
-    @JceId(3) val vecGroupInfo: List<StTroopNumSimplify>? = null,
-    @JceId(4) val groupFlagExt: Byte? = null,
-    @JceId(5) val shVersion: Int? = null,
-    @JceId(6) val dwCompanyId: Long? = null,
-    @JceId(7) val versionNum: Long? = null,
-    @JceId(8) val getLongGroupName: Byte? = null
+    @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<StTroopNumSimplify>? = 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
 ) : JceStruct
 
 @Serializable
 internal class StTroopNumSimplify(
-    @JceId(0) val groupCode: Long,
-    @JceId(1) val dwGroupInfoSeq: Long? = null,
-    @JceId(2) val dwGroupFlagExt: Long? = null,
-    @JceId(3) val dwGroupRankSeq: Long? = null
+    @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
 ) : JceStruct
 
 
 @Serializable
 internal class GetTroopListRespV2(
-    @JceId(0) val uin: Long,
-    @JceId(1) val troopCount: Short,
-    @JceId(2) val result: Int,
-    @JceId(3) val errorCode: Short? = null,
-    @JceId(4) val vecCookies: ByteArray? = null,
-    @JceId(5) val vecTroopList: List<StTroopNum>? = null,
-    @JceId(6) val vecTroopListDel: List<StTroopNum>? = null,
-    @JceId(7) val vecTroopRank: List<StGroupRankInfo>? = null,
-    @JceId(8) val vecFavGroup: List<StFavoriteGroup>? = null,
-    @JceId(9) val vecTroopListExt: List<StTroopNum>? = null
+    @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<StTroopNum>? = null,
+    @JceId(6) @JvmField val vecTroopListDel: List<StTroopNum>? = null,
+    @JceId(7) @JvmField val vecTroopRank: List<StGroupRankInfo>? = null,
+    @JceId(8) @JvmField val vecFavGroup: List<StFavoriteGroup>? = null,
+    @JceId(9) @JvmField val vecTroopListExt: List<StTroopNum>? = null
 ) : JceStruct
 
 
 @Serializable
 internal class StTroopNum(
-    @JceId(0) val groupUin: Long,
-    @JceId(1) val groupCode: Long,
-    @JceId(2) val flag: Byte? = null,
-    @JceId(3) val dwGroupInfoSeq: Long? = null,
-    @JceId(4) val groupName: String = "",
-    @JceId(5) val groupMemo: String = "",
-    @JceId(6) val dwGroupFlagExt: Long? = null,
-    @JceId(7) val dwGroupRankSeq: Long? = null,
-    @JceId(8) val dwCertificationType: Long? = null,
-    @JceId(9) val dwShutUpTimestamp: Long? = null,
-    @JceId(10) val dwMyShutUpTimestamp: Long? = null,
-    @JceId(11) val dwCmdUinUinFlag: Long? = null,
-    @JceId(12) val dwAdditionalFlag: Long? = null,
-    @JceId(13) val dwGroupTypeFlag: Long? = null,
-    @JceId(14) val dwGroupSecType: Long? = null,
-    @JceId(15) val dwGroupSecTypeInfo: Long? = null,
-    @JceId(16) val dwGroupClassExt: Long? = null,
-    @JceId(17) val dwAppPrivilegeFlag: Long? = null,
-    @JceId(18) val dwSubscriptionUin: Long? = null,
-    @JceId(19) val dwMemberNum: Long? = null,
-    @JceId(20) val dwMemberNumSeq: Long? = null,
-    @JceId(21) val dwMemberCardSeq: Long? = null,
-    @JceId(22) val dwGroupFlagExt3: Long? = null,
-    @JceId(23) val dwGroupOwnerUin: Long,
-    @JceId(24) val isConfGroup: Byte? = null,
-    @JceId(25) val isModifyConfGroupFace: Byte? = null,
-    @JceId(26) val isModifyConfGroupName: Byte? = null,
-    @JceId(27) val dwCmduinJoinTime: Long? = null,
-    @JceId(28) val ulCompanyId: Long? = null,
-    @JceId(29) val dwMaxGroupMemberNum: Long? = null,
-    @JceId(30) val dwCmdUinGroupMask: Long? = null,
-    @JceId(31) val udwHLGuildAppid: Long? = null,
-    @JceId(32) val udwHLGuildSubType: Long? = null,
-    @JceId(33) val udwCmdUinRingtoneID: Long? = null,
-    @JceId(34) val udwCmdUinFlagEx2: Long? = null
+    @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
 ) : JceStruct
 
 @Serializable
 internal class StGroupRankInfo(
-    @JceId(0) val dwGroupCode: Long,
-    @JceId(1) val groupRankSysFlag: Byte? = null,
-    @JceId(2) val groupRankUserFlag: Byte? = null,
-    @JceId(3) val vecRankMap: List<StLevelRankPair>? = null,
-    @JceId(4) val dwGroupRankSeq: Long? = null,
-    @JceId(5) val ownerName: String? = "",
-    @JceId(6) val adminName: String? = "",
-    @JceId(7) val dwOfficeMode: Long? = null
+    @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<StLevelRankPair>? = 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
 ) : JceStruct
 
 @Serializable
 internal class StFavoriteGroup(
-    @JceId(0) val dwGroupCode: Long,
-    @JceId(1) val dwTimestamp: Long? = null,
-    @JceId(2) val dwSnsFlag: Long? = 1L,
-    @JceId(3) val dwOpenTimestamp: Long? = null
+    @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
 ) : JceStruct
 
 @Serializable
 internal class StLevelRankPair(
-    @JceId(0) val dwLevel: Long? = null,
-    @JceId(1) val rank: String? = ""
+    @JceId(0) @JvmField val dwLevel: Long? = null,
+    @JceId(1) @JvmField val rank: String? = ""
 ) : JceStruct
 
 @Serializable
 internal class GetTroopMemberListReq(
-    @JceId(0) val uin: Long,
-    @JceId(1) val groupCode: Long,
-    @JceId(2) val nextUin: Long,
-    @JceId(3) val groupUin: Long,
-    @JceId(4) val version: Long? = null,
-    @JceId(5) val reqType: Long? = null,
-    @JceId(6) val getListAppointTime: Long? = null,
-    @JceId(7) val richCardNameVer: Byte? = null
+    @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
 ) : JceStruct
 
 
 @Serializable
 internal class GetTroopMemberListResp(
-    @JceId(0) val uin: Long,
-    @JceId(1) val groupCode: Long,
-    @JceId(2) val groupUin: Long,
-    @JceId(3) val vecTroopMember: List<StTroopMemberInfo>,
-    @JceId(4) val nextUin: Long,
-    @JceId(5) val result: Int,
-    @JceId(6) val errorCode: Short? = null,
-    @JceId(7) val officeMode: Long? = null,
-    @JceId(8) val nextGetTime: Long? = null
+    @JceId(0) @JvmField val uin: Long,
+    @JceId(1) @JvmField val groupCode: Long,
+    @JceId(2) @JvmField val groupUin: Long,
+    @JceId(3) @JvmField val vecTroopMember: List<StTroopMemberInfo>,
+    @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
 ) : JceStruct
 
 @Serializable
 internal class StTroopMemberInfo(
-    @JceId(0) val memberUin: Long,
-    @JceId(1) val faceId: Short,
-    @JceId(2) val age: Byte,
-    @JceId(3) val gender: Byte,
-    @JceId(4) val nick: String = "",
-    @JceId(5) val status: Byte = 20,
-    @JceId(6) val sShowName: String? = null,
-    @JceId(8) val sName: String? = null,
-    @JceId(9) val cGender: Byte? = null,
-    @JceId(10) val sPhone: String? = "",
-    @JceId(11) val sEmail: String? = "",
-    @JceId(12) val sMemo: String? = "",
-    @JceId(13) val autoRemark: String? = "",
-    @JceId(14) val dwMemberLevel: Long? = null,
-    @JceId(15) val dwJoinTime: Long? = null,
-    @JceId(16) val dwLastSpeakTime: Long? = null,
-    @JceId(17) val dwCreditLevel: Long? = null,
-    @JceId(18) val dwFlag: Long? = null,
-    @JceId(19) val dwFlagExt: Long? = null,
-    @JceId(20) val dwPoint: Long? = null,
-    @JceId(21) val concerned: Byte? = null,
-    @JceId(22) val shielded: Byte? = null,
-    @JceId(23) val sSpecialTitle: String? = "",
-    @JceId(24) val dwSpecialTitleExpireTime: Long? = null,
-    @JceId(25) val job: String? = "",
-    @JceId(26) val apolloFlag: Byte? = null,
-    @JceId(27) val dwApolloTimestamp: Long? = null,
-    @JceId(28) val dwGlobalGroupLevel: Long? = null,
-    @JceId(29) val dwTitleId: Long? = null,
-    @JceId(30) val dwShutupTimestap: Long? = null,
-    @JceId(31) val dwGlobalGroupPoint: Long? = null,
-    @JceId(32) val qzusrinfo: QzoneUserInfo? = null,
-    @JceId(33) val richCardNameVer: Byte? = null,
-    @JceId(34) val dwVipType: Long? = null,
-    @JceId(35) val dwVipLevel: Long? = null,
-    @JceId(36) val dwBigClubLevel: Long? = null,
-    @JceId(37) val dwBigClubFlag: Long? = null,
-    @JceId(38) val dwNameplate: Long? = null,
-    @JceId(39) val vecGroupHonor: ByteArray? = null
+    @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
 ) : JceStruct
 
 @Serializable
 internal class QzoneUserInfo(
-    @JceId(0) val eStarState: Int? = null,
-    @JceId(1) val extendInfo: Map<String, String>? = null
+    @JceId(0) @JvmField val eStarState: Int? = null,
+    @JceId(1) @JvmField val extendInfo: Map<String, String>? = null
 ) : JceStruct

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt

@@ -13,123 +13,124 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
 @Serializable
 internal class Cmd0x352 : ProtoBuf {
     @Serializable
-internal class DelImgReq(
-        @ProtoId(1) val srcUin: Long = 0L,
-        @ProtoId(2) val dstUin: Long = 0L,
-        @ProtoId(3) val reqTerm: Int = 0,
-        @ProtoId(4) val reqPlatformType: Int = 0,
-        @ProtoId(5) val buType: Int = 0,
-        @ProtoId(6) val buildVer: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(7) val fileResid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(8) val picWidth: Int = 0,
-        @ProtoId(9) val picHeight: Int = 0
+    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
     ) : ProtoBuf
 
     @Serializable
-internal class DelImgRsp(
-        @ProtoId(1) val result: Int = 0,
-        @ProtoId(2) val failMsg: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val fileResid: ByteArray = EMPTY_BYTE_ARRAY
+    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
     ) : ProtoBuf
 
     @Serializable
-internal class GetImgUrlReq(
-        @ProtoId(1) val srcUin: Long = 0L,
-        @ProtoId(2) val dstUin: Long = 0L,
-        @ProtoId(3) val fileResid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val urlFlag: Int = 0,
-        @ProtoId(6) val urlType: Int = 0,
-        @ProtoId(7) val reqTerm: Int = 0,
-        @ProtoId(8) val reqPlatformType: Int = 0,
-        @ProtoId(9) val srcFileType: Int = 0,
-        @ProtoId(10) val innerIp: Int = 0,
-        @ProtoId(11) val boolAddressBook: Boolean = false,
-        @ProtoId(12) val buType: Int = 0,
-        @ProtoId(13) val buildVer: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(14) val picUpTimestamp: Int = 0,
-        @ProtoId(15) val reqTransferType: Int = 0
+    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
     ) : ProtoBuf
 
     @Serializable
-internal class GetImgUrlRsp(
-        @ProtoId(1) val fileResid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val clientIp: Int = 0,
-        @ProtoId(3) val result: Int = 0,
-        @ProtoId(4) val failMsg: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val bytesThumbDownUrl: List<ByteArray>? = null,
-        @ProtoId(6) val bytesOriginalDownUrl: List<ByteArray>? = null,
-        @ProtoId(7) val msgImgInfo: ImgInfo? = null,
-        @ProtoId(8) val uint32DownIp: List<Int>? = null,
-        @ProtoId(9) val uint32DownPort: List<Int>? = null,
-        @ProtoId(10) val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(11) val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(12) val downDomain: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(13) val bytesBigDownUrl: List<ByteArray>? = null,
-        @ProtoId(14) val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(15) val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(16) val httpsUrlFlag: Int = 0,
-        @ProtoId(26) val msgDownIp6: List<IPv6Info>? = null,
-        @ProtoId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY
+    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<ByteArray>? = null,
+        @ProtoId(6) @JvmField val bytesOriginalDownUrl: List<ByteArray>? = null,
+        @ProtoId(7) @JvmField val msgImgInfo: ImgInfo? = null,
+        @ProtoId(8) @JvmField val uint32DownIp: List<Int>? = null,
+        @ProtoId(9) @JvmField val uint32DownPort: List<Int>? = 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<ByteArray>? = 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<IPv6Info>? = null,
+        @ProtoId(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Suppress("ArrayInDataClass")
     @Serializable
-internal class ImgInfo(
-        @ProtoId(1) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val fileType: Int = 0,
-        @ProtoId(3) val fileSize: Long = 0L,
-        @ProtoId(4) val fileWidth: Int = 0,
-        @ProtoId(5) val fileHeight: Int = 0,
-        @ProtoId(6) val fileFlag: Long = 0L,
-        @ProtoId(7) val fileCutPos: Int = 0
+    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
     ) : ProtoBuf
 
     @Serializable
-internal class IPv6Info(
-        @ProtoId(1) val ip6: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val port: Int = 0
+    internal class IPv6Info(
+        @ProtoId(1) @JvmField val ip6: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val port: Int = 0
     ) : ProtoBuf
 
     @Serializable
-internal class ReqBody(
-        @ProtoId(1) val subcmd: Int = 0, //2是GetImgUrlReq 1是UploadImgReq
-        @ProtoId(2) val msgTryupImgReq: List<TryUpImgReq>? = null,// optional
-        @ProtoId(3) val msgGetimgUrlReq: List<GetImgUrlReq>? = null,// optional
-        @ProtoId(4) val msgDelImgReq: List<DelImgReq>? = null,
-        @ProtoId(10) val netType: Int = 3// 数据网络=5
+    internal class ReqBody(
+        @ProtoId(1) @JvmField val subcmd: Int = 0, //2是GetImgUrlReq 1是UploadImgReq
+        @ProtoId(2) @JvmField val msgTryupImgReq: List<TryUpImgReq>? = null,// optional
+        @ProtoId(3) @JvmField val msgGetimgUrlReq: List<GetImgUrlReq>? = null,// optional
+        @ProtoId(4) @JvmField val msgDelImgReq: List<DelImgReq>? = null,
+        @ProtoId(10) @JvmField val netType: Int = 3// 数据网络=5
     ) : ProtoBuf
 
     @Serializable
-internal class RspBody(
-        @ProtoId(1) val subcmd: Int = 0,
-        @ProtoId(2) val msgTryupImgRsp: List<TryUpImgRsp>? = null,
-        @ProtoId(3) val msgGetimgUrlRsp: List<GetImgUrlRsp>? = null,
-        @ProtoId(4) val boolNewBigchan: Boolean = false,
-        @ProtoId(5) val msgDelImgRsp: List<DelImgRsp>? = null,
-        @ProtoId(10) val failMsg: String? = ""
+    internal class RspBody(
+        @ProtoId(1) @JvmField val subcmd: Int = 0,
+        @ProtoId(2) @JvmField val msgTryupImgRsp: List<TryUpImgRsp>? = null,
+        @ProtoId(3) @JvmField val msgGetimgUrlRsp: List<GetImgUrlRsp>? = null,
+        @ProtoId(4) @JvmField val boolNewBigchan: Boolean = false,
+        @ProtoId(5) @JvmField val msgDelImgRsp: List<DelImgRsp>? = null,
+        @ProtoId(10) @JvmField val failMsg: String? = ""
     ) : ProtoBuf
 
     @Serializable
     internal class TryUpImgReq(
-        @ProtoId(1) val srcUin: Int,
-        @ProtoId(2) val dstUin: Int,
-        @ProtoId(3) val fileId: Int = 0,//从0开始的自增数？貌似有一个连接就要自增1, 但是又会重置回0
-        @ProtoId(4) val fileMd5: ByteArray,
-        @ProtoId(5) val fileSize: Int,
-        @ProtoId(6) val fileName: String,//默认为md5+".jpg"
-        @ProtoId(7) val srcTerm: Int = 5,
-        @ProtoId(8) val platformType: Int = 9,
-        @ProtoId(9) val innerIP: Int = 0,
-        @ProtoId(10) val addressBook: Int = 0,//chatType == 1006为1 我觉得发0没问题
-        @ProtoId(11) val retry: Int = 0,//default
-        @ProtoId(12) val buType: Int = 1,//1或96 不确定
-        @ProtoId(13) val imgOriginal: Int,//是否为原图
-        @ProtoId(14) val imgWidth: Int,
-        @ProtoId(15) val imgHeight: Int,
+        @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,
+        @ProtoId(15) @JvmField val imgHeight: Int,
         /**
          * ImgType:
          *  JPG:    1000
@@ -140,50 +141,50 @@ internal class RspBody(
          *  APNG:   2001
          *  SHARPP: 1004
          */
-        @ProtoId(16) val imgType: Int = 1000,
-        @ProtoId(17) val buildVer: String = "8.2.7.4410",//版本号
-        @ProtoId(18) val fileIndex: ByteArray = EMPTY_BYTE_ARRAY,//default
-        @ProtoId(19) val fileStoreDays: Int = 0,//default
-        @ProtoId(20) val stepFlag: Int = 0,//default
-        @ProtoId(21) val rejectTryFast: Int = 0,//bool
-        @ProtoId(22) val srvUpload: Int = 1,//typeHotPic[1/2/3]
-        @ProtoId(23) val transferUrl: ByteArray = EMPTY_BYTE_ARRAY//rawDownloadUrl, 如果没有就是EMPTY_BYTE_ARRAY
+        @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
     ) : ImgReq
 
     @Serializable
-internal class TryUpImgRsp(
-        @ProtoId(1) val fileId: Long = 0L,
-        @ProtoId(2) val clientIp: Int = 0,
-        @ProtoId(3) val result: Int = 0,
-        @ProtoId(4) val failMsg: String? = "",
-        @ProtoId(5) val boolFileExit: Boolean = false,
-        @ProtoId(6) val msgImgInfo: ImgInfo? = null,
-        @ProtoId(7) val uint32UpIp: List<Int>? = null,
-        @ProtoId(8) val uint32UpPort: List<Int>? = null,
-        @ProtoId(9) val upUkey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(10) val upResid: String = "",
-        @ProtoId(11) val upUuid: String = "",
-        @ProtoId(12) val upOffset: Long = 0L,
-        @ProtoId(13) val blockSize: Long = 0L,
-        @ProtoId(14) val encryptDstip: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(15) val roamdays: Int = 0,
-        @ProtoId(26) val msgUpIp6: List<IPv6Info>? = null,
-        @ProtoId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(60) val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(61) val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(62) val downDomain: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(64) val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(65) val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(66) val httpsUrlFlag: Int = 0,
-        @ProtoId(1001) val msgInfo4busi: TryUpInfo4Busi? = null
+    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<Int>? = null,
+        @ProtoId(8) @JvmField val uint32UpPort: List<Int>? = 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<IPv6Info>? = 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
     ) : ProtoBuf
 
     @Serializable
-internal class TryUpInfo4Busi(
-        @ProtoId(1) val fileResid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val downDomain: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val thumbDownUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val originalDownUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val bigDownUrl: ByteArray = EMPTY_BYTE_ARRAY
+    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
     ) : ProtoBuf
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt

@@ -13,146 +13,147 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
 @Serializable
 internal class Cmd0x388 : ProtoBuf {
     @Serializable
 internal class DelImgReq(
-        @ProtoId(1) val srcUin: Long = 0L,
-        @ProtoId(2) val dstUin: Long = 0L,
-        @ProtoId(3) val reqTerm: Int = 0,
-        @ProtoId(4) val reqPlatformType: Int = 0,
-        @ProtoId(5) val buType: Int = 0,
-        @ProtoId(6) val buildVer: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(7) val fileResid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(8) val picWidth: Int = 0,
-        @ProtoId(9) val picHeight: Int = 0
+        @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
     ) : ProtoBuf
 
     @Serializable
 internal class DelImgRsp(
-        @ProtoId(1) val result: Int = 0,
-        @ProtoId(2) val failMsg: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val fileResid: ByteArray = EMPTY_BYTE_ARRAY
+        @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
     ) : ProtoBuf
 
     @Serializable
 internal class ExpRoamExtendInfo(
-        @ProtoId(1) val resid: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val resid: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
 internal class ExpRoamPicInfo(
-        @ProtoId(1) val shopFlag: Int = 0,
-        @ProtoId(2) val pkgId: Int = 0,
-        @ProtoId(3) val picId: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val shopFlag: Int = 0,
+        @ProtoId(2) @JvmField val pkgId: Int = 0,
+        @ProtoId(3) @JvmField val picId: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
 internal class ExtensionCommPicTryUp(
-        @ProtoId(1) val bytesExtinfo: List<ByteArray>? = null
+        @ProtoId(1) @JvmField val bytesExtinfo: List<ByteArray>? = null
     ) : ProtoBuf
 
     @Serializable
 internal class ExtensionExpRoamTryUp(
-        @ProtoId(1) val msgExproamPicInfo: List<ExpRoamPicInfo>? = null
+        @ProtoId(1) @JvmField val msgExproamPicInfo: List<ExpRoamPicInfo>? = null
     ) : ProtoBuf
 
     @Serializable
 internal class GetImgUrlReq(
-        @ProtoId(1) val groupCode: Long = 0L,
-        @ProtoId(2) val dstUin: Long = 0L,
-        @ProtoId(3) val fileid: Long = 0L,
-        @ProtoId(4) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val urlFlag: Int = 0,
-        @ProtoId(6) val urlType: Int = 0,
-        @ProtoId(7) val reqTerm: Int = 0,
-        @ProtoId(8) val reqPlatformType: Int = 0,
-        @ProtoId(9) val innerIp: Int = 0,
-        @ProtoId(10) val buType: Int = 0,
-        @ProtoId(11) val buildVer: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(12) val fileId: Long = 0L,
-        @ProtoId(13) val fileSize: Long = 0L,
-        @ProtoId(14) val originalPic: Int = 0,
-        @ProtoId(15) val retryReq: Int = 0,
-        @ProtoId(16) val fileHeight: Int = 0,
-        @ProtoId(17) val fileWidth: Int = 0,
-        @ProtoId(18) val picType: Int = 0,
-        @ProtoId(19) val picUpTimestamp: Int = 0,
-        @ProtoId(20) val reqTransferType: Int = 0
+        @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
     ) : ProtoBuf
 
     @Serializable
 internal class GetImgUrlRsp(
-        @ProtoId(1) val fileid: Long = 0L,
-        @ProtoId(2) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val result: Int = 0,
-        @ProtoId(4) val failMsg: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val msgImgInfo: ImgInfo? = null,
-        @ProtoId(6) val bytesThumbDownUrl: List<ByteArray>? = null,
-        @ProtoId(7) val bytesOriginalDownUrl: List<ByteArray>? = null,
-        @ProtoId(8) val bytesBigDownUrl: List<ByteArray>? = null,
-        @ProtoId(9) val uint32DownIp: List<Int>? = null,
-        @ProtoId(10) val uint32DownPort: List<Int>? = null,
-        @ProtoId(11) val downDomain: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(12) val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(13) val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(14) val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(15) val fileId: Long = 0L,
-        @ProtoId(16) val autoDownType: Int = 0,
-        @ProtoId(17) val uint32OrderDownType: List<Int>? = null,
-        @ProtoId(19) val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(20) val httpsUrlFlag: Int = 0,
-        @ProtoId(26) val msgDownIp6: List<IPv6Info>? = null,
-        @ProtoId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY
+        @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<ByteArray>? = null,
+        @ProtoId(7) @JvmField val bytesOriginalDownUrl: List<ByteArray>? = null,
+        @ProtoId(8) @JvmField val bytesBigDownUrl: List<ByteArray>? = null,
+        @ProtoId(9) @JvmField val uint32DownIp: List<Int>? = null,
+        @ProtoId(10) @JvmField val uint32DownPort: List<Int>? = 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<Int>? = null,
+        @ProtoId(19) @JvmField val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(20) @JvmField val httpsUrlFlag: Int = 0,
+        @ProtoId(26) @JvmField val msgDownIp6: List<IPv6Info>? = null,
+        @ProtoId(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
 internal class GetPttUrlReq(
-        @ProtoId(1) val groupCode: Long = 0L,
-        @ProtoId(2) val dstUin: Long = 0L,
-        @ProtoId(3) val fileid: Long = 0L,
-        @ProtoId(4) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val reqTerm: Int = 0,
-        @ProtoId(6) val reqPlatformType: Int = 0,
-        @ProtoId(7) val innerIp: Int = 0,
-        @ProtoId(8) val buType: Int = 0,
-        @ProtoId(9) val buildVer: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(10) val fileId: Long = 0L,
-        @ProtoId(11) val fileKey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(12) val codec: Int = 0,
-        @ProtoId(13) val buId: Int = 0,
-        @ProtoId(14) val reqTransferType: Int = 0,
-        @ProtoId(15) val isAuto: Int = 0
+        @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
     ) : ProtoBuf
 
     @Serializable
 internal class GetPttUrlRsp(
-        @ProtoId(1) val fileid: Long = 0L,
-        @ProtoId(2) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val result: Int = 0,
-        @ProtoId(4) val failMsg: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val bytesDownUrl: List<ByteArray>? = null,
-        @ProtoId(6) val uint32DownIp: List<Int>? = null,
-        @ProtoId(7) val uint32DownPort: List<Int>? = null,
-        @ProtoId(8) val downDomain: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(9) val downPara: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(10) val fileId: Long = 0L,
-        @ProtoId(11) val transferType: Int = 0,
-        @ProtoId(12) val allowRetry: Int = 0,
-        @ProtoId(26) val msgDownIp6: List<IPv6Info>? = null,
-        @ProtoId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(28) val strDomain: String = ""
+        @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<ByteArray>? = null,
+        @ProtoId(6) @JvmField val uint32DownIp: List<Int>? = null,
+        @ProtoId(7) @JvmField val uint32DownPort: List<Int>? = 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<IPv6Info>? = null,
+        @ProtoId(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(28) @JvmField val strDomain: String = ""
     ) : ProtoBuf
 
     @Suppress("ArrayInDataClass")
     @Serializable
 internal class ImgInfo(
-        @ProtoId(1) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val fileType: Int = 0,
-        @ProtoId(3) val fileSize: Long = 0L,
-        @ProtoId(4) val fileWidth: Int = 0,
-        @ProtoId(5) val fileHeight: Int = 0
+        @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
     ) : ProtoBuf {
         override fun toString(): String {
             return "ImgInfo(fileMd5=${fileMd5.contentToString()}, fileType=$fileType, fileSize=$fileSize, fileWidth=$fileWidth, fileHeight=$fileHeight)"
@@ -161,128 +162,128 @@ internal class ImgInfo(
 
     @Serializable
 internal class IPv6Info(
-        @ProtoId(1) val ip6: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val port: Int = 0
+        @ProtoId(1) @JvmField val ip6: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val port: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class PicSize(
-        @ProtoId(1) val original: Int = 0,
-        @ProtoId(2) val thumb: Int = 0,
-        @ProtoId(3) val high: Int = 0
+        @ProtoId(1) @JvmField val original: Int = 0,
+        @ProtoId(2) @JvmField val thumb: Int = 0,
+        @ProtoId(3) @JvmField val high: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class ReqBody(
-        @ProtoId(1) val netType: Int = 0,
-        @ProtoId(2) val subcmd: Int = 0,
-        @ProtoId(3) val msgTryupImgReq: List<TryUpImgReq>? = null,
-        @ProtoId(4) val msgGetimgUrlReq: List<GetImgUrlReq>? = null,
-        @ProtoId(5) val msgTryupPttReq: List<TryUpPttReq>? = null,
-        @ProtoId(6) val msgGetpttUrlReq: List<GetPttUrlReq>? = null,
-        @ProtoId(7) val commandId: Int = 0,
-        @ProtoId(8) val msgDelImgReq: List<DelImgReq>? = null,
-        @ProtoId(1001) val extension: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val netType: Int = 0,
+        @ProtoId(2) @JvmField val subcmd: Int = 0,
+        @ProtoId(3) @JvmField val msgTryupImgReq: List<TryUpImgReq>? = null,
+        @ProtoId(4) @JvmField val msgGetimgUrlReq: List<GetImgUrlReq>? = null,
+        @ProtoId(5) @JvmField val msgTryupPttReq: List<TryUpPttReq>? = null,
+        @ProtoId(6) @JvmField val msgGetpttUrlReq: List<GetPttUrlReq>? = null,
+        @ProtoId(7) @JvmField val commandId: Int = 0,
+        @ProtoId(8) @JvmField val msgDelImgReq: List<DelImgReq>? = null,
+        @ProtoId(1001) @JvmField val extension: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
 internal class RspBody(
-        @ProtoId(1) val clientIp: Int = 0,
-        @ProtoId(2) val subcmd: Int = 0,
-        @ProtoId(3) val msgTryupImgRsp: List<TryUpImgRsp>? = null,
-        @ProtoId(4) val msgGetimgUrlRsp: List<GetImgUrlRsp>? = null,
-        @ProtoId(5) val msgTryupPttRsp: List<TryUpPttRsp>? = null,
-        @ProtoId(6) val msgGetpttUrlRsp: List<GetPttUrlRsp>? = null,
-        @ProtoId(7) val msgDelImgRsp: List<DelImgRsp>? = null
+        @ProtoId(1) @JvmField val clientIp: Int = 0,
+        @ProtoId(2) @JvmField val subcmd: Int = 0,
+        @ProtoId(3) @JvmField val msgTryupImgRsp: List<TryUpImgRsp>? = null,
+        @ProtoId(4) @JvmField val msgGetimgUrlRsp: List<GetImgUrlRsp>? = null,
+        @ProtoId(5) @JvmField val msgTryupPttRsp: List<TryUpPttRsp>? = null,
+        @ProtoId(6) @JvmField val msgGetpttUrlRsp: List<GetPttUrlRsp>? = null,
+        @ProtoId(7) @JvmField val msgDelImgRsp: List<DelImgRsp>? = null
     ) : ProtoBuf
 
     @Serializable
 internal class TryUpImgReq(
-        @ProtoId(1) val groupCode: Long = 0L,
-        @ProtoId(2) val srcUin: Long = 0L,
-        @ProtoId(3) val fileId: Long = 0L,
-        @ProtoId(4) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val fileSize: Long = 0L,
-        @ProtoId(6) val fileName: String = "",
-        @ProtoId(7) val srcTerm: Int = 0,
-        @ProtoId(8) val platformType: Int = 0,
-        @ProtoId(9) val buType: Int = 0,
-        @ProtoId(10) val picWidth: Int = 0,
-        @ProtoId(11) val picHeight: Int = 0,
-        @ProtoId(12) val picType: Int = 0,
-        @ProtoId(13) val buildVer: String = "",
-        @ProtoId(14) val innerIp: Int = 0,
-        @ProtoId(15) val appPicType: Int = 0,
-        @ProtoId(16) val originalPic: Int = 0,
-        @ProtoId(17) val fileIndex: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(18) val dstUin: Long = 0L,
-        @ProtoId(19) val srvUpload: Int = 0,
-        @ProtoId(20) val transferUrl: ByteArray = EMPTY_BYTE_ARRAY
+        @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
     ) : ImgReq
 
     @Serializable
 internal class TryUpImgRsp(
-        @ProtoId(1) val fileId: Long = 0L,
-        @ProtoId(2) val result: Int = 0,
-        @ProtoId(3) val failMsg: String = "",
-        @ProtoId(4) val boolFileExit: Boolean = false,
-        @ProtoId(5) val msgImgInfo: ImgInfo? = null,
-        @ProtoId(6) val uint32UpIp: List<Int>? = null,
-        @ProtoId(7) val uint32UpPort: List<Int>? = null,
-        @ProtoId(8) val upUkey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(9) val fileid: Long = 0L,
-        @ProtoId(10) val upOffset: Long = 0L,
-        @ProtoId(11) val blockSize: Long = 0L,
-        @ProtoId(12) val boolNewBigChan: Boolean = false,
-        @ProtoId(26) val msgUpIp6: List<IPv6Info>? = null,
-        @ProtoId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(1001) val msgInfo4busi: TryUpInfo4Busi? = null
+        @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<Int>? = null,
+        @ProtoId(7) @JvmField val uint32UpPort: List<Int>? = 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<IPv6Info>? = null,
+        @ProtoId(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(1001) @JvmField val msgInfo4busi: TryUpInfo4Busi? = null
     ) : ProtoBuf
 
     @Serializable
 internal class TryUpInfo4Busi(
-        @ProtoId(1) val downDomain: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val thumbDownUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val originalDownUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val bigDownUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val fileResid: ByteArray = EMPTY_BYTE_ARRAY
+        @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
     ) : ProtoBuf
 
     @Serializable
 internal class TryUpPttReq(
-        @ProtoId(1) val groupCode: Long = 0L,
-        @ProtoId(2) val srcUin: Long = 0L,
-        @ProtoId(3) val fileId: Long = 0L,
-        @ProtoId(4) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val fileSize: Long = 0L,
-        @ProtoId(6) val fileName: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(7) val srcTerm: Int = 0,
-        @ProtoId(8) val platformType: Int = 0,
-        @ProtoId(9) val buType: Int = 0,
-        @ProtoId(10) val buildVer: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(11) val innerIp: Int = 0,
-        @ProtoId(12) val voiceLength: Int = 0,
-        @ProtoId(13) val boolNewUpChan: Boolean = false,
-        @ProtoId(14) val codec: Int = 0,
-        @ProtoId(15) val voiceType: Int = 0,
-        @ProtoId(16) val buId: Int = 0
+        @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
     ) : ProtoBuf
 
     @Serializable
 internal class TryUpPttRsp(
-        @ProtoId(1) val fileId: Long = 0L,
-        @ProtoId(2) val result: Int = 0,
-        @ProtoId(3) val failMsg: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val boolFileExit: Boolean = false,
-        @ProtoId(5) val uint32UpIp: List<Int>? = null,
-        @ProtoId(6) val uint32UpPort: List<Int>? = null,
-        @ProtoId(7) val upUkey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(8) val fileid: Long = 0L,
-        @ProtoId(9) val upOffset: Long = 0L,
-        @ProtoId(10) val blockSize: Long = 0L,
-        @ProtoId(11) val fileKey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(12) val channelType: Int = 0,
-        @ProtoId(26) val msgUpIp6: List<IPv6Info>? = null,
-        @ProtoId(27) val clientIp6: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val fileId: Long = 0L,
+        @ProtoId(2) @JvmField val result: Int = 0,
+        @ProtoId(3) @JvmField val failMsg: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val boolFileExit: Boolean = false,
+        @ProtoId(5) @JvmField val uint32UpIp: List<Int>? = null,
+        @ProtoId(6) @JvmField val uint32UpPort: List<Int>? = 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<IPv6Info>? = null,
+        @ProtoId(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x857.kt

@@ -17,54 +17,55 @@ import kotlinx.serialization.protobuf.ProtoNumberType
 import kotlinx.serialization.protobuf.ProtoType
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
 class GroupOpenSysMsg : ProtoBuf {
     @Serializable
     internal class LightApp(
-        @ProtoId(1) val app: String = "",
-        @ProtoId(2) val view: String = "",
-        @ProtoId(3) val desc: String = "",
-        @ProtoId(4) val prompt: String = "",
-        @ProtoId(5) val ver: String = "",
-        @ProtoId(6) val meta: String = "",
-        @ProtoId(7) val config: String = "",
-        @ProtoId(8) val source: Source? = null
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class RichMsg(
-        @ProtoId(1) val title: String = "",
-        @ProtoId(2) val desc: String = "",
-        @ProtoId(3) val brief: String = "",
-        @ProtoId(4) val cover: String = "",
-        @ProtoId(5) val url: String = "",
-        @ProtoId(6) val source: Source? = null
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class Sender(
-        @ProtoId(1) val uin: Long = 0L,
-        @ProtoId(2) val nick: String = "",
-        @ProtoId(3) val avatar: String = "",
-        @ProtoId(4) val url: String = ""
+        @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 = ""
     ) : ProtoBuf
 
     @Serializable
     internal class Source(
-        @ProtoId(1) val name: String = "",
-        @ProtoId(2) val icon: String = "",
-        @ProtoId(3) val url: String = ""
+        @ProtoId(1) @JvmField val name: String = "",
+        @ProtoId(2) @JvmField val icon: String = "",
+        @ProtoId(3) @JvmField val url: String = ""
     ) : ProtoBuf
 
     @Serializable
     internal class SysMsgBody(
-        @ProtoId(1) val groupId: Long = 0L,
-        @ProtoId(2) val appid: Long = 0L,
-        @ProtoId(3) val sender: Sender? = null,
-        @ProtoId(4) val msgType: Int = 0,
-        @ProtoId(5) val content: String = "",
-        @ProtoId(6) val richMsg: RichMsg? = null,
-        @ProtoId(7) val lightApp: LightApp? = null
+        @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
     ) : ProtoBuf
 }
 
@@ -72,337 +73,337 @@ class GroupOpenSysMsg : ProtoBuf {
 internal class TroopTips0x857 : ProtoBuf {
     @Serializable
     internal class AIOGrayTipsInfo(
-        @ProtoId(1) val optUint32ShowLastest: Int = 0,
-        @ProtoId(2) val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val optUint32Remind: Int = 0,
-        @ProtoId(4) val optBytesBrief: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val receiverUin: Long = 0L,
-        @ProtoId(6) val reliaoAdminOpt: Int = 0,
-        @ProtoId(7) val robotGroupOpt: Int = 0
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class AIOTopTipsInfo(
-        @ProtoId(1) val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val optUint32Icon: Int = 0,
-        @ProtoId(3) val optEnumAction: Int /* enum */ = 1,
-        @ProtoId(4) val optBytesUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val optBytesData: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(6) val optBytesDataI: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(7) val optBytesDataA: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(8) val optBytesDataP: ByteArray = EMPTY_BYTE_ARRAY
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class FloatedTipsInfo(
-        @ProtoId(1) val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class GeneralGrayTipInfo(
-        @ProtoId(1) val busiType: Long = 0L,
-        @ProtoId(2) val busiId: Long = 0L,
-        @ProtoId(3) val ctrlFlag: Int = 0,
-        @ProtoId(4) val c2cType: Int = 0,
-        @ProtoId(5) val serviceType: Int = 0,
-        @ProtoId(6) val templId: Long = 0L,
-        @ProtoId(7) val msgTemplParam: List<TemplParam>? = null,
-        @ProtoId(8) val content: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(10) val tipsSeqId: Long = 0L,
-        @ProtoId(100) val pbReserv: ByteArray = EMPTY_BYTE_ARRAY
+        @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<TemplParam>? = 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
     ) : ProtoBuf
 
     @Serializable
     internal class GoldMsgTipsElem(
-        @ProtoId(1) val type: Int = 0,
-        @ProtoId(2) val billno: String = "",
-        @ProtoId(3) val result: Int = 0,
-        @ProtoId(4) val amount: Int = 0,
-        @ProtoId(5) val total: Int = 0,
-        @ProtoId(6) val interval: Int = 0,
-        @ProtoId(7) val finish: Int = 0,
-        @ProtoId(8) val uin: List<Long>? = null,
-        @ProtoId(9) val action: Int = 0
+        @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<Long>? = null,
+        @ProtoId(9) @JvmField val action: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class GroupInfoChange(
-        @ProtoId(1) val groupHonorSwitch: Int = 0
+        @ProtoId(1) @JvmField val groupHonorSwitch: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class GroupNotifyInfo(
-        @ProtoId(1) val optUint32AutoPullFlag: Int = 0,
-        @ProtoId(2) val optBytesFeedsId: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val optUint32AutoPullFlag: Int = 0,
+        @ProtoId(2) @JvmField val optBytesFeedsId: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class InstCtrl(
-        @ProtoId(1) val msgSendToInst: List<InstInfo>? = null,
-        @ProtoId(2) val msgExcludeInst: List<InstInfo>? = null,
-        @ProtoId(3) val msgFromInst: InstInfo? = null
+        @ProtoId(1) @JvmField val msgSendToInst: List<InstInfo>? = null,
+        @ProtoId(2) @JvmField val msgExcludeInst: List<InstInfo>? = null,
+        @ProtoId(3) @JvmField val msgFromInst: InstInfo? = null
     ) : ProtoBuf
 
     @Serializable
     internal class InstInfo(
-        @ProtoId(1) val apppid: Int = 0,
-        @ProtoId(2) val instid: Int = 0,
-        @ProtoId(3) val platform: Int = 0,
-        @ProtoId(4) val openAppid: Int = 0,
-        @ProtoId(5) val productid: Int = 0,
-        @ProtoId(6) val ssoBid: Int = 0,
-        @ProtoId(7) val guid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(8) val verMin: Int = 0,
-        @ProtoId(9) val verMax: Int = 0
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class LbsShareChangePushInfo(
-        @ProtoId(1) val msgType: Int = 0,
-        @ProtoId(2) val msgInfo: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val versionCtrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val groupId: Long = 0L,
-        @ProtoId(5) val operUin: Long = 0L,
-        @ProtoId(6) val grayTips: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(7) val msgSeq: Long = 0L,
-        @ProtoId(8) val joinNums: Int = 0,
-        @ProtoId(99) val pushType: Int = 0,
-        @ProtoId(100) val extInfo: ByteArray = EMPTY_BYTE_ARRAY
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class LuckyBagNotify(
-        @ProtoId(1) val msgTips: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val msgTips: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class MediaChangePushInfo(
-        @ProtoId(1) val msgType: Int = 0,
-        @ProtoId(2) val msgInfo: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val versionCtrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val groupId: Long = 0L,
-        @ProtoId(5) val operUin: Long = 0L,
-        @ProtoId(6) val grayTips: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(7) val msgSeq: Long = 0L,
-        @ProtoId(8) val joinNums: Int = 0,
-        @ProtoId(9) val msgPerSetting: PersonalSetting? = null,
-        @ProtoId(10) val playMode: Int = 0,
-        @ProtoId(99) val mediaType: Int = 0,
-        @ProtoId(100) val extInfo: ByteArray = EMPTY_BYTE_ARRAY
+        @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
     ) : ProtoBuf {
         @Serializable
         internal class PersonalSetting(
-            @ProtoId(1) val themeId: Int = 0,
-            @ProtoId(2) val playerId: Int = 0,
-            @ProtoId(3) val fontId: Int = 0
+            @ProtoId(1) @JvmField val themeId: Int = 0,
+            @ProtoId(2) @JvmField val playerId: Int = 0,
+            @ProtoId(3) @JvmField val fontId: Int = 0
         ) : ProtoBuf
     }
 
     @Serializable
     internal class MessageBoxInfo(
-        @ProtoId(1) val optBytesContent: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val optBytesTitle: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val optBytesButton: ByteArray = EMPTY_BYTE_ARRAY
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class MessageRecallReminder(
-        @ProtoId(1) val uin: Long = 0L,
-        @ProtoId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val recalledMsgList: List<MessageMeta> = listOf(),
-        @ProtoId(4) val reminderContent: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val userdef: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(6) val groupType: Int = 0,
-        @ProtoId(7) val opType: Int = 0
+        @ProtoId(1) @JvmField val uin: Long = 0L,
+        @ProtoId(2) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val recalledMsgList: List<MessageMeta> = 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
     ) : ProtoBuf {
         @Serializable
         internal class MessageMeta(
-            @ProtoId(1) val seq: Int = 0,
-            @ProtoId(2) val time: Int = 0,
-            @ProtoId(3) val msgRandom: Int = 0,
-            @ProtoId(4) val msgType: Int = 0,
-            @ProtoId(5) val msgFlag: Int = 0,
-            @ProtoId(6) val authorUin: Long = 0L
+            @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
         ) : ProtoBuf
     }
 
     @Serializable
     internal class MiniAppNotify(
-        @ProtoId(1) val msg: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val msg: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class NotifyMsgBody(
-        @ProtoId(1) val optEnumType: Int /* enum */ = 1,
-        @ProtoId(2) val optUint64MsgTime: Long = 0L,
-        @ProtoId(3) val optUint64MsgExpires: Long = 0L,
-        @ProtoId(4) val optUint64GroupCode: Long = 0L,
-        @ProtoId(5) val optMsgGraytips: AIOGrayTipsInfo? = null,
-        @ProtoId(6) val optMsgMessagebox: MessageBoxInfo? = null,
-        @ProtoId(7) val optMsgFloatedtips: FloatedTipsInfo? = null,
-        @ProtoId(8) val optMsgToptips: AIOTopTipsInfo? = null,
-        @ProtoId(9) val optMsgRedtips: RedGrayTipsInfo? = null,
-        @ProtoId(10) val optMsgGroupNotify: GroupNotifyInfo? = null,
-        @ProtoId(11) val optMsgRecall: MessageRecallReminder? = null,
-        @ProtoId(12) val optMsgThemeNotify: ThemeStateNotify? = null,
-        @ProtoId(13) val serviceType: Int = 0,
-        @ProtoId(14) val optMsgObjmsgUpdate: NotifyObjmsgUpdate? = null,
-        @ProtoId(15) val optMsgWerewolfPush: WereWolfPush? = null,
-        // @SerialId(16) val optStcmGameState: ApolloGameStatus.STCMGameMessage? = null,
-        // @SerialId(17) val aplloMsgPush: ApolloPushMsgInfo.STPushMsgElem? = null,
-        @ProtoId(18) val optMsgGoldtips: GoldMsgTipsElem? = null,
-        @ProtoId(20) val optMsgMiniappNotify: MiniAppNotify? = null,
-        @ProtoId(21) val optUint64SenderUin: Long = 0L,
-        @ProtoId(22) val optMsgLuckybagNotify: LuckyBagNotify? = null,
-        @ProtoId(23) val optMsgTroopformtipsPush: TroopFormGrayTipsInfo? = null,
-        @ProtoId(24) val optMsgMediaPush: MediaChangePushInfo? = null,
-        @ProtoId(26) val optGeneralGrayTip: GeneralGrayTipInfo? = null,
-        @ProtoId(27) val optMsgVideoPush: VideoChangePushInfo? = null,
-        @ProtoId(28) val optLbsShareChangePlusInfo: LbsShareChangePushInfo? = null,
-        @ProtoId(29) val optMsgSingPush: SingChangePushInfo? = null,
-        @ProtoId(30) val optMsgGroupInfoChange: GroupInfoChange? = null
+        @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,
+        // @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
     ) : ProtoBuf
 
     @Serializable
     internal class NotifyObjmsgUpdate(
-        @ProtoId(1) val objmsgId: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val updateType: Int = 0,
-        @ProtoId(3) val extMsg: ByteArray = EMPTY_BYTE_ARRAY
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class RedGrayTipsInfo(
-        @ProtoId(1) val optUint32ShowLastest: Int = 0,
-        @ProtoId(2) val senderUin: Long = 0L,
-        @ProtoId(3) val receiverUin: Long = 0L,
-        @ProtoId(4) val senderRichContent: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val receiverRichContent: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(6) val authkey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoType(ProtoNumberType.SIGNED) @ProtoId(7) val sint32Msgtype: Int = 0,
-        @ProtoId(8) val luckyFlag: Int = 0,
-        @ProtoId(9) val hideFlag: Int = 0,
-        @ProtoId(10) val pcBody: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(11) val icon: Int = 0,
-        @ProtoId(12) val luckyUin: Long = 0L,
-        @ProtoId(13) val time: Int = 0,
-        @ProtoId(14) val random: Int = 0,
-        @ProtoId(15) val broadcastRichContent: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(16) val idiom: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(17) val idiomSeq: Int = 0,
-        @ProtoId(18) val idiomAlpha: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(19) val jumpurl: ByteArray = EMPTY_BYTE_ARRAY
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class ReqBody(
-        @ProtoId(1) val optUint64GroupCode: Long = 0L,
-        @ProtoId(2) val uint64Memberuins: List<Long>? = null,
-        @ProtoId(3) val optUint32Offline: Int = 0,
-        @ProtoId(4) val msgInstCtrl: InstCtrl? = null,
-        @ProtoId(5) val optBytesMsg: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(6) val optUint32BusiType: Int = 0
+        @ProtoId(1) @JvmField val optUint64GroupCode: Long = 0L,
+        @ProtoId(2) @JvmField val uint64Memberuins: List<Long>? = 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
     ) : ProtoBuf
 
     @Serializable
     internal class RspBody(
-        @ProtoId(1) val optUint64GroupCode: Long = 0L
+        @ProtoId(1) @JvmField val optUint64GroupCode: Long = 0L
     ) : ProtoBuf
 
     @Serializable
     internal class SingChangePushInfo(
-        @ProtoId(1) val seq: Long = 0L,
-        @ProtoId(2) val actionType: Int = 0,
-        @ProtoId(3) val groupId: Long = 0L,
-        @ProtoId(4) val operUin: Long = 0L,
-        @ProtoId(5) val grayTips: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(6) val joinNums: Int = 0
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class TemplParam(
-        @ProtoId(1) val name: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val value: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val name: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val value: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class ThemeStateNotify(
-        @ProtoId(1) val state: Int = 0,
-        @ProtoId(2) val feedsId: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val themeName: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val actionUin: Long = 0L,
-        @ProtoId(5) val createUin: Long = 0L
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class TroopFormGrayTipsInfo(
-        @ProtoId(1) val writerUin: Long = 0L,
-        @ProtoId(2) val creatorUin: Long = 0L,
-        @ProtoId(3) val richContent: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val optBytesUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val creatorNick: ByteArray = EMPTY_BYTE_ARRAY
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class VideoChangePushInfo(
-        @ProtoId(1) val seq: Long = 0L,
-        @ProtoId(2) val actionType: Int = 0,
-        @ProtoId(3) val groupId: Long = 0L,
-        @ProtoId(4) val operUin: Long = 0L,
-        @ProtoId(5) val grayTips: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(6) val joinNums: Int = 0,
-        @ProtoId(100) val extInfo: ByteArray = EMPTY_BYTE_ARRAY
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class WereWolfPush(
-        @ProtoId(1) val pushType: Int = 0,
-        @ProtoId(2) val gameRoom: Long = 0L,
-        @ProtoId(3) val enumGameState: Int = 0,
-        @ProtoId(4) val gameRound: Int = 0,
-        @ProtoId(5) val roles: List<Role>? = null,
-        @ProtoId(6) val speaker: Long = 0L,
-        @ProtoId(7) val judgeUin: Long = 0L,
-        @ProtoId(8) val judgeWords: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(9) val enumOperation: Int = 0,
-        @ProtoId(10) val srcUser: Long = 0L,
-        @ProtoId(11) val dstUser: Long = 0L,
-        @ProtoId(12) val deadUsers: List<Long>? = null,
-        @ProtoId(13) val gameResult: Int = 0,
-        @ProtoId(14) val timeoutSec: Int = 0,
-        @ProtoId(15) val killConfirmed: Int = 0,
-        @ProtoId(16) val judgeNickname: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(17) val votedTieUsers: List<Long>? = null
+        @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<Role>? = 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<Long>? = 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<Long>? = null
     ) : ProtoBuf {
         @Serializable
         internal class GameRecord(
-            @ProtoId(1) val total: Int = 0,
-            @ProtoId(2) val win: Int = 0,
-            @ProtoId(3) val lose: Int = 0,
-            @ProtoId(4) val draw: Int = 0
+            @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
         ) : ProtoBuf
 
         @Serializable
         internal class Role(
-            @ProtoId(1) val uin: Long = 0L,
-            @ProtoId(2) val enumType: Int = 0,
-            @ProtoId(3) val enumState: Int = 0,
-            @ProtoId(4) val canSpeak: Int = 0,
-            @ProtoId(5) val canListen: Int = 0,
-            @ProtoId(6) val position: Int = 0,
-            @ProtoId(7) val canVote: Int = 0,
-            @ProtoId(8) val canVoted: Int = 0,
-            @ProtoId(9) val alreadyChecked: Int = 0,
-            @ProtoId(10) val alreadySaved: Int = 0,
-            @ProtoId(11) val alreadyPoisoned: Int = 0,
-            @ProtoId(12) val playerState: Int = 0,
-            @ProtoId(13) val enumDeadOp: Int = 0,
-            @ProtoId(14) val enumOperation: Int = 0,
-            @ProtoId(15) val dstUser: Long = 0L,
-            @ProtoId(16) val operationRound: Int = 0,
-            @ProtoId(17) val msgGameRecord: GameRecord? = null,
-            @ProtoId(18) val isWerewolf: Int = 0,
-            @ProtoId(19) val defendedUser: Long = 0L,
-            @ProtoId(20) val isSheriff: Int = 0
+            @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
         ) : ProtoBuf
     }
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x858.kt

@@ -17,79 +17,80 @@ import kotlinx.serialization.protobuf.ProtoNumberType
 import kotlinx.serialization.protobuf.ProtoType
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
 @Serializable
 internal class Oidb0x858 : ProtoBuf {
     @Serializable
 internal class GoldMsgTipsElem(
-        @ProtoId(1) val type: Int = 0,
-        @ProtoId(2) val billno: String = "",
-        @ProtoId(3) val result: Int = 0,
-        @ProtoId(4) val amount: Int = 0,
-        @ProtoId(5) val total: Int = 0,
-        @ProtoId(6) val interval: Int = 0,
-        @ProtoId(7) val finish: Int = 0,
-        @ProtoId(8) val uin: List<Long>? = null,
-        @ProtoId(9) val action: Int = 0
+        @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<Long>? = null,
+        @ProtoId(9) @JvmField val action: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class MessageRecallReminder(
-        @ProtoId(1) val uin: Long = 0L,
-        @ProtoId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val recalledMsgList: List<MessageMeta> = listOf(),
-        @ProtoId(4) val reminderContent: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val userdef: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val uin: Long = 0L,
+        @ProtoId(2) @JvmField val nickname: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val recalledMsgList: List<MessageMeta> = listOf(),
+        @ProtoId(4) @JvmField val reminderContent: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(5) @JvmField val userdef: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf {
         @Serializable
 internal class MessageMeta(
-            @ProtoId(1) val seq: Int = 0,
-            @ProtoId(2) val time: Int = 0,
-            @ProtoId(3) val msgRandom: Int = 0
+            @ProtoId(1) @JvmField val seq: Int = 0,
+            @ProtoId(2) @JvmField val time: Int = 0,
+            @ProtoId(3) @JvmField val msgRandom: Int = 0
         ) : ProtoBuf
     }
 
     @Serializable
 internal class NotifyMsgBody(
-        @ProtoId(1) val optEnumType: Int /* enum */ = 5,
-        @ProtoId(2) val optUint64MsgTime: Long = 0L,
-        @ProtoId(3) val optUint64MsgExpires: Long = 0L,
-        @ProtoId(4) val optUint64ConfUin: Long = 0L,
-        @ProtoId(5) val optMsgRedtips: RedGrayTipsInfo? = null,
-        @ProtoId(6) val optMsgRecallReminder: MessageRecallReminder? = null,
-        @ProtoId(7) val optMsgObjUpdate: NotifyObjmsgUpdate? = null,
-        // @SerialId(8) val optStcmGameState: ApolloGameStatus.STCMGameMessage? = null,
-        // @SerialId(9) val aplloMsgPush: ApolloPushMsgInfo.STPushMsgElem? = null,
-        @ProtoId(10) val optMsgGoldtips: GoldMsgTipsElem? = null
+        @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,
+        // @SerialId(8) @JvmField val optStcmGameState: ApolloGameStatus.STCMGameMessage? = null,
+        // @SerialId(9) @JvmField val aplloMsgPush: ApolloPushMsgInfo.STPushMsgElem? = null,
+        @ProtoId(10) @JvmField val optMsgGoldtips: GoldMsgTipsElem? = null
     ) : ProtoBuf
 
     @Serializable
 internal class NotifyObjmsgUpdate(
-        @ProtoId(1) val objmsgId: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val updateType: Int = 0,
-        @ProtoId(3) val extMsg: ByteArray = EMPTY_BYTE_ARRAY
+        @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
     ) : ProtoBuf
 
     @Serializable
 internal class RedGrayTipsInfo(
-        @ProtoId(1) val optUint32ShowLastest: Int = 0,
-        @ProtoId(2) val senderUin: Long = 0L,
-        @ProtoId(3) val receiverUin: Long = 0L,
-        @ProtoId(4) val senderRichContent: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val receiverRichContent: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(6) val authkey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoType(ProtoNumberType.SIGNED) @ProtoId(7) val sint32Msgtype: Int = 0,
-        @ProtoId(8) val luckyFlag: Int = 0,
-        @ProtoId(9) val hideFlag: Int = 0,
-        @ProtoId(10) val pcBody: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(11) val icon: Int = 0,
-        @ProtoId(12) val luckyUin: Long = 0L,
-        @ProtoId(13) val time: Int = 0,
-        @ProtoId(14) val random: Int = 0,
-        @ProtoId(15) val broadcastRichContent: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(16) val idiom: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(17) val idiomSeq: Int = 0,
-        @ProtoId(18) val idiomAlpha: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(19) val jumpurl: ByteArray = EMPTY_BYTE_ARRAY
+        @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
     ) : ProtoBuf
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Define.kt

@@ -13,61 +13,61 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
-@Serializable
 internal class Common : ProtoBuf {
     @Serializable
     internal class BindInfo(
-        @ProtoId(1) val friUin: Long = 0L,
-        @ProtoId(2) val friNick: String = "",
-        @ProtoId(3) val time: Long = 0L,
-        @ProtoId(4) val bindStatus: Int = 0
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class MedalInfo(
-        @ProtoId(1) val id: Int = 0,
-        @ProtoId(2) val type: Int = 0,
-        @ProtoId(4) val seq: Long = 0,
-        @ProtoId(5) val name: String = "",
-        @ProtoId(6) val newflag: Int = 0,
-        @ProtoId(7) val time: Long = 0L,
-        @ProtoId(8) val msgBindFri: BindInfo? = null,
-        @ProtoId(11) val desc: String = "",
-        @ProtoId(31) val level: Int = 0,
-        @ProtoId(36) val taskinfos: List<MedalTaskInfo>? = null,
-        @ProtoId(40) val point: Int = 0,
-        @ProtoId(41) val pointLevel2: Int = 0,
-        @ProtoId(42) val pointLevel3: Int = 0,
-        @ProtoId(43) val seqLevel2: Long = 0,
-        @ProtoId(44) val seqLevel3: Long = 0,
-        @ProtoId(45) val timeLevel2: Long = 0L,
-        @ProtoId(46) val timeLevel3: Long = 0L,
-        @ProtoId(47) val descLevel2: String = "",
-        @ProtoId(48) val descLevel3: String = "",
-        @ProtoId(49) val endtime: Int = 0,
-        @ProtoId(50) val detailUrl: String = "",
-        @ProtoId(51) val detailUrl2: String = "",
-        @ProtoId(52) val detailUrl3: String = "",
-        @ProtoId(53) val taskDesc: String = "",
-        @ProtoId(54) val taskDesc2: String = "",
-        @ProtoId(55) val taskDesc3: String = "",
-        @ProtoId(56) val levelCount: Int = 0,
-        @ProtoId(57) val noProgress: Int = 0,
-        @ProtoId(58) val resource: String = "",
-        @ProtoId(59) val fromuinLevel: Int = 0,
-        @ProtoId(60) val unread: Int = 0,
-        @ProtoId(61) val unread2: Int = 0,
-        @ProtoId(62) val unread3: Int = 0
+        @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<MedalTaskInfo>? = 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
     ) : ProtoBuf
 
     @Serializable
     internal class MedalTaskInfo(
-        @ProtoId(1) val taskid: Int = 0,
-        @ProtoId(32) val int32TaskValue: Int = 0,
-        @ProtoId(33) val tarValue: Int = 0,
-        @ProtoId(34) val tarValueLevel2: Int = 0,
-        @ProtoId(35) val tarValueLevel3: Int = 0
+        @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
     ) : ProtoBuf
 }
 
@@ -75,475 +75,475 @@ internal class Common : ProtoBuf {
 internal class AppointDefine : ProtoBuf {
     @Serializable
     internal class ADFeedContent(
-        @ProtoId(1) val msgUserInfo: UserInfo? = null,
-        @ProtoId(2) val strPicUrl: List<String> = listOf(),
-        @ProtoId(3) val msgText: RichText? = null,
-        @ProtoId(4) val attendInfo: String = "",
-        @ProtoId(5) val actionUrl: String = "",
-        @ProtoId(6) val publishTime: Int = 0,
-        @ProtoId(7) val msgHotTopicList: HotTopicList? = null,
-        @ProtoId(8) val moreUrl: String = "",
-        @ProtoId(9) val recordDuration: String = ""
+        @ProtoId(1) @JvmField val msgUserInfo: UserInfo? = null,
+        @ProtoId(2) @JvmField val strPicUrl: List<String> = 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 = ""
     ) : ProtoBuf
 
     @Serializable
     internal class RichText(
-        @ProtoId(1) val msgElems: List<Elem>? = null
+        @ProtoId(1) @JvmField val msgElems: List<Elem>? = null
     ) : ProtoBuf
 
     @Serializable
     internal class RankEvent(
-        @ProtoId(1) val listtype: Int = 0,
-        @ProtoId(2) val notifytype: Int = 0,
-        @ProtoId(3) val eventtime: Int = 0,
-        @ProtoId(4) val seq: Int = 0,
-        @ProtoId(5) val notifyTips: String = ""
+        @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 = ""
     ) : ProtoBuf
 
     @Serializable
     internal class Wifi(
-        @ProtoId(1) val mac: Long = 0L,
-        @ProtoId(2) val int32Rssi: Int = 0
+        @ProtoId(1) @JvmField val mac: Long = 0L,
+        @ProtoId(2) @JvmField val int32Rssi: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class InterestItem(
-        @ProtoId(1) val tagId: Long = 0L,
-        @ProtoId(2) val tagName: String = "",
-        @ProtoId(3) val tagIconUrl: String = "",
-        @ProtoId(4) val tagHref: String = "",
-        @ProtoId(5) val tagBackColor: String = "",
-        @ProtoId(6) val tagFontColor: String = "",
-        @ProtoId(7) val tagVid: String = "",
-        @ProtoId(8) val tagType: Int = 0,
-        @ProtoId(9) val addTime: Int = 0,
-        @ProtoId(10) val tagCategory: String = "",
-        @ProtoId(11) val tagOtherUrl: String = "",
-        @ProtoId(12) val bid: Int = 0
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class ShopID(
-        @ProtoId(1) val shopid: String = "",
-        @ProtoId(2) val sp: Int = 0
+        @ProtoId(1) @JvmField val shopid: String = "",
+        @ProtoId(2) @JvmField val sp: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class FeedComment(
-        @ProtoId(1) val commentId: String = "",
-        @ProtoId(2) val feedId: String = "",
-        @ProtoId(3) val msgPublisherInfo: StrangerInfo? = null,
-        @ProtoId(4) val time: Int = 0,
-        @ProtoId(6) val msgReplyInfo: ReplyInfo? = null,
-        @ProtoId(7) val flag: Int = 0,
-        @ProtoId(8) val msgContent: RichText? = null,
-        @ProtoId(9) val hot: Int = 0
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class ADFeed(
-        @ProtoId(1) val taskId: Int = 0,
-        @ProtoId(2) val style: Int = 0,
-        @ProtoId(3) val content: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val taskId: Int = 0,
+        @ProtoId(2) @JvmField val style: Int = 0,
+        @ProtoId(3) @JvmField val content: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class Cell(
-        @ProtoId(1) val int32Mcc: Int = -1,
-        @ProtoId(2) val int32Mnc: Int = -1,
-        @ProtoId(3) val int32Lac: Int = -1,
-        @ProtoId(4) val int32Cellid: Int = -1,
-        @ProtoId(5) val int32Rssi: Int = 0
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class RecentVistorEvent(
-        @ProtoId(1) val eventtype: Int = 0,
-        @ProtoId(2) val eventTinyid: Long = 0L,
-        @ProtoId(3) val unreadCount: Int = 0
+        @ProtoId(1) @JvmField val eventtype: Int = 0,
+        @ProtoId(2) @JvmField val eventTinyid: Long = 0L,
+        @ProtoId(3) @JvmField val unreadCount: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class OrganizerInfo(
-        @ProtoId(1) val hostName: String = "",
-        @ProtoId(2) val hostUrl: String = "",
-        @ProtoId(3) val hostCover: String = ""
+        @ProtoId(1) @JvmField val hostName: String = "",
+        @ProtoId(2) @JvmField val hostUrl: String = "",
+        @ProtoId(3) @JvmField val hostCover: String = ""
     ) : ProtoBuf
 
     @Serializable
     internal class InterestTag(
-        @ProtoId(1) val tagType: Int = 0,
-        @ProtoId(2) val msgTagList: List<InterestItem>? = null
+        @ProtoId(1) @JvmField val tagType: Int = 0,
+        @ProtoId(2) @JvmField val msgTagList: List<InterestItem>? = null
     ) : ProtoBuf
 
     @Serializable
     internal class AppointInfoEx(
-        @ProtoId(1) val feedsPicUrl: String = "",
-        @ProtoId(2) val feedsUrl: String = "",
-        @ProtoId(3) val detailTitle: String = "",
-        @ProtoId(4) val detailDescribe: String = "",
-        @ProtoId(5) val showPublisher: Int = 0,
-        @ProtoId(6) val detailPicUrl: String = "",
-        @ProtoId(7) val detailUrl: String = "",
-        @ProtoId(8) val showAttend: Int = 0
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class DateComment(
-        @ProtoId(1) val commentId: String = "",
-        @ProtoId(2) val msgAppointId: AppointID? = null,
-        @ProtoId(3) val msgPublisherInfo: StrangerInfo? = null,
-        @ProtoId(4) val time: Int = 0,
-        @ProtoId(6) val msgReplyInfo: ReplyInfo? = null,
-        @ProtoId(7) val flag: Int = 0,
-        @ProtoId(8) val msgContent: RichText? = null
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class AppointContent(
-        @ProtoId(1) val appointSubject: Int = 0,
-        @ProtoId(2) val payType: Int = 0,
-        @ProtoId(3) val appointDate: Int = 0,
-        @ProtoId(4) val appointGender: Int = 0,
-        @ProtoId(5) val appointIntroduce: String = "",
-        @ProtoId(6) val msgAppointAddress: AddressInfo? = null,
-        @ProtoId(7) val msgTravelInfo: TravelInfo? = null
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class FeedInfo(
-        @ProtoId(1) val feedType: Long = 0L,
-        @ProtoId(2) val feedId: String = "",
-        @ProtoId(3) val msgFeedContent: FeedContent? = null,
-        @ProtoId(4) val msgTopicInfo: NearbyTopic? = null,
-        @ProtoId(5) val publishTime: Long = 0,
-        @ProtoId(6) val praiseCount: Int = 0,
-        @ProtoId(7) val praiseFlag: Int = 0,
-        @ProtoId(8) val msgPraiseUser: List<StrangerInfo>? = null,
-        @ProtoId(9) val commentCount: Int = 0,
-        @ProtoId(10) val msgCommentList: List<FeedComment>? = null,
-        @ProtoId(11) val commentRetAll: Int = 0,
-        @ProtoId(12) val hotFlag: Int = 0,
-        @ProtoId(13) val svrReserved: Long = 0L,
-        @ProtoId(14) val msgHotEntry: HotEntry? = null
+        @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<StrangerInfo>? = null,
+        @ProtoId(9) @JvmField val commentCount: Int = 0,
+        @ProtoId(10) @JvmField val msgCommentList: List<FeedComment>? = 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
     ) : ProtoBuf
 
     @Serializable
     internal class HotTopicList(
-        @ProtoId(1) val topicList: List<HotTopic>? = null
+        @ProtoId(1) @JvmField val topicList: List<HotTopic>? = null
     ) : ProtoBuf
 
     @Serializable
     internal class FeedContent(
-        @ProtoId(1) val strPicUrl: List<String> = listOf(),
-        @ProtoId(2) val msgText: RichText? = null,
-        @ProtoId(3) val hrefUrl: String = "",
-        @ProtoId(5) val groupName: String = "",
-        @ProtoId(6) val groupBulletin: String = "",
-        @ProtoId(7) val feedType: Int = 0,
-        @ProtoId(8) val poiId: String = "",
-        @ProtoId(9) val poiTitle: String = "",
-        @ProtoId(20) val effectiveTime: Int = 0,
-        @ProtoId(21) val expiationTime: Int = 0,
-        @ProtoId(22) val msgLocale: LocaleInfo? = null,
-        @ProtoId(23) val feedsIndex: Int = 0,
-        @ProtoId(24) val msgAd: ADFeed? = null,
-        @ProtoId(25) val privateData: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val strPicUrl: List<String> = 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
     ) : ProtoBuf
 
     @Serializable
     internal class TravelInfo(
-        @ProtoId(1) val msgDepartLocale: LocaleInfo? = null,
-        @ProtoId(2) val msgDestination: LocaleInfo? = null,
-        @ProtoId(3) val vehicle: Int = 0,
-        @ProtoId(4) val partnerCount: Int = 0,
-        @ProtoId(5) val placePicUrl: String = "",
-        @ProtoId(6) val placeUrl: String = ""
+        @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 = ""
     ) : ProtoBuf
 
     @Serializable
     internal class RecentFreshFeed(
-        @ProtoId(1) val freshFeedInfo: List<FreshFeedInfo>? = null,
-        @ProtoId(2) val uid: Long = 0L
+        @ProtoId(1) @JvmField val freshFeedInfo: List<FreshFeedInfo>? = null,
+        @ProtoId(2) @JvmField val uid: Long = 0L
     ) : ProtoBuf
 
     @Serializable
     internal class GPS(
-        @ProtoId(1) val int32Lat: Int = 900000000,
-        @ProtoId(2) val int32Lon: Int = 900000000,
-        @ProtoId(3) val int32Alt: Int = -10000000,
-        @ProtoId(4) val int32Type: Int = 0
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class AppointID(
-        @ProtoId(1) val requestId: String = ""
+        @ProtoId(1) @JvmField val requestId: String = ""
     ) : ProtoBuf
 
     @Serializable
     internal class LocaleInfo(
-        @ProtoId(1) val name: String = "",
-        @ProtoId(2) val country: String = "",
-        @ProtoId(3) val province: String = "",
-        @ProtoId(4) val city: String = "",
-        @ProtoId(5) val region: String = "",
-        @ProtoId(6) val poi: String = "",
-        @ProtoId(7) val msgGps: GPS? = null,
-        @ProtoId(8) val address: String = ""
+        @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 = ""
     ) : ProtoBuf
 
     @Serializable
     internal class LBSInfo(
-        @ProtoId(1) val msgGps: GPS? = null,
-        @ProtoId(2) val msgWifis: List<Wifi>? = null,
-        @ProtoId(3) val msgCells: List<Cell>? = null
+        @ProtoId(1) @JvmField val msgGps: GPS? = null,
+        @ProtoId(2) @JvmField val msgWifis: List<Wifi>? = null,
+        @ProtoId(3) @JvmField val msgCells: List<Cell>? = null
     ) : ProtoBuf
 
     @Serializable
     internal class FeedEvent(
-        @ProtoId(1) val eventId: Long = 0L,
-        @ProtoId(2) val time: Int = 0,
-        @ProtoId(3) val eventtype: Int = 0,
-        @ProtoId(4) val msgUserInfo: StrangerInfo? = null,
-        @ProtoId(5) val msgFeedInfo: FeedInfo? = null,
-        @ProtoId(6) val eventTips: String = "",
-        @ProtoId(7) val msgComment: FeedComment? = null,
-        @ProtoId(8) val cancelEventId: Long = 0L
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class FeedsCookie(
-        @ProtoId(1) val strList: List<String> = listOf(),
-        @ProtoId(2) val pose: Int = 0,
-        @ProtoId(3) val cookie: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val uint64Topics: List<Long>? = null
+        @ProtoId(1) @JvmField val strList: List<String> = listOf(),
+        @ProtoId(2) @JvmField val pose: Int = 0,
+        @ProtoId(3) @JvmField val cookie: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val uint64Topics: List<Long>? = null
     ) : ProtoBuf
 
     @Serializable
     internal class NearbyTopic(
-        @ProtoId(1) val topicId: Long = 0L,
-        @ProtoId(2) val topic: String = "",
-        @ProtoId(3) val foreword: String = "",
-        @ProtoId(4) val createTime: Int = 0,
-        @ProtoId(5) val updateTime: Int = 0,
-        @ProtoId(6) val hotFlag: Int = 0,
-        @ProtoId(7) val buttonStyle: Int = 0,
-        @ProtoId(8) val buttonSrc: String = "",
-        @ProtoId(9) val backgroundSrc: String = "",
-        @ProtoId(10) val attendeeInfo: String = "",
-        @ProtoId(11) val index: Int = 0,
-        @ProtoId(12) val publishScope: Int = 0,
-        @ProtoId(13) val effectiveTime: Int = 0,
-        @ProtoId(14) val expiationTime: Int = 0,
-        @ProtoId(15) val pushedUsrCount: Int = 0,
-        @ProtoId(16) val timerangeLeft: Int = 0,
-        @ProtoId(17) val timerangeRight: Int = 0,
-        @ProtoId(18) val area: String = ""
+        @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 = ""
     ) : ProtoBuf
 
     @Serializable
     internal class NearbyEvent(
-        @ProtoId(1) val eventtype: Int = 0,
-        @ProtoId(2) val msgRankevent: RankEvent? = null,
-        @ProtoId(3) val eventUin: Long = 0L,
-        @ProtoId(4) val eventTinyid: Long = 0L
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class Feed(
-        @ProtoId(1) val msgUserInfo: PublisherInfo? = null,
-        @ProtoId(2) val msgFeedInfo: FeedInfo? = null,
-        @ProtoId(3) val ownerFlag: Int = 0
+        @ProtoId(1) @JvmField val msgUserInfo: PublisherInfo? = null,
+        @ProtoId(2) @JvmField val msgFeedInfo: FeedInfo? = null,
+        @ProtoId(3) @JvmField val ownerFlag: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class ActivityInfo(
-        @ProtoId(2) val name: String = "",
-        @ProtoId(3) val cover: String = "",
-        @ProtoId(4) val url: String = "",
-        @ProtoId(5) val startTime: Int = 0,
-        @ProtoId(6) val endTime: Int = 0,
-        @ProtoId(7) val locName: String = "",
-        @ProtoId(8) val enroll: Long = 0L,
-        @ProtoId(9) val createUin: Long = 0L,
-        @ProtoId(10) val createTime: Int = 0,
-        @ProtoId(11) val organizerInfo: OrganizerInfo = OrganizerInfo(),
-        @ProtoId(12) val flag: Long? = null
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class HotEntry(
-        @ProtoId(1) val openFlag: Int = 0,
-        @ProtoId(2) val restTime: Int = 0,
-        @ProtoId(3) val foreword: String = "",
-        @ProtoId(4) val backgroundSrc: String = ""
+        @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 = ""
     ) : ProtoBuf
 
     @Serializable
     internal class UserFeed(
-        @ProtoId(1) val msgUserInfo: PublisherInfo? = null,
-        @ProtoId(2) val msgFeedInfo: FeedInfo? = null,
-        @ProtoId(3) val ownerFlag: Int = 0,
-        @ProtoId(4) val msgActivityInfo: ActivityInfo? = null
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class Elem(
-        @ProtoId(1) val content: String = "",
-        @ProtoId(2) val msgFaceInfo: Face? = null
+        @ProtoId(1) @JvmField val content: String = "",
+        @ProtoId(2) @JvmField val msgFaceInfo: Face? = null
     ) : ProtoBuf
 
     @Serializable
     internal class HotFreshFeedList(
-        @ProtoId(1) val msgFeeds: List<HotUserFeed>? = null,
-        @ProtoId(2) val updateTime: Int = 0
+        @ProtoId(1) @JvmField val msgFeeds: List<HotUserFeed>? = null,
+        @ProtoId(2) @JvmField val updateTime: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class RptInterestTag(
-        @ProtoId(1) val interestTags: List<InterestTag>? = null
+        @ProtoId(1) @JvmField val interestTags: List<InterestTag>? = null
     ) : ProtoBuf
 
     @Serializable
     internal class AddressInfo(
-        @ProtoId(1) val companyZone: String = "",
-        @ProtoId(2) val companyName: String = "",
-        @ProtoId(3) val companyAddr: String = "",
-        @ProtoId(4) val companyPicUrl: String = "",
-        @ProtoId(5) val companyUrl: String = "",
-        @ProtoId(6) val msgCompanyId: ShopID? = null
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class PublisherInfo(
-        @ProtoId(1) val tinyid: Long = 0L,
-        @ProtoId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val age: Int = 0,
-        @ProtoId(4) val gender: Int = 0,
-        @ProtoId(5) val constellation: String = "",
-        @ProtoId(6) val profession: Int = 0,
-        @ProtoId(7) val distance: String = "",
-        @ProtoId(8) val marriage: Int = 0,
-        @ProtoId(9) val vipinfo: String = "",
-        @ProtoId(10) val recommend: Int = 0,
-        @ProtoId(11) val godflag: Int = 0,
-        @ProtoId(12) val chatflag: Int = 0,
-        @ProtoId(13) val chatupCount: Int = 0,
-        @ProtoId(14) val charm: Int = 0,
-        @ProtoId(15) val charmLevel: Int = 0,
-        @ProtoId(16) val pubNumber: Int = 0,
-        @ProtoId(17) val msgCommonLabel: CommonLabel? = null,
-        @ProtoId(18) val recentVistorTime: Int = 0,
-        @ProtoId(19) val strangerDeclare: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(20) val friendUin: Long = 0L,
-        @ProtoId(21) val historyFlag: Int = 0,
-        @ProtoId(22) val followflag: Long = 0L
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class HotUserFeed(
-        @ProtoId(1) val feedId: String = "",
-        @ProtoId(2) val praiseCount: Int = 0,
-        @ProtoId(3) val publishUid: Long = 0L,
-        @ProtoId(4) val publishTime: Int = 0
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class FreshFeedInfo(
-        @ProtoId(1) val uin: Long = 0L,
-        @ProtoId(2) val time: Int = 0,
-        @ProtoId(3) val feedId: String = "",
-        @ProtoId(4) val feedType: Long = 0L
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class CommonLabel(
-        @ProtoId(1) val lableId: Int = 0,
-        @ProtoId(2) val lableMsgPre: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val lableMsgLast: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val interstName: List<ByteArray>? = null,
-        @ProtoId(5) val interstType: List<Int>? = null
+        @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<ByteArray>? = null,
+        @ProtoId(5) @JvmField val interstType: List<Int>? = null
     ) : ProtoBuf
 
     @Serializable
     internal class Face(
-        @ProtoId(1) val index: Int = 0
+        @ProtoId(1) @JvmField val index: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class StrangerInfo(
-        @ProtoId(1) val tinyid: Long = 0L,
-        @ProtoId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val age: Int = 0,
-        @ProtoId(4) val gender: Int = 0,
-        @ProtoId(5) val dating: Int = 0,
-        @ProtoId(6) val listIdx: Int = 0,
-        @ProtoId(7) val constellation: String = "",
-        @ProtoId(8) val profession: Int = 0,
-        @ProtoId(9) val marriage: Int = 0,
-        @ProtoId(10) val vipinfo: String = "",
-        @ProtoId(11) val recommend: Int = 0,
-        @ProtoId(12) val godflag: Int = 0,
-        @ProtoId(13) val charm: Int = 0,
-        @ProtoId(14) val charmLevel: Int = 0,
-        @ProtoId(15) val uin: Long = 0L
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class HotTopic(
-        @ProtoId(1) val id: Long = 0L,
-        @ProtoId(2) val title: String = "",
-        @ProtoId(3) val topicType: Long = 0L,
-        @ProtoId(4) val total: Long = 0L,
-        @ProtoId(5) val times: Long = 0L,
-        @ProtoId(6) val historyTimes: Long = 0L,
-        @ProtoId(7) val bgUrl: String = "",
-        @ProtoId(8) val url: String = "",
-        @ProtoId(9) val extraInfo: String = ""
+        @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 = ""
     ) : ProtoBuf
 
     @Serializable
     internal class DateEvent(
-        @ProtoId(1) val eventId: Long = 0L,
-        @ProtoId(2) val time: Int = 0,
-        @ProtoId(3) val type: Int = 0,
-        @ProtoId(4) val msgUserInfo: StrangerInfo? = null,
-        @ProtoId(5) val msgDateInfo: AppointInfo? = null,
-        @ProtoId(6) val attendIdx: Int = 0,
-        @ProtoId(7) val eventTips: String = "",
-        @ProtoId(8) val msgComment: DateComment? = null,
-        @ProtoId(9) val cancelEventId: Long = 0L
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class AppointInfo(
-        @ProtoId(1) val msgAppointId: AppointID? = null,
-        @ProtoId(2) val msgAppointment: AppointContent? = null,
-        @ProtoId(3) val appointStatus: Int = 0,
-        @ProtoId(4) val joinWording: String = "",
-        @ProtoId(5) val viewWording: String = "",
-        @ProtoId(6) val unreadCount: Int = 0,
-        @ProtoId(7) val owner: Int = 0,
-        @ProtoId(8) val join: Int = 0,
-        @ProtoId(9) val view: Int = 0,
-        @ProtoId(10) val commentWording: String = "",
-        @ProtoId(11) val commentNum: Int = 0,
-        @ProtoId(12) val attendStatus: Int = 0,
-        @ProtoId(13) val msgAppointmentEx: AppointInfoEx? = null
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class UserInfo(
-        @ProtoId(1) val uin: Long = 0L,
-        @ProtoId(2) val nickname: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val age: Int = 0,
-        @ProtoId(4) val gender: Int = 0,
-        @ProtoId(5) val avatar: ByteArray = EMPTY_BYTE_ARRAY
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class ReplyInfo(
-        @ProtoId(1) val commentId: String = "",
-        @ProtoId(2) val msgStrangerInfo: StrangerInfo? = null
+        @ProtoId(1) @JvmField val commentId: String = "",
+        @ProtoId(2) @JvmField val msgStrangerInfo: StrangerInfo? = null
     ) : ProtoBuf
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/FriendListCommon.kt

@@ -15,45 +15,46 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
 @Serializable
 internal class Vec0xd50 : ProtoBuf {
     @Serializable
     internal class ExtSnsFrdData(
-        @ProtoId(1) val frdUin: Long = 0L,
-        @ProtoId(91001) val musicSwitch: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(101001) val mutualmarkAlienation: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(141001) val mutualmarkScore: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(151001) val ksingSwitch: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(181001) val lbsShare: ByteArray = EMPTY_BYTE_ARRAY
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class RspBody(
-        @ProtoId(1) val msgUpdateData: List<ExtSnsFrdData>? = null,
-        @ProtoId(11) val over: Int = 0,
-        @ProtoId(12) val nextStart: Int = 0,
-        @ProtoId(13) val uint64UnfinishedUins: List<Long>? = null
+        @ProtoId(1) @JvmField val msgUpdateData: List<ExtSnsFrdData>? = null,
+        @ProtoId(11) @JvmField val over: Int = 0,
+        @ProtoId(12) @JvmField val nextStart: Int = 0,
+        @ProtoId(13) @JvmField val uint64UnfinishedUins: List<Long>? = null
     ) : ProtoBuf
 
     @Serializable
     internal class ReqBody(
-        @ProtoId(1) val appid: Long = 0L,
-        @ProtoId(2) val maxPkgSize: Int = 0,
-        @ProtoId(3) val startTime: Int = 0,
-        @ProtoId(4) val startIndex: Int = 0,
-        @ProtoId(5) val reqNum: Int = 0,
-        @ProtoId(6) val uinList: List<Long>? = null,
-        @ProtoId(91001) val reqMusicSwitch: Int = 0,
-        @ProtoId(101001) val reqMutualmarkAlienation: Int = 0,
-        @ProtoId(141001) val reqMutualmarkScore: Int = 0,
-        @ProtoId(151001) val reqKsingSwitch: Int = 0,
-        @ProtoId(181001) val reqMutualmarkLbsshare: Int = 0
+        @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<Long>? = 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
     ) : ProtoBuf
 
     @Serializable
     internal class KSingRelationInfo(
-        @ProtoId(1) val flag: Int = 0
+        @ProtoId(1) @JvmField val flag: Int = 0
     ) : ProtoBuf
 }
 
@@ -61,21 +62,21 @@ internal class Vec0xd50 : ProtoBuf {
 internal class Vec0xd6b : ProtoBuf {
     @Serializable
     internal class ReqBody(
-        @ProtoId(1) val maxPkgSize: Int = 0,
-        @ProtoId(2) val startTime: Int = 0,
-        @ProtoId(11) val uinList: List<Long>? = null
+        @ProtoId(1) @JvmField val maxPkgSize: Int = 0,
+        @ProtoId(2) @JvmField val startTime: Int = 0,
+        @ProtoId(11) @JvmField val uinList: List<Long>? = null
     ) : ProtoBuf
 
     @Serializable
     internal class RspBody(
-        @ProtoId(11) val msgMutualmarkData: List<MutualMarkData>? = null,
-        @ProtoId(12) val uint64UnfinishedUins: List<Long>? = null
+        @ProtoId(11) @JvmField val msgMutualmarkData: List<MutualMarkData>? = null,
+        @ProtoId(12) @JvmField val uint64UnfinishedUins: List<Long>? = null
     ) : ProtoBuf
 
     @Serializable
     internal class MutualMarkData(
-        @ProtoId(1) val frdUin: Long = 0L,
-        @ProtoId(2) val result: Int = 0
-        // @SerialId(11) val mutualmarkInfo: List<net.mamoe.mirai.qqandroid.network.protocol.data.proto.Mutualmark.MutualMark>? = null
+        @ProtoId(1) @JvmField val frdUin: Long = 0L,
+        @ProtoId(2) @JvmField val result: Int = 0
+        // @SerialId(11) @JvmField val mutualmarkInfo: List<net.mamoe.mirai.qqandroid.network.protocol.data.proto.Mutualmark.MutualMark>? = null
     ) : ProtoBuf
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Group.kt

@@ -13,56 +13,57 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
 @Serializable
 internal class GroupLabel : ProtoBuf {
     @Serializable
     internal class Label(
-        @ProtoId(1) val name: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val enumType: Int /* enum */ = 1,
-        @ProtoId(3) val textColor: Color? = null,
-        @ProtoId(4) val edgingColor: Color? = null,
-        @ProtoId(5) val labelAttr: Int = 0,
-        @ProtoId(6) val labelType: Int = 0
+        @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
     ) : ProtoBuf
 
     @Serializable
     internal class RspBody(
-        @ProtoId(1) val error: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val groupInfo: List<GroupInfo>? = null
+        @ProtoId(1) @JvmField val error: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val groupInfo: List<GroupInfo>? = null
     ) : ProtoBuf
 
     @Serializable
     internal class SourceId(
-        @ProtoId(1) val sourceId: Int = 0
+        @ProtoId(1) @JvmField val sourceId: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class GroupInfo(
-        @ProtoId(1) val int32Result: Int = 0,
-        @ProtoId(2) val groupCode: Long = 0L,
-        @ProtoId(3) val groupLabel: List<Label>? = null
+        @ProtoId(1) @JvmField val int32Result: Int = 0,
+        @ProtoId(2) @JvmField val groupCode: Long = 0L,
+        @ProtoId(3) @JvmField val groupLabel: List<Label>? = null
     ) : ProtoBuf
 
     @Serializable
     internal class Color(
-        @ProtoId(1) val r: Int = 0,
-        @ProtoId(2) val g: Int = 0,
-        @ProtoId(3) val b: Int = 0
+        @ProtoId(1) @JvmField val r: Int = 0,
+        @ProtoId(2) @JvmField val g: Int = 0,
+        @ProtoId(3) @JvmField val b: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class ReqBody(
-        @ProtoId(1) val sourceId: SourceId? = null,
-        @ProtoId(2) val uinInfo: UinInfo? = null,
-        @ProtoId(3) val numberLabel: Int = 5,
-        @ProtoId(4) val groupCode: List<Long>? = null,
-        @ProtoId(5) val labelStyle: Int = 0
+        @ProtoId(1) @JvmField val sourceId: SourceId? = null,
+        @ProtoId(2) @JvmField val uinInfo: UinInfo? = null,
+        @ProtoId(3) @JvmField val numberLabel: Int = 5,
+        @ProtoId(4) @JvmField val groupCode: List<Long>? = null,
+        @ProtoId(5) @JvmField val labelStyle: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class UinInfo(
-        @ProtoId(1) val int64Longitude: Long = 0L,
-        @ProtoId(2) val int64Latitude: Long = 0L
+        @ProtoId(1) @JvmField val int64Longitude: Long = 0L,
+        @ProtoId(2) @JvmField val int64Latitude: Long = 0L
     ) : ProtoBuf
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Highway.kt

@@ -15,95 +15,96 @@ import kotlinx.serialization.protobuf.ProtoNumberType
 import kotlinx.serialization.protobuf.ProtoType
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
 @Serializable
 internal class BdhExtinfo : ProtoBuf {
     @Serializable
     internal class CommFileExtReq(
-        @ProtoId(1) val actionType: Int = 0,
-        @ProtoId(2) val uuid: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val actionType: Int = 0,
+        @ProtoId(2) @JvmField val uuid: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class CommFileExtRsp(
-        @ProtoId(1) val int32Retcode: Int = 0,
-        @ProtoId(2) val downloadUrl: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val int32Retcode: Int = 0,
+        @ProtoId(2) @JvmField val downloadUrl: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class PicInfo(
-        @ProtoId(1) val idx: Int = 0,
-        @ProtoId(2) val size: Int = 0,
-        @ProtoId(3) val binMd5: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val type: Int = 0
+        @ProtoId(1) @JvmField val idx: Int = 0,
+        @ProtoId(2) @JvmField val size: Int = 0,
+        @ProtoId(3) @JvmField val binMd5: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val type: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class QQVoiceExtReq(
-        @ProtoId(1) val qid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val fmt: Int = 0,
-        @ProtoId(3) val rate: Int = 0,
-        @ProtoId(4) val bits: Int = 0,
-        @ProtoId(5) val channel: Int = 0,
-        @ProtoId(6) val pinyin: Int = 0
+        @ProtoId(1) @JvmField val qid: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val fmt: Int = 0,
+        @ProtoId(3) @JvmField val rate: Int = 0,
+        @ProtoId(4) @JvmField val bits: Int = 0,
+        @ProtoId(5) @JvmField val channel: Int = 0,
+        @ProtoId(6) @JvmField val pinyin: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class QQVoiceExtRsp(
-        @ProtoId(1) val qid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val int32Retcode: Int = 0,
-        @ProtoId(3) val msgResult: List<QQVoiceResult>? = null
+        @ProtoId(1) @JvmField val qid: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val int32Retcode: Int = 0,
+        @ProtoId(3) @JvmField val msgResult: List<QQVoiceResult>? = null
     ) : ProtoBuf
 
     @Serializable
     internal class QQVoiceResult(
-        @ProtoId(1) val text: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val pinyin: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val source: Int = 0
+        @ProtoId(1) @JvmField val text: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val pinyin: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val source: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class ShortVideoReqExtInfo(
-        @ProtoId(1) val cmd: Int = 0,
-        @ProtoId(2) val sessionId: Long = 0L,
-        @ProtoId(3) val msgThumbinfo: PicInfo? = null,
-        @ProtoId(4) val msgVideoinfo: VideoInfo? = null,
-        @ProtoId(5) val msgShortvideoSureReq: ShortVideoSureReqInfo? = null,
-        @ProtoId(6) val boolIsMergeCmdBeforeData: Boolean = false
+        @ProtoId(1) @JvmField val cmd: Int = 0,
+        @ProtoId(2) @JvmField val sessionId: Long = 0L,
+        @ProtoId(3) @JvmField val msgThumbinfo: PicInfo? = null,
+        @ProtoId(4) @JvmField val msgVideoinfo: VideoInfo? = null,
+        @ProtoId(5) @JvmField val msgShortvideoSureReq: ShortVideoSureReqInfo? = null,
+        @ProtoId(6) @JvmField val boolIsMergeCmdBeforeData: Boolean = false
     ) : ProtoBuf
 
     @Serializable
     internal class ShortVideoRspExtInfo(
-        @ProtoId(1) val cmd: Int = 0,
-        @ProtoId(2) val sessionId: Long = 0L,
-        @ProtoId(3) val int32Retcode: Int = 0,
-        @ProtoId(4) val errinfo: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val msgThumbinfo: PicInfo? = null,
-        @ProtoId(6) val msgVideoinfo: VideoInfo? = null,
-        @ProtoId(7) val msgShortvideoSureRsp: ShortVideoSureRspInfo? = null,
-        @ProtoId(8) val retryFlag: Int = 0
+        @ProtoId(1) @JvmField val cmd: Int = 0,
+        @ProtoId(2) @JvmField val sessionId: Long = 0L,
+        @ProtoId(3) @JvmField val int32Retcode: Int = 0,
+        @ProtoId(4) @JvmField val errinfo: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(5) @JvmField val msgThumbinfo: PicInfo? = null,
+        @ProtoId(6) @JvmField val msgVideoinfo: VideoInfo? = null,
+        @ProtoId(7) @JvmField val msgShortvideoSureRsp: ShortVideoSureRspInfo? = null,
+        @ProtoId(8) @JvmField val retryFlag: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class ShortVideoSureReqInfo(
-        @ProtoId(1) val fromuin: Long = 0L,
-        @ProtoId(2) val chatType: Int = 0,
-        @ProtoId(3) val touin: Long = 0L,
-        @ProtoId(4) val groupCode: Long = 0L,
-        @ProtoId(5) val clientType: Int = 0,
-        @ProtoId(6) val msgThumbinfo: PicInfo? = null,
-        @ProtoId(7) val msgMergeVideoinfo: List<VideoInfo>? = null,
-        @ProtoId(8) val msgDropVideoinfo: List<VideoInfo>? = null,
-        @ProtoId(9) val businessType: Int = 0,
-        @ProtoId(10) val subBusinessType: Int = 0
+        @ProtoId(1) @JvmField val fromuin: Long = 0L,
+        @ProtoId(2) @JvmField val chatType: Int = 0,
+        @ProtoId(3) @JvmField val touin: Long = 0L,
+        @ProtoId(4) @JvmField val groupCode: Long = 0L,
+        @ProtoId(5) @JvmField val clientType: Int = 0,
+        @ProtoId(6) @JvmField val msgThumbinfo: PicInfo? = null,
+        @ProtoId(7) @JvmField val msgMergeVideoinfo: List<VideoInfo>? = null,
+        @ProtoId(8) @JvmField val msgDropVideoinfo: List<VideoInfo>? = null,
+        @ProtoId(9) @JvmField val businessType: Int = 0,
+        @ProtoId(10) @JvmField val subBusinessType: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class ShortVideoSureRspInfo(
-        @ProtoId(1) val fileid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val ukey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val msgVideoinfo: VideoInfo? = null,
-        @ProtoId(4) val mergeCost: Int = 0
+        @ProtoId(1) @JvmField val fileid: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val ukey: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val msgVideoinfo: VideoInfo? = null,
+        @ProtoId(4) @JvmField val mergeCost: Int = 0
     ) : ProtoBuf
 
     @Serializable
@@ -111,31 +112,31 @@ internal class BdhExtinfo : ProtoBuf {
 
     @Serializable
     internal class StoryVideoExtRsp(
-        @ProtoId(1) val int32Retcode: Int = 0,
-        @ProtoId(2) val msg: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val cdnUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val fileKey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val fileId: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val int32Retcode: Int = 0,
+        @ProtoId(2) @JvmField val msg: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val cdnUrl: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val fileKey: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(5) @JvmField val fileId: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class UploadPicExtInfo(
-        @ProtoId(1) val fileResid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val downloadUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val thumbDownloadUrl: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val fileResid: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val downloadUrl: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val thumbDownloadUrl: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class VideoInfo(
-        @ProtoId(1) val idx: Int = 0,
-        @ProtoId(2) val size: Int = 0,
-        @ProtoId(3) val binMd5: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val format: Int = 0,
-        @ProtoId(5) val resLen: Int = 0,
-        @ProtoId(6) val resWidth: Int = 0,
-        @ProtoId(7) val time: Int = 0,
-        @ProtoId(8) val starttime: Long = 0L,
-        @ProtoId(9) val isAudio: Int = 0
+        @ProtoId(1) @JvmField val idx: Int = 0,
+        @ProtoId(2) @JvmField val size: Int = 0,
+        @ProtoId(3) @JvmField val binMd5: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val format: Int = 0,
+        @ProtoId(5) @JvmField val resLen: Int = 0,
+        @ProtoId(6) @JvmField val resWidth: Int = 0,
+        @ProtoId(7) @JvmField val time: Int = 0,
+        @ProtoId(8) @JvmField val starttime: Long = 0L,
+        @ProtoId(9) @JvmField val isAudio: Int = 0
     ) : ProtoBuf
 }
 
@@ -143,142 +144,142 @@ internal class BdhExtinfo : ProtoBuf {
 internal class CSDataHighwayHead : ProtoBuf {
     @Serializable
     internal class C2CCommonExtendinfo(
-        @ProtoId(1) val infoId: Int = 0,
-        @ProtoId(2) val msgFilterExtendinfo: FilterExtendinfo? = null
+        @ProtoId(1) @JvmField val infoId: Int = 0,
+        @ProtoId(2) @JvmField val msgFilterExtendinfo: FilterExtendinfo? = null
     ) : ProtoBuf
 
     @Serializable
     internal class DataHighwayHead(
-        @ProtoId(1) val version: Int = 0,
-        @ProtoId(2) val uin: String = "", // yes
-        @ProtoId(3) val command: String = "",
-        @ProtoId(4) val seq: Int = 0,
-        @ProtoId(5) val retryTimes: Int = 0,
-        @ProtoId(6) val appid: Int = 0,
-        @ProtoId(7) val dataflag: Int = 0,
-        @ProtoId(8) val commandId: Int = 0,
-        @ProtoId(9) val buildVer: String = "",
-        @ProtoId(10) val localeId: Int = 0
+        @ProtoId(1) @JvmField val version: Int = 0,
+        @ProtoId(2) @JvmField val uin: String = "", // yes
+        @ProtoId(3) @JvmField val command: String = "",
+        @ProtoId(4) @JvmField val seq: Int = 0,
+        @ProtoId(5) @JvmField val retryTimes: Int = 0,
+        @ProtoId(6) @JvmField val appid: Int = 0,
+        @ProtoId(7) @JvmField val dataflag: Int = 0,
+        @ProtoId(8) @JvmField val commandId: Int = 0,
+        @ProtoId(9) @JvmField val buildVer: String = "",
+        @ProtoId(10) @JvmField val localeId: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class DataHole(
-        @ProtoId(1) val begin: Long = 0L,
-        @ProtoId(2) val end: Long = 0L
+        @ProtoId(1) @JvmField val begin: Long = 0L,
+        @ProtoId(2) @JvmField val end: Long = 0L
     ) : ProtoBuf
 
     @Serializable
     internal class FilterExtendinfo(
-        @ProtoId(1) val filterFlag: Int = 0,
-        @ProtoId(2) val msgImageFilterRequest: ImageFilterRequest? = null
+        @ProtoId(1) @JvmField val filterFlag: Int = 0,
+        @ProtoId(2) @JvmField val msgImageFilterRequest: ImageFilterRequest? = null
     ) : ProtoBuf
 
     @Serializable
     internal class FilterStyle(
-        @ProtoId(1) val styleId: Int = 0,
-        @ProtoId(2) val styleName: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val styleId: Int = 0,
+        @ProtoId(2) @JvmField val styleName: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class ImageFilterRequest(
-        @ProtoId(1) val sessionId: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val clientIp: Int = 0,
-        @ProtoId(3) val uin: Long = 0L,
-        @ProtoId(4) val style: FilterStyle? = null,
-        @ProtoId(5) val width: Int = 0,
-        @ProtoId(6) val height: Int = 0,
-        @ProtoId(7) val imageData: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val sessionId: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val clientIp: Int = 0,
+        @ProtoId(3) @JvmField val uin: Long = 0L,
+        @ProtoId(4) @JvmField val style: FilterStyle? = null,
+        @ProtoId(5) @JvmField val width: Int = 0,
+        @ProtoId(6) @JvmField val height: Int = 0,
+        @ProtoId(7) @JvmField val imageData: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class ImageFilterResponse(
-        @ProtoId(1) val retCode: Int = 0,
-        @ProtoId(2) val imageData: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val costTime: Int = 0
+        @ProtoId(1) @JvmField val retCode: Int = 0,
+        @ProtoId(2) @JvmField val imageData: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val costTime: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class LoginSigHead(
-        @ProtoId(1) val loginsigType: Int = 0,
-        @ProtoId(2) val loginsig: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val loginsigType: Int = 0,
+        @ProtoId(2) @JvmField val loginsig: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class NewServiceTicket(
-        @ProtoId(1) val signature: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val ukey: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val signature: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val ukey: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class PicInfoExt(
-        @ProtoId(1) val picWidth: Int = 0,
-        @ProtoId(2) val picHeight: Int = 0,
-        @ProtoId(3) val picFlag: Int = 0,
-        @ProtoId(4) val busiType: Int = 0,
-        @ProtoId(5) val srcTerm: Int = 0,
-        @ProtoId(6) val platType: Int = 0,
-        @ProtoId(7) val netType: Int = 0,
-        @ProtoId(8) val imgType: Int = 0,
-        @ProtoId(9) val appPicType: Int = 0
+        @ProtoId(1) @JvmField val picWidth: Int = 0,
+        @ProtoId(2) @JvmField val picHeight: Int = 0,
+        @ProtoId(3) @JvmField val picFlag: Int = 0,
+        @ProtoId(4) @JvmField val busiType: Int = 0,
+        @ProtoId(5) @JvmField val srcTerm: Int = 0,
+        @ProtoId(6) @JvmField val platType: Int = 0,
+        @ProtoId(7) @JvmField val netType: Int = 0,
+        @ProtoId(8) @JvmField val imgType: Int = 0,
+        @ProtoId(9) @JvmField val appPicType: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class PicRspExtInfo(
-        @ProtoId(1) val skey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val clientIp: Int = 0,
-        @ProtoId(3) val upOffset: Long = 0L,
-        @ProtoId(4) val blockSize: Long = 0L
+        @ProtoId(1) @JvmField val skey: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val clientIp: Int = 0,
+        @ProtoId(3) @JvmField val upOffset: Long = 0L,
+        @ProtoId(4) @JvmField val blockSize: Long = 0L
     ) : ProtoBuf
 
     @Serializable
     internal class QueryHoleRsp(
-        @ProtoId(1) val result: Int = 0,
-        @ProtoId(2) val dataHole: List<DataHole>? = null,
-        @ProtoId(3) val boolCompFlag: Boolean = false
+        @ProtoId(1) @JvmField val result: Int = 0,
+        @ProtoId(2) @JvmField val dataHole: List<DataHole>? = null,
+        @ProtoId(3) @JvmField val boolCompFlag: Boolean = false
     ) : ProtoBuf
 
     @Serializable
     internal class ReqDataHighwayHead(
-        @ProtoId(1) val msgBasehead: DataHighwayHead? = null,
-        @ProtoId(2) val msgSeghead: SegHead? = null,
-        @ProtoId(3) val reqExtendinfo: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val timestamp: Long = 0L,
-        @ProtoId(5) val msgLoginSigHead: LoginSigHead? = null
+        @ProtoId(1) @JvmField val msgBasehead: DataHighwayHead? = null,
+        @ProtoId(2) @JvmField val msgSeghead: SegHead? = null,
+        @ProtoId(3) @JvmField val reqExtendinfo: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val timestamp: Long = 0L,
+        @ProtoId(5) @JvmField val msgLoginSigHead: LoginSigHead? = null
     ) : ProtoBuf
 
     @Serializable
     internal class RspBody(
-        @ProtoId(1) val msgQueryHoleRsp: QueryHoleRsp? = null
+        @ProtoId(1) @JvmField val msgQueryHoleRsp: QueryHoleRsp? = null
     ) : ProtoBuf
 
     @Serializable
     internal class RspDataHighwayHead(
-        @ProtoId(1) val msgBasehead: DataHighwayHead? = null,
-        @ProtoId(2) val msgSeghead: SegHead? = null,
-        @ProtoId(3) val errorCode: Int = 0,
-        @ProtoId(4) val allowRetry: Int = 0,
-        @ProtoId(5) val cachecost: Int = 0,
-        @ProtoId(6) val htcost: Int = 0,
-        @ProtoId(7) val rspExtendinfo: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(8) val timestamp: Long = 0L,
-        @ProtoId(9) val range: Long = 0L,
-        @ProtoId(10) val isReset: Int = 0
+        @ProtoId(1) @JvmField val msgBasehead: DataHighwayHead? = null,
+        @ProtoId(2) @JvmField val msgSeghead: SegHead? = null,
+        @ProtoId(3) @JvmField val errorCode: Int = 0,
+        @ProtoId(4) @JvmField val allowRetry: Int = 0,
+        @ProtoId(5) @JvmField val cachecost: Int = 0,
+        @ProtoId(6) @JvmField val htcost: Int = 0,
+        @ProtoId(7) @JvmField val rspExtendinfo: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(8) @JvmField val timestamp: Long = 0L,
+        @ProtoId(9) @JvmField val range: Long = 0L,
+        @ProtoId(10) @JvmField val isReset: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class SegHead(
-        @ProtoId(1) val serviceid: Int = 0,
-        @ProtoId(2) val filesize: Long = 0L,
-        @ProtoId(3) val dataoffset: Long = 0L,
-        @ProtoId(4) val datalength: Int = 0,
-        @ProtoId(5) val rtcode: Int = 0,
-        @ProtoId(6) val serviceticket: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(7) val flag: Int = 0,
-        @ProtoId(8) val md5: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(9) val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(10) val cacheAddr: Int = 0,
-        @ProtoId(11) val queryTimes: Int = 0,
-        @ProtoId(12) val updateCacheip: Int = 0
+        @ProtoId(1) @JvmField val serviceid: Int = 0,
+        @ProtoId(2) @JvmField val filesize: Long = 0L,
+        @ProtoId(3) @JvmField val dataoffset: Long = 0L,
+        @ProtoId(4) @JvmField val datalength: Int = 0,
+        @ProtoId(5) @JvmField val rtcode: Int = 0,
+        @ProtoId(6) @JvmField val serviceticket: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(7) @JvmField val flag: Int = 0,
+        @ProtoId(8) @JvmField val md5: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(9) @JvmField val fileMd5: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(10) @JvmField val cacheAddr: Int = 0,
+        @ProtoId(11) @JvmField val queryTimes: Int = 0,
+        @ProtoId(12) @JvmField val updateCacheip: Int = 0
     ) : ProtoBuf
 }
 
@@ -286,31 +287,31 @@ internal class CSDataHighwayHead : ProtoBuf {
 internal class HwConfigPersistentPB : ProtoBuf {
     @Serializable
     internal class HwConfigItemPB(
-        @ProtoId(1) val ingKey: String = "",
-        @ProtoId(2) val endPointList: List<HwEndPointPB>? = null
+        @ProtoId(1) @JvmField val ingKey: String = "",
+        @ProtoId(2) @JvmField val endPointList: List<HwEndPointPB>? = null
     ) : ProtoBuf
 
     @Serializable
     internal class HwConfigPB(
-        @ProtoId(1) val configItemList: List<HwConfigItemPB>? = null,
-        @ProtoId(2) val netSegConfList: List<HwNetSegConfPB>? = null,
-        @ProtoId(3) val shortVideoNetConf: List<HwNetSegConfPB>? = null,
-        @ProtoId(4) val configItemListIp6: List<HwConfigItemPB>? = null
+        @ProtoId(1) @JvmField val configItemList: List<HwConfigItemPB>? = null,
+        @ProtoId(2) @JvmField val netSegConfList: List<HwNetSegConfPB>? = null,
+        @ProtoId(3) @JvmField val shortVideoNetConf: List<HwNetSegConfPB>? = null,
+        @ProtoId(4) @JvmField val configItemListIp6: List<HwConfigItemPB>? = null
     ) : ProtoBuf
 
     @Serializable
     internal class HwEndPointPB(
-        @ProtoId(1) val ingHost: String = "",
-        @ProtoId(2) val int32Port: Int = 0,
-        @ProtoId(3) val int64Timestampe: Long = 0L
+        @ProtoId(1) @JvmField val ingHost: String = "",
+        @ProtoId(2) @JvmField val int32Port: Int = 0,
+        @ProtoId(3) @JvmField val int64Timestampe: Long = 0L
     ) : ProtoBuf
 
     @Serializable
     internal class HwNetSegConfPB(
-        @ProtoId(1) val int64NetType: Long = 0L,
-        @ProtoId(2) val int64SegSize: Long = 0L,
-        @ProtoId(3) val int64SegNum: Long = 0L,
-        @ProtoId(4) val int64CurConnNum: Long = 0L
+        @ProtoId(1) @JvmField val int64NetType: Long = 0L,
+        @ProtoId(2) @JvmField val int64SegSize: Long = 0L,
+        @ProtoId(3) @JvmField val int64SegNum: Long = 0L,
+        @ProtoId(4) @JvmField val int64CurConnNum: Long = 0L
     ) : ProtoBuf
 }
 
@@ -318,8 +319,8 @@ internal class HwConfigPersistentPB : ProtoBuf {
 internal class HwSessionInfoPersistentPB : ProtoBuf {
     @Serializable
     internal class HwSessionInfoPB(
-        @ProtoId(1) val httpconnSigSession: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val sessionKey: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val httpconnSigSession: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val sessionKey: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 }
 
@@ -327,137 +328,137 @@ internal class HwSessionInfoPersistentPB : ProtoBuf {
 internal class Subcmd0x501 : ProtoBuf {
     @Serializable
     internal class ReqBody(
-        @ProtoId(1281) val msgSubcmd0x501ReqBody: SubCmd0x501ReqBody? = null
+        @ProtoId(1281) @JvmField val msgSubcmd0x501ReqBody: SubCmd0x501ReqBody? = null
     ) : ProtoBuf
 
     @Serializable
     internal class RspBody(
-        @ProtoId(1281) val msgSubcmd0x501RspBody: SubCmd0x501Rspbody? = null
+        @ProtoId(1281) @JvmField val msgSubcmd0x501RspBody: SubCmd0x501Rspbody? = null
     ) : ProtoBuf
 
     @Serializable
     internal class SubCmd0x501ReqBody(
-        @ProtoId(1) val uin: Long = 0L,
-        @ProtoId(2) val idcId: Int = 0,
-        @ProtoId(3) val appid: Int = 0,
-        @ProtoId(4) val loginSigType: Int = 0,
-        @ProtoId(5) val loginSigTicket: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(6) val requestFlag: Int = 0,
-        @ProtoId(7) val uint32ServiceTypes: List<Int>? = null,
-        @ProtoId(8) val bid: Int = 0,
-        @ProtoId(9) val term: Int = 0,
-        @ProtoId(10) val plat: Int = 0,
-        @ProtoId(11) val net: Int = 0,
-        @ProtoId(12) val caller: Int = 0
+        @ProtoId(1) @JvmField val uin: Long = 0L,
+        @ProtoId(2) @JvmField val idcId: Int = 0,
+        @ProtoId(3) @JvmField val appid: Int = 0,
+        @ProtoId(4) @JvmField val loginSigType: Int = 0,
+        @ProtoId(5) @JvmField val loginSigTicket: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(6) @JvmField val requestFlag: Int = 0,
+        @ProtoId(7) @JvmField val uint32ServiceTypes: List<Int>? = null,
+        @ProtoId(8) @JvmField val bid: Int = 0,
+        @ProtoId(9) @JvmField val term: Int = 0,
+        @ProtoId(10) @JvmField val plat: Int = 0,
+        @ProtoId(11) @JvmField val net: Int = 0,
+        @ProtoId(12) @JvmField val caller: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class SubCmd0x501Rspbody(
-        @ProtoId(1) val httpconnSigSession: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val sessionKey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val msgHttpconnAddrs: List<SrvAddrs>? = null,
-        @ProtoId(4) val preConnection: Int = 0,
-        @ProtoId(5) val csConn: Int = 0,
-        @ProtoId(6) val msgIpLearnConf: IpLearnConf? = null,
-        @ProtoId(7) val msgDynTimeoutConf: DynTimeOutConf? = null,
-        @ProtoId(8) val msgOpenUpConf: OpenUpConf? = null,
-        @ProtoId(9) val msgDownloadEncryptConf: DownloadEncryptConf? = null,
-        @ProtoId(10) val msgShortVideoConf: ShortVideoConf? = null,
-        @ProtoId(11) val msgPtvConf: PTVConf? = null
+        @ProtoId(1) @JvmField val httpconnSigSession: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val sessionKey: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val msgHttpconnAddrs: List<SrvAddrs>? = null,
+        @ProtoId(4) @JvmField val preConnection: Int = 0,
+        @ProtoId(5) @JvmField val csConn: Int = 0,
+        @ProtoId(6) @JvmField val msgIpLearnConf: IpLearnConf? = null,
+        @ProtoId(7) @JvmField val msgDynTimeoutConf: DynTimeOutConf? = null,
+        @ProtoId(8) @JvmField val msgOpenUpConf: OpenUpConf? = null,
+        @ProtoId(9) @JvmField val msgDownloadEncryptConf: DownloadEncryptConf? = null,
+        @ProtoId(10) @JvmField val msgShortVideoConf: ShortVideoConf? = null,
+        @ProtoId(11) @JvmField val msgPtvConf: PTVConf? = null
     ) : ProtoBuf {
         @Serializable
         internal class DownloadEncryptConf(
-            @ProtoId(1) val boolEnableEncryptRequest: Boolean = false,
-            @ProtoId(2) val boolEnableEncryptedPic: Boolean = false,
-            @ProtoId(3) val ctrlFlag: Int = 0
+            @ProtoId(1) @JvmField val boolEnableEncryptRequest: Boolean = false,
+            @ProtoId(2) @JvmField val boolEnableEncryptedPic: Boolean = false,
+            @ProtoId(3) @JvmField val ctrlFlag: Int = 0
         ) : ProtoBuf
 
         @Serializable
         internal class DynTimeOutConf(
-            @ProtoId(1) val tbase2g: Int = 0,
-            @ProtoId(2) val tbase3g: Int = 0,
-            @ProtoId(3) val tbase4g: Int = 0,
-            @ProtoId(4) val tbaseWifi: Int = 0,
-            @ProtoId(5) val torg2g: Int = 0,
-            @ProtoId(6) val torg3g: Int = 0,
-            @ProtoId(7) val torg4g: Int = 0,
-            @ProtoId(8) val torgWifi: Int = 0,
-            @ProtoId(9) val maxTimeout: Int = 0,
-            @ProtoId(10) val enableDynTimeout: Int = 0,
-            @ProtoId(11) val maxTimeout2g: Int = 0,
-            @ProtoId(12) val maxTimeout3g: Int = 0,
-            @ProtoId(13) val maxTimeout4g: Int = 0,
-            @ProtoId(14) val maxTimeoutWifi: Int = 0,
-            @ProtoId(15) val hbTimeout2g: Int = 0,
-            @ProtoId(16) val hbTimeout3g: Int = 0,
-            @ProtoId(17) val hbTimeout4g: Int = 0,
-            @ProtoId(18) val hbTimeoutWifi: Int = 0,
-            @ProtoId(19) val hbTimeoutDefault: Int = 0
+            @ProtoId(1) @JvmField val tbase2g: Int = 0,
+            @ProtoId(2) @JvmField val tbase3g: Int = 0,
+            @ProtoId(3) @JvmField val tbase4g: Int = 0,
+            @ProtoId(4) @JvmField val tbaseWifi: Int = 0,
+            @ProtoId(5) @JvmField val torg2g: Int = 0,
+            @ProtoId(6) @JvmField val torg3g: Int = 0,
+            @ProtoId(7) @JvmField val torg4g: Int = 0,
+            @ProtoId(8) @JvmField val torgWifi: Int = 0,
+            @ProtoId(9) @JvmField val maxTimeout: Int = 0,
+            @ProtoId(10) @JvmField val enableDynTimeout: Int = 0,
+            @ProtoId(11) @JvmField val maxTimeout2g: Int = 0,
+            @ProtoId(12) @JvmField val maxTimeout3g: Int = 0,
+            @ProtoId(13) @JvmField val maxTimeout4g: Int = 0,
+            @ProtoId(14) @JvmField val maxTimeoutWifi: Int = 0,
+            @ProtoId(15) @JvmField val hbTimeout2g: Int = 0,
+            @ProtoId(16) @JvmField val hbTimeout3g: Int = 0,
+            @ProtoId(17) @JvmField val hbTimeout4g: Int = 0,
+            @ProtoId(18) @JvmField val hbTimeoutWifi: Int = 0,
+            @ProtoId(19) @JvmField val hbTimeoutDefault: Int = 0
         ) : ProtoBuf
 
         @Serializable
         internal class Ip6Addr(
-            @ProtoId(1) val type: Int = 0,
-            @ProtoId(2) val ip6: ByteArray = EMPTY_BYTE_ARRAY,
-            @ProtoId(3) val port: Int = 0,
-            @ProtoId(4) val area: Int = 0,
-            @ProtoId(5) val sameIsp: Int = 0
+            @ProtoId(1) @JvmField val type: Int = 0,
+            @ProtoId(2) @JvmField val ip6: ByteArray = EMPTY_BYTE_ARRAY,
+            @ProtoId(3) @JvmField val port: Int = 0,
+            @ProtoId(4) @JvmField val area: Int = 0,
+            @ProtoId(5) @JvmField val sameIsp: Int = 0
         ) : ProtoBuf
 
         @Serializable
         internal class IpAddr(
-            @ProtoId(1) val type: Int = 0,
-            @ProtoType(ProtoNumberType.FIXED) @ProtoId(2) val ip: Int = 0,
-            @ProtoId(3) val port: Int = 0,
-            @ProtoId(4) val area: Int = 0,
-            @ProtoId(5) val sameIsp: Int = 0
+            @ProtoId(1) @JvmField val type: Int = 0,
+            @ProtoType(ProtoNumberType.FIXED) @ProtoId(2) @JvmField val ip: Int = 0,
+            @ProtoId(3) @JvmField val port: Int = 0,
+            @ProtoId(4) @JvmField val area: Int = 0,
+            @ProtoId(5) @JvmField val sameIsp: Int = 0
         ) : ProtoBuf
 
         @Serializable
         internal class IpLearnConf(
-            @ProtoId(1) val refreshCachedIp: Int = 0,
-            @ProtoId(2) val enableIpLearn: Int = 0
+            @ProtoId(1) @JvmField val refreshCachedIp: Int = 0,
+            @ProtoId(2) @JvmField val enableIpLearn: Int = 0
         ) : ProtoBuf
 
         @Serializable
         internal class NetSegConf(
-            @ProtoId(1) val netType: Int = 0,
-            @ProtoId(2) val segsize: Int = 0,
-            @ProtoId(3) val segnum: Int = 0,
-            @ProtoId(4) val curconnnum: Int = 0
+            @ProtoId(1) @JvmField val netType: Int = 0,
+            @ProtoId(2) @JvmField val segsize: Int = 0,
+            @ProtoId(3) @JvmField val segnum: Int = 0,
+            @ProtoId(4) @JvmField val curconnnum: Int = 0
         ) : ProtoBuf
 
         @Serializable
         internal class OpenUpConf(
-            @ProtoId(1) val boolEnableOpenup: Boolean = false,
-            @ProtoId(2) val preSendSegnum: Int = 0,
-            @ProtoId(3) val preSendSegnum3g: Int = 0,
-            @ProtoId(4) val preSendSegnum4g: Int = 0,
-            @ProtoId(5) val preSendSegnumWifi: Int = 0
+            @ProtoId(1) @JvmField val boolEnableOpenup: Boolean = false,
+            @ProtoId(2) @JvmField val preSendSegnum: Int = 0,
+            @ProtoId(3) @JvmField val preSendSegnum3g: Int = 0,
+            @ProtoId(4) @JvmField val preSendSegnum4g: Int = 0,
+            @ProtoId(5) @JvmField val preSendSegnumWifi: Int = 0
         ) : ProtoBuf
 
         @Serializable
         internal class PTVConf(
-            @ProtoId(1) val channelType: Int = 0,
-            @ProtoId(2) val msgNetsegconf: List<NetSegConf>? = null,
-            @ProtoId(3) val boolOpenHardwareCodec: Boolean = false
+            @ProtoId(1) @JvmField val channelType: Int = 0,
+            @ProtoId(2) @JvmField val msgNetsegconf: List<NetSegConf>? = null,
+            @ProtoId(3) @JvmField val boolOpenHardwareCodec: Boolean = false
         ) : ProtoBuf
 
         @Serializable
         internal class ShortVideoConf(
-            @ProtoId(1) val channelType: Int = 0,
-            @ProtoId(2) val msgNetsegconf: List<NetSegConf>? = null,
-            @ProtoId(3) val boolOpenHardwareCodec: Boolean = false,
-            @ProtoId(4) val boolSendAheadSignal: Boolean = false
+            @ProtoId(1) @JvmField val channelType: Int = 0,
+            @ProtoId(2) @JvmField val msgNetsegconf: List<NetSegConf>? = null,
+            @ProtoId(3) @JvmField val boolOpenHardwareCodec: Boolean = false,
+            @ProtoId(4) @JvmField val boolSendAheadSignal: Boolean = false
         ) : ProtoBuf
 
         @Serializable
         internal class SrvAddrs(
-            @ProtoId(1) val serviceType: Int = 0,
-            @ProtoId(2) val msgAddrs: List<IpAddr>? = null,
-            @ProtoId(3) val fragmentSize: Int = 0,
-            @ProtoId(4) val msgNetsegconf: List<NetSegConf>? = null,
-            @ProtoId(5) val msgAddrsV6: List<Ip6Addr>? = null
+            @ProtoId(1) @JvmField val serviceType: Int = 0,
+            @ProtoId(2) @JvmField val msgAddrs: List<IpAddr>? = null,
+            @ProtoId(3) @JvmField val fragmentSize: Int = 0,
+            @ProtoId(4) @JvmField val msgNetsegconf: List<NetSegConf>? = null,
+            @ProtoId(5) @JvmField val msgAddrsV6: List<Ip6Addr>? = null
         ) : ProtoBuf
     }
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/HummerCommelem.kt

@@ -13,260 +13,261 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
 internal class HummerCommelem : ProtoBuf {
     @Serializable
 internal class MsgElemInfoServtype1(
-        @ProtoId(1) val rewardId: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val senderUin: Long = 0L,
-        @ProtoId(3) val picType: Int = 0,
-        @ProtoId(4) val rewardMoney: Int = 0,
-        @ProtoId(5) val url: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(6) val content: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(7) val createTimestamp: Int = 0,
-        @ProtoId(8) val status: Int = 0,
-        @ProtoId(9) val size: Int = 0,
-        @ProtoId(10) val videoDuration: Int = 0,
-        @ProtoId(11) val seq: Long = 0L,
-        @ProtoId(12) val rewardTypeExt: Int = 0
+        @ProtoId(1) @JvmField val rewardId: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val senderUin: Long = 0L,
+        @ProtoId(3) @JvmField val picType: Int = 0,
+        @ProtoId(4) @JvmField val rewardMoney: Int = 0,
+        @ProtoId(5) @JvmField val url: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(6) @JvmField val content: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(7) @JvmField val createTimestamp: Int = 0,
+        @ProtoId(8) @JvmField val status: Int = 0,
+        @ProtoId(9) @JvmField val size: Int = 0,
+        @ProtoId(10) @JvmField val videoDuration: Int = 0,
+        @ProtoId(11) @JvmField val seq: Long = 0L,
+        @ProtoId(12) @JvmField val rewardTypeExt: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype11(
-        @ProtoId(1) val resID: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val resMD5: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val reserveInfo1: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val reserveInfo2: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val doodleDataOffset: Int = 0,
-        @ProtoId(6) val doodleGifId: Int = 0,
-        @ProtoId(7) val doodleUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(8) val doodleMd5: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val resID: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val resMD5: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val reserveInfo1: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val reserveInfo2: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(5) @JvmField val doodleDataOffset: Int = 0,
+        @ProtoId(6) @JvmField val doodleGifId: Int = 0,
+        @ProtoId(7) @JvmField val doodleUrl: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(8) @JvmField val doodleMd5: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype13(
-        @ProtoId(1) val sysHeadId: Int = 0,
-        @ProtoId(2) val headFlag: Int = 0
+        @ProtoId(1) @JvmField val sysHeadId: Int = 0,
+        @ProtoId(2) @JvmField val headFlag: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype14(
-        @ProtoId(1) val id: Int = 0,
-        @ProtoId(2) val reserveInfo: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val id: Int = 0,
+        @ProtoId(2) @JvmField val reserveInfo: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype15(
-        @ProtoId(1) val vid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val cover: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val title: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val summary: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val createTime: Long = 0L,
-        @ProtoId(6) val commentContent: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(7) val author: Long = 0L,
-        @ProtoId(8) val ctrVersion: Int = 0
+        @ProtoId(1) @JvmField val vid: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val cover: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val title: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val summary: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(5) @JvmField val createTime: Long = 0L,
+        @ProtoId(6) @JvmField val commentContent: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(7) @JvmField val author: Long = 0L,
+        @ProtoId(8) @JvmField val ctrVersion: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype16(
-        @ProtoId(1) val uid: Long = 0L,
-        @ProtoId(2) val unionID: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val storyID: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val md5: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val thumbUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(6) val doodleUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(7) val videoWidth: Int = 0,
-        @ProtoId(8) val videoHeight: Int = 0,
-        @ProtoId(9) val sourceName: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(10) val sourceActionType: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(11) val sourceActionData: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(12) val ctrVersion: Int = 0
+        @ProtoId(1) @JvmField val uid: Long = 0L,
+        @ProtoId(2) @JvmField val unionID: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val storyID: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val md5: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(5) @JvmField val thumbUrl: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(6) @JvmField val doodleUrl: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(7) @JvmField val videoWidth: Int = 0,
+        @ProtoId(8) @JvmField val videoHeight: Int = 0,
+        @ProtoId(9) @JvmField val sourceName: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(10) @JvmField val sourceActionType: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(11) @JvmField val sourceActionData: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(12) @JvmField val ctrVersion: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype18(
-        @ProtoId(1) val currentAmount: Long = 0L,
-        @ProtoId(2) val totalAmount: Long = 0L,
-        @ProtoId(3) val listid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val authKey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val number: Int = 0
+        @ProtoId(1) @JvmField val currentAmount: Long = 0L,
+        @ProtoId(2) @JvmField val totalAmount: Long = 0L,
+        @ProtoId(3) @JvmField val listid: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val authKey: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(5) @JvmField val number: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype19(
-        @ProtoId(1) val data: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val data: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype2(
-        @ProtoId(1) val pokeType: Int = 0,
-        @ProtoId(2) val pokeSummary: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val doubleHit: Int = 0,
-        @ProtoId(4) val vaspokeId: Int = 0,
-        @ProtoId(5) val vaspokeName: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(6) val vaspokeMinver: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(7) val pokeStrength: Int = 0,
-        @ProtoId(8) val msgType: Int = 0,
-        @ProtoId(9) val faceBubbleCount: Int = 0,
-        @ProtoId(10) val pokeFlag: Int = 0
+        @ProtoId(1) @JvmField val pokeType: Int = 0,
+        @ProtoId(2) @JvmField val pokeSummary: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val doubleHit: Int = 0,
+        @ProtoId(4) @JvmField val vaspokeId: Int = 0,
+        @ProtoId(5) @JvmField val vaspokeName: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(6) @JvmField val vaspokeMinver: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(7) @JvmField val pokeStrength: Int = 0,
+        @ProtoId(8) @JvmField val msgType: Int = 0,
+        @ProtoId(9) @JvmField val faceBubbleCount: Int = 0,
+        @ProtoId(10) @JvmField val pokeFlag: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype20(
-        @ProtoId(1) val data: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val data: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype21(
-        @ProtoId(1) val topicId: Int = 0,
-        @ProtoId(2) val confessorUin: Long = 0L,
-        @ProtoId(3) val confessorNick: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val confessorSex: Int = 0,
-        @ProtoId(5) val sysmsgFlag: Int = 0,
-        @ProtoId(6) val c2cConfessCtx: HummerCommelem.MsgElemInfoServtype21.C2CConfessContext? = null,
-        @ProtoId(7) val topic: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(8) val confessTime: Long = 0L,
-        @ProtoId(9) val groupConfessMsg: HummerCommelem.MsgElemInfoServtype21.GroupConfessMsg? = null,
-        @ProtoId(10) val groupConfessCtx: HummerCommelem.MsgElemInfoServtype21.GroupConfessContext? = null
+        @ProtoId(1) @JvmField val topicId: Int = 0,
+        @ProtoId(2) @JvmField val confessorUin: Long = 0L,
+        @ProtoId(3) @JvmField val confessorNick: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val confessorSex: Int = 0,
+        @ProtoId(5) @JvmField val sysmsgFlag: Int = 0,
+        @ProtoId(6) @JvmField val c2cConfessCtx: HummerCommelem.MsgElemInfoServtype21.C2CConfessContext? = null,
+        @ProtoId(7) @JvmField val topic: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(8) @JvmField val confessTime: Long = 0L,
+        @ProtoId(9) @JvmField val groupConfessMsg: HummerCommelem.MsgElemInfoServtype21.GroupConfessMsg? = null,
+        @ProtoId(10) @JvmField val groupConfessCtx: HummerCommelem.MsgElemInfoServtype21.GroupConfessContext? = null
     ) : ProtoBuf {
         @Serializable
 internal class C2CConfessContext(
-            @ProtoId(1) val confessorUin: Long = 0L,
-            @ProtoId(2) val confessToUin: Long = 0L,
-            @ProtoId(3) val sendUin: Long = 0L,
-            @ProtoId(4) val confessorNick: ByteArray = EMPTY_BYTE_ARRAY,
-            @ProtoId(5) val confess: ByteArray = EMPTY_BYTE_ARRAY,
-            @ProtoId(6) val bgType: Int = 0,
-            @ProtoId(7) val topicId: Int = 0,
-            @ProtoId(8) val confessTime: Long = 0L,
-            @ProtoId(9) val confessorSex: Int = 0,
-            @ProtoId(10) val bizType: Int = 0,
-            @ProtoId(11) val confessNum: Int = 0,
-            @ProtoId(12) val confessToSex: Int = 0
+            @ProtoId(1) @JvmField val confessorUin: Long = 0L,
+            @ProtoId(2) @JvmField val confessToUin: Long = 0L,
+            @ProtoId(3) @JvmField val sendUin: Long = 0L,
+            @ProtoId(4) @JvmField val confessorNick: ByteArray = EMPTY_BYTE_ARRAY,
+            @ProtoId(5) @JvmField val confess: ByteArray = EMPTY_BYTE_ARRAY,
+            @ProtoId(6) @JvmField val bgType: Int = 0,
+            @ProtoId(7) @JvmField val topicId: Int = 0,
+            @ProtoId(8) @JvmField val confessTime: Long = 0L,
+            @ProtoId(9) @JvmField val confessorSex: Int = 0,
+            @ProtoId(10) @JvmField val bizType: Int = 0,
+            @ProtoId(11) @JvmField val confessNum: Int = 0,
+            @ProtoId(12) @JvmField val confessToSex: Int = 0
         ) : ProtoBuf
 
         @Serializable
 internal class GroupConfessContext(
-            @ProtoId(1) val confessorUin: Long = 0L,
-            @ProtoId(2) val confessToUin: Long = 0L,
-            @ProtoId(3) val sendUin: Long = 0L,
-            @ProtoId(4) val confessorSex: Int = 0,
-            @ProtoId(5) val confessToNick: ByteArray = EMPTY_BYTE_ARRAY,
-            @ProtoId(6) val topic: ByteArray = EMPTY_BYTE_ARRAY,
-            @ProtoId(7) val topicId: Int = 0,
-            @ProtoId(8) val confessTime: Long = 0L,
-            @ProtoId(9) val confessToNickType: Int = 0,
-            @ProtoId(10) val confessorNick: ByteArray = EMPTY_BYTE_ARRAY
+            @ProtoId(1) @JvmField val confessorUin: Long = 0L,
+            @ProtoId(2) @JvmField val confessToUin: Long = 0L,
+            @ProtoId(3) @JvmField val sendUin: Long = 0L,
+            @ProtoId(4) @JvmField val confessorSex: Int = 0,
+            @ProtoId(5) @JvmField val confessToNick: ByteArray = EMPTY_BYTE_ARRAY,
+            @ProtoId(6) @JvmField val topic: ByteArray = EMPTY_BYTE_ARRAY,
+            @ProtoId(7) @JvmField val topicId: Int = 0,
+            @ProtoId(8) @JvmField val confessTime: Long = 0L,
+            @ProtoId(9) @JvmField val confessToNickType: Int = 0,
+            @ProtoId(10) @JvmField val confessorNick: ByteArray = EMPTY_BYTE_ARRAY
         ) : ProtoBuf
 
         @Serializable
 internal class GroupConfessItem(
-            @ProtoId(1) val topicId: Int = 0,
-            @ProtoId(2) val confessToUin: Long = 0L,
-            @ProtoId(3) val confessToNick: ByteArray = EMPTY_BYTE_ARRAY,
-            @ProtoId(4) val topic: ByteArray = EMPTY_BYTE_ARRAY,
-            @ProtoId(5) val confessToNickType: Int = 0
+            @ProtoId(1) @JvmField val topicId: Int = 0,
+            @ProtoId(2) @JvmField val confessToUin: Long = 0L,
+            @ProtoId(3) @JvmField val confessToNick: ByteArray = EMPTY_BYTE_ARRAY,
+            @ProtoId(4) @JvmField val topic: ByteArray = EMPTY_BYTE_ARRAY,
+            @ProtoId(5) @JvmField val confessToNickType: Int = 0
         ) : ProtoBuf
 
         @Serializable
 internal class GroupConfessMsg(
-            @ProtoId(1) val confessTime: Long = 0L,
-            @ProtoId(2) val confessorUin: Long = 0L,
-            @ProtoId(3) val confessorSex: Int = 0,
-            @ProtoId(4) val sysmsgFlag: Int = 0,
-            @ProtoId(5) val confessItems: List<HummerCommelem.MsgElemInfoServtype21.GroupConfessItem>? = null,
-            @ProtoId(6) val totalTopicCount: Int = 0
+            @ProtoId(1) @JvmField val confessTime: Long = 0L,
+            @ProtoId(2) @JvmField val confessorUin: Long = 0L,
+            @ProtoId(3) @JvmField val confessorSex: Int = 0,
+            @ProtoId(4) @JvmField val sysmsgFlag: Int = 0,
+            @ProtoId(5) @JvmField val confessItems: List<HummerCommelem.MsgElemInfoServtype21.GroupConfessItem>? = null,
+            @ProtoId(6) @JvmField val totalTopicCount: Int = 0
         ) : ProtoBuf
     }
 
     @Serializable
 internal class MsgElemInfoServtype23(
-        @ProtoId(1) val faceType: Int = 0,
-        @ProtoId(2) val faceBubbleCount: Int = 0,
-        @ProtoId(3) val faceSummary: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val flag: Int = 0,
-        @ProtoId(5) val others: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val faceType: Int = 0,
+        @ProtoId(2) @JvmField val faceBubbleCount: Int = 0,
+        @ProtoId(3) @JvmField val faceSummary: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val flag: Int = 0,
+        @ProtoId(5) @JvmField val others: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype24(
-        @ProtoId(1) val limitChatEnter: HummerCommelem.MsgElemInfoServtype24.LimitChatEnter? = null,
-        @ProtoId(2) val limitChatExit: HummerCommelem.MsgElemInfoServtype24.LimitChatExit? = null
+        @ProtoId(1) @JvmField val limitChatEnter: HummerCommelem.MsgElemInfoServtype24.LimitChatEnter? = null,
+        @ProtoId(2) @JvmField val limitChatExit: HummerCommelem.MsgElemInfoServtype24.LimitChatExit? = null
     ) : ProtoBuf {
         @Serializable
 internal class LimitChatEnter(
-            @ProtoId(1) val tipsWording: ByteArray = EMPTY_BYTE_ARRAY,
-            @ProtoId(2) val leftChatTime: Int = 0,
-            @ProtoId(3) val matchTs: Long = 0L,
-            @ProtoId(4) val matchExpiredTime: Int = 0,
-            @ProtoId(5) val c2cExpiredTime: Int = 0,
-            @ProtoId(6) val readyTs: Long = 0L,
-            @ProtoId(7) val matchNick: ByteArray = EMPTY_BYTE_ARRAY
+            @ProtoId(1) @JvmField val tipsWording: ByteArray = EMPTY_BYTE_ARRAY,
+            @ProtoId(2) @JvmField val leftChatTime: Int = 0,
+            @ProtoId(3) @JvmField val matchTs: Long = 0L,
+            @ProtoId(4) @JvmField val matchExpiredTime: Int = 0,
+            @ProtoId(5) @JvmField val c2cExpiredTime: Int = 0,
+            @ProtoId(6) @JvmField val readyTs: Long = 0L,
+            @ProtoId(7) @JvmField val matchNick: ByteArray = EMPTY_BYTE_ARRAY
         ) : ProtoBuf
 
         @Serializable
 internal class LimitChatExit(
-            @ProtoId(1) val exitMethod: Int = 0,
-            @ProtoId(2) val matchTs: Long = 0L
+            @ProtoId(1) @JvmField val exitMethod: Int = 0,
+            @ProtoId(2) @JvmField val matchTs: Long = 0L
         ) : ProtoBuf
     }
 
     @Serializable
 internal class MsgElemInfoServtype27(
-        @ProtoId(1) val videoFile: ImMsgBody.VideoFile? = null
+        @ProtoId(1) @JvmField val videoFile: ImMsgBody.VideoFile? = null
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype29(
-        @ProtoId(1) val luckybagMsg: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val luckybagMsg: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype3(
-        @ProtoId(1) val flashTroopPic: ImMsgBody.CustomFace? = null,
-        @ProtoId(2) val flashC2cPic: ImMsgBody.NotOnlineImage? = null
+        @ProtoId(1) @JvmField val flashTroopPic: ImMsgBody.CustomFace? = null,
+        @ProtoId(2) @JvmField val flashC2cPic: ImMsgBody.NotOnlineImage? = null
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype31(
-        @ProtoId(1) val text: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val ext: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val text: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val ext: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype4(
-        @ProtoId(1) val imsgType: Int = 0,
-        @ProtoId(4) val stStoryAioObjMsg: HummerCommelem.StoryAioObjMsg? = null
+        @ProtoId(1) @JvmField val imsgType: Int = 0,
+        @ProtoId(4) @JvmField val stStoryAioObjMsg: HummerCommelem.StoryAioObjMsg? = null
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype5(
-        @ProtoId(1) val vid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val cover: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val title: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val summary: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val createTime: Long = 0L,
-        @ProtoId(6) val commentContent: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(7) val author: Long = 0L
+        @ProtoId(1) @JvmField val vid: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val cover: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val title: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val summary: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(5) @JvmField val createTime: Long = 0L,
+        @ProtoId(6) @JvmField val commentContent: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(7) @JvmField val author: Long = 0L
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype8(
-        @ProtoId(1) val wifiDeliverGiftMsg: ImMsgBody.DeliverGiftMsg? = null
+        @ProtoId(1) @JvmField val wifiDeliverGiftMsg: ImMsgBody.DeliverGiftMsg? = null
     ) : ProtoBuf
 
     @Serializable
 internal class MsgElemInfoServtype9(
-        @ProtoId(1) val anchorStatus: Int = 0,
-        @ProtoId(2) val jumpSchema: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val anchorNickname: String = "",
-        @ProtoId(4) val anchorHeadUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val liveTitle: String = ""
+        @ProtoId(1) @JvmField val anchorStatus: Int = 0,
+        @ProtoId(2) @JvmField val jumpSchema: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val anchorNickname: String = "",
+        @ProtoId(4) @JvmField val anchorHeadUrl: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(5) @JvmField val liveTitle: String = ""
     ) : ProtoBuf
 
     @Serializable
 internal class StoryAioObjMsg(
-        @ProtoId(1) val uiUrl: String = "",
-        @ProtoId(2) val jmpUrl: String = ""
+        @ProtoId(1) @JvmField val uiUrl: String = "",
+        @ProtoId(2) @JvmField val jmpUrl: String = ""
     ) : ProtoBuf
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/ImageRequest.kt

@@ -13,6 +13,7 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
 import net.mamoe.mirai.utils.currentTimeSeconds
+import kotlin.jvm.JvmField
 
 internal interface ImgReq : ProtoBuf
 
@@ -20,22 +21,22 @@ internal interface ImgReq : ProtoBuf
 
 @Serializable
 internal class GetImgUrlReq(
-    @ProtoId(1) val srcUni: Int,
-    @ProtoId(2) val dstUni: Int,
-    @ProtoId(3) val fileResID: String,//UUID
+    @ProtoId(1) @JvmField val srcUni: Int,
+    @ProtoId(2) @JvmField val dstUni: Int,
+    @ProtoId(3) @JvmField val fileResID: String,//UUID
     /**
      * UUID例子: 没有找到
      */
-    @ProtoId(4) val urlFlag: Int = 1,
+    @ProtoId(4) @JvmField val urlFlag: Int = 1,
     //5 unknown, 好像没用
-    @ProtoId(6) val urlType: Int = 4,
-    @ProtoId(7) val requestTerm: Int = 5,//确定
-    @ProtoId(8) val requestPlatformType: Int = 9,//确定
-    @ProtoId(9) val srcFileType: Int = 1,//2=ftn，1=picplatform，255
-    @ProtoId(10) val innerIP: Int = 0,//确定
-    @ProtoId(11) val addressBook: Int = 0,//[ChatType.internalID]== 1006为1[为CONTACT时] 我觉得发0没问题
-    @ProtoId(12) val buType: Int = 1,//确定
-    @ProtoId(13) val buildVer: String = "8.2.7.4410",//版本号
-    @ProtoId(14) val timestamp: Int = currentTimeSeconds.toInt(),//(pic_up_timestamp)
-    @ProtoId(15) val requestTransferType: Int = 1
+    @ProtoId(6) @JvmField val urlType: Int = 4,
+    @ProtoId(7) @JvmField val requestTerm: Int = 5,//确定
+    @ProtoId(8) @JvmField val requestPlatformType: Int = 9,//确定
+    @ProtoId(9) @JvmField val srcFileType: Int = 1,//2=ftn，1=picplatform，255
+    @ProtoId(10) @JvmField val innerIP: Int = 0,//确定
+    @ProtoId(11) @JvmField val addressBook: Int = 0,//[ChatType.internalID]== 1006为1[为CONTACT时] 我觉得发0没问题
+    @ProtoId(12) @JvmField val buType: Int = 1,//确定
+    @ProtoId(13) @JvmField val buildVer: String = "8.2.7.4410",//版本号
+    @ProtoId(14) @JvmField val timestamp: Int = currentTimeSeconds.toInt(),//(pic_up_timestamp)
+    @ProtoId(15) @JvmField val requestTransferType: Int = 1
 ) : ImgReq

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/LongMsg.kt

@@ -4,69 +4,70 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
 internal class LongMsg : ProtoBuf {
     @Serializable
 internal class MsgDeleteReq(
-        @ProtoId(1) val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val msgType: Int = 0
+        @ProtoId(1) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val msgType: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class MsgDeleteRsp(
-        @ProtoId(1) val result: Int = 0,
-        @ProtoId(2) val msgResid: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val result: Int = 0,
+        @ProtoId(2) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
 internal class MsgDownReq(
-        @ProtoId(1) val srcUin: Int = 0,
-        @ProtoId(2) val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val msgType: Int = 0,
-        @ProtoId(4) val needCache: Int = 0
+        @ProtoId(1) @JvmField val srcUin: Int = 0,
+        @ProtoId(2) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val msgType: Int = 0,
+        @ProtoId(4) @JvmField val needCache: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class MsgDownRsp(
-        @ProtoId(1) val result: Int = 0,
-        @ProtoId(2) val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val msgContent: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val result: Int = 0,
+        @ProtoId(2) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val msgContent: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
 internal class MsgUpReq(
-        @ProtoId(1) val msgType: Int = 0,
-        @ProtoId(2) val dstUin: Long = 0L,
-        @ProtoId(3) val msgId: Int = 0,
-        @ProtoId(4) val msgContent: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val storeType: Int = 0,
-        @ProtoId(6) val msgUkey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(7) val needCache: Int = 0
+        @ProtoId(1) @JvmField val msgType: Int = 0,
+        @ProtoId(2) @JvmField val dstUin: Long = 0L,
+        @ProtoId(3) @JvmField val msgId: Int = 0,
+        @ProtoId(4) @JvmField val msgContent: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(5) @JvmField val storeType: Int = 0,
+        @ProtoId(6) @JvmField val msgUkey: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(7) @JvmField val needCache: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class MsgUpRsp(
-        @ProtoId(1) val result: Int = 0,
-        @ProtoId(2) val msgId: Int = 0,
-        @ProtoId(3) val msgResid: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val result: Int = 0,
+        @ProtoId(2) @JvmField val msgId: Int = 0,
+        @ProtoId(3) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
 internal class ReqBody(
-        @ProtoId(1) val subcmd: Int = 0,
-        @ProtoId(2) val termType: Int = 0,
-        @ProtoId(3) val platformType: Int = 0,
-        @ProtoId(4) val msgUpReq: List<LongMsg.MsgUpReq>? = null,
-        @ProtoId(5) val msgDownReq: List<LongMsg.MsgDownReq>? = null,
-        @ProtoId(6) val msgDelReq: List<LongMsg.MsgDeleteReq>? = null,
-        @ProtoId(10) val agentType: Int = 0
+        @ProtoId(1) @JvmField val subcmd: Int = 0,
+        @ProtoId(2) @JvmField val termType: Int = 0,
+        @ProtoId(3) @JvmField val platformType: Int = 0,
+        @ProtoId(4) @JvmField val msgUpReq: List<LongMsg.MsgUpReq>? = null,
+        @ProtoId(5) @JvmField val msgDownReq: List<LongMsg.MsgDownReq>? = null,
+        @ProtoId(6) @JvmField val msgDelReq: List<LongMsg.MsgDeleteReq>? = null,
+        @ProtoId(10) @JvmField val agentType: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class RspBody(
-        @ProtoId(1) val subcmd: Int = 0,
-        @ProtoId(2) val msgUpRsp: List<LongMsg.MsgUpRsp>? = null,
-        @ProtoId(3) val msgDownRsp: List<LongMsg.MsgDownRsp>? = null,
-        @ProtoId(4) val msgDelRsp: List<LongMsg.MsgDeleteRsp>? = null
+        @ProtoId(1) @JvmField val subcmd: Int = 0,
+        @ProtoId(2) @JvmField val msgUpRsp: List<LongMsg.MsgUpRsp>? = null,
+        @ProtoId(3) @JvmField val msgDownRsp: List<LongMsg.MsgDownRsp>? = null,
+        @ProtoId(4) @JvmField val msgDelRsp: List<LongMsg.MsgDeleteRsp>? = null
     ) : ProtoBuf
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgCommon.kt

@@ -13,6 +13,7 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
 /**
  * msf.msgcomm.msg_comm
@@ -21,143 +22,143 @@ import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
 internal class MsgComm : ProtoBuf {
     @Serializable
     internal class AppShareInfo(
-        @ProtoId(1) val appshareId: Int = 0,
-        @ProtoId(2) val appshareCookie: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val appshareResource: PluginInfo? = null
+        @ProtoId(1) @JvmField val appshareId: Int = 0,
+        @ProtoId(2) @JvmField val appshareCookie: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val appshareResource: PluginInfo? = null
     ) : ProtoBuf
 
     @Serializable
     internal class C2CTmpMsgHead(
-        @ProtoId(1) val c2cType: Int = 0,
-        @ProtoId(2) val serviceType: Int = 0,
-        @ProtoId(3) val groupUin: Long = 0L,
-        @ProtoId(4) val groupCode: Long = 0L,
-        @ProtoId(5) val sig: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(6) val sigType: Int = 0,
-        @ProtoId(7) val fromPhone: String = "",
-        @ProtoId(8) val toPhone: String = "",
-        @ProtoId(9) val lockDisplay: Int = 0,
-        @ProtoId(10) val directionFlag: Int = 0,
-        @ProtoId(11) val reserved: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val c2cType: Int = 0,
+        @ProtoId(2) @JvmField val serviceType: Int = 0,
+        @ProtoId(3) @JvmField val groupUin: Long = 0L,
+        @ProtoId(4) @JvmField val groupCode: Long = 0L,
+        @ProtoId(5) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(6) @JvmField val sigType: Int = 0,
+        @ProtoId(7) @JvmField val fromPhone: String = "",
+        @ProtoId(8) @JvmField val toPhone: String = "",
+        @ProtoId(9) @JvmField val lockDisplay: Int = 0,
+        @ProtoId(10) @JvmField val directionFlag: Int = 0,
+        @ProtoId(11) @JvmField val reserved: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class ContentHead(
-        @ProtoId(1) val pkgNum: Int = 0,
-        @ProtoId(2) val pkgIndex: Int = 0,
-        @ProtoId(3) val divSeq: Int = 0,
-        @ProtoId(4) val autoReply: Int = 0
+        @ProtoId(1) @JvmField val pkgNum: Int = 0,
+        @ProtoId(2) @JvmField val pkgIndex: Int = 0,
+        @ProtoId(3) @JvmField val divSeq: Int = 0,
+        @ProtoId(4) @JvmField val autoReply: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class DiscussInfo(
-        @ProtoId(1) val discussUin: Long = 0L,
-        @ProtoId(2) val discussType: Int = 0,
-        @ProtoId(3) val discussInfoSeq: Long = 0L,
-        @ProtoId(4) val discussRemark: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val discussName: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val discussUin: Long = 0L,
+        @ProtoId(2) @JvmField val discussType: Int = 0,
+        @ProtoId(3) @JvmField val discussInfoSeq: Long = 0L,
+        @ProtoId(4) @JvmField val discussRemark: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(5) @JvmField val discussName: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class ExtGroupKeyInfo(
-        @ProtoId(1) val curMaxSeq: Int = 0,
-        @ProtoId(2) val curTime: Long = 0L
+        @ProtoId(1) @JvmField val curMaxSeq: Int = 0,
+        @ProtoId(2) @JvmField val curTime: Long = 0L
     ) : ProtoBuf
 
     @Serializable
     internal class GroupInfo(
-        @ProtoId(1) val groupCode: Long = 0L,
-        @ProtoId(2) val groupType: Int = 0,
-        @ProtoId(3) val groupInfoSeq: Long = 0L,
-        @ProtoId(4) val groupCard: String = "",
-        @ProtoId(5) val groupRank: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(6) val groupLevel: Int = 0,
-        @ProtoId(7) val groupCardType: Int = 0,
-        @ProtoId(8) val groupName: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val groupCode: Long = 0L,
+        @ProtoId(2) @JvmField val groupType: Int = 0,
+        @ProtoId(3) @JvmField val groupInfoSeq: Long = 0L,
+        @ProtoId(4) @JvmField val groupCard: String = "",
+        @ProtoId(5) @JvmField val groupRank: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(6) @JvmField val groupLevel: Int = 0,
+        @ProtoId(7) @JvmField val groupCardType: Int = 0,
+        @ProtoId(8) @JvmField val groupName: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class Msg(
-        @ProtoId(1) val msgHead: MsgHead,
-        @ProtoId(2) val contentHead: ContentHead? = null,
-        @ProtoId(3) val msgBody: ImMsgBody.MsgBody,
-        @ProtoId(4) val appshareInfo: AppShareInfo? = null
+        @ProtoId(1) @JvmField val msgHead: MsgHead,
+        @ProtoId(2) @JvmField val contentHead: ContentHead? = null,
+        @ProtoId(3) @JvmField val msgBody: ImMsgBody.MsgBody,
+        @ProtoId(4) @JvmField val appshareInfo: AppShareInfo? = null
     ) : ProtoBuf
 
     @Serializable
     internal class MsgHead(
-        @ProtoId(1) val fromUin: Long = 0L,
-        @ProtoId(2) val toUin: Long = 0L,
-        @ProtoId(3) val msgType: Int = 0,
-        @ProtoId(4) val c2cCmd: Int = 0,
-        @ProtoId(5) val msgSeq: Int = 0,
-        @ProtoId(6) val msgTime: Int = 0,
+        @ProtoId(1) @JvmField val fromUin: Long = 0L,
+        @ProtoId(2) @JvmField val toUin: Long = 0L,
+        @ProtoId(3) @JvmField val msgType: Int = 0,
+        @ProtoId(4) @JvmField val c2cCmd: Int = 0,
+        @ProtoId(5) @JvmField val msgSeq: Int = 0,
+        @ProtoId(6) @JvmField val msgTime: Int = 0,
         @ProtoId(7) var msgUid: Long = 0L,
-        @ProtoId(8) val c2cTmpMsgHead: C2CTmpMsgHead? = null,
-        @ProtoId(9) val groupInfo: GroupInfo? = null,
-        @ProtoId(10) val fromAppid: Int = 0,
-        @ProtoId(11) val fromInstid: Int = 0,
-        @ProtoId(12) val userActive: Int = 0,
-        @ProtoId(13) val discussInfo: DiscussInfo? = null,
-        @ProtoId(14) val fromNick: String = "",
-        @ProtoId(15) val authUin: Long = 0L,
-        @ProtoId(16) val authNick: String = "",
-        @ProtoId(17) val msgFlag: Int = 0,
-        @ProtoId(18) val authRemark: String = "",
-        @ProtoId(19) val groupName: String = "",
-        @ProtoId(20) val mutiltransHead: MutilTransHead? = null,
-        @ProtoId(21) val msgInstCtrl: ImMsgHead.InstCtrl? = null,
-        @ProtoId(22) val publicAccountGroupSendFlag: Int = 0,
-        @ProtoId(23) val wseqInC2cMsghead: Int = 0,
-        @ProtoId(24) val cpid: Long = 0L,
-        @ProtoId(25) val extGroupKeyInfo: ExtGroupKeyInfo? = null,
-        @ProtoId(26) val multiCompatibleText: String = "",
-        @ProtoId(27) val authSex: Int = 0,
-        @ProtoId(28) val isSrcMsg: Boolean = false
+        @ProtoId(8) @JvmField val c2cTmpMsgHead: C2CTmpMsgHead? = null,
+        @ProtoId(9) @JvmField val groupInfo: GroupInfo? = null,
+        @ProtoId(10) @JvmField val fromAppid: Int = 0,
+        @ProtoId(11) @JvmField val fromInstid: Int = 0,
+        @ProtoId(12) @JvmField val userActive: Int = 0,
+        @ProtoId(13) @JvmField val discussInfo: DiscussInfo? = null,
+        @ProtoId(14) @JvmField val fromNick: String = "",
+        @ProtoId(15) @JvmField val authUin: Long = 0L,
+        @ProtoId(16) @JvmField val authNick: String = "",
+        @ProtoId(17) @JvmField val msgFlag: Int = 0,
+        @ProtoId(18) @JvmField val authRemark: String = "",
+        @ProtoId(19) @JvmField val groupName: String = "",
+        @ProtoId(20) @JvmField val mutiltransHead: MutilTransHead? = null,
+        @ProtoId(21) @JvmField val msgInstCtrl: ImMsgHead.InstCtrl? = null,
+        @ProtoId(22) @JvmField val publicAccountGroupSendFlag: Int = 0,
+        @ProtoId(23) @JvmField val wseqInC2cMsghead: Int = 0,
+        @ProtoId(24) @JvmField val cpid: Long = 0L,
+        @ProtoId(25) @JvmField val extGroupKeyInfo: ExtGroupKeyInfo? = null,
+        @ProtoId(26) @JvmField val multiCompatibleText: String = "",
+        @ProtoId(27) @JvmField val authSex: Int = 0,
+        @ProtoId(28) @JvmField val isSrcMsg: Boolean = false
     ) : ProtoBuf
 
     @Serializable
     internal class MsgType0x210(
-        @ProtoId(1) val subMsgType: Int = 0,
-        @ProtoId(2) val msgContent: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val subMsgType: Int = 0,
+        @ProtoId(2) @JvmField val msgContent: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
     internal class MutilTransHead(
-        @ProtoId(1) val status: Int = 0,
-        @ProtoId(2) val msgId: Int = 0
+        @ProtoId(1) @JvmField val status: Int = 0,
+        @ProtoId(2) @JvmField val msgId: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class PluginInfo(
-        @ProtoId(1) val resId: Int = 0,
-        @ProtoId(2) val pkgName: String = "",
-        @ProtoId(3) val newVer: Int = 0,
-        @ProtoId(4) val resType: Int = 0,
-        @ProtoId(5) val lanType: Int = 0,
-        @ProtoId(6) val priority: Int = 0,
-        @ProtoId(7) val resName: String = "",
-        @ProtoId(8) val resDesc: String = "",
-        @ProtoId(9) val resUrlBig: String = "",
-        @ProtoId(10) val resUrlSmall: String = "",
-        @ProtoId(11) val resConf: String = ""
+        @ProtoId(1) @JvmField val resId: Int = 0,
+        @ProtoId(2) @JvmField val pkgName: String = "",
+        @ProtoId(3) @JvmField val newVer: Int = 0,
+        @ProtoId(4) @JvmField val resType: Int = 0,
+        @ProtoId(5) @JvmField val lanType: Int = 0,
+        @ProtoId(6) @JvmField val priority: Int = 0,
+        @ProtoId(7) @JvmField val resName: String = "",
+        @ProtoId(8) @JvmField val resDesc: String = "",
+        @ProtoId(9) @JvmField val resUrlBig: String = "",
+        @ProtoId(10) @JvmField val resUrlSmall: String = "",
+        @ProtoId(11) @JvmField val resConf: String = ""
     ) : ProtoBuf
 
     @Serializable
     internal class Uin2Nick(
-        @ProtoId(1) val uin: Long = 0L,
-        @ProtoId(2) val nick: String = ""
+        @ProtoId(1) @JvmField val uin: Long = 0L,
+        @ProtoId(2) @JvmField val nick: String = ""
     ) : ProtoBuf
 
     @Serializable
     internal class UinPairMsg(
-        @ProtoId(1) val lastReadTime: Int = 0,
-        @ProtoId(2) val peerUin: Long = 0L,
-        @ProtoId(3) val msgCompleted: Int = 0,
-        @ProtoId(4) val msg: List<Msg>? = null,
-        @ProtoId(5) val unreadMsgNum: Int = 0,
-        @ProtoId(8) val c2cType: Int = 0,
-        @ProtoId(9) val serviceType: Int = 0,
-        @ProtoId(10) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val lastReadTime: Int = 0,
+        @ProtoId(2) @JvmField val peerUin: Long = 0L,
+        @ProtoId(3) @JvmField val msgCompleted: Int = 0,
+        @ProtoId(4) @JvmField val msg: List<Msg>? = null,
+        @ProtoId(5) @JvmField val unreadMsgNum: Int = 0,
+        @ProtoId(8) @JvmField val c2cType: Int = 0,
+        @ProtoId(9) @JvmField val serviceType: Int = 0,
+        @ProtoId(10) @JvmField val pbReserve: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgRevokeUserDef.kt

@@ -12,27 +12,28 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
 class MsgRevokeUserDef : ProtoBuf {
     @Serializable
 internal class MsgInfoUserDef(
-        @ProtoId(1) val longMessageFlag: Int = 0,
-        @ProtoId(2) val longMsgInfo: List<MsgInfoDef>? = null,
-        @ProtoId(3) val fileUuid: List<String> = listOf()
+        @ProtoId(1) @JvmField val longMessageFlag: Int = 0,
+        @ProtoId(2) @JvmField val longMsgInfo: List<MsgInfoDef>? = null,
+        @ProtoId(3) @JvmField val fileUuid: List<String> = listOf()
     ) : ProtoBuf {
         @Serializable
 internal class MsgInfoDef(
-            @ProtoId(1) val msgSeq: Int = 0,
-            @ProtoId(2) val longMsgId: Int = 0,
-            @ProtoId(3) val longMsgNum: Int = 0,
-            @ProtoId(4) val longMsgIndex: Int = 0
+            @ProtoId(1) @JvmField val msgSeq: Int = 0,
+            @ProtoId(2) @JvmField val longMsgId: Int = 0,
+            @ProtoId(3) @JvmField val longMsgNum: Int = 0,
+            @ProtoId(4) @JvmField val longMsgIndex: Int = 0
         ) : ProtoBuf
     }
 
     @Serializable
 internal class UinTypeUserDef(
-        @ProtoId(1) val fromUinType: Int = 0,
-        @ProtoId(2) val fromGroupCode: Long = 0L,
-        @ProtoId(3) val fileUuid: List<String> = listOf()
+        @ProtoId(1) @JvmField val fromUinType: Int = 0,
+        @ProtoId(2) @JvmField val fromGroupCode: Long = 0L,
+        @ProtoId(3) @JvmField val fileUuid: List<String> = listOf()
     ) : ProtoBuf
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MsgTransmit.kt

@@ -4,22 +4,23 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
 internal class MsgTransmit : ProtoBuf {
     @Serializable
 internal class PbMultiMsgItem(
-        @ProtoId(1) val fileName: String = "",
-        @ProtoId(2) val buffer: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val fileName: String = "",
+        @ProtoId(2) @JvmField val buffer: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
 internal class PbMultiMsgNew(
-        @ProtoId(1) val msg: List<MsgComm.Msg>? = null
+        @ProtoId(1) @JvmField val msg: List<MsgComm.Msg>? = null
     ) : ProtoBuf
 
     @Serializable
 internal class PbMultiMsgTransmit(
-        @ProtoId(1) val msg: List<MsgComm.Msg>? = null,
-        @ProtoId(2) val pbItemList: List<MsgTransmit.PbMultiMsgItem>? = null
+        @ProtoId(1) @JvmField val msg: List<MsgComm.Msg>? = null,
+        @ProtoId(2) @JvmField val pbItemList: List<MsgTransmit.PbMultiMsgItem>? = null
     ) : ProtoBuf
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MultiMsg.kt

@@ -4,77 +4,78 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
 @Serializable
 internal class MultiMsg : ProtoBuf {
     @Serializable
 internal class ExternMsg(
-        @ProtoId(1) val channelType: Int = 0
+        @ProtoId(1) @JvmField val channelType: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class MultiMsgApplyDownReq(
-        @ProtoId(1) val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val msgType: Int = 0,
-        @ProtoId(3) val srcUin: Long = 0L
+        @ProtoId(1) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val msgType: Int = 0,
+        @ProtoId(3) @JvmField val srcUin: Long = 0L
     ) : ProtoBuf
 
     @Serializable
 internal class MultiMsgApplyDownRsp(
-        @ProtoId(1) val result: Int = 0,
-        @ProtoId(2) val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val msgKey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val uint32DownIp: List<Int>? = null,
-        @ProtoId(5) val uint32DownPort: List<Int>? = null,
-        @ProtoId(6) val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(7) val msgExternInfo: MultiMsg.ExternMsg? = null,
-        @ProtoId(8) val bytesDownIpV6: List<ByteArray>? = null,
-        @ProtoId(9) val uint32DownV6Port: List<Int>? = null
+        @ProtoId(1) @JvmField val result: Int = 0,
+        @ProtoId(2) @JvmField val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val msgKey: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val uint32DownIp: List<Int>? = null,
+        @ProtoId(5) @JvmField val uint32DownPort: List<Int>? = null,
+        @ProtoId(6) @JvmField val msgResid: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(7) @JvmField val msgExternInfo: MultiMsg.ExternMsg? = null,
+        @ProtoId(8) @JvmField val bytesDownIpV6: List<ByteArray>? = null,
+        @ProtoId(9) @JvmField val uint32DownV6Port: List<Int>? = null
     ) : ProtoBuf
 
     @Serializable
 internal class MultiMsgApplyUpReq(
-        @ProtoId(1) val dstUin: Long = 0L,
-        @ProtoId(2) val msgSize: Long = 0L,
-        @ProtoId(3) val msgMd5: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val msgType: Int = 0,
-        @ProtoId(5) val applyId: Int = 0
+        @ProtoId(1) @JvmField val dstUin: Long = 0L,
+        @ProtoId(2) @JvmField val msgSize: Long = 0L,
+        @ProtoId(3) @JvmField val msgMd5: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val msgType: Int = 0,
+        @ProtoId(5) @JvmField val applyId: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class MultiMsgApplyUpRsp(
-        @ProtoId(1) val result: Int = 0,
-        @ProtoId(2) val msgResid: String = "",
-        @ProtoId(3) val msgUkey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val uint32UpIp: List<Int>,
-        @ProtoId(5) val uint32UpPort: List<Int>,
-        @ProtoId(6) val blockSize: Long = 0L,
-        @ProtoId(7) val upOffset: Long = 0L,
-        @ProtoId(8) val applyId: Int = 0,
-        @ProtoId(9) val msgKey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(10) val msgSig: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(11) val msgExternInfo: MultiMsg.ExternMsg? = null,
-        @ProtoId(12) val bytesUpIpV6: List<ByteArray>? = null,
-        @ProtoId(13) val uint32UpV6Port: List<Int>? = null
+        @ProtoId(1) @JvmField val result: Int = 0,
+        @ProtoId(2) @JvmField val msgResid: String = "",
+        @ProtoId(3) @JvmField val msgUkey: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val uint32UpIp: List<Int>,
+        @ProtoId(5) @JvmField val uint32UpPort: List<Int>,
+        @ProtoId(6) @JvmField val blockSize: Long = 0L,
+        @ProtoId(7) @JvmField val upOffset: Long = 0L,
+        @ProtoId(8) @JvmField val applyId: Int = 0,
+        @ProtoId(9) @JvmField val msgKey: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(10) @JvmField val msgSig: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(11) @JvmField val msgExternInfo: MultiMsg.ExternMsg? = null,
+        @ProtoId(12) @JvmField val bytesUpIpV6: List<ByteArray>? = null,
+        @ProtoId(13) @JvmField val uint32UpV6Port: List<Int>? = null
     ) : ProtoBuf
 
     @Serializable
 internal class ReqBody(
-        @ProtoId(1) val subcmd: Int = 0,
-        @ProtoId(2) val termType: Int = 0,
-        @ProtoId(3) val platformType: Int = 0,
-        @ProtoId(4) val netType: Int = 0,
-        @ProtoId(5) val buildVer: String = "",
-        @ProtoId(6) val multimsgApplyupReq: List<MultiMsg.MultiMsgApplyUpReq>? = null,
-        @ProtoId(7) val multimsgApplydownReq: List<MultiMsg.MultiMsgApplyDownReq>? = null,
-        @ProtoId(8) val buType: Int = 0,
-        @ProtoId(9) val reqChannelType: Int = 0
+        @ProtoId(1) @JvmField val subcmd: Int = 0,
+        @ProtoId(2) @JvmField val termType: Int = 0,
+        @ProtoId(3) @JvmField val platformType: Int = 0,
+        @ProtoId(4) @JvmField val netType: Int = 0,
+        @ProtoId(5) @JvmField val buildVer: String = "",
+        @ProtoId(6) @JvmField val multimsgApplyupReq: List<MultiMsg.MultiMsgApplyUpReq>? = null,
+        @ProtoId(7) @JvmField val multimsgApplydownReq: List<MultiMsg.MultiMsgApplyDownReq>? = null,
+        @ProtoId(8) @JvmField val buType: Int = 0,
+        @ProtoId(9) @JvmField val reqChannelType: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class RspBody(
-        @ProtoId(1) val subcmd: Int = 0,
-        @ProtoId(2) val multimsgApplyupRsp: List<MultiMsg.MultiMsgApplyUpRsp>? = null,
-        @ProtoId(3) val multimsgApplydownRsp: List<MultiMsg.MultiMsgApplyDownRsp>? = null
+        @ProtoId(1) @JvmField val subcmd: Int = 0,
+        @ProtoId(2) @JvmField val multimsgApplyupRsp: List<MultiMsg.MultiMsgApplyUpRsp>? = null,
+        @ProtoId(3) @JvmField val multimsgApplydownRsp: List<MultiMsg.MultiMsgApplyDownRsp>? = null
     ) : ProtoBuf
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Oidb0x769.kt

@@ -12,84 +12,85 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
 class Oidb0x769 {
     @Serializable
 internal class RequestBody(
-        @ProtoId(1) val rpt_config_list: List<ConfigSeq>
-       // @SerialId(2) val msg_device_info: DeviceInfo,
-       // @SerialId(3) val str_info: String = "",
-       // @SerialId(4) val province: String,
-       // @SerialId(5) val city: String,
-       // @SerialId(6) val req_debug_msg: Int = 0,
-       // @SerialId(101) val query_uin_package_usage_req: QueryUinPackageUsageReq
+        @ProtoId(1) @JvmField val rpt_config_list: List<ConfigSeq>
+        // @SerialId(2) @JvmField val msg_device_info: DeviceInfo,
+        // @SerialId(3) @JvmField val str_info: String = "",
+        // @SerialId(4) @JvmField val province: String,
+        // @SerialId(5) @JvmField val city: String,
+        // @SerialId(6) @JvmField val req_debug_msg: Int = 0,
+        // @SerialId(101) @JvmField val query_uin_package_usage_req: QueryUinPackageUsageReq
     ) : ProtoBuf
 
     @Serializable
 internal class QueryUinPackageUsageReq(
-        @ProtoId(1) val type: Int,
-        @ProtoId(2) val uinFileSize: Long = 0
+        @ProtoId(1) @JvmField val type: Int,
+        @ProtoId(2) @JvmField val uinFileSize: Long = 0
     ): ProtoBuf
 
     @Serializable
 internal class ConfigSeq(
-        @ProtoId(1) val type: Int, // uint
-        @ProtoId(2) val version: Int // uint
+        @ProtoId(1) @JvmField val type: Int, // uint
+        @ProtoId(2) @JvmField val version: Int // uint
     ): ProtoBuf
 
     @Serializable
 internal class DeviceInfo(
-        @ProtoId(1) val brand: String,
-        @ProtoId(2) val model: String
-        //@SerialId(3) val os: OS,
-        //@SerialId(4) val cpu: CPU,
-        //@SerialId(5) val memory: Memory,
-        //@SerialId(6) val storage: Storage,
-        //@SerialId(7) val screen: Screen,
-        //@SerialId(8) val camera: Camera
+        @ProtoId(1) @JvmField val brand: String,
+        @ProtoId(2) @JvmField val model: String
+        //@SerialId(3) @JvmField val os: OS,
+        //@SerialId(4) @JvmField val cpu: CPU,
+        //@SerialId(5) @JvmField val memory: Memory,
+        //@SerialId(6) @JvmField val storage: Storage,
+        //@SerialId(7) @JvmField val screen: Screen,
+        //@SerialId(8) @JvmField val camera: Camera
     ): ProtoBuf
 
     @Serializable
 internal class OS(
-        @ProtoId(1) val type: Int = 1,
-        @ProtoId(2) val version: String,
-        @ProtoId(3) val sdk: String,
-        @ProtoId(4) val kernel: String,
-        @ProtoId(5) val rom: String
+        @ProtoId(1) @JvmField val type: Int = 1,
+        @ProtoId(2) @JvmField val version: String,
+        @ProtoId(3) @JvmField val sdk: String,
+        @ProtoId(4) @JvmField val kernel: String,
+        @ProtoId(5) @JvmField val rom: String
     ): ProtoBuf
 
     @Serializable
 internal class Camera(
-        @ProtoId(1) val primary: Long,
-        @ProtoId(2) val secondary: Long,
-        @ProtoId(3) val flag: Boolean
+        @ProtoId(1) @JvmField val primary: Long,
+        @ProtoId(2) @JvmField val secondary: Long,
+        @ProtoId(3) @JvmField val flag: Boolean
     ): ProtoBuf
 
     @Serializable
 internal class CPU(
-        @ProtoId(1) val model: String,
-        @ProtoId(2) val frequency: Int,
-        @ProtoId(3) val cores: Int
+        @ProtoId(1) @JvmField val model: String,
+        @ProtoId(2) @JvmField val frequency: Int,
+        @ProtoId(3) @JvmField val cores: Int
     ): ProtoBuf
 
     @Serializable
 internal class Memory(
-        @ProtoId(1) val total: Int,
-        @ProtoId(2) val process: Int
+        @ProtoId(1) @JvmField val total: Int,
+        @ProtoId(2) @JvmField val process: Int
     ): ProtoBuf
 
     @Serializable
 internal class Screen(
-        @ProtoId(1) val model: String,
-        @ProtoId(2) val width: Int,
-        @ProtoId(3) val height: Int,
-        @ProtoId(4) val dpi: Int,
-        @ProtoId(5) val multiTouch: Boolean
+        @ProtoId(1) @JvmField val model: String,
+        @ProtoId(2) @JvmField val width: Int,
+        @ProtoId(3) @JvmField val height: Int,
+        @ProtoId(4) @JvmField val dpi: Int,
+        @ProtoId(5) @JvmField val multiTouch: Boolean
     ): ProtoBuf
 
     @Serializable
 internal class Storage(
-        @ProtoId(1) val builtin: Int,
-        @ProtoId(2) val external: Int
+        @ProtoId(1) @JvmField val builtin: Int,
+        @ProtoId(2) @JvmField val external: Int
     ): ProtoBuf
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/OnlinePush.kt

@@ -13,16 +13,17 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
 @Serializable
 internal class MsgOnlinePush {
     @Serializable
     internal class PbPushMsg(
-        @ProtoId(1) val msg: MsgComm.Msg,
-        @ProtoId(2) val svrip: Int = 0,
-        @ProtoId(3) val pushToken: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val pingFlag: Int = 0,
-        @ProtoId(9) val generalFlag: Int = 0
+        @ProtoId(1) @JvmField val msg: MsgComm.Msg,
+        @ProtoId(2) @JvmField val svrip: Int = 0,
+        @ProtoId(3) @JvmField val pushToken: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val pingFlag: Int = 0,
+        @ProtoId(9) @JvmField val generalFlag: Int = 0
     ) : ProtoBuf
 }
 
@@ -30,24 +31,24 @@ internal class MsgOnlinePush {
 internal class OnlinePushTrans : ProtoBuf {
     @Serializable
     internal class ExtGroupKeyInfo(
-        @ProtoId(1) val curMaxSeq: Int = 0,
-        @ProtoId(2) val curTime: Long = 0L
+        @ProtoId(1) @JvmField val curMaxSeq: Int = 0,
+        @ProtoId(2) @JvmField val curTime: Long = 0L
     ) : ProtoBuf
 
     @Serializable
     internal class PbMsgInfo(
-        @ProtoId(1) val fromUin: Long = 0L,
-        @ProtoId(2) val toUin: Long = 0L,
-        @ProtoId(3) val msgType: Int = 0,
-        @ProtoId(4) val msgSubtype: Int = 0,
-        @ProtoId(5) val msgSeq: Int = 0,
-        @ProtoId(6) val msgUid: Long = 0L,
-        @ProtoId(7) val msgTime: Int = 0,
-        @ProtoId(8) val realMsgTime: Int = 0,
-        @ProtoId(9) val nickName: String = "",
-        @ProtoId(10) val msgData: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(11) val svrIp: Int = 0,
-        @ProtoId(12) val extGroupKeyInfo: ExtGroupKeyInfo? = null,
-        @ProtoId(17) val generalFlag: Int = 0
+        @ProtoId(1) @JvmField val fromUin: Long = 0L,
+        @ProtoId(2) @JvmField val toUin: Long = 0L,
+        @ProtoId(3) @JvmField val msgType: Int = 0,
+        @ProtoId(4) @JvmField val msgSubtype: Int = 0,
+        @ProtoId(5) @JvmField val msgSeq: Int = 0,
+        @ProtoId(6) @JvmField val msgUid: Long = 0L,
+        @ProtoId(7) @JvmField val msgTime: Int = 0,
+        @ProtoId(8) @JvmField val realMsgTime: Int = 0,
+        @ProtoId(9) @JvmField val nickName: String = "",
+        @ProtoId(10) @JvmField val msgData: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(11) @JvmField val svrIp: Int = 0,
+        @ProtoId(12) @JvmField val extGroupKeyInfo: ExtGroupKeyInfo? = null,
+        @ProtoId(17) @JvmField val generalFlag: Int = 0
     ) : ProtoBuf
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/PbReserve.kt

@@ -13,72 +13,73 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
 internal class Generalflags : ProtoBuf {
     @Serializable
 internal class ResvAttr(
-        @ProtoId(1) val globalGroupLevel: Int = 0,
-        @ProtoId(2) val nearbyCharmLevel: Int = 0,
-        @ProtoId(3) val redbagMsgSenderUin: Long = 0L,
-        @ProtoId(4) val titleId: Int = 0,
-        @ProtoId(5) val robotMsgFlag: Int = 0,
-        @ProtoId(6) val wantGiftSenderUin: Long = 0L,
-        @ProtoId(7) val stickerX: Float = 0.0f,
-        @ProtoId(8) val stickerY: Float = 0.0f,
-        @ProtoId(9) val stickerWidth: Float = 0.0f,
-        @ProtoId(10) val stickerHeight: Float = 0.0f,
-        @ProtoId(11) val stickerRotate: Int = 0,
-        @ProtoId(12) val stickerHostMsgseq: Long = 0L,
-        @ProtoId(13) val stickerHostMsguid: Long = 0L,
-        @ProtoId(14) val stickerHostTime: Long = 0L,
-        @ProtoId(15) val mobileCustomFont: Int = 0,
-        @ProtoId(16) val tailKey: Int = 0,
-        @ProtoId(17) val showTailFlag: Int = 0,
-        @ProtoId(18) val doutuMsgType: Int = 0,
-        @ProtoId(19) val doutuCombo: Int = 0,
-        @ProtoId(20) val customFeatureid: Int = 0,
-        @ProtoId(21) val goldenMsgType: Int = 0,
-        @ProtoId(22) val goldenMsgInfo: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(23) val botMessageClassId: Int = 0,
-        @ProtoId(24) val subscriptionUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(25) val pendantDiyId: Int = 0,
-        @ProtoId(26) val timedMessage: Int = 0,
-        @ProtoId(27) val holidayFlag: Int = 0,
-        @ProtoId(29) val kplInfo: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(30) val faceId: Int = 0,
-        @ProtoId(31) val diyFontTimestamp: Int = 0,
-        @ProtoId(32) val redEnvelopeType: Int = 0,
-        @ProtoId(33) val shortVideoId: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(34) val reqFontEffectId: Int = 0,
-        @ProtoId(35) val loveLanguageFlag: Int = 0,
-        @ProtoId(36) val aioSyncToStoryFlag: Int = 0,
-        @ProtoId(37) val uploadImageToQzoneFlag: Int = 0,
-        @ProtoId(39) val uploadImageToQzoneParam: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(40) val groupConfessSig: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(41) val subfontId: Long = 0L,
-        @ProtoId(42) val msgFlagType: Int = 0,
-        @ProtoId(43) val uint32CustomFeatureid: List<Int>? = null,
-        @ProtoId(44) val richCardNameVer: Int = 0,
-        @ProtoId(47) val msgInfoFlag: Int = 0,
-        @ProtoId(48) val serviceMsgType: Int = 0,
-        @ProtoId(49) val serviceMsgRemindType: Int = 0,
-        @ProtoId(50) val serviceMsgName: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(51) val vipType: Int = 0,
-        @ProtoId(52) val vipLevel: Int = 0,
-        @ProtoId(53) val pbPttWaveform: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(54) val userBigclubLevel: Int = 0,
-        @ProtoId(55) val userBigclubFlag: Int = 0,
-        @ProtoId(56) val nameplate: Int = 0,
-        @ProtoId(57) val autoReply: Int = 0,
-        @ProtoId(58) val reqIsBigclubHidden: Int = 0,
-        @ProtoId(59) val showInMsgList: Int = 0,
-        @ProtoId(60) val oacMsgExtend: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(61) val groupMemberFlagEx2: Int = 0,
-        @ProtoId(62) val groupRingtoneId: Int = 0,
-        @ProtoId(63) val robotGeneralTrans: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(64) val troopPobingTemplate: Int = 0,
-        @ProtoId(65) val hudongMark: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(66) val groupInfoFlagEx3: Int = 0
+        @ProtoId(1) @JvmField val globalGroupLevel: Int = 0,
+        @ProtoId(2) @JvmField val nearbyCharmLevel: Int = 0,
+        @ProtoId(3) @JvmField val redbagMsgSenderUin: Long = 0L,
+        @ProtoId(4) @JvmField val titleId: Int = 0,
+        @ProtoId(5) @JvmField val robotMsgFlag: Int = 0,
+        @ProtoId(6) @JvmField val wantGiftSenderUin: Long = 0L,
+        @ProtoId(7) @JvmField val stickerX: Float = 0.0f,
+        @ProtoId(8) @JvmField val stickerY: Float = 0.0f,
+        @ProtoId(9) @JvmField val stickerWidth: Float = 0.0f,
+        @ProtoId(10) @JvmField val stickerHeight: Float = 0.0f,
+        @ProtoId(11) @JvmField val stickerRotate: Int = 0,
+        @ProtoId(12) @JvmField val stickerHostMsgseq: Long = 0L,
+        @ProtoId(13) @JvmField val stickerHostMsguid: Long = 0L,
+        @ProtoId(14) @JvmField val stickerHostTime: Long = 0L,
+        @ProtoId(15) @JvmField val mobileCustomFont: Int = 0,
+        @ProtoId(16) @JvmField val tailKey: Int = 0,
+        @ProtoId(17) @JvmField val showTailFlag: Int = 0,
+        @ProtoId(18) @JvmField val doutuMsgType: Int = 0,
+        @ProtoId(19) @JvmField val doutuCombo: Int = 0,
+        @ProtoId(20) @JvmField val customFeatureid: Int = 0,
+        @ProtoId(21) @JvmField val goldenMsgType: Int = 0,
+        @ProtoId(22) @JvmField val goldenMsgInfo: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(23) @JvmField val botMessageClassId: Int = 0,
+        @ProtoId(24) @JvmField val subscriptionUrl: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(25) @JvmField val pendantDiyId: Int = 0,
+        @ProtoId(26) @JvmField val timedMessage: Int = 0,
+        @ProtoId(27) @JvmField val holidayFlag: Int = 0,
+        @ProtoId(29) @JvmField val kplInfo: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(30) @JvmField val faceId: Int = 0,
+        @ProtoId(31) @JvmField val diyFontTimestamp: Int = 0,
+        @ProtoId(32) @JvmField val redEnvelopeType: Int = 0,
+        @ProtoId(33) @JvmField val shortVideoId: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(34) @JvmField val reqFontEffectId: Int = 0,
+        @ProtoId(35) @JvmField val loveLanguageFlag: Int = 0,
+        @ProtoId(36) @JvmField val aioSyncToStoryFlag: Int = 0,
+        @ProtoId(37) @JvmField val uploadImageToQzoneFlag: Int = 0,
+        @ProtoId(39) @JvmField val uploadImageToQzoneParam: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(40) @JvmField val groupConfessSig: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(41) @JvmField val subfontId: Long = 0L,
+        @ProtoId(42) @JvmField val msgFlagType: Int = 0,
+        @ProtoId(43) @JvmField val uint32CustomFeatureid: List<Int>? = null,
+        @ProtoId(44) @JvmField val richCardNameVer: Int = 0,
+        @ProtoId(47) @JvmField val msgInfoFlag: Int = 0,
+        @ProtoId(48) @JvmField val serviceMsgType: Int = 0,
+        @ProtoId(49) @JvmField val serviceMsgRemindType: Int = 0,
+        @ProtoId(50) @JvmField val serviceMsgName: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(51) @JvmField val vipType: Int = 0,
+        @ProtoId(52) @JvmField val vipLevel: Int = 0,
+        @ProtoId(53) @JvmField val pbPttWaveform: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(54) @JvmField val userBigclubLevel: Int = 0,
+        @ProtoId(55) @JvmField val userBigclubFlag: Int = 0,
+        @ProtoId(56) @JvmField val nameplate: Int = 0,
+        @ProtoId(57) @JvmField val autoReply: Int = 0,
+        @ProtoId(58) @JvmField val reqIsBigclubHidden: Int = 0,
+        @ProtoId(59) @JvmField val showInMsgList: Int = 0,
+        @ProtoId(60) @JvmField val oacMsgExtend: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(61) @JvmField val groupMemberFlagEx2: Int = 0,
+        @ProtoId(62) @JvmField val groupRingtoneId: Int = 0,
+        @ProtoId(63) @JvmField val robotGeneralTrans: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(64) @JvmField val troopPobingTemplate: Int = 0,
+        @ProtoId(65) @JvmField val hudongMark: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(66) @JvmField val groupInfoFlagEx3: Int = 0
     ) : ProtoBuf
 }
 
@@ -86,27 +87,27 @@ internal class ResvAttr(
 internal class ResvAttrForGiftMsg : ProtoBuf {
     @Serializable
 internal class ActivityGiftInfo(
-        @ProtoId(1) val isActivityGift: Int = 0,
-        @ProtoId(2) val textColor: String = "",
-        @ProtoId(3) val text: String = "",
-        @ProtoId(4) val url: String = ""
+        @ProtoId(1) @JvmField val isActivityGift: Int = 0,
+        @ProtoId(2) @JvmField val textColor: String = "",
+        @ProtoId(3) @JvmField val text: String = "",
+        @ProtoId(4) @JvmField val url: String = ""
     ) : ProtoBuf
 
     @Serializable
 internal class InteractGift(
-        @ProtoId(1) val interactId: ByteArray = EMPTY_BYTE_ARRAY
+        @ProtoId(1) @JvmField val interactId: ByteArray = EMPTY_BYTE_ARRAY
     ) : ProtoBuf
 
     @Serializable
 internal class ResvAttr(
-        @ProtoId(1) val int32SendScore: Int = 0,
-        @ProtoId(2) val int32RecvScore: Int = 0,
-        @ProtoId(3) val charmHeroism: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val buttonFlag: Int = 0,
-        @ProtoId(5) val objColor: Int = 0,
-        @ProtoId(6) val animationType: Int = 0,
-        @ProtoId(7) val msgInteractGift: InteractGift? = null,
-        @ProtoId(8) val activityGiftInfo: ActivityGiftInfo? = null
+        @ProtoId(1) @JvmField val int32SendScore: Int = 0,
+        @ProtoId(2) @JvmField val int32RecvScore: Int = 0,
+        @ProtoId(3) @JvmField val charmHeroism: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val buttonFlag: Int = 0,
+        @ProtoId(5) @JvmField val objColor: Int = 0,
+        @ProtoId(6) @JvmField val animationType: Int = 0,
+        @ProtoId(7) @JvmField val msgInteractGift: InteractGift? = null,
+        @ProtoId(8) @JvmField val activityGiftInfo: ActivityGiftInfo? = null
     ) : ProtoBuf
 }
 
@@ -114,9 +115,9 @@ internal class ResvAttr(
 internal class SourceMsg : ProtoBuf {
     @Serializable
 internal class ResvAttr(
-        @ProtoId(1) val richMsg2: ByteArray? = null,
-        @ProtoId(2) val oriMsgtype: Int? = null,
-        @ProtoId(3) val origUids: Long? = null // 原来是 list
+        @ProtoId(1) @JvmField val richMsg2: ByteArray? = null,
+        @ProtoId(2) @JvmField val oriMsgtype: Int? = null,
+        @ProtoId(3) @JvmField val origUids: Long? = null // 原来是 list
     ) : ProtoBuf
 }
 
@@ -124,17 +125,17 @@ internal class ResvAttr(
 internal class VideoFile : ProtoBuf {
     @Serializable
 internal class ResvAttr(
-        @ProtoId(1) val hotvideoIcon: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(2) val hotvideoTitle: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(3) val hotvideoUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val hotvideoIconSub: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(5) val specialVideoType: Int = 0,
-        @ProtoId(6) val dynamicText: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(7) val msgTailType: Int = 0,
-        @ProtoId(8) val redEnvelopeType: Int = 0,
-        @ProtoId(9) val shortVideoId: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(10) val animojiModelId: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(11) val longVideoKandianType: Int = 0,
-        @ProtoId(12) val source: Int = 0
+        @ProtoId(1) @JvmField val hotvideoIcon: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(2) @JvmField val hotvideoTitle: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(3) @JvmField val hotvideoUrl: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(4) @JvmField val hotvideoIconSub: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(5) @JvmField val specialVideoType: Int = 0,
+        @ProtoId(6) @JvmField val dynamicText: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(7) @JvmField val msgTailType: Int = 0,
+        @ProtoId(8) @JvmField val redEnvelopeType: Int = 0,
+        @ProtoId(9) @JvmField val shortVideoId: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(10) @JvmField val animojiModelId: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(11) @JvmField val longVideoKandianType: Int = 0,
+        @ProtoId(12) @JvmField val source: Int = 0
     ) : ProtoBuf
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/StatSvcGetOnline.kt

@@ -12,27 +12,28 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
 class StatSvcGetOnline {
     @Serializable
 internal class Instance(
-        @ProtoId(1) val instanceId: Int = 0,
-        @ProtoId(2) val clientType: Int = 0
+        @ProtoId(1) @JvmField val instanceId: Int = 0,
+        @ProtoId(2) @JvmField val clientType: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class ReqBody(
-        @ProtoId(1) val uin: Long = 0L,
-        @ProtoId(2) val appid: Int = 0
+        @ProtoId(1) @JvmField val uin: Long = 0L,
+        @ProtoId(2) @JvmField val appid: Int = 0
     ) : ProtoBuf
 
     @Serializable
 internal class RspBody(
-        @ProtoId(1) val errorCode: Int = 0,
-        @ProtoId(2) val errorMsg: String = "",
-        @ProtoId(3) val uin: Long = 0L,
-        @ProtoId(4) val appid: Int = 0,
-        @ProtoId(5) val timeInterval: Int = 0,
-        @ProtoId(6) val msgInstances: List<StatSvcGetOnline.Instance>? = null
+        @ProtoId(1) @JvmField val errorCode: Int = 0,
+        @ProtoId(2) @JvmField val errorMsg: String = "",
+        @ProtoId(3) @JvmField val uin: Long = 0L,
+        @ProtoId(4) @JvmField val appid: Int = 0,
+        @ProtoId(5) @JvmField val timeInterval: Int = 0,
+        @ProtoId(6) @JvmField val msgInstances: List<StatSvcGetOnline.Instance>? = null
     ) : ProtoBuf
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/StructMsg.kt

@@ -4,295 +4,294 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 
-@Serializable
 internal class QPayReminderMsg : ProtoBuf {
     @Serializable
     internal class GetInfoReq(
-        @ProtoId(1) val scene: String = "",
-        @ProtoId(2) val subCmd: String = "",
-        @ProtoId(3) val infoDate: String = ""
+        @ProtoId(1) @JvmField val scene: String = "",
+        @ProtoId(2) @JvmField val subCmd: String = "",
+        @ProtoId(3) @JvmField val infoDate: String = ""
     ) : ProtoBuf
 
     @Serializable
     internal class GetInfoRsp(
-        @ProtoId(1) val resultCode: Int = 0,
-        @ProtoId(2) val resultInfo: String = "",
-        @ProtoId(3) val urgency: Int = 0,
-        @ProtoId(4) val templateNo: Int = 0,
-        @ProtoId(5) val content: String = "",
-        @ProtoId(6) val infoDate: String = ""
+        @ProtoId(1) @JvmField val resultCode: Int = 0,
+        @ProtoId(2) @JvmField val resultInfo: String = "",
+        @ProtoId(3) @JvmField val urgency: Int = 0,
+        @ProtoId(4) @JvmField val templateNo: Int = 0,
+        @ProtoId(5) @JvmField val content: String = "",
+        @ProtoId(6) @JvmField val infoDate: String = ""
     ) : ProtoBuf
 }
 
-@Serializable
 internal class Structmsg : ProtoBuf {
     @Serializable
     internal class AddFrdSNInfo(
-        @ProtoId(1) val notSeeDynamic: Int = 0,
-        @ProtoId(2) val setSn: Int = 0
+        @ProtoId(1) @JvmField val notSeeDynamic: Int = 0,
+        @ProtoId(2) @JvmField val setSn: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class FlagInfo(
-        @ProtoId(1) val grpMsgKickAdmin: Int = 0,
-        @ProtoId(2) val grpMsgHiddenGrp: Int = 0,
-        @ProtoId(3) val grpMsgWordingDown: Int = 0,
-        @ProtoId(4) val frdMsgGetBusiCard: Int = 0,
-        @ProtoId(5) val grpMsgGetOfficialAccount: Int = 0,
-        @ProtoId(6) val grpMsgGetPayInGroup: Int = 0,
-        @ProtoId(7) val frdMsgDiscuss2ManyChat: Int = 0,
-        @ProtoId(8) val grpMsgNotAllowJoinGrpInviteNotFrd: Int = 0,
-        @ProtoId(9) val frdMsgNeedWaitingMsg: Int = 0,
-        @ProtoId(10) val frdMsgUint32NeedAllUnreadMsg: Int = 0,
-        @ProtoId(11) val grpMsgNeedAutoAdminWording: Int = 0,
-        @ProtoId(12) val grpMsgGetTransferGroupMsgFlag: Int = 0,
-        @ProtoId(13) val grpMsgGetQuitPayGroupMsgFlag: Int = 0,
-        @ProtoId(14) val grpMsgSupportInviteAutoJoin: Int = 0,
-        @ProtoId(15) val grpMsgMaskInviteAutoJoin: Int = 0,
-        @ProtoId(16) val grpMsgGetDisbandedByAdmin: Int = 0,
-        @ProtoId(17) val grpMsgGetC2cInviteJoinGroup: Int = 0
+        @ProtoId(1) @JvmField val grpMsgKickAdmin: Int = 0,
+        @ProtoId(2) @JvmField val grpMsgHiddenGrp: Int = 0,
+        @ProtoId(3) @JvmField val grpMsgWordingDown: Int = 0,
+        @ProtoId(4) @JvmField val frdMsgGetBusiCard: Int = 0,
+        @ProtoId(5) @JvmField val grpMsgGetOfficialAccount: Int = 0,
+        @ProtoId(6) @JvmField val grpMsgGetPayInGroup: Int = 0,
+        @ProtoId(7) @JvmField val frdMsgDiscuss2ManyChat: Int = 0,
+        @ProtoId(8) @JvmField val grpMsgNotAllowJoinGrpInviteNotFrd: Int = 0,
+        @ProtoId(9) @JvmField val frdMsgNeedWaitingMsg: Int = 0,
+        @ProtoId(10) @JvmField val frdMsgUint32NeedAllUnreadMsg: Int = 0,
+        @ProtoId(11) @JvmField val grpMsgNeedAutoAdminWording: Int = 0,
+        @ProtoId(12) @JvmField val grpMsgGetTransferGroupMsgFlag: Int = 0,
+        @ProtoId(13) @JvmField val grpMsgGetQuitPayGroupMsgFlag: Int = 0,
+        @ProtoId(14) @JvmField val grpMsgSupportInviteAutoJoin: Int = 0,
+        @ProtoId(15) @JvmField val grpMsgMaskInviteAutoJoin: Int = 0,
+        @ProtoId(16) @JvmField val grpMsgGetDisbandedByAdmin: Int = 0,
+        @ProtoId(17) @JvmField val grpMsgGetC2cInviteJoinGroup: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class FriendInfo(
-        @ProtoId(1) val msgJointFriend: String = "",
-        @ProtoId(2) val msgBlacklist: String = ""
+        @ProtoId(1) @JvmField val msgJointFriend: String = "",
+        @ProtoId(2) @JvmField val msgBlacklist: String = ""
     ) : ProtoBuf
 
     @Serializable
     internal class GroupInfo(
-        @ProtoId(1) val groupAuthType: Int = 0,
-        @ProtoId(2) val displayAction: Int = 0,
-        @ProtoId(3) val msgAlert: String = "",
-        @ProtoId(4) val msgDetailAlert: String = "",
-        @ProtoId(5) val msgOtherAdminDone: String = "",
-        @ProtoId(6) val appPrivilegeFlag: Int = 0
+        @ProtoId(1) @JvmField val groupAuthType: Int = 0,
+        @ProtoId(2) @JvmField val displayAction: Int = 0,
+        @ProtoId(3) @JvmField val msgAlert: String = "",
+        @ProtoId(4) @JvmField val msgDetailAlert: String = "",
+        @ProtoId(5) @JvmField val msgOtherAdminDone: String = "",
+        @ProtoId(6) @JvmField val appPrivilegeFlag: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class MsgInviteExt(
-        @ProtoId(1) val srcType: Int = 0,
-        @ProtoId(2) val srcCode: Long = 0L,
-        @ProtoId(3) val waitState: Int = 0
+        @ProtoId(1) @JvmField val srcType: Int = 0,
+        @ProtoId(2) @JvmField val srcCode: Long = 0L,
+        @ProtoId(3) @JvmField val waitState: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class MsgPayGroupExt(
-        @ProtoId(1) val joinGrpTime: Long = 0L,
-        @ProtoId(2) val quitGrpTime: Long = 0L
+        @ProtoId(1) @JvmField val joinGrpTime: Long = 0L,
+        @ProtoId(2) @JvmField val quitGrpTime: Long = 0L
     ) : ProtoBuf
 
     @Serializable
     internal class ReqNextSystemMsg(
-        @ProtoId(1) val msgNum: Int = 0,
-        @ProtoId(2) val followingFriendSeq: Long = 0L,
-        @ProtoId(3) val followingGroupSeq: Long = 0L,
-        @ProtoId(4) val checktype: Int /* enum */ = 1,
-        @ProtoId(5) val flag: FlagInfo? = null,
-        @ProtoId(6) val language: Int = 0,
-        @ProtoId(7) val version: Int = 0,
-        @ProtoId(8) val friendMsgTypeFlag: Long = 0L
+        @ProtoId(1) @JvmField val msgNum: Int = 0,
+        @ProtoId(2) @JvmField val followingFriendSeq: Long = 0L,
+        @ProtoId(3) @JvmField val followingGroupSeq: Long = 0L,
+        @ProtoId(4) @JvmField val checktype: Int /* enum */ = 1,
+        @ProtoId(5) @JvmField val flag: FlagInfo? = null,
+        @ProtoId(6) @JvmField val language: Int = 0,
+        @ProtoId(7) @JvmField val version: Int = 0,
+        @ProtoId(8) @JvmField val friendMsgTypeFlag: Long = 0L
     ) : ProtoBuf
 
     @Serializable
     internal class ReqSystemMsg(
-        @ProtoId(1) val msgNum: Int = 0,
-        @ProtoId(2) val latestFriendSeq: Long = 0L,
-        @ProtoId(3) val latestGroupSeq: Long = 0L,
-        @ProtoId(4) val version: Int = 0,
-        @ProtoId(5) val language: Int = 0
+        @ProtoId(1) @JvmField val msgNum: Int = 0,
+        @ProtoId(2) @JvmField val latestFriendSeq: Long = 0L,
+        @ProtoId(3) @JvmField val latestGroupSeq: Long = 0L,
+        @ProtoId(4) @JvmField val version: Int = 0,
+        @ProtoId(5) @JvmField val language: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class ReqSystemMsgAction(
-        @ProtoId(1) val msgType: Int /* enum */ = 1,
-        @ProtoId(2) val msgSeq: Long = 0L,
-        @ProtoId(3) val reqUin: Long = 0L,
-        @ProtoId(4) val subType: Int = 0,
-        @ProtoId(5) val srcId: Int = 0,
-        @ProtoId(6) val subSrcId: Int = 0,
-        @ProtoId(7) val groupMsgType: Int = 0,
-        @ProtoId(8) val actionInfo: SystemMsgActionInfo? = null,
-        @ProtoId(9) val language: Int = 0
+        @ProtoId(1) @JvmField val msgType: Int /* enum */ = 1,
+        @ProtoId(2) @JvmField val msgSeq: Long = 0L,
+        @ProtoId(3) @JvmField val reqUin: Long = 0L,
+        @ProtoId(4) @JvmField val subType: Int = 0,
+        @ProtoId(5) @JvmField val srcId: Int = 0,
+        @ProtoId(6) @JvmField val subSrcId: Int = 0,
+        @ProtoId(7) @JvmField val groupMsgType: Int = 0,
+        @ProtoId(8) @JvmField val actionInfo: SystemMsgActionInfo? = null,
+        @ProtoId(9) @JvmField val language: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class ReqSystemMsgNew(
-        @ProtoId(1) val msgNum: Int = 0,
-        @ProtoId(2) val latestFriendSeq: Long = 0L,
-        @ProtoId(3) val latestGroupSeq: Long = 0L,
-        @ProtoId(4) val version: Int = 0,
-        @ProtoId(5) val checktype: Int /* enum */ = 1,
-        @ProtoId(6) val flag: FlagInfo? = null,
-        @ProtoId(7) val language: Int = 0,
-        @ProtoId(8) val isGetFrdRibbon: Boolean = true,
-        @ProtoId(9) val isGetGrpRibbon: Boolean = true,
-        @ProtoId(10) val friendMsgTypeFlag: Long = 0L
+        @ProtoId(1) @JvmField val msgNum: Int = 0,
+        @ProtoId(2) @JvmField val latestFriendSeq: Long = 0L,
+        @ProtoId(3) @JvmField val latestGroupSeq: Long = 0L,
+        @ProtoId(4) @JvmField val version: Int = 0,
+        @ProtoId(5) @JvmField val checktype: Int /* enum */ = 1,
+        @ProtoId(6) @JvmField val flag: FlagInfo? = null,
+        @ProtoId(7) @JvmField val language: Int = 0,
+        @ProtoId(8) @JvmField val isGetFrdRibbon: Boolean = true,
+        @ProtoId(9) @JvmField val isGetGrpRibbon: Boolean = true,
+        @ProtoId(10) @JvmField val friendMsgTypeFlag: Long = 0L
     ) : ProtoBuf
 
     @Serializable
     internal class ReqSystemMsgRead(
-        @ProtoId(1) val latestFriendSeq: Long = 0L,
-        @ProtoId(2) val latestGroupSeq: Long = 0L,
-        @ProtoId(3) val type: Int = 0,
-        @ProtoId(4) val checktype: Int /* enum */ = 1
+        @ProtoId(1) @JvmField val latestFriendSeq: Long = 0L,
+        @ProtoId(2) @JvmField val latestGroupSeq: Long = 0L,
+        @ProtoId(3) @JvmField val type: Int = 0,
+        @ProtoId(4) @JvmField val checktype: Int /* enum */ = 1
     ) : ProtoBuf
 
     @Serializable
     internal class RspHead(
-        @ProtoId(1) val result: Int = 0,
-        @ProtoId(2) val msgFail: String = ""
+        @ProtoId(1) @JvmField val result: Int = 0,
+        @ProtoId(2) @JvmField val msgFail: String = ""
     ) : ProtoBuf
 
     @Serializable
     internal class RspNextSystemMsg(
-        @ProtoId(1) val head: RspHead? = null,
-        @ProtoId(2) val msgs: List<StructMsg>? = null,
-        @ProtoId(3) val followingFriendSeq: Long = 0L,
-        @ProtoId(4) val followingGroupSeq: Long = 0L,
-        @ProtoId(5) val checktype: Int /* enum */ = 1,
-        @ProtoId(100) val gameNick: String = "",
-        @ProtoId(101) val undecidForQim: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(102) val unReadCount3: Int = 0
+        @ProtoId(1) @JvmField val head: RspHead? = null,
+        @ProtoId(2) @JvmField val msgs: List<StructMsg>? = null,
+        @ProtoId(3) @JvmField val followingFriendSeq: Long = 0L,
+        @ProtoId(4) @JvmField val followingGroupSeq: Long = 0L,
+        @ProtoId(5) @JvmField val checktype: Int /* enum */ = 1,
+        @ProtoId(100) @JvmField val gameNick: String = "",
+        @ProtoId(101) @JvmField val undecidForQim: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(102) @JvmField val unReadCount3: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class RspSystemMsg(
-        @ProtoId(1) val head: RspHead? = null,
-        @ProtoId(2) val msgs: List<StructMsg>? = null,
-        @ProtoId(3) val unreadCount: Int = 0,
-        @ProtoId(4) val latestFriendSeq: Long = 0L,
-        @ProtoId(5) val latestGroupSeq: Long = 0L,
-        @ProtoId(6) val followingFriendSeq: Long = 0L,
-        @ProtoId(7) val followingGroupSeq: Long = 0L,
-        @ProtoId(8) val msgDisplay: String = ""
+        @ProtoId(1) @JvmField val head: RspHead? = null,
+        @ProtoId(2) @JvmField val msgs: List<StructMsg>? = null,
+        @ProtoId(3) @JvmField val unreadCount: Int = 0,
+        @ProtoId(4) @JvmField val latestFriendSeq: Long = 0L,
+        @ProtoId(5) @JvmField val latestGroupSeq: Long = 0L,
+        @ProtoId(6) @JvmField val followingFriendSeq: Long = 0L,
+        @ProtoId(7) @JvmField val followingGroupSeq: Long = 0L,
+        @ProtoId(8) @JvmField val msgDisplay: String = ""
     ) : ProtoBuf
 
     @Serializable
     internal class RspSystemMsgAction(
-        @ProtoId(1) val head: RspHead? = null,
-        @ProtoId(2) val msgDetail: String = "",
-        @ProtoId(3) val type: Int = 0,
-        @ProtoId(5) val msgInvalidDecided: String = "",
-        @ProtoId(6) val remarkResult: Int = 0
+        @ProtoId(1) @JvmField val head: RspHead? = null,
+        @ProtoId(2) @JvmField val msgDetail: String = "",
+        @ProtoId(3) @JvmField val type: Int = 0,
+        @ProtoId(5) @JvmField val msgInvalidDecided: String = "",
+        @ProtoId(6) @JvmField val remarkResult: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class RspSystemMsgNew(
-        @ProtoId(1) val head: RspHead? = null,
-        @ProtoId(2) val unreadFriendCount: Int = 0,
-        @ProtoId(3) val unreadGroupCount: Int = 0,
-        @ProtoId(4) val latestFriendSeq: Long = 0L,
-        @ProtoId(5) val latestGroupSeq: Long = 0L,
-        @ProtoId(6) val followingFriendSeq: Long = 0L,
-        @ProtoId(7) val followingGroupSeq: Long = 0L,
-        @ProtoId(9) val friendmsgs: List<StructMsg>? = null,
-        @ProtoId(10) val groupmsgs: List<StructMsg>? = null,
-        @ProtoId(11) val msgRibbonFriend: StructMsg? = null,
-        @ProtoId(12) val msgRibbonGroup: StructMsg? = null,
-        @ProtoId(13) val msgDisplay: String = "",
-        @ProtoId(14) val grpMsgDisplay: String = "",
-        @ProtoId(15) val over: Int = 0,
-        @ProtoId(20) val checktype: Int /* enum */ = 1,
-        @ProtoId(100) val gameNick: String = "",
-        @ProtoId(101) val undecidForQim: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(102) val unReadCount3: Int = 0
+        @ProtoId(1) @JvmField val head: RspHead? = null,
+        @ProtoId(2) @JvmField val unreadFriendCount: Int = 0,
+        @ProtoId(3) @JvmField val unreadGroupCount: Int = 0,
+        @ProtoId(4) @JvmField val latestFriendSeq: Long = 0L,
+        @ProtoId(5) @JvmField val latestGroupSeq: Long = 0L,
+        @ProtoId(6) @JvmField val followingFriendSeq: Long = 0L,
+        @ProtoId(7) @JvmField val followingGroupSeq: Long = 0L,
+        @ProtoId(9) @JvmField val friendmsgs: List<StructMsg>? = null,
+        @ProtoId(10) @JvmField val groupmsgs: List<StructMsg>? = null,
+        @ProtoId(11) @JvmField val msgRibbonFriend: StructMsg? = null,
+        @ProtoId(12) @JvmField val msgRibbonGroup: StructMsg? = null,
+        @ProtoId(13) @JvmField val msgDisplay: String = "",
+        @ProtoId(14) @JvmField val grpMsgDisplay: String = "",
+        @ProtoId(15) @JvmField val over: Int = 0,
+        @ProtoId(20) @JvmField val checktype: Int /* enum */ = 1,
+        @ProtoId(100) @JvmField val gameNick: String = "",
+        @ProtoId(101) @JvmField val undecidForQim: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(102) @JvmField val unReadCount3: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class RspSystemMsgRead(
-        @ProtoId(1) val head: RspHead? = null,
-        @ProtoId(2) val type: Int = 0,
-        @ProtoId(3) val checktype: Int /* enum */ = 1
+        @ProtoId(1) @JvmField val head: RspHead? = null,
+        @ProtoId(2) @JvmField val type: Int = 0,
+        @ProtoId(3) @JvmField val checktype: Int /* enum */ = 1
     ) : ProtoBuf
 
     @Serializable
     internal class StructMsg(
-        @ProtoId(1) val version: Int = 0,
-        @ProtoId(2) val msgType: Int /* enum */ = 1,
-        @ProtoId(3) val msgSeq: Long = 0L,
-        @ProtoId(4) val msgTime: Long = 0L,
-        @ProtoId(5) val reqUin: Long = 0L,
-        @ProtoId(6) val unreadFlag: Int = 0,
-        @ProtoId(50) val msg: SystemMsg? = null
+        @ProtoId(1) @JvmField val version: Int = 0,
+        @ProtoId(2) @JvmField val msgType: Int /* enum */ = 1,
+        @ProtoId(3) @JvmField val msgSeq: Long = 0L,
+        @ProtoId(4) @JvmField val msgTime: Long = 0L,
+        @ProtoId(5) @JvmField val reqUin: Long = 0L,
+        @ProtoId(6) @JvmField val unreadFlag: Int = 0,
+        @ProtoId(50) @JvmField val msg: SystemMsg? = null
     ) : ProtoBuf
 
     @Serializable
     internal class SystemMsg(
-        @ProtoId(1) val subType: Int = 0,
-        @ProtoId(2) val msgTitle: String = "",
-        @ProtoId(3) val msgDescribe: String = "",
-        @ProtoId(4) val msgAdditional: String = "",
-        @ProtoId(5) val msgSource: String = "",
-        @ProtoId(6) val msgDecided: String = "",
-        @ProtoId(7) val srcId: Int = 0,
-        @ProtoId(8) val subSrcId: Int = 0,
-        @ProtoId(9) val actions: List<SystemMsgAction>? = null,
-        @ProtoId(10) val groupCode: Long = 0L,
-        @ProtoId(11) val actionUin: Long = 0L,
-        @ProtoId(12) val groupMsgType: Int = 0,
-        @ProtoId(13) val groupInviterRole: Int = 0,
-        @ProtoId(14) val friendInfo: FriendInfo? = null,
-        @ProtoId(15) val groupInfo: GroupInfo? = null,
-        @ProtoId(16) val actorUin: Long = 0L,
-        @ProtoId(17) val msgActorDescribe: String = "",
-        @ProtoId(18) val msgAdditionalList: String = "",
-        @ProtoId(19) val relation: Int = 0,
-        @ProtoId(20) val reqsubtype: Int = 0,
-        @ProtoId(21) val cloneUin: Long = 0L,
-        @ProtoId(22) val discussUin: Long = 0L,
-        @ProtoId(23) val eimGroupId: Long = 0L,
-        @ProtoId(24) val msgInviteExtinfo: MsgInviteExt? = null,
-        @ProtoId(25) val msgPayGroupExtinfo: MsgPayGroupExt? = null,
-        @ProtoId(26) val sourceFlag: Int = 0,
-        @ProtoId(27) val gameNick: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(28) val gameMsg: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(29) val groupFlagext3: Int = 0,
-        @ProtoId(30) val groupOwnerUin: Long = 0L,
-        @ProtoId(31) val doubtFlag: Int = 0,
-        @ProtoId(32) val warningTips: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(33) val nameMore: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(50) val reqUinFaceid: Int = 0,
-        @ProtoId(51) val reqUinNick: String = "",
-        @ProtoId(52) val groupName: String = "",
-        @ProtoId(53) val actionUinNick: String = "",
-        @ProtoId(54) val msgQna: String = "",
-        @ProtoId(55) val msgDetail: String = "",
-        @ProtoId(57) val groupExtFlag: Int = 0,
-        @ProtoId(58) val actorUinNick: String = "",
-        @ProtoId(59) val picUrl: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(60) val cloneUinNick: String = "",
-        @ProtoId(61) val reqUinBusinessCard: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(63) val eimGroupIdName: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(64) val reqUinPreRemark: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(65) val actionUinQqNick: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(66) val actionUinRemark: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(67) val reqUinGender: Int = 0,
-        @ProtoId(68) val reqUinAge: Int = 0,
-        @ProtoId(69) val c2cInviteJoinGroupFlag: Int = 0,
-        @ProtoId(101) val cardSwitch: Int = 0
+        @ProtoId(1) @JvmField val subType: Int = 0,
+        @ProtoId(2) @JvmField val msgTitle: String = "",
+        @ProtoId(3) @JvmField val msgDescribe: String = "",
+        @ProtoId(4) @JvmField val msgAdditional: String = "",
+        @ProtoId(5) @JvmField val msgSource: String = "",
+        @ProtoId(6) @JvmField val msgDecided: String = "",
+        @ProtoId(7) @JvmField val srcId: Int = 0,
+        @ProtoId(8) @JvmField val subSrcId: Int = 0,
+        @ProtoId(9) @JvmField val actions: List<SystemMsgAction>? = null,
+        @ProtoId(10) @JvmField val groupCode: Long = 0L,
+        @ProtoId(11) @JvmField val actionUin: Long = 0L,
+        @ProtoId(12) @JvmField val groupMsgType: Int = 0,
+        @ProtoId(13) @JvmField val groupInviterRole: Int = 0,
+        @ProtoId(14) @JvmField val friendInfo: FriendInfo? = null,
+        @ProtoId(15) @JvmField val groupInfo: GroupInfo? = null,
+        @ProtoId(16) @JvmField val actorUin: Long = 0L,
+        @ProtoId(17) @JvmField val msgActorDescribe: String = "",
+        @ProtoId(18) @JvmField val msgAdditionalList: String = "",
+        @ProtoId(19) @JvmField val relation: Int = 0,
+        @ProtoId(20) @JvmField val reqsubtype: Int = 0,
+        @ProtoId(21) @JvmField val cloneUin: Long = 0L,
+        @ProtoId(22) @JvmField val discussUin: Long = 0L,
+        @ProtoId(23) @JvmField val eimGroupId: Long = 0L,
+        @ProtoId(24) @JvmField val msgInviteExtinfo: MsgInviteExt? = null,
+        @ProtoId(25) @JvmField val msgPayGroupExtinfo: MsgPayGroupExt? = null,
+        @ProtoId(26) @JvmField val sourceFlag: Int = 0,
+        @ProtoId(27) @JvmField val gameNick: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(28) @JvmField val gameMsg: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(29) @JvmField val groupFlagext3: Int = 0,
+        @ProtoId(30) @JvmField val groupOwnerUin: Long = 0L,
+        @ProtoId(31) @JvmField val doubtFlag: Int = 0,
+        @ProtoId(32) @JvmField val warningTips: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(33) @JvmField val nameMore: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(50) @JvmField val reqUinFaceid: Int = 0,
+        @ProtoId(51) @JvmField val reqUinNick: String = "",
+        @ProtoId(52) @JvmField val groupName: String = "",
+        @ProtoId(53) @JvmField val actionUinNick: String = "",
+        @ProtoId(54) @JvmField val msgQna: String = "",
+        @ProtoId(55) @JvmField val msgDetail: String = "",
+        @ProtoId(57) @JvmField val groupExtFlag: Int = 0,
+        @ProtoId(58) @JvmField val actorUinNick: String = "",
+        @ProtoId(59) @JvmField val picUrl: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(60) @JvmField val cloneUinNick: String = "",
+        @ProtoId(61) @JvmField val reqUinBusinessCard: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(63) @JvmField val eimGroupIdName: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(64) @JvmField val reqUinPreRemark: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(65) @JvmField val actionUinQqNick: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(66) @JvmField val actionUinRemark: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(67) @JvmField val reqUinGender: Int = 0,
+        @ProtoId(68) @JvmField val reqUinAge: Int = 0,
+        @ProtoId(69) @JvmField val c2cInviteJoinGroupFlag: Int = 0,
+        @ProtoId(101) @JvmField val cardSwitch: Int = 0
     ) : ProtoBuf
 
     @Serializable
     internal class SystemMsgAction(
-        @ProtoId(1) val name: String = "",
-        @ProtoId(2) val result: String = "",
-        @ProtoId(3) val action: Int = 0,
-        @ProtoId(4) val actionInfo: SystemMsgActionInfo? = null,
-        @ProtoId(5) val detailName: String = ""
+        @ProtoId(1) @JvmField val name: String = "",
+        @ProtoId(2) @JvmField val result: String = "",
+        @ProtoId(3) @JvmField val action: Int = 0,
+        @ProtoId(4) @JvmField val actionInfo: SystemMsgActionInfo? = null,
+        @ProtoId(5) @JvmField val detailName: String = ""
     ) : ProtoBuf
 
     @Serializable
     internal class SystemMsgActionInfo(
-        @ProtoId(1) val type: Int /* enum */ = 1,
-        @ProtoId(2) val groupCode: Long = 0L,
-        @ProtoId(3) val sig: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(50) val msg: String = "",
-        @ProtoId(51) val groupId: Int = 0,
-        @ProtoId(52) val remark: String = "",
-        @ProtoId(53) val blacklist: Boolean = false,
-        @ProtoId(54) val addFrdSNInfo: AddFrdSNInfo? = null
+        @ProtoId(1) @JvmField val type: Int /* enum */ = 1,
+        @ProtoId(2) @JvmField val groupCode: Long = 0L,
+        @ProtoId(3) @JvmField val sig: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(50) @JvmField val msg: String = "",
+        @ProtoId(51) @JvmField val groupId: Int = 0,
+        @ProtoId(52) @JvmField val remark: String = "",
+        @ProtoId(53) @JvmField val blacklist: Boolean = false,
+        @ProtoId(54) @JvmField val addFrdSNInfo: AddFrdSNInfo? = null
     ) : ProtoBuf
 }
 
@@ -300,15 +299,15 @@ internal class Structmsg : ProtoBuf {
 internal class Youtu : ProtoBuf {
     @Serializable
     internal class NameCardOcrRsp(
-        @ProtoId(1) val errorcode: Int = 0,
-        @ProtoId(2) val errormsg: String = "",
-        @ProtoId(3) val uin: String = "",
-        @ProtoId(4) val uinConfidence: Float = 0.0F,
-        @ProtoId(5) val phone: String = "",
-        @ProtoId(6) val phoneConfidence: Float = 0.0F,
-        @ProtoId(7) val name: String = "",
-        @ProtoId(8) val nameConfidence: Float = 0.0F,
-        @ProtoId(9) val image: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(10) val sessionId: String = ""
+        @ProtoId(1) @JvmField val errorcode: Int = 0,
+        @ProtoId(2) @JvmField val errormsg: String = "",
+        @ProtoId(3) @JvmField val uin: String = "",
+        @ProtoId(4) @JvmField val uinConfidence: Float = 0.0F,
+        @ProtoId(5) @JvmField val phone: String = "",
+        @ProtoId(6) @JvmField val phoneConfidence: Float = 0.0F,
+        @ProtoId(7) @JvmField val name: String = "",
+        @ProtoId(8) @JvmField val nameConfidence: Float = 0.0F,
+        @ProtoId(9) @JvmField val image: ByteArray = EMPTY_BYTE_ARRAY,
+        @ProtoId(10) @JvmField val sessionId: String = ""
     ) : ProtoBuf
 }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/SyncCookie.kt

@@ -12,20 +12,21 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.proto
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoId
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
+import kotlin.jvm.JvmField
 import kotlin.math.absoluteValue
 import kotlin.random.Random
 
 @Serializable
 internal class SyncCookie(
-    @ProtoId(1) val time1: Long? = null, // 1580277992
-    @ProtoId(2) val time: Long, // 1580277992
-    @ProtoId(3) val unknown1: Long = Random.nextLong().absoluteValue,// 678328038
-    @ProtoId(4) val unknown2: Long = Random.nextLong().absoluteValue, // 1687142153
-    @ProtoId(5) val const1: Long = const1_, // 1458467940
-    @ProtoId(11) val const2: Long = const2_, // 2683038258
-    @ProtoId(12) val unknown3: Long = 0x1d,
-    @ProtoId(13) val lastSyncTime: Long? = null,
-    @ProtoId(14) val unknown4: Long = 0
+    @ProtoId(1) @JvmField val time1: Long? = null, // 1580277992
+    @ProtoId(2) @JvmField val time: Long, // 1580277992
+    @ProtoId(3) @JvmField val unknown1: Long = Random.nextLong().absoluteValue,// 678328038
+    @ProtoId(4) @JvmField val unknown2: Long = Random.nextLong().absoluteValue, // 1687142153
+    @ProtoId(5) @JvmField val const1: Long = const1_, // 1458467940
+    @ProtoId(11) @JvmField val const2: Long = const2_, // 2683038258
+    @ProtoId(12) @JvmField val unknown3: Long = 0x1d,
+    @ProtoId(13) @JvmField val lastSyncTime: Long? = null,
+    @ProtoId(14) @JvmField val unknown4: Long = 0
 ) : ProtoBuf
 
 private val const1_: Long = Random.nextLong().absoluteValue
@@ -34,14 +35,14 @@ private val const2_: Long = Random.nextLong().absoluteValue
 
 @Serializable
 internal class SyncCookie(
-    @SerialId(1) val time1: Long? = null, // 1580277992
-    @SerialId(2) val time: Long, // 1580277992
-    @SerialId(3) val unknown1: Long = 678328038,// 678328038
-    @SerialId(4) val unknown2: Long = 1687142153, // 1687142153
-    @SerialId(5) val const1: Long = 1458467940, // 1458467940
-    @SerialId(11) val const2: Long = 2683038258, // 2683038258
-    @SerialId(12) val unknown3: Long = 0x1d,
-    @SerialId(13) val lastSyncTime: Long? = null,
-    @SerialId(14) val unknown4: Long = 0
+    @SerialId(1) @JvmField val time1: Long? = null, // 1580277992
+    @SerialId(2) @JvmField val time: Long, // 1580277992
+    @SerialId(3) @JvmField val unknown1: Long = 678328038,// 678328038
+    @SerialId(4) @JvmField val unknown2: Long = 1687142153, // 1687142153
+    @SerialId(5) @JvmField val const1: Long = 1458467940, // 1458467940
+    @SerialId(11) @JvmField val const2: Long = 2683038258, // 2683038258
+    @SerialId(12) @JvmField val unknown3: Long = 0x1d,
+    @SerialId(13) @JvmField val lastSyncTime: Long? = null,
+    @SerialId(14) @JvmField val unknown4: Long = 0
 ) : ProtoBuf
  */

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

@@ -29,8 +29,8 @@ internal class ImgStore {
             groupCode: Long,
             md5: ByteArray,
             size: Long,
-            picWidth: Int,
-            picHeight: Int,
+            picWidth: Int = 0, // not orthodox
+            picHeight: Int = 0, // not orthodox
             picType: Int = 1000,
             fileId: Long = 0,
             filename: String,
@@ -102,7 +102,10 @@ internal class ImgStore {
             return when {
                 resp.result != 0 -> Response.Failed(resultCode = resp.result, message = resp.failMsg)
                 resp.boolFileExit -> Response.FileExists(fileId = resp.fileid, fileInfo = resp.msgImgInfo!!)
-                else -> Response.RequireUpload(fileId = resp.fileid, uKey = resp.upUkey, uploadIpList = resp.uint32UpIp!!, uploadPortList = resp.uint32UpPort!!)
+                else -> Response.RequireUpload(fileId = resp.fileid,
+                    uKey = resp.upUkey,
+                    uploadIpList = resp.uint32UpIp!!,
+                    uploadPortList = resp.uint32UpPort!!)
             }
         }
     }