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

feat: 完成minitouch的push

Browse Source
This commit is contained in:
MistEO
2022-11-07 01:10:04 +08:00
parent 9055670e7d
commit cb6b057f92
11 changed files with 69 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/MeoAssistant/Controller.cpp
View File

@@ -997,7 +997,7 @@ bool asst::Controller::connect(const std::string& adb_path, const std::string& a
}
auto& uuid_str = uuid_ret.value();
std::erase(uuid_str, ' ');
std::erase_if(uuid_str, [](char c) { return !std::isdigit(c) && !std::isalpha(c); });
m_uuid = std::move(uuid_str);
json::value info = get_info_json() | json::object {
@@ -1166,6 +1166,23 @@ bool asst::Controller::connect(const std::string& adb_path, const std::string& a
return false;
}
if (m_enable_minitouch) {
auto minitouch_cmd_rep = [&](const std::string& cfg_cmd) -> std::string {
return utils::string_replace_all(
cmd_replace(cfg_cmd),
{
// TODO: 用 adb shell getprop ro.product.cpu.abilist 来判断该用哪个文件夹里的
{ "[minitouchLocalPath]", (m_resource_path / "minitouch" / "armeabi-v7a" / "minitouch").string() },
{ "[minitouchWorkingFile]", m_uuid },
});
};
call_command(minitouch_cmd_rep(adb_cfg.push_minitouch));
call_command(minitouch_cmd_rep(adb_cfg.chmod_minitouch));
m_adb.call_minitouch = minitouch_cmd_rep(adb_cfg.push_minitouch);
}
// try to find the fastest way
if (!screencap()) {
Log.error("Cannot find a proper way to screencap!");