From 1cc4123fbc7bd89689a60b03b48e4b280317e237 Mon Sep 17 00:00:00 2001 From: MistEO Date: Sun, 21 Nov 2021 00:14:25 +0800 Subject: [PATCH] =?UTF-8?q?feat.=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=9F=BA=E5=BB=BA=E5=AE=B9=E9=94=99=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 1 + resource/template/InfrastOverview.png | Bin 7472 -> 9041 bytes src/MeoAssistance/AbstractTask.h | 4 ++-- src/MeoAssistance/Assistance.cpp | 2 +- src/MeoAssistance/InfrastAbstractTask.cpp | 13 ++++++++++++- src/MeoAssistance/InfrastAbstractTask.h | 1 + src/MeoAssistance/InfrastMfgTask.cpp | 4 +++- src/MeoAssistance/InfrastProductionTask.cpp | 8 ++++++-- src/MeoAssistance/InfrastTradeTask.cpp | 4 +++- 9 files changed, 29 insertions(+), 8 deletions(-) diff --git a/resource/tasks.json b/resource/tasks.json index a80c17e8a2..d1cd5e70b5 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -668,6 +668,7 @@ "InfrastEnteredFlag": { "template": "InfrastOverview.png", "templThreshold": 0.8, + "histThreshold": 0.8, "action": "doNothing", "next": [ "InfrastNotification", diff --git a/resource/template/InfrastOverview.png b/resource/template/InfrastOverview.png index 692f4901e9c1162c412270adbbbad892caa39605..999f362edd0c25a8aca66834467a0a4c29844e08 100644 GIT binary patch literal 9041 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 literal 7472 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 + task_ptr->on_run_fails(); } } diff --git a/src/MeoAssistance/InfrastAbstractTask.cpp b/src/MeoAssistance/InfrastAbstractTask.cpp index f46918411b..27bbd8f0e3 100644 --- a/src/MeoAssistance/InfrastAbstractTask.cpp +++ b/src/MeoAssistance/InfrastAbstractTask.cpp @@ -27,6 +27,17 @@ void asst::InfrastAbstractTask::set_work_mode(infrast::WorkMode work_mode) noexc } } +void asst::InfrastAbstractTask::on_run_fails() +{ + LogTraceFunction; + + json::value next_json; + next_json["task_chain"] = m_task_chain; + next_json["retry_times"] = m_retry_times; + next_json["tasks"] = json::array({ "InfrastBegin" }); + m_callback(AsstMsg::AppendProcessTask, next_json, m_callback_arg); +} + bool asst::InfrastAbstractTask::enter_facility(const std::string& facility, int index) { LogTraceFunction; @@ -214,4 +225,4 @@ void asst::InfrastAbstractTask::swipe_to_the_right_of_main_ui() static int extra_delay = resource.task().task_ptr("InfrastOperListSwipeToTheLeftBegin")->rear_delay; ctrler.swipe(begin_rect, end_rect, duration, true, extra_delay, false); -} \ No newline at end of file +} diff --git a/src/MeoAssistance/InfrastAbstractTask.h b/src/MeoAssistance/InfrastAbstractTask.h index 4def3053ff..6cb4e76755 100644 --- a/src/MeoAssistance/InfrastAbstractTask.h +++ b/src/MeoAssistance/InfrastAbstractTask.h @@ -11,6 +11,7 @@ namespace asst using AbstractTask::AbstractTask; virtual ~InfrastAbstractTask() = default; virtual void set_work_mode(infrast::WorkMode work_mode) noexcept; + virtual void on_run_fails() override; protected: virtual bool enter_facility(const std::string& facility, int index = 0); diff --git a/src/MeoAssistance/InfrastMfgTask.cpp b/src/MeoAssistance/InfrastMfgTask.cpp index c2b292fc54..2b6d29d642 100644 --- a/src/MeoAssistance/InfrastMfgTask.cpp +++ b/src/MeoAssistance/InfrastMfgTask.cpp @@ -21,7 +21,9 @@ bool asst::InfrastMfgTask::run() enter_facility(FacilityName, 0); click_bottomleft_tab(); - shift_facility_list(); + if (!shift_facility_list()) { + return false; + } return true; } diff --git a/src/MeoAssistance/InfrastProductionTask.cpp b/src/MeoAssistance/InfrastProductionTask.cpp index ab64d76909..dab16b45e2 100644 --- a/src/MeoAssistance/InfrastProductionTask.cpp +++ b/src/MeoAssistance/InfrastProductionTask.cpp @@ -27,7 +27,9 @@ bool asst::InfrastProductionTask::run() m_all_available_opers.clear(); - shift_facility_list(); + if (!shift_facility_list()) { + return false; + } return true; } @@ -49,7 +51,9 @@ asst::InfrastProductionTask::InfrastProductionTask(AsstCallback callback, void* bool asst::InfrastProductionTask::shift_facility_list() { LogTraceFunction; - facility_list_detect(); + if (!facility_list_detect()) { + return false; + } if (need_exit()) { return false; } diff --git a/src/MeoAssistance/InfrastTradeTask.cpp b/src/MeoAssistance/InfrastTradeTask.cpp index 11c0d043a3..c68e473697 100644 --- a/src/MeoAssistance/InfrastTradeTask.cpp +++ b/src/MeoAssistance/InfrastTradeTask.cpp @@ -17,7 +17,9 @@ bool asst::InfrastTradeTask::run() enter_facility(FacilityName, 0); click_bottomleft_tab(); - shift_facility_list(); + if (!shift_facility_list()) { + return false; + } return true; }