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

merge dev

Browse Source
This commit is contained in:
MistEO
2022-06-05 23:52:38 +08:00
parent 58b46487e9 847c04d3ae
commit c402def46e
24 changed files with 332 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/MeoAssistant/GeneralConfiger.cpp
View File

@@ -28,6 +28,12 @@ bool asst::GeneralConfiger::parse(const json::value& json)
m_options.aip_ocr.client_id = aip_ocr.get("clientId", std::string());
m_options.aip_ocr.client_secret = aip_ocr.get("clientSerect", std::string());
}
}
for (const auto& [server_type, intent_name] : json.at("intent").as_object())
{
m_intent_name[server_type]=intent_name.as_string();
}
for (const auto& [name, cfg_json] : json.at("connection").as_object()) {
@@ -47,6 +53,7 @@ bool asst::GeneralConfiger::parse(const json::value& json)
adb.nc_port = static_cast<unsigned short>(cfg_json.at("ncPort").as_integer());
adb.screencap_encode = cfg_json.at("screencapEncode").as_string();
adb.release = cfg_json.at("release").as_string();
adb.start = cfg_json.at("start").as_string();
//adb.pullscreen = cfg_json.at("pullscreen").as_string();
m_adb_cfg[name] = std::move(adb);