fix: 修复python接口编码问题

MaaXYZ · May 9, 2024 · bc59f72 · bc59f72
1 parent e5621f7
commit bc59f72
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/sample/python/exec_agent/my_action.py b/sample/python/exec_agent/my_action.py
@@ -10,7 +10,7 @@
     "x": 200,
     "y": 100,
 }
-print(json.dumps(output))
+print(json.dumps(output, ensure_ascii=False))
 
 res = input()
 print("maafw return:", res)
diff --git a/source/binding/Python/maa/context.py b/source/binding/Python/maa/context.py
@@ -32,7 +32,7 @@ def run_task(self, task_name: str, task_param: Dict = {}) -> bool:
             Library.framework.MaaSyncContextRunTask(
                 self._handle,
                 task_name.encode("utf-8"),
-                json.dumps(task_param).encode("utf-8"),
+                json.dumps(task_param, ensure_ascii=False).encode("utf-8"),
             )
         )
 
@@ -62,7 +62,7 @@ def run_recognition(
             self._handle,
             image_buffer.c_handle,
             task_name.encode("utf-8"),
-            json.dumps(task_param).encode("utf-8"),
+            json.dumps(task_param, ensure_ascii=False).encode("utf-8"),
             rect_buffer.c_handle,
             detail_buffer.c_handle,
         )
@@ -94,7 +94,7 @@ def run_action(
             Library.framework.MaaSyncContextRunAction(
                 self._handle,
                 task_name.encode("utf-8"),
-                json.dumps(task_param).encode("utf-8"),
+                json.dumps(task_param, ensure_ascii=False).encode("utf-8"),
                 rect_buffer.c_handle,
                 cur_rec_detail.encode("utf-8"),
             )

diff --git a/source/binding/Python/maa/controller.py b/source/binding/Python/maa/controller.py
@@ -275,7 +275,7 @@ def __init__(
             str(adb_path).encode("utf-8"),
             address.encode("utf-8"),
             touch_type | key_type | screencap_type,
-            json.dumps(config).encode("utf-8"),
+            json.dumps(config, ensure_ascii=False).encode("utf-8"),
             str(agent_path).encode("utf-8"),
             self._callback_agent.c_callback,
             self._callback_agent.c_callback_arg,
@@ -321,7 +321,7 @@ def __init__(
             str(read_path).encode("utf-8"),
             str(write_path).encode("utf-8"),
             touch_type | key_type | screencap_type,
-            json.dumps(config).encode("utf-8"),
+            json.dumps(config, ensure_ascii=False).encode("utf-8"),
             self._callback_agent.c_callback,
             self._callback_agent.c_callback_arg,
         )
@@ -401,7 +401,7 @@ def __init__(
             type,
             host.encode("utf-8"),
             port,
-            json.dumps(config).encode("utf-8"),
+            json.dumps(config, ensure_ascii=False).encode("utf-8"),
             self._callback_agent.c_callback,
             self._callback_agent.c_callback_arg,
         )

diff --git a/source/binding/Python/maa/instance.py b/source/binding/Python/maa/instance.py
@@ -109,7 +109,9 @@ def post_task(self, task_type: str, param: Any = {}) -> Future:
         """
 
         maaid = Library.framework.MaaPostTask(
-            self._handle, task_type.encode("utf-8"), json.dumps(param).encode("utf-8")
+            self._handle,
+            task_type.encode("utf-8"),
+            json.dumps(param, ensure_ascii=False).encode("utf-8"),
         )
         return TaskFuture(maaid, self._status, self._set_task_param)
 
@@ -203,7 +205,7 @@ def _stop_status(self, id: int) -> ctypes.c_int32:
 
     def _set_task_param(self, id: int, param: Dict) -> bool:
         return Library.framework.MaaSetTaskParam(
-            self._handle, id, json.dumps(param).encode("utf-8")
+            self._handle, id, json.dumps(param, ensure_ascii=False).encode("utf-8")
         )
 
     @staticmethod

diff --git a/source/binding/Python/maa/toolkit.py b/source/binding/Python/maa/toolkit.py
@@ -33,7 +33,7 @@ def init_option(
         return bool(
             Library.toolkit.MaaToolkitInitOptionConfig(
                 str(user_path).encode("utf-8"),
-                json.dumps(default_config).encode("utf-8"),
+                json.dumps(default_config, ensure_ascii=False).encode("utf-8"),
             )
         )
 

diff --git a/test/python/binding_test.py b/test/python/binding_test.py
@@ -107,7 +107,7 @@ async def main():
                 "custom_recognition": "MyRec",
                 "action": "Custom",
                 "custom_action": "MyAct",
-                "custom_action_param": "abcdefg",
+                "custom_action_param": "👋哈哈哈(*´▽｀)ノノ😀",
             },
         },
     )