fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

rewrite callback for msvc

Browse Source
This commit is contained in:
Alex Zhang
2022-05-14 12:30:40 +08:00
parent fb87c00d1b
commit e19f45b912
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/dart/lib/maa_core.dart
View File

@@ -36,7 +36,6 @@ class MaaCore implements MaaCoreInterface {
final result = _asstLoadResource(strPtr);
_resourceLoaded = _resourceLoaded || result;
}
MaaCore(String libDir, [Function(String)? callback]) {
_loadCppLib(libDir);
if (!_apiInited) {
@@ -65,7 +64,9 @@ class MaaCore implements MaaCoreInterface {
void Function(dynamic) _wrapCallback(void Function(String) cb) {
return (dynamic data) {
// c will manage the memory for the string
String msg = data;
final Pointer<Utf8> ptr = Pointer.fromAddress(data as int);
String msg = ptr.toDartString();
malloc.free(ptr);
cb(msg);
};
}

14
src/dart/native/callback.c
View File

@@ -1,6 +1,7 @@
#include "dart_api_dl.h"
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
void callback(int, const char *, void *);
void init_dart_api(void *);
void init_dart_api(void *api_data) {
@@ -19,14 +20,13 @@ void callback(int retval, const char *json_str, void *custom_arg) {
}
Dart_CObject obj;
int required_len = n_digits + strlen(json_str) + 1;
char retstr[required_len];
retstr[required_len-1] = 0;
sprintf(retstr, "{\"retval\": %d, \"payload\": %s }", retval, json_str);
obj.type = Dart_CObject_kString;
obj.value.as_string = retstr;
printf("C: Sending Pointer %ld to dart through port %ld\n", (int64_t)json_str, port);
char* retptr = calloc(required_len, sizeof(char));
snprintf(retptr, required_len, "{\"retval\": %d, \"payload\": %s }", retval, json_str);
obj.type = Dart_CObject_kInt64;
obj.value.as_string = (int64_t)retptr;
printf("C: Sending Pointer %p to dart through port %lld\n", retptr, (int64_t) port);
char res = Dart_PostCObject_DL(port, &obj);
if (res == 0) {
printf("C: Failed to send message to Dart\n");
}
}
}