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

feat: auto retry start on app startup crash (#8966)

Browse Source
This commit is contained in:
Constrat
2024-05-06 22:04:26 +02:00
committed by GitHub
parent b051a46241
commit fef2f56d39
11 changed files with 394 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/MaaCore/Controller/AdbController.cpp
View File

@@ -156,6 +156,7 @@ std::optional<std::string> asst::AdbController::call_command(
", socket size:",
sock_data.size());
if (!pipe_data.empty() && pipe_data.size() < 4096) {
m_pipe_data_size = pipe_data.size();
Log.trace("stdout output:", Logger::separator::newline, pipe_data);
}
if (recv_by_socket && !sock_data.empty() && sock_data.size() < 4096) {
@@ -178,6 +179,16 @@ std::optional<std::string> asst::AdbController::call_command(
return std::nullopt;
}
size_t asst::AdbController::get_pipe_data_size() const noexcept
{
return m_pipe_data_size;
}
size_t asst::AdbController::get_version() const noexcept
{
return m_version;
}
void asst::AdbController::callback(AsstMsg msg, const json::value& details)
{
if (m_callback) {
@@ -760,6 +771,23 @@ bool asst::AdbController::connect(
info["details"]["uuid"] = m_uuid;
callback(AsstMsg::ConnectionInfo, info);
}
/* get android version */
{
auto version_ret = call_command(cmd_replace(adb_cfg.version));
if (!version_ret) {
json::value info = get_info_json()
| json::object {
{ "what", "ConnectFailed" },
{ "why", "Android version command failed to exec" },
};
callback(AsstMsg::ConnectionInfo, info);
return false;
}
auto& version_str = version_ret.value();
convert_lf(version_str);
m_version = std::stoul(version_str);
}
if (need_exit()) {
return false;