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

fix: 修复minitouch参数错误

Browse Source
This commit is contained in:
MistEO
2022-11-12 15:41:25 +08:00
parent 50edd9e5e2
commit 2ccba7f101
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/MeoAssistant/Controller.cpp
View File

@@ -550,8 +550,9 @@ bool asst::Controller::call_and_hup_minitouch(const std::string& cmd)
#endif // _WIN32
}
bool asst::Controller::input_to_minitouch(const std::string& cmd)
bool asst::Controller::input_to_minitouch(const std::string& cmd, int delay_ms)
{
LogTraceFunction;
Log.info("Input to minitouch", Logger::separator::newline, cmd);
#ifdef _WIN32
@@ -560,8 +561,12 @@ bool asst::Controller::input_to_minitouch(const std::string& cmd)
&written, NULL)) {
auto err = GetLastError();
Log.error("Failed to write to minitouch, err", err);
return false;
}
using namespace std::chrono_literals;
std::this_thread::sleep_for(delay_ms * 1ms);
return cmd.size() == written;
#else
return false;
@@ -983,7 +988,7 @@ bool asst::Controller::click_without_scale(const Point& p)
int x = static_cast<int>(p.x * m_minitouch_props.x_scaling);
int y = static_cast<int>(p.y * m_minitouch_props.y_scaling);
std::string minitouch_cmd = MinitouchCmd::down(x, y) + MinitouchCmd::up();
return input_to_minitouch(minitouch_cmd);
return input_to_minitouch(minitouch_cmd, MinitouchCmd::DefaultInterval);
}
std::string cur_cmd =
@@ -1025,12 +1030,12 @@ bool asst::Controller::swipe_without_scale(const Point& p1, const Point& p2, int
}
if (m_minitouch_avaiable) {
x1 *= static_cast<int>(m_minitouch_props.x_scaling);
y1 *= static_cast<int>(m_minitouch_props.y_scaling);
x2 *= static_cast<int>(m_minitouch_props.x_scaling);
y2 *= static_cast<int>(m_minitouch_props.y_scaling);
x1 = static_cast<int>(x1 * m_minitouch_props.x_scaling);
y1 = static_cast<int>(y1 * m_minitouch_props.y_scaling);
x2 = static_cast<int>(x2 * m_minitouch_props.x_scaling);
y2 = static_cast<int>(y2 * m_minitouch_props.y_scaling);
std::string minitouch_cmd = MinitouchCmd::down(x1, y2);
std::string minitouch_cmd = MinitouchCmd::down(x1, y1);
if (duration == 0) {
duration = 1000;
}
@@ -1045,7 +1050,7 @@ bool asst::Controller::swipe_without_scale(const Point& p1, const Point& p2, int
minitouch_cmd += MinitouchCmd::move(x2, y2);
minitouch_cmd += MinitouchCmd::up();
return input_to_minitouch(minitouch_cmd);
return input_to_minitouch(minitouch_cmd, duration + MoveInterval);
}
std::string cur_cmd =

2
src/MeoAssistant/Controller.h
View File

@@ -91,7 +91,7 @@ namespace asst
void callback(AsstMsg msg, const json::value& details);
bool call_and_hup_minitouch(const std::string& cmd);
bool input_to_minitouch(const std::string& cmd);
bool input_to_minitouch(const std::string& cmd, int delay_ms = 0);
void release_minitouch();
// 转换 data 中的 CRLF 为 LF：有些模拟器自带的 adb，exec-out 输出的 \n 会被替换成 \r\n，