From 0b08ecbcbbfc0e70b2f22143060313f38f1b77cb Mon Sep 17 00:00:00 2001 From: iguigui Date: Wed, 25 May 2022 20:57:17 +0800 Subject: [PATCH] =?UTF-8?q?Maa=20HTTP=20server=20DTO=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iguigui/maaj/routing/HttpRouting.kt | 5 +++++ .../src/main/java/com/iguigui/maaj/service/MaaInstance.kt | 2 ++ .../src/main/java/com/iguigui/maaj/service/MaaService.kt | 7 +++++++ 3 files changed, 14 insertions(+) diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/routing/HttpRouting.kt b/src/Java/Maaj/src/main/java/com/iguigui/maaj/routing/HttpRouting.kt index 4f8a328b68..4eef4f55fa 100644 --- a/src/Java/Maaj/src/main/java/com/iguigui/maaj/routing/HttpRouting.kt +++ b/src/Java/Maaj/src/main/java/com/iguigui/maaj/routing/HttpRouting.kt @@ -30,6 +30,11 @@ fun Application.httpRouting() { MaaService.appendTask(appendTask.host, appendTask.type, appendTask.params.toJsonString()) call.respond(HttpResponse()) } + post("/setTaskParams") { + val appendTask = call.receive() + MaaService.setTaskParams(appendTask.host, appendTask.type, appendTask.params.toJsonString()) + call.respond(HttpResponse()) + } post("/start") { val start = call.receive() MaaService.start(start.host) diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaInstance.kt b/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaInstance.kt index 2e3160c0b8..d9cb60e790 100644 --- a/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaInstance.kt +++ b/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaInstance.kt @@ -33,6 +33,8 @@ class MaaInstance(private val instance: MeoAssistant, val id: String, val adbPat fun appendTask(type: String, params: String) = instance.AsstAppendTask(pointer, type, params) + fun setTaskParams(type: String, params: String) = instance.AsstSetTaskParams(pointer, 1, params) + fun start() = instance.AsstStart(pointer) fun stop() = instance.AsstStop(pointer) diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaService.kt b/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaService.kt index de32f37da6..093c8b041c 100644 --- a/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaService.kt +++ b/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaService.kt @@ -39,6 +39,12 @@ object MaaService { return appendTask ?: 0 } + + fun setTaskParams(host: String, type: String, detailJson: String): Int { + val appendTask = instancePool[host]?.setTaskParams(type, detailJson) + return appendTask ?: 0 + } + fun start(host: String) = instancePool[host]?.start() fun stop(host: String) = instancePool[host]?.stop() @@ -64,4 +70,5 @@ object MaaService { fun listInstance(): List = instancePool.values.map { e -> MaaInstanceInfo(e.id, e.host, e.id, e.status) }.toList() + }