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

Revert removal of timeout in call_and_hup_minitouch

Browse Source
This commit is contained in:
shxyke
2023-03-28 06:39:59 +00:00
parent a6158a6f20
commit cd38cec87f
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/MaaCore/Controller/MinitouchController.cpp
View File

@@ -36,16 +36,29 @@ bool asst::MinitouchController::call_and_hup_minitouch()
return false;
}
if (need_exit()) {
release_minitouch(true);
return false;
}
auto check_timeout = [&](const auto& start_time) -> bool {
using namespace std::chrono_literals;
return std::chrono::steady_clock::now() - start_time < 3s;
};
pipe_str = m_minitouch_handler->read(3);
const auto start_time = std::chrono::steady_clock::now();
while (true) {
if (need_exit()) {
release_minitouch(true);
return false;
}
if (pipe_str.find('$') == std::string::npos) {
release_minitouch(true);
return false;
pipe_str += m_minitouch_handler->read(3);
if (!check_timeout(start_time)) {
Log.info("unable to find $ from pipe_str:", Logger::separator::newline, pipe_str);
release_minitouch(true);
return false;
}
if (pipe_str.find('$') != std::string::npos) {
break;
}
}
Log.info("pipe str", Logger::separator::newline, pipe_str);