From dfa6f52a2b8fdee515146adc422bc42f0efe9ee7 Mon Sep 17 00:00:00 2001 From: MistEO Date: Wed, 21 Sep 2022 12:16:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=9F=BA=E5=BB=BA=E5=AE=BF=E8=88=8D=E5=A7=8B=E7=BB=88?= =?UTF-8?q?autofill=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=83=A8=E5=88=86=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9F=BA=E5=BB=BA?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/InfrastAbstractTask.cpp | 10 ++++------ src/MeoAssistant/InfrastAbstractTask.h | 2 +- src/MeoAssistant/InfrastControlTask.cpp | 2 +- src/MeoAssistant/InfrastDormTask.cpp | 13 ++++++++----- src/MeoAssistant/InfrastOfficeTask.cpp | 2 +- src/MeoAssistant/InfrastPowerTask.cpp | 2 +- src/MeoAssistant/InfrastProductionTask.cpp | 4 ++-- src/MeoAssistant/InfrastReceptionTask.cpp | 2 +- 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/MeoAssistant/InfrastAbstractTask.cpp b/src/MeoAssistant/InfrastAbstractTask.cpp index 330f2e2a96..fc5b370883 100644 --- a/src/MeoAssistant/InfrastAbstractTask.cpp +++ b/src/MeoAssistant/InfrastAbstractTask.cpp @@ -134,13 +134,11 @@ void asst::InfrastAbstractTask::async_swipe_of_operlist(bool reverse) } } -bool asst::InfrastAbstractTask::is_use_custom_config() +bool asst::InfrastAbstractTask::is_use_custom_opers() { - if (!m_is_custom) { - return false; - } - return !m_current_room_custom_config.names.empty() || !m_current_room_custom_config.candidates.empty() || - !m_current_room_custom_config.autofill; + return m_is_custom && + (!m_current_room_custom_config.names.empty() + || !m_current_room_custom_config.candidates.empty()); } void asst::InfrastAbstractTask::await_swipe() diff --git a/src/MeoAssistant/InfrastAbstractTask.h b/src/MeoAssistant/InfrastAbstractTask.h index a38f648db5..7611a4e490 100644 --- a/src/MeoAssistant/InfrastAbstractTask.h +++ b/src/MeoAssistant/InfrastAbstractTask.h @@ -36,7 +36,7 @@ namespace asst void swipe_of_operlist(bool reverse = false); void async_swipe_of_operlist(bool reverse = false); void await_swipe(); - bool is_use_custom_config(); + bool is_use_custom_opers(); bool swipe_and_select_custom_opers(bool is_dorm_order = false); bool select_custom_opers(); void order_opers_selection(const std::vector& names); diff --git a/src/MeoAssistant/InfrastControlTask.cpp b/src/MeoAssistant/InfrastControlTask.cpp index e296811bfa..e5ac19d95c 100644 --- a/src/MeoAssistant/InfrastControlTask.cpp +++ b/src/MeoAssistant/InfrastControlTask.cpp @@ -25,7 +25,7 @@ bool asst::InfrastControlTask::_run() } click_clear_button(); - if (is_use_custom_config()) { + if (is_use_custom_opers()) { bool name_select_ret = swipe_and_select_custom_opers(); if (name_select_ret) { break; diff --git a/src/MeoAssistant/InfrastDormTask.cpp b/src/MeoAssistant/InfrastDormTask.cpp index 2d1f366fcc..7b5734015a 100644 --- a/src/MeoAssistant/InfrastDormTask.cpp +++ b/src/MeoAssistant/InfrastDormTask.cpp @@ -41,6 +41,12 @@ bool asst::InfrastDormTask::_run() return false; } + click_clear_button(); + + if (is_use_custom_opers()) { + swipe_and_select_custom_opers(true); + } + Log.trace("m_dorm_notstationed_enabled:", m_dorm_notstationed_enabled); if (m_dorm_notstationed_enabled && !m_if_filter_notstationed_haspressed) { Log.trace("click_filter_menu_not_stationed_button"); @@ -48,12 +54,9 @@ bool asst::InfrastDormTask::_run() m_if_filter_notstationed_haspressed = true; } - click_clear_button(); - - if (is_use_custom_config()) { - swipe_and_select_custom_opers(true); + if (!m_is_custom || m_current_room_custom_config.autofill) { + opers_choose(); } - opers_choose(); click_confirm_button(); click_return_button(); diff --git a/src/MeoAssistant/InfrastOfficeTask.cpp b/src/MeoAssistant/InfrastOfficeTask.cpp index 6c00a88b75..2060847315 100644 --- a/src/MeoAssistant/InfrastOfficeTask.cpp +++ b/src/MeoAssistant/InfrastOfficeTask.cpp @@ -22,7 +22,7 @@ bool asst::InfrastOfficeTask::_run() if (need_exit()) { return false; } - if (is_use_custom_config()) { + if (is_use_custom_opers()) { bool name_select_ret = swipe_and_select_custom_opers(); if (name_select_ret) { break; diff --git a/src/MeoAssistant/InfrastPowerTask.cpp b/src/MeoAssistant/InfrastPowerTask.cpp index bcae422b9f..242140ddbd 100644 --- a/src/MeoAssistant/InfrastPowerTask.cpp +++ b/src/MeoAssistant/InfrastPowerTask.cpp @@ -30,7 +30,7 @@ bool asst::InfrastPowerTask::_run() } for (int j = 0; j <= OperSelectRetryTimes; ++j) { - if (is_use_custom_config()) { + if (is_use_custom_opers()) { bool name_select_ret = swipe_and_select_custom_opers(); if (name_select_ret) { break; diff --git a/src/MeoAssistant/InfrastProductionTask.cpp b/src/MeoAssistant/InfrastProductionTask.cpp index 7e555a1e91..d0a6bdca85 100644 --- a/src/MeoAssistant/InfrastProductionTask.cpp +++ b/src/MeoAssistant/InfrastProductionTask.cpp @@ -92,7 +92,7 @@ bool asst::InfrastProductionTask::shift_facility_list() } if (m_cur_facility_index != 0) { callback(AsstMsg::SubTaskExtraInfo, basic_info_with_what("EnterFacility")); - if (is_use_custom_config()) { + if (is_use_custom_opers()) { if (m_cur_facility_index < m_custom_config.size()) { m_current_room_custom_config = m_custom_config.at(m_cur_facility_index); } @@ -165,7 +165,7 @@ bool asst::InfrastProductionTask::shift_facility_list() } click_clear_button(); - if (is_use_custom_config()) { + if (is_use_custom_opers()) { bool name_select_ret = swipe_and_select_custom_opers(); if (name_select_ret) { break; diff --git a/src/MeoAssistant/InfrastReceptionTask.cpp b/src/MeoAssistant/InfrastReceptionTask.cpp index 3426381479..cacbcacbf1 100644 --- a/src/MeoAssistant/InfrastReceptionTask.cpp +++ b/src/MeoAssistant/InfrastReceptionTask.cpp @@ -177,7 +177,7 @@ bool asst::InfrastReceptionTask::shift() } click_clear_button(); - if (is_use_custom_config()) { + if (is_use_custom_opers()) { bool name_select_ret = swipe_and_select_custom_opers(); if (name_select_ret) { break;