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

feat.暂时废弃百度 OCR API

Browse Source
This commit is contained in:
MistEO
2021-12-17 21:20:40 +08:00
parent 9e03916e78
commit 079698ba01
10 changed files with 123 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/MeoAssistant/GeneralConfiger.cpp
View File

@@ -6,22 +6,28 @@ bool asst::GeneralConfiger::parse(const json::value& json)
{
m_version = json.at("version").as_string();
const json::value& options_json = json.at("options");
{
const json::value& options_json = json.at("options");
m_options.connect_type = static_cast<ConnectType>(options_json.at("connectType").as_integer());
m_options.task_delay = options_json.at("taskDelay").as_integer();
m_options.control_delay_lower = options_json.at("controlDelayRange")[0].as_integer();
m_options.control_delay_upper = options_json.at("controlDelayRange")[1].as_integer();
m_options.print_window = options_json.at("printWindow").as_boolean();
m_options.penguin_report = options_json.at("penguinReport").as_boolean();
m_options.penguin_report_cmd_line = options_json.at("penguinReportCmdLine").as_string();
m_options.penguin_report_server = options_json.get("penguinReportServer", "CN");
//m_options.ocr_gpu_index = options_json.get("ocrGpuIndex", -1);
//m_options.ocr_thread_number = options_json.at("ocrThreadNumber").as_integer();
//m_options.print_window = options_json.at("printWindow").as_boolean();
m_options.adb_extra_swipe_dist = options_json.get("adbExtraSwipeDist", 100);
m_options.adb_extra_swipe_duration = options_json.get("adbExtraSwipeDuration", -1);
m_options.adb_extra_swipe_duration = options_json.get("adbExtraSwipeDuration", -1);
auto& penguin_report = options_json.at("penguinReport");
m_options.penguin_report.enable = penguin_report.get("enable", true);
m_options.penguin_report.cmd_format = penguin_report.get("cmdFormat", std::string());
m_options.penguin_report.server = penguin_report.get("server", "CN");
if (options_json.exist("aipOcr")) {
auto& aip_ocr = options_json.at("aipOcr");
m_options.aip_ocr.enable = aip_ocr.get("enable", false);
m_options.aip_ocr.accurate = aip_ocr.get("accurate", false);
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& [name, emulator_json] : json.at("emulator").as_object()) {
@@ -52,4 +58,4 @@ bool asst::GeneralConfiger::parse(const json::value& json)
}
return true;
}
}