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

Merge pull request #1728 from MaaAssistantArknights/fix/lf

Browse Source 
fix: 尝试修复部分模拟器行尾变化的问题
This commit is contained in:
MistEO
2022-09-02 00:25:42 +08:00
committed by GitHub
parent 1b8cec2c7a e20ffff2af
commit e0c1dcb6ca
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/MeoAssistant/Controller.cpp
View File

@@ -648,54 +648,55 @@ bool asst::Controller::screencap()
switch (m_adb.screencap_method) {
case AdbProperty::ScreencapMethod::UnknownYet: {
using namespace std::chrono;
Log.info("Try to find the fastest way to screencap");
m_inited = false;
auto min_cost = std::chrono::nanoseconds(LLONG_MAX);
auto min_cost = milliseconds(LLONG_MAX);
auto start_time = std::chrono::high_resolution_clock::now();
auto start_time = high_resolution_clock::now();
if (m_support_socket && m_server_started && screencap(m_adb.screencap_raw_by_nc, decode_raw, true)) {
auto duration = std::chrono::high_resolution_clock::now() - start_time;
auto duration = duration_cast<milliseconds>(high_resolution_clock::now() - start_time);
if (duration < min_cost) {
m_adb.screencap_method = AdbProperty::ScreencapMethod::RawByNc;
m_inited = true;
min_cost = duration;
}
Log.info("RawByNc cost", duration.count(), "ns");
Log.info("RawByNc cost", duration.count(), "ms");
}
else {
Log.info("RawByNc is not supported");
}
clear_lf_info();
start_time = std::chrono::high_resolution_clock::now();
start_time = high_resolution_clock::now();
if (screencap(m_adb.screencap_raw_with_gzip, decode_raw_with_gzip)) {
auto duration = std::chrono::high_resolution_clock::now() - start_time;
auto duration = duration_cast<milliseconds>(high_resolution_clock::now() - start_time);
if (duration < min_cost) {
m_adb.screencap_method = AdbProperty::ScreencapMethod::RawWithGzip;
m_inited = true;
min_cost = duration;
}
Log.info("RawWithGzip cost", duration.count(), "ns");
Log.info("RawWithGzip cost", duration.count(), "ms");
}
else {
Log.info("RawWithGzip is not supported");
}
clear_lf_info();
start_time = std::chrono::high_resolution_clock::now();
start_time = high_resolution_clock::now();
if (screencap(m_adb.screencap_encode, decode_encode)) {
auto duration = std::chrono::high_resolution_clock::now() - start_time;
auto duration = duration_cast<milliseconds>(high_resolution_clock::now() - start_time);
if (duration < min_cost) {
m_adb.screencap_method = AdbProperty::ScreencapMethod::Encode;
m_inited = true;
min_cost = duration;
}
Log.info("Encode cost", duration.count(), "ns");
Log.info("Encode cost", duration.count(), "ms");
}
else {
Log.info("Encode is not supported");
}
Log.info("The fastest way is", static_cast<int>(m_adb.screencap_method), ", cost:", min_cost.count(), "ns");
Log.info("The fastest way is", static_cast<int>(m_adb.screencap_method), ", cost:", min_cost.count(), "ms");
clear_lf_info();
return m_inited;
} break;
@@ -741,7 +742,8 @@ bool asst::Controller::screencap(const std::string& cmd, const DecodeFunc& decod
else {
Log.info("data is not empty, but image is empty");
if (m_adb.screencap_end_of_line == AdbProperty::ScreencapEndOfLine::UnknownYet) {
if (m_adb.screencap_end_of_line == AdbProperty::ScreencapEndOfLine::UnknownYet ||
m_adb.screencap_end_of_line == AdbProperty::ScreencapEndOfLine::LF) {
Log.info("try to cvt lf");
convert_lf(data);
@@ -754,6 +756,7 @@ bool asst::Controller::screencap(const std::string& cmd, const DecodeFunc& decod
Log.error("convert lf and retry decode failed!");
}
}
m_adb.screencap_end_of_line = AdbProperty::ScreencapEndOfLine::UnknownYet;
return false;
}
}

3
src/MeoAssistant/Controller.h
View File

@@ -91,7 +91,8 @@ namespace asst
void random_delay() const;
void clear_info() noexcept;
// 转换data中所有的crlf为lf：有些模拟器自带的adb，exec-out输出的\n，会被替换成\r\n，导致解码错误，所以这里转一下回来（点名批评mumu）
// 转换 data 中所有的 crlf 为 lf：有些模拟器自带的 adb，exec-out 输出的 lf 会被替换成 crlf，
// 导致解码错误，所以这里转一下回来（点名批评 mumu 和雷电）
static void convert_lf(std::vector<uchar>& data);
bool* m_exit_flag = nullptr;