From 11d51447ad9d77c0d2f21b76745bd5ab4f5a5d6c Mon Sep 17 00:00:00 2001
From: guigui <atmzxl@163.com>
Date: Wed, 25 May 2022 22:45:05 +0800
Subject: [PATCH] Maa HTTP Server

---
 .../Maaj/src/main/java/com/iguigui/maaj/dto/request.kt   | 2 ++
 .../Maaj/src/main/java/com/iguigui/maaj/dto/response.kt  | 9 +++++++--
 .../main/java/com/iguigui/maaj/routing/HttpRouting.kt    | 2 +-
 .../main/java/com/iguigui/maaj/service/MaaInstance.kt    | 2 +-
 .../src/main/java/com/iguigui/maaj/service/MaaService.kt | 6 +++---
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/request.kt b/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/request.kt
index 5a2c950e95..d9c453ca60 100644
--- a/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/request.kt
+++ b/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/request.kt
@@ -21,6 +21,8 @@ data class AppendTaskRequest(
     val host: String,
     @SerialName("type")
     val type: String,
+    @SerialName("taskId")
+    val taskId: Int,
     @SerialName("params")
     val params: Task
 )
diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/response.kt b/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/response.kt
index cf6b654eda..079f4279d4 100644
--- a/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/response.kt
+++ b/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/response.kt
@@ -41,14 +41,14 @@ data class GetVersion(
 
 @Serializable
 data class ConnectResponse(
-    @SerialName("version")
+    @SerialName("id")
     val id: String
 ) : BaseData()
 
 
 @Serializable
 data class ListInstance(
-    @SerialName("version")
+    @SerialName("list")
     val list: List<MaaInstanceInfo>
 ) : BaseData()
 
@@ -64,6 +64,11 @@ data class MaaInstanceInfo(
     val status: Int,
 ) : BaseData()
 
+@Serializable
+data class AppendTask(
+    @SerialName("id")
+    val id: Int
+) : BaseData()
 
 object EmptyBaseData : BaseData()
 
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 4eef4f55fa..9879108338 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
@@ -32,7 +32,7 @@ fun Application.httpRouting() {
             }
             post("/setTaskParams") {
                 val appendTask = call.receive<AppendTaskRequest>()
-                MaaService.setTaskParams(appendTask.host, appendTask.type, appendTask.params.toJsonString())
+                MaaService.setTaskParams(appendTask.host, appendTask.type,appendTask.taskId, appendTask.params.toJsonString())
                 call.respond(HttpResponse())
             }
             post("/start") {
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 d9cb60e790..4b1bce31c0 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,7 +33,7 @@ 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 setTaskParams(type: String,taskId:Int, params: String) = instance.AsstSetTaskParams(pointer, taskId, params)
 
     fun start() = instance.AsstStart(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 093c8b041c..f8bd60cc9e 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
@@ -40,9 +40,9 @@ object MaaService {
     }
 
 
-    fun setTaskParams(host: String, type: String, detailJson: String): Int {
-        val appendTask = instancePool[host]?.setTaskParams(type, detailJson)
-        return appendTask ?: 0
+    fun setTaskParams(host: String, type: String, taskId: Int, detailJson: String): Boolean {
+        val appendTask = instancePool[host]?.setTaskParams(type, taskId, detailJson)
+        return appendTask ?: false
     }
 
     fun start(host: String) = instancePool[host]?.start()