Merge remote-tracking branch 'origin'

# Conflicts:
#	mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/controller/MiraiController.kt

README.md

-# Mirai
+<div align="center">
+ 
+   <img width="160" src="http://img.mamoe.net/2020/02/16/a759783b42f72.png" alt="logo"></br>
+   <img width="95" src="http://img.mamoe.net/2020/02/16/c4aece361224d.png" alt="title">
+----
 [![Gitter](https://badges.gitter.im/mamoe/mirai.svg)](https://gitter.im/mamoe/mirai?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Actions Status](https://github.com/mamoe/mirai/workflows/CI/badge.svg)](https://github.com/mamoe/mirai/actions)
 [![Download](https://api.bintray.com/packages/him188moe/mirai/mirai-core/images/download.svg)](https://bintray.com/him188moe/mirai/mirai-core/)  
+
+Mirai 是一个在全平台下运行，提供 QQ Android 和 TIM PC 协议支持的高效率机器人框架
+
+这个项目的名字来源于
+     <p><a href = "http://www.kyotoanimation.co.jp/">京都动画</a>作品<a href = "https://www.bilibili.com/bangumi/media/md3365/?from=search&seid=14448313700764690387">《境界的彼方》</a>的<a href = "https://zh.moegirl.org/zh-hans/%E6%A0%97%E5%B1%B1%E6%9C%AA%E6%9D%A5">栗山未来(Kuriyama <b>Mirai</b>)</a></p>
+     <p><a href = "https://www.crypton.co.jp/">CRYPTON</a>中<a href = "https://www.crypton.co.jp/miku_eng">初音未来</a>的线下创作文化活动<a href = "https://magicalmirai.com/2019/index_en.html">(Magical <b>Mirai</b>)</a></p>
+图标以及形象由画师<a href = "">DazeCake</a>绘制
+</div>
+
+## Mirai
 **[English](README-eng.md)**  
 
 多平台 **QQ Android 和 TimPC** 协议支持库与高效率的机器人框架.   

mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/controller/MiraiGraphicalUIController.kt

@@ -2,6 +2,7 @@ package net.mamoe.mirai.console.graphical.controller
 
 import javafx.application.Platform
 import javafx.stage.Modality
+import kotlinx.io.core.IoBuffer
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.console.MiraiConsole
 import net.mamoe.mirai.console.MiraiConsoleUI
@@ -9,6 +10,7 @@ import net.mamoe.mirai.console.graphical.model.BotModel
 import net.mamoe.mirai.console.graphical.model.ConsoleInfo
 import net.mamoe.mirai.console.graphical.model.VerificationCodeModel
 import net.mamoe.mirai.console.graphical.view.VerificationCodeFragment
+import net.mamoe.mirai.utils.LoginSolver
 import tornadofx.Controller
 import tornadofx.Scope
 import tornadofx.find
@@ -16,6 +18,7 @@ import tornadofx.observableListOf
 
 class MiraiGraphicalUIController : Controller(), MiraiConsoleUI {
 
+    private val loginSolver = GraphicalLoginSolver()
     private val cache = mutableMapOf<Long, BotModel>()
     val mainLog = observableListOf<String>()
     val botList = observableListOf<BotModel>()
@@ -63,4 +66,20 @@ class MiraiGraphicalUIController : Controller(), MiraiConsoleUI {
     override fun pushBotAdminStatus(identity: Long, admins: List<Long>) = Platform.runLater {
         cache[identity]?.admins?.setAll(admins)
     }
+
+    override fun createLoginSolver(): LoginSolver = loginSolver
+}
+
+class GraphicalLoginSolver : LoginSolver() {
+    override suspend fun onSolvePicCaptcha(bot: Bot, data: IoBuffer): String? {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override suspend fun onSolveSliderCaptcha(bot: Bot, url: String): String? {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override suspend fun onSolveUnsafeDeviceLoginVerify(bot: Bot, url: String): String? {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
 }
\ No newline at end of file

mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt

@@ -123,19 +123,7 @@ object MiraiConsole {
                         runBlocking {
                             frontEnd.prePushBot(qqNumber)
                             val bot = Bot(qqNumber, qqPassword) {
-                                this.loginSolver = DefaultLoginSolver(object : LoginSolverInputReader {
-                                    override suspend fun read(question: String): String? {
-                                        return frontEnd.requestInput(question)
-                                    }
-                                },
-                                    SimpleLogger("Login Helper") { _, message, e ->
-                                        logger("[Login Helper]", qqNumber, message)
-                                        if (e != null) {
-                                            logger("[NETWORK ERROR]", qqNumber, e.toString())//因为在一页 所以可以不打QQ
-                                            e.printStackTrace()
-                                        }
-                                    }
-                                )
+                                this.loginSolver = frontEnd.createLoginSolver()
                                 this.botLoggerSupplier = {
                                     SimpleLogger("BOT $qqNumber]") { _, message, e ->
                                         logger("[BOT $qqNumber]", qqNumber, message)

mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleUI.kt

 package net.mamoe.mirai.console
 
 import net.mamoe.mirai.Bot
+import net.mamoe.mirai.utils.LoginSolver
 
 /**
  * 只需要实现一个这个 传入MiraiConsole 就可以绑定UI层与Console层
@@ -57,4 +58,9 @@ interface MiraiConsoleUI {
         admins: List<Long>
     )
 
+    /**
+     * 由UI层创建一个LoginSolver
+     */
+    fun createLoginSolver(): LoginSolver
+
 }
\ No newline at end of file

mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BotConfigurationJvm.kt

@@ -118,7 +118,7 @@ class DefaultLoginSolver(
 }
 
 // Copied from Ktor CIO
-private fun File.writeChannel(
+public fun File.writeChannel(
     coroutineContext: CoroutineContext = Dispatchers.IO
 ): ByteWriteChannel = GlobalScope.reader(CoroutineName("file-writer") + coroutineContext, autoFlush = true) {
     @Suppress("BlockingMethodInNonBlockingContext")
@@ -134,7 +134,7 @@ private val loginSolverLock = Mutex()
 /**
  * @author NaturalHG
  */
-private fun BufferedImage.createCharImg(outputWidth: Int = 100, ignoreRate: Double = 0.95): String {
+public fun BufferedImage.createCharImg(outputWidth: Int = 100, ignoreRate: Double = 0.95): String {
     val newHeight = (this.height * (outputWidth.toDouble() / this.width)).toInt()
     val tmp = this.getScaledInstance(outputWidth, newHeight, Image.SCALE_SMOOTH)
     val image = BufferedImage(outputWidth, newHeight, BufferedImage.TYPE_INT_ARGB)

mirai-demos/mirai-demo-gentleman/src/main/kotlin/demo/gentleman/a.html

+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+</head>
+<body>
+
+<p><a href="http://www.kyotoanimation.co.jp/">京都动画</a>作品<a
+        href="https://www.bilibili.com/bangumi/media/md3365/?from=search&seid=14448313700764690387">《境界的彼方》</a>的<a
+        href="https://zh.moegirl.org/zh-hans/%E6%A0%97%E5%B1%B1%E6%9C%AA%E6%9D%A5">栗山未来(Kuriyama <b>Mirai</b>)</a></p>
+<p><a href="https://www.crypton.co.jp/miku_eng">初音未来</a>的线下创作文化活动<a href="https://magicalmirai.com/2019/index_en.html">(Magical
+    <b>Mirai</b>)</a></p>
+
+
+</body>
+</html>
\ No newline at end of file