From 04c1d90a515234038695f997df6b7394ded77fc4 Mon Sep 17 00:00:00 2001 From: MistEO Date: Sun, 17 Oct 2021 04:15:22 +0800 Subject: [PATCH] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E6=99=BA=E8=83=BD=E6=8C=87=E9=92=88=E7=9A=84=E4=B8=8D=E5=BD=93?= =?UTF-8?q?=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistance/AbstractTask.cpp | 3 +-- src/MeoAssistance/Assistance.cpp | 2 +- src/MeoAssistance/CreditShopImageAnalyzer.cpp | 6 +++--- src/MeoAssistance/CreditShoppingTask.cpp | 2 +- src/MeoAssistance/RecruitImageAnalyzer.cpp | 4 ++-- src/MeoAssistance/TaskData.cpp | 4 ++-- src/MeoAssistance/TaskData.h | 4 ++-- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/MeoAssistance/AbstractTask.cpp b/src/MeoAssistance/AbstractTask.cpp index 337b49f3be..aaf308a811 100644 --- a/src/MeoAssistance/AbstractTask.cpp +++ b/src/MeoAssistance/AbstractTask.cpp @@ -78,8 +78,7 @@ bool asst::AbstractTask::click_return_button() static Rect ReturnButtonRect; if (ReturnButtonRect.empty()) { - const static auto return_task_ptr = std::dynamic_pointer_cast( - resource.task().task_ptr("Return")); + const auto return_task_ptr = resource.task().task_ptr("Return"); ReturnButtonRect = return_task_ptr->specific_rect; } return ctrler.click(ReturnButtonRect); diff --git a/src/MeoAssistance/Assistance.cpp b/src/MeoAssistance/Assistance.cpp index 0df7f2c077..351bfcaad4 100644 --- a/src/MeoAssistance/Assistance.cpp +++ b/src/MeoAssistance/Assistance.cpp @@ -423,7 +423,7 @@ void Assistance::working_proc() //controller.set_idle(false); auto start_time = std::chrono::system_clock::now(); - std::shared_ptr task_ptr = m_tasks_deque.front(); + auto task_ptr = m_tasks_deque.front(); // 先pop出来，如果执行失败再还原回去 m_tasks_deque.pop_front(); diff --git a/src/MeoAssistance/CreditShopImageAnalyzer.cpp b/src/MeoAssistance/CreditShopImageAnalyzer.cpp index b99306d1aa..70684cf0c1 100644 --- a/src/MeoAssistance/CreditShopImageAnalyzer.cpp +++ b/src/MeoAssistance/CreditShopImageAnalyzer.cpp @@ -20,7 +20,7 @@ bool asst::CreditShopImageAnalyzer::analyze() bool asst::CreditShopImageAnalyzer::commoditys_analyze() { - const static auto commodity_task_ptr = std::dynamic_pointer_cast( + const auto commodity_task_ptr = std::dynamic_pointer_cast( resource.task().task_ptr("CreditShop-Commoditys")); // 识别信用点的图标 @@ -54,7 +54,7 @@ bool asst::CreditShopImageAnalyzer::commoditys_analyze() bool asst::CreditShopImageAnalyzer::whether_to_buy_analyze() { - const static auto not_to_buy_task_ptr = std::dynamic_pointer_cast( + const auto not_to_buy_task_ptr = std::dynamic_pointer_cast( resource.task().task_ptr("CreditShop-NotToBuy")); for (const Rect& commodity : m_commoditys) { @@ -81,7 +81,7 @@ bool asst::CreditShopImageAnalyzer::whether_to_buy_analyze() bool asst::CreditShopImageAnalyzer::sold_out_analyze() { - const static auto sold_out_task_ptr = std::dynamic_pointer_cast( + const auto sold_out_task_ptr = std::dynamic_pointer_cast( resource.task().task_ptr("CreditShop-SoldOut")); // 识别是否售罄 diff --git a/src/MeoAssistance/CreditShoppingTask.cpp b/src/MeoAssistance/CreditShoppingTask.cpp index 1e60bd91eb..07f50b6c36 100644 --- a/src/MeoAssistance/CreditShoppingTask.cpp +++ b/src/MeoAssistance/CreditShoppingTask.cpp @@ -62,7 +62,7 @@ bool asst::CreditShoppingTask::run() // 识别是否信用不足无法购买 const cv::Mat& prompt_image = ctrler.get_image(); - const static auto no_money_task_ptr = std::dynamic_pointer_cast( + const auto no_money_task_ptr = std::dynamic_pointer_cast( resource.task().task_ptr("CreditShop-NoMoney")); OcrImageAnalyzer prompt_analyzer(prompt_image, no_money_task_ptr->roi); prompt_analyzer.set_required(no_money_task_ptr->text); diff --git a/src/MeoAssistance/RecruitImageAnalyzer.cpp b/src/MeoAssistance/RecruitImageAnalyzer.cpp index 1938508212..04d41c58c5 100644 --- a/src/MeoAssistance/RecruitImageAnalyzer.cpp +++ b/src/MeoAssistance/RecruitImageAnalyzer.cpp @@ -17,7 +17,7 @@ bool asst::RecruitImageAnalyzer::analyze() bool asst::RecruitImageAnalyzer::tags_analyze() { - const static auto tags_task_ptr = std::dynamic_pointer_cast( + const auto tags_task_ptr = std::dynamic_pointer_cast( resource.task().task_ptr("RecruitTags")); static bool analyzer_inited = false; @@ -46,7 +46,7 @@ bool asst::RecruitImageAnalyzer::tags_analyze() bool asst::RecruitImageAnalyzer::time_analyze() { - const static auto time_task_ptr = std::dynamic_pointer_cast( + const auto time_task_ptr = std::dynamic_pointer_cast( resource.task().task_ptr("RecruitTime")); MatchImageAnalyzer time_analyzer( diff --git a/src/MeoAssistance/TaskData.cpp b/src/MeoAssistance/TaskData.cpp index 1b0363d5ae..35a0d297ab 100644 --- a/src/MeoAssistance/TaskData.cpp +++ b/src/MeoAssistance/TaskData.cpp @@ -53,7 +53,7 @@ bool asst::TaskData::set_param(const std::string& type, const std::string& param return true; } -const std::shared_ptr& asst::TaskData::task_ptr(const std::string& name) const noexcept +const std::shared_ptr asst::TaskData::task_ptr(const std::string& name) const noexcept { if (auto iter = m_all_tasks_info.find(name); iter != m_all_tasks_info.cend()) @@ -70,7 +70,7 @@ const std::unordered_set& asst::TaskData::get_templ_required() cons return m_templ_required; } -std::shared_ptr& asst::TaskData::task_ptr(std::string name) +std::shared_ptr asst::TaskData::task_ptr(std::string name) { return m_all_tasks_info[std::move(name)]; } diff --git a/src/MeoAssistance/TaskData.h b/src/MeoAssistance/TaskData.h index 74c73fae40..29d93eadf0 100644 --- a/src/MeoAssistance/TaskData.h +++ b/src/MeoAssistance/TaskData.h @@ -16,9 +16,9 @@ namespace asst { bool set_param(const std::string& type, const std::string& param, const std::string& value); - const std::shared_ptr& task_ptr(const std::string& name) const noexcept; + const std::shared_ptr task_ptr(const std::string& name) const noexcept; const std::unordered_set& get_templ_required() const noexcept; - std::shared_ptr& task_ptr(std::string name); + std::shared_ptr task_ptr(std::string name); void clear_exec_times(); protected: