Improve login procedure

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt

@@ -17,7 +17,6 @@ import net.mamoe.mirai.qqandroid.event.PacketReceivedEvent
 import net.mamoe.mirai.qqandroid.network.protocol.packet.*
 import net.mamoe.mirai.qqandroid.network.protocol.packet.list.FriendList
 import net.mamoe.mirai.qqandroid.network.protocol.packet.login.LoginPacket
-import net.mamoe.mirai.qqandroid.network.protocol.packet.login.LoginPacket.LoginPacketResponse.*
 import net.mamoe.mirai.qqandroid.network.protocol.packet.login.StatSvc
 import net.mamoe.mirai.utils.*
 import net.mamoe.mirai.utils.cryptor.contentToString
@@ -36,7 +35,9 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
 
     private lateinit var channel: PlatformSocket
 
+
     override suspend fun login() {
+        suspend fun doLogin() {
             channel = PlatformSocket()
             channel.connect("113.96.13.208", 8080)
             launch(CoroutineName("Incoming Packet Receiver")) { processReceive() }
@@ -45,13 +46,13 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
             var response: LoginPacket.LoginPacketResponse = LoginPacket.SubCommand9(bot.client).sendAndExpect()
             mainloop@ while (true) {
                 when (response) {
-                is UnsafeLogin -> {
+                    is LoginPacket.LoginPacketResponse.UnsafeLogin -> {
                         bot.configuration.loginSolver.onSolveUnsafeDeviceLoginVerify(bot, response.url)
                         response = LoginPacket.SubCommand9(bot.client).sendAndExpect()
                     }
 
-                is Captcha -> when (response) {
-                    is Captcha.Picture -> {
+                    is LoginPacket.LoginPacketResponse.Captcha -> when (response) {
+                        is LoginPacket.LoginPacketResponse.Captcha.Picture -> {
                             var result = response.data.withUse {
                                 bot.configuration.loginSolver.onSolvePicCaptcha(bot, this)
                             }
@@ -62,7 +63,7 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
                             response = LoginPacket.SubCommand2.SubmitPictureCaptcha(bot.client, response.sign, result).sendAndExpect()
                             continue@mainloop
                         }
-                    is Captcha.Slider -> {
+                        is LoginPacket.LoginPacketResponse.Captcha.Slider -> {
                             var ticket = bot.configuration.loginSolver.onSolveSliderCaptcha(bot, response.url)
                             if (ticket == null) {
                                 ticket = ""
@@ -72,9 +73,9 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
                         }
                     }
 
-                is Error -> error(response.toString())
+                    is LoginPacket.LoginPacketResponse.Error -> error(response.toString())
 
-                is DeviceLockLogin -> {
+                    is LoginPacket.LoginPacketResponse.DeviceLockLogin -> {
                         response = LoginPacket.SubCommand20(
                             bot.client,
                             response.t402,
@@ -83,7 +84,7 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
                         continue@mainloop
                     }
 
-                is Success -> {
+                    is LoginPacket.LoginPacketResponse.Success -> {
                         bot.logger.info("Login successful")
                         break@mainloop
                     }
@@ -92,7 +93,9 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
 
             println("d2key=${bot.client.wLoginSigInfo.d2Key.toUHexString()}")
             StatSvc.Register(bot.client).sendAndExpect<StatSvc.Register.Response>()
+        }
 
+        suspend fun doInit() {
             //start updating friend/group list
             bot.logger.info("Start updating friend/group list")
             /*
@@ -110,6 +113,10 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
             println(data.contentToString())
         }
 
+        doLogin()
+        doInit()
+    }
+
 
     /**
      * 单线程处理包的接收, 分割和连接.

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt

@@ -13,7 +13,7 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.list.FriendList
 import net.mamoe.mirai.qqandroid.network.protocol.packet.login.LoginPacket
 import net.mamoe.mirai.qqandroid.network.protocol.packet.login.StatSvc
 import net.mamoe.mirai.utils.DefaultLogger
-import net.mamoe.mirai.utils.MiraiLogger
+import net.mamoe.mirai.utils.MiraiLoggerWithSwitch
 import net.mamoe.mirai.utils.cryptor.adjustToPublicKey
 import net.mamoe.mirai.utils.cryptor.decryptBy
 import net.mamoe.mirai.utils.io.*
@@ -55,7 +55,7 @@ internal val DECRYPTER_16_ZERO = ByteArray(16)
 internal typealias PacketConsumer<T> = suspend (packetFactory: PacketFactory<T>, packet: T, commandName: String, ssoSequenceId: Int) -> Unit
 
 @PublishedApi
-internal val PacketLogger: MiraiLogger = DefaultLogger("Packet").withSwitch(false)
+internal val PacketLogger: MiraiLoggerWithSwitch = DefaultLogger("Packet").withSwitch(false)
 
 @UseExperimental(ExperimentalUnsignedTypes::class)
 internal object KnownPacketFactories : List<PacketFactory<*>> by mutableListOf(