github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-15 13:00:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Him188 2020-01-20 21:33:33 +08:00
parent 5445a10e5f
commit 7c4263da0f
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,15 +25,15 @@ class SvcReqRegister(
val lBid: Long = 0L, val lBid: Long = 0L,
val lCpId: Long = 0L, val lCpId: Long = 0L,
val lUin: Long = 0L, val lUin: Long = 0L,
val sBuildVer: String? = "", val sBuildVer: String? = null,
val sChannelNo: String? = "", val sChannelNo: String? = null,
val sOther: String = "", val sOther: String = "",
val strDevName: String? = "", val strDevName: String? = null,
val strDevType: String? = "", val strDevType: String? = null,
val strIOSIdfa: String? = "", val strIOSIdfa: String? = null,
val strOSVer: String? = "", val strOSVer: String? = null,
val strVendorName: String? = "", val strVendorName: String? = null,
val strVendorOSName: String? = "", val strVendorOSName: String? = null,
val timeStamp: Long = 0L, val timeStamp: Long = 0L,
val uNewSSOIp: Long = 0L, val uNewSSOIp: Long = 0L,
val uOldSSOIp: Long = 0L, val uOldSSOIp: Long = 0L,

2
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/LoginPacket.kt
View File

@ -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.GuidSource
import net.mamoe.mirai.qqandroid.utils.MacOrAndroidIdChangeFlag import net.mamoe.mirai.qqandroid.utils.MacOrAndroidIdChangeFlag
import net.mamoe.mirai.qqandroid.utils.guidFlag import net.mamoe.mirai.qqandroid.utils.guidFlag
import net.mamoe.mirai.utils.MiraiDebugAPI
import net.mamoe.mirai.utils.MiraiInternalAPI import net.mamoe.mirai.utils.MiraiInternalAPI
import net.mamoe.mirai.utils.cryptor.contentToString import net.mamoe.mirai.utils.cryptor.contentToString
import net.mamoe.mirai.utils.cryptor.decryptBy import net.mamoe.mirai.utils.cryptor.decryptBy
@ -174,6 +175,7 @@ internal object LoginPacket : PacketFactory<LoginPacket.LoginPacketResponse>() {
object Success : LoginPacketResponse() object Success : LoginPacketResponse()
} }
@UseExperimental(MiraiDebugAPI::class)
override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): LoginPacketResponse = this.debugPrint("login解析").run { override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): LoginPacketResponse = this.debugPrint("login解析").run {
// 00 09 sub cmd // 00 09 sub cmd
// 00 type // 00 type

4
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/DeviceInfo.kt
View File

@ -3,10 +3,8 @@ package net.mamoe.mirai.qqandroid.utils
import kotlinx.serialization.SerialId import kotlinx.serialization.SerialId
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.protobuf.ProtoBuf 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.cryptor.contentToString
import net.mamoe.mirai.utils.getValue import net.mamoe.mirai.utils.getValue
import net.mamoe.mirai.utils.io.encodeToString
import net.mamoe.mirai.utils.unsafeWeakRef import net.mamoe.mirai.utils.unsafeWeakRef
abstract class DeviceInfo( abstract class DeviceInfo(
@ -42,7 +40,7 @@ abstract class DeviceInfo(
abstract val imsiMd5: ByteArray abstract val imsiMd5: ByteArray
abstract val imei: String abstract val imei: String
abstract val ipAddress: String abstract val ipAddress: ByteArray
abstract val androidId: ByteArray abstract val androidId: ByteArray