From 35eb427a83722ec288d267101bc37bfa672bb57f Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Fri, 18 Nov 2022 20:01:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=86=8D=E6=AC=A1=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MeoAssistant/AsstCaller.cpp     | 3 ++-
 src/MeoAssistant/Controller.cpp     | 3 ++-
 src/MeoAssistant/ResourceLoader.cpp | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

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);