From 5e882563a37069588b061caac2d79df8ee89dc9f Mon Sep 17 00:00:00 2001 From: kit <101046518@qq.com> Date: Wed, 24 Apr 2024 21:44:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/main' --- metagpt/environment/android/android_ext_env.py | 8 ++++---- setup.py | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/metagpt/environment/android/android_ext_env.py b/metagpt/environment/android/android_ext_env.py index cba0636c7..9a3e5a4c0 100644 --- a/metagpt/environment/android/android_ext_env.py +++ b/metagpt/environment/android/android_ext_env.py @@ -45,9 +45,8 @@ class AndroidExtEnv(ExtEnv): (width, height) = self.device_shape self.width = data.get("width", width) self.height = data.get("height", height) - - #self.create_device_path(self.screenshot_dir) - #self.create_device_path(self.xml_dir) + self.create_device_path(self.screenshot_dir) + self.create_device_path(self.xml_dir) def reset( self, @@ -269,7 +268,7 @@ class AndroidExtEnv(ExtEnv): ocr_result[0], ocr_result[1], ocr_result[2], ocr_result[3], ocr_result[4], ocr_result[5]) if len(in_coordinate) == 0: logger.info(f"No App named {app_name}.") - return "no" + return "no app here" else: tap_coordinate = [ (in_coordinate[0][0] + in_coordinate[0][2]) / 2, @@ -336,4 +335,5 @@ class AndroidExtEnv(ExtEnv): final_box = hash_table[clip_filter] tap_coordinate = [(final_box[0] + final_box[2]) / 2, (final_box[1] + final_box[3]) / 2] tap_coordinate = [round(tap_coordinate[0] / iw, 2), round(tap_coordinate[1] / ih, 2)] + print(tap_coordinate[0] * x, tap_coordinate[1] * y) return self.system_tap(tap_coordinate[0] * x, tap_coordinate[1] * y) diff --git a/setup.py b/setup.py index 22782a5c3..1368a67fd 100644 --- a/setup.py +++ b/setup.py @@ -62,6 +62,7 @@ extras_require = { "pyclipper", "shapely", "groundingdino-py", + "datasets==2.18.0", ], }