From 6d57f44e91a986a77044c4b768aea869776f9688 Mon Sep 17 00:00:00 2001 From: Him188 Date: Fri, 17 Apr 2020 09:29:29 +0800 Subject: [PATCH] Optimize useless getters, fix #236 --- .../network/protocol/data/jce/ConfigPush.kt | 187 +- .../network/protocol/data/jce/FriendList.kt | 261 +- .../network/protocol/data/jce/GroupMngReq.kt | 59 +- .../network/protocol/data/jce/MsgType0x210.kt | 233 +- .../protocol/data/jce/OnlinePushPack.kt | 301 +- .../protocol/data/jce/PushNotifyPack.kt | 85 +- .../data/jce/RequestMSFForceOffline.kt | 23 +- .../protocol/data/jce/RequestPacket.kt | 27 +- .../data/jce/RequestPushForceOffline.kt | 9 +- .../protocol/data/jce/SvcReqRegister.kt | 73 +- .../network/protocol/data/jce/TroopList.kt | 261 +- .../network/protocol/data/proto/Cmd0x352.kt | 253 +- .../network/protocol/data/proto/Cmd0x388.kt | 371 +- .../network/protocol/data/proto/Cmd0x857.kt | 489 +-- .../network/protocol/data/proto/Cmd0x858.kt | 99 +- .../network/protocol/data/proto/Define.kt | 658 ++-- .../protocol/data/proto/FriendListCommon.kt | 61 +- .../network/protocol/data/proto/Group.kt | 45 +- .../network/protocol/data/proto/Highway.kt | 473 +-- .../protocol/data/proto/HummerCommelem.kt | 287 +- .../protocol/data/proto/ImageRequest.kt | 29 +- .../network/protocol/data/proto/LongMsg.kt | 65 +- .../network/protocol/data/proto/Msg.kt | 1462 +++---- .../network/protocol/data/proto/MsgCommon.kt | 179 +- .../protocol/data/proto/MsgRevokeUserDef.kt | 21 +- .../network/protocol/data/proto/MsgSvc.kt | 831 ++-- .../protocol/data/proto/MsgTransmit.kt | 11 +- .../network/protocol/data/proto/MultiMsg.kt | 87 +- .../network/protocol/data/proto/OIDB.kt | 2449 ++++++------ .../network/protocol/data/proto/Oidb0x769.kt | 79 +- .../network/protocol/data/proto/OnlinePush.kt | 41 +- .../network/protocol/data/proto/PbReserve.kt | 181 +- .../protocol/data/proto/StatSvcGetOnline.kt | 21 +- .../network/protocol/data/proto/StructMsg.kt | 409 +- .../network/protocol/data/proto/SyncCookie.kt | 37 +- .../protocol/data/proto/msgType0x210.kt | 3501 +++++++++-------- .../protocol/packet/chat/image/ImgStore.kt | 9 +- 37 files changed, 6852 insertions(+), 6815 deletions(-) diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt index b760c18dc..c1f86c96d 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt @@ -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, - @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, + @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, - @JceId(2) val netSegConfs: List? = null, - @JceId(3) val ufragmentSize: Long? = null + @JceId(0) @JvmField val uServiceType: Long, + @JceId(1) @JvmField val vIplist: List, + @JceId(2) @JvmField val netSegConfs: List? = null, + @JceId(3) @JvmField val ufragmentSize: Long? = null ) : 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 + @JceId(0) @JvmField val vDomainIplists: List ) : 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, - @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, + @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? = listOf(), - @JceId(1) val vPicDownLoadList: List? = listOf(), - @JceId(2) val vGPicDownLoadList: List? = null, - @JceId(3) val vQzoneProxyServiceList: List? = null, - @JceId(4) val vUrlEncodeServiceList: List? = null, - @JceId(5) val bigDataChannel: BigDataChannel? = null, - @JceId(6) val vVipEmotionList: List? = null, - @JceId(7) val vC2CPicDownList: List? = 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? = listOf(), + @JceId(1) @JvmField val vPicDownLoadList: List? = listOf(), + @JceId(2) @JvmField val vGPicDownLoadList: List? = null, + @JceId(3) @JvmField val vQzoneProxyServiceList: List? = null, + @JceId(4) @JvmField val vUrlEncodeServiceList: List? = null, + @JceId(5) @JvmField val bigDataChannel: BigDataChannel? = null, + @JceId(6) @JvmField val vVipEmotionList: List? = null, + @JceId(7) @JvmField val vC2CPicDownList: List? = null, + @JceId(8) @JvmField val fmtIPInfo: FmtIPInfo? = null, + @JceId(9) @JvmField val domainIpChannel: DomainIpChannel? = null, + @JceId(10) @JvmField val pttlist: ByteArray? = null ) : 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, - @JceId(3) val vWifiList: List, - @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? = null, - @JceId(9) val vHttpWifilist: List? = null + @JceId(1) @JvmField val v2G3GList: List, + @JceId(3) @JvmField val vWifiList: List, + @JceId(4) @JvmField val iReconnect: Int, + @JceId(5) @JvmField val testSpeed: Byte? = null, + @JceId(6) @JvmField val useNewList: Byte? = null, + @JceId(7) @JvmField val iMultiConn: Int? = 1, + @JceId(8) @JvmField val vHttp2g3glist: List? = null, + @JceId(9) @JvmField val vHttpWifilist: List? = null ) : 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 diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt index ae071e353..b78e6b4d0 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt @@ -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 + @JceId(0) @JvmField val dwZero: Long, + @JceId(1) @JvmField val dwGroupCode: Long, + @JceId(2) @JvmField val dwNewSeq: Long, + @JceId(3) @JvmField val vecUinInfo: List ) : 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? = 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? = 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? = null, + @JceId(13) @JvmField val eAppType: Int = 0, + @JceId(14) @JvmField val ifGetDOVId: Byte? = null, + @JceId(15) @JvmField val ifGetBothFlag: Byte? = null, + @JceId(16) @JvmField val vec0xd50Req: ByteArray? = null, + @JceId(17) @JvmField val vec0xd6bReq: ByteArray? = null, + @JceId(18) @JvmField val vecSnsTypelist: List? = null ) : 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? = 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? = 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? = 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? = null, + @JceId(8) @JvmField val groupid: Byte? = null, + @JceId(9) @JvmField val ifGetGroupInfo: Byte, + @JceId(10) @JvmField val groupstartIndex: Byte? = null, + @JceId(11) @JvmField val getgroupCount: Byte? = null, + @JceId(12) @JvmField val totoalGroupCount: Short? = null, + @JceId(13) @JvmField val groupCount: Byte? = null, + @JceId(14) @JvmField val vecGroupInfo: List? = null, + @JceId(15) @JvmField val result: Int, + @JceId(16) @JvmField val errorCode: Short? = null, + @JceId(17) @JvmField val onlineFriendCount: Short? = null, + @JceId(18) @JvmField val serverTime: Long? = null, + @JceId(19) @JvmField val sqqOnLineCount: Short? = null, + @JceId(20) @JvmField val vecMSFGroupInfo: List? = null, + @JceId(21) @JvmField val respType: Byte? = null, + @JceId(22) @JvmField val hasOtherRespFlag: Byte? = null, + @JceId(23) @JvmField val stSelfInfo: FriendInfo? = null, + @JceId(24) @JvmField val showPcIcon: Byte? = null, + @JceId(25) @JvmField val wGetExtSnsRspCode: Short? = null, + @JceId(26) @JvmField val stSubSrvRspCode: FriendListSubSrvRspCode? = null ) : 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? = null, + @JceId(0) @JvmField val mOpenInfo: Map? = 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 diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/GroupMngReq.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/GroupMngReq.kt index aedf7f349..73def5748 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/GroupMngReq.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/GroupMngReq.kt @@ -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 diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/MsgType0x210.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/MsgType0x210.kt index 1a6057a48..7f62e4ad7 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/MsgType0x210.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/MsgType0x210.kt @@ -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? = null, - @JceId(2) val vNewGroupID: List? = null + @JceId(0) @JvmField val dwFuin: Long? = null, + @JceId(1) @JvmField val vOldGroupID: List? = null, + @JceId(2) @JvmField val vNewGroupID: List? = 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? = null + @JceId(0) @JvmField val vMsgFrdGroup: List? = 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? = null + @JceId(0) @JvmField val vMsgGroupSort: List? = 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? = null + @JceId(0) @JvmField val vPluginNumList: List? = 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? = null + @JceId(0) @JvmField val type: Byte? = null, + @JceId(1) @JvmField val vChgField: List? = 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? = 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? = null, + @JceId(13) @JvmField val uSuperQQBubbleId: Long? = null ) : JceStruct @Serializable internal class Type_1_QQDataTextMsg( - @JceId(0) val msgItem: List? = null + @JceId(0) @JvmField val msgItem: List? = null ) : JceStruct diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt index 448ce4102..5359dc44a 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt @@ -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? = 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? = 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? = null, + @JceId(13) @JvmField val stShareData: ShareData? = null, + @JceId(14) @JvmField val fromInstId: Long? = null, + @JceId(15) @JvmField val vRemarkOfSender: ByteArray? = null, + @JceId(16) @JvmField val fromMobile: String? = "", + @JceId(17) @JvmField val fromName: String? = "", + @JceId(18) @JvmField val vNickName: List? = null, + @JceId(19) @JvmField val stC2CTmpMsgHead: TempMsgHead? = null ) : JceStruct @Serializable internal class SvcReqPushMsg( - @JceId(0) val uin: Long, - @JceId(1) val uMsgTime: Long, - @JceId(2) val vMsgInfos: List, - @JceId(3) val svrip: Int? = 0, - @JceId(4) val vSyncCookie: ByteArray? = null, - @JceId(5) val vUinPairMsg: List? = null, - @JceId(6) val mPreviews: Map? = 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, + @JceId(3) @JvmField val svrip: Int? = 0, + @JceId(4) @JvmField val vSyncCookie: ByteArray? = null, + @JceId(5) @JvmField val vUinPairMsg: List? = null, + @JceId(6) @JvmField val mPreviews: Map? = null + // @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, - @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, + @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? = 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? = 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? = null + @JceId(0) @JvmField val vMsgFrdGroup: List? = null ) : JceStruct @Serializable internal class FriendGroup( - @JceId(0) val dwFuin: Long? = null, - @JceId(1) val vOldGroupID: List? = null, - @JceId(2) val vNewGroupID: List? = null + @JceId(0) @JvmField val dwFuin: Long? = null, + @JceId(1) @JvmField val vOldGroupID: List? = null, + @JceId(2) @JvmField val vNewGroupID: List? = 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? = null + @JceId(0) @JvmField val vMsgGroupSort: List? = 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? = null + @JceId(0) @JvmField val vPluginNumList: List? = 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 } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt index bffd180ab..2b827da3b 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt @@ -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?, - @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?//, - //@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?, + @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?//, + //@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 \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestMSFForceOffline.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestMSFForceOffline.kt index d937f11b9..474ecffe1 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestMSFForceOffline.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestMSFForceOffline.kt @@ -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 \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPacket.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPacket.kt index 6be4d5a04..bb8d0b2b3 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPacket.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPacket.kt @@ -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() @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? = EMPTY_MAP, - @JceId(10) val status: Map? = 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? = EMPTY_MAP, + @JceId(10) @JvmField val status: Map? = EMPTY_MAP ) : JceStruct @Serializable internal class RequestDataVersion3( - @JceId(0) val map: Map // 注意: ByteArray 不能直接放序列化的 JceStruct!! 要放类似 RequestDataStructSvcReqRegister 的 + @JceId(0) @JvmField val map: Map // 注意: ByteArray 不能直接放序列化的 JceStruct!! 要放类似 RequestDataStructSvcReqRegister 的 ) : JceStruct @Serializable internal class RequestDataVersion2( - @JceId(0) val map: Map> + @JceId(0) @JvmField val map: Map> ) : JceStruct @Serializable internal class RequestDataStructSvcReqRegister( - @JceId(0) val struct: SvcReqRegister + @JceId(0) @JvmField val struct: SvcReqRegister ) : JceStruct \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPushForceOffline.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPushForceOffline.kt index aadbd9083..a8c31cefe 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPushForceOffline.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPushForceOffline.kt @@ -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 \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/SvcReqRegister.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/SvcReqRegister.kt index c747bb223..fb44f55e1 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/SvcReqRegister.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/SvcReqRegister.kt @@ -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 \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/TroopList.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/TroopList.kt index c169c0a4b..ed692d803 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/TroopList.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/TroopList.kt @@ -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? = 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? = 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? = null, - @JceId(6) val vecTroopListDel: List? = null, - @JceId(7) val vecTroopRank: List? = null, - @JceId(8) val vecFavGroup: List? = null, - @JceId(9) val vecTroopListExt: List? = 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? = null, + @JceId(6) @JvmField val vecTroopListDel: List? = null, + @JceId(7) @JvmField val vecTroopRank: List? = null, + @JceId(8) @JvmField val vecFavGroup: List? = null, + @JceId(9) @JvmField val vecTroopListExt: List? = null ) : 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? = 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? = 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, - @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, + @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? = null + @JceId(0) @JvmField val eStarState: Int? = null, + @JceId(1) @JvmField val extendInfo: Map? = null ) : JceStruct \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt index 1e8ef3ab3..16a08bd8f 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x352.kt @@ -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? = null, - @ProtoId(6) val bytesOriginalDownUrl: List? = null, - @ProtoId(7) val msgImgInfo: ImgInfo? = null, - @ProtoId(8) val uint32DownIp: List? = null, - @ProtoId(9) val uint32DownPort: List? = 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? = 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? = 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? = null, + @ProtoId(6) @JvmField val bytesOriginalDownUrl: List? = null, + @ProtoId(7) @JvmField val msgImgInfo: ImgInfo? = null, + @ProtoId(8) @JvmField val uint32DownIp: List? = null, + @ProtoId(9) @JvmField val uint32DownPort: List? = null, + @ProtoId(10) @JvmField val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(11) @JvmField val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(12) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(13) @JvmField val bytesBigDownUrl: List? = null, + @ProtoId(14) @JvmField val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(15) @JvmField val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(16) @JvmField val httpsUrlFlag: Int = 0, + @ProtoId(26) @JvmField val msgDownIp6: List? = null, + @ProtoId(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY ) : 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? = null,// optional - @ProtoId(3) val msgGetimgUrlReq: List? = null,// optional - @ProtoId(4) val msgDelImgReq: List? = 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? = null,// optional + @ProtoId(3) @JvmField val msgGetimgUrlReq: List? = null,// optional + @ProtoId(4) @JvmField val msgDelImgReq: List? = null, + @ProtoId(10) @JvmField val netType: Int = 3// 数据网络=5 ) : ProtoBuf @Serializable -internal class RspBody( - @ProtoId(1) val subcmd: Int = 0, - @ProtoId(2) val msgTryupImgRsp: List? = null, - @ProtoId(3) val msgGetimgUrlRsp: List? = null, - @ProtoId(4) val boolNewBigchan: Boolean = false, - @ProtoId(5) val msgDelImgRsp: List? = null, - @ProtoId(10) val failMsg: String? = "" + internal class RspBody( + @ProtoId(1) @JvmField val subcmd: Int = 0, + @ProtoId(2) @JvmField val msgTryupImgRsp: List? = null, + @ProtoId(3) @JvmField val msgGetimgUrlRsp: List? = null, + @ProtoId(4) @JvmField val boolNewBigchan: Boolean = false, + @ProtoId(5) @JvmField val msgDelImgRsp: List? = null, + @ProtoId(10) @JvmField val failMsg: String? = "" ) : 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? = null, - @ProtoId(8) val uint32UpPort: List? = 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? = 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? = null, + @ProtoId(8) @JvmField val uint32UpPort: List? = null, + @ProtoId(9) @JvmField val upUkey: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(10) @JvmField val upResid: String = "", + @ProtoId(11) @JvmField val upUuid: String = "", + @ProtoId(12) @JvmField val upOffset: Long = 0L, + @ProtoId(13) @JvmField val blockSize: Long = 0L, + @ProtoId(14) @JvmField val encryptDstip: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(15) @JvmField val roamdays: Int = 0, + @ProtoId(26) @JvmField val msgUpIp6: List? = null, + @ProtoId(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(60) @JvmField val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(61) @JvmField val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(62) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(64) @JvmField val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(65) @JvmField val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(66) @JvmField val httpsUrlFlag: Int = 0, + @ProtoId(1001) @JvmField val msgInfo4busi: TryUpInfo4Busi? = null ) : 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 } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt index bfef4d837..8796bd66b 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x388.kt @@ -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? = null + @ProtoId(1) @JvmField val bytesExtinfo: List? = null ) : ProtoBuf @Serializable internal class ExtensionExpRoamTryUp( - @ProtoId(1) val msgExproamPicInfo: List? = null + @ProtoId(1) @JvmField val msgExproamPicInfo: List? = 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? = null, - @ProtoId(7) val bytesOriginalDownUrl: List? = null, - @ProtoId(8) val bytesBigDownUrl: List? = null, - @ProtoId(9) val uint32DownIp: List? = null, - @ProtoId(10) val uint32DownPort: List? = 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? = null, - @ProtoId(19) val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(20) val httpsUrlFlag: Int = 0, - @ProtoId(26) val msgDownIp6: List? = 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? = null, + @ProtoId(7) @JvmField val bytesOriginalDownUrl: List? = null, + @ProtoId(8) @JvmField val bytesBigDownUrl: List? = null, + @ProtoId(9) @JvmField val uint32DownIp: List? = null, + @ProtoId(10) @JvmField val uint32DownPort: List? = null, + @ProtoId(11) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(12) @JvmField val thumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(13) @JvmField val originalDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(14) @JvmField val bigDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(15) @JvmField val fileId: Long = 0L, + @ProtoId(16) @JvmField val autoDownType: Int = 0, + @ProtoId(17) @JvmField val uint32OrderDownType: List? = null, + @ProtoId(19) @JvmField val bigThumbDownPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(20) @JvmField val httpsUrlFlag: Int = 0, + @ProtoId(26) @JvmField val msgDownIp6: List? = null, + @ProtoId(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY ) : 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? = null, - @ProtoId(6) val uint32DownIp: List? = null, - @ProtoId(7) val uint32DownPort: List? = 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? = 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? = null, + @ProtoId(6) @JvmField val uint32DownIp: List? = null, + @ProtoId(7) @JvmField val uint32DownPort: List? = null, + @ProtoId(8) @JvmField val downDomain: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(9) @JvmField val downPara: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(10) @JvmField val fileId: Long = 0L, + @ProtoId(11) @JvmField val transferType: Int = 0, + @ProtoId(12) @JvmField val allowRetry: Int = 0, + @ProtoId(26) @JvmField val msgDownIp6: List? = null, + @ProtoId(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(28) @JvmField val strDomain: String = "" ) : 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? = null, - @ProtoId(4) val msgGetimgUrlReq: List? = null, - @ProtoId(5) val msgTryupPttReq: List? = null, - @ProtoId(6) val msgGetpttUrlReq: List? = null, - @ProtoId(7) val commandId: Int = 0, - @ProtoId(8) val msgDelImgReq: List? = 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? = null, + @ProtoId(4) @JvmField val msgGetimgUrlReq: List? = null, + @ProtoId(5) @JvmField val msgTryupPttReq: List? = null, + @ProtoId(6) @JvmField val msgGetpttUrlReq: List? = null, + @ProtoId(7) @JvmField val commandId: Int = 0, + @ProtoId(8) @JvmField val msgDelImgReq: List? = null, + @ProtoId(1001) @JvmField val extension: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf @Serializable internal class RspBody( - @ProtoId(1) val clientIp: Int = 0, - @ProtoId(2) val subcmd: Int = 0, - @ProtoId(3) val msgTryupImgRsp: List? = null, - @ProtoId(4) val msgGetimgUrlRsp: List? = null, - @ProtoId(5) val msgTryupPttRsp: List? = null, - @ProtoId(6) val msgGetpttUrlRsp: List? = null, - @ProtoId(7) val msgDelImgRsp: List? = null + @ProtoId(1) @JvmField val clientIp: Int = 0, + @ProtoId(2) @JvmField val subcmd: Int = 0, + @ProtoId(3) @JvmField val msgTryupImgRsp: List? = null, + @ProtoId(4) @JvmField val msgGetimgUrlRsp: List? = null, + @ProtoId(5) @JvmField val msgTryupPttRsp: List? = null, + @ProtoId(6) @JvmField val msgGetpttUrlRsp: List? = null, + @ProtoId(7) @JvmField val msgDelImgRsp: List? = null ) : 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? = null, - @ProtoId(7) val uint32UpPort: List? = 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? = 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? = null, + @ProtoId(7) @JvmField val uint32UpPort: List? = null, + @ProtoId(8) @JvmField val upUkey: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(9) @JvmField val fileid: Long = 0L, + @ProtoId(10) @JvmField val upOffset: Long = 0L, + @ProtoId(11) @JvmField val blockSize: Long = 0L, + @ProtoId(12) @JvmField val boolNewBigChan: Boolean = false, + @ProtoId(26) @JvmField val msgUpIp6: List? = null, + @ProtoId(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(1001) @JvmField val msgInfo4busi: TryUpInfo4Busi? = null ) : 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? = null, - @ProtoId(6) val uint32UpPort: List? = 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? = 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? = null, + @ProtoId(6) @JvmField val uint32UpPort: List? = null, + @ProtoId(7) @JvmField val upUkey: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(8) @JvmField val fileid: Long = 0L, + @ProtoId(9) @JvmField val upOffset: Long = 0L, + @ProtoId(10) @JvmField val blockSize: Long = 0L, + @ProtoId(11) @JvmField val fileKey: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(12) @JvmField val channelType: Int = 0, + @ProtoId(26) @JvmField val msgUpIp6: List? = null, + @ProtoId(27) @JvmField val clientIp6: ByteArray = EMPTY_BYTE_ARRAY ) : ProtoBuf } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x857.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x857.kt index f0232aa04..38f2fca82 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x857.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x857.kt @@ -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? = 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? = 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? = 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? = 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? = null, - @ProtoId(2) val msgExcludeInst: List? = null, - @ProtoId(3) val msgFromInst: InstInfo? = null + @ProtoId(1) @JvmField val msgSendToInst: List? = null, + @ProtoId(2) @JvmField val msgExcludeInst: List? = 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 = 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 = 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? = 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? = 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? = 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? = 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? = 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? = null, + @ProtoId(6) @JvmField val speaker: Long = 0L, + @ProtoId(7) @JvmField val judgeUin: Long = 0L, + @ProtoId(8) @JvmField val judgeWords: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(9) @JvmField val enumOperation: Int = 0, + @ProtoId(10) @JvmField val srcUser: Long = 0L, + @ProtoId(11) @JvmField val dstUser: Long = 0L, + @ProtoId(12) @JvmField val deadUsers: List? = null, + @ProtoId(13) @JvmField val gameResult: Int = 0, + @ProtoId(14) @JvmField val timeoutSec: Int = 0, + @ProtoId(15) @JvmField val killConfirmed: Int = 0, + @ProtoId(16) @JvmField val judgeNickname: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(17) @JvmField val votedTieUsers: List? = null ) : 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 } } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x858.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x858.kt index f669ccb41..c9164af55 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x858.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Cmd0x858.kt @@ -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? = 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? = 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 = 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 = 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 } diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Define.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Define.kt index 8f999fc6b..6d40c492b 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Define.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Define.kt @@ -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? = 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? = 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 = 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 = 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? = null + @ProtoId(1) @JvmField val msgElems: List? = 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? = null + @ProtoId(1) @JvmField val tagType: Int = 0, + @ProtoId(2) @JvmField val msgTagList: List? = 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? = null, - @ProtoId(9) val commentCount: Int = 0, - @ProtoId(10) val msgCommentList: List? = 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? = null, + @ProtoId(9) @JvmField val commentCount: Int = 0, + @ProtoId(10) @JvmField val msgCommentList: List? = null, + @ProtoId(11) @JvmField val commentRetAll: Int = 0, + @ProtoId(12) @JvmField val hotFlag: Int = 0, + @ProtoId(13) @JvmField val svrReserved: Long = 0L, + @ProtoId(14) @JvmField val msgHotEntry: HotEntry? = null ) : ProtoBuf @Serializable internal class HotTopicList( - @ProtoId(1) val topicList: List? = null + @ProtoId(1) @JvmField val topicList: List? = null ) : ProtoBuf @Serializable internal class FeedContent( - @ProtoId(1) val strPicUrl: List = 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 = 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? = null, - @ProtoId(2) val uid: Long = 0L + @ProtoId(1) @JvmField val freshFeedInfo: List? = 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? = null, - @ProtoId(3) val msgCells: List? = null + @ProtoId(1) @JvmField val msgGps: GPS? = null, + @ProtoId(2) @JvmField val msgWifis: List? = null, + @ProtoId(3) @JvmField val msgCells: List? = 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 = listOf(), - @ProtoId(2) val pose: Int = 0, - @ProtoId(3) val cookie: ByteArray = EMPTY_BYTE_ARRAY, - @ProtoId(4) val uint64Topics: List? = null + @ProtoId(1) @JvmField val strList: List = listOf(), + @ProtoId(2) @JvmField val pose: Int = 0, + @ProtoId(3) @JvmField val cookie: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(4) @JvmField val uint64Topics: List? = null ) : 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? = null, - @ProtoId(2) val updateTime: Int = 0 + @ProtoId(1) @JvmField val msgFeeds: List? = null, + @ProtoId(2) @JvmField val updateTime: Int = 0 ) : ProtoBuf @Serializable internal class RptInterestTag( - @ProtoId(1) val interestTags: List? = null + @ProtoId(1) @JvmField val interestTags: List? = 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? = null, - @ProtoId(5) val interstType: List? = 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? = null, + @ProtoId(5) @JvmField val interstType: List? = 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 } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/FriendListCommon.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/FriendListCommon.kt index abc00198b..1aaceab1a 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/FriendListCommon.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/FriendListCommon.kt @@ -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? = null, - @ProtoId(11) val over: Int = 0, - @ProtoId(12) val nextStart: Int = 0, - @ProtoId(13) val uint64UnfinishedUins: List? = null + @ProtoId(1) @JvmField val msgUpdateData: List? = null, + @ProtoId(11) @JvmField val over: Int = 0, + @ProtoId(12) @JvmField val nextStart: Int = 0, + @ProtoId(13) @JvmField val uint64UnfinishedUins: List? = null ) : 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? = 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? = 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? = null + @ProtoId(1) @JvmField val maxPkgSize: Int = 0, + @ProtoId(2) @JvmField val startTime: Int = 0, + @ProtoId(11) @JvmField val uinList: List? = null ) : ProtoBuf @Serializable internal class RspBody( - @ProtoId(11) val msgMutualmarkData: List? = null, - @ProtoId(12) val uint64UnfinishedUins: List? = null + @ProtoId(11) @JvmField val msgMutualmarkData: List? = null, + @ProtoId(12) @JvmField val uint64UnfinishedUins: List? = null ) : ProtoBuf @Serializable internal class MutualMarkData( - @ProtoId(1) val frdUin: Long = 0L, - @ProtoId(2) val result: Int = 0 - // @SerialId(11) val mutualmarkInfo: List? = null + @ProtoId(1) @JvmField val frdUin: Long = 0L, + @ProtoId(2) @JvmField val result: Int = 0 + // @SerialId(11) @JvmField val mutualmarkInfo: List? = null ) : ProtoBuf } \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Group.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Group.kt index c06060506..cf24d3c65 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Group.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/Group.kt @@ -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? = null + @ProtoId(1) @JvmField val error: ByteArray = EMPTY_BYTE_ARRAY, + @ProtoId(2) @JvmField val groupInfo: List? = 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