diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 0f998bb678..b44b300e57 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -689,14 +689,15 @@ cv::Mat asst::Controller::get_resized_image() const return resized_mat; } -std::optional asst::Controller::start_game(const std::string& server_type, bool block) +std::optional asst::Controller::start_game(const std::string& client_type, bool block) { - if (auto intent_name = Resrc.cfg().get_intent_name(server_type)) - { + if (client_type.empty()) { + return std::nullopt; + } + if (auto intent_name = Resrc.cfg().get_intent_name(client_type)) { std::string cur_cmd = utils::string_replace_all(m_adb.start, "[Intent]", intent_name.value()); int id = push_cmd(cur_cmd); - if (block) - { + if (block) { wait(id); } return id; diff --git a/src/MeoAssistant/Controller.h b/src/MeoAssistant/Controller.h index cc29c828aa..b6c399abfe 100644 --- a/src/MeoAssistant/Controller.h +++ b/src/MeoAssistant/Controller.h @@ -37,9 +37,10 @@ namespace asst cv::Mat get_image(bool raw = false); std::vector get_image_encode() const; - // 开启/置顶游戏、点击和滑动都是异步执行，返回该任务的id - std::optional start_game(const std::string& server_type = "", bool block = true); - + /* 开启游戏、点击和滑动都是异步执行，返回该任务的id */ + + std::optional start_game(const std::string& client_type, bool block = true); + int click(const Point& p, bool block = true); int click(const Rect& rect, bool block = true); int click_without_scale(const Point& p, bool block = true); diff --git a/src/MeoAssistant/GeneralConfiger.cpp b/src/MeoAssistant/GeneralConfiger.cpp index cd615473f3..2a25a2595b 100644 --- a/src/MeoAssistant/GeneralConfiger.cpp +++ b/src/MeoAssistant/GeneralConfiger.cpp @@ -28,12 +28,10 @@ bool asst::GeneralConfiger::parse(const json::value& json) m_options.aip_ocr.client_id = aip_ocr.get("clientId", std::string()); m_options.aip_ocr.client_secret = aip_ocr.get("clientSerect", std::string()); } - } - - for (const auto& [server_type, intent_name] : json.at("intent").as_object()) - { - m_intent_name[server_type]=intent_name.as_string(); + + for (const auto& [client_type, intent_name] : json.at("intent").as_object()) { + m_intent_name[client_type] = intent_name.as_string(); } for (const auto& [name, cfg_json] : json.at("connection").as_object()) { diff --git a/src/MeoAssistant/GeneralConfiger.h b/src/MeoAssistant/GeneralConfiger.h index 7a85215e70..6098334973 100644 --- a/src/MeoAssistant/GeneralConfiger.h +++ b/src/MeoAssistant/GeneralConfiger.h @@ -86,11 +86,10 @@ namespace asst } } - [[nodiscard]] std::optional get_intent_name(const std::string& server_type) const + [[nodiscard]] std::optional get_intent_name(const std::string& client_type) const { - if (auto iter = m_intent_name.find(server_type); - iter != m_intent_name.cend()) - { + if (auto iter = m_intent_name.find(client_type); + iter != m_intent_name.cend()) { return iter->second; } return std::nullopt; diff --git a/src/MeoAssistant/StartGameTask.cpp b/src/MeoAssistant/StartGameTask.cpp index a0c35f61ad..03134fe4be 100644 --- a/src/MeoAssistant/StartGameTask.cpp +++ b/src/MeoAssistant/StartGameTask.cpp @@ -1,4 +1,4 @@ -#include "StartGameTask.h" +#include "StartGameTask.h" #include "Controller.h" @@ -6,16 +6,15 @@ using namespace asst; bool StartGameTask::_run() { - if(m_ctrler->start_game(m_client_type)) - { - return true; + if (m_client_type.empty()) { + return false; } - return false; + return m_ctrler->start_game(m_client_type).has_value(); } StartGameTask& StartGameTask::set_param(std::string client_type) noexcept { - m_client_type = client_type; + m_client_type = std::move(client_type); return *this; } diff --git a/src/MeoAssistant/StartGameTask.h b/src/MeoAssistant/StartGameTask.h index d359adbfb3..cf685677df 100644 --- a/src/MeoAssistant/StartGameTask.h +++ b/src/MeoAssistant/StartGameTask.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "AbstractTask.h" #include "AsstTypes.h" @@ -11,7 +11,7 @@ namespace asst using AbstractTask::AbstractTask; ~StartGameTask() override = default; - StartGameTask& set_param(std::string server_type = "") noexcept; + StartGameTask& set_param(std::string client_type = "") noexcept; StartGameTask& set_enable(bool enable = false) noexcept override; protected: diff --git a/src/MeoAssistant/StartUpTask.cpp b/src/MeoAssistant/StartUpTask.cpp index f70cc92570..21095a0b11 100644 --- a/src/MeoAssistant/StartUpTask.cpp +++ b/src/MeoAssistant/StartUpTask.cpp @@ -4,12 +4,12 @@ asst::StartUpTask::StartUpTask(AsstCallback callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType), - m_start_game_task_ptr(std::make_shared(m_callback, m_callback_arg, TaskType)), - m_start_up_task_ptr(std::make_shared(m_callback, m_callback_arg, TaskType)) + m_start_game_task_ptr(std::make_shared(m_callback, m_callback_arg, TaskType)), + m_start_up_task_ptr(std::make_shared(m_callback, m_callback_arg, TaskType)) { - m_start_up_task_ptr->set_tasks({"StartUp"}) - .set_times_limit("ReturnToTerminal", 0) - .set_times_limit("Terminal", 0); + m_start_up_task_ptr->set_tasks({ "StartUp" }) + .set_times_limit("ReturnToTerminal", 0) + .set_times_limit("Terminal", 0); m_subtasks.emplace_back(m_start_game_task_ptr); m_subtasks.emplace_back(m_start_up_task_ptr); } @@ -17,6 +17,6 @@ asst::StartUpTask::StartUpTask(AsstCallback callback, void* callback_arg) bool asst::StartUpTask::set_params(const json::value& params) { m_start_game_task_ptr->set_param(params.get("client_type", "")) - .set_enable(params.get("start_game_enable",false)); + .set_enable(params.get("start_game_enable", false)); return true; } diff --git a/src/MeoAsstGui/Helper/AsstProxy.cs b/src/MeoAsstGui/Helper/AsstProxy.cs index 900ac57bbd..27a7f5f2e1 100644 --- a/src/MeoAsstGui/Helper/AsstProxy.cs +++ b/src/MeoAsstGui/Helper/AsstProxy.cs @@ -257,7 +257,7 @@ namespace MeoAsstGui case "StartGameTask": mainModel.AddLog("打开客户端失败，请\n检查配置文件", "darkred"); break; - + case "AutoRecruitTask": mainModel.AddLog("公招识别错误，已返回", "darkred"); break; @@ -449,7 +449,7 @@ namespace MeoAsstGui } } break; - + case "RecruitRobotTag": { string special = subTaskDetails["tag"].ToString(); @@ -691,10 +691,10 @@ namespace MeoAsstGui return AsstAppendTaskWithEncoding("Award"); } - public bool AsstAppendStartUp(string server_type, bool enable) + public bool AsstAppendStartUp(string client_type, bool enable) { var task_params = new JObject(); - task_params["client_type"] = server_type; + task_params["client_type"] = client_type; task_params["start_game_enable"] = enable; return AsstAppendTaskWithEncoding("StartUp", task_params); } @@ -796,4 +796,4 @@ namespace MeoAsstGui SubTaskCompleted, // 原子任务完成 SubTaskExtraInfo // 原子任务额外信息 }; -} +} \ No newline at end of file