Commit e698f69e authored by ryoii's avatar ryoii

fix build

parent 6e2c8079
...@@ -6,7 +6,6 @@ import javafx.stage.Modality ...@@ -6,7 +6,6 @@ import javafx.stage.Modality
import kotlinx.io.core.IoBuffer import kotlinx.io.core.IoBuffer
import net.mamoe.mirai.Bot import net.mamoe.mirai.Bot
import net.mamoe.mirai.console.MiraiConsole import net.mamoe.mirai.console.MiraiConsole
import net.mamoe.mirai.console.MiraiConsoleUI
import net.mamoe.mirai.console.graphical.model.BotModel import net.mamoe.mirai.console.graphical.model.BotModel
import net.mamoe.mirai.console.graphical.model.ConsoleInfo import net.mamoe.mirai.console.graphical.model.ConsoleInfo
import net.mamoe.mirai.console.graphical.model.PluginModel import net.mamoe.mirai.console.graphical.model.PluginModel
...@@ -29,15 +28,15 @@ class MiraiGraphicalUIController : Controller(), MiraiConsoleUI { ...@@ -29,15 +28,15 @@ class MiraiGraphicalUIController : Controller(), MiraiConsoleUI {
val botList = observableListOf<BotModel>() val botList = observableListOf<BotModel>()
val pluginList: ObservableList<PluginModel> by lazy(::getPluginsFromConsole) val pluginList: ObservableList<PluginModel> by lazy(::getPluginsFromConsole)
val consoleConfig : Map<String, Any> by lazy(::getConfigFromConsole) // val consoleConfig : Map<String, Any> by lazy(::getConfigFromConsole)
val consoleInfo = ConsoleInfo() val consoleInfo = ConsoleInfo()
suspend fun login(qq: String, psd: String) { suspend fun login(qq: String, psd: String) {
MiraiConsole.CommandListener.commandChannel.send("/login $qq $psd") // MiraiConsole
} }
suspend fun sendCommand(command: String) = MiraiConsole.CommandListener.commandChannel.send(command) suspend fun sendCommand(command: String) = Unit
override fun pushLog(identity: Long, message: String) = Platform.runLater { override fun pushLog(identity: Long, message: String) = Platform.runLater {
when (identity) { when (identity) {
...@@ -84,8 +83,6 @@ class MiraiGraphicalUIController : Controller(), MiraiConsoleUI { ...@@ -84,8 +83,6 @@ class MiraiGraphicalUIController : Controller(), MiraiConsoleUI {
// TODO // TODO
return observableListOf<PluginModel>() return observableListOf<PluginModel>()
} }
private fun getConfigFromConsole() = MiraiConsole.MiraiProperties.config.asMap()
} }
class GraphicalLoginSolver : LoginSolver() { class GraphicalLoginSolver : LoginSolver() {
......
...@@ -12,12 +12,12 @@ class SettingsView : View() { ...@@ -12,12 +12,12 @@ class SettingsView : View() {
private val controller = find<MiraiGraphicalUIController>() private val controller = find<MiraiGraphicalUIController>()
override val root = form { override val root = form {
controller.consoleConfig.forEach { // controller.consoleConfig.forEach {
fieldset { // fieldset {
field(it.key) { // field(it.key) {
jfxTextfield(it.value.toString()) { isEditable = false } // jfxTextfield(it.value.toString()) { isEditable = false }
} // }
} // }
} // }
} }
} }
\ No newline at end of file
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