diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/jce/SvcReqRegister.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/jce/SvcReqRegister.kt index 727155432..3bea4715f 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/jce/SvcReqRegister.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/jce/SvcReqRegister.kt @@ -25,15 +25,15 @@ class SvcReqRegister( val lBid: Long = 0L, val lCpId: Long = 0L, val lUin: Long = 0L, - val sBuildVer: String? = "", - val sChannelNo: String? = "", + val sBuildVer: String? = null, + val sChannelNo: String? = null, val sOther: String = "", - val strDevName: String? = "", - val strDevType: String? = "", - val strIOSIdfa: String? = "", - val strOSVer: String? = "", - val strVendorName: String? = "", - val strVendorOSName: String? = "", + val strDevName: String? = null, + val strDevType: String? = null, + val strIOSIdfa: String? = null, + val strOSVer: String? = null, + val strVendorName: String? = null, + val strVendorOSName: String? = null, val timeStamp: Long = 0L, val uNewSSOIp: Long = 0L, val uOldSSOIp: Long = 0L, diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/LoginPacket.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/LoginPacket.kt index c8e81b8f9..87b748041 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/LoginPacket.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/LoginPacket.kt @@ -10,6 +10,7 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.* import net.mamoe.mirai.qqandroid.utils.GuidSource import net.mamoe.mirai.qqandroid.utils.MacOrAndroidIdChangeFlag import net.mamoe.mirai.qqandroid.utils.guidFlag +import net.mamoe.mirai.utils.MiraiDebugAPI import net.mamoe.mirai.utils.MiraiInternalAPI import net.mamoe.mirai.utils.cryptor.contentToString import net.mamoe.mirai.utils.cryptor.decryptBy @@ -174,6 +175,7 @@ internal object LoginPacket : PacketFactory() { object Success : LoginPacketResponse() } + @UseExperimental(MiraiDebugAPI::class) override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): LoginPacketResponse = this.debugPrint("login解析").run { // 00 09 sub cmd // 00 type diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/DeviceInfo.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/DeviceInfo.kt index 0094bea83..327a775a8 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/DeviceInfo.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/DeviceInfo.kt @@ -3,10 +3,8 @@ package net.mamoe.mirai.qqandroid.utils import kotlinx.serialization.SerialId import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoBuf -import net.mamoe.mirai.qqandroid.network.protocol.packet.oidb.oidb0x769.Oidb0x769 import net.mamoe.mirai.utils.cryptor.contentToString import net.mamoe.mirai.utils.getValue -import net.mamoe.mirai.utils.io.encodeToString import net.mamoe.mirai.utils.unsafeWeakRef abstract class DeviceInfo( @@ -42,7 +40,7 @@ abstract class DeviceInfo( abstract val imsiMd5: ByteArray abstract val imei: String - abstract val ipAddress: String + abstract val ipAddress: ByteArray abstract val androidId: ByteArray