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

Merge pull request #2844 from MaaAssistantArknights/dev

Browse Source 
Release v4.7.0-rc.1
This commit is contained in:
MistEO
2022-11-22 00:50:47 +08:00
committed by GitHub
parent 087c60e58e 417f306b43
commit eed5d3a3d3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/MeoAssistant/Assistant.cpp
View File

@@ -57,6 +57,7 @@ Assistant::~Assistant()
bool asst::Assistant::set_instance_option(InstanceOptionKey key, const std::string& value)
{
Log.info(__FUNCTION__, "| key", static_cast<int>(key), "value", value);
switch (key) {
case InstanceOptionKey::MinitouchEnabled:
if (value == "0") {

7
src/MeoAssistant/Controller.cpp
View File

@@ -1531,10 +1531,11 @@ bool asst::Controller::connect(const std::string& adb_path, const std::string& a
call_and_hup_minitouch(m_adb.call_minitouch);
std::string orientation_str = call_command(cmd_replace(adb_cfg.orientation)).value_or("0");
auto [beg, end] = ranges::remove_if(orientation_str, [](char ch) -> bool { return !std::isdigit(ch); });
orientation_str.erase(beg, end);
if (!orientation_str.empty()) {
m_minitouch_props.orientation = std::stoi(orientation_str);
char first = orientation_str.front();
if (first == '0' || first == '1' || first == '2' || first == '3') {
m_minitouch_props.orientation = static_cast<int>(first - '0');
}
}
// try to find the fastest way