From 5c0b2e41ee49c8cf2f6ca4374c979a753f16eaa4 Mon Sep 17 00:00:00 2001 From: MistEO Date: Tue, 23 Nov 2021 23:14:59 +0800 Subject: [PATCH] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E4=BF=A1=E7=94=A8?= =?UTF-8?q?=E5=95=86=E5=BA=97=E6=B2=A1=E6=9C=89=E8=A6=81=E4=B9=B0=E7=9A=84?= =?UTF-8?q?=E4=B8=9C=E8=A5=BF=E7=9A=84=E6=97=B6=E5=80=99=E4=BC=9A=E5=8D=A1?= =?UTF-8?q?=E4=BD=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistance/Assistance.cpp | 3 ++- src/MeoAssistance/CreditShoppingTask.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/MeoAssistance/Assistance.cpp b/src/MeoAssistance/Assistance.cpp index ab850e0d88..4832535f92 100644 --- a/src/MeoAssistance/Assistance.cpp +++ b/src/MeoAssistance/Assistance.cpp @@ -163,6 +163,7 @@ bool asst::Assistance::append_visit(bool with_shopping, bool only_append) if (with_shopping) { auto shopping_task_ptr = std::make_shared(task_callback, (void*)this); + shopping_task_ptr->set_retry_times(5); shopping_task_ptr->set_task_chain("CreditShopping"); m_tasks_deque.emplace_back(shopping_task_ptr); } @@ -391,7 +392,7 @@ void Assistance::working_proc() bool ret = task_ptr->run(); if (ret) { retry_times = 0; - if (m_tasks_deque.empty() + if (m_tasks_deque.empty() || task_ptr->get_task_chain() != m_tasks_deque.front()->get_task_chain()) { json::value task_all_completed_json; task_all_completed_json["task_chain"] = task_ptr->get_task_chain(); diff --git a/src/MeoAssistance/CreditShoppingTask.cpp b/src/MeoAssistance/CreditShoppingTask.cpp index d490adfab2..db1affd539 100644 --- a/src/MeoAssistance/CreditShoppingTask.cpp +++ b/src/MeoAssistance/CreditShoppingTask.cpp @@ -23,7 +23,7 @@ bool asst::CreditShoppingTask::run() CreditShopImageAnalyzer shop_analyzer(image); if (!shop_analyzer.analyze()) { - return false; + return true; } const auto& shopping_list = shop_analyzer.get_result();