Commit b7fd77b6 authored by jiahua.liu's avatar jiahua.liu

Mirai Console UI

parent d4321152
...@@ -42,5 +42,6 @@ dependencies { ...@@ -42,5 +42,6 @@ dependencies {
api(group = "com.alibaba", name = "fastjson", version = "1.2.62") api(group = "com.alibaba", name = "fastjson", version = "1.2.62")
api(group = "org.yaml", name = "snakeyaml", version = "1.25") api(group = "org.yaml", name = "snakeyaml", version = "1.25")
api(group = "com.moandjiezana.toml", name = "toml4j", version = "0.7.2") api(group = "com.moandjiezana.toml", name = "toml4j", version = "0.7.2")
api(group = "com.googlecode.lanterna", name = "lanterna", version = "3.0.2")
// classpath is not set correctly by IDE // classpath is not set correctly by IDE
} }
\ No newline at end of file
...@@ -17,6 +17,7 @@ import net.mamoe.mirai.plugins.withDefaultWriteSave ...@@ -17,6 +17,7 @@ import net.mamoe.mirai.plugins.withDefaultWriteSave
import net.mamoe.mirai.api.http.MiraiHttpAPIServer import net.mamoe.mirai.api.http.MiraiHttpAPIServer
import net.mamoe.mirai.api.http.generateSessionKey import net.mamoe.mirai.api.http.generateSessionKey
import net.mamoe.mirai.contact.sendMessage import net.mamoe.mirai.contact.sendMessage
import net.mamoe.mirai.utils.MiraiLogger
import java.io.File import java.io.File
import kotlin.concurrent.thread import kotlin.concurrent.thread
...@@ -37,7 +38,7 @@ object MiraiConsole { ...@@ -37,7 +38,7 @@ object MiraiConsole {
get() = PluginManager get() = PluginManager
var logger: MiraiConsoleLogger = var logger: MiraiConsoleLogger =
DefaultLogger UIPushLogger()
var path: String = System.getProperty("user.dir") var path: String = System.getProperty("user.dir")
...@@ -254,14 +255,11 @@ object MiraiConsole { ...@@ -254,14 +255,11 @@ object MiraiConsole {
} }
} }
interface MiraiConsoleLogger { class UIPushLogger(override val identity: String?, override var follower: MiraiLogger?) : MiraiLogger {
operator fun invoke(any: Any? = null)
}
object DefaultLogger : MiraiConsoleLogger {
override fun invoke(any: Any?) { override fun invoke(any: Any?) {
MiraiConsoleUI.start()
if (any != null) { if (any != null) {
println("[Mirai$version $build]: " + any.toString()) MiraiConsoleUI.pushLog(0, "[Mirai$version $build]: $any")
} }
} }
} }
...@@ -287,6 +285,7 @@ class MiraiConsoleLoader { ...@@ -287,6 +285,7 @@ class MiraiConsoleLoader {
Runtime.getRuntime().addShutdownHook(thread(start = false) { Runtime.getRuntime().addShutdownHook(thread(start = false) {
MiraiConsole.stop() MiraiConsole.stop()
}) })
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment