fix: register And/Or sub-recognition results in runtime cache (#1281)

Author: MistEO

source/MaaFramework/Task/Component/Recognizer.cpp

@@ -394,6 +394,8 @@ RecoResult Recognizer::and_(const std::shared_ptr<MAA_RES_NS::Recognition::AndPa
             res = sub_recognizer.recognize(inline_sub.type, inline_sub.param, inline_sub.sub_name);
         }
 
+        register_sub_result_in_cache(res);
+
         all_hit &= res.box.has_value();
         sub_results.emplace_back(std::move(res));
 
@@ -477,6 +479,7 @@ RecoResult Recognizer::or_(const std::shared_ptr<MAA_RES_NS::Recognition::OrPara
         }
 
         has_hit = res.box.has_value();
+        register_sub_result_in_cache(res);
         sub_results.emplace_back(std::move(res));
 
         if (has_hit) {
@@ -611,6 +614,20 @@ void Recognizer::save_draws(const std::string& node_name, const RecoResult& resu
     MAA_VISION_NS::VisionBase::save_draws(name, result.draws);
 }
 
+void Recognizer::register_sub_result_in_cache(const RecoResult& res)
+{
+    if (!res.box.has_value() || res.name.empty()) {
+        return;
+    }
+
+    auto& cache = tasker_->runtime_cache();
+    auto sub_node_id = TaskBase::generate_node_id();
+    cache.set_node_detail(
+        sub_node_id,
+        NodeDetail { .node_id = sub_node_id, .name = res.name, .reco_id = res.reco_id, .completed = true });
+    cache.set_latest_node(res.name, sub_node_id);
+}
+
 bool Recognizer::debug_mode() const
 {
     return MAA_GLOBAL_NS::OptionMgr::get_instance().debug_mode();

source/MaaFramework/Task/Component/Recognizer.h

@@ -47,6 +47,7 @@ class Recognizer
     std::vector<cv::Rect> get_rois(const MAA_VISION_NS::Target& roi, bool use_best = false);
     std::vector<cv::Rect> get_rois_from_pretask(const std::string& name, bool use_best);
     void save_draws(const std::string& node_name, const RecoResult& result) const;
+    void register_sub_result_in_cache(const RecoResult& res);
 
 private:
     bool debug_mode() const;

source/MaaFramework/Task/TaskBase.h

@@ -34,6 +34,7 @@ class TaskBase : public NonCopyable
     Tasker* tasker() const;
     MaaTaskId task_id() const;
     const std::string& entry() const;
+    static MaaNodeId generate_node_id();
 
 protected:
     MAA_RES_NS::ResourceMgr* resource();
@@ -46,7 +47,6 @@ class TaskBase : public NonCopyable
         std::shared_ptr<MAA_VISION_NS::OCRCache> ocr_cache = nullptr);
     ActionResult run_action(const RecoResult& reco, const PipelineData& data);
     cv::Mat screencap();
-    MaaNodeId generate_node_id();
     void set_node_detail(MaaNodeId node_id, NodeDetail detail);
     void set_task_detail(TaskDetail detail);