From f6e69cc4ffbc69b74f27eff2a502d3ce822dd9ed Mon Sep 17 00:00:00 2001 From: MistEO Date: Sat, 11 Dec 2021 03:22:02 +0800 Subject: [PATCH] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E6=B2=A1=E7=9A=84=E5=B0=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistance/InfrastAbstractTask.cpp | 2 +- src/MeoAssistance/InfrastAbstractTask.h | 2 +- src/MeoAssistance/InfrastControlTask.cpp | 2 +- src/MeoAssistance/InfrastDormTask.cpp | 6 +++--- src/MeoAssistance/InfrastOfficeTask.cpp | 2 +- src/MeoAssistance/InfrastPowerTask.cpp | 2 +- src/MeoAssistance/InfrastProductionTask.cpp | 6 +++--- src/MeoAssistance/InfrastReceptionTask.cpp | 2 +- src/MeoAssistance/Logger.hpp | 4 ++-- src/MeoAssistance/Version.h | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/MeoAssistance/InfrastAbstractTask.cpp b/src/MeoAssistance/InfrastAbstractTask.cpp index 67dbe698e5..52721bd52d 100644 --- a/src/MeoAssistance/InfrastAbstractTask.cpp +++ b/src/MeoAssistance/InfrastAbstractTask.cpp @@ -201,7 +201,7 @@ bool asst::InfrastAbstractTask::click_confirm_button() return false; } -void asst::InfrastAbstractTask::sync_swipe_of_operlist(bool reverse) +void asst::InfrastAbstractTask::swipe_of_operlist(bool reverse) { async_swipe_of_operlist(reverse); await_swipe(); diff --git a/src/MeoAssistance/InfrastAbstractTask.h b/src/MeoAssistance/InfrastAbstractTask.h index 1f3adbea32..5ce6114024 100644 --- a/src/MeoAssistance/InfrastAbstractTask.h +++ b/src/MeoAssistance/InfrastAbstractTask.h @@ -24,7 +24,7 @@ namespace asst virtual void swipe_to_the_left_of_operlist(); // 滑动到干员列表的最左侧 virtual void swipe_to_the_left_of_main_ui(); // 滑动基建的主界面到最左侧 virtual void swipe_to_the_right_of_main_ui(); // 滑动基建的主界面到最右侧 - virtual void sync_swipe_of_operlist(bool reverse = false); + virtual void swipe_of_operlist(bool reverse = false); virtual void async_swipe_of_operlist(bool reverse = false); virtual void await_swipe(); diff --git a/src/MeoAssistance/InfrastControlTask.cpp b/src/MeoAssistance/InfrastControlTask.cpp index 0b142fc296..91a011668e 100644 --- a/src/MeoAssistance/InfrastControlTask.cpp +++ b/src/MeoAssistance/InfrastControlTask.cpp @@ -23,7 +23,7 @@ bool asst::InfrastControlTask::_run() if (!enter_oper_list_page()) { return false; } - constexpr int retry_times = 1; + constexpr int retry_times = 3; for (int i = 0; i <= retry_times; ++i) { if (need_exit()) { return false; diff --git a/src/MeoAssistance/InfrastDormTask.cpp b/src/MeoAssistance/InfrastDormTask.cpp index b4937b4613..51a16d9b4e 100644 --- a/src/MeoAssistance/InfrastDormTask.cpp +++ b/src/MeoAssistance/InfrastDormTask.cpp @@ -34,7 +34,7 @@ bool asst::InfrastDormTask::_run() swipe_to_the_left_of_operlist(); } else { - async_swipe_of_operlist(); + swipe_of_operlist(); } int num_of_selected = 0; @@ -89,7 +89,7 @@ bool asst::InfrastDormTask::_run() } } else { - if (oper.doing != infrast::Doing::Working) { + if (oper.selected == false && oper.doing != infrast::Doing::Working) { Ctrler.click(oper.rect); if (++num_of_selected >= MaxNumOfOpers) { Log.trace("num_of_selected:", num_of_selected, ", just break"); @@ -102,7 +102,7 @@ bool asst::InfrastDormTask::_run() Log.trace("num_of_selected:", num_of_selected, ", just break"); break; } - sync_swipe_of_operlist(); + swipe_of_operlist(); } click_confirm_button(); click_return_button(); diff --git a/src/MeoAssistance/InfrastOfficeTask.cpp b/src/MeoAssistance/InfrastOfficeTask.cpp index f19a99d49c..41b1cf3e72 100644 --- a/src/MeoAssistance/InfrastOfficeTask.cpp +++ b/src/MeoAssistance/InfrastOfficeTask.cpp @@ -22,7 +22,7 @@ bool asst::InfrastOfficeTask::_run() enter_facility(FacilityName, 0); click_bottomleft_tab(); - constexpr int retry_times = 1; + constexpr int retry_times = 3; for (int i = 0; i <= retry_times; ++i) { if (need_exit()) { return false; diff --git a/src/MeoAssistance/InfrastPowerTask.cpp b/src/MeoAssistance/InfrastPowerTask.cpp index 1d9cea3e5e..160924cfd3 100644 --- a/src/MeoAssistance/InfrastPowerTask.cpp +++ b/src/MeoAssistance/InfrastPowerTask.cpp @@ -31,7 +31,7 @@ bool asst::InfrastPowerTask::_run() if (!enter_oper_list_page()) { return false; } - constexpr int retry_times = 1; + constexpr int retry_times = 3; for (int i = 0; i <= retry_times; ++i) { swipe_to_the_left_of_operlist(); diff --git a/src/MeoAssistance/InfrastProductionTask.cpp b/src/MeoAssistance/InfrastProductionTask.cpp index a3c763e3ec..500779ff9a 100644 --- a/src/MeoAssistance/InfrastProductionTask.cpp +++ b/src/MeoAssistance/InfrastProductionTask.cpp @@ -110,7 +110,7 @@ bool asst::InfrastProductionTask::shift_facility_list() Ctrler.click(add_button); sleep(add_task_ptr->rear_delay); - constexpr int retry_times = 1; + constexpr int retry_times = 3; for (int i = 0; i <= retry_times; ++i) { if (need_exit()) { return false; @@ -167,7 +167,7 @@ bool asst::InfrastProductionTask::opers_detect_with_swipe() } // 异步在最后会多滑动一下，耽误的时间还不如用同步 - sync_swipe_of_operlist(); + swipe_of_operlist(); } if (!m_all_available_opers.empty()) { @@ -555,7 +555,7 @@ bool asst::InfrastProductionTask::opers_choose() } // 因为识别完了还要点击，所以这里不能异步滑动 - sync_swipe_of_operlist(); + swipe_of_operlist(); } return true; diff --git a/src/MeoAssistance/InfrastReceptionTask.cpp b/src/MeoAssistance/InfrastReceptionTask.cpp index 1aa5e1b7ff..d6e3a3046e 100644 --- a/src/MeoAssistance/InfrastReceptionTask.cpp +++ b/src/MeoAssistance/InfrastReceptionTask.cpp @@ -179,7 +179,7 @@ bool asst::InfrastReceptionTask::shift() } sleep(raw_task_ptr->rear_delay); - constexpr int retry_times = 1; + constexpr int retry_times = 3; for (int i = 0; i <= retry_times; ++i) { if (need_exit()) { return false; diff --git a/src/MeoAssistance/Logger.hpp b/src/MeoAssistance/Logger.hpp index f76b407096..72a3b40275 100644 --- a/src/MeoAssistance/Logger.hpp +++ b/src/MeoAssistance/Logger.hpp @@ -50,8 +50,8 @@ namespace asst log(level, std::forward(args)...); } - const std::string m_log_filename = m_dirname + "asst.log"; - const std::string m_log_bak_filename = m_dirname + "asst.bak.log"; + const std::string m_log_filename = m_dirname + "\\asst.log"; + const std::string m_log_bak_filename = m_dirname + "\\asst.bak.log"; private: Logger() diff --git a/src/MeoAssistance/Version.h b/src/MeoAssistance/Version.h index eeedbb0fa7..0e4a941277 100644 --- a/src/MeoAssistance/Version.h +++ b/src/MeoAssistance/Version.h @@ -2,5 +2,5 @@ namespace asst { - constexpr static const char* Version = "v2.3.1"; + constexpr static const char* Version = "v2.3.2"; }