fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 01:40:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: mumu extras (#8939)

Browse Source 
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
This commit is contained in:
MistEO
2024-05-03 22:05:37 +08:00
committed by GitHub
parent 0165469ad0
commit 605dcda98a
31 changed files with 2239 additions and 1175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/MaaCore/AsstCaller.cpp
View File

@@ -70,7 +70,9 @@ AsstBool AsstLoadResource(const char* path)
AsstBool AsstSetStaticOption(AsstStaticOptionKey key, const char* value)
{
return AsstExtAPI::set_static_option(static_cast<asst::StaticOptionKey>(key), value) ? AsstTrue : AsstFalse;
return AsstExtAPI::set_static_option(static_cast<asst::StaticOptionKey>(key), value)
? AsstTrue
: AsstFalse;
}
AsstHandle AsstCreate()
@@ -105,17 +107,25 @@ AsstBool AsstSetInstanceOption(AsstHandle handle, AsstInstanceOptionKey key, con
return AsstFalse;
}
return handle->set_instance_option(static_cast<asst::InstanceOptionKey>(key), value) ? AsstTrue : AsstFalse;
return handle->set_instance_option(static_cast<asst::InstanceOptionKey>(key), value)
? AsstTrue
: AsstFalse;
}
AsstBool AsstConnect(AsstHandle handle, const char* adb_path, const char* address, const char* config)
AsstBool
AsstConnect(AsstHandle handle, const char* adb_path, const char* address, const char* config)
{
if (!inited() || handle == nullptr) {
asst::Log.error(__FUNCTION__, "Cannot connect to device, asst not inited or handle is null", inited(), handle);
Log.error(
__FUNCTION__,
"Cannot connect to device, asst not inited or handle is null",
inited(),
handle);
return AsstFalse;
}
return handle->connect(adb_path, address, config ? config : std::string()) ? AsstTrue : AsstFalse;
return handle->connect(adb_path, address, config ? config : std::string()) ? AsstTrue
: AsstFalse;
}
AsstBool AsstStart(AsstHandle handle)
@@ -163,8 +173,12 @@ AsstBool ASSTAPI AsstBackToHome(AsstHandle handle)
return handle->back_to_home() ? AsstTrue : AsstFalse;
}
AsstAsyncCallId AsstAsyncConnect(AsstHandle handle, const char* adb_path, const char* address, const char* config,
AsstBool block)
AsstAsyncCallId AsstAsyncConnect(
AsstHandle handle,
const char* adb_path,
const char* address,
const char* config,
AsstBool block)
{
if (!inited() || handle == nullptr) {
return InvalidId;
@@ -172,6 +186,17 @@ AsstAsyncCallId AsstAsyncConnect(AsstHandle handle, const char* adb_path, const
return handle->async_connect(adb_path, address, config ? config : std::string(), block);
}
void AsstSetConnectionExtras(const char* name, const char* extras)
{
auto jopt = json::parse(extras);
if (!jopt) {
LogError << "failed to parse json" << extras;
return;
}
asst::ResourceLoader::get_instance().set_connection_extras(name, jopt->as_object());
}
AsstTaskId AsstAppendTask(AsstHandle handle, const char* type, const char* params)
{
if (!inited() || handle == nullptr) {
@@ -264,5 +289,5 @@ void AsstLog(const char* level, const char* message)
std::cerr << __FUNCTION__ << " | User Dir not set" << std::endl;
return;
}
asst::Log.log(asst::Logger::level(level), message);
Log.log(asst::Logger::level(level), message);
}