From 46ee9727f4e2fb9f3012f704409461973a8a35d1 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Tue, 4 Jan 2022 22:14:55 +0800
Subject: [PATCH] =?UTF-8?q?fix.=E9=87=8D=E6=9E=84=E5=B9=B6=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=87=AA=E5=8A=A8=E5=85=AC=E6=8B=9B=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MeoAssistant/AutoRecruitTask.cpp | 111 ++++++++++++++++-----------
 src/MeoAssistant/AutoRecruitTask.h   |   8 ++
 2 files changed, 73 insertions(+), 46 deletions(-)

diff --git a/src/MeoAssistant/AutoRecruitTask.cpp b/src/MeoAssistant/AutoRecruitTask.cpp
index fd200a172e..2541ed1071 100644
--- a/src/MeoAssistant/AutoRecruitTask.cpp
+++ b/src/MeoAssistant/AutoRecruitTask.cpp
@@ -40,54 +40,65 @@ bool asst::AutoRecruitTask::_run()
     };
     m_callback(AsstMsg::TaskStart, task_start_json, m_callback_arg);
 
-    int delay = Resrc.cfg().get_options().task_delay;
+    if (!check_recruit_home_page()) {
+        return false;
+    }
 
-    OcrImageAnalyzer start_analyzer;
-    const auto start_task_ptr = std::dynamic_pointer_cast<OcrTaskInfo>(Task.get("StartRecruit"));
-    start_analyzer.set_task_info(*start_task_ptr);
-    std::vector<TextRect> start_res;
+    analyze_start_buttons();
 
-    auto analyze_start = [&]() -> bool {
-        auto image = Ctrler.get_image();
-        start_analyzer.set_image(image);
-        if (!start_analyzer.analyze()) {
-            return false;
-        }
-        start_analyzer.sort_result();
-        start_res = start_analyzer.get_result();
-        return true;
-    };
-
-    for (; m_cur_times < m_max_times; ++m_cur_times) {
-        analyze_start();
-        if (m_cur_times >= start_res.size()) {
-            if (m_use_expedited) {
-                recruit_now();
-                analyze_start();
-            }
-            else {
-                break;
-            }
-        }
-        if (start_res.empty()) {
-            if (check_recruit_home_page()) {
-                return true;
-            }
-            else {
-                return false;
-            }
-        }
-        Rect start_rect = start_res.at(0).rect;
-        Ctrler.click(start_rect);
-        sleep(delay);
-
-        if (!calc_and_recruit()) {
+    // 不使用加急许可的正常公招
+    for (; m_cur_times < m_max_times && m_cur_times < m_start_buttons.size(); ++m_cur_times) {
+        if (!recruit_index(m_cur_times)) {
             return false;
         }
     }
+    if (!m_use_expedited) {
+        return true;
+    }
+    // 使用加急许可
+    for (; m_cur_times < m_max_times; ++m_cur_times) {
+        if (!recruit_now()) {
+            return true;
+        }
+        analyze_start_buttons();
+        if (!recruit_index(0)) {
+            return false;
+        }
+    }
+
     return true;
 }
 
+bool asst::AutoRecruitTask::analyze_start_buttons()
+{
+    OcrImageAnalyzer start_analyzer;
+    const auto start_task_ptr = std::dynamic_pointer_cast<OcrTaskInfo>(Task.get("StartRecruit"));
+    start_analyzer.set_task_info(*start_task_ptr);
+
+    auto image = Ctrler.get_image();
+    start_analyzer.set_image(image);
+    if (!start_analyzer.analyze()) {
+        return false;
+    }
+    start_analyzer.sort_result();
+    m_start_buttons = start_analyzer.get_result();
+    return true;
+}
+
+bool asst::AutoRecruitTask::recruit_index(size_t index)
+{
+    int delay = Resrc.cfg().get_options().task_delay;
+
+    if (m_start_buttons.size() <= index) {
+        return false;
+    }
+    Rect button = m_start_buttons.at(index).rect;
+    Ctrler.click(button);
+    sleep(delay);
+
+    return calc_and_recruit();
+}
+
 bool asst::AutoRecruitTask::calc_and_recruit()
 {
     RecruitTask recurit_task(m_callback, m_callback_arg);
@@ -108,16 +119,12 @@ bool asst::AutoRecruitTask::calc_and_recruit()
     if (m_need_refresh && maybe_level == 3
         && !recurit_task.get_has_special_tag()
         && recurit_task.get_has_refresh()) {
-        ProcessTask refresh_task(*this, { "RecruitRefresh" });
-        if (refresh_task.run()) {
+        if (refresh()) {
             return calc_and_recruit();
         }
     }
     if (std::find(m_confirm_level.cbegin(), m_confirm_level.cend(), maybe_level) != m_confirm_level.cend()) {
-        ProcessTask confirm_task(*this, { "RecruitConfirm" });
-        if (!confirm_task.run()) {
-            return false;
-        }
+        confirm();
     }
     else {
         click_return_button();
@@ -136,3 +143,15 @@ bool asst::AutoRecruitTask::recruit_now()
     ProcessTask task(*this, { "RecruitNow" });
     return task.run();
 }
+
+bool asst::AutoRecruitTask::confirm()
+{
+    ProcessTask confirm_task(*this, { "RecruitConfirm" });
+    return confirm_task.run();
+}
+
+bool asst::AutoRecruitTask::refresh()
+{
+    ProcessTask refresh_task(*this, { "RecruitRefresh" });
+    return refresh_task.run();
+}
diff --git a/src/MeoAssistant/AutoRecruitTask.h b/src/MeoAssistant/AutoRecruitTask.h
index e36470065f..26f5dc9952 100644
--- a/src/MeoAssistant/AutoRecruitTask.h
+++ b/src/MeoAssistant/AutoRecruitTask.h
@@ -1,6 +1,8 @@
 #pragma once
 #include "AbstractTask.h"
 
+#include "AsstDef.h"
+
 namespace asst
 {
     class AutoRecruitTask final : public AbstractTask
@@ -18,15 +20,21 @@ namespace asst
     protected:
         virtual bool _run() override;
 
+        bool analyze_start_buttons();
+        bool recruit_index(size_t index);
         bool calc_and_recruit();
         bool check_recruit_home_page();
         bool recruit_now();
+        bool confirm();
+        bool refresh();
 
         std::vector<int> m_select_level;
         std::vector<int> m_confirm_level;
         bool m_need_refresh = false;
         bool m_use_expedited = false;
         int m_max_times = 0;
+
+        std::vector<TextRect> m_start_buttons;
         int m_cur_times = 0;
     };
 }