diff --git a/Utils/JsonUtils.py b/Utils/JsonUtils.py index f36e9ba..46d8fa7 100644 --- a/Utils/JsonUtils.py +++ b/Utils/JsonUtils.py @@ -200,13 +200,10 @@ class JsonUtils: return updated - - - @classmethod def query_all_json_items(cls, filename="log/last_message.json") -> list: """ - 查询 JSON 文件(数组)中的所有项,并剔除 sender 为空的记录 + 查询 JSON 文件(数组)中的所有项,并剔除 sender 和 text 为空的记录 :param filename: JSON 文件路径 :return: list,可能为空 """ @@ -214,10 +211,9 @@ class JsonUtils: data = cls._read_json_list(file_path) if not isinstance(data, list): return [] - # 过滤 sender 为空字符串的项 - # return [item for item in data if isinstance(item, dict) and item.get("sender", "").strip()] - return [item for item in data if isinstance(item, dict)] - + # 过滤 sender 和 text 为空字符串的项 + return [item for item in data if + isinstance(item, dict) and item.get("sender", "").strip() and item.get("text", "").strip()] @classmethod diff --git a/script/ScriptManager.py b/script/ScriptManager.py index 2029ff4..e8b7cbc 100644 --- a/script/ScriptManager.py +++ b/script/ScriptManager.py @@ -1635,6 +1635,7 @@ class ScriptManager(): LogManager.method_info(f"点击坐标: ({tap_x}, {tap_y}),账号: {target_account}", "切换账号", udid) session.tap(tap_x, tap_y) + time.sleep(5) return 200, "成功" except Exception as e: