chore: breaking rename

This commit is contained in:
MistEO
2022-12-02 00:22:47 +08:00
parent 5abf4f0c1c
commit 3d83b80dd6
346 changed files with 374 additions and 372 deletions

View File

@@ -32,8 +32,8 @@
1. 把他丢进 Maa 文件夹下,形成如下文件结构.备注: 启动脚本[Maa-HTTP-Server-startup.bat](Maa-HTTP-Server-startup.bat).
```text
MeoAssistantArknights_v3.9.0-beta.8
│ MeoAsstGui.exe
MaaCoreArknights_v3.9.0-beta.8
│ MaaWpfGui.exe
│ MaaCore.dll
│ ...
└───Java-HTTP
@@ -108,7 +108,7 @@
```json
{
"adbPath": "C:\\MeoAssistantArknights3\\platform-tools\\adb.exe",
"adbPath": "C:\\MaaCoreArknights3\\platform-tools\\adb.exe",
"host": "127.0.0.1:62001",
"detailJson": ""
}
@@ -144,7 +144,6 @@
---
---
##### 接口名称 添加任务
@@ -400,7 +399,7 @@
{
"id": "ccd76e0c367511158ca774ff951a22e8bb62f5d3",
"host": "127.0.0.1:62026",
"adbPath": "C:\\Users\\atmzx\\Desktop\\MeoAssistantArknights3\\platform-tools\\adb.exe",
"adbPath": "C:\\Users\\atmzx\\Desktop\\MaaCoreArknights3\\platform-tools\\adb.exe",
"uuid": "",
"status": 0
}
@@ -441,7 +440,6 @@
###### 4) 请求返回结果: 图片内容, PNG 格式
### WebSocket 部分
请求地址(没错跟HTTP同样是8848钛金端口
@@ -511,7 +509,7 @@
"command": "connect",
"msgId": 114514,
"data": {
"adbPath": "C:\\Users\\atmzx\\Desktop\\MeoAssistantArknights3\\platform-tools\\adb.exe",
"adbPath": "C:\\Users\\atmzx\\Desktop\\MaaCoreArknights3\\platform-tools\\adb.exe",
"host": "127.0.0.1:62001"
}
}
@@ -561,7 +559,7 @@ appendTask setTaskParams start stop等接口不再描述均可遵循以上规
"details": {
"uuid": "",
"details": {
"adb": "C:\\MeoAssistantArknights3\\platform-tools\\adb.exe",
"adb": "C:\\MaaCoreArknights3\\platform-tools\\adb.exe",
"address": "127.0.0.1:62001",
"config": "General",
"width": 1280,

View File

@@ -20,13 +20,13 @@ public class MaaJavaSample {
*/
public static void main(String[] args) {
//设定JNA寻找maa的dll的地址同时也要把这个路径添加到环境变量中的Path中
String maaPath = "C:/Users/iguigui/Desktop/MeoAssistantArknights3";
String maaPath = "C:/Users/iguigui/Desktop/MaaCoreArknights3";
System.setProperty("jna.library.path", maaPath);
//adb地址自己看着办
String adbPath = maaPath + "/platform-tools/adb.exe";
//第一步加载Maa调用实例加载失败请检查jna.library.path和path参数
MeoAssistant instance = Native.load("MeoAssistant", MeoAssistant.class);
MaaCore instance = Native.load("MaaCore", MaaCore.class);
System.out.println("获取Maa版本号:" + instance.AsstGetVersion());
//第二步加载Maa资源初始化

View File

@@ -6,7 +6,7 @@ import com.sun.jna.win32.StdCallLibrary;
//本质上是对C接口的抽象层
//请参考C接口 https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/include/AsstCaller.h
public interface MeoAssistant extends StdCallLibrary {
public interface MaaCore extends StdCallLibrary {
//回调接口定义
interface AsstApiCallback extends StdCallCallback {

View File

@@ -2,7 +2,7 @@ package com.iguigui.maaj.service
import com.iguigui.maaj.dto.CallBackLog
import com.iguigui.maaj.dto.*
import com.iguigui.maaj.easySample.MeoAssistant
import com.iguigui.maaj.easySample.MaaCore
import com.iguigui.maaj.logger
import com.iguigui.maaj.util.Json
import com.sun.jna.Pointer
@@ -11,17 +11,17 @@ import java.util.concurrent.atomic.AtomicLong
import kotlin.reflect.KFunction1
class MaaInstance(
private val instance: MeoAssistant,
private val instance: MaaCore,
val id: String,
val adbPath: String,
val host: String,
private val detailJson: String,
val callBackAction: KFunction1<CallBackLog, Unit>
) :
MeoAssistant.AsstApiCallback {
MaaCore.AsstApiCallback {
// constructor(
// instance: MeoAssistant,
// instance: MaaCore,
// id: String,
// adbPath: String,
// host: String,

View File

@@ -1,7 +1,7 @@
package com.iguigui.maaj.service
import com.iguigui.maaj.dto.*
import com.iguigui.maaj.easySample.MeoAssistant
import com.iguigui.maaj.easySample.MaaCore
import com.iguigui.maaj.logger
import com.sun.jna.Native
import io.ktor.websocket.*
@@ -18,12 +18,12 @@ object MaaService {
private val wsConnection = Collections.synchronizedSet<Connection?>(LinkedHashSet())
val meoAssistant: MeoAssistant by lazy {
val MaaCore: MaaCore by lazy {
var maaPath = File(File("").absolutePath).parent
logger.info("maaPath $maaPath")
// maaPath = "C:\\Users\\atmzx\\Desktop\\MeoAssistantArknights3"
// maaPath = "C:\\Users\\atmzx\\Desktop\\MaaCoreArknights3"
System.setProperty("jna.library.path", maaPath)
val load = Native.load("MeoAssistant", MeoAssistant::class.java)
val load = Native.load("MaaCore", MaaCore::class.java)
load.AsstLoadResource(maaPath)
load
}
@@ -33,8 +33,8 @@ object MaaService {
// if (instancePool.containsKey(id)) {
// return ConnectResponse(id, true)
// }
val maaInstance = MaaInstance(meoAssistant, id, adbPath, host, detailJson, ::callBackLog)
maaInstance.pointer = meoAssistant.AsstCreateEx(maaInstance, maaInstance.id)
val maaInstance = MaaInstance(MaaCore, id, adbPath, host, detailJson, ::callBackLog)
maaInstance.pointer = MaaCore.AsstCreateEx(maaInstance, maaInstance.id)
val connect = maaInstance.connect()
if (!connect) {
return ConnectResponse("", false)
@@ -54,7 +54,7 @@ object MaaService {
fun stop(id: String) = instancePool[id]?.stop() ?: false
fun getVersion(): String = meoAssistant.AsstGetVersion()
fun getVersion(): String = MaaCore.AsstGetVersion()
private fun sha1(password: String): String {
val messageDigest = MessageDigest.getInstance("SHA")