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

fix. 修复无法软重启的问题

Browse Source
This commit is contained in:
Alaric Gilbert
2022-02-19 23:48:05 +08:00
parent 25b4f25d9c
commit 548fc4c2b8
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/MeoAssistant/Controller.cpp
View File

@@ -110,6 +110,8 @@ bool asst::Controller::connect_adb(const std::string & address)
std::string connect_cmd = utils::string_replace_all(
utils::string_replace_all(m_emulator_info.adb.connect, "[Adb]", m_emulator_info.adb.path),
"[Address]", address);
std::string display_id;
auto connect_ret = call_command(connect_cmd);
// 端口即使错误，命令仍然会返回0，TODO 对connect_result进行判断
if (!connect_ret) {
@@ -136,17 +138,18 @@ bool asst::Controller::connect_adb(const std::string & address)
return false;
}
m_emulator_info.adb.display_id = display_id_pipe_str.substr(last + 1);
display_id = display_id_pipe_str.substr(last + 1);
// 去掉换行
m_emulator_info.adb.display_id.pop_back();
display_id.pop_back();
}
std::vector<std::pair<std::string, std::string>> replaces = {
{"[Adb]", m_emulator_info.adb.path},
{"[Address]", address},
{"[DisplayId]", display_id}
};
std::string display_cmd = utils::string_replace_all(
utils::string_replace_all(
utils::string_replace_all(m_emulator_info.adb.display, "[Adb]", m_emulator_info.adb.path),
"[Address]", address),
"[DisplayId]", m_emulator_info.adb.display_id);
std::string display_cmd = utils::string_replace_all_batch(
m_emulator_info.adb.display, replaces);
auto display_ret = call_command(display_cmd);
if (!display_ret) {
@@ -183,11 +186,7 @@ bool asst::Controller::connect_adb(const std::string & address)
m_scale_size = std::make_pair(WindowWidthDefault, scale_height);
m_control_scale = static_cast<double>(m_emulator_info.adb.display_width) / static_cast<double>(WindowWidthDefault);
}
std::vector<std::pair<std::string, std::string>> replaces = {
{"[Adb]", m_emulator_info.adb.path},
{"[Address]", address},
{"[DisplayId]", m_emulator_info.adb.display_id}
};
m_emulator_info.adb.click = utils::string_replace_all_batch(
m_emulator_info.adb.click, replaces);
m_emulator_info.adb.swipe = utils::string_replace_all_batch(