From 2fe77758f7b1f0bf8a172b749cab18638bed0e01 Mon Sep 17 00:00:00 2001 From: status102 <102887808+status102@users.noreply.github.com> Date: Wed, 10 Dec 2025 09:30:33 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84report?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Task/Miscellaneous/SupportList.cpp | 142 ++++++------------ src/MaaCore/Task/Miscellaneous/SupportList.h | 2 +- 2 files changed, 46 insertions(+), 98 deletions(-) diff --git a/src/MaaCore/Task/Miscellaneous/SupportList.cpp b/src/MaaCore/Task/Miscellaneous/SupportList.cpp index d600e5b33c..3dd561be21 100644 --- a/src/MaaCore/Task/Miscellaneous/SupportList.cpp +++ b/src/MaaCore/Task/Miscellaneous/SupportList.cpp @@ -17,21 +17,15 @@ bool asst::SupportList::select_role(const Role role) LogTraceFunction; if (m_in_support_unit_detail_panel) { - Log.error( - __FUNCTION__, - std::format( - "| Invalid operation: currently in support unit detail panel; failed to select role; reverting to {}", - enum_to_string(m_selected_role))); + LogError << __FUNCTION__ + << "| Invalid operation: currently in support unit detail panel; failed to select role; reverting to " + << enum_to_string(m_selected_role); return false; } if (std::ranges::find(SUPPORT_UNIT_ROLES, role) == SUPPORT_UNIT_ROLES.end()) { - Log.error( - __FUNCTION__, - std::format( - "| Unsupported role: {}; failed to select role; reverting to {}", - enum_to_string(role), - enum_to_string(m_selected_role))); + LogError << __FUNCTION__ << "| Unsupported role: " << enum_to_string(role) + << "; failed to select role; reverting to " << enum_to_string(m_selected_role); return false; } @@ -94,7 +88,7 @@ bool asst::SupportList::update() return false; } m_list = analyzer.get_result(); - report_support_list(); + print_support_list(); update_view(); @@ -106,11 +100,8 @@ bool asst::SupportList::select_support_unit(const size_t index) LogTraceFunction; if (index >= m_list.size()) { - Log.error( - __FUNCTION__, - "| Support unit No. {} does not exist in support list with size {}; failed to use support unit", - index + 1, - m_list.size()); + LogError << __FUNCTION__ << "| Support unit No." << index + 1 << "does not exist in support list with size" + << m_list.size() << "; failed to use support unit"; return false; } @@ -165,10 +156,9 @@ bool asst::SupportList::leave_support_unit_detail_panel() LogTraceFunction; if (!m_in_support_unit_detail_panel) { - Log.error( - __FUNCTION__, - "| Invalid operation: currently not in support unit detail panel; " - "failed to leave support unit detail panel"); + LogError << __FUNCTION__ + << "| Invalid operation: currently not in support unit detail panel; failed to leave support unit " + "detail panel"; return false; } @@ -186,15 +176,13 @@ bool asst::SupportList::select_skill(const int skill, const int minimum_skill_le LogTraceFunction; if (!m_in_support_unit_detail_panel) { - Log.error( - __FUNCTION__, - "| Invalid operation: currently not in support unit detail panel; failed to select skill" - "panel"); + LogError << __FUNCTION__ + << "| Invalid operation: currently not in support unit detail panel; failed to select skill panel"; return false; } if (skill < 1 || skill > 3) { - Log.error(__FUNCTION__, std::format("| Invalid skill: {}; failed to select skill", skill)); + LogError << __FUNCTION__ << "| Invalid skill:" << skill << "; failed to select skill"; return false; } @@ -209,7 +197,7 @@ bool asst::SupportList::select_skill(const int skill, const int minimum_skill_le skill_level_analyzer.set_roi(skill_level_roi); if (!skill_level_analyzer.analyze()) { - Log.info(__FUNCTION__, std::format("| Skill {} does not exist; failed to select skill", skill)); + LogInfo << __FUNCTION__ << "| Skill" << skill << "does not exist; failed to select skill"; return false; } @@ -221,13 +209,8 @@ bool asst::SupportList::select_skill(const int skill, const int minimum_skill_le const int skill_level = ret.value(); if (skill_level < minimum_skill_level) { - Log.info( - __FUNCTION__, - std::format( - "| The current support unit's skill level {} is below the minimum requirement {}; " - "failed to select skill", - skill_level, - minimum_skill_level)); + LogInfo << __FUNCTION__ << "| The current support unit's skill level" << skill_level + << "is below the minimum requirement" << minimum_skill_level << "; failed to select skill"; return false; } @@ -245,11 +228,11 @@ bool asst::SupportList::select_skill(const int skill, const int minimum_skill_le skill_selected_analyzer.set_roi(skill_selected_roi); if (!skill_selected_analyzer.analyze()) { - Log.error(__FUNCTION__, std::format("| Skill {} did not respond to the click; failed to select skill", skill)); + LogError << __FUNCTION__ << "| Skill" << skill << "did not respond to the click; failed to select skill"; return false; } - Log.info(__FUNCTION__, std::format("| Selected skill {} with level {}", skill, skill_level)); + LogInfo << __FUNCTION__ << "| Selected skill" << skill << "with level" << skill_level; return true; } @@ -258,15 +241,13 @@ bool asst::SupportList::select_module(const OperModule module, const int minimum LogTraceFunction; if (!m_in_support_unit_detail_panel) { - Log.error( - __FUNCTION__, - "| Invalid operation: currently not in support unit detail panel; failed to select skill" - "panel"); + LogError << __FUNCTION__ + << "| Invalid operation: currently not in support unit detail panel; failed to select skill panel"; return false; } if (std::ranges::find(SUPPORT_UNIT_MODULES, module) == SUPPORT_UNIT_MODULES.end()) { - Log.error(__FUNCTION__, std::format("| Invalid module: {}; failed to select module", enum_to_string(module))); + LogError << __FUNCTION__ << "| Invalid module:" << enum_to_string(module) << "; failed to select module"; return false; } @@ -277,20 +258,16 @@ bool asst::SupportList::select_module(const OperModule module, const int minimum if (module == OperModule::Original) { if (!ProcessTask(*this, { "SupportList-DetailPanel-SelectOriginalModule" }).run()) { - Log.info( - __FUNCTION__, - std::format("| Module {} does not exist; failed to select module", enum_to_string(module))); + LogInfo << __FUNCTION__ << "| Module" << enum_to_string(module) + << "does not exist; failed to select module"; return false; } if (!ProcessTask(*this, { "SupportList-DetailPanel-ModuleSelected" }).run()) { - Log.error( - __FUNCTION__, - std::format( - "| Module {} did not respond to the click; failed to select module", - enum_to_string(module))); + LogError << __FUNCTION__ << "| Module" << enum_to_string(module) + << "did not respond to the click; failed to select module"; return false; } - Log.info(__FUNCTION__, std::format("| Selected module {}", enum_to_string(module))); + LogInfo << __FUNCTION__ << "| Selected module" << enum_to_string(module); return true; } @@ -304,14 +281,9 @@ bool asst::SupportList::select_module(const OperModule module, const int minimum // Check Module Level // ———————————————————————————————————————————————————————————————— if (module_level < minimum_module_level) { - Log.info( - __FUNCTION__, - std::format( - "| The current support unit's module {} is at level {}, " - "which is below the minimum requirement {}; failed to select module", - enum_to_string(module), - module_level, - minimum_module_level)); + LogInfo << __FUNCTION__ << "| The current support unit's module" << enum_to_string(module) + << "is at level" << module_level << "which is below the minimum requirement" + << minimum_module_level << "; failed to select module"; return false; } @@ -328,17 +300,12 @@ bool asst::SupportList::select_module(const OperModule module, const int minimum module_selected_analyzer.set_roi(module_selected_roi); if (!module_selected_analyzer.analyze()) { - Log.error( - __FUNCTION__, - std::format( - "| Module {} did not respond to the click; failed to select module", - enum_to_string(module))); + LogError << __FUNCTION__ << "| Module" << enum_to_string(module) + << "did not respond to the click; failed to select module"; return false; } - Log.info( - __FUNCTION__, - std::format("| Selected module {} with level {}", enum_to_string(module), module_level)); + LogInfo << __FUNCTION__ << "| Selected module" << enum_to_string(module) << "with level" << module_level; return true; } @@ -347,7 +314,7 @@ bool asst::SupportList::select_module(const OperModule module, const int minimum } } - Log.info(__FUNCTION__, std::format("| Module {} does not exist; failed to select module", enum_to_string(module))); + LogInfo << __FUNCTION__ << "| Module" << enum_to_string(module) << "does not exist; failed to select module"; return false; } @@ -356,9 +323,8 @@ bool asst::SupportList::refresh_list() LogTraceFunction; if (m_in_support_unit_detail_panel) [[unlikely]] { - Log.error( - __FUNCTION__, - "| Invalid operation: currently in support unit detail panel; failed to refresh support list"); + LogError << __FUNCTION__ + << "| Invalid operation: currently in support unit detail panel; failed to refresh support list"; return false; } @@ -392,26 +358,15 @@ void asst::SupportList::reset_list_and_view_data() reset_view(); } -void asst::SupportList::report_support_list() +void asst::SupportList::print_support_list() const { static constexpr std::string_view FMT_STR = "{:^5} | {:^2} | {:^3} | {:^3} | {:^3} | {}"; - std::vector support_units; - Log.info("Support List"); Log.info(std::string(40, '-')); Log.info(std::format(FMT_STR, "Elite", "Lv", "Pot", "Mod", "Frd", "Name")); Log.info(std::string(40, '-')); for (const SupportUnit& support_unit : m_list) { - json::value option = json::object { - { "name", support_unit.name }, - { "elite", support_unit.elite }, - { "level", support_unit.level }, - { "potential", support_unit.potential }, - { "module_enabled", support_unit.module_enabled }, - { "friendship", static_cast(support_unit.friendship) }, - }; - support_units.emplace_back(std::move(option)); Log.info( std::format( FMT_STR, @@ -425,10 +380,6 @@ void asst::SupportList::report_support_list() support_unit.name)); } Log.info(std::string(40, '-')); - - json::value info = basic_info_with_what("SupportList"); - info["details"]["support_units"] = std::move(support_units); - callback(AsstMsg::SubTaskExtraInfo, info); } void asst::SupportList::update_view(const cv::Mat& image) @@ -452,7 +403,7 @@ void asst::SupportList::update_view(const cv::Mat& image) } } - Log.info(__FUNCTION__, std::format("| Current view is [{}, {}]", m_view_begin + 1, m_view_end)); + LogInfo << __FUNCTION__ << "| Current view is [" << m_view_begin + 1 << ", " << m_view_end << "]"; } void asst::SupportList::reset_view() @@ -468,13 +419,12 @@ void asst::SupportList::move_to_support_unit(const size_t index) // sanity check if (index >= m_list.size()) [[unlikely]] { - Log.error( - __FUNCTION__, - std::format("| Attempt to move to support unit {} out of {}", index + 1, m_list.size())); + LogError << __FUNCTION__ + << "| Attempt to move to support unit " << index + 1 << " out of " << m_list.size(); return; } - Log.info(__FUNCTION__, std::format("Moving to support unit {}: {}", index + 1, m_list[index].name)); + LogInfo << __FUNCTION__ << "| Moving to support unit " << index + 1 << ": " << m_list[index].name; cv::Mat image; while (!need_exit()) { @@ -491,7 +441,7 @@ void asst::SupportList::move_to_support_unit(const size_t index) continue; } if (m_support_unit_x_in_view[index] == UNDEFINED) [[unlikely]] { - Log.error(__FUNCTION__, "| rect for support unit {} in view is not updated", index + 1); + LogError << __FUNCTION__ << "| rect for support unit " << index + 1 << " in view is not updated"; save_img(image, "lastly used screenshot"); save_img(m_list[index].templ, "support unit template"); image = ctrler()->get_image(); @@ -566,14 +516,12 @@ std::vector asst::SupportList::analyze_module_pag }; const auto iter = STR_OPER_MODULE_MAP.find(module_str); if (iter == STR_OPER_MODULE_MAP.end()) { - Log.error( - __FUNCTION__, - std::format("The current module has an unknown letter {}; skipping to the next one", module_str)); + LogError << __FUNCTION__ + << "| The current module has an unknown letter " << module_str << "; skipping to the next one"; continue; } - module_items.emplace_back(ModuleItem { .rect = rect, .module = iter->second, .level = module_level }); - Log.info(__FUNCTION__, std::format("| Found module {} with level {}", module_str, module_level)); + LogInfo << __FUNCTION__ << "| Found module " << module_str << " with level " << module_level; } return module_items; diff --git a/src/MaaCore/Task/Miscellaneous/SupportList.h b/src/MaaCore/Task/Miscellaneous/SupportList.h index deb58694bb..df5a73403c 100644 --- a/src/MaaCore/Task/Miscellaneous/SupportList.h +++ b/src/MaaCore/Task/Miscellaneous/SupportList.h @@ -128,7 +128,7 @@ private: /// void reset_list_and_view_data(); - void report_support_list(); + void print_support_list() const; /// /// 使用 image 或主动截图，更新当前助战列表视图。