diff --git a/src/MaaCore/Controller/AdbController.cpp b/src/MaaCore/Controller/AdbController.cpp index e54f0ee369..7fd0096118 100644 --- a/src/MaaCore/Controller/AdbController.cpp +++ b/src/MaaCore/Controller/AdbController.cpp @@ -1026,7 +1026,13 @@ bool asst::AdbController::connect(const std::string& adb_path, const std::string // 按需获取display ID 信息 if (!adb_cfg.display_id.empty()) { - auto display_id_ret = call_command(m_conn_ctx.replace_cmd(adb_cfg.display_id)); + // [PackageName] 不参与 replace_cmd 的统一替换(保留为运行时参数), + // 此处 displayId 查询是 connect 阶段唯一需要它的场景,就地显式替换。 + auto display_id_cmd = utils::string_replace_all( + m_conn_ctx.replace_cmd(adb_cfg.display_id), + "[PackageName]", + m_conn_ctx.package_name); + auto display_id_ret = call_command(display_id_cmd); if (!display_id_ret) { return false; } diff --git a/src/MaaCore/Controller/AdbController.h b/src/MaaCore/Controller/AdbController.h index 961f104b2a..f6f515f0db 100644 --- a/src/MaaCore/Controller/AdbController.h +++ b/src/MaaCore/Controller/AdbController.h @@ -57,7 +57,6 @@ struct AdbConnectionContext { "[EventId]", event_id }, { "[NcPort]", std::to_string(nc_port) }, { "[NcAddress]", nc_address }, - { "[PackageName]", package_name }, }); } };