diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/LoginType.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/LoginType.kt new file mode 100644 index 000000000..c8650c0de --- /dev/null +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/LoginType.kt @@ -0,0 +1,20 @@ +package net.mamoe.mirai.qqandroid.network.protocol + +inline class LoginType( + val value: Int +) { + companion object { + /** + * 短信验证登录 + */ + val SMS = LoginType(3) + /** + * 密码登录 + */ + val PASSWORD = LoginType(1) + /** + * 微信一键登录 + */ + val WE_CHAT = LoginType(4) + } +} \ No newline at end of file diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/Tlv.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/Tlv.kt index d7b3332a8..5efc81679 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/Tlv.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/Tlv.kt @@ -4,6 +4,7 @@ import kotlinx.io.core.BytePacketBuilder import kotlinx.io.core.ByteReadPacket import kotlinx.io.core.toByteArray import kotlinx.io.core.writeFully +import net.mamoe.mirai.qqandroid.network.protocol.LoginType import net.mamoe.mirai.qqandroid.utils.NetworkType import net.mamoe.mirai.utils.currentTimeMillis import net.mamoe.mirai.utils.io.* @@ -15,25 +16,6 @@ import kotlin.random.Random */ inline class Tlv(val value: ByteArray) -inline class LoginType( - val value: Int -) { - companion object { - /** - * 短信验证登录 - */ - val SMS = LoginType(3) - /** - * 密码登录 - */ - val PASSWORD = LoginType(1) - /** - * 微信一键登录 - */ - val WE_CHAT = LoginType(4) - } -} - @Suppress("MemberVisibilityCanBePrivate") fun BytePacketBuilder.t1(uin: Long, ip: String) { writeShort(0x1) 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 b0cc0d8a0..6cf19c1df 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 @@ -5,6 +5,7 @@ import kotlinx.io.core.* import net.mamoe.mirai.data.Packet import net.mamoe.mirai.qqandroid.QQAndroidBot import net.mamoe.mirai.qqandroid.network.* +import net.mamoe.mirai.qqandroid.network.protocol.LoginType import net.mamoe.mirai.qqandroid.network.protocol.packet.* import net.mamoe.mirai.qqandroid.utils.GuidSource import net.mamoe.mirai.qqandroid.utils.MacOrAndroidIdChangeFlag