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

perf.优化adb连接

Browse Source
This commit is contained in:
MistEO
2021-12-21 22:05:42 +08:00
parent 1a4ddfee71
commit a9df0e1842
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/MeoAssistant/Controller.cpp
View File

@@ -52,7 +52,7 @@ bool asst::Controller::connect_adb(const std::string& address)
LogTraceScope("connect_adb " + address);
std::string connect_cmd = utils::string_replace_all(
utils::string_replace_all(m_emulator_info.adb.connect, "[Adb]", m_adb_path),
utils::string_replace_all(m_emulator_info.adb.connect, "[Adb]", m_emulator_info.adb.path),
"[Address]", address);
auto&& [connect_ret, connect_result] = call_command(connect_cmd);
// 端口即使错误，命令仍然会返回0，TODO 对connect_result进行判断
@@ -61,7 +61,7 @@ bool asst::Controller::connect_adb(const std::string& address)
}
std::string display_cmd = utils::string_replace_all(
utils::string_replace_all(m_emulator_info.adb.display, "[Adb]", m_adb_path),
utils::string_replace_all(m_emulator_info.adb.display, "[Adb]", m_emulator_info.adb.path),
"[Address]", address);
auto&& [display_ret, display_result] = call_command(display_cmd);
if (!display_ret) {
@@ -95,10 +95,10 @@ bool asst::Controller::connect_adb(const std::string& address)
m_control_scale = static_cast<double>(m_emulator_info.adb.display_width) / static_cast<double>(WindowWidthDefault);
}
m_emulator_info.adb.click = utils::string_replace_all(utils::string_replace_all(m_emulator_info.adb.click, "[Adb]", m_adb_path), "[Address]", address);
m_emulator_info.adb.swipe = utils::string_replace_all(utils::string_replace_all(m_emulator_info.adb.swipe, "[Adb]", m_adb_path), "[Address]", address);
m_emulator_info.adb.screencap = utils::string_replace_all(utils::string_replace_all(m_emulator_info.adb.screencap, "[Adb]", m_adb_path), "[Address]", address);
m_emulator_info.adb.release = utils::string_replace_all(m_emulator_info.adb.release, "[Adb]", m_adb_path);
m_emulator_info.adb.click = utils::string_replace_all(utils::string_replace_all(m_emulator_info.adb.click, "[Adb]", m_emulator_info.adb.path), "[Address]", address);
m_emulator_info.adb.swipe = utils::string_replace_all(utils::string_replace_all(m_emulator_info.adb.swipe, "[Adb]", m_emulator_info.adb.path), "[Address]", address);
m_emulator_info.adb.screencap = utils::string_replace_all(utils::string_replace_all(m_emulator_info.adb.screencap, "[Adb]", m_emulator_info.adb.path), "[Address]", address);
m_emulator_info.adb.release = utils::string_replace_all(m_emulator_info.adb.release, "[Adb]", m_emulator_info.adb.path);
return true;
}
@@ -225,12 +225,9 @@ bool asst::Controller::try_capture(const EmulatorInfo& info, bool without_handle
{
LogTraceScope("try_capture | " + info.name);
if (!m_emulator_info.adb.release.empty()) {
call_command(m_emulator_info.adb.release);
}
const HandleInfo& handle_info = info.handle;
std::string adb_path;
if (!without_handle) { // 使用模拟器自带的adb
// 转成宽字符的
wchar_t* class_wbuff = nullptr;
@@ -291,19 +288,19 @@ bool asst::Controller::try_capture(const EmulatorInfo& info, bool without_handle
// 到这一步说明句柄和权限没问题了，接下来就是adb的事情了
m_emulator_info = info;
m_handle = window_handle;
Log.trace("Handle:", m_handle, "Name:", m_emulator_info.name);
Log.trace("Handle:", window_handle, "Name:", m_emulator_info.name);
std::string adb_path = emulator_path.substr(0, emulator_path.find_last_of('\\') + 1);
adb_path = emulator_path.substr(0, emulator_path.find_last_of('\\') + 1);
adb_path = '"' + utils::string_replace_all(m_emulator_info.adb.path, "[EmulatorPath]", adb_path) + '"';
adb_path = utils::string_replace_all(adb_path, "[ExecDir]", m_dirname);
m_adb_path = std::move(adb_path);
}
else { // 使用辅助自带的标准adb
m_emulator_info = info;
m_adb_path = '"' + utils::string_replace_all(m_emulator_info.adb.path, "[ExecDir]", m_dirname) + '"';
adb_path = '"' + utils::string_replace_all(m_emulator_info.adb.path, "[ExecDir]", m_dirname) + '"';
}
m_emulator_info.adb.path = std::move(adb_path);
// 优先使用addresses里指定的地址
for (const std::string& address : info.adb.addresses) {
if (connect_adb(address)) {
@@ -312,7 +309,7 @@ bool asst::Controller::try_capture(const EmulatorInfo& info, bool without_handle
}
// 若指定地址都没连上，再尝试用devices查找地址
std::string devices_cmd = utils::string_replace_all(m_emulator_info.adb.devices, "[Adb]", m_adb_path);
std::string devices_cmd = utils::string_replace_all(m_emulator_info.adb.devices, "[Adb]", m_emulator_info.adb.path);
auto&& [devices_ret, devices_result] = call_command(devices_cmd);
if (!devices_ret) {
return false;