diff --git a/src/MeoAssistant/AsstCaller.cpp b/src/MeoAssistant/AsstCaller.cpp index 7d58ef6ac9..3a439f2138 100644 --- a/src/MeoAssistant/AsstCaller.cpp +++ b/src/MeoAssistant/AsstCaller.cpp @@ -51,7 +51,8 @@ bool AsstLoadResource(const char* path) if (auto& user_dir = asst::UserDir::get_instance(); user_dir.empty()) { user_dir.set(path); } - inited = asst::ResourceLoader::get_instance().load(asst::utils::path(path) / asst::utils::path("resource")); + using namespace asst::utils::path_literals; + inited = asst::ResourceLoader::get_instance().load(asst::utils::path(path) / "resource"_p); return inited; } diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 21967ef850..5fd225a0af 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -1406,7 +1406,8 @@ bool asst::Controller::connect(const std::string& adb_path, const std::string& a return utils::string_replace_all( cmd_replace(cfg_cmd), { - { "[minitouchLocalPath]", (m_resource_path / "minitouch"_p / optimal_abi / "minitouch"_p).u8string() }, + { "[minitouchLocalPath]", + utils::path_to_utf8_string(m_resource_path / "minitouch"_p / optimal_abi / "minitouch"_p) }, { "[minitouchWorkingFile]", m_uuid }, }); }; diff --git a/src/MeoAssistant/ResourceLoader.cpp b/src/MeoAssistant/ResourceLoader.cpp index d6d0eee27f..5dceeb79bd 100644 --- a/src/MeoAssistant/ResourceLoader.cpp +++ b/src/MeoAssistant/ResourceLoader.cpp @@ -22,8 +22,6 @@ bool asst::ResourceLoader::load(const std::filesystem::path& path) { - using namespace asst::utils::path_literals; - #define LoadResourceAndCheckRet(Configer, Filename) \ { \ LogTraceScope(std::string("LoadResourceAndCheckRet ") + #Configer); \ @@ -48,6 +46,7 @@ bool asst::ResourceLoader::load(const std::filesystem::path& path) } LogTraceFunction; + using namespace asst::utils::path_literals; /* load resource with json files*/ LoadResourceAndCheckRet(GeneralConfiger, "config.json"_p);