fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 09:50:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor.删除实例化的TaskData

Browse Source
This commit is contained in:
MistEO
2022-03-09 23:40:28 +08:00
parent 50ccafdf44
commit e3b2401ca6
39 changed files with 144 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/MeoAssistant/TaskData.cpp
View File

@@ -9,7 +9,7 @@
#include "TemplResource.h"
#include "Logger.hpp"
const std::shared_ptr<asst::TaskInfo> asst::StaticTaskData::get(const std::string& name) const noexcept
const std::shared_ptr<asst::TaskInfo> asst::TaskData::get(const std::string& name) const noexcept
{
if (auto iter = m_all_tasks_info.find(name);
iter != m_all_tasks_info.cend()) {
@@ -20,17 +20,17 @@ const std::shared_ptr<asst::TaskInfo> asst::StaticTaskData::get(const std::strin
}
}
const std::unordered_set<std::string>& asst::StaticTaskData::get_templ_required() const noexcept
const std::unordered_set<std::string>& asst::TaskData::get_templ_required() const noexcept
{
return m_templ_required;
}
std::shared_ptr<asst::TaskInfo> asst::StaticTaskData::get(const std::string& name)
std::shared_ptr<asst::TaskInfo> asst::TaskData::get(const std::string& name)
{
return m_all_tasks_info[name];
}
bool asst::StaticTaskData::parse(const json::value& json)
bool asst::TaskData::parse(const json::value& json)
{
LogTraceFunction;
@@ -214,47 +214,3 @@ bool asst::StaticTaskData::parse(const json::value& json)
#endif
return true;
}
const std::shared_ptr<asst::TaskInfo> asst::TaskData::get(const std::string& name) const noexcept
{
if (auto iter = m_specal_tasks_info.find(name);
iter != m_specal_tasks_info.cend()) {
return iter->second;
}
else {
return StaticTaskData::get_instance().get(name);
}
}
std::shared_ptr<asst::TaskInfo> asst::TaskData::get(const std::string& name)
{
if (auto iter = m_specal_tasks_info.find(name);
iter != m_specal_tasks_info.cend()) {
return iter->second;
}
else {
return StaticTaskData::get_instance().get(name);
}
}
bool asst::TaskData::set_ocr_text(const std::string& key, std::vector<std::string> text)
{
if (auto iter = m_specal_tasks_info.find(key);
iter != m_specal_tasks_info.end()) {
std::dynamic_pointer_cast<OcrTaskInfo>(iter->second)->text = std::move(text);
return true;
}
else {
auto raw_task_ptr = StaticTaskData::get_instance().get(key);
if (!raw_task_ptr) {
Log.error("Task", key, "Not Exists");
return false;
}
// 拷贝一份
OcrTaskInfo info = *std::dynamic_pointer_cast<OcrTaskInfo>(raw_task_ptr);
info.text = std::move(text);
auto specail_ptr = std::make_shared<OcrTaskInfo>(std::move(info));
m_specal_tasks_info.emplace(key, specail_ptr);
return true;
}
}