Refactor and clean up code across multiple scripts
- Removed trailing whitespace and ensured files end with a single newline in cleanup_unused_files.py. - Added fix_trailing_whitespace.py to batch remove trailing whitespace from Python files. - Updated install_dependencies.py to improve dependency installation prompts. - Cleaned up pick_coords.py by removing unnecessary whitespace and improving code readability. - Enhanced region_selector.py by disabling specific pylint checks for better compatibility with third-party libraries. - Improved WPS流程图生成工具.py by cleaning up whitespace and enhancing readability. - Updated __init__.py in typings to remove unnecessary lines. - Modified app.js to adjust default configuration values and clean up unused code.
This commit is contained in:
1 parent
9131c48633
commit
0b5f150691
149 files changed
+2437
-4913
No files matched your search
@@ -0,0 +1,35 @@
|
||||
# Copilot 指令(douyin_guaji-main)
|
||||
|
||||
## 先从这里入手(入口/主链路)
|
||||
- CLI 入口:`run_cli.py`;主调度器:`douyin/core/douyin_fudai.py` 的 `fudai_analyse`(`fudai_choujiang()` -> 循环 `run_once_basic()`)。
|
||||
- 设备/ADB/OCR 兼容层:`Underlying_Operations.py`(OCR:优先 EasyOCR,失败回退 PaddleOCR;可用 `SKIP_OCR_INIT=1` 跳过初始化)。
|
||||
- 路径与配置:以 `config/config.json` 为准,统一用 `path_config.py` 取路径(不要硬编码 `assets/`、`pic/`、`logs/`)。
|
||||
|
||||
## 架构要点(理解模块边界)
|
||||
- 核心包:`douyin/`;主要分层:`core/`(流程/状态) + `stage/`(阶段诊断) + `handlers/`(截图/弹窗/滑动等操作) + `fudai/`(福袋查找/详情/流程) + `reservation/`(高价值预约/回退校验) + `detection/`(像素/模板检测)。
|
||||
- 分辨率适配以 1080x2400 为基准:坐标/ROI 一般需要走“缩放/偏移”路径(见 `fudai_analyse` 的分辨率字段与相关 helper)。
|
||||
- 开发以模块化为主:新功能/修复优先落在 `douyin/*`(业务流程)与 `operations/*`(底层封装);`Underlying_Operations.py` 多为兼容与兜底,避免把新逻辑持续堆进去。
|
||||
|
||||
## 配置加载与覆盖优先级(以 config.json 为核心)
|
||||
- 真实配置文件:`config/config.json`(`path_config.get_config_path()`);GUI/WebGUI 会读写它。
|
||||
- `douyin/utils/douyin_config.py:ConfigManager.load_config_from_file()` 会把配置写回 analyser;命令行传入的 `needswitch` 会被保留(命令行优先)。
|
||||
- `run_cli.py` 会在创建 `fudai_analyse()` 后,用 CLI 参数覆盖部分字段(如 `min_prize_value_yuan`、`skip_if_countdown_*`、OCR/模板开关等)。
|
||||
|
||||
## 日志与调试图像(排障首选路径)
|
||||
- 日志初始化:`douyin/logging/douyin_logging.py:configure_logging()`;统一日志能力在 `unified_logger.py`(traceId/MDC/脱敏)。
|
||||
- 业务日志优先用 `analyser._log_kv(...)`(实现见 `douyin/logging/douyin_logging_wrapper.py`):始终 stdout 可被 GUI 捕获,并带阶段分隔。
|
||||
- 截图/调试图像:`douyin/handlers/douyin_screenshot_manager.py`(可异步保存;行为日志写入 `logs/actions.log`,路径用 `path_config.get_actions_log_path()`)。
|
||||
- 排障开关以 `config/config.json` 为准:优先通过 `debug_captures.*` 控制调试图像(enabled/keep_days/max_files/async_save/log_on_complete),环境变量只作为性能/临时诊断手段。
|
||||
|
||||
## 状态文件(别改路径/格式)
|
||||
- 预约队列落盘:`douyin/core/state/reservations.json`(见 `fudai_analyse._reservations_state_path`)。
|
||||
- 高价值直播间等状态:`state/high_value_rooms.json`(路径见 `path_config.get_high_value_rooms_path()`)。
|
||||
|
||||
## 兼容/遗留机制(默认不用,但别误删)
|
||||
- `run_cli.py` 仍保留 shim + `EXTERNAL_DOUYIN_FUDAI_DIR` 的兼容加载逻辑;本仓库已内置“本地完整版”实现,日常开发以本仓库代码为主。
|
||||
- `Underlying_Operations.py` 可能会把 `pic/screenshot.png` 镜像到外部目录;如做性能排查可设 `DISABLE_SCREENSHOT_MIRROR=1`。
|
||||
|
||||
## 开发约束(本仓库高频踩坑)
|
||||
- 代码修改规范(硬性):严格 4 空格缩进(禁用 Tab);`try` 必须配 `except/finally`,`if` 必须配对 `else/elif`,`for/while`/`def/class` 块必须完整且缩进正确。
|
||||
- 修改流程:先理清缩进层级再改;改完做一次语法自检,避免孤立的 `except/else/elif`、括号/引号不配对、冒号后缺缩进块(详见 `docs/完整技术文档.md`)。
|
||||
- 当前仓库没有可运行的 `pytest` 测试集;常用验证方式是跑 `python run_cli.py ...` 或 GUI/WebGUI,并结合 `logs/` + `pic/` 调试输出定位问题。
|
||||
@@ -0,0 +1,2 @@
|
||||
[MASTER]
|
||||
disable = broad-except,protected-access,unused-argument,unnecessary-pass,unused-variable,unused-import
|
||||
+33
-33
@@ -55,7 +55,7 @@ _EXTERNAL_AXF_SCREENSHOT = os.path.join(
|
||||
|
||||
def _safe_replace_file(tmp_file: str, out_file: str, max_retries: int = 2) -> bool:
|
||||
"""安全地替换文件,处理Windows文件锁定问题。
|
||||
|
||||
|
||||
根本优化:优先使用直接复制而不是替换,避免文件锁定问题。
|
||||
如果文件被占用,直接复制内容而不是等待释放。
|
||||
|
||||
@@ -81,7 +81,7 @@ def _safe_replace_file(tmp_file: str, out_file: str, max_retries: int = 2) -> bo
|
||||
# 如果原子替换失败(文件被占用),直接使用复制方法(避免等待)
|
||||
# 这样可以避免文件锁定导致的长时间等待
|
||||
pass
|
||||
|
||||
|
||||
# 方法2: 直接复制文件内容(避免文件锁定问题)
|
||||
# 这是最可靠的方法,即使文件被占用也能成功
|
||||
try:
|
||||
@@ -128,13 +128,13 @@ def _mirror_screenshot_to_external(src_file: str) -> None:
|
||||
"""将当前项目下的 screenshot.png 同步一份到外部 axf 目录,便于完整版代码复用。
|
||||
|
||||
若外部目录/路径不存在或复制失败,会静默忽略,不影响主流程。
|
||||
|
||||
|
||||
可通过环境变量 DISABLE_SCREENSHOT_MIRROR=1 禁用此功能以提升性能。
|
||||
"""
|
||||
# 检查环境变量:是否禁用镜像功能(用于性能测试)
|
||||
if os.environ.get("DISABLE_SCREENSHOT_MIRROR", "0") == "1":
|
||||
return
|
||||
|
||||
|
||||
mirror_start = time_module.time()
|
||||
try:
|
||||
external_path = _EXTERNAL_AXF_SCREENSHOT
|
||||
@@ -143,7 +143,7 @@ def _mirror_screenshot_to_external(src_file: str) -> None:
|
||||
external_dir = os.path.dirname(external_path)
|
||||
if not external_dir:
|
||||
return
|
||||
|
||||
|
||||
# 检查外部路径是否是网络路径或可能较慢的路径
|
||||
external_base = os.environ.get("EXTERNAL_DOUYIN_FUDAI_DIR", "")
|
||||
is_network_path = False
|
||||
@@ -156,7 +156,7 @@ def _mirror_screenshot_to_external(src_file: str) -> None:
|
||||
elif ":" in external_base and len(external_base) > 3:
|
||||
# 可能是网络驱动器,但无法确定,记录路径供诊断
|
||||
logging.debug("[截图] 镜像目标路径: %s", external_path)
|
||||
|
||||
|
||||
os.makedirs(external_dir, exist_ok=True)
|
||||
if not os.path.exists(src_file):
|
||||
return
|
||||
@@ -168,13 +168,13 @@ def _mirror_screenshot_to_external(src_file: str) -> None:
|
||||
copy_dur = (time_module.time() - copy_start) * 1000.0
|
||||
if copy_dur > 50.0 or is_network_path:
|
||||
logging.info("[截图] 镜像复制耗时(ms)=%.1f src=%s dst=%s (网络路径=%s)", copy_dur, src_file, tmp, is_network_path)
|
||||
|
||||
|
||||
replace_start = time_module.time()
|
||||
_safe_replace_file(tmp, external_path)
|
||||
replace_dur = (time_module.time() - replace_start) * 1000.0
|
||||
if replace_dur > 50.0 or is_network_path:
|
||||
logging.info("[截图] 镜像文件替换耗时(ms)=%.1f (网络路径=%s)", replace_dur, is_network_path)
|
||||
|
||||
|
||||
mirror_total_dur = (time_module.time() - mirror_start) * 1000.0
|
||||
if mirror_total_dur > 100.0 or is_network_path:
|
||||
logging.info("[截图] 镜像总耗时(ms)=%.1f path=%s (网络路径=%s)", mirror_total_dur, external_path, is_network_path)
|
||||
@@ -467,12 +467,12 @@ class underlying_operations:
|
||||
|
||||
def get_screenshot(self, device_id, path="pic", use_service: bool = False):
|
||||
"""截图(支持后台服务模式)
|
||||
|
||||
|
||||
参数:
|
||||
device_id: 设备ID
|
||||
path: 路径(默认"pic")
|
||||
use_service: 是否使用后台截图服务(默认False,强制使用直接截图)
|
||||
|
||||
|
||||
返回:
|
||||
是否成功获取截图
|
||||
"""
|
||||
@@ -482,7 +482,7 @@ class underlying_operations:
|
||||
try:
|
||||
from operations.screenshot_service import ScreenshotService
|
||||
service = ScreenshotService.get_instance()
|
||||
|
||||
|
||||
# 诊断:检查服务是否在运行
|
||||
service_running = getattr(service, "_running", False)
|
||||
if not service_running:
|
||||
@@ -493,7 +493,7 @@ class underlying_operations:
|
||||
time_module.sleep(0.2)
|
||||
except Exception as start_err:
|
||||
logging.warning("[截图] 启动后台服务失败: %s,将使用直接截图", start_err)
|
||||
|
||||
|
||||
try:
|
||||
service_result = service.get_screenshot(device_id, force=False)
|
||||
if service_result:
|
||||
@@ -523,11 +523,11 @@ class underlying_operations:
|
||||
dur = (time.time() - start_ts) * 1000.0
|
||||
logging.info("[截图] 总耗时(ms)=%.1f device=%s use_service=%s result=%s", dur, device_id, bool(use_service), result)
|
||||
return result
|
||||
|
||||
|
||||
def _get_screenshot_direct(self, device_id, path="pic"):
|
||||
"""直接截图(不使用服务模式)"""
|
||||
overall_start = time_module.time()
|
||||
|
||||
|
||||
if path == "pic":
|
||||
try:
|
||||
import path_config
|
||||
@@ -549,7 +549,7 @@ class underlying_operations:
|
||||
|
||||
# 检查环境变量:是否跳过PNG验证(用于性能测试)
|
||||
skip_verify = os.environ.get("SKIP_SCREENSHOT_VERIFY", "0") == "1"
|
||||
|
||||
|
||||
def _valid_png(path0: str) -> bool:
|
||||
if skip_verify:
|
||||
# 快速路径:只检查文件存在和大小
|
||||
@@ -560,7 +560,7 @@ class underlying_operations:
|
||||
return sz >= 1024
|
||||
except Exception:
|
||||
return False
|
||||
|
||||
|
||||
verify_start = time_module.time()
|
||||
try:
|
||||
if not os.path.exists(path0):
|
||||
@@ -587,7 +587,7 @@ class underlying_operations:
|
||||
header_check_dur = (time_module.time() - header_check_start) * 1000.0
|
||||
if header_check_dur > 10.0: # 只记录超过10ms的
|
||||
logging.debug("[截图] PNG头尾校验耗时(ms)=%.1f path=%s", header_check_dur, path0)
|
||||
|
||||
|
||||
# 优化:只在必要时使用 PIL 验证(PIL verify 可能很慢)
|
||||
# 对于临时文件,快速验证已足够;对于最终文件,可以跳过完整验证以提高速度
|
||||
# 如果文件头尾都正确,大概率是有效的PNG文件
|
||||
@@ -603,7 +603,7 @@ class underlying_operations:
|
||||
# pil_verify_dur = (time_module.time() - pil_verify_start) * 1000.0
|
||||
# if pil_verify_dur > 50.0: # 只记录超过50ms的
|
||||
# logging.debug("[截图] PIL verify耗时(ms)=%.1f path=%s", pil_verify_dur, path0)
|
||||
|
||||
|
||||
verify_total_dur = (time_module.time() - verify_start) * 1000.0
|
||||
if verify_total_dur > 100.0: # 只记录超过100ms的
|
||||
logging.info("[截图] _valid_png总耗时(ms)=%.1f path=%s", verify_total_dur, path0)
|
||||
@@ -635,7 +635,7 @@ class underlying_operations:
|
||||
stderr=subprocess.DEVNULL,
|
||||
bufsize=0, # 无缓冲,立即传输
|
||||
)
|
||||
|
||||
|
||||
# 使用更大的缓冲区(256KB)提高写入效率
|
||||
if process.stdout is None:
|
||||
raise RuntimeError("ADB process stdout is None")
|
||||
@@ -645,15 +645,15 @@ class underlying_operations:
|
||||
if not chunk:
|
||||
break
|
||||
f.write(chunk)
|
||||
|
||||
|
||||
# 等待进程完成
|
||||
return_code = process.wait(timeout=10)
|
||||
if return_code != 0:
|
||||
raise subprocess.CalledProcessError(return_code, [adb, "-s", device_id, "exec-out", "screencap", "-p"])
|
||||
|
||||
|
||||
adb_subprocess_dur = (time_module.time() - adb_start) * 1000.0
|
||||
logging.info("[截图] ADB exec-out subprocess耗时(ms)=%.1f device=%s attempt=%d", adb_subprocess_dur, device_id, attempt + 1)
|
||||
|
||||
|
||||
# 优化:移除 fsync(现代文件系统会自动同步,减少不必要的磁盘I/O)
|
||||
# 文件写入已经完成,操作系统会在适当时机同步到磁盘
|
||||
# 这样可以减少 10-50ms 的等待时间
|
||||
@@ -674,14 +674,14 @@ class underlying_operations:
|
||||
replace_dur = (time_module.time() - replace_start) * 1000.0
|
||||
if replace_dur > 50.0:
|
||||
logging.info("[截图] 文件替换耗时(ms)=%.1f result=%s", replace_dur, replace_success)
|
||||
|
||||
|
||||
if replace_success:
|
||||
mirror_start = time_module.time()
|
||||
_mirror_screenshot_to_external(out_file)
|
||||
mirror_dur = (time_module.time() - mirror_start) * 1000.0
|
||||
if mirror_dur > 50.0:
|
||||
logging.info("[截图] 镜像到外部路径耗时(ms)=%.1f", mirror_dur)
|
||||
|
||||
|
||||
# 优化:快速验证目标文件(只检查存在和大小,不进行完整PNG验证)
|
||||
# 完整验证可以在读取时进行,不阻塞截图流程
|
||||
validate_out_start = time_module.time()
|
||||
@@ -698,14 +698,14 @@ class underlying_operations:
|
||||
validate_out_dur = (time_module.time() - validate_out_start) * 1000.0
|
||||
if validate_out_dur > 50.0:
|
||||
logging.info("[截图] 目标文件快速验证耗时(ms)=%.1f", validate_out_dur)
|
||||
|
||||
|
||||
overall_dur = (time_module.time() - overall_start) * 1000.0
|
||||
logging.info("[截图] _get_screenshot_direct总耗时(ms)=%.1f device=%s (exec-out成功)", overall_dur, device_id)
|
||||
print(f"[{timetag}] [截图] ✓ 获取屏幕截图成功")
|
||||
return True
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 如果快速验证失败,记录诊断信息
|
||||
try:
|
||||
st = os.stat(out_file)
|
||||
@@ -770,7 +770,7 @@ class underlying_operations:
|
||||
)
|
||||
shell_screencap_dur = (time_module.time() - shell_screencap_start) * 1000.0
|
||||
logging.info("[截图] 回退方案-shell screencap耗时(ms)=%.1f device=%s", shell_screencap_dur, device_id)
|
||||
|
||||
|
||||
pull_start = time_module.time()
|
||||
subprocess.run(
|
||||
[adb, "-s", device_id, "pull", "/sdcard/DCIM/screenshot.png", tmp_file],
|
||||
@@ -781,26 +781,26 @@ class underlying_operations:
|
||||
)
|
||||
pull_dur = (time_module.time() - pull_start) * 1000.0
|
||||
logging.info("[截图] 回退方案-adb pull耗时(ms)=%.1f device=%s", pull_dur, device_id)
|
||||
|
||||
|
||||
fallback_validate_start = time_module.time()
|
||||
if _valid_png(tmp_file):
|
||||
fallback_validate_dur = (time_module.time() - fallback_validate_start) * 1000.0
|
||||
if fallback_validate_dur > 50.0:
|
||||
logging.info("[截图] 回退方案-临时文件验证耗时(ms)=%.1f", fallback_validate_dur)
|
||||
|
||||
|
||||
# 使用安全的文件替换函数
|
||||
fallback_replace_start = time_module.time()
|
||||
if _safe_replace_file(tmp_file, out_file):
|
||||
fallback_replace_dur = (time_module.time() - fallback_replace_start) * 1000.0
|
||||
if fallback_replace_dur > 50.0:
|
||||
logging.info("[截图] 回退方案-文件替换耗时(ms)=%.1f", fallback_replace_dur)
|
||||
|
||||
|
||||
fallback_mirror_start = time_module.time()
|
||||
_mirror_screenshot_to_external(out_file)
|
||||
fallback_mirror_dur = (time_module.time() - fallback_mirror_start) * 1000.0
|
||||
if fallback_mirror_dur > 50.0:
|
||||
logging.info("[截图] 回退方案-镜像耗时(ms)=%.1f", fallback_mirror_dur)
|
||||
|
||||
|
||||
try:
|
||||
if _valid_png(out_file):
|
||||
overall_dur = (time_module.time() - overall_start) * 1000.0
|
||||
@@ -1078,7 +1078,7 @@ class underlying_operations:
|
||||
save_debug = os.environ.get("SAVE_DEBUG_IMAGES", "0") == "1"
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
if save_debug:
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
|
||||
@@ -1301,7 +1301,7 @@ class underlying_operations:
|
||||
save_debug = bool(getattr(self, "save_ocr_debug_images", False))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
if save_debug:
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
import path_config
|
||||
|
||||
@@ -1,523 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
# pyright: reportOptionalMemberAccess=false
|
||||
"""
|
||||
详细检查设备是否支持 JPEG 截图
|
||||
测试各种可能的 JPEG 截图方法
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import subprocess
|
||||
import tempfile
|
||||
import time
|
||||
from datetime import datetime
|
||||
from typing import Dict, List, Tuple, cast, IO
|
||||
|
||||
def get_adb_path() -> str:
|
||||
"""获取 adb 路径"""
|
||||
adb = os.environ.get("ADB_EXECUTABLE", "adb")
|
||||
if adb.startswith('"') and adb.endswith('"'):
|
||||
adb = adb[1:-1]
|
||||
return adb
|
||||
|
||||
def get_device_info(device_id: str) -> Dict[str, str]:
|
||||
"""获取设备信息"""
|
||||
adb = get_adb_path()
|
||||
info = {}
|
||||
|
||||
try:
|
||||
# Android 版本
|
||||
result = subprocess.run(
|
||||
[adb, "-s", device_id, "shell", "getprop", "ro.build.version.release"],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=3
|
||||
)
|
||||
info["android_version"] = result.stdout.strip() if result.returncode == 0 else "未知"
|
||||
except:
|
||||
info["android_version"] = "未知"
|
||||
|
||||
try:
|
||||
# 设备型号
|
||||
result = subprocess.run(
|
||||
[adb, "-s", device_id, "shell", "getprop", "ro.product.model"],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=3
|
||||
)
|
||||
info["model"] = result.stdout.strip() if result.returncode == 0 else "未知"
|
||||
except:
|
||||
info["model"] = "未知"
|
||||
|
||||
try:
|
||||
# 制造商
|
||||
result = subprocess.run(
|
||||
[adb, "-s", device_id, "shell", "getprop", "ro.product.manufacturer"],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=3
|
||||
)
|
||||
info["manufacturer"] = result.stdout.strip() if result.returncode == 0 else "未知"
|
||||
except:
|
||||
info["manufacturer"] = "未知"
|
||||
|
||||
return info
|
||||
|
||||
def check_root_access(device_id: str) -> bool:
|
||||
"""检查 root 权限"""
|
||||
adb = get_adb_path()
|
||||
try:
|
||||
result = subprocess.run(
|
||||
[adb, "-s", device_id, "shell", "su", "-c", "id"],
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.DEVNULL,
|
||||
timeout=3,
|
||||
capture_output=True,
|
||||
)
|
||||
return "uid=0" in result.stdout.decode('utf-8', errors='ignore')
|
||||
except:
|
||||
return False
|
||||
|
||||
def test_screencap_jpeg_direct(device_id: str) -> Tuple[bool, str, float]:
|
||||
"""测试方法1: screencap 直接输出 JPEG(如果支持)"""
|
||||
adb = get_adb_path()
|
||||
tmp_file = os.path.join(tempfile.gettempdir(), "test_jpeg_direct.jpg")
|
||||
|
||||
# 测试各种可能的 JPEG 参数
|
||||
test_commands = [
|
||||
["exec-out", "screencap", "-j"], # 标准 JPEG 参数
|
||||
["exec-out", "screencap", "--jpeg"], # 长参数
|
||||
["exec-out", "screencap", "-f", "jpeg"], # 格式参数
|
||||
["exec-out", "screencap", "-p", "-j"], # PNG + JPEG
|
||||
["shell", "screencap", "-j", "/sdcard/test.jpg"], # shell 模式
|
||||
]
|
||||
|
||||
for cmd in test_commands:
|
||||
try:
|
||||
if os.path.exists(tmp_file):
|
||||
try:
|
||||
os.remove(tmp_file)
|
||||
except:
|
||||
pass
|
||||
|
||||
start_time = time.time()
|
||||
full_cmd = [adb, "-s", device_id] + cmd
|
||||
|
||||
if "exec-out" in cmd:
|
||||
# 流式读取
|
||||
process = subprocess.Popen(
|
||||
full_cmd,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.DEVNULL,
|
||||
)
|
||||
|
||||
if process.stdout is None:
|
||||
continue
|
||||
|
||||
assert process.stdout is not None
|
||||
stdout = cast(IO[bytes], process.stdout)
|
||||
with open(tmp_file, "wb") as f:
|
||||
while True:
|
||||
chunk = stdout.read(65536) # type: ignore[union-attr]
|
||||
if not chunk:
|
||||
break
|
||||
f.write(chunk)
|
||||
|
||||
return_code = process.wait(timeout=5)
|
||||
else:
|
||||
# shell 模式
|
||||
result = subprocess.run(
|
||||
full_cmd,
|
||||
stdout=subprocess.DEVNULL,
|
||||
stderr=subprocess.DEVNULL,
|
||||
timeout=5,
|
||||
)
|
||||
return_code = result.returncode
|
||||
|
||||
if return_code == 0 and "shell" in cmd:
|
||||
# 如果是 shell 模式,需要 pull
|
||||
subprocess.run(
|
||||
[adb, "-s", device_id, "pull", "/sdcard/test.jpg", tmp_file],
|
||||
stdout=subprocess.DEVNULL,
|
||||
stderr=subprocess.DEVNULL,
|
||||
timeout=5,
|
||||
)
|
||||
|
||||
elapsed = (time.time() - start_time) * 1000
|
||||
|
||||
if return_code == 0 and os.path.exists(tmp_file):
|
||||
file_size = os.path.getsize(tmp_file)
|
||||
# 检查是否是有效的 JPEG(检查文件头)
|
||||
if file_size > 100:
|
||||
with open(tmp_file, "rb") as f:
|
||||
header = f.read(2)
|
||||
if header == b'\xff\xd8': # JPEG 文件头
|
||||
return True, f"命令: {' '.join(cmd)}", elapsed
|
||||
|
||||
except Exception as e:
|
||||
continue
|
||||
|
||||
return False, "不支持直接 JPEG 输出", 0.0
|
||||
|
||||
def test_screencap_help(device_id: str) -> Dict[str, bool]:
|
||||
"""检查 screencap 帮助信息,查看支持的参数"""
|
||||
adb = get_adb_path()
|
||||
result = {}
|
||||
|
||||
try:
|
||||
# 获取 screencap 帮助信息
|
||||
help_output = ""
|
||||
try:
|
||||
help_output += subprocess.run(
|
||||
[adb, "-s", device_id, "shell", "screencap", "-h"],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=3,
|
||||
).stdout
|
||||
except:
|
||||
pass
|
||||
|
||||
try:
|
||||
help_output += subprocess.run(
|
||||
[adb, "-s", device_id, "shell", "screencap", "--help"],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=3,
|
||||
).stdout
|
||||
except:
|
||||
pass
|
||||
|
||||
# 检查是否包含 JPEG 相关参数
|
||||
result["has_jpeg_flag"] = any(keyword in help_output.lower() for keyword in ["-j", "jpeg", "--jpeg"])
|
||||
result["has_format_flag"] = any(keyword in help_output.lower() for keyword in ["-f", "format", "--format"])
|
||||
result["has_quality_flag"] = any(keyword in help_output.lower() for keyword in ["-q", "quality", "--quality"])
|
||||
|
||||
except:
|
||||
result["has_jpeg_flag"] = False
|
||||
result["has_format_flag"] = False
|
||||
result["has_quality_flag"] = False
|
||||
|
||||
return result
|
||||
|
||||
def test_device_tools(device_id: str) -> Dict[str, bool]:
|
||||
"""检查设备上是否有可用的转换工具"""
|
||||
adb = get_adb_path()
|
||||
tools = {}
|
||||
|
||||
# 检查 ImageMagick convert
|
||||
try:
|
||||
result = subprocess.run(
|
||||
[adb, "-s", device_id, "shell", "which", "convert"],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=3,
|
||||
)
|
||||
tools["imagemagick"] = result.returncode == 0 and result.stdout.strip() != ""
|
||||
except:
|
||||
tools["imagemagick"] = False
|
||||
|
||||
# 检查 /data/local/tmp/convert
|
||||
try:
|
||||
result = subprocess.run(
|
||||
[adb, "-s", device_id, "shell", "test", "-f", "/data/local/tmp/convert"],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=3,
|
||||
)
|
||||
tools["imagemagick_tmp"] = result.returncode == 0
|
||||
except:
|
||||
tools["imagemagick_tmp"] = False
|
||||
|
||||
# 检查 Python
|
||||
try:
|
||||
result = subprocess.run(
|
||||
[adb, "-s", device_id, "shell", "which", "python3"],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=3,
|
||||
)
|
||||
tools["python3"] = result.returncode == 0 and result.stdout.strip() != ""
|
||||
except:
|
||||
tools["python3"] = False
|
||||
|
||||
# 检查 Python (python)
|
||||
try:
|
||||
result = subprocess.run(
|
||||
[adb, "-s", device_id, "shell", "which", "python"],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=3,
|
||||
)
|
||||
tools["python"] = result.returncode == 0 and result.stdout.strip() != ""
|
||||
except:
|
||||
tools["python"] = False
|
||||
|
||||
# 检查 BusyBox
|
||||
try:
|
||||
result = subprocess.run(
|
||||
[adb, "-s", device_id, "shell", "which", "busybox"],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=3,
|
||||
)
|
||||
tools["busybox"] = result.returncode == 0 and result.stdout.strip() != ""
|
||||
except:
|
||||
tools["busybox"] = False
|
||||
|
||||
return tools
|
||||
|
||||
def test_pc_conversion(device_id: str) -> Tuple[bool, str, float]:
|
||||
"""测试方法2: PC 端转换(PNG -> JPEG)"""
|
||||
try:
|
||||
from PIL import Image
|
||||
import io
|
||||
except ImportError:
|
||||
return False, "PIL/Pillow 未安装", 0.0
|
||||
|
||||
adb = get_adb_path()
|
||||
tmp_jpg = os.path.join(tempfile.gettempdir(), "test_jpeg_pc.jpg")
|
||||
|
||||
try:
|
||||
start_time = time.time()
|
||||
|
||||
# 流式接收 PNG
|
||||
process = subprocess.Popen(
|
||||
[adb, "-s", device_id, "exec-out", "screencap", "-p"],
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.DEVNULL,
|
||||
)
|
||||
|
||||
if process.stdout is None:
|
||||
return False, "无法创建进程输出流", 0.0
|
||||
|
||||
assert process.stdout is not None
|
||||
stdout = cast(IO[bytes], process.stdout)
|
||||
png_data = b""
|
||||
while True:
|
||||
chunk = stdout.read(65536) # type: ignore[union-attr]
|
||||
if not chunk:
|
||||
break
|
||||
png_data += chunk
|
||||
|
||||
process.wait(timeout=10)
|
||||
|
||||
if len(png_data) < 100:
|
||||
return False, "PNG 数据无效", 0.0
|
||||
|
||||
# 转换为 JPEG(RGBA 需要先转换为 RGB)
|
||||
img = Image.open(io.BytesIO(png_data))
|
||||
if img.mode == 'RGBA':
|
||||
# 创建白色背景
|
||||
rgb_img = Image.new('RGB', img.size, (255, 255, 255))
|
||||
rgb_img.paste(img, mask=img.split()[3]) # 使用 alpha 通道作为 mask
|
||||
img = rgb_img
|
||||
elif img.mode != 'RGB':
|
||||
img = img.convert('RGB')
|
||||
|
||||
jpeg_data = io.BytesIO()
|
||||
img.save(jpeg_data, format='JPEG', quality=85, optimize=True)
|
||||
|
||||
with open(tmp_jpg, "wb") as f:
|
||||
f.write(jpeg_data.getvalue())
|
||||
|
||||
elapsed = (time.time() - start_time) * 1000
|
||||
file_size = os.path.getsize(tmp_jpg)
|
||||
|
||||
return True, f"PC 端转换成功,文件大小: {file_size/1024:.1f}KB", elapsed
|
||||
|
||||
except Exception as e:
|
||||
return False, f"PC 端转换失败: {str(e)}", 0.0
|
||||
|
||||
def test_device_conversion(device_id: str) -> Tuple[bool, str, float]:
|
||||
"""测试方法3: 设备端转换(如果工具可用)"""
|
||||
adb = get_adb_path()
|
||||
tools = test_device_tools(device_id)
|
||||
|
||||
# 测试 ImageMagick
|
||||
if tools.get("imagemagick") or tools.get("imagemagick_tmp"):
|
||||
convert_path = "/data/local/tmp/convert" if tools.get("imagemagick_tmp") else "convert"
|
||||
|
||||
try:
|
||||
start_time = time.time()
|
||||
tmp_file = os.path.join(tempfile.gettempdir(), "test_jpeg_device.jpg")
|
||||
|
||||
# 使用 shell 命令组合
|
||||
cmd = f"screencap -p | {convert_path} - -quality 85 jpg:-"
|
||||
process = subprocess.Popen(
|
||||
[adb, "-s", device_id, "exec-out", "sh", "-c", cmd],
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.DEVNULL,
|
||||
)
|
||||
|
||||
if process.stdout is None:
|
||||
raise Exception("无法创建进程输出流")
|
||||
|
||||
assert process.stdout is not None
|
||||
stdout = cast(IO[bytes], process.stdout)
|
||||
with open(tmp_file, "wb") as f:
|
||||
while True:
|
||||
chunk = stdout.read(65536) # type: ignore[union-attr]
|
||||
if not chunk:
|
||||
break
|
||||
f.write(chunk)
|
||||
|
||||
return_code = process.wait(timeout=10)
|
||||
elapsed = (time.time() - start_time) * 1000
|
||||
|
||||
if return_code == 0 and os.path.exists(tmp_file):
|
||||
file_size = os.path.getsize(tmp_file)
|
||||
if file_size > 100:
|
||||
with open(tmp_file, "rb") as f:
|
||||
header = f.read(2)
|
||||
if header == b'\xff\xd8':
|
||||
return True, f"ImageMagick 转换成功,文件大小: {file_size/1024:.1f}KB", elapsed
|
||||
except Exception as e:
|
||||
pass
|
||||
|
||||
return False, "设备端无可用转换工具", 0.0
|
||||
|
||||
def main():
|
||||
"""主函数"""
|
||||
print("=" * 70)
|
||||
print("设备 JPEG 截图支持检查工具")
|
||||
print("=" * 70)
|
||||
print()
|
||||
|
||||
# 获取设备ID
|
||||
device_id = None
|
||||
if len(sys.argv) > 1:
|
||||
device_id = sys.argv[1]
|
||||
else:
|
||||
device_id = os.environ.get("ANDROID_DEVICE_ID")
|
||||
|
||||
if not device_id:
|
||||
# 尝试从 adb devices 获取
|
||||
try:
|
||||
adb = get_adb_path()
|
||||
result = subprocess.run(
|
||||
[adb, "devices"],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=3,
|
||||
)
|
||||
lines = result.stdout.strip().split('\n')[1:] # 跳过第一行
|
||||
devices = [line.split()[0] for line in lines if line.strip() and 'device' in line]
|
||||
if len(devices) == 1:
|
||||
device_id = devices[0]
|
||||
elif len(devices) > 1:
|
||||
print(f"[INFO] 发现多个设备: {', '.join(devices)}")
|
||||
print(f"[INFO] 使用第一个设备: {devices[0]}")
|
||||
device_id = devices[0]
|
||||
except:
|
||||
pass
|
||||
|
||||
if not device_id:
|
||||
print("[ERROR] 未找到设备ID")
|
||||
print("使用方法: python check_jpeg_support.py [设备ID]")
|
||||
print("或设置环境变量: set ANDROID_DEVICE_ID=设备ID")
|
||||
return
|
||||
|
||||
print(f"设备ID: {device_id}")
|
||||
print()
|
||||
|
||||
# 获取设备信息
|
||||
print("1. 设备信息")
|
||||
print("-" * 70)
|
||||
info = get_device_info(device_id)
|
||||
print(f" 制造商: {info.get('manufacturer', '未知')}")
|
||||
print(f" 型号: {info.get('model', '未知')}")
|
||||
print(f" Android 版本: {info.get('android_version', '未知')}")
|
||||
|
||||
has_root = check_root_access(device_id)
|
||||
print(f" Root 权限: {'是' if has_root else '否'}")
|
||||
print()
|
||||
|
||||
# 检查 screencap 帮助信息
|
||||
print("2. screencap 命令支持检查")
|
||||
print("-" * 70)
|
||||
help_info = test_screencap_help(device_id)
|
||||
print(f" 支持 -j/--jpeg 参数: {'是' if help_info.get('has_jpeg_flag') else '否'}")
|
||||
print(f" 支持 -f/--format 参数: {'是' if help_info.get('has_format_flag') else '否'}")
|
||||
print(f" 支持质量参数: {'是' if help_info.get('has_quality_flag') else '否'}")
|
||||
print()
|
||||
|
||||
# 测试直接 JPEG 输出
|
||||
print("3. 测试直接 JPEG 截图")
|
||||
print("-" * 70)
|
||||
success, msg, elapsed = test_screencap_jpeg_direct(device_id)
|
||||
if success:
|
||||
print(f" [OK] 支持直接 JPEG 输出")
|
||||
print(f" 方法: {msg}")
|
||||
print(f" 耗时: {elapsed:.0f}ms")
|
||||
else:
|
||||
print(f" [X] 不支持直接 JPEG 输出")
|
||||
print(f" 原因: {msg}")
|
||||
print()
|
||||
|
||||
# 检查设备工具
|
||||
print("4. 设备端工具检查")
|
||||
print("-" * 70)
|
||||
tools = test_device_tools(device_id)
|
||||
print(f" ImageMagick (convert): {'是' if tools.get('imagemagick') else '否'}")
|
||||
print(f" ImageMagick (/data/local/tmp): {'是' if tools.get('imagemagick_tmp') else '否'}")
|
||||
print(f" Python3: {'是' if tools.get('python3') else '否'}")
|
||||
print(f" Python: {'是' if tools.get('python') else '否'}")
|
||||
print(f" BusyBox: {'是' if tools.get('busybox') else '否'}")
|
||||
print()
|
||||
|
||||
# 测试设备端转换
|
||||
print("5. 测试设备端转换")
|
||||
print("-" * 70)
|
||||
success, msg, elapsed = test_device_conversion(device_id)
|
||||
if success:
|
||||
print(f" [OK] 设备端转换可用")
|
||||
print(f" 方法: {msg}")
|
||||
print(f" 耗时: {elapsed:.0f}ms")
|
||||
else:
|
||||
print(f" [X] 设备端转换不可用")
|
||||
print(f" 原因: {msg}")
|
||||
print()
|
||||
|
||||
# 测试 PC 端转换
|
||||
print("6. 测试 PC 端转换")
|
||||
print("-" * 70)
|
||||
success, msg, elapsed = test_pc_conversion(device_id)
|
||||
if success:
|
||||
print(f" [OK] PC 端转换可用")
|
||||
print(f" 方法: {msg}")
|
||||
print(f" 耗时: {elapsed:.0f}ms")
|
||||
else:
|
||||
print(f" [X] PC 端转换不可用")
|
||||
print(f" 原因: {msg}")
|
||||
print()
|
||||
|
||||
# 总结
|
||||
print("=" * 70)
|
||||
print("检查结果总结")
|
||||
print("=" * 70)
|
||||
|
||||
recommendations = []
|
||||
|
||||
direct_success, _, _ = test_screencap_jpeg_direct(device_id)
|
||||
pc_success, _, _ = test_pc_conversion(device_id)
|
||||
device_success, _, _ = test_device_conversion(device_id)
|
||||
|
||||
if direct_success:
|
||||
recommendations.append("[OK] 设备支持直接 JPEG 截图(推荐使用)")
|
||||
elif pc_success:
|
||||
recommendations.append("[OK] 可以使用 PC 端转换方法(推荐,无需设备端工具)")
|
||||
elif device_success:
|
||||
recommendations.append("[OK] 可以使用设备端转换方法(需要安装工具)")
|
||||
else:
|
||||
recommendations.append("[X] 当前设备不支持 JPEG 截图,建议使用 PNG 格式")
|
||||
|
||||
for rec in recommendations:
|
||||
print(f" {rec}")
|
||||
|
||||
print()
|
||||
print("=" * 70)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
检查截图文件状态
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
def check_screenshot_file():
|
||||
pic_path = r"C:\Users\12742\Desktop\douyin_guaji-main\pic\screenshot.png"
|
||||
|
||||
if os.path.exists(pic_path):
|
||||
size = os.path.getsize(pic_path)
|
||||
print(f"screenshot.png exists, size: {size} bytes")
|
||||
|
||||
if size == 0:
|
||||
print("WARNING: Screenshot file is empty!")
|
||||
elif size < 1024:
|
||||
print("WARNING: Screenshot file is too small (possibly corrupted)")
|
||||
else:
|
||||
print("Screenshot file size looks normal")
|
||||
|
||||
# Try to read first 4 bytes to check PNG header
|
||||
try:
|
||||
with open(pic_path, 'rb') as f:
|
||||
header = f.read(4)
|
||||
if header == b'\x89PNG':
|
||||
print("PNG file format is correct")
|
||||
else:
|
||||
print(f"WARNING: File format issue, header: {header}")
|
||||
except Exception as e:
|
||||
print(f"ERROR reading file: {e}")
|
||||
|
||||
else:
|
||||
print("screenshot.png does not exist")
|
||||
|
||||
# Check tmp file
|
||||
tmp_path = pic_path + ".tmp"
|
||||
if os.path.exists(tmp_path):
|
||||
tmp_size = os.path.getsize(tmp_path)
|
||||
print(f"screenshot.png.tmp exists, size: {tmp_size} bytes")
|
||||
else:
|
||||
print("screenshot.png.tmp does not exist")
|
||||
|
||||
if __name__ == "__main__":
|
||||
check_screenshot_file()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,73 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""检查后台截图服务状态"""
|
||||
|
||||
import time
|
||||
from operations.screenshot_service import ScreenshotService
|
||||
|
||||
def main():
|
||||
print("=== 后台截图服务状态检查 ===\n")
|
||||
|
||||
service = ScreenshotService.get_instance()
|
||||
info = service.get_cache_info()
|
||||
|
||||
print("服务状态:")
|
||||
print(f" 运行中: {info['running']}")
|
||||
print(f" 设备ID: {info.get('device_id', 'None')}")
|
||||
print(f" 截图间隔: {info.get('interval', 'N/A')}秒")
|
||||
print(f" 缓存有效期: {info.get('cache_valid_duration', 'N/A')}秒")
|
||||
|
||||
last_time = info.get('last_screenshot_time', 0)
|
||||
if last_time > 0:
|
||||
time_since = time.time() - last_time
|
||||
print(f"\n最后截图时间: {time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(last_time))}")
|
||||
print(f" 距离现在: {time_since:.1f}秒前")
|
||||
print(f" 缓存状态: {'有效' if time_since < info.get('cache_valid_duration', 4.0) else '已过期'}")
|
||||
print(f" 最后成功: {info.get('last_success', False)}")
|
||||
else:
|
||||
print("\n最后截图时间: 从未截图")
|
||||
print(" 缓存状态: 无缓存")
|
||||
|
||||
print("\n=== 诊断结果 ===")
|
||||
|
||||
if not info['running']:
|
||||
print("[ERROR] 后台截图服务未运行")
|
||||
print(" 原因: 服务可能未启动或已停止")
|
||||
elif not info.get('device_id'):
|
||||
print("[ERROR] 设备ID为空")
|
||||
print(" 原因: 服务启动时未设置设备ID")
|
||||
elif last_time == 0:
|
||||
print("[WARN] 服务运行中但从未成功截图")
|
||||
print(" 可能原因:")
|
||||
print(" 1. ADB连接问题")
|
||||
print(" 2. 设备未连接")
|
||||
print(" 3. 截图操作失败")
|
||||
elif time.time() - last_time > 10:
|
||||
print("[WARN] 服务运行中但最近未截图")
|
||||
print(f" 距离上次截图已过: {time.time() - last_time:.1f}秒")
|
||||
print(" 可能原因: 后台线程异常或截图失败")
|
||||
else:
|
||||
print("[OK] 后台截图服务运行正常")
|
||||
print(f" 缓存有效,响应时间应该 < 10ms")
|
||||
|
||||
# 检查是否有后台线程在运行
|
||||
if hasattr(service, '_thread') and service._thread:
|
||||
print(f"\n后台线程状态:")
|
||||
print(f" 线程存在: True")
|
||||
print(f" 线程存活: {service._thread.is_alive() if service._thread else False}")
|
||||
else:
|
||||
print("\n后台线程状态: 未创建")
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
+4
-4
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"needswitch": false,
|
||||
"needswitch": true,
|
||||
"infinite_loop_enabled": true,
|
||||
"wait_minutes": 5,
|
||||
"min_prize_value_yuan": 200.0,
|
||||
"min_participants": 0,
|
||||
"max_participants": 0,
|
||||
"skip_if_countdown_gt_seconds": 1800,
|
||||
"skip_if_countdown_gt_seconds": 180,
|
||||
"reset_after_swipes_enabled": true,
|
||||
"reset_after_swipes": 10,
|
||||
"auto_join_fansclub": true,
|
||||
@@ -134,9 +134,9 @@
|
||||
"async_save": false,
|
||||
"log_on_complete": false
|
||||
},
|
||||
"fudai_detail_template_threshold": 0.54,
|
||||
"fudai_detail_template_threshold": 0.53,
|
||||
"switch_room_wait_after_stage_diag_seconds": 4.0,
|
||||
"coupon_template_match_threshold": 0.4,
|
||||
"coupon_template_match_threshold": 0.37,
|
||||
"attend_button_red_ratio_threshold": 0.25,
|
||||
"fansclub_join_red_ratio_threshold": 0.25,
|
||||
"reservation_test_mode": false,
|
||||
|
||||
+24
-27
@@ -47,7 +47,7 @@ def get_device_id() -> Optional[str]:
|
||||
if result.returncode != 0:
|
||||
print(f"[错误] adb devices 失败: {result.stderr}")
|
||||
return None
|
||||
|
||||
|
||||
lines = result.stdout.strip().split("\n")[1:] # 跳过第一行 "List of devices attached"
|
||||
devices = []
|
||||
for line in lines:
|
||||
@@ -55,14 +55,14 @@ def get_device_id() -> Optional[str]:
|
||||
device_id = line.split("\t")[0].strip()
|
||||
if device_id:
|
||||
devices.append(device_id)
|
||||
|
||||
|
||||
if not devices:
|
||||
print("[错误] 未找到连接的设备")
|
||||
return None
|
||||
|
||||
|
||||
if len(devices) > 1:
|
||||
print(f"[提示] 找到多个设备: {devices},使用第一个: {devices[0]}")
|
||||
|
||||
|
||||
return devices[0]
|
||||
except Exception as e:
|
||||
print(f"[错误] 获取设备列表失败: {e}")
|
||||
@@ -77,10 +77,10 @@ def test_exec_out_screencap(device_id: str, iterations: int = 5) -> None:
|
||||
print(f"设备: {device_id}")
|
||||
print(f"迭代次数: {iterations}")
|
||||
print(f"{'='*60}\n")
|
||||
|
||||
|
||||
times = []
|
||||
sizes = []
|
||||
|
||||
|
||||
for i in range(iterations):
|
||||
try:
|
||||
start = time.time()
|
||||
@@ -90,7 +90,7 @@ def test_exec_out_screencap(device_id: str, iterations: int = 5) -> None:
|
||||
timeout=15,
|
||||
)
|
||||
elapsed = (time.time() - start) * 1000.0 # 转换为毫秒
|
||||
|
||||
|
||||
if result.returncode == 0:
|
||||
size = len(result.stdout)
|
||||
times.append(elapsed)
|
||||
@@ -102,13 +102,13 @@ def test_exec_out_screencap(device_id: str, iterations: int = 5) -> None:
|
||||
print(f" 迭代 {i+1}: 超时 (>15秒)")
|
||||
except Exception as e:
|
||||
print(f" 迭代 {i+1}: 异常: {e}")
|
||||
|
||||
|
||||
if times:
|
||||
avg_time = sum(times) / len(times)
|
||||
min_time = min(times)
|
||||
max_time = max(times)
|
||||
avg_size = sum(sizes) / len(sizes) if sizes else 0
|
||||
|
||||
|
||||
print(f"\n{'='*60}")
|
||||
print(f"统计结果:")
|
||||
print(f" 平均耗时: {avg_time:.1f}ms")
|
||||
@@ -116,7 +116,7 @@ def test_exec_out_screencap(device_id: str, iterations: int = 5) -> None:
|
||||
print(f" 最大耗时: {max_time:.1f}ms")
|
||||
print(f" 平均大小: {avg_size/1024:.1f}KB")
|
||||
print(f"{'='*60}\n")
|
||||
|
||||
|
||||
if avg_time > 3000:
|
||||
print("[警告] 平均耗时超过3秒,可能存在问题:")
|
||||
print(" - 检查 USB 连接是否稳定")
|
||||
@@ -136,17 +136,17 @@ def test_shell_screencap_pull(device_id: str, iterations: int = 3) -> None:
|
||||
print(f"设备: {device_id}")
|
||||
print(f"迭代次数: {iterations}")
|
||||
print(f"{'='*60}\n")
|
||||
|
||||
|
||||
times = []
|
||||
|
||||
|
||||
for i in range(iterations):
|
||||
try:
|
||||
# 清理旧文件
|
||||
subprocess.run([adb, "-s", device_id, "shell", "rm", "/sdcard/DCIM/screenshot.png"],
|
||||
capture_output=True, timeout=5)
|
||||
|
||||
|
||||
start = time.time()
|
||||
|
||||
|
||||
# Step 1: shell screencap
|
||||
step1_start = time.time()
|
||||
result1 = subprocess.run(
|
||||
@@ -155,11 +155,11 @@ def test_shell_screencap_pull(device_id: str, iterations: int = 3) -> None:
|
||||
timeout=10,
|
||||
)
|
||||
step1_dur = (time.time() - step1_start) * 1000.0
|
||||
|
||||
|
||||
if result1.returncode != 0:
|
||||
print(f" 迭代 {i+1}: shell screencap 失败")
|
||||
continue
|
||||
|
||||
|
||||
# Step 2: pull
|
||||
step2_start = time.time()
|
||||
result2 = subprocess.run(
|
||||
@@ -168,9 +168,9 @@ def test_shell_screencap_pull(device_id: str, iterations: int = 3) -> None:
|
||||
timeout=10,
|
||||
)
|
||||
step2_dur = (time.time() - step2_start) * 1000.0
|
||||
|
||||
|
||||
elapsed = (time.time() - start) * 1000.0
|
||||
|
||||
|
||||
if result2.returncode == 0 and os.path.exists("test_screenshot.png"):
|
||||
size = os.path.getsize("test_screenshot.png")
|
||||
times.append(elapsed)
|
||||
@@ -183,12 +183,12 @@ def test_shell_screencap_pull(device_id: str, iterations: int = 3) -> None:
|
||||
print(f" 迭代 {i+1}: pull 失败")
|
||||
except Exception as e:
|
||||
print(f" 迭代 {i+1}: 异常: {e}")
|
||||
|
||||
|
||||
if times:
|
||||
avg_time = sum(times) / len(times)
|
||||
min_time = min(times)
|
||||
max_time = max(times)
|
||||
|
||||
|
||||
print(f"\n{'='*60}")
|
||||
print(f"统计结果 (回退方案):")
|
||||
print(f" 平均耗时: {avg_time:.1f}ms")
|
||||
@@ -203,23 +203,20 @@ def main():
|
||||
device_id = sys.argv[1]
|
||||
else:
|
||||
device_id = get_device_id()
|
||||
|
||||
|
||||
if not device_id:
|
||||
print("[错误] 无法获取设备ID")
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
print(f"使用设备: {device_id}")
|
||||
print(f"ADB 路径: {get_adb_path()}")
|
||||
|
||||
|
||||
# 测试 exec-out(主要方案)
|
||||
test_exec_out_screencap(device_id, iterations=5)
|
||||
|
||||
|
||||
# 测试 shell + pull(回退方案,较少迭代)
|
||||
test_shell_screencap_pull(device_id, iterations=3)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
|
||||
|
||||
File renamed without changes.
@@ -17,10 +17,10 @@ def test_screenshot_operations():
|
||||
print("=" * 80)
|
||||
print("测试 1: operations.screenshot_operations.get_screenshot()")
|
||||
print("=" * 80)
|
||||
|
||||
|
||||
try:
|
||||
from operations.screenshot_operations import get_screenshot, ScreenshotOperations
|
||||
|
||||
|
||||
# 获取设备ID
|
||||
device_id = os.environ.get("DEVICE_ID", "")
|
||||
if not device_id:
|
||||
@@ -34,11 +34,11 @@ def test_screenshot_operations():
|
||||
except Exception:
|
||||
print("[ERROR] 无法获取设备ID,请设置环境变量 DEVICE_ID")
|
||||
return False
|
||||
|
||||
|
||||
print(f"设备ID: {device_id}")
|
||||
print(f"测试模式: 直接截图 (use_service=False)")
|
||||
print()
|
||||
|
||||
|
||||
# 测试1: 使用默认参数(应该是 False)
|
||||
print("测试 1.1: 使用默认参数调用 get_screenshot()")
|
||||
start = time.time()
|
||||
@@ -50,9 +50,9 @@ def test_screenshot_operations():
|
||||
except Exception as e:
|
||||
elapsed = (time.time() - start) * 1000
|
||||
print(f" [ERROR] 异常: {e}, 耗时: {elapsed:.1f}ms")
|
||||
|
||||
|
||||
print()
|
||||
|
||||
|
||||
# 测试2: 显式传递 use_service=False
|
||||
print("测试 1.2: 显式传递 use_service=False")
|
||||
start = time.time()
|
||||
@@ -65,9 +65,9 @@ def test_screenshot_operations():
|
||||
except Exception as e:
|
||||
elapsed = (time.time() - start) * 1000
|
||||
print(f" [ERROR] 异常: {e}, 耗时: {elapsed:.1f}ms")
|
||||
|
||||
|
||||
print()
|
||||
|
||||
|
||||
# 测试3: 验证不会使用服务模式
|
||||
print("测试 1.3: 验证不会调用后台服务")
|
||||
try:
|
||||
@@ -75,22 +75,22 @@ def test_screenshot_operations():
|
||||
service = ScreenshotService.get_instance()
|
||||
service_running_before = service.is_running()
|
||||
print(f" 服务运行状态(测试前): {service_running_before}")
|
||||
|
||||
|
||||
# 调用截图(应该不会启动服务)
|
||||
get_screenshot(device_id)
|
||||
|
||||
|
||||
service_running_after = service.is_running()
|
||||
print(f" 服务运行状态(测试后): {service_running_after}")
|
||||
|
||||
|
||||
if not service_running_after:
|
||||
print(" [OK] 确认:服务未被启动(符合预期)")
|
||||
else:
|
||||
print(" [WARN] 警告:服务仍在运行(可能之前已启动)")
|
||||
except Exception as e:
|
||||
print(f" [WARN] 无法检查服务状态: {e}")
|
||||
|
||||
|
||||
return True
|
||||
|
||||
|
||||
except ImportError as e:
|
||||
print(f"[ERROR] 导入错误: {e}")
|
||||
return False
|
||||
@@ -107,16 +107,16 @@ def test_underlying_operations():
|
||||
print("=" * 80)
|
||||
print("测试 2: Underlying_Operations.get_screenshot()")
|
||||
print("=" * 80)
|
||||
|
||||
|
||||
try:
|
||||
from Underlying_Operations import underlying_operations
|
||||
|
||||
|
||||
device_id = os.environ.get("DEVICE_ID", "MB75DEFQZHZTGMLJ")
|
||||
print(f"设备ID: {device_id}")
|
||||
print()
|
||||
|
||||
|
||||
ops = underlying_operations()
|
||||
|
||||
|
||||
# 测试默认参数
|
||||
print("测试 2.1: 使用默认参数(应该是 False)")
|
||||
start = time.time()
|
||||
@@ -125,7 +125,7 @@ def test_underlying_operations():
|
||||
elapsed = (time.time() - start) * 1000
|
||||
status = "[OK] 成功" if result else "[FAIL] 失败"
|
||||
print(f" 结果: {status}, 耗时: {elapsed:.1f}ms")
|
||||
|
||||
|
||||
if elapsed > 2000:
|
||||
print(f" [WARN] 警告:耗时较长 ({elapsed:.1f}ms),但应该 < 2秒")
|
||||
elif elapsed > 6000:
|
||||
@@ -137,9 +137,9 @@ def test_underlying_operations():
|
||||
print(f" [ERROR] 异常: {e}, 耗时: {elapsed:.1f}ms")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
|
||||
|
||||
return True
|
||||
|
||||
|
||||
except Exception as e:
|
||||
print(f"[ERROR] 测试失败: {e}")
|
||||
import traceback
|
||||
@@ -153,17 +153,17 @@ def test_stage_diagnosis_screenshot():
|
||||
print("=" * 80)
|
||||
print("测试 3: 阶段诊断截图调用(模拟)")
|
||||
print("=" * 80)
|
||||
|
||||
|
||||
try:
|
||||
# 检查关键文件中的调用
|
||||
import inspect
|
||||
from douyin.core import douyin_fudai
|
||||
|
||||
|
||||
# 查找 get_screenshot 调用
|
||||
source_file = inspect.getfile(douyin_fudai.fudai_analyse)
|
||||
with open(source_file, 'r', encoding='utf-8') as f:
|
||||
content = f.read()
|
||||
|
||||
|
||||
# 检查是否包含 use_service=False
|
||||
if 'get_screenshot(self.device_id, use_service=False)' in content:
|
||||
print(" [OK] 确认:douyin_fudai.py 中已使用 use_service=False")
|
||||
@@ -172,9 +172,9 @@ def test_stage_diagnosis_screenshot():
|
||||
print(" (但默认值应该是 False)")
|
||||
else:
|
||||
print(" [WARN] 未找到 get_screenshot 调用")
|
||||
|
||||
|
||||
return True
|
||||
|
||||
|
||||
except Exception as e:
|
||||
print(f" [WARN] 无法检查: {e}")
|
||||
return False
|
||||
@@ -186,25 +186,25 @@ def check_logs_for_timeouts():
|
||||
print("=" * 80)
|
||||
print("测试 4: 检查日志中的超时记录")
|
||||
print("=" * 80)
|
||||
|
||||
|
||||
try:
|
||||
import glob
|
||||
log_files = glob.glob("logs/unified_*.log")
|
||||
if not log_files:
|
||||
print(" [WARN] 未找到日志文件")
|
||||
return True
|
||||
|
||||
|
||||
# 读取最新的日志文件
|
||||
latest_log = max(log_files, key=os.path.getmtime)
|
||||
print(f" 检查日志文件: {latest_log}")
|
||||
|
||||
|
||||
timeout_count = 0
|
||||
screenshot_count = 0
|
||||
|
||||
|
||||
with open(latest_log, 'r', encoding='utf-8', errors='ignore') as f:
|
||||
# 只读取最后 1000 行
|
||||
lines = f.readlines()[-1000:]
|
||||
|
||||
|
||||
for line in lines:
|
||||
if '[TIMEOUT] 等待超时' in line or '等待超时' in line:
|
||||
timeout_count += 1
|
||||
@@ -220,17 +220,17 @@ def check_logs_for_timeouts():
|
||||
print(f" [WARN] 发现耗时过长的截图: {elapsed:.2f}秒")
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
print(f" 超时记录数(最近1000行): {timeout_count}")
|
||||
print(f" 截图耗时记录数: {screenshot_count}")
|
||||
|
||||
|
||||
if timeout_count == 0:
|
||||
print(" [OK] 未发现超时记录(符合预期)")
|
||||
else:
|
||||
print(f" [WARN] 发现 {timeout_count} 条超时记录")
|
||||
|
||||
|
||||
return True
|
||||
|
||||
|
||||
except Exception as e:
|
||||
print(f" [WARN] 无法检查日志: {e}")
|
||||
return False
|
||||
@@ -244,37 +244,37 @@ def main():
|
||||
print("=" * 80)
|
||||
print(f"测试时间: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}")
|
||||
print()
|
||||
|
||||
|
||||
results = []
|
||||
|
||||
|
||||
# 测试1: screenshot_operations
|
||||
results.append(("screenshot_operations", test_screenshot_operations()))
|
||||
|
||||
|
||||
# 测试2: underlying_operations
|
||||
results.append(("underlying_operations", test_underlying_operations()))
|
||||
|
||||
|
||||
# 测试3: 代码检查
|
||||
results.append(("stage_diagnosis", test_stage_diagnosis_screenshot()))
|
||||
|
||||
|
||||
# 测试4: 日志检查
|
||||
results.append(("log_check", check_logs_for_timeouts()))
|
||||
|
||||
|
||||
# 总结
|
||||
print()
|
||||
print("=" * 80)
|
||||
print("测试总结")
|
||||
print("=" * 80)
|
||||
|
||||
|
||||
passed = sum(1 for _, result in results if result)
|
||||
total = len(results)
|
||||
|
||||
|
||||
for name, result in results:
|
||||
status = "[PASS] 通过" if result else "[FAIL] 失败"
|
||||
print(f" {name}: {status}")
|
||||
|
||||
|
||||
print()
|
||||
print(f"总计: {passed}/{total} 测试通过")
|
||||
|
||||
|
||||
if passed == total:
|
||||
print("[SUCCESS] 所有测试通过!")
|
||||
return 0
|
||||
@@ -285,4 +285,3 @@ def main():
|
||||
|
||||
if __name__ == "__main__":
|
||||
exit(main())
|
||||
|
||||
File renamed without changes.
@@ -93,7 +93,3 @@ def test_loop_screenshot_service_stop():
|
||||
if __name__ == "__main__":
|
||||
success = test_loop_screenshot_service_stop()
|
||||
sys.exit(0 if success else 1)
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -16,25 +16,25 @@ def test_ocr_multithread_config():
|
||||
print("OCR多线程配置检查")
|
||||
print("=" * 70)
|
||||
print()
|
||||
|
||||
|
||||
# 1. CPU信息
|
||||
cpu_count = os.cpu_count() or 4
|
||||
print(f"1. CPU信息")
|
||||
print("-" * 70)
|
||||
print(f" CPU核心数: {cpu_count}")
|
||||
print()
|
||||
|
||||
|
||||
# 2. OMP线程数配置
|
||||
print("2. OMP线程数配置(底层库多线程)")
|
||||
print("-" * 70)
|
||||
omp_threads = os.environ.get("OMP_NUM_THREADS", "未设置")
|
||||
print(f" OMP_NUM_THREADS: {omp_threads}")
|
||||
|
||||
|
||||
# 计算推荐的OMP线程数
|
||||
optimal_omp_threads = min(4, max(2, cpu_count // 3))
|
||||
print(f" 推荐值: {optimal_omp_threads} (根据CPU核心数动态计算)")
|
||||
print()
|
||||
|
||||
|
||||
# 3. 线程池大小配置
|
||||
print("3. 线程池大小配置(任务级多线程)")
|
||||
print("-" * 70)
|
||||
@@ -42,7 +42,7 @@ def test_ocr_multithread_config():
|
||||
print(f" 推荐线程池大小: {optimal_workers} (根据CPU核心数动态计算)")
|
||||
print(f" 说明: 用于并行执行多个OCR任务")
|
||||
print()
|
||||
|
||||
|
||||
# 4. 优化说明
|
||||
print("4. 优化说明")
|
||||
print("-" * 70)
|
||||
@@ -60,7 +60,7 @@ def test_ocr_multithread_config():
|
||||
print(" - 充分利用多核CPU资源")
|
||||
print(" - 预计性能提升: 30-50% (取决于任务数量和CPU核心数)")
|
||||
print()
|
||||
|
||||
|
||||
# 5. 验证OCR引擎是否已初始化
|
||||
print("5. OCR引擎状态")
|
||||
print("-" * 70)
|
||||
@@ -74,7 +74,7 @@ def test_ocr_multithread_config():
|
||||
except Exception as e:
|
||||
print(f" 状态: 检查失败 - {e}")
|
||||
print()
|
||||
|
||||
|
||||
print("=" * 70)
|
||||
print("检查完成")
|
||||
print("=" * 70)
|
||||
@@ -98,11 +98,3 @@ def test_ocr_performance():
|
||||
if __name__ == "__main__":
|
||||
test_ocr_multithread_config()
|
||||
test_ocr_performance()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
+44
-47
@@ -17,27 +17,27 @@ def test_ocr_single(image_path, ocr_processor, omp_threads):
|
||||
"""测试单个OCR任务的性能"""
|
||||
old_omp = os.environ.get('OMP_NUM_THREADS', '4')
|
||||
os.environ['OMP_NUM_THREADS'] = str(omp_threads)
|
||||
|
||||
|
||||
try:
|
||||
img = Image.open(image_path)
|
||||
if img.mode != 'RGB':
|
||||
img = img.convert('RGB')
|
||||
img_np = np.array(img)
|
||||
|
||||
|
||||
start_time = time.time()
|
||||
|
||||
|
||||
if ocr_processor.ocr_type == "easyocr":
|
||||
result = ocr_processor.ocr.readtext(img_np)
|
||||
else:
|
||||
result = ocr_processor.ocr.ocr(img_np)
|
||||
|
||||
|
||||
elapsed = (time.time() - start_time) * 1000
|
||||
|
||||
|
||||
# 提取文本
|
||||
from Underlying_Operations import underlying_operations
|
||||
ops = underlying_operations()
|
||||
text = ops.extract_ocr_content(result)
|
||||
|
||||
|
||||
return {
|
||||
'time': elapsed,
|
||||
'text': text,
|
||||
@@ -61,24 +61,24 @@ def test_ocr_config(image_path, config_name, omp_threads, num_iterations=5):
|
||||
print(f"OMP_NUM_THREADS: {omp_threads}")
|
||||
print(f"迭代次数: {num_iterations}")
|
||||
print()
|
||||
|
||||
|
||||
# 初始化OCR
|
||||
try:
|
||||
from operations.ocr_operations import OCRProcessor
|
||||
ocr_processor = OCRProcessor()
|
||||
ensure_ocr = getattr(ocr_processor, '_ensure_ocr')
|
||||
ensure_ocr()
|
||||
|
||||
|
||||
if ocr_processor.ocr is None:
|
||||
print("[ERROR] OCR引擎未初始化")
|
||||
return None
|
||||
|
||||
|
||||
print(f"OCR引擎: {ocr_processor.ocr_type}")
|
||||
print()
|
||||
except Exception as e:
|
||||
print(f"[ERROR] OCR引擎初始化失败: {e}")
|
||||
return None
|
||||
|
||||
|
||||
# 执行多次测试
|
||||
times = []
|
||||
for i in range(num_iterations):
|
||||
@@ -88,21 +88,21 @@ def test_ocr_config(image_path, config_name, omp_threads, num_iterations=5):
|
||||
print(f" 第{i+1}次: {result['time']:.0f}ms - {result['text'][:30] if result['text'] else '(空)'}")
|
||||
else:
|
||||
print(f" 第{i+1}次: 失败 - {result.get('error', 'Unknown')}")
|
||||
|
||||
|
||||
if not times:
|
||||
print("[ERROR] 所有测试都失败")
|
||||
return None
|
||||
|
||||
|
||||
avg_time = sum(times) / len(times)
|
||||
min_time = min(times)
|
||||
max_time = max(times)
|
||||
|
||||
|
||||
print()
|
||||
print(f"平均耗时: {avg_time:.0f}ms")
|
||||
print(f"最快: {min_time:.0f}ms")
|
||||
print(f"最慢: {max_time:.0f}ms")
|
||||
print()
|
||||
|
||||
|
||||
return {
|
||||
'avg_time': avg_time,
|
||||
'min_time': min_time,
|
||||
@@ -119,42 +119,42 @@ def test_parallel_ocr(image_path, config_name, omp_threads, max_workers, num_tas
|
||||
print(f"线程池大小: {max_workers}")
|
||||
print(f"任务数量: {num_tasks}")
|
||||
print()
|
||||
|
||||
|
||||
# 设置OMP线程数
|
||||
old_omp = os.environ.get('OMP_NUM_THREADS', '4')
|
||||
os.environ['OMP_NUM_THREADS'] = str(omp_threads)
|
||||
|
||||
|
||||
# 初始化OCR
|
||||
try:
|
||||
from operations.ocr_operations import OCRProcessor
|
||||
ocr_processor = OCRProcessor()
|
||||
ensure_ocr = getattr(ocr_processor, '_ensure_ocr')
|
||||
ensure_ocr()
|
||||
|
||||
|
||||
if ocr_processor.ocr is None:
|
||||
print("[ERROR] OCR引擎未初始化")
|
||||
os.environ['OMP_NUM_THREADS'] = old_omp
|
||||
return None
|
||||
|
||||
|
||||
print(f"OCR引擎: {ocr_processor.ocr_type}")
|
||||
print()
|
||||
except Exception as e:
|
||||
print(f"[ERROR] OCR引擎初始化失败: {e}")
|
||||
os.environ['OMP_NUM_THREADS'] = old_omp
|
||||
return None
|
||||
|
||||
|
||||
# 创建多个相同的任务(使用同一张图片)
|
||||
def ocr_task():
|
||||
return test_ocr_single(image_path, ocr_processor, omp_threads)
|
||||
|
||||
|
||||
# 并行执行
|
||||
print("开始并行OCR识别...")
|
||||
start_time = time.time()
|
||||
results = []
|
||||
|
||||
|
||||
with ThreadPoolExecutor(max_workers=max_workers) as executor:
|
||||
futures = [executor.submit(ocr_task) for _ in range(num_tasks)]
|
||||
|
||||
|
||||
for i, future in enumerate(futures):
|
||||
try:
|
||||
result = future.result(timeout=60)
|
||||
@@ -166,12 +166,12 @@ def test_parallel_ocr(image_path, config_name, omp_threads, max_workers, num_tas
|
||||
except Exception as e:
|
||||
print(f" 任务{i+1}: 异常 - {e}")
|
||||
results.append({'success': False, 'error': str(e)})
|
||||
|
||||
|
||||
total_elapsed = (time.time() - start_time) * 1000
|
||||
|
||||
|
||||
# 恢复OMP设置
|
||||
os.environ['OMP_NUM_THREADS'] = old_omp
|
||||
|
||||
|
||||
# 统计结果
|
||||
successful_results = [r for r in results if r.get('success', False)]
|
||||
efficiency = 0 # 初始化效率变量
|
||||
@@ -188,7 +188,7 @@ def test_parallel_ocr(image_path, config_name, omp_threads, max_workers, num_tas
|
||||
efficiency = total_task_time / total_elapsed
|
||||
print(f"并行效率: {efficiency:.2f}x (理想值: {num_tasks:.1f}x)")
|
||||
print()
|
||||
|
||||
|
||||
return {
|
||||
'total_time': total_elapsed,
|
||||
'avg_task_time': avg_task_time,
|
||||
@@ -203,26 +203,26 @@ def main():
|
||||
"""主函数"""
|
||||
# 默认图片路径
|
||||
default_image = "pic/debug_captures/2025-12-31/20251231_152118_ocr_福袋倒计时_分钟_识别后_(390,1110)-(480,1230)_模式_1_文本长度_2_数字_14_类型_digits_平均置信度_0.9991_最小置信度_0.9991_最大置信度_0.9991_置信度项数_1_有完整截图_是_有坐标_是.png"
|
||||
|
||||
|
||||
if len(sys.argv) > 1:
|
||||
image_path = sys.argv[1]
|
||||
else:
|
||||
image_path = default_image
|
||||
|
||||
|
||||
if not os.path.isabs(image_path):
|
||||
project_root = os.path.dirname(os.path.abspath(__file__))
|
||||
image_path = os.path.join(project_root, image_path)
|
||||
|
||||
|
||||
if not os.path.exists(image_path):
|
||||
print(f"[ERROR] 图片文件不存在: {image_path}")
|
||||
return
|
||||
|
||||
|
||||
print("=" * 70)
|
||||
print("OCR多线程性能测试")
|
||||
print("=" * 70)
|
||||
print()
|
||||
print(f"测试图片: {os.path.basename(image_path)}")
|
||||
|
||||
|
||||
# 获取系统信息
|
||||
cpu_count = os.cpu_count() or 4
|
||||
print(f"CPU核心数: {cpu_count}")
|
||||
@@ -233,7 +233,7 @@ def main():
|
||||
except (ImportError, AttributeError):
|
||||
optimal_workers = 6
|
||||
print()
|
||||
|
||||
|
||||
# 测试1: 单次OCR - 优化前
|
||||
print("\n" + "="*70)
|
||||
print("测试1: 单次OCR性能对比")
|
||||
@@ -244,9 +244,9 @@ def main():
|
||||
omp_threads=1,
|
||||
num_iterations=5
|
||||
)
|
||||
|
||||
|
||||
time.sleep(1)
|
||||
|
||||
|
||||
# 测试2: 单次OCR - 优化后
|
||||
result_single_new = test_ocr_config(
|
||||
image_path,
|
||||
@@ -254,7 +254,7 @@ def main():
|
||||
omp_threads=6,
|
||||
num_iterations=5
|
||||
)
|
||||
|
||||
|
||||
# 测试3: 并行OCR - 优化前
|
||||
print("\n" + "="*70)
|
||||
print("测试2: 并行OCR性能对比")
|
||||
@@ -266,9 +266,9 @@ def main():
|
||||
max_workers=6,
|
||||
num_tasks=6
|
||||
)
|
||||
|
||||
|
||||
time.sleep(1)
|
||||
|
||||
|
||||
# 测试4: 并行OCR - 优化后
|
||||
result_parallel_new = test_parallel_ocr(
|
||||
image_path,
|
||||
@@ -277,38 +277,38 @@ def main():
|
||||
max_workers=optimal_workers,
|
||||
num_tasks=6
|
||||
)
|
||||
|
||||
|
||||
# 性能对比总结
|
||||
print()
|
||||
print("=" * 70)
|
||||
print("性能对比总结")
|
||||
print("=" * 70)
|
||||
print()
|
||||
|
||||
|
||||
if result_single_old and result_single_new:
|
||||
old_avg = result_single_old['avg_time']
|
||||
new_avg = result_single_new['avg_time']
|
||||
speedup = old_avg / new_avg if new_avg > 0 else 0
|
||||
|
||||
|
||||
print("单次OCR性能:")
|
||||
print(f" 优化前平均: {old_avg:.0f}ms")
|
||||
print(f" 优化后平均: {new_avg:.0f}ms")
|
||||
print(f" 性能提升: {speedup:.2f}x")
|
||||
print(f" 时间减少: {(1 - new_avg/old_avg)*100:.1f}%")
|
||||
print()
|
||||
|
||||
|
||||
if result_parallel_old and result_parallel_new:
|
||||
old_total = result_parallel_old['total_time']
|
||||
new_total = result_parallel_new['total_time']
|
||||
speedup = old_total / new_total if new_total > 0 else 0
|
||||
|
||||
|
||||
print("并行OCR性能:")
|
||||
print(f" 优化前总耗时: {old_total:.0f}ms ({old_total/1000:.2f}秒)")
|
||||
print(f" 优化后总耗时: {new_total:.0f}ms ({new_total/1000:.2f}秒)")
|
||||
print(f" 性能提升: {speedup:.2f}x")
|
||||
print(f" 时间减少: {(1 - new_total/old_total)*100:.1f}%")
|
||||
print()
|
||||
|
||||
|
||||
old_avg = result_parallel_old['avg_task_time']
|
||||
new_avg = result_parallel_new['avg_task_time']
|
||||
print("单任务性能:")
|
||||
@@ -316,13 +316,10 @@ def main():
|
||||
print(f" 优化后平均任务: {new_avg:.0f}ms")
|
||||
print(f" 单任务性能提升: {old_avg/new_avg:.2f}x" if new_avg > 0 else " 单任务性能提升: N/A")
|
||||
print()
|
||||
|
||||
|
||||
print("=" * 70)
|
||||
print("测试完成")
|
||||
print("=" * 70)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
|
||||
|
||||
@@ -15,18 +15,18 @@ def test_ocr_speed(image_path: str, iterations: int = 5):
|
||||
print("OCR速度测试")
|
||||
print("=" * 70)
|
||||
print()
|
||||
|
||||
|
||||
# 检查图片文件是否存在
|
||||
if not os.path.exists(image_path):
|
||||
print(f"[ERROR] 图片文件不存在: {image_path}")
|
||||
return
|
||||
|
||||
|
||||
file_size = os.path.getsize(image_path) / 1024 # KB
|
||||
print(f"测试图片: {image_path}")
|
||||
print(f"文件大小: {file_size:.2f} KB")
|
||||
print(f"测试次数: {iterations} 次")
|
||||
print()
|
||||
|
||||
|
||||
# 获取图片信息
|
||||
try:
|
||||
from PIL import Image
|
||||
@@ -34,11 +34,11 @@ def test_ocr_speed(image_path: str, iterations: int = 5):
|
||||
width, height = img.size
|
||||
print(f"图片尺寸: {width}x{height}")
|
||||
print(f"图片模式: {img.mode}")
|
||||
|
||||
|
||||
# 计算图片像素数
|
||||
total_pixels = width * height
|
||||
print(f"总像素数: {total_pixels:,}")
|
||||
|
||||
|
||||
# 判断图片大小
|
||||
if total_pixels > 2000000: # 大于200万像素
|
||||
print(f" [提示] 图片较大,OCR处理可能需要较长时间")
|
||||
@@ -47,44 +47,44 @@ def test_ocr_speed(image_path: str, iterations: int = 5):
|
||||
except Exception as e:
|
||||
print(f"[WARNING] 无法读取图片信息: {e}")
|
||||
print()
|
||||
|
||||
|
||||
# 检查OCR引擎
|
||||
print("1. OCR引擎信息")
|
||||
print("-" * 70)
|
||||
try:
|
||||
from operations.ocr_operations import _ocr_processor
|
||||
_ocr_processor._ensure_ocr()
|
||||
|
||||
|
||||
if _ocr_processor.ocr is None:
|
||||
print("[ERROR] OCR引擎未初始化")
|
||||
return
|
||||
|
||||
|
||||
print(f" OCR引擎: {_ocr_processor.ocr_type}")
|
||||
print(f" OMP线程数: {os.environ.get('OMP_NUM_THREADS', '未设置')}")
|
||||
print()
|
||||
except Exception as e:
|
||||
print(f"[ERROR] OCR引擎检查失败: {e}")
|
||||
return
|
||||
|
||||
|
||||
# 测试OCR速度
|
||||
print("2. OCR速度测试")
|
||||
print("-" * 70)
|
||||
|
||||
|
||||
times = []
|
||||
results = []
|
||||
|
||||
|
||||
for i in range(iterations):
|
||||
try:
|
||||
# 导入OCR操作
|
||||
from Underlying_Operations import underlying_operations
|
||||
ops = underlying_operations()
|
||||
|
||||
|
||||
# 确保OCR已初始化
|
||||
ops._ensure_ocr()
|
||||
|
||||
|
||||
# 执行OCR(使用analyse_pic_digits,因为这是数字识别)
|
||||
start_time = time.time()
|
||||
|
||||
|
||||
# 直接使用图片路径进行OCR
|
||||
# 注意:如果图片很大,OCR会处理整个图片,这可能会很慢
|
||||
# 建议使用预处理后的小图片进行测试
|
||||
@@ -93,23 +93,23 @@ def test_ocr_speed(image_path: str, iterations: int = 5):
|
||||
change_color=1, # 数字识别模式
|
||||
pic_path=image_path
|
||||
)
|
||||
|
||||
|
||||
# 记录各个阶段的耗时(如果可能)
|
||||
# 注意:analyse_pic_digits 内部会进行图像预处理和OCR识别
|
||||
|
||||
|
||||
elapsed = (time.time() - start_time) * 1000 # 转换为毫秒
|
||||
times.append(elapsed)
|
||||
results.append(result)
|
||||
|
||||
|
||||
print(f" 第 {i+1} 次: {elapsed:.0f}ms, 识别结果: {result[:50] if result else '(空)'}")
|
||||
|
||||
|
||||
except Exception as e:
|
||||
print(f" 第 {i+1} 次: 失败 - {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
|
||||
|
||||
print()
|
||||
|
||||
|
||||
# 统计结果
|
||||
if times:
|
||||
print("3. 性能统计")
|
||||
@@ -117,13 +117,13 @@ def test_ocr_speed(image_path: str, iterations: int = 5):
|
||||
avg_time = sum(times) / len(times)
|
||||
min_time = min(times)
|
||||
max_time = max(times)
|
||||
|
||||
|
||||
print(f" 平均耗时: {avg_time:.0f}ms")
|
||||
print(f" 最快耗时: {min_time:.0f}ms")
|
||||
print(f" 最慢耗时: {max_time:.0f}ms")
|
||||
print(f" 耗时范围: {max_time - min_time:.0f}ms")
|
||||
print()
|
||||
|
||||
|
||||
# 识别结果统计
|
||||
print("4. 识别结果")
|
||||
print("-" * 70)
|
||||
@@ -132,7 +132,7 @@ def test_ocr_speed(image_path: str, iterations: int = 5):
|
||||
count = results.count(result)
|
||||
print(f" 结果 {i}: {result[:100] if result else '(空)'} (出现 {count} 次)")
|
||||
print()
|
||||
|
||||
|
||||
# 性能评估
|
||||
print("5. 性能评估")
|
||||
print("-" * 70)
|
||||
@@ -147,7 +147,7 @@ def test_ocr_speed(image_path: str, iterations: int = 5):
|
||||
else:
|
||||
print(" [很慢] OCR速度很慢 (> 5000ms)")
|
||||
print(" 提示: 如果图片很大,建议先裁剪到目标区域再OCR")
|
||||
|
||||
|
||||
# 多线程效果评估
|
||||
cpu_count = os.cpu_count() or 4
|
||||
omp_threads = int(os.environ.get('OMP_NUM_THREADS', '1'))
|
||||
@@ -160,7 +160,7 @@ def test_ocr_speed(image_path: str, iterations: int = 5):
|
||||
print()
|
||||
else:
|
||||
print("[ERROR] 所有测试都失败了")
|
||||
|
||||
|
||||
print("=" * 70)
|
||||
print("测试完成")
|
||||
print("=" * 70)
|
||||
@@ -169,13 +169,13 @@ def main():
|
||||
"""主函数"""
|
||||
# 默认图片路径
|
||||
default_image = "pic/debug_captures/2025-12-31/20251231_152116_ocr_福袋倒计时_秒_预处理后_(480,1110)-(570,1230)_模式_1_尺寸_270x360_来源_福袋倒计时_秒.png_有完整截图_是_有坐标_是_类型_digits.png"
|
||||
|
||||
|
||||
# 从命令行参数获取图片路径
|
||||
if len(sys.argv) > 1:
|
||||
image_path = sys.argv[1]
|
||||
else:
|
||||
image_path = default_image
|
||||
|
||||
|
||||
# 获取测试次数
|
||||
iterations = 5
|
||||
if len(sys.argv) > 2:
|
||||
@@ -183,15 +183,14 @@ def main():
|
||||
iterations = int(sys.argv[2])
|
||||
except:
|
||||
pass
|
||||
|
||||
|
||||
# 转换为绝对路径
|
||||
if not os.path.isabs(image_path):
|
||||
# 尝试相对于项目根目录
|
||||
project_root = os.path.dirname(os.path.abspath(__file__))
|
||||
image_path = os.path.join(project_root, image_path)
|
||||
|
||||
|
||||
test_ocr_speed(image_path, iterations)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
@@ -16,12 +16,12 @@ def test_ocr_on_region(image_path: str, region: Optional[tuple] = None, iteratio
|
||||
print("OCR速度测试(区域优化版)")
|
||||
print("=" * 70)
|
||||
print()
|
||||
|
||||
|
||||
# 检查图片文件是否存在
|
||||
if not os.path.exists(image_path):
|
||||
print(f"[ERROR] 图片文件不存在: {image_path}")
|
||||
return
|
||||
|
||||
|
||||
# 加载图片
|
||||
try:
|
||||
img = Image.open(image_path)
|
||||
@@ -33,7 +33,7 @@ def test_ocr_on_region(image_path: str, region: Optional[tuple] = None, iteratio
|
||||
except Exception as e:
|
||||
print(f"[ERROR] 无法加载图片: {e}")
|
||||
return
|
||||
|
||||
|
||||
# 如果指定了区域,裁剪图片
|
||||
if region:
|
||||
x1, y1, x2, y2 = region
|
||||
@@ -42,7 +42,7 @@ def test_ocr_on_region(image_path: str, region: Optional[tuple] = None, iteratio
|
||||
print(f"裁剪后尺寸: {img.size[0]}x{img.size[1]}")
|
||||
print(f"裁剪后像素数: {img.size[0] * img.size[1]:,}")
|
||||
print()
|
||||
|
||||
|
||||
# 保存裁剪后的临时图片
|
||||
import tempfile
|
||||
temp_dir = tempfile.gettempdir()
|
||||
@@ -51,70 +51,70 @@ def test_ocr_on_region(image_path: str, region: Optional[tuple] = None, iteratio
|
||||
test_image_path = temp_image
|
||||
else:
|
||||
test_image_path = image_path
|
||||
|
||||
|
||||
# 测试OCR速度
|
||||
print("开始OCR速度测试...")
|
||||
print("-" * 70)
|
||||
|
||||
|
||||
try:
|
||||
from operations.ocr_operations import _ocr_processor
|
||||
_ocr_processor._ensure_ocr()
|
||||
|
||||
|
||||
if _ocr_processor.ocr is None:
|
||||
print("[ERROR] OCR引擎未初始化")
|
||||
return
|
||||
|
||||
|
||||
print(f"OCR引擎: {_ocr_processor.ocr_type}")
|
||||
print(f"OMP线程数: {os.environ.get('OMP_NUM_THREADS', '未设置')}")
|
||||
print()
|
||||
except Exception as e:
|
||||
print(f"[ERROR] OCR引擎检查失败: {e}")
|
||||
return
|
||||
|
||||
|
||||
# 执行多次测试
|
||||
times = []
|
||||
results = []
|
||||
|
||||
|
||||
for i in range(iterations):
|
||||
try:
|
||||
import numpy as np
|
||||
|
||||
|
||||
# 准备图像
|
||||
if img.mode != 'RGB':
|
||||
img_rgb = img.convert('RGB')
|
||||
else:
|
||||
img_rgb = img
|
||||
|
||||
|
||||
# 转换为numpy数组
|
||||
img_np = np.array(img_rgb)
|
||||
|
||||
|
||||
# 执行OCR
|
||||
start_time = time.time()
|
||||
|
||||
|
||||
if _ocr_processor.ocr_type == "easyocr":
|
||||
result = _ocr_processor.ocr.readtext(img_np)
|
||||
else:
|
||||
result = _ocr_processor.ocr.ocr(img_np)
|
||||
|
||||
|
||||
elapsed = (time.time() - start_time) * 1000 # 转换为毫秒
|
||||
|
||||
|
||||
# 提取文本
|
||||
from Underlying_Operations import underlying_operations
|
||||
ops = underlying_operations()
|
||||
text = ops.extract_ocr_content(result)
|
||||
|
||||
|
||||
times.append(elapsed)
|
||||
results.append(text)
|
||||
|
||||
|
||||
print(f"第 {i+1} 次: {elapsed:.0f}ms, 识别结果: {text[:50] if text else '(空)'}")
|
||||
|
||||
|
||||
except Exception as e:
|
||||
print(f"第 {i+1} 次: 失败 - {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
|
||||
|
||||
print()
|
||||
|
||||
|
||||
# 统计结果
|
||||
if times:
|
||||
print("性能统计")
|
||||
@@ -122,13 +122,13 @@ def test_ocr_on_region(image_path: str, region: Optional[tuple] = None, iteratio
|
||||
avg_time = sum(times) / len(times)
|
||||
min_time = min(times)
|
||||
max_time = max(times)
|
||||
|
||||
|
||||
print(f"平均耗时: {avg_time:.0f}ms ({avg_time/1000:.2f}秒)")
|
||||
print(f"最快耗时: {min_time:.0f}ms ({min_time/1000:.2f}秒)")
|
||||
print(f"最慢耗时: {max_time:.0f}ms ({max_time/1000:.2f}秒)")
|
||||
print(f"耗时范围: {max_time - min_time:.0f}ms")
|
||||
print()
|
||||
|
||||
|
||||
# 识别结果
|
||||
print("识别结果")
|
||||
print("-" * 70)
|
||||
@@ -137,7 +137,7 @@ def test_ocr_on_region(image_path: str, region: Optional[tuple] = None, iteratio
|
||||
count = results.count(result)
|
||||
print(f"结果 {i}: {result[:100] if result else '(空)'} (出现 {count} 次)")
|
||||
print()
|
||||
|
||||
|
||||
# 性能对比
|
||||
if region:
|
||||
original_pixels = original_size[0] * original_size[1]
|
||||
@@ -150,14 +150,14 @@ def test_ocr_on_region(image_path: str, region: Optional[tuple] = None, iteratio
|
||||
print(f"像素减少: {reduction:.1f}%")
|
||||
print(f"预计原始图片OCR耗时: {avg_time * (original_pixels / crop_pixels):.0f}ms")
|
||||
print()
|
||||
|
||||
|
||||
# 清理临时文件
|
||||
if region and os.path.exists(test_image_path):
|
||||
try:
|
||||
os.remove(test_image_path)
|
||||
except:
|
||||
pass
|
||||
|
||||
|
||||
print("=" * 70)
|
||||
print("测试完成")
|
||||
print("=" * 70)
|
||||
@@ -166,18 +166,18 @@ def main():
|
||||
"""主函数"""
|
||||
# 默认图片路径
|
||||
default_image = "pic/debug_captures/2025-12-31/20251231_152116_ocr_福袋倒计时_秒_预处理后_(480,1110)-(570,1230)_模式_1_尺寸_270x360_来源_福袋倒计时_秒.png_有完整截图_是_有坐标_是_类型_digits.png"
|
||||
|
||||
|
||||
# 从命令行参数获取图片路径
|
||||
if len(sys.argv) > 1:
|
||||
image_path = sys.argv[1]
|
||||
else:
|
||||
image_path = default_image
|
||||
|
||||
|
||||
# 转换为绝对路径
|
||||
if not os.path.isabs(image_path):
|
||||
project_root = os.path.dirname(os.path.abspath(__file__))
|
||||
image_path = os.path.join(project_root, image_path)
|
||||
|
||||
|
||||
# 从文件名提取区域信息(如果文件名包含坐标)
|
||||
region = None
|
||||
if "(480,1110)-(570,1230)" in image_path:
|
||||
@@ -185,7 +185,7 @@ def main():
|
||||
region = (480, 1110, 570, 1230)
|
||||
print("[INFO] 检测到文件名中的坐标信息,将使用裁剪区域进行测试")
|
||||
print()
|
||||
|
||||
|
||||
# 获取测试次数
|
||||
iterations = 5
|
||||
if len(sys.argv) > 2:
|
||||
@@ -193,13 +193,13 @@ def main():
|
||||
iterations = int(sys.argv[2])
|
||||
except:
|
||||
pass
|
||||
|
||||
|
||||
# 先测试完整图片
|
||||
print("=" * 70)
|
||||
print("测试1: 完整图片OCR")
|
||||
print("=" * 70)
|
||||
test_ocr_on_region(image_path, region=None, iterations=iterations)
|
||||
|
||||
|
||||
# 如果检测到区域信息,再测试裁剪区域
|
||||
if region:
|
||||
print()
|
||||
@@ -210,5 +210,3 @@ def main():
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
|
||||
+55
-56
@@ -19,7 +19,7 @@ def test_serial_ocr(image_path: str, num_tasks: int = 3):
|
||||
print(f"任务数量: {num_tasks}")
|
||||
print(f"OMP_NUM_THREADS: {os.environ.get('OMP_NUM_THREADS', '未设置')}")
|
||||
print()
|
||||
|
||||
|
||||
# 加载图片
|
||||
try:
|
||||
img = Image.open(image_path)
|
||||
@@ -31,55 +31,55 @@ def test_serial_ocr(image_path: str, num_tasks: int = 3):
|
||||
except Exception as e:
|
||||
print(f"[ERROR] 无法加载图片: {e}")
|
||||
return None
|
||||
|
||||
|
||||
# 初始化OCR
|
||||
try:
|
||||
from operations.ocr_operations import _ocr_processor
|
||||
_ocr_processor._ensure_ocr()
|
||||
|
||||
|
||||
if _ocr_processor.ocr is None:
|
||||
print("[ERROR] OCR引擎未初始化")
|
||||
return None
|
||||
|
||||
|
||||
print(f"OCR引擎: {_ocr_processor.ocr_type}")
|
||||
print()
|
||||
except Exception as e:
|
||||
print(f"[ERROR] OCR引擎初始化失败: {e}")
|
||||
return None
|
||||
|
||||
|
||||
# 串行执行OCR任务
|
||||
start_time = time.time()
|
||||
results = []
|
||||
|
||||
|
||||
print("开始串行OCR测试...")
|
||||
for i in range(num_tasks):
|
||||
task_start = time.time()
|
||||
|
||||
|
||||
try:
|
||||
if _ocr_processor.ocr_type == "easyocr":
|
||||
result = _ocr_processor.ocr.readtext(img_np)
|
||||
else:
|
||||
result = _ocr_processor.ocr.ocr(img_np)
|
||||
|
||||
|
||||
# 提取文本
|
||||
from Underlying_Operations import underlying_operations
|
||||
ops = underlying_operations()
|
||||
text = ops.extract_ocr_content(result)
|
||||
|
||||
|
||||
task_elapsed = (time.time() - task_start) * 1000
|
||||
results.append(text)
|
||||
print(f" 任务 {i+1}/{num_tasks}: {task_elapsed:.0f}ms, 结果: {text[:30] if text else '(空)'}")
|
||||
except Exception as e:
|
||||
print(f" 任务 {i+1}/{num_tasks}: 失败 - {e}")
|
||||
results.append(None)
|
||||
|
||||
|
||||
total_elapsed = (time.time() - start_time) * 1000
|
||||
|
||||
|
||||
print()
|
||||
print(f"总耗时: {total_elapsed:.0f}ms ({total_elapsed/1000:.2f}秒)")
|
||||
print(f"平均每个任务: {total_elapsed/num_tasks:.0f}ms")
|
||||
print()
|
||||
|
||||
|
||||
return total_elapsed
|
||||
|
||||
def test_parallel_ocr(image_path: str, num_tasks: int = 3):
|
||||
@@ -89,7 +89,7 @@ def test_parallel_ocr(image_path: str, num_tasks: int = 3):
|
||||
print("=" * 70)
|
||||
print(f"任务数量: {num_tasks}")
|
||||
print(f"OMP_NUM_THREADS: {os.environ.get('OMP_NUM_THREADS', '未设置')}")
|
||||
|
||||
|
||||
# 获取最优线程数
|
||||
try:
|
||||
from operations.screenshot_service import get_optimal_workers
|
||||
@@ -99,7 +99,7 @@ def test_parallel_ocr(image_path: str, num_tasks: int = 3):
|
||||
optimal_workers = 6
|
||||
print(f"线程池大小: {optimal_workers} (默认)")
|
||||
print()
|
||||
|
||||
|
||||
# 加载图片
|
||||
try:
|
||||
img = Image.open(image_path)
|
||||
@@ -111,22 +111,22 @@ def test_parallel_ocr(image_path: str, num_tasks: int = 3):
|
||||
except Exception as e:
|
||||
print(f"[ERROR] 无法加载图片: {e}")
|
||||
return None
|
||||
|
||||
|
||||
# 初始化OCR
|
||||
try:
|
||||
from operations.ocr_operations import _ocr_processor
|
||||
_ocr_processor._ensure_ocr()
|
||||
|
||||
|
||||
if _ocr_processor.ocr is None:
|
||||
print("[ERROR] OCR引擎未初始化")
|
||||
return None
|
||||
|
||||
|
||||
print(f"OCR引擎: {_ocr_processor.ocr_type}")
|
||||
print()
|
||||
except Exception as e:
|
||||
print(f"[ERROR] OCR引擎初始化失败: {e}")
|
||||
return None
|
||||
|
||||
|
||||
# 定义OCR任务函数
|
||||
def ocr_task(task_id):
|
||||
"""单个OCR任务"""
|
||||
@@ -135,26 +135,26 @@ def test_parallel_ocr(image_path: str, num_tasks: int = 3):
|
||||
result = _ocr_processor.ocr.readtext(img_np)
|
||||
else:
|
||||
result = _ocr_processor.ocr.ocr(img_np)
|
||||
|
||||
|
||||
# 提取文本
|
||||
from Underlying_Operations import underlying_operations
|
||||
ops = underlying_operations()
|
||||
text = ops.extract_ocr_content(result)
|
||||
|
||||
|
||||
return text
|
||||
except Exception as e:
|
||||
print(f" 任务 {task_id} 失败: {e}")
|
||||
return None
|
||||
|
||||
|
||||
# 并行执行OCR任务
|
||||
start_time = time.time()
|
||||
results = []
|
||||
|
||||
|
||||
print("开始并行OCR测试...")
|
||||
with ThreadPoolExecutor(max_workers=optimal_workers) as executor:
|
||||
# 提交所有任务
|
||||
futures = {executor.submit(ocr_task, i+1): i+1 for i in range(num_tasks)}
|
||||
|
||||
|
||||
# 收集结果
|
||||
task_times = {}
|
||||
for future in futures:
|
||||
@@ -169,9 +169,9 @@ def test_parallel_ocr(image_path: str, num_tasks: int = 3):
|
||||
except Exception as e:
|
||||
print(f" 任务 {task_id}/{num_tasks}: 失败 - {e}")
|
||||
results.append(None)
|
||||
|
||||
|
||||
total_elapsed = (time.time() - start_time) * 1000
|
||||
|
||||
|
||||
print()
|
||||
print(f"总耗时: {total_elapsed:.0f}ms ({total_elapsed/1000:.2f}秒)")
|
||||
if task_times:
|
||||
@@ -179,7 +179,7 @@ def test_parallel_ocr(image_path: str, num_tasks: int = 3):
|
||||
print(f"平均每个任务: {avg_task_time:.0f}ms")
|
||||
print(f"并行效率: {avg_task_time * num_tasks / total_elapsed:.1f}x (理想情况下应该接近{num_tasks}x)")
|
||||
print()
|
||||
|
||||
|
||||
return total_elapsed
|
||||
|
||||
def test_parallel_ocr_old_config(image_path: str, num_tasks: int = 3):
|
||||
@@ -188,14 +188,14 @@ def test_parallel_ocr_old_config(image_path: str, num_tasks: int = 3):
|
||||
print("测试3: 并行OCR(旧配置:OMP=1, 线程池=6)")
|
||||
print("=" * 70)
|
||||
print(f"任务数量: {num_tasks}")
|
||||
|
||||
|
||||
# 临时设置旧配置
|
||||
old_omp = os.environ.get('OMP_NUM_THREADS', '4')
|
||||
os.environ['OMP_NUM_THREADS'] = '1'
|
||||
print(f"OMP_NUM_THREADS: 1 (临时设置)")
|
||||
print(f"线程池大小: 6 (固定)")
|
||||
print()
|
||||
|
||||
|
||||
# 加载图片
|
||||
try:
|
||||
img = Image.open(image_path)
|
||||
@@ -208,7 +208,7 @@ def test_parallel_ocr_old_config(image_path: str, num_tasks: int = 3):
|
||||
print(f"[ERROR] 无法加载图片: {e}")
|
||||
os.environ['OMP_NUM_THREADS'] = old_omp
|
||||
return None
|
||||
|
||||
|
||||
# 重新初始化OCR(使用新的OMP设置)
|
||||
try:
|
||||
from operations.ocr_operations import _ocr_processor
|
||||
@@ -221,7 +221,7 @@ def test_parallel_ocr_old_config(image_path: str, num_tasks: int = 3):
|
||||
print(f"[ERROR] OCR引擎检查失败: {e}")
|
||||
os.environ['OMP_NUM_THREADS'] = old_omp
|
||||
return None
|
||||
|
||||
|
||||
# 定义OCR任务函数
|
||||
def ocr_task(task_id):
|
||||
"""单个OCR任务"""
|
||||
@@ -230,26 +230,26 @@ def test_parallel_ocr_old_config(image_path: str, num_tasks: int = 3):
|
||||
result = _ocr_processor.ocr.readtext(img_np)
|
||||
else:
|
||||
result = _ocr_processor.ocr.ocr(img_np)
|
||||
|
||||
|
||||
# 提取文本
|
||||
from Underlying_Operations import underlying_operations
|
||||
ops = underlying_operations()
|
||||
text = ops.extract_ocr_content(result)
|
||||
|
||||
|
||||
return text
|
||||
except Exception as e:
|
||||
print(f" 任务 {task_id} 失败: {e}")
|
||||
return None
|
||||
|
||||
|
||||
# 并行执行OCR任务(使用旧的线程池大小)
|
||||
start_time = time.time()
|
||||
results = []
|
||||
|
||||
|
||||
print("开始并行OCR测试(旧配置)...")
|
||||
with ThreadPoolExecutor(max_workers=6) as executor:
|
||||
# 提交所有任务
|
||||
futures = {executor.submit(ocr_task, i+1): i+1 for i in range(num_tasks)}
|
||||
|
||||
|
||||
# 收集结果
|
||||
task_times = {}
|
||||
for future in futures:
|
||||
@@ -264,42 +264,42 @@ def test_parallel_ocr_old_config(image_path: str, num_tasks: int = 3):
|
||||
except Exception as e:
|
||||
print(f" 任务 {task_id}/{num_tasks}: 失败 - {e}")
|
||||
results.append(None)
|
||||
|
||||
|
||||
total_elapsed = (time.time() - start_time) * 1000
|
||||
|
||||
|
||||
# 恢复OMP设置
|
||||
os.environ['OMP_NUM_THREADS'] = old_omp
|
||||
|
||||
|
||||
print()
|
||||
print(f"总耗时: {total_elapsed:.0f}ms ({total_elapsed/1000:.2f}秒)")
|
||||
if task_times:
|
||||
avg_task_time = sum(task_times.values()) / len(task_times)
|
||||
print(f"平均每个任务: {avg_task_time:.0f}ms")
|
||||
print()
|
||||
|
||||
|
||||
return total_elapsed
|
||||
|
||||
def main():
|
||||
"""主函数"""
|
||||
# 默认图片路径
|
||||
default_image = "pic/debug_captures/2025-12-31/20251231_152116_ocr_福袋倒计时_秒_预处理后_(480,1110)-(570,1230)_模式_1_尺寸_270x360_来源_福袋倒计时_秒.png_有完整截图_是_有坐标_是_类型_digits.png"
|
||||
|
||||
|
||||
# 从命令行参数获取图片路径
|
||||
if len(sys.argv) > 1:
|
||||
image_path = sys.argv[1]
|
||||
else:
|
||||
image_path = default_image
|
||||
|
||||
|
||||
# 转换为绝对路径
|
||||
if not os.path.isabs(image_path):
|
||||
project_root = os.path.dirname(os.path.abspath(__file__))
|
||||
image_path = os.path.join(project_root, image_path)
|
||||
|
||||
|
||||
# 检查文件是否存在
|
||||
if not os.path.exists(image_path):
|
||||
print(f"[ERROR] 图片文件不存在: {image_path}")
|
||||
return
|
||||
|
||||
|
||||
# 获取任务数量(默认3个,减少测试时间)
|
||||
num_tasks = 3
|
||||
if len(sys.argv) > 2:
|
||||
@@ -307,7 +307,7 @@ def main():
|
||||
num_tasks = int(sys.argv[2])
|
||||
except:
|
||||
pass
|
||||
|
||||
|
||||
print("=" * 70)
|
||||
print("并行OCR性能对比测试")
|
||||
print("=" * 70)
|
||||
@@ -315,7 +315,7 @@ def main():
|
||||
print(f"测试图片: {os.path.basename(image_path)}")
|
||||
print(f"任务数量: {num_tasks}")
|
||||
print()
|
||||
|
||||
|
||||
# 获取当前配置信息
|
||||
cpu_count = os.cpu_count() or 4
|
||||
omp_threads = os.environ.get('OMP_NUM_THREADS', '未设置')
|
||||
@@ -330,43 +330,43 @@ def main():
|
||||
pass
|
||||
print()
|
||||
print()
|
||||
|
||||
|
||||
# 测试1: 串行OCR
|
||||
serial_time = test_serial_ocr(image_path, num_tasks)
|
||||
|
||||
|
||||
print()
|
||||
print()
|
||||
|
||||
|
||||
# 测试2: 并行OCR(优化后)
|
||||
parallel_time = test_parallel_ocr(image_path, num_tasks)
|
||||
|
||||
|
||||
print()
|
||||
print()
|
||||
|
||||
|
||||
# 测试3: 并行OCR(旧配置)
|
||||
parallel_old_time = test_parallel_ocr_old_config(image_path, num_tasks)
|
||||
|
||||
|
||||
# 性能对比总结
|
||||
print()
|
||||
print("=" * 70)
|
||||
print("性能对比总结")
|
||||
print("=" * 70)
|
||||
print()
|
||||
|
||||
|
||||
if serial_time and parallel_time:
|
||||
speedup = serial_time / parallel_time
|
||||
print(f"串行OCR: {serial_time:.0f}ms ({serial_time/1000:.2f}秒)")
|
||||
print(f"并行OCR: {parallel_time:.0f}ms ({parallel_time/1000:.2f}秒)")
|
||||
print(f"性能提升: {speedup:.2f}x ({(1 - parallel_time/serial_time)*100:.1f}% 时间减少)")
|
||||
print()
|
||||
|
||||
|
||||
if parallel_old_time and parallel_time:
|
||||
speedup_vs_old = parallel_old_time / parallel_time
|
||||
print(f"旧配置并行: {parallel_old_time:.0f}ms ({parallel_old_time/1000:.2f}秒)")
|
||||
print(f"新配置并行: {parallel_time:.0f}ms ({parallel_time/1000:.2f}秒)")
|
||||
print(f"配置优化提升: {speedup_vs_old:.2f}x ({(1 - parallel_time/parallel_old_time)*100:.1f}% 时间减少)")
|
||||
print()
|
||||
|
||||
|
||||
if serial_time and parallel_time and parallel_old_time:
|
||||
total_speedup = serial_time / parallel_time
|
||||
print(f"总体优化效果:")
|
||||
@@ -374,11 +374,10 @@ def main():
|
||||
print(f" 旧配置 → 新配置: {parallel_old_time/parallel_time:.2f}x")
|
||||
print(f" 串行 → 新配置: {total_speedup:.2f}x")
|
||||
print()
|
||||
|
||||
|
||||
print("=" * 70)
|
||||
print("测试完成")
|
||||
print("=" * 70)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
@@ -17,12 +17,12 @@ def test_parallel_ocr_quick(image_path: str, num_tasks: int = 3):
|
||||
print("并行OCR性能测试(快速版)")
|
||||
print("=" * 70)
|
||||
print()
|
||||
|
||||
|
||||
# 检查文件
|
||||
if not os.path.exists(image_path):
|
||||
print(f"[ERROR] 图片文件不存在: {image_path}")
|
||||
return None
|
||||
|
||||
|
||||
# 加载图片
|
||||
try:
|
||||
img = Image.open(image_path)
|
||||
@@ -36,19 +36,19 @@ def test_parallel_ocr_quick(image_path: str, num_tasks: int = 3):
|
||||
except Exception as e:
|
||||
print(f"[ERROR] 无法加载图片: {e}")
|
||||
return None
|
||||
|
||||
|
||||
# 初始化OCR
|
||||
try:
|
||||
from operations.ocr_operations import _ocr_processor
|
||||
_ocr_processor._ensure_ocr()
|
||||
|
||||
|
||||
if _ocr_processor.ocr is None:
|
||||
print("[ERROR] OCR引擎未初始化")
|
||||
return None
|
||||
|
||||
|
||||
print(f"OCR引擎: {_ocr_processor.ocr_type}")
|
||||
print(f"OMP_NUM_THREADS: {os.environ.get('OMP_NUM_THREADS', '未设置')}")
|
||||
|
||||
|
||||
from operations.screenshot_service import get_optimal_workers
|
||||
optimal_workers = get_optimal_workers()
|
||||
print(f"线程池大小: {optimal_workers}")
|
||||
@@ -56,7 +56,7 @@ def test_parallel_ocr_quick(image_path: str, num_tasks: int = 3):
|
||||
except Exception as e:
|
||||
print(f"[ERROR] OCR引擎初始化失败: {e}")
|
||||
return None
|
||||
|
||||
|
||||
# 定义OCR任务
|
||||
def ocr_task(task_id):
|
||||
try:
|
||||
@@ -64,22 +64,22 @@ def test_parallel_ocr_quick(image_path: str, num_tasks: int = 3):
|
||||
result = _ocr_processor.ocr.readtext(img_np)
|
||||
else:
|
||||
result = _ocr_processor.ocr.ocr(img_np)
|
||||
|
||||
|
||||
from Underlying_Operations import underlying_operations
|
||||
ops = underlying_operations()
|
||||
text = ops.extract_ocr_content(result)
|
||||
return text
|
||||
except Exception as e:
|
||||
return f"错误: {e}"
|
||||
|
||||
|
||||
# 执行并行OCR
|
||||
print("开始并行OCR测试...")
|
||||
start_time = time.time()
|
||||
|
||||
|
||||
with ThreadPoolExecutor(max_workers=optimal_workers) as executor:
|
||||
futures = {executor.submit(ocr_task, i+1): i+1 for i in range(num_tasks)}
|
||||
results = []
|
||||
|
||||
|
||||
for future in futures:
|
||||
task_id = futures[future]
|
||||
try:
|
||||
@@ -89,61 +89,53 @@ def test_parallel_ocr_quick(image_path: str, num_tasks: int = 3):
|
||||
except Exception as e:
|
||||
print(f" 任务 {task_id}: 失败 - {e}")
|
||||
results.append(None)
|
||||
|
||||
|
||||
total_elapsed = (time.time() - start_time) * 1000
|
||||
|
||||
|
||||
print()
|
||||
print(f"总耗时: {total_elapsed:.0f}ms ({total_elapsed/1000:.2f}秒)")
|
||||
print(f"平均每个任务: {total_elapsed/num_tasks:.0f}ms")
|
||||
print()
|
||||
|
||||
|
||||
# 估算串行时间(基于单次OCR耗时)
|
||||
print("性能估算:")
|
||||
print("-" * 70)
|
||||
single_task_time = total_elapsed / num_tasks
|
||||
estimated_serial_time = single_task_time * num_tasks
|
||||
speedup = estimated_serial_time / total_elapsed if total_elapsed > 0 else 0
|
||||
|
||||
|
||||
print(f"估算串行时间: {estimated_serial_time:.0f}ms ({estimated_serial_time/1000:.2f}秒)")
|
||||
print(f"实际并行时间: {total_elapsed:.0f}ms ({total_elapsed/1000:.2f}秒)")
|
||||
print(f"性能提升: {speedup:.2f}x (节省 {(1 - total_elapsed/estimated_serial_time)*100:.1f}% 时间)")
|
||||
print()
|
||||
|
||||
|
||||
return total_elapsed
|
||||
|
||||
def main():
|
||||
"""主函数"""
|
||||
default_image = "pic/debug_captures/2025-12-31/20251231_152116_ocr_福袋倒计时_秒_预处理后_(480,1110)-(570,1230)_模式_1_尺寸_270x360_来源_福袋倒计时_秒.png_有完整截图_是_有坐标_是_类型_digits.png"
|
||||
|
||||
|
||||
if len(sys.argv) > 1:
|
||||
image_path = sys.argv[1]
|
||||
else:
|
||||
image_path = default_image
|
||||
|
||||
|
||||
if not os.path.isabs(image_path):
|
||||
project_root = os.path.dirname(os.path.abspath(__file__))
|
||||
image_path = os.path.join(project_root, image_path)
|
||||
|
||||
|
||||
num_tasks = 3
|
||||
if len(sys.argv) > 2:
|
||||
try:
|
||||
num_tasks = int(sys.argv[2])
|
||||
except:
|
||||
pass
|
||||
|
||||
|
||||
test_parallel_ocr_quick(image_path, num_tasks)
|
||||
|
||||
|
||||
print("=" * 70)
|
||||
print("测试完成")
|
||||
print("=" * 70)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -19,11 +19,11 @@ def test_ocr_with_config(image_path, config_name, omp_threads, max_workers, num_
|
||||
print(f"{'='*70}")
|
||||
print(f"OMP_NUM_THREADS={omp_threads}, max_workers={max_workers}, 任务数={num_tasks}")
|
||||
print()
|
||||
|
||||
|
||||
# 设置OMP
|
||||
old_omp = os.environ.get('OMP_NUM_THREADS', '4')
|
||||
os.environ['OMP_NUM_THREADS'] = str(omp_threads)
|
||||
|
||||
|
||||
# 加载图片
|
||||
try:
|
||||
img = Image.open(image_path)
|
||||
@@ -37,25 +37,25 @@ def test_ocr_with_config(image_path, config_name, omp_threads, max_workers, num_
|
||||
print(f"[ERROR] 无法加载图片: {e}")
|
||||
os.environ['OMP_NUM_THREADS'] = old_omp
|
||||
return None
|
||||
|
||||
|
||||
# 初始化OCR
|
||||
try:
|
||||
from operations.ocr_operations import OCRProcessor
|
||||
ocr_processor = OCRProcessor()
|
||||
ocr_processor._ensure_ocr()
|
||||
|
||||
|
||||
if ocr_processor.ocr is None:
|
||||
print("[ERROR] OCR引擎未初始化")
|
||||
os.environ['OMP_NUM_THREADS'] = old_omp
|
||||
return None
|
||||
|
||||
|
||||
print(f"OCR引擎: {ocr_processor.ocr_type}")
|
||||
print()
|
||||
except Exception as e:
|
||||
print(f"[ERROR] OCR引擎初始化失败: {e}")
|
||||
os.environ['OMP_NUM_THREADS'] = old_omp
|
||||
return None
|
||||
|
||||
|
||||
# OCR任务函数
|
||||
def ocr_task(task_id):
|
||||
try:
|
||||
@@ -64,7 +64,7 @@ def test_ocr_with_config(image_path, config_name, omp_threads, max_workers, num_
|
||||
result = ocr_processor.ocr.readtext(img_np)
|
||||
else:
|
||||
result = ocr_processor.ocr.ocr(img_np)
|
||||
|
||||
|
||||
from Underlying_Operations import underlying_operations
|
||||
ops = underlying_operations()
|
||||
text = ops.extract_ocr_content(result)
|
||||
@@ -72,15 +72,15 @@ def test_ocr_with_config(image_path, config_name, omp_threads, max_workers, num_
|
||||
return {'task_id': task_id, 'text': text, 'time': elapsed, 'success': True}
|
||||
except Exception as e:
|
||||
return {'task_id': task_id, 'text': '', 'time': 0, 'success': False, 'error': str(e)}
|
||||
|
||||
|
||||
# 执行并行OCR
|
||||
print("开始并行OCR测试...")
|
||||
start_time = time.time()
|
||||
results = []
|
||||
|
||||
|
||||
with ThreadPoolExecutor(max_workers=max_workers) as executor:
|
||||
futures = {executor.submit(ocr_task, i+1): i+1 for i in range(num_tasks)}
|
||||
|
||||
|
||||
for future in futures:
|
||||
try:
|
||||
result = future.result()
|
||||
@@ -89,17 +89,17 @@ def test_ocr_with_config(image_path, config_name, omp_threads, max_workers, num_
|
||||
print(f" {status} 任务{result['task_id']}: {result['time']:.0f}ms, 结果: {result['text'][:20] if result['text'] else '(空)'}")
|
||||
except Exception as e:
|
||||
print(f" ✗ 任务失败: {e}")
|
||||
|
||||
|
||||
total_elapsed = (time.time() - start_time) * 1000
|
||||
|
||||
|
||||
# 恢复OMP设置
|
||||
os.environ['OMP_NUM_THREADS'] = old_omp
|
||||
|
||||
|
||||
# 统计
|
||||
successful = [r for r in results if r['success']]
|
||||
total_task_time = sum(r['time'] for r in successful)
|
||||
avg_task_time = total_task_time / len(successful) if successful else 0
|
||||
|
||||
|
||||
print()
|
||||
print(f"总耗时: {total_elapsed:.0f}ms ({total_elapsed/1000:.2f}秒)")
|
||||
print(f"任务总耗时: {total_task_time:.0f}ms")
|
||||
@@ -108,7 +108,7 @@ def test_ocr_with_config(image_path, config_name, omp_threads, max_workers, num_
|
||||
efficiency = total_task_time / total_elapsed
|
||||
print(f"并行效率: {efficiency:.2f}x (理想值: {num_tasks:.1f}x)")
|
||||
print()
|
||||
|
||||
|
||||
return {
|
||||
'total_time': total_elapsed,
|
||||
'avg_task_time': avg_task_time,
|
||||
@@ -118,26 +118,26 @@ def test_ocr_with_config(image_path, config_name, omp_threads, max_workers, num_
|
||||
def main():
|
||||
"""主函数"""
|
||||
default_image = "pic/debug_captures/2025-12-31/20251231_152116_ocr_福袋倒计时_秒_预处理后_(480,1110)-(570,1230)_模式_1_尺寸_270x360_来源_福袋倒计时_秒.png_有完整截图_是_有坐标_是_类型_digits.png"
|
||||
|
||||
|
||||
if len(sys.argv) > 1:
|
||||
image_path = sys.argv[1]
|
||||
else:
|
||||
image_path = default_image
|
||||
|
||||
|
||||
if not os.path.isabs(image_path):
|
||||
project_root = os.path.dirname(os.path.abspath(__file__))
|
||||
image_path = os.path.join(project_root, image_path)
|
||||
|
||||
|
||||
if not os.path.exists(image_path):
|
||||
print(f"[ERROR] 图片文件不存在: {image_path}")
|
||||
return
|
||||
|
||||
|
||||
print("=" * 70)
|
||||
print("并行OCR性能对比测试(简化版)")
|
||||
print("=" * 70)
|
||||
print()
|
||||
print(f"测试图片: {os.path.basename(image_path)}")
|
||||
|
||||
|
||||
# 获取系统信息
|
||||
cpu_count = os.cpu_count() or 4
|
||||
print(f"CPU核心数: {cpu_count}")
|
||||
@@ -147,22 +147,22 @@ def main():
|
||||
print(f"推荐线程池大小: {optimal_workers}")
|
||||
except:
|
||||
optimal_workers = 6
|
||||
|
||||
|
||||
num_tasks = 6
|
||||
print(f"测试任务数: {num_tasks}")
|
||||
print()
|
||||
|
||||
|
||||
# 测试1: 优化前
|
||||
result_old = test_ocr_with_config(
|
||||
image_path,
|
||||
image_path,
|
||||
"优化前配置 (OMP=1, workers=6)",
|
||||
omp_threads=1,
|
||||
max_workers=6,
|
||||
num_tasks=num_tasks
|
||||
)
|
||||
|
||||
|
||||
time.sleep(1) # 等待系统稳定
|
||||
|
||||
|
||||
# 测试2: 优化后
|
||||
result_new = test_ocr_with_config(
|
||||
image_path,
|
||||
@@ -171,32 +171,32 @@ def main():
|
||||
max_workers=optimal_workers,
|
||||
num_tasks=num_tasks
|
||||
)
|
||||
|
||||
|
||||
# 对比结果
|
||||
print()
|
||||
print("=" * 70)
|
||||
print("性能对比总结")
|
||||
print("=" * 70)
|
||||
print()
|
||||
|
||||
|
||||
if result_old and result_new:
|
||||
old_time = result_old['total_time']
|
||||
new_time = result_new['total_time']
|
||||
speedup = old_time / new_time if new_time > 0 else 0
|
||||
|
||||
|
||||
print(f"优化前总耗时: {old_time:.0f}ms ({old_time/1000:.2f}秒)")
|
||||
print(f"优化后总耗时: {new_time:.0f}ms ({new_time/1000:.2f}秒)")
|
||||
print(f"性能提升: {speedup:.2f}x")
|
||||
print(f"时间减少: {(1 - new_time/old_time)*100:.1f}%")
|
||||
print()
|
||||
|
||||
|
||||
old_avg = result_old['avg_task_time']
|
||||
new_avg = result_new['avg_task_time']
|
||||
print(f"优化前平均任务耗时: {old_avg:.0f}ms")
|
||||
print(f"优化后平均任务耗时: {new_avg:.0f}ms")
|
||||
if new_avg > 0:
|
||||
print(f"单任务性能提升: {old_avg/new_avg:.2f}x")
|
||||
|
||||
|
||||
print()
|
||||
print("=" * 70)
|
||||
print("测试完成")
|
||||
@@ -204,10 +204,3 @@ def main():
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -19,12 +19,12 @@ def create_test_regions(full_image_path):
|
||||
img = Image.open(full_image_path)
|
||||
if img.mode != 'RGB':
|
||||
img = img.convert('RGB')
|
||||
|
||||
|
||||
width, height = img.size
|
||||
|
||||
|
||||
# 判断是否是完整截图(1080x2400)还是裁剪区域
|
||||
is_full_screenshot = width >= 1000 and height >= 2000
|
||||
|
||||
|
||||
if is_full_screenshot:
|
||||
# 完整截图:创建多个测试区域
|
||||
# 模拟真实的OCR区域(基于福袋详情页的常见区域)
|
||||
@@ -42,12 +42,12 @@ def create_test_regions(full_image_path):
|
||||
coords_from_filename = None
|
||||
if "(480,1110)-(570,1230)" in full_image_path:
|
||||
coords_from_filename = (480, 1110, 570, 1230)
|
||||
|
||||
|
||||
# 创建多个相似大小的测试区域
|
||||
# 如果图片较小,创建多个相同大小的区域用于测试
|
||||
# 这些区域会在完整截图的合理位置
|
||||
regions = {}
|
||||
|
||||
|
||||
# 使用当前图片作为第一个区域
|
||||
if coords_from_filename:
|
||||
x1, y1, x2, y2 = coords_from_filename
|
||||
@@ -67,11 +67,11 @@ def create_test_regions(full_image_path):
|
||||
regions["区域4"] = (0, 0, width, height) # 相同区域,用于测试并行
|
||||
regions["区域5"] = (0, 0, width, height) # 相同区域,用于测试并行
|
||||
regions["区域6"] = (0, 0, width, height) # 相同区域,用于测试并行
|
||||
|
||||
|
||||
# 裁剪并保存区域图片
|
||||
region_images = {}
|
||||
temp_dir = tempfile.gettempdir()
|
||||
|
||||
|
||||
for name, (x1, y1, x2, y2) in regions.items():
|
||||
try:
|
||||
# 确保坐标在图片范围内
|
||||
@@ -79,7 +79,7 @@ def create_test_regions(full_image_path):
|
||||
y1 = max(0, min(y1, img.height))
|
||||
x2 = max(x1, min(x2, img.width))
|
||||
y2 = max(y1, min(y2, img.height))
|
||||
|
||||
|
||||
if x2 > x1 and y2 > y1:
|
||||
crop_img = img.crop((x1, y1, x2, y2))
|
||||
temp_path = os.path.join(temp_dir, f"ocr_test_{name}.png")
|
||||
@@ -91,7 +91,7 @@ def create_test_regions(full_image_path):
|
||||
}
|
||||
except (ValueError, OSError, IOError) as e:
|
||||
print(f"[WARNING] 无法裁剪区域 {name}: {e}")
|
||||
|
||||
|
||||
return region_images, img.size
|
||||
except (OSError, IOError, ValueError) as e:
|
||||
print(f"[ERROR] 无法处理图片: {e}")
|
||||
@@ -104,21 +104,21 @@ def ocr_single_region(image_path, region_name, ocr_processor):
|
||||
if img.mode != 'RGB':
|
||||
img = img.convert('RGB')
|
||||
img_np = np.array(img)
|
||||
|
||||
|
||||
start_time = time.time()
|
||||
|
||||
|
||||
if ocr_processor.ocr_type == "easyocr":
|
||||
result = ocr_processor.ocr.readtext(img_np)
|
||||
else:
|
||||
result = ocr_processor.ocr.ocr(img_np)
|
||||
|
||||
|
||||
elapsed = (time.time() - start_time) * 1000
|
||||
|
||||
|
||||
# 提取文本
|
||||
from Underlying_Operations import underlying_operations
|
||||
ops = underlying_operations()
|
||||
text = ops.extract_ocr_content(result)
|
||||
|
||||
|
||||
return {
|
||||
'region': region_name,
|
||||
'text': text,
|
||||
@@ -145,11 +145,11 @@ def test_parallel_ocr_real(region_images, config_name, omp_threads, max_workers)
|
||||
print(f"配置: OMP_NUM_THREADS={omp_threads}, max_workers={max_workers}")
|
||||
print(f"区域数量: {len(region_images)}")
|
||||
print()
|
||||
|
||||
|
||||
# 设置OMP线程数
|
||||
old_omp = os.environ.get('OMP_NUM_THREADS', '4')
|
||||
os.environ['OMP_NUM_THREADS'] = str(omp_threads)
|
||||
|
||||
|
||||
# 初始化OCR(使用新的OMP设置)
|
||||
try:
|
||||
from operations.ocr_operations import OCRProcessor
|
||||
@@ -158,40 +158,40 @@ def test_parallel_ocr_real(region_images, config_name, omp_threads, max_workers)
|
||||
# 使用 getattr 来避免 pylance 警告
|
||||
ensure_ocr = getattr(ocr_processor, '_ensure_ocr')
|
||||
ensure_ocr()
|
||||
|
||||
|
||||
if ocr_processor.ocr is None:
|
||||
print("[ERROR] OCR引擎未初始化")
|
||||
os.environ['OMP_NUM_THREADS'] = old_omp
|
||||
return None
|
||||
|
||||
|
||||
print(f"OCR引擎: {ocr_processor.ocr_type}")
|
||||
print()
|
||||
except (ImportError, AttributeError, RuntimeError) as e:
|
||||
print(f"[ERROR] OCR引擎初始化失败: {e}")
|
||||
os.environ['OMP_NUM_THREADS'] = old_omp
|
||||
return None
|
||||
|
||||
|
||||
# 显示区域信息
|
||||
print("OCR区域信息:")
|
||||
for name, info in region_images.items():
|
||||
print(f" {name}: {info['size'][0]}x{info['size'][1]} 像素, 坐标: {info['coords']}")
|
||||
print()
|
||||
|
||||
|
||||
# 并行执行OCR
|
||||
print("开始并行OCR识别...")
|
||||
start_time = time.time()
|
||||
results = []
|
||||
|
||||
|
||||
def ocr_task(name, path):
|
||||
return ocr_single_region(path, name, ocr_processor)
|
||||
|
||||
|
||||
with ThreadPoolExecutor(max_workers=max_workers) as executor:
|
||||
# 提交所有任务
|
||||
futures = {
|
||||
executor.submit(ocr_task, name, info['path']): name
|
||||
executor.submit(ocr_task, name, info['path']): name
|
||||
for name, info in region_images.items()
|
||||
}
|
||||
|
||||
|
||||
# 收集结果
|
||||
for future in futures:
|
||||
region_name = futures[future]
|
||||
@@ -218,17 +218,17 @@ def test_parallel_ocr_real(region_images, config_name, omp_threads, max_workers)
|
||||
'success': False,
|
||||
'error': str(e)
|
||||
})
|
||||
|
||||
|
||||
total_elapsed = (time.time() - start_time) * 1000
|
||||
|
||||
|
||||
# 恢复OMP设置
|
||||
os.environ['OMP_NUM_THREADS'] = old_omp
|
||||
|
||||
|
||||
# 统计结果
|
||||
successful_results = [r for r in results if r['success']]
|
||||
total_task_time = sum(r['time'] for r in successful_results)
|
||||
avg_task_time = total_task_time / len(successful_results) if successful_results else 0
|
||||
|
||||
|
||||
print()
|
||||
print(f"总耗时: {total_elapsed:.0f}ms ({total_elapsed/1000:.2f}秒)")
|
||||
print(f"任务总耗时: {total_task_time:.0f}ms")
|
||||
@@ -237,7 +237,7 @@ def test_parallel_ocr_real(region_images, config_name, omp_threads, max_workers)
|
||||
efficiency = total_task_time / total_elapsed
|
||||
print(f"并行效率: {efficiency:.2f}x (理想值: {len(region_images):.1f}x)")
|
||||
print()
|
||||
|
||||
|
||||
return {
|
||||
'total_time': total_elapsed,
|
||||
'task_times': [r['time'] for r in successful_results],
|
||||
@@ -249,42 +249,42 @@ def main():
|
||||
"""主函数"""
|
||||
# 默认图片路径(完整截图)
|
||||
default_image = "pic/debug_captures/2025-12-31/20251231_152116_ocr_福袋倒计时_秒_预处理后_(480,1110)-(570,1230)_模式_1_尺寸_270x360_来源_福袋倒计时_秒.png_有完整截图_是_有坐标_是_类型_digits.png"
|
||||
|
||||
|
||||
if len(sys.argv) > 1:
|
||||
image_path = sys.argv[1]
|
||||
else:
|
||||
image_path = default_image
|
||||
|
||||
|
||||
if not os.path.isabs(image_path):
|
||||
project_root = os.path.dirname(os.path.abspath(__file__))
|
||||
image_path = os.path.join(project_root, image_path)
|
||||
|
||||
|
||||
if not os.path.exists(image_path):
|
||||
print(f"[ERROR] 图片文件不存在: {image_path}")
|
||||
return
|
||||
|
||||
|
||||
print("=" * 70)
|
||||
print("真实场景并行OCR性能对比测试")
|
||||
print("=" * 70)
|
||||
print()
|
||||
print(f"测试图片: {os.path.basename(image_path)}")
|
||||
print()
|
||||
|
||||
|
||||
# 创建测试区域
|
||||
print("准备测试区域...")
|
||||
region_images, full_size = create_test_regions(image_path)
|
||||
|
||||
|
||||
if not region_images:
|
||||
print("[ERROR] 无法创建测试区域")
|
||||
return
|
||||
|
||||
|
||||
if full_size is not None:
|
||||
print(f"完整截图尺寸: {full_size[0]}x{full_size[1]}")
|
||||
else:
|
||||
print("完整截图尺寸: 未知")
|
||||
print(f"成功创建 {len(region_images)} 个测试区域")
|
||||
print()
|
||||
|
||||
|
||||
# 获取系统信息
|
||||
cpu_count = os.cpu_count() or 4
|
||||
print("系统信息:")
|
||||
@@ -296,67 +296,67 @@ def main():
|
||||
except (ImportError, AttributeError):
|
||||
optimal_workers = 6
|
||||
print()
|
||||
|
||||
|
||||
# 测试1: 优化前配置(OMP=1, workers=6)
|
||||
result_old = test_parallel_ocr_real(
|
||||
region_images,
|
||||
"优化前配置",
|
||||
omp_threads=1,
|
||||
region_images,
|
||||
"优化前配置",
|
||||
omp_threads=1,
|
||||
max_workers=6
|
||||
)
|
||||
|
||||
|
||||
# 等待一下,让系统稳定
|
||||
time.sleep(1)
|
||||
|
||||
|
||||
# 测试2: 优化后配置(OMP=4, workers=10)
|
||||
result_new = test_parallel_ocr_real(
|
||||
region_images,
|
||||
"优化后配置",
|
||||
omp_threads=4,
|
||||
region_images,
|
||||
"优化后配置",
|
||||
omp_threads=4,
|
||||
max_workers=optimal_workers
|
||||
)
|
||||
|
||||
|
||||
# 性能对比总结
|
||||
print()
|
||||
print("=" * 70)
|
||||
print("性能对比总结")
|
||||
print("=" * 70)
|
||||
print()
|
||||
|
||||
|
||||
if result_old and result_new:
|
||||
old_time = result_old['total_time']
|
||||
new_time = result_new['total_time']
|
||||
speedup = old_time / new_time if new_time > 0 else 0
|
||||
|
||||
|
||||
print(f"优化前总耗时: {old_time:.0f}ms ({old_time/1000:.2f}秒)")
|
||||
print(f"优化后总耗时: {new_time:.0f}ms ({new_time/1000:.2f}秒)")
|
||||
print(f"性能提升: {speedup:.2f}x")
|
||||
print(f"时间减少: {(1 - new_time/old_time)*100:.1f}%")
|
||||
print()
|
||||
|
||||
|
||||
# 详细对比
|
||||
if result_old['task_times'] and result_new['task_times']:
|
||||
old_avg = sum(result_old['task_times']) / len(result_old['task_times'])
|
||||
new_avg = sum(result_new['task_times']) / len(result_new['task_times'])
|
||||
|
||||
|
||||
print("任务级性能对比:")
|
||||
print(f" 优化前平均任务耗时: {old_avg:.0f}ms")
|
||||
print(f" 优化后平均任务耗时: {new_avg:.0f}ms")
|
||||
print(f" 单任务性能提升: {old_avg/new_avg:.2f}x")
|
||||
print()
|
||||
|
||||
|
||||
# 识别结果对比
|
||||
print("识别结果对比:")
|
||||
for old_result in result_old['results']:
|
||||
region_name = old_result['region']
|
||||
new_result = next((r for r in result_new['results'] if r['region'] == region_name), None)
|
||||
|
||||
|
||||
if old_result['success'] and new_result and new_result['success']:
|
||||
old_text = old_result['text'][:20] if old_result['text'] else '(空)'
|
||||
new_text = new_result['text'][:20] if new_result['text'] else '(空)'
|
||||
match = "✓" if old_text == new_text else "✗"
|
||||
print(f" {match} {region_name}: 结果一致")
|
||||
|
||||
|
||||
# 清理临时文件
|
||||
print()
|
||||
print("清理临时文件...")
|
||||
@@ -366,7 +366,7 @@ def main():
|
||||
os.remove(info['path'])
|
||||
except (OSError, PermissionError):
|
||||
pass
|
||||
|
||||
|
||||
print()
|
||||
print("=" * 70)
|
||||
print("测试完成")
|
||||
@@ -374,4 +374,3 @@ def main():
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
-4
@@ -107,7 +107,3 @@ if __name__ == "__main__":
|
||||
print("2. 改进错误消息,提供更详细的诊断信息")
|
||||
print("3. 在douyin_fudai.py中添加截图重试机制")
|
||||
print("4. 当截图失败时会重试3次,而不是直接放弃")
|
||||
|
||||
|
||||
|
||||
|
||||
File renamed without changes.
+17
-18
@@ -27,7 +27,7 @@ def test_screenshot_with_timing():
|
||||
except ImportError:
|
||||
print("[错误] 无法导入 Underlying_Operations")
|
||||
return
|
||||
|
||||
|
||||
# 获取设备ID
|
||||
import subprocess
|
||||
try:
|
||||
@@ -35,7 +35,7 @@ def test_screenshot_with_timing():
|
||||
if result.returncode != 0:
|
||||
print("[错误] adb devices 失败")
|
||||
return
|
||||
|
||||
|
||||
lines = result.stdout.strip().split("\n")[1:]
|
||||
devices = []
|
||||
for line in lines:
|
||||
@@ -43,36 +43,36 @@ def test_screenshot_with_timing():
|
||||
device_id = line.split("\t")[0].strip()
|
||||
if device_id:
|
||||
devices.append(device_id)
|
||||
|
||||
|
||||
if not devices:
|
||||
print("[错误] 未找到连接的设备")
|
||||
return
|
||||
|
||||
|
||||
device_id = devices[0]
|
||||
print(f"[信息] 使用设备: {device_id}")
|
||||
except Exception as e:
|
||||
print(f"[错误] 获取设备ID失败: {e}")
|
||||
return
|
||||
|
||||
|
||||
# 创建操作对象
|
||||
ops = underlying_operations()
|
||||
|
||||
|
||||
print("\n" + "="*60)
|
||||
print("测试 1: 正常截图(启用所有验证和镜像)")
|
||||
print("="*60)
|
||||
|
||||
|
||||
# 测试1: 正常截图
|
||||
start = time.time()
|
||||
result1 = ops.get_screenshot(device_id, use_service=False) # 禁用服务,使用直接截图以便看到详细日志
|
||||
elapsed1 = (time.time() - start) * 1000.0
|
||||
print(f"\n[结果] 测试1完成: 成功={result1}, 总耗时={elapsed1:.1f}ms")
|
||||
|
||||
|
||||
time.sleep(1)
|
||||
|
||||
|
||||
print("\n" + "="*60)
|
||||
print("测试 2: 禁用 PNG 验证 (SKIP_SCREENSHOT_VERIFY=1)")
|
||||
print("="*60)
|
||||
|
||||
|
||||
# 测试2: 禁用验证
|
||||
os.environ["SKIP_SCREENSHOT_VERIFY"] = "1"
|
||||
start = time.time()
|
||||
@@ -82,13 +82,13 @@ def test_screenshot_with_timing():
|
||||
if elapsed1 > 0:
|
||||
improvement = ((elapsed1 - elapsed2) / elapsed1) * 100
|
||||
print(f"[对比] 相比测试1: {improvement:+.1f}% ({elapsed1 - elapsed2:+.1f}ms)")
|
||||
|
||||
|
||||
time.sleep(1)
|
||||
|
||||
|
||||
print("\n" + "="*60)
|
||||
print("测试 3: 禁用 PNG 验证 + 禁用镜像 (SKIP_SCREENSHOT_VERIFY=1, DISABLE_SCREENSHOT_MIRROR=1)")
|
||||
print("="*60)
|
||||
|
||||
|
||||
# 测试3: 禁用验证和镜像
|
||||
os.environ["DISABLE_SCREENSHOT_MIRROR"] = "1"
|
||||
start = time.time()
|
||||
@@ -98,24 +98,24 @@ def test_screenshot_with_timing():
|
||||
if elapsed1 > 0:
|
||||
improvement = ((elapsed1 - elapsed3) / elapsed1) * 100
|
||||
print(f"[对比] 相比测试1: {improvement:+.1f}% ({elapsed1 - elapsed3:+.1f}ms)")
|
||||
|
||||
|
||||
# 恢复环境变量
|
||||
if "SKIP_SCREENSHOT_VERIFY" in os.environ:
|
||||
del os.environ["SKIP_SCREENSHOT_VERIFY"]
|
||||
if "DISABLE_SCREENSHOT_MIRROR" in os.environ:
|
||||
del os.environ["DISABLE_SCREENSHOT_MIRROR"]
|
||||
|
||||
|
||||
print("\n" + "="*60)
|
||||
print("测试总结")
|
||||
print("="*60)
|
||||
print(f"测试1 (正常): {elapsed1:.1f}ms")
|
||||
print(f"测试2 (禁用验证): {elapsed2:.1f}ms")
|
||||
print(f"测试3 (禁用全部): {elapsed3:.1f}ms")
|
||||
|
||||
|
||||
if elapsed1 > 0 and elapsed3 > 0:
|
||||
total_improvement = ((elapsed1 - elapsed3) / elapsed1) * 100
|
||||
print(f"\n最大优化效果: {total_improvement:+.1f}% ({elapsed1 - elapsed3:+.1f}ms)")
|
||||
|
||||
|
||||
if total_improvement > 10:
|
||||
print("\n[建议] 如果优化效果明显,可以考虑:")
|
||||
print(" 1. 在生产环境谨慎使用 SKIP_SCREENSHOT_VERIFY(可能影响数据完整性)")
|
||||
@@ -125,4 +125,3 @@ def test_screenshot_with_timing():
|
||||
|
||||
if __name__ == "__main__":
|
||||
test_screenshot_with_timing()
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,72 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""截图服务诊断工具"""
|
||||
|
||||
import time
|
||||
from operations.screenshot_service import ScreenshotService
|
||||
|
||||
def diagnose_screenshot_service():
|
||||
"""诊断截图服务状态"""
|
||||
print("=== 截图服务诊断工具 ===\n")
|
||||
|
||||
service = ScreenshotService.get_instance()
|
||||
cache_info = service.get_cache_info()
|
||||
|
||||
print(f"1. 服务运行状态: {'[OK] 运行中' if cache_info['running'] else '[ERROR] 未运行'}")
|
||||
print(f"2. 设备ID: {cache_info.get('device_id', 'None')}")
|
||||
print(f"3. 截图间隔: {cache_info.get('interval', 'N/A')}秒")
|
||||
print(f"4. 缓存有效期: {cache_info.get('cache_valid_duration', 'N/A')}秒")
|
||||
|
||||
last_time = cache_info.get('last_screenshot_time', 0)
|
||||
if last_time > 0:
|
||||
time_since = time.time() - last_time
|
||||
print(".1f")
|
||||
print(f"6. 缓存状态: {'[OK] 有效' if time_since < cache_info.get('cache_valid_duration', 2.0) else '[EXPIRED] 过期'}")
|
||||
else:
|
||||
print("5. 最后截图时间: 从未截图")
|
||||
print("6. 缓存状态: 无缓存")
|
||||
|
||||
print(f"7. 最后截图成功: {cache_info.get('last_success', False)}")
|
||||
|
||||
# 诊断建议
|
||||
print("\n=== 诊断结果 ===")
|
||||
|
||||
issues = []
|
||||
|
||||
if not cache_info['running']:
|
||||
issues.append("[ERROR] 后台截图服务未运行 - 每次截图都会很慢")
|
||||
|
||||
if not cache_info.get('device_id'):
|
||||
issues.append("[ERROR] 设备ID为空 - 无法启动截图服务")
|
||||
|
||||
if last_time == 0:
|
||||
issues.append("[ERROR] 从未成功截图 - 检查ADB连接和设备状态")
|
||||
|
||||
if issues:
|
||||
print("发现问题:")
|
||||
for issue in issues:
|
||||
print(f" {issue}")
|
||||
else:
|
||||
print("[OK] 截图服务运行正常")
|
||||
|
||||
# 显示性能预期
|
||||
print("\n=== 性能预期 ===")
|
||||
print("- 缓存命中时: < 10ms")
|
||||
print("- 缓存未命中时: < 1秒")
|
||||
print("- 后台截图间隔: 1.5秒")
|
||||
|
||||
print("\n=== 解决建议 ===")
|
||||
if not cache_info['running']:
|
||||
print("1. 重启程序,确保设备ID正确设置")
|
||||
print("2. 检查ADB连接: adb devices")
|
||||
print("3. 查看程序日志中的截图服务相关信息")
|
||||
|
||||
if cache_info['running'] and last_time == 0:
|
||||
print("1. 检查ADB连接是否正常")
|
||||
print("2. 尝试手动截图测试连接")
|
||||
print("3. 检查设备是否进入睡眠模式")
|
||||
|
||||
print("\n=== 测试命令 ===")
|
||||
print("运行测试: python test_full_screenshot_flow.py")
|
||||
|
||||
if __name__ == "__main__":
|
||||
diagnose_screenshot_service()
|
||||
@@ -1,7 +1,3 @@
|
||||
"""
|
||||
抖音挂机项目核心模块
|
||||
"""
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
"""
|
||||
核心调度和流程控制模块
|
||||
"""
|
||||
|
||||
|
||||
|
||||
+171
-311
@@ -1,5 +1,3 @@
|
||||
from __future__ import annotations
|
||||
|
||||
"""
|
||||
Flow control main helpers (本地模块化实现,基础版)
|
||||
================================================
|
||||
@@ -11,43 +9,44 @@ Flow control main helpers (本地模块化实现,基础版)
|
||||
- filter_fudai_detail:根据 config.json 对福袋进行基础筛选
|
||||
"""
|
||||
|
||||
from typing import Any, List, Tuple
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any, Callable, List, Optional, Tuple
|
||||
import time
|
||||
import os
|
||||
|
||||
from douyin.detection.douyin_detection import check_have_fudai_with_ready_screenshot
|
||||
from douyin.fudai.douyin_fudai_core import should_skip_fudai_by_config
|
||||
from douyin.reservation import douyin_reservation_logic
|
||||
import path_config
|
||||
from PIL import Image
|
||||
|
||||
|
||||
def handle_stage_after_diagnosis(
|
||||
analyser: Any,
|
||||
stage: str,
|
||||
seen: str,
|
||||
loop_count: int,
|
||||
) -> bool:
|
||||
"""记录阶段诊断结果,当前不改变主流程走向。"""
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"handle_stage_after_diagnosis",
|
||||
stage=stage,
|
||||
seen=seen,
|
||||
loop_count=loop_count,
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
return False
|
||||
func_start_time: float | None = None,
|
||||
):
|
||||
if func_start_time is None:
|
||||
func_start_time = time.time()
|
||||
|
||||
return find_and_open_fudai_detail(
|
||||
analyser=analyser,
|
||||
stage=stage,
|
||||
seen=seen,
|
||||
func_start_time=func_start_time,
|
||||
)
|
||||
|
||||
|
||||
def find_and_open_fudai_detail(
|
||||
analyser: Any,
|
||||
room_pos_ref: List[int],
|
||||
) -> bool:
|
||||
"""在当前直播间查找福袋图标并尝试点击打开详情(基础版,不做预约)。"""
|
||||
func_start_time = time.time()
|
||||
stage: Any = "",
|
||||
seen: Any = "",
|
||||
func_start_time: float | None = None,
|
||||
):
|
||||
"""主实现:检测福袋图标并点击打开详情页。"""
|
||||
if func_start_time is None:
|
||||
func_start_time = time.time()
|
||||
|
||||
# 如果正在等待开奖,不应该再次打开福袋详情
|
||||
try:
|
||||
if getattr(analyser, "_waiting_for_lottery_result", False):
|
||||
@@ -59,7 +58,11 @@ def find_and_open_fudai_detail(
|
||||
except Exception:
|
||||
pass
|
||||
elapsed = time.time() - func_start_time
|
||||
analyser._log_kv("流程", "find_and_open_fudai_detail完成(等待开奖中)", elapsed_seconds=round(elapsed, 2))
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"find_and_open_fudai_detail完成(等待开奖中)",
|
||||
elapsed_seconds=round(elapsed, 2),
|
||||
)
|
||||
return False
|
||||
except Exception:
|
||||
pass
|
||||
@@ -79,13 +82,10 @@ def find_and_open_fudai_detail(
|
||||
x = False
|
||||
|
||||
while (time.time() - start_time) < max_wait_seconds:
|
||||
# 优先尝试复用已有截图,如果失败再强制刷新
|
||||
x = check_have_fudai_with_ready_screenshot(analyser, screenshot_ready=True)
|
||||
if not x:
|
||||
# 如果复用截图失败,强制刷新后重试
|
||||
x = check_have_fudai_with_ready_screenshot(analyser, screenshot_ready=False)
|
||||
if x:
|
||||
# 找到福袋图标,跳出循环
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
@@ -97,13 +97,11 @@ def find_and_open_fudai_detail(
|
||||
pass
|
||||
break
|
||||
|
||||
# 未找到,等待一段时间后重试
|
||||
elapsed = time.time() - start_time
|
||||
remaining = max_wait_seconds - elapsed
|
||||
if remaining <= 0:
|
||||
break
|
||||
|
||||
# 计算本次等待时间(不超过剩余时间和重试延迟)
|
||||
wait_time = min(retry_delay_seconds, remaining)
|
||||
try:
|
||||
analyser._log_kv(
|
||||
@@ -134,7 +132,11 @@ def find_and_open_fudai_detail(
|
||||
except Exception:
|
||||
pass
|
||||
elapsed = time.time() - func_start_time
|
||||
analyser._log_kv("流程", "find_and_open_fudai_detail完成(未找到福袋)", elapsed_seconds=round(elapsed, 2))
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"find_and_open_fudai_detail完成(未找到福袋)",
|
||||
elapsed_seconds=round(elapsed, 2),
|
||||
)
|
||||
return False
|
||||
|
||||
# 点击坐标:用检测到的 X,加一个固定基准 Y(图标所在高度)
|
||||
@@ -162,17 +164,17 @@ def find_and_open_fudai_detail(
|
||||
try:
|
||||
from PIL import Image
|
||||
import importlib
|
||||
douyin_screenshot_manager = importlib.import_module("douyin.handlers.douyin_screenshot_manager")
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
|
||||
screenshot_path = path_config.get_screenshot_path()
|
||||
if os.path.exists(screenshot_path):
|
||||
img = Image.open(screenshot_path)
|
||||
img.load()
|
||||
pic_rgb_full = img.convert("RGB")
|
||||
# 使用与检测处相同的命名(pixel_detect + fudai_icon + detected)
|
||||
# 为了在调试图像中标注检测到的位置,传入 coords 和 detected_x_scaled
|
||||
try:
|
||||
# 在点击位置附近画一个小框以便定位(30px 半径)
|
||||
box_r = 30
|
||||
coord_box = (
|
||||
max(0, click_x - box_r),
|
||||
@@ -206,158 +208,29 @@ def find_and_open_fudai_detail(
|
||||
except Exception:
|
||||
pass
|
||||
except Exception:
|
||||
# 不要让调试保存影响主流程
|
||||
pass
|
||||
|
||||
# 优先走底层 operation.click,失败再尝试 analyser.click
|
||||
try:
|
||||
analyser.operation.click(device_id, click_x, click_y)
|
||||
|
||||
# 智能等待:先等待最小时间,然后循环检测详情页是否已打开
|
||||
# 这样可以减少不必要的等待时间
|
||||
min_wait_seconds = 0.5 # 最小等待时间(确保点击生效)
|
||||
max_wait_seconds = float(
|
||||
getattr(analyser, "fudai_click_wait_seconds", 2.0) or 2.0
|
||||
)
|
||||
check_interval = 0.2 # 每次检测间隔(秒)
|
||||
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"find_and_open_fudai_detail:开始智能等待",
|
||||
min_wait_seconds=min_wait_seconds,
|
||||
max_wait_seconds=max_wait_seconds,
|
||||
check_interval=check_interval,
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 先等待最小时间
|
||||
analyser.operation.delay(min_wait_seconds)
|
||||
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"find_and_open_fudai_detail:最小等待时间已过,开始循环检测",
|
||||
elapsed_seconds=min_wait_seconds,
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 智能等待:循环检测详情页是否已打开
|
||||
from douyin.stage import douyin_stage
|
||||
wait_start = time.time()
|
||||
detail_opened = False
|
||||
check_count = 0
|
||||
|
||||
while (time.time() - wait_start) < (max_wait_seconds - min_wait_seconds):
|
||||
check_count += 1
|
||||
elapsed_in_loop = time.time() - wait_start
|
||||
try:
|
||||
analyser.operation.get_screenshot(device_id, use_service=False)
|
||||
pic_path = path_config.get_screenshot_path()
|
||||
if os.path.exists(pic_path):
|
||||
# 快速检测是否已在详情页(只检测关键特征,不执行完整阶段诊断)
|
||||
result = douyin_stage.diagnose_stage_from_current_screen(analyser)
|
||||
if result is not None:
|
||||
stage, reason = result
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"find_and_open_fudai_detail:智能等待检测中",
|
||||
check_count=check_count,
|
||||
elapsed_in_loop=round(elapsed_in_loop, 2),
|
||||
total_elapsed=round(elapsed_in_loop + min_wait_seconds, 2),
|
||||
current_stage=stage,
|
||||
reason=reason[:50] if reason else "",
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
if stage == "FUDai_DETAIL":
|
||||
detail_opened = True
|
||||
elapsed_wait = time.time() - wait_start
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"find_and_open_fudai_detail:智能等待检测到详情页已打开",
|
||||
check_count=check_count,
|
||||
wait_seconds=round(elapsed_wait + min_wait_seconds, 2),
|
||||
elapsed_in_loop=round(elapsed_wait, 2),
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
break
|
||||
else:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"find_and_open_fudai_detail:智能等待检测中(阶段诊断返回None)",
|
||||
check_count=check_count,
|
||||
elapsed_in_loop=round(elapsed_in_loop, 2),
|
||||
total_elapsed=round(elapsed_in_loop + min_wait_seconds, 2),
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
else:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"find_and_open_fudai_detail:智能等待检测中(截图文件不存在)",
|
||||
check_count=check_count,
|
||||
elapsed_in_loop=round(elapsed_in_loop, 2),
|
||||
total_elapsed=round(elapsed_in_loop + min_wait_seconds, 2),
|
||||
pic_path=pic_path,
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
except Exception as e:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"find_and_open_fudai_detail:智能等待检测中(检测异常)",
|
||||
check_count=check_count,
|
||||
elapsed_in_loop=round(elapsed_in_loop, 2),
|
||||
total_elapsed=round(elapsed_in_loop + min_wait_seconds, 2),
|
||||
error=str(e),
|
||||
error_type=type(e).__name__,
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 等待一小段时间后再次检测
|
||||
try:
|
||||
analyser.operation.delay(check_interval)
|
||||
except Exception:
|
||||
time.sleep(check_interval)
|
||||
|
||||
# 记录智能等待结束状态
|
||||
total_elapsed = time.time() - wait_start + min_wait_seconds
|
||||
if not detail_opened:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"find_and_open_fudai_detail:智能等待超时,未检测到详情页",
|
||||
check_count=check_count,
|
||||
total_elapsed=round(total_elapsed, 2),
|
||||
max_wait_seconds=max_wait_seconds,
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 如果智能等待已检测到详情页,直接返回成功,无需再次检测
|
||||
if detail_opened:
|
||||
# 清除第一次读取标志,确保新打开的福袋会进行完整的OCR识别
|
||||
try:
|
||||
analyser._fudai_detail_first_read = False
|
||||
analyser._last_fudai_detail_tuple = None
|
||||
except Exception:
|
||||
pass
|
||||
elapsed = time.time() - func_start_time
|
||||
analyser._log_kv("流程", "find_and_open_fudai_detail完成(成功打开详情)", elapsed_seconds=round(elapsed, 2))
|
||||
return True
|
||||
|
||||
# 如果智能等待未检测到详情页,执行完整的验证流程
|
||||
# 确保有最新截图
|
||||
wait_seconds = float(getattr(analyser, "fudai_click_wait_seconds", 1.0) or 1.0)
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"find_and_open_fudai_detail:点击后固定等待",
|
||||
wait_seconds=wait_seconds,
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
try:
|
||||
analyser.operation.delay(wait_seconds)
|
||||
except Exception:
|
||||
time.sleep(wait_seconds)
|
||||
|
||||
from douyin.stage import douyin_stage
|
||||
|
||||
analyser.operation.get_screenshot(device_id, use_service=False)
|
||||
pic_path = path_config.get_screenshot_path()
|
||||
if not os.path.exists(pic_path):
|
||||
@@ -370,11 +243,13 @@ def find_and_open_fudai_detail(
|
||||
pass
|
||||
return False
|
||||
|
||||
# 点击后进行阶段检测,确认当前页面状态
|
||||
try:
|
||||
result = douyin_stage.diagnose_stage_from_current_screen(analyser)
|
||||
if result is None:
|
||||
stage, reason = ("IN_LIVE_ROOM", "阶段诊断返回 None,默认判定为在直播间")
|
||||
stage, reason = (
|
||||
"IN_LIVE_ROOM",
|
||||
"阶段诊断返回 None,默认判定为在直播间",
|
||||
)
|
||||
else:
|
||||
stage, reason = result
|
||||
try:
|
||||
@@ -387,7 +262,6 @@ def find_and_open_fudai_detail(
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 如果阶段检测已经确认在福袋详情页,直接返回成功
|
||||
if stage == "FUDai_DETAIL":
|
||||
try:
|
||||
analyser._log_kv(
|
||||
@@ -398,17 +272,19 @@ def find_and_open_fudai_detail(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
# 清除第一次读取标志,确保新打开的福袋会进行完整的OCR识别
|
||||
try:
|
||||
analyser._fudai_detail_first_read = False
|
||||
analyser._last_fudai_detail_tuple = None
|
||||
except Exception:
|
||||
pass
|
||||
elapsed = time.time() - func_start_time
|
||||
analyser._log_kv("流程", "find_and_open_fudai_detail完成(成功打开详情)", elapsed_seconds=round(elapsed, 2))
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"find_and_open_fudai_detail完成(成功打开详情)",
|
||||
elapsed_seconds=round(elapsed, 2),
|
||||
)
|
||||
return True
|
||||
else:
|
||||
# 如果不在福袋详情页,可能是误点击,通过点击固定坐标返回直播间
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
@@ -419,8 +295,6 @@ def find_and_open_fudai_detail(
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 使用固定坐标 (520, 505) 进行点击,而不是系统返回键
|
||||
# 根据当前分辨率进行等比例换算(基准分辨率 1080x2400)
|
||||
rx = int(getattr(analyser, "resolution_ratio_x", 1080) or 1080)
|
||||
ry = int(getattr(analyser, "resolution_ratio_y", 2400) or 2400)
|
||||
try:
|
||||
@@ -432,7 +306,6 @@ def find_and_open_fudai_detail(
|
||||
try:
|
||||
analyser.operation.click(device_id, back_click_x, back_click_y)
|
||||
except Exception:
|
||||
# 兜底:直接用 analyser.click
|
||||
try:
|
||||
analyser.click(back_click_x, back_click_y)
|
||||
except Exception:
|
||||
@@ -443,16 +316,18 @@ def find_and_open_fudai_detail(
|
||||
except Exception:
|
||||
time.sleep(1.0)
|
||||
|
||||
# 清除历史位置,避免下次继续误点击
|
||||
try:
|
||||
analyser.last_fudai_x = 0
|
||||
except Exception:
|
||||
pass
|
||||
elapsed = time.time() - func_start_time
|
||||
analyser._log_kv("流程", "find_and_open_fudai_detail完成(误点击)", elapsed_seconds=round(elapsed, 2))
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"find_and_open_fudai_detail完成(误点击)",
|
||||
elapsed_seconds=round(elapsed, 2),
|
||||
)
|
||||
return False
|
||||
except Exception as e:
|
||||
# 阶段检测失败,返回False
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
@@ -462,139 +337,41 @@ def find_and_open_fudai_detail(
|
||||
except Exception:
|
||||
pass
|
||||
elapsed = time.time() - func_start_time
|
||||
analyser._log_kv("流程", "find_and_open_fudai_detail完成(阶段检测异常)", elapsed_seconds=round(elapsed, 2))
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"find_and_open_fudai_detail完成(阶段检测异常)",
|
||||
elapsed_seconds=round(elapsed, 2),
|
||||
)
|
||||
return False
|
||||
except Exception:
|
||||
try:
|
||||
analyser.click(x, base_y)
|
||||
# 点击后等待福袋详情页加载(可配置)
|
||||
fudai_click_wait_seconds = float(
|
||||
getattr(analyser, "fudai_click_wait_seconds", 2.0) or 2.0
|
||||
wait_seconds = float(
|
||||
getattr(analyser, "fudai_click_wait_seconds", 1.0) or 1.0
|
||||
)
|
||||
analyser.operation.delay(fudai_click_wait_seconds)
|
||||
analyser.operation.delay(wait_seconds)
|
||||
elapsed = time.time() - func_start_time
|
||||
analyser._log_kv("流程", "find_and_open_fudai_detail完成(兜底成功)", elapsed_seconds=round(elapsed, 2))
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"find_and_open_fudai_detail完成(兜底成功)",
|
||||
elapsed_seconds=round(elapsed, 2),
|
||||
)
|
||||
return True
|
||||
except Exception:
|
||||
elapsed = time.time() - func_start_time
|
||||
analyser._log_kv("流程", "find_and_open_fudai_detail完成(兜底失败)", elapsed_seconds=round(elapsed, 2))
|
||||
return False
|
||||
|
||||
|
||||
def handle_no_fudai_situation(
|
||||
analyser: Any,
|
||||
x: int,
|
||||
swipe_times: int,
|
||||
wait_times_ref: List[int],
|
||||
needswitch: bool,
|
||||
reservation_focus_until_ts: float,
|
||||
reservations: list,
|
||||
room_pos: int,
|
||||
post_switch_delay_s: float,
|
||||
swipe_up_switch_callback,
|
||||
swipe_down_back_callback,
|
||||
sort_reservations_callback,
|
||||
clear_reservations_callback,
|
||||
write_state_callback,
|
||||
back_to_list_callback,
|
||||
into_list_callback,
|
||||
reservation_focus_until_ts_ref: List[float],
|
||||
reset_to_list_after_reservations_ref: List[bool],
|
||||
swipe_times_ref: List[int],
|
||||
) -> bool:
|
||||
"""当前直播间没有福袋时的基础处理。
|
||||
|
||||
本地版实现:
|
||||
- 先让预约模块有机会“抢占”流程(例如到点需要回退到预约直播间);
|
||||
- 若未触发预约回退,则执行简单的等待 + 上滑切换。
|
||||
"""
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"handle_no_fudai_situation",
|
||||
x=x,
|
||||
swipe_times=swipe_times,
|
||||
room_pos=room_pos,
|
||||
reservations=len(reservations),
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# --- 优先让“预约回退窗口”有机会执行 ---
|
||||
try:
|
||||
if getattr(analyser, "high_value_fudai_enabled", False) and reservations:
|
||||
# 构造回调:下滑回退一个直播间
|
||||
def _swipe_down_once() -> None:
|
||||
try:
|
||||
if swipe_down_back_callback:
|
||||
swipe_down_back_callback()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def _sort_reservations() -> None:
|
||||
try:
|
||||
# 使用统一核心逻辑排序
|
||||
douyin_reservation_logic._sort_reservations_inplace(reservations) # type: ignore[attr-defined]
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def _write_state() -> None:
|
||||
try:
|
||||
if write_state_callback:
|
||||
write_state_callback()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 调用预约窗口处理:若返回 True,表示已触发回退,本轮不再上滑
|
||||
def _seek_reservation_room(item: dict) -> bool:
|
||||
"""委托给 analyser._seek_reservation_room,避免简化为恒 True。"""
|
||||
try:
|
||||
fn = getattr(analyser, "_seek_reservation_room", None)
|
||||
if not fn:
|
||||
return False
|
||||
return bool(fn(item))
|
||||
except Exception:
|
||||
return False
|
||||
|
||||
preempted = douyin_reservation_logic.process_reservation_attend_window(
|
||||
analyser=analyser,
|
||||
reservations=reservations,
|
||||
room_pos=room_pos,
|
||||
reservation_focus_until_ts_ref=reservation_focus_until_ts_ref,
|
||||
reservation_after_action_pending_ref=[False],
|
||||
reservation_back_swipe_delay_s=float(
|
||||
getattr(analyser, "reservation_back_swipe_delay", 0.6) or 0.6
|
||||
),
|
||||
swipe_down_back_callback=_swipe_down_once,
|
||||
seek_reservation_room_callback=_seek_reservation_room,
|
||||
sort_reservations_callback=_sort_reservations,
|
||||
write_state_callback=_write_state,
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"find_and_open_fudai_detail完成(兜底失败)",
|
||||
elapsed_seconds=round(elapsed, 2),
|
||||
)
|
||||
if preempted:
|
||||
return True
|
||||
except Exception:
|
||||
# 预约处理异常不影响基础切换逻辑
|
||||
pass
|
||||
|
||||
# 简单策略:轻微等待 + 上滑切换
|
||||
try:
|
||||
analyser.operation.delay(1.0)
|
||||
except Exception:
|
||||
time.sleep(1.0)
|
||||
|
||||
if needswitch and swipe_up_switch_callback:
|
||||
swipe_up_switch_callback()
|
||||
try:
|
||||
analyser.operation.delay(post_switch_delay_s or 1.2)
|
||||
except Exception:
|
||||
time.sleep(post_switch_delay_s or 1.2)
|
||||
return False
|
||||
|
||||
return False
|
||||
|
||||
|
||||
def filter_fudai_detail(
|
||||
analyser: Any,
|
||||
detail: Tuple,
|
||||
detail: tuple,
|
||||
x: int,
|
||||
needswitch: bool,
|
||||
post_switch_delay_s: float,
|
||||
@@ -625,7 +402,11 @@ def filter_fudai_detail(
|
||||
|
||||
if not skip:
|
||||
elapsed = time.time() - start_time
|
||||
analyser._log_kv("流程", "filter_fudai_detail完成(筛选通过)", elapsed_seconds=round(elapsed, 2))
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"filter_fudai_detail完成(筛选通过)",
|
||||
elapsed_seconds=round(elapsed, 2),
|
||||
)
|
||||
return False
|
||||
|
||||
try:
|
||||
@@ -647,7 +428,86 @@ def filter_fudai_detail(
|
||||
pass
|
||||
|
||||
elapsed = time.time() - start_time
|
||||
analyser._log_kv("流程", "filter_fudai_detail完成(筛选不通过)", elapsed_seconds=round(elapsed, 2), reason=reason)
|
||||
analyser._log_kv(
|
||||
"流程",
|
||||
"filter_fudai_detail完成(筛选不通过)",
|
||||
elapsed_seconds=round(elapsed, 2),
|
||||
reason=reason,
|
||||
)
|
||||
return True
|
||||
|
||||
|
||||
def handle_no_fudai_situation(
|
||||
analyser: Any,
|
||||
x: int,
|
||||
swipe_times: int,
|
||||
wait_times_ref: List[int],
|
||||
needswitch: bool,
|
||||
reservation_focus_until_ts: float,
|
||||
reservations: list,
|
||||
room_pos: int,
|
||||
post_switch_delay_s: float,
|
||||
swipe_up_switch_callback: Optional[Callable[[], None]],
|
||||
swipe_down_back_callback: Callable[[], None],
|
||||
sort_reservations_callback: Callable[[], None],
|
||||
clear_reservations_callback: Callable[[], None],
|
||||
write_state_callback: Callable[[], None],
|
||||
back_to_list_callback: Callable[[], None],
|
||||
into_list_callback: Callable[[], None],
|
||||
reservation_focus_until_ts_ref: List[float],
|
||||
reset_to_list_after_reservations_ref: List[bool],
|
||||
swipe_times_ref: List[int],
|
||||
seek_reservation_room_callback: Optional[Callable[[dict[str, Any]], bool]] = None,
|
||||
reservation_after_action_pending_ref: Optional[List[bool]] = None,
|
||||
reservation_back_swipe_delay_s: Optional[float] = None,
|
||||
) -> bool:
|
||||
"""处理未找到福袋的逻辑(预约回退 / 切换直播间)。"""
|
||||
|
||||
handled_reservation = False
|
||||
seek_callback = seek_reservation_room_callback or (lambda item: False)
|
||||
reservation_after_action_pending_ref = (
|
||||
reservation_after_action_pending_ref if reservation_after_action_pending_ref else [False]
|
||||
)
|
||||
reservation_back_swipe_delay_s = (
|
||||
reservation_back_swipe_delay_s
|
||||
if reservation_back_swipe_delay_s is not None
|
||||
else float(getattr(analyser, "reservation_back_swipe_delay_s", 0.5) or 0.5)
|
||||
)
|
||||
|
||||
try:
|
||||
from douyin.reservation import douyin_reservation_logic
|
||||
|
||||
handled_reservation = douyin_reservation_logic.process_reservation_attend_window(
|
||||
analyser,
|
||||
reservations,
|
||||
room_pos,
|
||||
reservation_focus_until_ts_ref,
|
||||
reservation_after_action_pending_ref,
|
||||
reservation_back_swipe_delay_s,
|
||||
swipe_down_back_callback,
|
||||
seek_callback,
|
||||
sort_reservations_callback,
|
||||
write_state_callback,
|
||||
)
|
||||
except Exception:
|
||||
handled_reservation = False
|
||||
|
||||
if handled_reservation:
|
||||
return True
|
||||
|
||||
if wait_times_ref:
|
||||
wait_times_ref[0] += 1
|
||||
|
||||
if needswitch and swipe_up_switch_callback:
|
||||
try:
|
||||
swipe_up_switch_callback()
|
||||
except Exception:
|
||||
pass
|
||||
delay_seconds = float(post_switch_delay_s or 1.0)
|
||||
try:
|
||||
analyser.operation.delay(delay_seconds)
|
||||
except Exception:
|
||||
time.sleep(delay_seconds)
|
||||
if swipe_times_ref:
|
||||
swipe_times_ref[0] += 1
|
||||
return False
|
||||
+43
-17
@@ -1,5 +1,3 @@
|
||||
from __future__ import annotations
|
||||
|
||||
"""
|
||||
本地完整版 douyin_fudai(模块化调度器)
|
||||
======================================
|
||||
@@ -10,6 +8,8 @@ from __future__ import annotations
|
||||
- 将核心逻辑拆分到各子模块,仅在此做"组装 + 调度"。
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any, List, Tuple, Optional
|
||||
import os
|
||||
import time
|
||||
@@ -139,7 +139,7 @@ class fudai_analyse:
|
||||
self.fudai_icon_retry_delay_seconds: float = 0.6
|
||||
self.fudai_icon_max_wait_seconds: float = 5.0
|
||||
# 点击福袋图标后等待详情页加载的时间(秒)
|
||||
self.fudai_click_wait_seconds: float = 2.0
|
||||
self.fudai_click_wait_seconds: float = 1.0
|
||||
# 切换直播间后等待阶段诊断的时间(秒)
|
||||
self.switch_room_wait_after_stage_diag_seconds: float = 7.0
|
||||
# 滑动速度(毫秒),影响滑动持续时间,值越大滑动越慢
|
||||
@@ -299,9 +299,16 @@ class fudai_analyse:
|
||||
"""兼容原 fudai1.fudai_choujiang 的主入口(当前实现为精简版:仅基础抢福袋)。"""
|
||||
# DEBUG: 记录函数入口
|
||||
try:
|
||||
self._log_kv("DEBUG", "entered fudai_choujiang", device_id=device_id, wait_minutes=wait_minutes)
|
||||
self._log_kv(
|
||||
"DEBUG",
|
||||
"entered fudai_choujiang",
|
||||
device_id=device_id,
|
||||
wait_minutes=wait_minutes,
|
||||
)
|
||||
except Exception:
|
||||
print(f"[DEBUG] entered fudai_choujiang device_id={device_id} wait_minutes={wait_minutes}")
|
||||
print(
|
||||
f"[DEBUG] entered fudai_choujiang device_id={device_id} wait_minutes={wait_minutes}"
|
||||
)
|
||||
self.device_id = device_id or self.device_id
|
||||
self.y_pianyi = int(y_pianyi or 0)
|
||||
# 保存是否允许切换直播间的配置,供后续所有逻辑统一使用
|
||||
@@ -322,9 +329,16 @@ class fudai_analyse:
|
||||
break
|
||||
except Exception as e:
|
||||
try:
|
||||
self._log_kv("截图", "获取分辨率失败,重试中", attempt=attempt + 1, error=str(e))
|
||||
self._log_kv(
|
||||
"截图",
|
||||
"获取分辨率失败,重试中",
|
||||
attempt=attempt + 1,
|
||||
error=str(e),
|
||||
)
|
||||
except Exception:
|
||||
print(f"[DEBUG] get_device_resolution attempt {attempt+1} failed: {e}")
|
||||
print(
|
||||
f"[DEBUG] get_device_resolution attempt {attempt+1} failed: {e}"
|
||||
)
|
||||
time.sleep(1.0)
|
||||
if not resolved:
|
||||
# 回退到默认分辨率
|
||||
@@ -359,9 +373,12 @@ class fudai_analyse:
|
||||
pass
|
||||
except Exception as top_exc:
|
||||
try:
|
||||
self._log_kv("ERROR", "fudai_choujiang top-level exception", error=str(top_exc))
|
||||
self._log_kv(
|
||||
"ERROR", "fudai_choujiang top-level exception", error=str(top_exc)
|
||||
)
|
||||
except Exception:
|
||||
import traceback
|
||||
|
||||
traceback.print_exc()
|
||||
raise
|
||||
|
||||
@@ -456,7 +473,9 @@ class fudai_analyse:
|
||||
errors="replace",
|
||||
) as f:
|
||||
f.write("=" * 80 + "\n")
|
||||
f.write(f"{end_time} - [GUI] - [运行] 程序运行结束(中断退出)\n")
|
||||
f.write(
|
||||
f"{end_time} - [GUI] - [运行] 程序运行结束(中断退出)\n"
|
||||
)
|
||||
f.flush()
|
||||
except Exception:
|
||||
pass
|
||||
@@ -486,7 +505,9 @@ class fudai_analyse:
|
||||
time.sleep(1.0)
|
||||
|
||||
# ========== 阶段诊断 ==========
|
||||
def _diagnose_stage_from_current_screen(self, force_screenshot: bool = False) -> Tuple[str, str]:
|
||||
def _diagnose_stage_from_current_screen(
|
||||
self, force_screenshot: bool = False
|
||||
) -> Tuple[str, str]:
|
||||
"""封装到子模块的阶段诊断入口。
|
||||
|
||||
参数:
|
||||
@@ -590,7 +611,9 @@ class fudai_analyse:
|
||||
|
||||
注意:此方法复杂度较高,已通过模块化重构将部分逻辑拆分到子模块。
|
||||
"""
|
||||
from douyin.reservation import douyin_reservation_logic # 确保在函数作用域内可用
|
||||
from douyin.reservation import (
|
||||
douyin_reservation_logic,
|
||||
) # 确保在函数作用域内可用
|
||||
|
||||
start_time = time.time()
|
||||
# 0. 如果正在等待开奖,检查高价值预约是否需要抢占,否则只检测开奖结果
|
||||
@@ -874,7 +897,9 @@ class fudai_analyse:
|
||||
state_path = getattr(self, "_reservations_state_path", None)
|
||||
if state_path:
|
||||
# 写入空队列到状态文件
|
||||
from douyin.reservation.douyin_reservation import write_reservations_state
|
||||
from douyin.reservation.douyin_reservation import (
|
||||
write_reservations_state,
|
||||
)
|
||||
|
||||
write_reservations_state(
|
||||
state_path=state_path,
|
||||
@@ -1546,7 +1571,7 @@ class fudai_analyse:
|
||||
retries=max_screenshot_retries,
|
||||
elapsed_seconds=round(elapsed, 2),
|
||||
screenshot_elapsed_seconds=round(screenshot_elapsed, 2),
|
||||
suggestion="检查设备连接状态和ADB服务"
|
||||
suggestion="检查设备连接状态和ADB服务",
|
||||
)
|
||||
return
|
||||
|
||||
@@ -2379,8 +2404,8 @@ class fudai_analyse:
|
||||
and len(detail) >= 6
|
||||
):
|
||||
# 类型检查:detail 已经通过 isinstance 检查,可以安全地索引
|
||||
# 直接使用 detail,因为已经通过了类型和长度检查
|
||||
countdown_tuple: Any = detail[5] # type: ignore[index]
|
||||
detail_values = detail
|
||||
countdown_tuple: Any = detail_values[5] # type: ignore[index]
|
||||
if (
|
||||
isinstance(countdown_tuple, (tuple, list))
|
||||
and len(countdown_tuple) >= 2
|
||||
@@ -2492,8 +2517,9 @@ class fudai_analyse:
|
||||
prize_value_yuan = 0.0
|
||||
countdown_tuple = None
|
||||
if isinstance(detail, tuple) and len(detail) >= 6:
|
||||
prize_value_yuan = float(detail[4] or 0.0)
|
||||
countdown_tuple = detail[5]
|
||||
detail_values = detail
|
||||
prize_value_yuan = float(detail_values[4] or 0.0)
|
||||
countdown_tuple = detail_values[5]
|
||||
|
||||
# 检查是否启用高价值预约
|
||||
high_value_enabled = bool(
|
||||
|
||||
@@ -132,5 +132,3 @@ class MainFlowController:
|
||||
# 由于 run_once_basic 方法过于复杂,暂时保持原实现
|
||||
# 但通过模块化组织,后续可以进一步拆分
|
||||
analyser.run_once_basic_original() # type: ignore[attr-defined]
|
||||
|
||||
|
||||
@@ -72,53 +72,3 @@ class BaseFudaiMixin:
|
||||
except Exception as e:
|
||||
self._safe_log("错误", f"调用 {operation_name} 失败", error=str(e))
|
||||
return None
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -27,19 +27,3 @@ class LotteryResultMixin:
|
||||
"""
|
||||
from douyin.utils import douyin_helpers
|
||||
douyin_helpers.HelperFunctions.handle_lottery_result_by_ocr(self, result_type)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -46,53 +46,3 @@ class RoomUtilsMixin:
|
||||
return douyin_reservation_handler.ReservationHandler.seek_reservation_room(
|
||||
self, item
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"updated_ts": 1767290732.5810602,
|
||||
"updated_ts": 1767357328.7936106,
|
||||
"reason": "startup_clear",
|
||||
"room_pos": 0,
|
||||
"current_room_title": "",
|
||||
|
||||
@@ -6,4 +6,3 @@ from . import douyin_detection
|
||||
from . import douyin_pixel
|
||||
|
||||
__all__ = ["douyin_detection", "douyin_pixel"]
|
||||
|
||||
@@ -18,53 +18,3 @@ __all__ = [
|
||||
"check_have_fudai_with_ready_screenshot",
|
||||
"check_in_fudai_detail",
|
||||
]
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ def check_detail_height(analyser: Any) -> int:
|
||||
# 回退到旧路径(向后兼容)
|
||||
import path_config
|
||||
pic1_path = path_config.get_screenshot_path()
|
||||
|
||||
|
||||
# 记录截图文件的时间戳(如果存在)
|
||||
screenshot_timestamp = None
|
||||
try:
|
||||
@@ -51,7 +51,7 @@ def check_detail_height(analyser: Any) -> int:
|
||||
screenshot_timestamp = os.path.getmtime(pic1_path)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
pic = None
|
||||
for attempt in range(3):
|
||||
try:
|
||||
@@ -162,13 +162,13 @@ def check_detail_height(analyser: Any) -> int:
|
||||
try:
|
||||
import importlib
|
||||
douyin_screenshot_manager = importlib.import_module("douyin.handlers.douyin_screenshot_manager")
|
||||
|
||||
|
||||
# 计算检测区域(参与按钮附近的区域)
|
||||
check_region_x1 = max(0, x - 50)
|
||||
check_region_x2 = min(width, x + 50)
|
||||
check_region_y1 = max(0, (883 * ry // 2400) - 100) # 3个任务的Y坐标附近
|
||||
check_region_y2 = min(height, (1058 * ry // 2400) + 100) # 1个任务的Y坐标附近
|
||||
|
||||
|
||||
# 标注检测点
|
||||
coords_list = []
|
||||
for base_y, dy, task_count_val in check_points:
|
||||
@@ -181,7 +181,7 @@ def check_detail_height(analyser: Any) -> int:
|
||||
min(width, x + 10),
|
||||
min(height, check_y + 5)
|
||||
))
|
||||
|
||||
|
||||
# 保存调试图片
|
||||
pic_rgb = pic.convert("RGB")
|
||||
debug_path = douyin_screenshot_manager.save_debug_image(
|
||||
@@ -244,7 +244,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
analyser: Any, screenshot_ready: bool = False
|
||||
):
|
||||
"""判定直播页面福袋的小图标是否存在(优化版,优先使用模块化查找器)。
|
||||
|
||||
|
||||
如果启用了优化查找器(fudai_finder_optimized_enabled=True),则使用新的模块化查找器。
|
||||
否则使用原版像素检测实现。
|
||||
"""
|
||||
@@ -255,7 +255,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
)
|
||||
except Exception:
|
||||
use_optimized = False
|
||||
|
||||
|
||||
if use_optimized:
|
||||
try:
|
||||
from douyin.fudai.douyin_fudai_finder import check_have_fudai_with_ready_screenshot_optimized
|
||||
@@ -283,7 +283,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 原版实现(像素检测版)
|
||||
func_start = time.time()
|
||||
# 使用统一的截图路径配置
|
||||
@@ -337,7 +337,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
except Exception:
|
||||
pass
|
||||
break
|
||||
|
||||
|
||||
# 每次循环都重新截图(除了第一次如果已经提供了截图)
|
||||
if not (screenshot_ready and loop == 0):
|
||||
try:
|
||||
@@ -431,7 +431,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
scan_x_start = 41 * rx // 1080
|
||||
scan_x_end = min(410 * rx // 1080, width)
|
||||
scan_y = 403 * ry // 2400 + y_pianyi_val
|
||||
|
||||
|
||||
# 获取最优搜索起始位置(使用历史记录或默认值)
|
||||
try:
|
||||
# 尝试获取上次找到的福袋位置(1080基准)
|
||||
@@ -444,7 +444,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
except Exception:
|
||||
# 使用默认最优位置
|
||||
optimal_x_scaled = 169 * rx // 1080
|
||||
|
||||
|
||||
# 确保最优位置在搜索范围内
|
||||
optimal_x_scaled = max(scan_x_start, min(optimal_x_scaled, scan_x_end - 1))
|
||||
|
||||
@@ -452,7 +452,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
try:
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
pic_rgb_full = pic_new.convert("RGB")
|
||||
|
||||
|
||||
# 保存完整截图
|
||||
debug_path = douyin_screenshot_manager.save_debug_image(
|
||||
pic_rgb_full,
|
||||
@@ -526,11 +526,11 @@ def check_have_fudai_with_ready_screenshot(
|
||||
roi_width = x2 - x1
|
||||
optimal_col = optimal_x_scaled - x1 # 转换为ROI内的列索引
|
||||
optimal_col = max(0, min(optimal_col, roi_width - 1))
|
||||
|
||||
|
||||
# 从最优位置开始,向左右两侧交替搜索
|
||||
found_col = None
|
||||
search_range = max(optimal_col, roi_width - optimal_col)
|
||||
|
||||
|
||||
# 先检查最优位置本身
|
||||
if valid_cols[optimal_col]:
|
||||
found_col = optimal_col
|
||||
@@ -547,16 +547,16 @@ def check_have_fudai_with_ready_screenshot(
|
||||
if left_col >= 0 and valid_cols[left_col]:
|
||||
found_col = left_col
|
||||
break
|
||||
|
||||
|
||||
# 如果没找到,回退到原来的方法(从左到右)
|
||||
if found_col is None:
|
||||
found_col = int(_np.argmax(valid_cols))
|
||||
|
||||
|
||||
col_idx = found_col
|
||||
# 计算检测到的x坐标:转换为1080基准坐标,确保精度
|
||||
detected_x = int((x1 + col_idx) * 1080.0 / max(1, rx))
|
||||
detected = True
|
||||
|
||||
|
||||
# 保存找到的位置作为下次的最优位置
|
||||
try:
|
||||
analyser.last_fudai_x = detected_x
|
||||
@@ -571,7 +571,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
douyin_screenshot_manager.save_last_success(
|
||||
roi, operation_type="pixel_detect"
|
||||
)
|
||||
|
||||
|
||||
# 保存完整截图(检测成功)
|
||||
pic_rgb_full = pic_new.convert("RGB")
|
||||
debug_path = douyin_screenshot_manager.save_debug_image(
|
||||
@@ -618,7 +618,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
scan_x_start = 41 * rx // 1080
|
||||
scan_x_end = min(410 * rx // 1080, pic_width)
|
||||
scan_y = 403 * ry // 2400 + y_pianyi_val
|
||||
|
||||
|
||||
# 获取最优搜索起始位置(使用历史记录或默认值)
|
||||
try:
|
||||
# 尝试获取上次找到的福袋位置(1080基准)
|
||||
@@ -631,10 +631,10 @@ def check_have_fudai_with_ready_screenshot(
|
||||
except Exception:
|
||||
# 使用默认最优位置
|
||||
optimal_x_scaled = 169 * rx // 1080
|
||||
|
||||
|
||||
# 确保最优位置在搜索范围内
|
||||
optimal_x_scaled = max(scan_x_start, min(optimal_x_scaled, scan_x_end - 1))
|
||||
|
||||
|
||||
# 确保y坐标在有效范围内
|
||||
if 0 <= scan_y < pic_height:
|
||||
# 精度优化:同时检查上下几行像素,提高检测准确性
|
||||
@@ -642,11 +642,11 @@ def check_have_fudai_with_ready_screenshot(
|
||||
check_y = scan_y + offset_y
|
||||
if not (0 <= check_y < pic_height):
|
||||
continue
|
||||
|
||||
|
||||
# 优化:从最优位置开始向左右两侧搜索
|
||||
found_x = None
|
||||
search_range = max(optimal_x_scaled - scan_x_start, scan_x_end - optimal_x_scaled)
|
||||
|
||||
|
||||
# 先检查最优位置本身
|
||||
try:
|
||||
px = pix[optimal_x_scaled, check_y]
|
||||
@@ -659,7 +659,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
found_x = optimal_x_scaled
|
||||
except (IndexError, TypeError):
|
||||
pass
|
||||
|
||||
|
||||
# 如果最优位置没找到,向左右两侧交替搜索
|
||||
if found_x is None:
|
||||
for offset in range(1, search_range + 1):
|
||||
@@ -678,7 +678,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
break
|
||||
except (IndexError, TypeError):
|
||||
continue
|
||||
|
||||
|
||||
# 再检查左侧
|
||||
left_x = optimal_x_scaled - offset
|
||||
if left_x >= scan_x_start:
|
||||
@@ -694,7 +694,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
break
|
||||
except (IndexError, TypeError):
|
||||
continue
|
||||
|
||||
|
||||
# 如果还是没找到,回退到原来的方法(从左到右)
|
||||
if found_x is None:
|
||||
for x_scaled in range(scan_x_start, scan_x_end):
|
||||
@@ -710,12 +710,12 @@ def check_have_fudai_with_ready_screenshot(
|
||||
break
|
||||
except (IndexError, TypeError):
|
||||
continue
|
||||
|
||||
|
||||
if found_x is not None:
|
||||
# 转换回1080基准坐标
|
||||
detected_x = int(found_x * 1080.0 / max(1, rx))
|
||||
detected = True
|
||||
|
||||
|
||||
# 保存找到的位置作为下次的最优位置
|
||||
try:
|
||||
analyser.last_fudai_x = detected_x
|
||||
@@ -739,7 +739,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
detect_roi,
|
||||
operation_type="pixel_detect",
|
||||
)
|
||||
|
||||
|
||||
# 保存完整截图(检测成功)
|
||||
pic_rgb_full = pic_new.convert("RGB")
|
||||
debug_path = douyin_screenshot_manager.save_debug_image(
|
||||
@@ -779,7 +779,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
except Exception:
|
||||
pass
|
||||
break # 找到后退出offset_y循环
|
||||
|
||||
|
||||
if detected:
|
||||
break # 找到后退出外层循环
|
||||
except Exception:
|
||||
@@ -1017,7 +1017,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
if detected and detected_x is not None:
|
||||
# 重置连续失败计数
|
||||
consecutive_failures = 0
|
||||
|
||||
|
||||
# 统计:每次"进入直播间"后首次找到福袋图标耗时
|
||||
try:
|
||||
enter_ts = float(getattr(analyser, "_enter_live_ts", 0.0) or 0.0)
|
||||
@@ -1069,7 +1069,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
|
||||
loop += 1
|
||||
consecutive_failures += 1
|
||||
|
||||
|
||||
# 如果连续失败太多次,提前退出(避免无效循环)
|
||||
if consecutive_failures >= max_consecutive_failures:
|
||||
try:
|
||||
@@ -1085,7 +1085,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
except Exception:
|
||||
pass
|
||||
break
|
||||
|
||||
|
||||
# 每轮记录一次轻量调试信息(帮助诊断为何未命中)
|
||||
# 只在每3次循环记录一次,减少日志量
|
||||
if loop % 3 == 0:
|
||||
@@ -1374,7 +1374,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
douyin_screenshot_manager.save_latest_attempt(
|
||||
search_roi_pil, operation_type="template_match"
|
||||
)
|
||||
|
||||
|
||||
# 保存调试图像(匹配前)- 使用完整截图
|
||||
screenshot_pil = PILImage.fromarray(
|
||||
cv2.cvtColor(screenshot_img, cv2.COLOR_BGR2RGB)
|
||||
@@ -1433,7 +1433,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
douyin_screenshot_manager.save_last_success(
|
||||
search_roi_pil, operation_type="template_match"
|
||||
)
|
||||
|
||||
|
||||
# 保存带匹配结果的调试图像(带匹配框)- 使用完整截图
|
||||
screenshot_pil = PILImage.fromarray(
|
||||
cv2.cvtColor(screenshot_img, cv2.COLOR_BGR2RGB)
|
||||
@@ -1446,7 +1446,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
match_x2 = search_x1 + match_x_in_roi + tw
|
||||
match_y2 = search_y1 + match_y_in_roi + th
|
||||
match_coords = (match_x1, match_y1, match_x2, match_y2)
|
||||
|
||||
|
||||
debug_path = douyin_screenshot_manager.save_debug_image(
|
||||
screenshot_pil,
|
||||
operation_type="template_match",
|
||||
@@ -1635,7 +1635,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
|
||||
def check_in_fudai_detail(analyser: Any) -> bool:
|
||||
"""Detect whether we are currently on the fudai detail page.
|
||||
|
||||
|
||||
使用模板匹配检测,与 detect_fudai_detail_page 保持一致。
|
||||
"""
|
||||
_ensure_detection_cache(analyser)
|
||||
@@ -1652,7 +1652,7 @@ def check_in_fudai_detail(analyser: Any) -> bool:
|
||||
try:
|
||||
from douyin.detection import douyin_pixel
|
||||
import path_config
|
||||
|
||||
|
||||
# 获取截图
|
||||
pic_path = path_config.get_screenshot_path()
|
||||
if not os.path.exists(pic_path):
|
||||
@@ -1665,26 +1665,26 @@ def check_in_fudai_detail(analyser: Any) -> bool:
|
||||
if not os.path.exists(pic_path):
|
||||
analyser._detection_cache[cache_key] = (now, False)
|
||||
return False
|
||||
|
||||
|
||||
pic = Image.open(pic_path)
|
||||
pic.load()
|
||||
pic_rgb = pic.convert("RGB")
|
||||
|
||||
|
||||
# 获取分辨率比例和Y偏移
|
||||
rx = int(getattr(analyser, "resolution_ratio_x", 1080) or 1080)
|
||||
ry = int(getattr(analyser, "resolution_ratio_y", 2400) or 2400)
|
||||
y_pianyi = int(getattr(analyser, "y_pianyi", 0) or 0)
|
||||
|
||||
|
||||
# 获取模板匹配阈值(优先使用福袋详情页专用阈值)
|
||||
template_threshold = float(
|
||||
getattr(analyser, "fudai_detail_template_threshold", None) or
|
||||
getattr(analyser, "fudai_detail_template_threshold", None) or
|
||||
getattr(analyser, "fudai_template_match_threshold", 0.7) or 0.7
|
||||
)
|
||||
if template_threshold < 0.0:
|
||||
template_threshold = 0.0
|
||||
if template_threshold > 1.0:
|
||||
template_threshold = 1.0
|
||||
|
||||
|
||||
# 使用任务数量检测
|
||||
result = douyin_pixel.detect_fudai_detail_page(
|
||||
pic_rgb,
|
||||
@@ -1695,7 +1695,7 @@ def check_in_fudai_detail(analyser: Any) -> bool:
|
||||
return_info=False, # 不需要详细信息
|
||||
analyser=analyser,
|
||||
)
|
||||
|
||||
|
||||
is_in_detail = bool(result)
|
||||
analyser._detection_cache[cache_key] = (now, is_in_detail)
|
||||
return is_in_detail
|
||||
|
||||
@@ -664,7 +664,7 @@ def detect_live_room_icons_by_pixel(pic_rgb: Image.Image) -> tuple[bool, float]:
|
||||
try:
|
||||
from PIL import ImageDraw
|
||||
import numpy as np
|
||||
|
||||
|
||||
width, height = pic_rgb.size
|
||||
# 缩放坐标到实际尺寸(基于1080x2400)
|
||||
scale_x = width / 1080.0
|
||||
@@ -675,7 +675,7 @@ def detect_live_room_icons_by_pixel(pic_rgb: Image.Image) -> tuple[bool, float]:
|
||||
(1002, 172), (999, 174), (1011, 186), (999, 199), (1002, 202), (1013, 190),
|
||||
(1025, 201), (1028, 198), (1017, 187), (1028, 174), (1025, 172), (1014, 184)
|
||||
]
|
||||
|
||||
|
||||
# 缩放多边形坐标到实际截图尺寸
|
||||
polygon_points = [
|
||||
(int(x * scale_x), int(y * scale_y))
|
||||
@@ -685,13 +685,13 @@ def detect_live_room_icons_by_pixel(pic_rgb: Image.Image) -> tuple[bool, float]:
|
||||
# 创建多边形mask
|
||||
mask = Image.new('L', (width, height), 0)
|
||||
draw = ImageDraw.Draw(mask)
|
||||
|
||||
|
||||
# 绘制多边形(填充为白色)
|
||||
draw.polygon(polygon_points, fill=255)
|
||||
|
||||
# 将mask转换为numpy数组
|
||||
mask_array = np.array(mask)
|
||||
|
||||
|
||||
# 获取原始图像的像素数据
|
||||
img_array = np.array(pic_rgb)
|
||||
|
||||
@@ -937,9 +937,9 @@ def read_pixel_stage_state_from_screenshot(
|
||||
}
|
||||
except Exception as e: # type: ignore[general-exception]
|
||||
return False, {"method": "pixel_detection", "error": str(e)}
|
||||
|
||||
|
||||
# 模板匹配已删除,只使用像素检测
|
||||
|
||||
|
||||
detection_tasks = {
|
||||
"has_coupon_bg": lambda pic: detect_coupon_popup_background(
|
||||
pic,
|
||||
@@ -1025,9 +1025,9 @@ def read_pixel_stage_state_from_screenshot(
|
||||
if return_details:
|
||||
return state, details
|
||||
return state
|
||||
|
||||
|
||||
# 模板匹配已删除,只使用像素检测
|
||||
|
||||
|
||||
detection_tasks = {
|
||||
"has_coupon_bg": lambda pic: detect_coupon_popup_background(
|
||||
pic,
|
||||
@@ -1112,4 +1112,4 @@ def read_pixel_stage_state_from_screenshot(
|
||||
|
||||
if return_details:
|
||||
return state, details
|
||||
return state
|
||||
return state
|
||||
@@ -1,7 +1,3 @@
|
||||
"""
|
||||
福袋相关模块
|
||||
"""
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ def attend_choujiang(analyser) -> bool:
|
||||
attend_button_text = ""
|
||||
button_status = getattr(analyser, "_fudai_button_status", None)
|
||||
button_text = getattr(analyser, "_fudai_button_text", "")
|
||||
|
||||
|
||||
# 如果并行OCR已经识别了按钮,且识别时间较近(5秒内),直接使用
|
||||
if button_text and button_status:
|
||||
try:
|
||||
@@ -38,7 +38,7 @@ def attend_choujiang(analyser) -> bool:
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 如果并行OCR结果不可用,则重新识别
|
||||
if not attend_button_text:
|
||||
analyser.cut_pic(306, 2030, 780, 2110, "", "参与按钮") # 参与福袋抽奖的文字
|
||||
@@ -1378,4 +1378,4 @@ def attend_choujiang(analyser) -> bool:
|
||||
last_text=attend_button_text or "", # type: ignore[possibly-unbound]
|
||||
result="参与失败",
|
||||
)
|
||||
return False
|
||||
return False
|
||||
@@ -21,7 +21,7 @@ def log_debug_error(
|
||||
level: str = "WARNING",
|
||||
) -> None:
|
||||
"""统一的错误日志记录函数。
|
||||
|
||||
|
||||
参数:
|
||||
analyser: 分析器对象
|
||||
error: 异常对象
|
||||
@@ -31,7 +31,7 @@ def log_debug_error(
|
||||
try:
|
||||
error_type = type(error).__name__
|
||||
error_msg = str(error)
|
||||
|
||||
|
||||
# 构建详细的错误信息
|
||||
error_info = {
|
||||
"error": error_msg,
|
||||
@@ -39,7 +39,7 @@ def log_debug_error(
|
||||
"level": level,
|
||||
**context,
|
||||
}
|
||||
|
||||
|
||||
# 对于严重错误,添加调用栈信息
|
||||
if level == "ERROR":
|
||||
try:
|
||||
@@ -47,7 +47,7 @@ def log_debug_error(
|
||||
error_info["stack_trace"] = stack_trace[:500] # 限制长度
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
analyser._log_kv(
|
||||
"调试工具",
|
||||
f"调试工具错误:{error_type}",
|
||||
@@ -67,51 +67,51 @@ def validate_coords(
|
||||
height: int,
|
||||
) -> Tuple[bool, Optional[str], Tuple[int, int, int, int]]:
|
||||
"""验证和修正坐标。
|
||||
|
||||
|
||||
参数:
|
||||
coords: 原始坐标 (x1, y1, x2, y2)
|
||||
width: 图像宽度
|
||||
height: 图像高度
|
||||
|
||||
|
||||
返回:
|
||||
(是否有效, 错误信息, 修正后的坐标)
|
||||
"""
|
||||
x1, y1, x2, y2 = coords
|
||||
|
||||
|
||||
# 检查坐标是否有效
|
||||
if x1 >= x2:
|
||||
return False, f"x1({x1}) >= x2({x2})", coords
|
||||
if y1 >= y2:
|
||||
return False, f"y1({y1}) >= y2({y2})", coords
|
||||
|
||||
|
||||
# 修正坐标到图像范围内
|
||||
x1_corrected = max(0, min(x1, width - 1))
|
||||
y1_corrected = max(0, min(y1, height - 1))
|
||||
x2_corrected = max(0, min(x2, width - 1))
|
||||
y2_corrected = max(0, min(y2, height - 1))
|
||||
|
||||
|
||||
corrected_coords = (x1_corrected, y1_corrected, x2_corrected, y2_corrected)
|
||||
|
||||
|
||||
# 检查是否需要修正
|
||||
if (x1 != x1_corrected or y1 != y1_corrected or
|
||||
if (x1 != x1_corrected or y1 != y1_corrected or
|
||||
x2 != x2_corrected or y2 != y2_corrected):
|
||||
return True, "坐标已修正", corrected_coords
|
||||
|
||||
|
||||
return True, None, corrected_coords
|
||||
|
||||
|
||||
def safe_image_load(image_path: str) -> Optional[Image.Image]:
|
||||
"""安全地加载图像,带详细的错误处理。
|
||||
|
||||
|
||||
参数:
|
||||
image_path: 图像文件路径
|
||||
|
||||
|
||||
返回:
|
||||
PIL Image 对象,失败返回 None
|
||||
"""
|
||||
if not os.path.exists(image_path):
|
||||
return None
|
||||
|
||||
|
||||
try:
|
||||
pic = Image.open(image_path)
|
||||
pic.load() # 确保图像数据已加载
|
||||
@@ -128,19 +128,19 @@ def safe_image_load(image_path: str) -> Optional[Image.Image]:
|
||||
|
||||
|
||||
def save_full_screenshot_with_ocr_region(
|
||||
analyser: Any,
|
||||
picname: str,
|
||||
coords: Tuple[int, int, int, int],
|
||||
analyser: Any,
|
||||
picname: str,
|
||||
coords: Tuple[int, int, int, int],
|
||||
y_pianyi: int = 0
|
||||
) -> None:
|
||||
"""保存完整截图并标注OCR区域(用于调试)。
|
||||
|
||||
|
||||
参数:
|
||||
analyser: 分析器对象
|
||||
picname: 图片名称(如"福袋内容")
|
||||
coords: OCR区域坐标 (x1, y1, x2, y2) - 基准坐标(1080x2400)
|
||||
y_pianyi: Y轴偏移
|
||||
|
||||
|
||||
错误处理:
|
||||
- FileNotFoundError: 截图文件不存在
|
||||
- PermissionError: 文件权限错误
|
||||
@@ -154,7 +154,7 @@ def save_full_screenshot_with_ocr_region(
|
||||
"coords": coords,
|
||||
"y_pianyi": y_pianyi,
|
||||
}
|
||||
|
||||
|
||||
try:
|
||||
import importlib
|
||||
douyin_screenshot_manager = importlib.import_module("douyin.handlers.douyin_screenshot_manager")
|
||||
@@ -166,11 +166,11 @@ def save_full_screenshot_with_ocr_region(
|
||||
level="ERROR",
|
||||
)
|
||||
return
|
||||
|
||||
|
||||
# 读取完整截图
|
||||
pic_path = path_config.get_screenshot_path()
|
||||
context["screenshot_path"] = pic_path
|
||||
|
||||
|
||||
if not os.path.exists(pic_path):
|
||||
log_debug_error(
|
||||
analyser,
|
||||
@@ -179,7 +179,7 @@ def save_full_screenshot_with_ocr_region(
|
||||
level="WARNING",
|
||||
)
|
||||
return
|
||||
|
||||
|
||||
# 安全加载图像
|
||||
try:
|
||||
pic_rgb = safe_image_load(pic_path)
|
||||
@@ -209,7 +209,7 @@ def save_full_screenshot_with_ocr_region(
|
||||
level="ERROR",
|
||||
)
|
||||
return
|
||||
|
||||
|
||||
# 获取分辨率信息
|
||||
width, height = pic_rgb.size
|
||||
try:
|
||||
@@ -223,12 +223,12 @@ def save_full_screenshot_with_ocr_region(
|
||||
level="WARNING",
|
||||
)
|
||||
rx, ry = 1080, 2400 # 使用默认值
|
||||
|
||||
|
||||
context.update({
|
||||
"image_size": f"{width}x{height}",
|
||||
"base_resolution": f"{rx}x{ry}",
|
||||
})
|
||||
|
||||
|
||||
# 缩放坐标到实际分辨率
|
||||
try:
|
||||
x1_base, y1_base, x2_base, y2_base = coords
|
||||
@@ -236,7 +236,7 @@ def save_full_screenshot_with_ocr_region(
|
||||
y1 = int((y1_base + y_pianyi) * height / ry)
|
||||
x2 = int(x2_base * width / rx)
|
||||
y2 = int((y2_base + y_pianyi) * height / ry)
|
||||
|
||||
|
||||
scaled_coords = (x1, y1, x2, y2)
|
||||
except (ValueError, ZeroDivisionError) as e:
|
||||
log_debug_error(
|
||||
@@ -246,12 +246,12 @@ def save_full_screenshot_with_ocr_region(
|
||||
level="ERROR",
|
||||
)
|
||||
return
|
||||
|
||||
|
||||
# 验证和修正坐标
|
||||
is_valid, error_msg, corrected_coords = validate_coords(
|
||||
scaled_coords, width, height
|
||||
)
|
||||
|
||||
|
||||
if not is_valid:
|
||||
log_debug_error(
|
||||
analyser,
|
||||
@@ -260,9 +260,9 @@ def save_full_screenshot_with_ocr_region(
|
||||
level="WARNING",
|
||||
)
|
||||
return
|
||||
|
||||
|
||||
x1, y1, x2, y2 = corrected_coords
|
||||
|
||||
|
||||
# 如果坐标被修正,记录警告
|
||||
if error_msg:
|
||||
try:
|
||||
@@ -277,7 +277,7 @@ def save_full_screenshot_with_ocr_region(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 保存调试图片
|
||||
try:
|
||||
debug_path = douyin_screenshot_manager.save_debug_image(
|
||||
@@ -292,7 +292,7 @@ def save_full_screenshot_with_ocr_region(
|
||||
"y_offset": y_pianyi,
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
if debug_path:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
|
||||
@@ -1150,4 +1150,4 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return fudai_content_text, time_text, participants, copies, prize_value_yuan
|
||||
return fudai_content_text, time_text, participants, copies, prize_value_yuan
|
||||
@@ -1027,4 +1027,4 @@ def basic_join_decision(analyser: Any, detail: Tuple) -> bool:
|
||||
elapsed_seconds=round(elapsed, 2),
|
||||
result=result,
|
||||
)
|
||||
return result
|
||||
return result
|
||||
@@ -300,4 +300,4 @@ def get_reward(analyser, reward_y: int = 0) -> None:
|
||||
analyser._log_kv("领奖", "关闭中奖提醒后等待", wait_seconds=30)
|
||||
except Exception:
|
||||
pass
|
||||
analyser.operation.delay(30)
|
||||
analyser.operation.delay(30)
|
||||
@@ -4,7 +4,8 @@ import re
|
||||
import time
|
||||
import os
|
||||
import sys
|
||||
from typing import Tuple, Any
|
||||
import threading
|
||||
from typing import Tuple, Any, Optional, Dict
|
||||
from PIL import Image
|
||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||
import numpy as np
|
||||
@@ -19,19 +20,51 @@ from douyin.fudai.core.fudai_debug_utils import (
|
||||
)
|
||||
try:
|
||||
from douyin.utils.ocr_preprocess import preprocess_for_ocr # type: ignore
|
||||
except Exception:
|
||||
except Exception: # pyright: ignore
|
||||
# 在运行环境中可能缺少 OCR 预处理依赖,提供回退实现以避免导入失败导致程序中断。
|
||||
def preprocess_for_ocr(analyser, picname: str) -> str: # type: ignore
|
||||
def preprocess_for_ocr(_analyser, picname: str) -> str: # type: ignore # pyright: ignore
|
||||
"""回退的 preprocess_for_ocr:直接返回 picname(不做预处理)。"""
|
||||
try:
|
||||
return str(picname)
|
||||
except Exception:
|
||||
except TypeError: # pyright: ignore
|
||||
return picname
|
||||
|
||||
|
||||
# 模块级线程池状态,用于复用 OCR 并行执行,避免频繁创建/销毁
|
||||
|
||||
|
||||
class _FudaiOcrExecutorState:
|
||||
def __init__(self) -> None:
|
||||
self.executor: Optional[ThreadPoolExecutor] = None
|
||||
self.workers: int = 0
|
||||
self.lock = threading.Lock()
|
||||
|
||||
|
||||
_fudai_ocr_executor_state = _FudaiOcrExecutorState()
|
||||
|
||||
|
||||
def _get_fudai_ocr_executor(optimal_workers: int) -> ThreadPoolExecutor:
|
||||
"""获取复用的 OCR 线程池;如线程数变化则重建。"""
|
||||
state = _fudai_ocr_executor_state
|
||||
with state.lock:
|
||||
if state.executor and state.workers == optimal_workers:
|
||||
return state.executor
|
||||
# 若线程数变化,安全关闭旧池
|
||||
if state.executor:
|
||||
try:
|
||||
state.executor.shutdown(wait=False, cancel_futures=True)
|
||||
except RuntimeError:
|
||||
pass
|
||||
state.executor = None
|
||||
executor = ThreadPoolExecutor(max_workers=optimal_workers)
|
||||
state.executor = executor
|
||||
state.workers = optimal_workers
|
||||
return executor
|
||||
|
||||
|
||||
def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, float]:
|
||||
"""获取福袋的内容和倒计时(从 `fudai_analyse.get_fudai_contain` 抽离)。"""
|
||||
|
||||
|
||||
# 检查是否启用调试截图保存(默认False,正常运行时跳过以提升性能)
|
||||
try:
|
||||
save_debug_images = bool(getattr(analyser, "fudai_detail_save_debug_images", False))
|
||||
@@ -46,18 +79,26 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
with open(cfg_path, "r", encoding="utf-8") as f:
|
||||
cfg = json.load(f)
|
||||
save_debug_images = bool(cfg.get("fudai_detail_save_debug_images", False))
|
||||
except Exception:
|
||||
except Exception: # pyright: ignore[reportTooBroadExceptionType]
|
||||
pass
|
||||
|
||||
# 轻重分流模式:auto(缺失字段才跑重)、light(只跑轻)、heavy(轻后必跑重)
|
||||
try:
|
||||
ocr_mode = str(getattr(analyser, "fudai_detail_ocr_mode", "auto") or "auto").lower()
|
||||
except Exception:
|
||||
ocr_mode = "auto"
|
||||
force_light = ocr_mode == "light"
|
||||
force_heavy = ocr_mode == "heavy"
|
||||
|
||||
def _parse_mm_ss(text: str):
|
||||
m = re.search(r"(\d{1,2})[::](\d{2})", str(text or ""))
|
||||
if not m:
|
||||
return None
|
||||
try:
|
||||
return int(m.group(1)), int(m.group(2))
|
||||
except Exception as e:
|
||||
except Exception as e: # pyright: ignore
|
||||
try:
|
||||
analyser._log_kv(
|
||||
analyser._log_kv( # pyright: ignore
|
||||
"验证",
|
||||
"解析倒计时格式失败",
|
||||
error=str(e),
|
||||
@@ -65,7 +106,7 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
text=text[:50] if text else "",
|
||||
level="WARNING",
|
||||
)
|
||||
except Exception:
|
||||
except Exception: # pyright: ignore
|
||||
pass
|
||||
return None
|
||||
|
||||
@@ -110,9 +151,9 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
(x1 + seg1, y1, x1 + seg1 + seg2, y2),
|
||||
analyser.y_pianyi,
|
||||
)
|
||||
except Exception as e:
|
||||
except Exception as e: # pyright: ignore[reportTooBroadExceptionType]
|
||||
try:
|
||||
analyser._log_kv(
|
||||
analyser._log_kv( # pyright: ignore[reportPrivateUsage]
|
||||
"错误",
|
||||
"保存倒计时调试截图失败",
|
||||
error=str(e),
|
||||
@@ -120,7 +161,7 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
box=box,
|
||||
level="WARNING",
|
||||
)
|
||||
except Exception:
|
||||
except Exception: # pyright: ignore[reportTooBroadExceptionType]
|
||||
pass
|
||||
|
||||
# 切割分钟区域(左侧)
|
||||
@@ -142,7 +183,7 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
try:
|
||||
mm_name = preprocess_for_ocr(analyser, "福袋倒计时_分钟")
|
||||
ss_name = preprocess_for_ocr(analyser, "福袋倒计时_秒")
|
||||
except Exception:
|
||||
except Exception: # pyright: ignore[reportTooBroadExceptionType]
|
||||
mm_name = "福袋倒计时_分钟"
|
||||
ss_name = "福袋倒计时_秒"
|
||||
|
||||
@@ -185,7 +226,7 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
ss_int = int(ss) if ss else 0
|
||||
if ss_int >= 60:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
analyser._log_kv( # pyright: ignore[reportPrivateUsage]
|
||||
"验证",
|
||||
"分割识别:检测到秒数>=60(可能是识别错误)",
|
||||
mm=mm_int,
|
||||
@@ -194,11 +235,11 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
ss_raw=ss_raw,
|
||||
level="WARNING",
|
||||
)
|
||||
except Exception:
|
||||
except Exception: # pyright: ignore[reportTooBroadExceptionType]
|
||||
pass
|
||||
except Exception as e:
|
||||
except Exception as e: # pyright: ignore[reportTooBroadExceptionType]
|
||||
try:
|
||||
analyser._log_kv(
|
||||
analyser._log_kv( # pyright: ignore[reportPrivateUsage]
|
||||
"错误",
|
||||
"验证倒计时数值失败",
|
||||
error=str(e),
|
||||
@@ -207,40 +248,40 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
ss=ss,
|
||||
level="WARNING",
|
||||
)
|
||||
except Exception:
|
||||
except Exception: # pyright: ignore[reportTooBroadExceptionType]
|
||||
pass
|
||||
|
||||
if mm and ss:
|
||||
result = f"{mm}:{ss}"
|
||||
try:
|
||||
analyser._log_kv(
|
||||
analyser._log_kv( # pyright: ignore[reportPrivateUsage]
|
||||
"福袋倒计时",
|
||||
"分割识别成功",
|
||||
mm_raw=mm_raw,
|
||||
ss_raw=ss_raw,
|
||||
result=result,
|
||||
)
|
||||
except Exception as e:
|
||||
except Exception as e: # pyright: ignore[reportTooBroadExceptionType]
|
||||
try:
|
||||
analyser._log_kv(
|
||||
analyser._log_kv( # pyright: ignore[reportPrivateUsage]
|
||||
"错误",
|
||||
"记录倒计时识别成功日志失败",
|
||||
error=str(e),
|
||||
error_type=type(e).__name__,
|
||||
level="WARNING",
|
||||
)
|
||||
except Exception:
|
||||
except Exception: # pyright: ignore[reportTooBroadExceptionType]
|
||||
pass
|
||||
return result
|
||||
except Exception as e:
|
||||
except Exception as e: # pyright: ignore[reportTooBroadExceptionType]
|
||||
try:
|
||||
analyser._log_kv(
|
||||
analyser._log_kv( # pyright: ignore[reportPrivateUsage]
|
||||
"福袋倒计时",
|
||||
"分割识别失败",
|
||||
error=str(e),
|
||||
error_type=type(e).__name__,
|
||||
)
|
||||
except Exception:
|
||||
except Exception: # pyright: ignore[reportTooBroadExceptionType]
|
||||
pass
|
||||
return ""
|
||||
|
||||
@@ -263,7 +304,126 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
cleaned = re.sub(r"\d+人已参与", "", cleaned)
|
||||
return participants, copies, cleaned
|
||||
|
||||
def _is_blank_text(text: Any) -> bool:
|
||||
return len(str(text or "").strip()) == 0
|
||||
|
||||
def _should_use_heavy(
|
||||
content_text: Any,
|
||||
mm_raw: Any,
|
||||
ss_raw: Any,
|
||||
value_text: Any,
|
||||
task_text: Any,
|
||||
button_text: Any,
|
||||
) -> set:
|
||||
fields: set[str] = set()
|
||||
if force_light:
|
||||
return fields
|
||||
if force_heavy or _is_blank_text(content_text):
|
||||
fields.add("content")
|
||||
if force_heavy or not (mm_raw and ss_raw):
|
||||
fields.update({"countdown_mm", "countdown_ss"})
|
||||
if force_heavy or _is_blank_text(value_text):
|
||||
fields.add("value")
|
||||
if force_heavy or _is_blank_text(task_text):
|
||||
fields.add("task_list")
|
||||
if force_heavy or _is_blank_text(button_text):
|
||||
fields.add("button")
|
||||
return fields
|
||||
|
||||
def _run_heavy_ocr(fields: set[str]) -> Dict[str, Any]:
|
||||
"""按需补充较重的OCR,避免默认就跑全量重模型。"""
|
||||
results: Dict[str, Any] = {}
|
||||
heavy_start = time.time()
|
||||
|
||||
def _safe_preprocess(name: str) -> str:
|
||||
try:
|
||||
return preprocess_for_ocr(analyser, name)
|
||||
except Exception:
|
||||
return name
|
||||
|
||||
# 任务列表:用于兜底检测观看任务
|
||||
if "task_list" in fields:
|
||||
try:
|
||||
name_tl = _safe_preprocess("福袋任务列表")
|
||||
results["task_list"] = analyser.operation.analyse_pic_word(name_tl, 1)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 内容:使用更重的文本模型兜底
|
||||
if "content" in fields:
|
||||
try:
|
||||
name_fc = _safe_preprocess("福袋内容")
|
||||
results["content"] = analyser.operation.analyse_pic_word(name_fc, 1)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 倒计时:先数字模型,失败再文本提取数字
|
||||
if "countdown_mm" in fields:
|
||||
mm_digits = ""
|
||||
try:
|
||||
raw = analyser.operation.analyse_pic_digits("福袋倒计时_分钟", 1)
|
||||
mm_digits = "".join(ch for ch in str(raw or "") if ch.isdigit())
|
||||
except Exception:
|
||||
pass
|
||||
if not mm_digits:
|
||||
try:
|
||||
raw = analyser.operation.analyse_pic_word("福袋倒计时_分钟", 1)
|
||||
mm_digits = "".join(ch for ch in str(raw or "") if ch.isdigit())
|
||||
except Exception:
|
||||
pass
|
||||
if mm_digits:
|
||||
results["countdown_mm"] = mm_digits
|
||||
|
||||
if "countdown_ss" in fields:
|
||||
ss_digits = ""
|
||||
try:
|
||||
raw = analyser.operation.analyse_pic_digits("福袋倒计时_秒", 1)
|
||||
ss_digits = "".join(ch for ch in str(raw or "") if ch.isdigit())
|
||||
except Exception:
|
||||
pass
|
||||
if not ss_digits:
|
||||
try:
|
||||
raw = analyser.operation.analyse_pic_word("福袋倒计时_秒", 1)
|
||||
ss_digits = "".join(ch for ch in str(raw or "") if ch.isdigit())
|
||||
except Exception:
|
||||
pass
|
||||
if ss_digits:
|
||||
results["countdown_ss"] = ss_digits
|
||||
|
||||
# 价值:重模型兜底一次,兼容带符号文本
|
||||
if "value" in fields:
|
||||
val_digits = ""
|
||||
try:
|
||||
name_val = _safe_preprocess("福袋价值")
|
||||
raw_val = analyser.operation.analyse_pic_digits(name_val, 1)
|
||||
val_digits = "".join(ch for ch in str(raw_val or "") if ch.isdigit())
|
||||
except Exception:
|
||||
pass
|
||||
if not val_digits:
|
||||
try:
|
||||
raw_val = analyser.operation.analyse_pic_word(name_val, 1)
|
||||
val_digits = "".join(ch for ch in str(raw_val or "") if ch.isdigit())
|
||||
except Exception:
|
||||
pass
|
||||
if val_digits:
|
||||
results["value"] = val_digits
|
||||
|
||||
# 按钮状态:重模型兜底,避免轻量误判
|
||||
if "button" in fields:
|
||||
try:
|
||||
name_btn = _safe_preprocess("参与按钮")
|
||||
results["button"] = analyser.operation.analyse_pic_word(name_btn, 1)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
try:
|
||||
results["_duration_ms"] = round((time.time() - heavy_start) * 1000, 1)
|
||||
except Exception:
|
||||
pass
|
||||
return results
|
||||
|
||||
countdown_box = None
|
||||
value_box = (633, 1580, 783, 1696)
|
||||
if renwu == 2: # 如果是2个任务的
|
||||
# 优化:扩大Y范围向上,确保包含任务描述(如"观看X分钟"等)
|
||||
# 从1240向上扩展到1100,确保包含任务描述区域
|
||||
@@ -301,11 +461,9 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
# 优化:向上扩大范围(1460->1440),防止识别不完整
|
||||
if save_debug_images:
|
||||
_save_full_screenshot_with_ocr_region(
|
||||
analyser, "福袋价值", (390, 1440, 1000, 1580), analyser.y_pianyi
|
||||
analyser, "福袋价值", value_box, analyser.y_pianyi
|
||||
)
|
||||
analyser.cut_pic(
|
||||
390, 1440, 1000, 1580, "", "福袋价值", analyser.y_pianyi
|
||||
) # 奖品价值/价格
|
||||
analyser.cut_pic(*value_box, "", "福袋价值", analyser.y_pianyi)
|
||||
elif renwu == 1: # 如果是1个任务的
|
||||
# 优化:扩大Y范围向上,确保包含任务描述
|
||||
if save_debug_images:
|
||||
@@ -342,11 +500,9 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
# 优化:向上扩大范围(1520->1500),防止识别不完整
|
||||
if save_debug_images:
|
||||
_save_full_screenshot_with_ocr_region(
|
||||
analyser, "福袋价值", (390, 1500, 1000, 1630), analyser.y_pianyi
|
||||
analyser, "福袋价值", value_box, analyser.y_pianyi
|
||||
)
|
||||
analyser.cut_pic(
|
||||
390, 1500, 1000, 1630, "", "福袋价值", analyser.y_pianyi
|
||||
) # 奖品价值/价格
|
||||
analyser.cut_pic(*value_box, "", "福袋价值", analyser.y_pianyi)
|
||||
elif renwu == 3: # 如果是3个任务的
|
||||
# 优化:扩大Y范围向上,确保包含任务描述
|
||||
if save_debug_images:
|
||||
@@ -383,11 +539,9 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
# 优化:向上扩大范围(1380->1360),防止识别不完整
|
||||
if save_debug_images:
|
||||
_save_full_screenshot_with_ocr_region(
|
||||
analyser, "福袋价值", (390, 1360, 1000, 1490), analyser.y_pianyi
|
||||
analyser, "福袋价值", value_box, analyser.y_pianyi
|
||||
)
|
||||
analyser.cut_pic(
|
||||
390, 1360, 1000, 1490, "", "福袋价值", analyser.y_pianyi
|
||||
) # 奖品价值/价格
|
||||
analyser.cut_pic(*value_box, "", "福袋价值", analyser.y_pianyi)
|
||||
else:
|
||||
# 优化:稍微缩小宽度,增加高度
|
||||
if save_debug_images:
|
||||
@@ -424,11 +578,9 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
# 优化:向上扩大范围(1820->1800),防止识别不完整
|
||||
if save_debug_images:
|
||||
_save_full_screenshot_with_ocr_region(
|
||||
analyser, "福袋价值", (390, 1800, 1000, 1930), analyser.y_pianyi
|
||||
analyser, "福袋价值", value_box, analyser.y_pianyi
|
||||
)
|
||||
analyser.cut_pic(
|
||||
390, 1800, 1000, 1930, "", "福袋价值", analyser.y_pianyi
|
||||
) # 奖品价值/价格
|
||||
analyser.cut_pic(*value_box, "", "福袋价值", analyser.y_pianyi)
|
||||
|
||||
# 准备任务列表区域的截图(用于并行OCR)
|
||||
# 任务列表区域(任务位置:50,1621到1032,1960),用于检测"观看X分钟"任务
|
||||
@@ -439,15 +591,15 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
analyser, "福袋任务列表", (50, 1621, 1032, 1960), analyser.y_pianyi
|
||||
)
|
||||
analyser.cut_pic(50, 1621, 1032, 1960, "", "福袋任务列表", analyser.y_pianyi)
|
||||
except Exception as e:
|
||||
except Exception as e: # pyright: ignore[reportTooBroadExceptionType]
|
||||
# 任务列表截图失败不影响后续流程,记录日志即可
|
||||
try:
|
||||
analyser._log_kv(
|
||||
analyser._log_kv( # pyright: ignore[reportPrivateUsage]
|
||||
"福袋",
|
||||
"任务列表截图失败,继续后续流程",
|
||||
error=str(e),
|
||||
)
|
||||
except Exception:
|
||||
except Exception: # pyright: ignore[reportTooBroadExceptionType]
|
||||
pass
|
||||
|
||||
# 准备参与按钮区域的截图(用于并行OCR识别按钮状态)
|
||||
@@ -458,10 +610,10 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
analyser, "参与按钮", (306, 2030, 780, 2110), analyser.y_pianyi
|
||||
)
|
||||
analyser.cut_pic(306, 2030, 780, 2110, "", "参与按钮", analyser.y_pianyi)
|
||||
except Exception as e:
|
||||
except Exception as e: # pyright: ignore[reportTooBroadExceptionType]
|
||||
# 按钮截图失败不影响后续流程,记录日志即可
|
||||
try:
|
||||
analyser._log_kv(
|
||||
analyser._log_kv( # pyright: ignore[reportPrivateUsage]
|
||||
"福袋",
|
||||
"参与按钮截图失败,继续后续流程",
|
||||
error=str(e),
|
||||
@@ -478,9 +630,13 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
countdown_ss_raw = None
|
||||
value_raw = None
|
||||
button_text_raw = None
|
||||
# 并行子任务耗时收集(ms),由各子任务在 finally 中写入
|
||||
perf_task_durations: Dict[str, float] = {}
|
||||
perf_task_lock = threading.Lock()
|
||||
|
||||
def ocr_task_list():
|
||||
"""OCR识别任务列表(用于检测观看任务)"""
|
||||
start = time.time()
|
||||
try:
|
||||
name_tl = preprocess_for_ocr(analyser, "福袋任务列表")
|
||||
return analyser.operation.analyse_pic_word(name_tl, 0)
|
||||
@@ -496,9 +652,21 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
except Exception:
|
||||
pass
|
||||
return None
|
||||
finally:
|
||||
try:
|
||||
dur = round((time.time() - start) * 1000, 1)
|
||||
with perf_task_lock:
|
||||
perf_task_durations["ocr_task_list"] = dur
|
||||
try:
|
||||
analyser._log_kv("性能", "并行OCR子任务单项耗时(ms)", field="task_list", duration_ms=dur)
|
||||
except Exception:
|
||||
pass
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def ocr_content():
|
||||
"""OCR识别福袋内容"""
|
||||
start = time.time()
|
||||
try:
|
||||
name_fc = preprocess_for_ocr(analyser, "福袋内容")
|
||||
return analyser.operation.analyse_pic_word(name_fc, 0)
|
||||
@@ -514,11 +682,25 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
except Exception:
|
||||
pass
|
||||
return None
|
||||
finally:
|
||||
try:
|
||||
dur = round((time.time() - start) * 1000, 1)
|
||||
with perf_task_lock:
|
||||
perf_task_durations["ocr_content"] = dur
|
||||
try:
|
||||
analyser._log_kv("性能", "并行OCR子任务单项耗时(ms)", field="content", duration_ms=dur)
|
||||
except Exception:
|
||||
pass
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def ocr_countdown_mm():
|
||||
"""OCR识别福袋倒计时分钟(使用轻量数字OCR)"""
|
||||
"""OCR识别福袋倒计时分钟(纯数字模型,无回退)。"""
|
||||
start = time.time()
|
||||
try:
|
||||
return analyser.operation.analyse_pic_digits("福袋倒计时_分钟", 1)
|
||||
raw = str(analyser.operation.analyse_pic_digits("福袋倒计时_分钟", 0) or "")
|
||||
digits = "".join(ch for ch in raw if ch.isdigit())
|
||||
return digits
|
||||
except Exception as e:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
@@ -531,11 +713,25 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
except Exception:
|
||||
pass
|
||||
return None
|
||||
finally:
|
||||
try:
|
||||
dur = round((time.time() - start) * 1000, 1)
|
||||
with perf_task_lock:
|
||||
perf_task_durations["ocr_countdown_mm"] = dur
|
||||
try:
|
||||
analyser._log_kv("性能", "并行OCR子任务单项耗时(ms)", field="countdown_mm", duration_ms=dur)
|
||||
except Exception:
|
||||
pass
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def ocr_countdown_ss():
|
||||
"""OCR识别福袋倒计时秒(使用轻量数字OCR)"""
|
||||
"""OCR识别福袋倒计时秒(纯数字模型,无回退)。"""
|
||||
start = time.time()
|
||||
try:
|
||||
return analyser.operation.analyse_pic_digits("福袋倒计时_秒", 1)
|
||||
raw = str(analyser.operation.analyse_pic_digits("福袋倒计时_秒", 0) or "")
|
||||
digits = "".join(ch for ch in raw if ch.isdigit())
|
||||
return digits
|
||||
except Exception as e:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
@@ -548,12 +744,37 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
except Exception:
|
||||
pass
|
||||
return None
|
||||
finally:
|
||||
try:
|
||||
dur = round((time.time() - start) * 1000, 1)
|
||||
with perf_task_lock:
|
||||
perf_task_durations["ocr_countdown_ss"] = dur
|
||||
try:
|
||||
analyser._log_kv("性能", "并行OCR子任务单项耗时(ms)", field="countdown_ss", duration_ms=dur)
|
||||
except Exception:
|
||||
pass
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def ocr_value():
|
||||
"""OCR识别福袋价值(使用普通OCR)"""
|
||||
"""OCR识别福袋价值:优先用数字模型提取金额,回退文本模型。"""
|
||||
start = time.time()
|
||||
try:
|
||||
name_val = preprocess_for_ocr(analyser, "福袋价值")
|
||||
return analyser.operation.analyse_pic_word(name_val, 0)
|
||||
try:
|
||||
name_val = preprocess_for_ocr(analyser, "福袋价值")
|
||||
except Exception:
|
||||
name_val = "福袋价值"
|
||||
|
||||
# 先用数字模型提取金额,避免整段文本的开销
|
||||
digits_raw = str(analyser.operation.analyse_pic_digits(name_val, 1) or "")
|
||||
digits_only = "".join(ch for ch in digits_raw if ch.isdigit())
|
||||
if digits_only:
|
||||
return digits_only
|
||||
|
||||
# 回退:再跑一次文本模型,兼容包含货币符号的情况
|
||||
word_raw = str(analyser.operation.analyse_pic_word(name_val, 0) or "")
|
||||
word_digits = "".join(ch for ch in word_raw if ch.isdigit())
|
||||
return word_digits or word_raw
|
||||
except Exception as e:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
@@ -566,6 +787,17 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
except Exception:
|
||||
pass
|
||||
return None
|
||||
finally:
|
||||
try:
|
||||
dur = round((time.time() - start) * 1000, 1)
|
||||
with perf_task_lock:
|
||||
perf_task_durations["ocr_value"] = dur
|
||||
try:
|
||||
analyser._log_kv("性能", "并行OCR子任务单项耗时(ms)", field="value", duration_ms=dur)
|
||||
except Exception:
|
||||
pass
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def ocr_button():
|
||||
"""OCR识别参与按钮(用于检测参与状态)"""
|
||||
@@ -592,7 +824,7 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
return button_text
|
||||
# 只有在模式0完全失败时才尝试模式1
|
||||
if not button_text:
|
||||
button_text = str(analyser.operation.analyse_pic_word(name_btn, 1) or "")
|
||||
button_text = str(analyser.operation.analyse_pic_word(name_btn, 0) or "")
|
||||
return button_text
|
||||
except Exception as e:
|
||||
try:
|
||||
@@ -610,24 +842,94 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
# 使用线程池并行执行OCR(包括任务列表OCR,与其他OCR一起并行执行)
|
||||
# 任务数量已在 detect_fudai_detail_page 中检测,直接使用传入的 renwu 参数
|
||||
try:
|
||||
# 使用动态线程池大小,根据CPU核心数优化
|
||||
# 使用动态线程池大小,根据CPU核心数优化,并复用线程池
|
||||
from operations.screenshot_service import get_optimal_workers
|
||||
optimal_workers = get_optimal_workers()
|
||||
with ThreadPoolExecutor(max_workers=optimal_workers) as executor:
|
||||
future_task_list = executor.submit(ocr_task_list)
|
||||
future_content = executor.submit(ocr_content)
|
||||
future_countdown_mm = executor.submit(ocr_countdown_mm)
|
||||
future_countdown_ss = executor.submit(ocr_countdown_ss)
|
||||
future_value = executor.submit(ocr_value)
|
||||
future_button = executor.submit(ocr_button)
|
||||
executor = _get_fudai_ocr_executor(optimal_workers)
|
||||
|
||||
# 等待所有操作完成
|
||||
task_list_raw = future_task_list.result()
|
||||
fudai_content_raw = future_content.result()
|
||||
countdown_mm_raw = future_countdown_mm.result()
|
||||
countdown_ss_raw = future_countdown_ss.result()
|
||||
value_raw = future_value.result()
|
||||
button_text_raw = future_button.result()
|
||||
task_funcs = {
|
||||
"task_list": ocr_task_list,
|
||||
"content": ocr_content,
|
||||
"countdown_mm": ocr_countdown_mm,
|
||||
"countdown_ss": ocr_countdown_ss,
|
||||
"value": ocr_value,
|
||||
"button": ocr_button,
|
||||
}
|
||||
futures: Dict[str, Any] = {}
|
||||
start_ts: Dict[str, float] = {}
|
||||
|
||||
for name, func in task_funcs.items():
|
||||
start_ts[name] = time.time()
|
||||
futures[name] = executor.submit(func)
|
||||
|
||||
task_list_raw = fudai_content_raw = countdown_mm_raw = None
|
||||
countdown_ss_raw = value_raw = button_text_raw = None
|
||||
|
||||
# 收集结果并记录耗时
|
||||
durations = {}
|
||||
for name, fut in futures.items():
|
||||
try:
|
||||
res = fut.result()
|
||||
finally:
|
||||
durations[name] = round((time.time() - start_ts.get(name, time.time())) * 1000, 1)
|
||||
if name == "task_list":
|
||||
task_list_raw = res
|
||||
elif name == "content":
|
||||
fudai_content_raw = res
|
||||
elif name == "countdown_mm":
|
||||
countdown_mm_raw = res
|
||||
elif name == "countdown_ss":
|
||||
countdown_ss_raw = res
|
||||
elif name == "value":
|
||||
value_raw = res
|
||||
elif name == "button":
|
||||
button_text_raw = res
|
||||
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"性能",
|
||||
"并行OCR子任务耗时(ms)",
|
||||
**{f"ocr_{k}": v for k, v in durations.items()},
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 轻重分流:轻量OCR跑完后,仅在缺字段或强制时补充重OCR
|
||||
try:
|
||||
heavy_fields = _should_use_heavy(
|
||||
fudai_content_raw,
|
||||
countdown_mm_raw,
|
||||
countdown_ss_raw,
|
||||
value_raw,
|
||||
task_list_raw,
|
||||
button_text_raw,
|
||||
)
|
||||
except Exception:
|
||||
heavy_fields = set()
|
||||
|
||||
if heavy_fields:
|
||||
heavy_res = _run_heavy_ocr(heavy_fields)
|
||||
|
||||
def _prefer(new_val: Any, old_val: Any):
|
||||
return new_val if not _is_blank_text(new_val) else old_val
|
||||
|
||||
task_list_raw = _prefer(heavy_res.get("task_list"), task_list_raw)
|
||||
fudai_content_raw = _prefer(heavy_res.get("content"), fudai_content_raw)
|
||||
countdown_mm_raw = _prefer(heavy_res.get("countdown_mm"), countdown_mm_raw)
|
||||
countdown_ss_raw = _prefer(heavy_res.get("countdown_ss"), countdown_ss_raw)
|
||||
value_raw = _prefer(heavy_res.get("value"), value_raw)
|
||||
button_text_raw = _prefer(heavy_res.get("button"), button_text_raw)
|
||||
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"性能",
|
||||
"福袋详情OCR轻重分流:触发重OCR补齐",
|
||||
mode=ocr_mode,
|
||||
heavy_fields=sorted(list(heavy_fields)),
|
||||
heavy_duration_ms=heavy_res.get("_duration_ms"),
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 检查任务列表中是否包含"观看X分钟"任务(在并行OCR完成后检查)
|
||||
if task_list_raw:
|
||||
@@ -758,17 +1060,36 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
except Exception:
|
||||
pass
|
||||
except Exception as e:
|
||||
# 如果并行执行失败,回退到备用并行执行(使用新的线程池)
|
||||
# 如果并行执行失败,按需决定是否走备用并行(可跳过以节省时间)
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"错误",
|
||||
"并行OCR失败,使用备用并行执行",
|
||||
"并行OCR失败",
|
||||
error=str(e),
|
||||
error_type=type(e).__name__,
|
||||
level="ERROR",
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 可选跳过备用并行,加快失败路径(默认启用备用;可通过 analyser.enable_fudai_ocr_fallback 控制)
|
||||
try:
|
||||
enable_fallback_parallel = bool(getattr(analyser, "enable_fudai_ocr_fallback", True))
|
||||
except Exception:
|
||||
enable_fallback_parallel = True
|
||||
|
||||
if not enable_fallback_parallel:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"性能",
|
||||
"跳过备用并行OCR以节省时间",
|
||||
reason="fallback_disabled",
|
||||
level="WARNING",
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
return "", "", 0, 0, 0.0
|
||||
|
||||
# 使用线程池并行执行OCR(包括任务列表OCR,与其他OCR一起并行执行)
|
||||
try:
|
||||
|
||||
@@ -807,7 +1128,7 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
|
||||
def ocr_countdown_mm_fallback():
|
||||
try:
|
||||
return analyser.operation.analyse_pic_digits("福袋倒计时_分钟", 1)
|
||||
return analyser.operation.analyse_pic_digits("福袋倒计时_分钟", 0)
|
||||
except Exception as e:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
@@ -823,7 +1144,7 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
|
||||
def ocr_countdown_ss_fallback():
|
||||
try:
|
||||
return analyser.operation.analyse_pic_digits("福袋倒计时_秒", 1)
|
||||
return analyser.operation.analyse_pic_digits("福袋倒计时_秒", 0)
|
||||
except Exception as e:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
@@ -872,7 +1193,7 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
"未达成",
|
||||
)
|
||||
):
|
||||
button_text = str(analyser.operation.analyse_pic_word(name_btn, 1) or "")
|
||||
button_text = str(analyser.operation.analyse_pic_word(name_btn, 0) or "")
|
||||
return button_text
|
||||
except Exception as e:
|
||||
try:
|
||||
@@ -887,24 +1208,54 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
pass
|
||||
return None
|
||||
|
||||
# 使用动态线程池大小
|
||||
# 使用动态线程池大小,并复用线程池
|
||||
from operations.screenshot_service import get_optimal_workers
|
||||
optimal_workers = get_optimal_workers()
|
||||
with ThreadPoolExecutor(max_workers=optimal_workers) as executor:
|
||||
future_task_list = executor.submit(ocr_task_list_fallback)
|
||||
future_content = executor.submit(ocr_content_fallback)
|
||||
future_countdown_mm = executor.submit(ocr_countdown_mm_fallback)
|
||||
future_countdown_ss = executor.submit(ocr_countdown_ss_fallback)
|
||||
future_value = executor.submit(ocr_value_fallback)
|
||||
future_button = executor.submit(ocr_button_fallback)
|
||||
executor = _get_fudai_ocr_executor(optimal_workers)
|
||||
|
||||
# 等待所有操作完成
|
||||
task_list_raw = future_task_list.result()
|
||||
fudai_content_raw = future_content.result()
|
||||
countdown_mm_raw = future_countdown_mm.result()
|
||||
countdown_ss_raw = future_countdown_ss.result()
|
||||
value_raw = future_value.result()
|
||||
button_text_raw = future_button.result()
|
||||
task_funcs = {
|
||||
"task_list": ocr_task_list_fallback,
|
||||
"content": ocr_content_fallback,
|
||||
"countdown_mm": ocr_countdown_mm_fallback,
|
||||
"countdown_ss": ocr_countdown_ss_fallback,
|
||||
"value": ocr_value_fallback,
|
||||
"button": ocr_button_fallback,
|
||||
}
|
||||
futures: Dict[str, Any] = {}
|
||||
start_ts: Dict[str, float] = {}
|
||||
for name, func in task_funcs.items():
|
||||
start_ts[name] = time.time()
|
||||
futures[name] = executor.submit(func)
|
||||
|
||||
durations = {}
|
||||
task_list_raw = fudai_content_raw = countdown_mm_raw = None
|
||||
countdown_ss_raw = value_raw = button_text_raw = None
|
||||
for name, fut in futures.items():
|
||||
try:
|
||||
res = fut.result()
|
||||
finally:
|
||||
durations[name] = round((time.time() - start_ts.get(name, time.time())) * 1000, 1)
|
||||
if name == "task_list":
|
||||
task_list_raw = res
|
||||
elif name == "content":
|
||||
fudai_content_raw = res
|
||||
elif name == "countdown_mm":
|
||||
countdown_mm_raw = res
|
||||
elif name == "countdown_ss":
|
||||
countdown_ss_raw = res
|
||||
elif name == "value":
|
||||
value_raw = res
|
||||
elif name == "button":
|
||||
button_text_raw = res
|
||||
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"性能",
|
||||
"备用并行OCR子任务耗时(ms)",
|
||||
**{f"ocr_{k}": v for k, v in durations.items()},
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 检查任务列表中是否包含"观看X分钟"任务(在并行OCR完成后检查)
|
||||
if task_list_raw:
|
||||
@@ -1051,9 +1402,9 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
pass
|
||||
fudai_content_raw = analyser.operation.analyse_pic_word("福袋内容", 0)
|
||||
countdown_mm_raw = analyser.operation.analyse_pic_digits(
|
||||
"福袋倒计时_分钟", 1
|
||||
"福袋倒计时_分钟", 0
|
||||
)
|
||||
countdown_ss_raw = analyser.operation.analyse_pic_digits("福袋倒计时_秒", 1)
|
||||
countdown_ss_raw = analyser.operation.analyse_pic_digits("福袋倒计时_秒", 0)
|
||||
value_raw = analyser.operation.analyse_pic_word("福袋价值", 0)
|
||||
# 串行执行按钮OCR
|
||||
try:
|
||||
@@ -1074,8 +1425,8 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo
|
||||
"未达成",
|
||||
)
|
||||
):
|
||||
button_text_raw = str(analyser.operation.analyse_pic_word(name_btn3, 1) or "")
|
||||
|
||||
button_text_raw = str(analyser.operation.analyse_pic_word(name_btn3, 0) or "")
|
||||
|
||||
# 处理串行执行的按钮识别结果
|
||||
button_status = None
|
||||
if button_text_raw:
|
||||
@@ -1464,6 +1815,12 @@ def check_contain(analyser, contains: str = "") -> bool:
|
||||
- True : “建议丢弃”(内容命中黑名单 contains_not_want)
|
||||
- False : “可以保留”(未命中黑名单,或凌晨时段不做内容过滤)
|
||||
"""
|
||||
|
||||
# 以下抑制为静态检查方便添加:
|
||||
# - W0212: protected-access(许多地方访问分析器/底层对象的受保护属性,运行时可用)
|
||||
# - W0718: broad-exception-caught(代码中大量使用 broad except 用于鲁棒性)
|
||||
# 这些抑制只影响静态检查,不改变运行时行为。
|
||||
# pylint: disable=W0212,W0718
|
||||
try:
|
||||
hour = int(analyser.operation.get_current_hour())
|
||||
except Exception:
|
||||
@@ -3739,7 +4096,7 @@ def basic_join_decision(analyser: Any, detail: Tuple) -> bool:
|
||||
# 检查是否是预约回退后强制参与(跳过验证)
|
||||
# 注意:必须在检查 _last_fudai_detail_status 之前检查,否则强制参与标志会被忽略
|
||||
force_attend = getattr(analyser, "_force_attend_after_reservation_back", False)
|
||||
|
||||
|
||||
# 检查是否是优惠券弹窗或识别错误:如果检测到,应该直接跳过,不继续处理
|
||||
# 但如果设置了强制参与标志,则跳过状态检查(预约回退时使用预约记录,可能不满足验证条件)
|
||||
try:
|
||||
|
||||
@@ -12,6 +12,8 @@ from __future__ import annotations
|
||||
5. 详细日志:记录每个步骤的耗时和结果
|
||||
"""
|
||||
|
||||
# pylint: disable=E1101
|
||||
|
||||
import os
|
||||
import time
|
||||
from typing import Any, Optional, Tuple, Dict
|
||||
@@ -1056,12 +1058,12 @@ class FudaiClickExecutor:
|
||||
self.analyser.operation.click(device_id, click_x, click_y)
|
||||
|
||||
# 点击后等待足够时间让详情页加载(避免连续点击导致详情页被关闭)
|
||||
# 默认等待2.5秒,确保详情页完全打开并稳定
|
||||
# 默认等待1.0秒,可通过 GUI 配置
|
||||
click_wait_time = float(
|
||||
getattr(self.analyser, "fudai_click_wait_seconds", 2.5) or 2.5
|
||||
getattr(self.analyser, "fudai_click_wait_seconds", 1.0) or 1.0
|
||||
)
|
||||
if click_wait_time < 1.5:
|
||||
click_wait_time = 1.5 # 最小1.5秒
|
||||
if click_wait_time < 1.0:
|
||||
click_wait_time = 1.0 # 最小1.0秒
|
||||
self.analyser.operation.delay(click_wait_time)
|
||||
|
||||
elapsed = (time.time() - start_time) * 1000
|
||||
@@ -1081,7 +1083,7 @@ class FudaiClickExecutor:
|
||||
self.analyser.click(fudai_x, base_y)
|
||||
# 回退模式也需要等待
|
||||
click_wait_time = float(
|
||||
getattr(self.analyser, "fudai_click_wait_seconds", 1.5) or 1.5
|
||||
getattr(self.analyser, "fudai_click_wait_seconds", 1.0) or 1.0
|
||||
)
|
||||
if click_wait_time < 1.0:
|
||||
click_wait_time = 1.0
|
||||
|
||||
@@ -22,54 +22,3 @@ __all__ = [
|
||||
"FudaiFinder",
|
||||
"check_have_fudai_with_ready_screenshot_optimized",
|
||||
]
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -40,5 +40,3 @@ class PopupHandler:
|
||||
bool: 是否检测到弹窗
|
||||
"""
|
||||
return douyin_popups.check_shopping_redpacket_popup(analyser)
|
||||
|
||||
|
||||
@@ -123,5 +123,3 @@ class ScreenshotHandler:
|
||||
pass
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
@@ -1506,4 +1506,4 @@ def save_debug_image( # type: ignore
|
||||
return None
|
||||
|
||||
# 结束 save_debug_image 的主逻辑,返回 None 表示保存失败
|
||||
return None
|
||||
return None
|
||||
@@ -422,9 +422,3 @@ class SwipeHandler:
|
||||
)
|
||||
except Exception:
|
||||
pass # 日志系统本身出错时忽略
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import os
|
||||
|
||||
def _adb_swipe_direct(device_id: str, start_x: int, start_y: int, end_x: int, end_y: int, duration_ms: int = 300, operation=None) -> bool:
|
||||
"""直接使用 ADB 内部滑动命令执行滑动操作。
|
||||
|
||||
|
||||
Args:
|
||||
device_id: 设备 ID
|
||||
start_x: 起始 X 坐标
|
||||
@@ -16,7 +16,7 @@ def _adb_swipe_direct(device_id: str, start_x: int, start_y: int, end_x: int, en
|
||||
end_y: 结束 Y 坐标
|
||||
duration_ms: 滑动持续时间(毫秒)
|
||||
operation: operation 对象,用于获取 ADB 路径(可选)
|
||||
|
||||
|
||||
Returns:
|
||||
True 如果成功,False 如果失败
|
||||
"""
|
||||
@@ -28,7 +28,7 @@ def _adb_swipe_direct(device_id: str, start_x: int, start_y: int, end_x: int, en
|
||||
adb_cmd = os.environ.get("ADB_EXECUTABLE", "adb") or "adb"
|
||||
if not adb_cmd.startswith('"') and not adb_cmd.endswith('"'):
|
||||
adb_cmd = f'"{adb_cmd}"'
|
||||
|
||||
|
||||
# 直接使用 ADB 命令执行滑动
|
||||
cmd = f"{adb_cmd} -s {device_id} shell input swipe {start_x} {start_y} {end_x} {end_y} {duration_ms}"
|
||||
result = subprocess.run(
|
||||
@@ -39,7 +39,7 @@ def _adb_swipe_direct(device_id: str, start_x: int, start_y: int, end_x: int, en
|
||||
timeout=5.0,
|
||||
text=True,
|
||||
)
|
||||
|
||||
|
||||
return result.returncode == 0
|
||||
except Exception:
|
||||
return False
|
||||
@@ -111,14 +111,14 @@ def swipe_up_switch_live(analyser: Any) -> None:
|
||||
analyser.swipe(start_x_base, start_y_base, end_x_base, end_y_base, swipe_duration_ms)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 注意:滑动后的延迟由调用方控制(如 reservation_back_swipe_delay)
|
||||
# 这里不添加额外延迟,避免双重延迟
|
||||
|
||||
|
||||
def swipe_down_back_live(analyser: Any) -> None:
|
||||
"""下滑回退到上一个直播间(基础版封装)。
|
||||
|
||||
|
||||
直接使用 ADB 内部滑动命令,不通过坐标计算。
|
||||
在直播间内,向下滑动(从上往下)可以回退到上一个直播间。
|
||||
采用 1080x2400 基准坐标,在屏幕中上部向下滑一段距离。
|
||||
@@ -185,6 +185,6 @@ def swipe_down_back_live(analyser: Any) -> None:
|
||||
analyser.swipe(start_x_base, start_y_base, end_x_base, end_y_base, swipe_duration_ms)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 注意:滑动后的延迟由调用方控制(如 reservation_back_swipe_delay)
|
||||
# 这里不添加额外延迟,避免双重延迟
|
||||
@@ -58,7 +58,3 @@ __all__ = [
|
||||
"track_action",
|
||||
"_get_debug_logger",
|
||||
]
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -60,5 +60,3 @@ class ActionLogger:
|
||||
self.log_operation("Step", name, elapsed=elapsed)
|
||||
|
||||
__all__ = ["ActionLogger"]
|
||||
|
||||
|
||||
@@ -26,41 +26,3 @@ def track_action(name: str = ""):
|
||||
return decorator
|
||||
|
||||
__all__ = ["track_action"]
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -96,5 +96,3 @@ def _get_debug_logger() -> DebugLogger:
|
||||
return DebugLogger(True)
|
||||
|
||||
__all__ = ["DebugLogger", "_get_debug_logger"]
|
||||
|
||||
|
||||
@@ -500,7 +500,7 @@ class LoggingWrapper:
|
||||
console_handlers = [h for h in root_logger.handlers if isinstance(h, logging.StreamHandler) and h.stream == sys.stdout]
|
||||
for handler in console_handlers:
|
||||
handler.setLevel(logging.CRITICAL + 1) # 临时禁用
|
||||
|
||||
|
||||
try:
|
||||
if exc_info:
|
||||
root_logger.log(
|
||||
|
||||
@@ -60,24 +60,3 @@ class ErrorLogger:
|
||||
self.log_exception(exc, context=context, level=level)
|
||||
|
||||
__all__ = ["ErrorLogger"]
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -152,5 +152,3 @@ __all__ = [
|
||||
"beautify_log_output",
|
||||
"colorize_log_line",
|
||||
]
|
||||
|
||||
|
||||
@@ -65,5 +65,3 @@ class PerformanceTracker:
|
||||
return stats
|
||||
|
||||
__all__ = ["PerformanceTracker"]
|
||||
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
"""
|
||||
其他功能模块
|
||||
"""
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -53,4 +53,3 @@ def get_no_fudai_wait_time(analyser: Any) -> float:
|
||||
def check_no_fudai_time(analyser: Any) -> float:
|
||||
"""Shim: compatibility wrapper returning the same as get_no_fudai_wait_time."""
|
||||
return get_no_fudai_wait_time(analyser)
|
||||
|
||||
@@ -12,16 +12,16 @@ from douyin.utils.ocr_preprocess import preprocess_for_ocr # type: ignore
|
||||
|
||||
def check_coupon_popup(analyser) -> bool:
|
||||
"""优惠券弹窗检测(模板匹配 + OCR兜底确认)。
|
||||
|
||||
|
||||
流程:
|
||||
1. 使用模板匹配检测优惠券弹窗背景(assets/coupon.png)
|
||||
2. 如果模板匹配成功,使用OCR检测"开心收下"按钮文字进行确认
|
||||
3. OCR检测区域与"粉丝团加入"相同:(200, 1940)-(880, 2140)
|
||||
|
||||
|
||||
注意:优惠券弹窗中的数字可能不同,但"开心收下"按钮位置固定。
|
||||
"""
|
||||
check_start = time.time()
|
||||
|
||||
|
||||
# 步骤1:模板匹配
|
||||
template_matched = False
|
||||
try:
|
||||
@@ -52,7 +52,7 @@ def check_coupon_popup(analyser) -> bool:
|
||||
return False
|
||||
|
||||
template_elapsed = time.time() - check_start
|
||||
|
||||
|
||||
# 如果模板匹配失败,直接返回False
|
||||
if not template_matched:
|
||||
try:
|
||||
@@ -70,19 +70,19 @@ def check_coupon_popup(analyser) -> bool:
|
||||
ocr_start = time.time()
|
||||
coupon_text = ""
|
||||
ocr_confirmed = False
|
||||
|
||||
|
||||
try:
|
||||
# 截图按钮区域
|
||||
analyser.cut_pic(200, 1940, 880, 2140, "", "参与按钮")
|
||||
cut_elapsed = time.time() - ocr_start
|
||||
|
||||
|
||||
# OCR模式0
|
||||
ocr_mode0_start = time.time()
|
||||
try:
|
||||
pname0 = preprocess_for_ocr(analyser, "参与按钮")
|
||||
coupon_text = str(analyser.operation.analyse_pic_word(pname0, 0) or "")
|
||||
ocr_mode0_elapsed = time.time() - ocr_mode0_start
|
||||
|
||||
|
||||
if coupon_text and "开心收下" in coupon_text:
|
||||
ocr_confirmed = True
|
||||
total_elapsed = time.time() - check_start
|
||||
@@ -109,7 +109,7 @@ def check_coupon_popup(analyser) -> bool:
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# OCR模式1(如果模式0未识别到)
|
||||
enable_ocr_mode1 = bool(getattr(analyser, "enable_ocr_mode1", False))
|
||||
if enable_ocr_mode1 and not ocr_confirmed:
|
||||
@@ -118,7 +118,7 @@ def check_coupon_popup(analyser) -> bool:
|
||||
pname1 = preprocess_for_ocr(analyser, "参与按钮")
|
||||
coupon_text = str(analyser.operation.analyse_pic_word(pname1, 1) or "")
|
||||
ocr_mode1_elapsed = time.time() - ocr_mode1_start
|
||||
|
||||
|
||||
if coupon_text and "开心收下" in coupon_text:
|
||||
ocr_confirmed = True
|
||||
total_elapsed = time.time() - check_start
|
||||
@@ -145,7 +145,7 @@ def check_coupon_popup(analyser) -> bool:
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# OCR未确认,但模板匹配成功,信任模板匹配结果
|
||||
total_elapsed = time.time() - check_start
|
||||
try:
|
||||
@@ -161,7 +161,7 @@ def check_coupon_popup(analyser) -> bool:
|
||||
except Exception:
|
||||
pass
|
||||
return True
|
||||
|
||||
|
||||
except Exception as e:
|
||||
ocr_elapsed = time.time() - ocr_start
|
||||
total_elapsed = time.time() - check_start
|
||||
@@ -384,16 +384,16 @@ def check_shopping_redpacket_popup(analyser) -> bool:
|
||||
|
||||
def handle_lottery_result_popup(analyser) -> None:
|
||||
"""处理抽奖结果弹窗:通过OCR识别并点击"我知道了"或"领取并使用"按钮。
|
||||
|
||||
|
||||
根据阶段诊断,已经确认是 FUDai_RESULT 阶段,这里使用OCR识别按钮文本后点击。
|
||||
"""
|
||||
try:
|
||||
analyser._log_kv("开奖结果", "开始处理抽奖结果弹窗")
|
||||
|
||||
|
||||
# 使用OCR识别开奖结果按钮
|
||||
from douyin.utils import douyin_helpers
|
||||
result_type = douyin_helpers.HelperFunctions.check_lottery_result_by_ocr(analyser)
|
||||
|
||||
|
||||
if result_type:
|
||||
# 根据OCR识别结果处理
|
||||
douyin_helpers.HelperFunctions.handle_lottery_result_by_ocr(analyser, result_type)
|
||||
@@ -402,7 +402,7 @@ def handle_lottery_result_popup(analyser) -> None:
|
||||
analyser._log_kv("开奖结果", "OCR未识别到按钮,使用返回键关闭")
|
||||
analyser.operation.click_back(analyser.device_id)
|
||||
analyser.operation.delay(0.5)
|
||||
|
||||
|
||||
analyser._log_kv("开奖结果", "处理完成")
|
||||
except Exception as e:
|
||||
analyser._log_kv("开奖结果", "处理失败", error=str(e))
|
||||
|
||||
@@ -144,5 +144,3 @@ def check_robot_pic_distance(analyser) -> int:
|
||||
return x1 - x
|
||||
# 如果没有检测到,返回一个兜底值 0
|
||||
return 0
|
||||
|
||||
|
||||
@@ -530,6 +530,3 @@ def maybe_reset_after_swipes(analyser, needswitch: bool, swipe_times: int) -> in
|
||||
# 回到第一个后,计数归零
|
||||
analyser.operation.delay(3)
|
||||
return 0
|
||||
|
||||
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
"""
|
||||
预约相关模块
|
||||
"""
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -32,54 +32,3 @@ __all__ = [
|
||||
"process_reservation_attend_window",
|
||||
"record_high_value_reservation",
|
||||
]
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -18,17 +18,17 @@ def format_reservation_context(
|
||||
**kwargs
|
||||
) -> Dict[str, Any]:
|
||||
"""格式化预约上下文信息。
|
||||
|
||||
|
||||
参数:
|
||||
item: 预约项字典(可选)
|
||||
reservations: 预约队列列表(可选)
|
||||
**kwargs: 其他上下文信息
|
||||
|
||||
|
||||
返回:
|
||||
格式化的上下文信息字典
|
||||
"""
|
||||
context: Dict[str, Any] = {}
|
||||
|
||||
|
||||
# 添加预约项信息
|
||||
if item:
|
||||
try:
|
||||
@@ -51,7 +51,7 @@ def format_reservation_context(
|
||||
pass
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 添加队列信息
|
||||
if reservations is not None:
|
||||
try:
|
||||
@@ -68,10 +68,10 @@ def format_reservation_context(
|
||||
}
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 添加其他上下文信息
|
||||
context.update(kwargs)
|
||||
|
||||
|
||||
return context
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ def log_reservation_error(
|
||||
stage: str = "",
|
||||
) -> None:
|
||||
"""统一的预约错误日志记录函数。
|
||||
|
||||
|
||||
参数:
|
||||
analyser: 分析器对象
|
||||
error: 异常对象
|
||||
@@ -94,7 +94,7 @@ def log_reservation_error(
|
||||
try:
|
||||
error_type = type(error).__name__
|
||||
error_msg = str(error)
|
||||
|
||||
|
||||
# 构建详细的错误信息
|
||||
error_info = {
|
||||
"error": error_msg,
|
||||
@@ -103,7 +103,7 @@ def log_reservation_error(
|
||||
"stage": stage,
|
||||
**context,
|
||||
}
|
||||
|
||||
|
||||
# 对于严重错误,添加调用栈信息
|
||||
if level == "ERROR":
|
||||
try:
|
||||
@@ -111,7 +111,7 @@ def log_reservation_error(
|
||||
error_info["stack_trace"] = stack_trace[:500] # 限制长度
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
analyser._log_kv(
|
||||
"预约",
|
||||
f"[预约] 错误:{stage or '未知操作'}" if stage else "[预约] 错误",
|
||||
@@ -131,18 +131,18 @@ def safe_write_state(
|
||||
context: Optional[Dict[str, Any]] = None,
|
||||
) -> bool:
|
||||
"""安全的状态文件写入,带详细的错误处理。
|
||||
|
||||
|
||||
参数:
|
||||
write_callback: 写入状态的回调函数
|
||||
analyser: 分析器对象(可选,用于日志记录)
|
||||
context: 上下文信息(可选)
|
||||
|
||||
|
||||
返回:
|
||||
bool: 是否成功写入
|
||||
"""
|
||||
if context is None:
|
||||
context = {}
|
||||
|
||||
|
||||
try:
|
||||
write_callback()
|
||||
return True
|
||||
@@ -190,22 +190,22 @@ def safe_write_state(
|
||||
|
||||
def validate_reservation_item(item: ReservationItem) -> Tuple[bool, Optional[str]]:
|
||||
"""验证预约项数据的有效性。
|
||||
|
||||
|
||||
参数:
|
||||
item: 预约项字典
|
||||
|
||||
|
||||
返回:
|
||||
(是否有效, 错误信息)
|
||||
"""
|
||||
if not isinstance(item, dict):
|
||||
return False, "预约项不是字典类型"
|
||||
|
||||
|
||||
# 检查必需字段
|
||||
required_fields = ["future_ts", "prize_value_yuan"]
|
||||
for field in required_fields:
|
||||
if field not in item:
|
||||
return False, f"缺少必需字段: {field}"
|
||||
|
||||
|
||||
# 验证 future_ts
|
||||
try:
|
||||
future_ts = float(item.get("future_ts", 0))
|
||||
@@ -213,7 +213,7 @@ def validate_reservation_item(item: ReservationItem) -> Tuple[bool, Optional[str
|
||||
return False, f"future_ts 无效: {future_ts}"
|
||||
except (ValueError, TypeError) as e:
|
||||
return False, f"future_ts 格式错误: {e}"
|
||||
|
||||
|
||||
# 验证 prize_value_yuan
|
||||
try:
|
||||
prize_value = float(item.get("prize_value_yuan", 0))
|
||||
@@ -221,6 +221,5 @@ def validate_reservation_item(item: ReservationItem) -> Tuple[bool, Optional[str
|
||||
return False, f"prize_value_yuan 无效: {prize_value}"
|
||||
except (ValueError, TypeError) as e:
|
||||
return False, f"prize_value_yuan 格式错误: {e}"
|
||||
|
||||
return True, None
|
||||
|
||||
return True, None
|
||||
@@ -26,7 +26,7 @@ except ImportError:
|
||||
|
||||
def _write_json_atomic(path: str, data: object, *, indent: int = 2, analyser: Optional[Any] = None) -> None:
|
||||
"""原子写入 JSON 文件,带详细的错误处理。
|
||||
|
||||
|
||||
参数:
|
||||
path: 文件路径
|
||||
data: 要写入的数据
|
||||
@@ -55,7 +55,7 @@ def _write_json_atomic(path: str, data: object, *, indent: int = 2, analyser: Op
|
||||
stage="创建状态文件目录(系统错误)",
|
||||
)
|
||||
raise
|
||||
|
||||
|
||||
tmp = path + ".tmp"
|
||||
try:
|
||||
with open(tmp, "w", encoding="utf-8") as f:
|
||||
@@ -91,7 +91,7 @@ def _write_json_atomic(path: str, data: object, *, indent: int = 2, analyser: Op
|
||||
stage="写入状态文件(系统错误)",
|
||||
)
|
||||
raise
|
||||
|
||||
|
||||
try:
|
||||
os.replace(tmp, path)
|
||||
except OSError as e:
|
||||
@@ -123,7 +123,7 @@ def write_reservations_state(
|
||||
analyser: Optional[Any] = None,
|
||||
) -> None:
|
||||
"""寫入預約隊列狀態(跨進程可讀)。
|
||||
|
||||
|
||||
参数:
|
||||
state_path: 状态文件路径
|
||||
reservations: 预约队列列表
|
||||
@@ -239,6 +239,3 @@ def write_high_value_rooms_state(path: str, rooms_map: dict, *, reason: str = ""
|
||||
_write_json_atomic(path, data, indent=2)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
|
||||
@@ -16,9 +16,7 @@ import difflib
|
||||
from typing import Any, Optional, Dict
|
||||
|
||||
from douyin.fudai import douyin_fudai_detail
|
||||
from douyin.fudai import douyin_fudai_core
|
||||
from douyin.reservation import douyin_reservation_logic
|
||||
from douyin.reservation import douyin_reservation_verify
|
||||
from douyin.handlers import douyin_swipe_handler
|
||||
|
||||
# 导入预约错误处理工具
|
||||
|
||||
@@ -70,7 +70,7 @@ def _now_ts() -> float:
|
||||
|
||||
def _normalize_room_title_for_matching(title: str) -> str:
|
||||
"""规范化直播间标题用于匹配比较。
|
||||
|
||||
|
||||
去除数字、特殊字符等,只保留核心名称部分。
|
||||
例如:"王媛媛" 和 "王媛媛2" 会被规范化为相同的字符串。
|
||||
"""
|
||||
@@ -92,39 +92,39 @@ def _normalize_room_title_for_matching(title: str) -> str:
|
||||
|
||||
def _calculate_string_similarity(s1: str, s2: str) -> float:
|
||||
"""计算两个字符串的相似度(简单的字符重叠比例)。
|
||||
|
||||
|
||||
返回 0.0 到 1.0 之间的值,1.0 表示完全相同。
|
||||
"""
|
||||
if not s1 or not s2:
|
||||
return 0.0
|
||||
if s1 == s2:
|
||||
return 1.0
|
||||
|
||||
|
||||
# 计算字符集合的交集和并集
|
||||
set1 = set(s1)
|
||||
set2 = set(s2)
|
||||
intersection = len(set1 & set2)
|
||||
union = len(set1 | set2)
|
||||
|
||||
|
||||
if union == 0:
|
||||
return 0.0
|
||||
|
||||
|
||||
# Jaccard相似度
|
||||
jaccard = intersection / union
|
||||
|
||||
|
||||
# 如果长度相近,额外加分
|
||||
len_ratio = min(len(s1), len(s2)) / max(len(s1), len(s2)) if max(len(s1), len(s2)) > 0 else 0.0
|
||||
|
||||
|
||||
# 综合相似度(Jaccard占70%,长度比例占30%)
|
||||
similarity = jaccard * 0.7 + len_ratio * 0.3
|
||||
|
||||
|
||||
return similarity
|
||||
|
||||
|
||||
def _extract_content_core(content: str) -> str:
|
||||
"""提取福袋内容的核心部分(去除倒计时等变化部分)。
|
||||
|
||||
例如:"10后开奖03(琦儿专属1HONOR/荣耀平板X9Pro11.5英寸/官方"
|
||||
|
||||
例如:"10后开奖03(琦儿专属1HONOR/荣耀平板X9Pro11.5英寸/官方"
|
||||
提取为:"琦儿专属1HONOR/荣耀平板X9Pro11.5英寸/官方"
|
||||
"""
|
||||
if not content:
|
||||
@@ -171,13 +171,13 @@ def add_reservation_core_logic(
|
||||
bool: 如果队列已满且需要回到最早开奖的预约直播间等待,返回 True;否则返回 False。
|
||||
"""
|
||||
start_time = time.time()
|
||||
|
||||
|
||||
ft = float(item.get("future_ts") or 0.0)
|
||||
content = str(item.get("content") or "")
|
||||
prize_value = float(item.get("prize_value_yuan") or 0.0)
|
||||
room_title = str(item.get("room_title") or "")
|
||||
room_title_normalized = _normalize_room_title_for_matching(room_title)
|
||||
|
||||
|
||||
# 添加函数入口日志
|
||||
try:
|
||||
from datetime import datetime
|
||||
@@ -216,24 +216,24 @@ def add_reservation_core_logic(
|
||||
r_prize_value = float(r.get("prize_value_yuan") or 0.0)
|
||||
r_room_title = str(r.get("room_title") or "")
|
||||
r_room_title_normalized = _normalize_room_title_for_matching(r_room_title)
|
||||
|
||||
|
||||
# 判断是否为同一个预约:
|
||||
# 1. (future_ts, content) 相同,且直播间名字相同(规范化后)
|
||||
# 2. 或者 (future_ts, content) 相同(兼容旧数据,没有直播间名字的情况)
|
||||
# 3. 或者通过相似度匹配:直播间名称相似 + 开奖时间相近 + 奖品价值相同 + 内容核心部分相似
|
||||
is_same_future_and_content = (r_ft == ft and r_content == content)
|
||||
is_same_room_title = (
|
||||
room_title_normalized
|
||||
and r_room_title_normalized
|
||||
room_title_normalized
|
||||
and r_room_title_normalized
|
||||
and room_title_normalized == r_room_title_normalized
|
||||
)
|
||||
|
||||
|
||||
# 相似度匹配(处理OCR误差)
|
||||
is_similar_room_title = False
|
||||
is_similar_time = False
|
||||
is_same_prize_value = False
|
||||
is_similar_content = False
|
||||
|
||||
|
||||
if room_title_normalized and r_room_title_normalized:
|
||||
# 计算直播间名称相似度
|
||||
room_title_similarity = _calculate_string_similarity(
|
||||
@@ -241,26 +241,26 @@ def add_reservation_core_logic(
|
||||
)
|
||||
# 如果一个是另一个的子串,或者相似度 >= 0.6,视为相似
|
||||
is_similar_room_title = (
|
||||
room_title_normalized in r_room_title_normalized
|
||||
room_title_normalized in r_room_title_normalized
|
||||
or r_room_title_normalized in room_title_normalized
|
||||
or room_title_similarity >= 0.6
|
||||
)
|
||||
|
||||
|
||||
# 开奖时间相近(相差60秒内,放宽容忍度以处理OCR误差和实际时间差)
|
||||
time_diff = abs(r_ft - ft)
|
||||
is_similar_time = time_diff <= 60.0
|
||||
|
||||
|
||||
# 奖品价值相同(允许0.01的误差)
|
||||
prize_diff = abs(r_prize_value - prize_value)
|
||||
is_same_prize_value = prize_diff < 0.01
|
||||
|
||||
|
||||
# 内容核心部分相似
|
||||
content_core = _extract_content_core(content)
|
||||
r_content_core = _extract_content_core(r_content)
|
||||
if content_core and r_content_core:
|
||||
content_similarity = _calculate_string_similarity(content_core, r_content_core)
|
||||
is_similar_content = content_similarity >= 0.7
|
||||
|
||||
|
||||
# 判断是否为同一个预约
|
||||
if is_same_future_and_content:
|
||||
# 如果 (future_ts, content) 相同
|
||||
@@ -402,7 +402,7 @@ def add_reservation_core_logic(
|
||||
# 按当前排序规则,队尾是"优先级最低"的记录
|
||||
del reservations[max_reservations:]
|
||||
queue_full = True
|
||||
|
||||
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"预约",
|
||||
@@ -440,7 +440,7 @@ def add_reservation_core_logic(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 添加函数完成日志
|
||||
try:
|
||||
elapsed = time.time() - start_time
|
||||
@@ -498,7 +498,7 @@ def cleanup_expired_reservations(
|
||||
try:
|
||||
now_ts_drop = _now_ts()
|
||||
before = len(reservations)
|
||||
|
||||
|
||||
# 记录被清理的预约详情
|
||||
dropped_items_detail = []
|
||||
for r in reservations:
|
||||
@@ -513,7 +513,7 @@ def cleanup_expired_reservations(
|
||||
})
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
reservations[:] = [
|
||||
r for r in reservations if float(r.get("future_ts") or 0.0) > now_ts_drop
|
||||
]
|
||||
@@ -561,7 +561,7 @@ def cleanup_expired_reservations(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
try:
|
||||
elapsed = time.time() - start_time
|
||||
analyser._log_kv(
|
||||
@@ -590,7 +590,7 @@ def handle_queue_full_wait_at_earliest(
|
||||
bool: 如果已回退到最早开奖的预约直播间,返回 True;否则返回 False。
|
||||
"""
|
||||
start_time = time.time()
|
||||
|
||||
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"预约",
|
||||
@@ -600,7 +600,7 @@ def handle_queue_full_wait_at_earliest(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
if not reservations:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
@@ -747,7 +747,7 @@ def handle_queue_full_wait_at_earliest(
|
||||
current_room_pos = int(getattr(analyser, "room_pos", room_pos) or room_pos)
|
||||
except Exception:
|
||||
current_room_pos = int(room_pos)
|
||||
|
||||
|
||||
# 计算位置差
|
||||
try:
|
||||
target_pos = int(earliest.get("pos_seen") or 0)
|
||||
@@ -774,7 +774,7 @@ def handle_queue_full_wait_at_earliest(
|
||||
analyser.operation.delay(1.5) # 等待页面加载
|
||||
except Exception:
|
||||
time.sleep(1.5)
|
||||
|
||||
|
||||
# 队列满后回退到最早直播间,继续执行后续流程
|
||||
try:
|
||||
analyser._log_kv(
|
||||
@@ -786,7 +786,7 @@ def handle_queue_full_wait_at_earliest(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 队列满后立即参与,不设置锁定期(设置为0),使用标志控制
|
||||
# 这样不会影响切换直播间的逻辑,同时后续的 process_reservation_attend_window 不会因为锁定期而跳过
|
||||
focus_until_new = 0.0 # 设置为0,表示不设置锁定期,使用标志控制
|
||||
@@ -815,7 +815,7 @@ def handle_queue_full_wait_at_earliest(
|
||||
write_state_callback()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
try:
|
||||
elapsed = time.time() - start_time
|
||||
analyser._log_kv(
|
||||
@@ -827,7 +827,7 @@ def handle_queue_full_wait_at_earliest(
|
||||
pass
|
||||
|
||||
return True
|
||||
|
||||
|
||||
try:
|
||||
elapsed = time.time() - start_time
|
||||
analyser._log_kv(
|
||||
@@ -860,7 +860,7 @@ def process_reservation_attend_window(
|
||||
让上层逻辑继续后续处理(例如识别详情并参与)。
|
||||
"""
|
||||
start_time = time.time()
|
||||
|
||||
|
||||
# 添加函数入口日志
|
||||
try:
|
||||
analyser._log_kv(
|
||||
@@ -880,7 +880,7 @@ def process_reservation_attend_window(
|
||||
)
|
||||
else:
|
||||
pass
|
||||
|
||||
|
||||
if not reservations:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
@@ -1056,7 +1056,7 @@ def process_reservation_attend_window(
|
||||
time_window_end_ts = ft + max(0.0, poll_before)
|
||||
time_window_end_str = datetime.fromtimestamp(time_window_end_ts).strftime("%Y-%m-%d %H:%M:%S") if time_window_end_ts > 0 else "无效"
|
||||
ft_str = datetime.fromtimestamp(ft).strftime("%Y-%m-%d %H:%M:%S") if ft > 0 else "无效"
|
||||
|
||||
|
||||
analyser._log_kv(
|
||||
"预约",
|
||||
"[预约] process_reservation_attend_window 详细检查",
|
||||
@@ -1097,7 +1097,7 @@ def process_reservation_attend_window(
|
||||
is_queue_full_immediate_attend_check = True
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
if focus_until > 0 and now_ts < focus_until and abs(focus_until - now_ts) > 1.0 and not is_queue_full_immediate_attend_check:
|
||||
# 锁定期还没结束,检查是否是同一个预约(允许5秒误差)
|
||||
expected_focus_until = ft + max(0.0, poll_before)
|
||||
@@ -1122,14 +1122,14 @@ def process_reservation_attend_window(
|
||||
current_room_pos_check = int(getattr(analyser, "room_pos", room_pos) or room_pos)
|
||||
except Exception:
|
||||
current_room_pos_check = int(room_pos)
|
||||
|
||||
|
||||
# 计算位置差
|
||||
try:
|
||||
target_pos_check = int(target.get("pos_seen") or 0)
|
||||
except Exception:
|
||||
target_pos_check = 0
|
||||
pos_diff_check = current_room_pos_check - target_pos_check
|
||||
|
||||
|
||||
# 如果已经在目标位置(pos_diff == 0),说明已经在目标直播间,不需要再次回退
|
||||
# 但是需要检查时间窗口是否到达,如果到达了,应该返回 True 表示需要参与
|
||||
# 或者如果是队列满立即参与模式,直接返回 True
|
||||
@@ -1142,7 +1142,7 @@ def process_reservation_attend_window(
|
||||
is_queue_full_immediate_attend_pos = True
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 检查时间窗口是否到达,或者是队列满立即参与模式
|
||||
if is_queue_full_immediate_attend_pos or (now_ts >= ft - dynamic_ahead and now_ts <= ft + max(0.0, poll_before)):
|
||||
# 时间窗口已到达或队列满立即参与模式,虽然已在目标位置,但需要参与,返回 True
|
||||
@@ -1173,12 +1173,12 @@ def process_reservation_attend_window(
|
||||
reservation_after_action_pending_ref[0] = True
|
||||
else:
|
||||
reservation_after_action_pending_ref.append(True)
|
||||
|
||||
|
||||
try:
|
||||
write_state_callback()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
return True
|
||||
else:
|
||||
# 时间窗口未到达,跳过
|
||||
@@ -1202,7 +1202,7 @@ def process_reservation_attend_window(
|
||||
if reservation_after_action_pending_ref:
|
||||
reservation_after_action_pending_ref[0] = False
|
||||
return False
|
||||
|
||||
|
||||
# 如果不在目标位置,继续检查时间窗口
|
||||
try:
|
||||
analyser._log_kv(
|
||||
@@ -1235,7 +1235,7 @@ def process_reservation_attend_window(
|
||||
pass
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
if not is_queue_full_immediate_attend and now_ts < ft - dynamic_ahead:
|
||||
# 还没到窗口(非队列满立即参与模式)
|
||||
try:
|
||||
@@ -1296,7 +1296,7 @@ def process_reservation_attend_window(
|
||||
current_room_pos = int(getattr(analyser, "room_pos", room_pos) or room_pos)
|
||||
except Exception:
|
||||
current_room_pos = int(room_pos)
|
||||
|
||||
|
||||
# 计算位置差
|
||||
try:
|
||||
target_pos = int(target.get("pos_seen") or 0)
|
||||
@@ -1357,7 +1357,7 @@ def process_reservation_attend_window(
|
||||
target_room_title_raw = str(target.get("room_title_raw") or "").strip()
|
||||
target_content = str(target.get("content") or "").strip()
|
||||
target_value = float(target.get("prize_value_yuan") or 0.0)
|
||||
|
||||
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"预约",
|
||||
@@ -1373,7 +1373,7 @@ def process_reservation_attend_window(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 回退成功后,进行回退校验(如果启用了回退校验)
|
||||
verify_ok = True
|
||||
verify_detail = None
|
||||
@@ -1388,7 +1388,7 @@ def process_reservation_attend_window(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
if verify_enabled:
|
||||
try:
|
||||
try:
|
||||
@@ -1401,7 +1401,7 @@ def process_reservation_attend_window(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
from douyin.reservation import douyin_reservation_verify
|
||||
verify_ok, verify_detail = douyin_reservation_verify.validate_back_to_reservation(
|
||||
analyser=analyser,
|
||||
@@ -1409,7 +1409,7 @@ def process_reservation_attend_window(
|
||||
quick=False,
|
||||
max_checks=3,
|
||||
)
|
||||
|
||||
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"预约",
|
||||
@@ -1445,7 +1445,7 @@ def process_reservation_attend_window(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 校验失败,尝试根据映射表查找正确位置并自动回退
|
||||
try:
|
||||
if hasattr(analyser, "_find_room_pos_by_title"):
|
||||
@@ -1463,7 +1463,7 @@ def process_reservation_attend_window(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 更新目标位置并重新回退
|
||||
target["pos_seen"] = correct_pos
|
||||
try:
|
||||
@@ -1605,7 +1605,7 @@ def process_reservation_attend_window(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 如果回退或校验失败,直接返回 False
|
||||
if not ok:
|
||||
try:
|
||||
@@ -1625,7 +1625,7 @@ def process_reservation_attend_window(
|
||||
except Exception:
|
||||
pass
|
||||
return False
|
||||
|
||||
|
||||
# 进入锁定期:在开奖附近一段时间内不再切换直播间
|
||||
focus_until_new = ft + max(0.0, poll_before)
|
||||
if reservation_focus_until_ts_ref:
|
||||
@@ -1637,11 +1637,11 @@ def process_reservation_attend_window(
|
||||
reservation_after_action_pending_ref[0] = True
|
||||
else:
|
||||
reservation_after_action_pending_ref.append(True)
|
||||
|
||||
|
||||
try:
|
||||
from datetime import datetime
|
||||
ft_str = datetime.fromtimestamp(ft).strftime("%Y-%m-%d %H:%M:%S") if ft > 0 else "无效"
|
||||
|
||||
|
||||
# 运行日志
|
||||
analyser._log_kv(
|
||||
"预约",
|
||||
@@ -1656,7 +1656,7 @@ def process_reservation_attend_window(
|
||||
target_content=target_content,
|
||||
target_value_yuan=target_value,
|
||||
)
|
||||
|
||||
|
||||
# 行为日志
|
||||
analyser._log_kv(
|
||||
"行为",
|
||||
@@ -1681,7 +1681,7 @@ def process_reservation_attend_window(
|
||||
write_state_callback()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 添加函数完成日志
|
||||
try:
|
||||
from datetime import datetime
|
||||
@@ -1718,7 +1718,7 @@ def process_reservation_attend_window(
|
||||
write_state_callback()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 添加函数完成日志
|
||||
try:
|
||||
from datetime import datetime
|
||||
@@ -2037,4 +2037,4 @@ def record_high_value_reservation(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
return False
|
||||
return False
|
||||
@@ -44,11 +44,11 @@ def _compact_text(text: str) -> str:
|
||||
|
||||
def match_reservation(item: Dict[str, Any], detail: Tuple) -> Tuple[bool, str, Dict[str, Any]]:
|
||||
"""校验回退后的福袋详情是否匹配预约。返回 (ok, reason, debug_dict)
|
||||
|
||||
|
||||
参数:
|
||||
item: 预约项字典
|
||||
detail: 福袋详情 tuple (content, time_text, participants, copies, prize_value_yuan, countdown_tuple)
|
||||
|
||||
|
||||
返回:
|
||||
(is_match, reason, debug_dict)
|
||||
"""
|
||||
@@ -172,15 +172,15 @@ def validate_back_to_reservation(
|
||||
max_checks: int = 3,
|
||||
) -> Tuple[bool, Optional[Tuple]]:
|
||||
"""回退后校验:只校验直播间标题,不校验福袋。
|
||||
|
||||
|
||||
如果直播间标题不符合,则根据映射表找到正确位置并回退。
|
||||
|
||||
|
||||
参数:
|
||||
analyser: 分析器对象
|
||||
item: 预约项字典
|
||||
quick: 是否快速模式(减少检查次数)
|
||||
max_checks: 最大检查次数(未使用,保留兼容性)
|
||||
|
||||
|
||||
返回:
|
||||
(is_valid, None) - 如果校验通过返回 True,否则返回 False
|
||||
"""
|
||||
@@ -196,7 +196,7 @@ def validate_back_to_reservation(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 若开关关闭,则跳过复杂校验,直接认为回退成功以加速流程
|
||||
try:
|
||||
verify_enabled = bool(getattr(analyser, "reservation_back_verify_enabled", True))
|
||||
@@ -229,7 +229,7 @@ def validate_back_to_reservation(
|
||||
except Exception:
|
||||
expected_title = str(item.get("room_title") or "").strip()
|
||||
expected_title_raw = str(item.get("room_title_raw") or "").strip()
|
||||
|
||||
|
||||
# 使用运行时映射表验证位置信息
|
||||
target_pos_seen = int(item.get("pos_seen") or 0)
|
||||
try:
|
||||
@@ -248,7 +248,7 @@ def validate_back_to_reservation(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 如果映射表中的标题与预期标题匹配,增强验证信心
|
||||
if expected_title and recorded_title:
|
||||
try:
|
||||
@@ -299,7 +299,7 @@ def validate_back_to_reservation(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
if expected_title:
|
||||
try:
|
||||
y_pianyi_val = int(getattr(analyser, "y_pianyi", 0) or 0)
|
||||
@@ -312,14 +312,14 @@ def validate_back_to_reservation(
|
||||
analyser.current_room_title_raw = current_title_raw
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
if current_title:
|
||||
ratio = 0.0
|
||||
try:
|
||||
ratio = float(difflib.SequenceMatcher(None, expected_title, current_title).ratio())
|
||||
except Exception:
|
||||
ratio = 0.0
|
||||
|
||||
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"预约",
|
||||
@@ -332,7 +332,7 @@ def validate_back_to_reservation(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 强不匹配:根据映射表找到正确位置并回退
|
||||
if current_title and (expected_title not in current_title) and (current_title not in expected_title) and ratio < 0.45:
|
||||
try:
|
||||
@@ -345,7 +345,7 @@ def validate_back_to_reservation(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 根据映射表找到正确位置
|
||||
try:
|
||||
if hasattr(analyser, "_find_room_pos_by_title"):
|
||||
@@ -361,7 +361,7 @@ def validate_back_to_reservation(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 回退到正确位置
|
||||
try:
|
||||
# 更新 item 中的 pos_seen
|
||||
@@ -382,7 +382,7 @@ def validate_back_to_reservation(
|
||||
new_ratio = float(difflib.SequenceMatcher(None, expected_title, new_title).ratio())
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
if (expected_title in new_title) or (new_title in expected_title) or new_ratio >= 0.45:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
@@ -519,7 +519,7 @@ def validate_back_to_reservation(
|
||||
analyser._log_kv("预约", "回退校验:读取直播间标题失败", error=str(e))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 如果标题匹配或没有标题,校验通过
|
||||
try:
|
||||
analyser._log_kv(
|
||||
@@ -529,6 +529,5 @@ def validate_back_to_reservation(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return True, None
|
||||
|
||||
return True, None
|
||||
@@ -1,7 +1,3 @@
|
||||
"""
|
||||
阶段处理模块
|
||||
"""
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -7,9 +7,9 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
"""完整抽離自 `douyin_fudai.fudai_analyse._diagnose_stage_from_current_screen`。
|
||||
|
||||
日志輸出已從 print 改為 _log_kv,方便結構化查看。
|
||||
|
||||
|
||||
当前模式:优先使用像素检测,OCR检测已暂时关闭用于测试像素检测精准度。
|
||||
|
||||
|
||||
注意:此函数复杂度较高,包含多个检测步骤和条件分支,这是设计上的权衡。
|
||||
"""
|
||||
import time
|
||||
@@ -38,7 +38,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
except Exception:
|
||||
# 兜底:避免任何日志异常影响主流程
|
||||
pass
|
||||
|
||||
|
||||
def _log_separator(title: str = "", char: str = "="):
|
||||
"""输出简洁分隔符(仅在 verbose=True 时启用),方便阅读详细日志。"""
|
||||
if not verbose:
|
||||
@@ -69,14 +69,14 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
in_live_room = False
|
||||
live_room_score = 0.0
|
||||
detection_method = ""
|
||||
|
||||
|
||||
# 获取像素检测阈值(用于判断置信度是否达到要求)
|
||||
pixel_threshold = float(getattr(analyser, "live_room_match_threshold", 0.8) or 0.8)
|
||||
if pixel_threshold < 0.0:
|
||||
pixel_threshold = 0.0
|
||||
if pixel_threshold > 1.0:
|
||||
pixel_threshold = 1.0
|
||||
|
||||
|
||||
# ========== 第一步:基于同一张截图并行采集所有像素特征(包括直播间图标检测)==========
|
||||
# 这是最优先的检测方式,速度快且准确,所有像素检测在screenshot中并行执行
|
||||
# 包括:直播间图标像素检测(多边形区域白色像素检测)以及其他所有阶段检测
|
||||
@@ -90,18 +90,18 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
else:
|
||||
pixel_state = result
|
||||
pixel_details = {}
|
||||
|
||||
|
||||
pixel_detection_elapsed = (time.time() - pixel_detection_start) * 1000
|
||||
|
||||
|
||||
# 从并行检测结果中获取直播间图标检测结果
|
||||
# 只使用像素检测(多边形区域白色像素检测),白色比例 >= 阈值则判定为在直播间
|
||||
live_room_pixel_detected = bool(pixel_state.get("has_live_room_pixel", False))
|
||||
|
||||
|
||||
# 获取检测分数(白色像素比例)
|
||||
pixel_confidence = 0.0
|
||||
if "has_live_room_pixel" in pixel_details:
|
||||
pixel_confidence = float(pixel_details["has_live_room_pixel"].get("confidence", 0.0) or 0.0)
|
||||
|
||||
|
||||
# 如果像素检测通过(白色比例 >= 阈值),判定为在直播间
|
||||
if live_room_pixel_detected:
|
||||
in_live_room = True
|
||||
@@ -136,11 +136,11 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
except Exception:
|
||||
# 此处为容错:若 pixel_state/pixel_details 格式异常,继续保持未命中
|
||||
pass
|
||||
|
||||
|
||||
if in_live_room:
|
||||
total_elapsed = (time.time() - step_start) * 1000
|
||||
_log("步骤0[检测直播间]-最终结果:在直播间", 检测方法=detection_method, 分数=live_room_score, 总耗时毫秒=total_elapsed)
|
||||
|
||||
|
||||
# 记录每个检测步骤的详细信息
|
||||
for key, detail in pixel_details.items():
|
||||
step_name_map = {
|
||||
@@ -155,13 +155,13 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
step_name = step_name_map.get(key, key)
|
||||
detected = detail.get("detected", False)
|
||||
method = detail.get("method", "unknown")
|
||||
|
||||
|
||||
log_fields = {
|
||||
"步骤": step_name,
|
||||
"检测结果": "命中" if detected else "未命中",
|
||||
"检测方法": method,
|
||||
}
|
||||
|
||||
|
||||
# 添加分数信息
|
||||
if "template_score" in detail and detail["template_score"] is not None:
|
||||
log_fields["分数"] = round(detail["template_score"], 4)
|
||||
@@ -215,7 +215,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
log_fields["任务数量"] = "未获取"
|
||||
try:
|
||||
configured_threshold = float(
|
||||
getattr(analyser, "fudai_detail_template_threshold", None) or
|
||||
getattr(analyser, "fudai_detail_template_threshold", None) or
|
||||
getattr(analyser, "fudai_template_match_threshold", 0.7) or 0.7
|
||||
)
|
||||
log_fields["配置阈值"] = round(configured_threshold, 4)
|
||||
@@ -225,9 +225,9 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
log_fields["原因"] = detail["reason"]
|
||||
if "error" in detail:
|
||||
log_fields["错误"] = detail["error"]
|
||||
|
||||
|
||||
_log(f"并行检测-{step_name}", **log_fields)
|
||||
|
||||
|
||||
_log(
|
||||
"像素状态(并行检测完成)",
|
||||
耗时毫秒=pixel_detection_elapsed,
|
||||
@@ -245,11 +245,11 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
_log("并行检测异常", 耗时毫秒=pixel_detection_elapsed, 异常类型=type(e).__name__, 异常信息=str(e))
|
||||
pixel_state = {}
|
||||
pixel_details = {}
|
||||
|
||||
|
||||
# ========== 如果不在直播间,执行步骤3(OCR检测推荐页/关注列表/直播列表)==========
|
||||
if not in_live_room:
|
||||
_log("不在直播间,执行步骤3(OCR检测推荐页/关注列表/直播列表)")
|
||||
|
||||
|
||||
# 步骤3:检测推荐页面、关注列表、直播列表(OCR标签栏,整合在一起检测)
|
||||
step_start = time.time()
|
||||
remaining_time_before = max_diag_time - (time.time() - diag_start)
|
||||
@@ -292,7 +292,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
文本预览=t_recommend[:50] if t_recommend else "",
|
||||
)
|
||||
elapsed_recommend = (time.time() - step_start) * 1000
|
||||
|
||||
|
||||
# 如果识别到"推荐",直接返回推荐页面
|
||||
if "推荐" in t_recommend:
|
||||
total_elapsed = (time.time() - diag_start) * 1000
|
||||
@@ -311,7 +311,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
)
|
||||
_log_separator(f"最终结果:RECOMMEND_PAGE(推荐页)")
|
||||
return "RECOMMEND_PAGE", "标题='{}'".format(t_recommend)
|
||||
|
||||
|
||||
# 如果识别到"关注"但没有"推荐",可能是关注列表
|
||||
if "关注" in t_recommend and "推荐" not in t_recommend:
|
||||
_log("步骤3[OCR关注列表]-检测到关注关键词,准备精确确认", 精确区域="(658,147)-(765,194)")
|
||||
@@ -349,7 +349,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
except Exception as e:
|
||||
import traceback
|
||||
_log("步骤3[OCR关注列表]-异常", 异常类型=type(e).__name__, 异常信息=str(e), 堆栈=traceback.format_exc())
|
||||
|
||||
|
||||
elapsed_follow = (time.time() - step_start_follow) * 1000
|
||||
if "关注" in t_follow:
|
||||
total_elapsed = (time.time() - diag_start) * 1000
|
||||
@@ -372,7 +372,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
)
|
||||
_log_separator(f"最终结果:FOLLOW_LIST(关注列表)")
|
||||
return "FOLLOW_LIST", "标题='{}'".format(t_follow)
|
||||
|
||||
|
||||
# 如果识别到"正在直播"标签,判定为直播列表
|
||||
if "正在直播" in t_recommend or ("直播" in t_recommend and "推荐" not in t_recommend and "关注" not in t_recommend):
|
||||
_log("步骤3[OCR直播列表]-检测到直播关键词,准备精确确认", 精确区域="(650,145)-(800,195)")
|
||||
@@ -412,7 +412,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
except Exception as e:
|
||||
import traceback
|
||||
_log("步骤3[OCR直播列表]-异常", 异常类型=type(e).__name__, 异常信息=str(e), 堆栈=traceback.format_exc())
|
||||
|
||||
|
||||
elapsed_list = (time.time() - step_start_list) * 1000
|
||||
if "正在直播" in t_list:
|
||||
total_elapsed = (time.time() - diag_start) * 1000
|
||||
@@ -431,13 +431,13 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
)
|
||||
_log_separator(f"最终结果:LIVE_LIST(直播列表)")
|
||||
return "LIVE_LIST", "标题='{}'".format(t_list)
|
||||
|
||||
|
||||
# 记录诊断时看到的"关注页标题"
|
||||
try:
|
||||
analyser._last_follow_list_title_text = str(t_follow or "").strip()
|
||||
except Exception:
|
||||
analyser._last_follow_list_title_text = ""
|
||||
|
||||
|
||||
elapsed_total = (time.time() - step_start) * 1000
|
||||
if elapsed_total > max_step_time * 1000:
|
||||
_log("步骤3[OCR推荐页/关注列表/直播列表]-步骤超时", 耗时毫秒=elapsed_total, 阈值毫秒=max_step_time * 1000)
|
||||
@@ -457,7 +457,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
异常信息=str(e),
|
||||
堆栈=traceback.format_exc(),
|
||||
)
|
||||
|
||||
|
||||
# 如果不在直播间且OCR也未识别到特定页面,默认返回在直播间
|
||||
total_elapsed = (time.time() - diag_start) * 1000
|
||||
_log_summary(
|
||||
@@ -468,14 +468,14 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
)
|
||||
_log_separator(f"最终结果:IN_LIVE_ROOM(默认直播间)")
|
||||
return "IN_LIVE_ROOM", "不在直播间且未识别到特定页面,默认判定为在直播间"
|
||||
|
||||
|
||||
# ========== 在直播间:继续执行像素检测结果处理 ==========
|
||||
_log_separator("在直播间,继续执行像素检测结果处理")
|
||||
_log("在直播间,继续执行像素检测结果处理")
|
||||
|
||||
# ========== 优先使用像素检测结果判断阶段(按优先级顺序)==========
|
||||
# 根据像素检测结果,按优先级返回阶段
|
||||
|
||||
|
||||
# 优先级1:抽奖结果弹窗(大片红色+我知道了)
|
||||
if pixel_state.get("has_lucky_draw_result", False):
|
||||
_log_separator("步骤1:检测抽奖结果弹窗")
|
||||
@@ -483,7 +483,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
step_result_start = time.time()
|
||||
remaining_time_before = max_diag_time - (time.time() - diag_start)
|
||||
_log("步骤1[检测抽奖结果弹窗]-开始", 剩余时间秒=remaining_time_before, 说明="像素检测到抽奖结果弹窗,OCR兜底确认")
|
||||
|
||||
|
||||
result_verified = False
|
||||
try:
|
||||
# 检测抽奖结果文字区域 (300, 600)-(800, 800) - 扩大区域以覆盖"没有抽中福袋"文字
|
||||
@@ -516,7 +516,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
文本长度=len(result_text),
|
||||
文本预览=result_text[:50] if result_text else "",
|
||||
)
|
||||
|
||||
|
||||
# 检测"我知道了"按钮区域 (181, 1261)-(890, 1389) - 与像素检测区域一致
|
||||
if result_text and ("没有抽中" in result_text or "抽中福袋" in result_text):
|
||||
if time.time() - step_result_start < max_step_time:
|
||||
@@ -536,7 +536,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
文本长度=len(confirm_text),
|
||||
文本预览=confirm_text[:50] if confirm_text else "",
|
||||
)
|
||||
|
||||
|
||||
if confirm_text and ("我知道了" in confirm_text or "领取并使用" in confirm_text):
|
||||
result_verified = True
|
||||
else:
|
||||
@@ -550,7 +550,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
_log("步骤1[检测抽奖结果弹窗]-异常", 耗时毫秒=result_elapsed, 异常类型=type(e).__name__, 异常信息=str(e))
|
||||
# OCR异常时,不判定为抽奖结果弹窗(需要OCR确认)
|
||||
_log("步骤1[检测抽奖结果弹窗]-OCR异常,不判定为抽奖结果弹窗", 说明="需要OCR确认才能判定")
|
||||
|
||||
|
||||
if result_verified:
|
||||
total_elapsed = (time.time() - diag_start) * 1000
|
||||
result_elapsed = (time.time() - step_result_start) * 1000
|
||||
@@ -563,14 +563,14 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
)
|
||||
_log_separator(f"最终结果:FUDai_RESULT(抽奖结果弹窗)")
|
||||
return "FUDai_RESULT", "像素检测+OCR确认(抽奖结果弹窗)"
|
||||
|
||||
|
||||
# 优先级1.5:购物红包弹窗检测(保持现有检测方式)
|
||||
if pixel_state.get("has_redpacket_bg", False):
|
||||
_log_separator("步骤1.5:检测购物红包弹窗")
|
||||
step_redpacket_start = time.time()
|
||||
remaining_time_before = max_diag_time - (time.time() - diag_start)
|
||||
_log("步骤1.5[检测购物红包弹窗]-开始", 剩余时间秒=remaining_time_before, 说明="像素检测到购物红包背景")
|
||||
|
||||
|
||||
redpacket_detected = False
|
||||
try:
|
||||
if time.time() - step_redpacket_start < max_step_time:
|
||||
@@ -590,7 +590,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
文本长度=len(redpacket_text),
|
||||
文本预览=redpacket_text[:50] if redpacket_text else "",
|
||||
)
|
||||
|
||||
|
||||
# 检查是否包含购物红包关键词
|
||||
redpacket_keywords = ("购物红包", "邀你抢", "抢红包")
|
||||
if redpacket_text and any(kw in redpacket_text for kw in redpacket_keywords):
|
||||
@@ -603,7 +603,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
_log("步骤1.5[检测购物红包弹窗]-异常", 耗时毫秒=redpacket_elapsed, 异常类型=type(e).__name__, 异常信息=str(e))
|
||||
# OCR异常时,不判定为购物红包弹窗(以OCR为准)
|
||||
_log("步骤1.5[检测购物红包弹窗]-OCR异常,不判定为购物红包弹窗", 说明="需要OCR确认才能判定")
|
||||
|
||||
|
||||
if redpacket_detected:
|
||||
total_elapsed = (time.time() - diag_start) * 1000
|
||||
redpacket_elapsed = (time.time() - step_redpacket_start) * 1000
|
||||
@@ -615,7 +615,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
红包检测耗时毫秒=redpacket_elapsed,
|
||||
)
|
||||
return "SHOPPING_REDPACKET_POPUP", "像素检测+OCR确认(购物红包弹窗)"
|
||||
|
||||
|
||||
# 优先级2:优惠券弹窗检测(使用参与按钮区域,检测"开心收下")
|
||||
# 优惠券弹窗和参与福袋按钮在同一个位置,需要通过OCR区分
|
||||
# ========== 步骤2:OCR检测(已暂时禁用)==========
|
||||
@@ -632,7 +632,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
# 注意:即使 has_fudai_detail 为 False,pixel_details 中可能仍然有任务数量信息
|
||||
detail_detected = bool(pixel_state.get("has_fudai_detail", False))
|
||||
detail_task_count = None
|
||||
|
||||
|
||||
# 尝试从 pixel_details 中获取任务数量(无论 has_fudai_detail 是否为 True)
|
||||
if "has_fudai_detail" in pixel_details:
|
||||
detail_task_count = pixel_details["has_fudai_detail"].get("task_count")
|
||||
@@ -681,7 +681,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 如果并行检测到福袋详情页,直接返回
|
||||
if detail_detected:
|
||||
total_elapsed = (time.time() - diag_start) * 1000
|
||||
@@ -694,7 +694,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
)
|
||||
_log_separator(f"最终结果:FUDai_DETAIL(福袋详情页)")
|
||||
return "FUDai_DETAIL", f"任务数量检测确认(任务数量={detail_task_count})"
|
||||
|
||||
|
||||
# 额外检测:在指定区域检测"邀你抢红包"文字(用于检测红包/福袋详情页)
|
||||
# 区域:(238,454) 到 (847,545) - 基准坐标(1080x2400)
|
||||
# 优化:当模板匹配分数很低(<0.4)时,说明明显不在福袋详情页,跳过OCR检测以节省时间
|
||||
@@ -704,7 +704,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
# 获取模板匹配分数(如果存在),用于判断是否跳过OCR
|
||||
template_match_score = float(getattr(analyser, "_last_template_match_score", 0.0) or 0.0)
|
||||
should_skip_redpacket_ocr = (not detail_detected and template_match_score > 0 and template_match_score < template_match_score_threshold)
|
||||
|
||||
|
||||
if should_skip_redpacket_ocr:
|
||||
_log(
|
||||
"步骤1.5[OCR检测邀你抢红包]-跳过(模板匹配分数过低)",
|
||||
@@ -712,7 +712,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
阈值=template_match_score_threshold,
|
||||
说明="模板匹配分数过低,明显不在福袋详情页,跳过OCR检测以节省时间"
|
||||
)
|
||||
|
||||
|
||||
if not detail_detected and enable_invite_redpacket_ocr and not should_skip_redpacket_ocr:
|
||||
step_ocr_redpacket_start = time.time()
|
||||
remaining_time_before = max_diag_time - (time.time() - diag_start)
|
||||
@@ -721,7 +721,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
if remaining_time_before > ocr_max_step_time:
|
||||
try:
|
||||
_log("步骤1.5[OCR检测邀你抢红包]-开始", 剩余时间秒=remaining_time_before, 说明="在指定区域检测邀你抢红包文字")
|
||||
|
||||
|
||||
if time.time() - step_ocr_redpacket_start < ocr_max_step_time:
|
||||
cut_start = time.time()
|
||||
y_pianyi = int(getattr(analyser, "y_pianyi", 0) or 0)
|
||||
@@ -732,28 +732,28 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
import path_config
|
||||
import os
|
||||
from PIL import Image
|
||||
|
||||
|
||||
pic_path = path_config.get_screenshot_path()
|
||||
if os.path.exists(pic_path):
|
||||
pic = Image.open(pic_path)
|
||||
pic.load()
|
||||
pic_rgb = pic.convert("RGB")
|
||||
|
||||
|
||||
width, height = pic_rgb.size
|
||||
rx = int(getattr(analyser, "resolution_ratio_x", 1080) or 1080)
|
||||
ry = int(getattr(analyser, "resolution_ratio_y", 2400) or 2400)
|
||||
|
||||
|
||||
x1_base, y1_base, x2_base, y2_base = 238, 454, 847, 545
|
||||
x1 = int(x1_base * width / rx)
|
||||
y1 = int((y1_base + y_pianyi) * height / ry)
|
||||
x2 = int(x2_base * width / rx)
|
||||
y2 = int((y2_base + y_pianyi) * height / ry)
|
||||
|
||||
|
||||
x1 = max(0, min(x1, width - 1))
|
||||
y1 = max(0, min(y1, height - 1))
|
||||
x2 = max(0, min(x2, width - 1))
|
||||
y2 = max(0, min(y2, height - 1))
|
||||
|
||||
|
||||
if x1 < x2 and y1 < y2:
|
||||
debug_path = douyin_screenshot_manager.save_debug_image(
|
||||
pic_rgb,
|
||||
@@ -774,11 +774,11 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
pass
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
analyser.cut_pic(238, 454, 847, 545, "", "阶段诊断邀你抢红包区域", y_pianyi)
|
||||
cut_elapsed = (time.time() - cut_start) * 1000
|
||||
_log("步骤1.5[OCR检测邀你抢红包]-截图完成", 耗时毫秒=cut_elapsed)
|
||||
|
||||
|
||||
if time.time() - step_ocr_redpacket_start < ocr_max_step_time:
|
||||
ocr_start = time.time()
|
||||
name_red0 = preprocess_for_ocr(analyser, "阶段诊断邀你抢红包区域")
|
||||
@@ -790,7 +790,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
文本长度=len(ocr_text),
|
||||
文本预览=ocr_text[:50] if ocr_text else "",
|
||||
)
|
||||
|
||||
|
||||
# 如果模式0未识别到,尝试模式1
|
||||
enable_ocr_mode1 = bool(getattr(analyser, "enable_ocr_mode1", False))
|
||||
if enable_ocr_mode1 and (not ocr_text or not any(kw in ocr_text for kw in ("邀你抢", "抢红包", "抢手气"))):
|
||||
@@ -802,7 +802,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
文本长度=len(ocr_text),
|
||||
文本预览=ocr_text[:50] if ocr_text else "",
|
||||
)
|
||||
|
||||
|
||||
# 检测是否包含"邀你抢红包"相关关键词(支持变体)
|
||||
redpacket_keywords = ("邀你抢红包", "邀你抢手气红包", "邀你抢", "抢红包", "抢手气")
|
||||
if ocr_text and any(kw in ocr_text for kw in redpacket_keywords):
|
||||
@@ -833,15 +833,15 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
# 在返回"在直播间"之前,如果检测到弹窗相关的像素特征,需要OCR再次确认
|
||||
# 因为有些直播间背景颜色可能与弹窗颜色相似,导致误判
|
||||
has_suspicious_popup_pixel = (
|
||||
pixel_state.get("has_coupon_bg", False) or
|
||||
pixel_state.get("has_coupon_bg", False) or
|
||||
pixel_state.get("has_redpacket_bg", False)
|
||||
)
|
||||
|
||||
|
||||
if has_suspicious_popup_pixel:
|
||||
step_ocr_verify_start = time.time()
|
||||
remaining_time_before = max_diag_time - (time.time() - diag_start)
|
||||
_log("步骤3[OCR确认弹窗]-开始", 剩余时间秒=remaining_time_before, 说明="像素检测到弹窗背景,但未匹配到弹窗阶段,OCR再次确认")
|
||||
|
||||
|
||||
# 检测优惠券弹窗(使用参与按钮区域,检测"开心收下")
|
||||
if pixel_state.get("has_coupon_bg", False):
|
||||
coupon_verified = False
|
||||
@@ -890,13 +890,13 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
文本长度=len(coupon_text),
|
||||
文本预览=coupon_text[:50] if coupon_text else "",
|
||||
)
|
||||
|
||||
|
||||
if coupon_text and "开心收下" in coupon_text:
|
||||
coupon_verified = True
|
||||
except Exception as e:
|
||||
coupon_elapsed = (time.time() - step_ocr_verify_start) * 1000
|
||||
_log("步骤3[OCR确认弹窗]-优惠券异常", 耗时毫秒=coupon_elapsed, 异常类型=type(e).__name__, 异常信息=str(e))
|
||||
|
||||
|
||||
if coupon_verified:
|
||||
total_elapsed = (time.time() - diag_start) * 1000
|
||||
coupon_elapsed = (time.time() - step_ocr_verify_start) * 1000
|
||||
@@ -908,7 +908,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
优惠券检测耗时毫秒=coupon_elapsed,
|
||||
)
|
||||
return "COUPON_POPUP", "OCR确认(开心收下)"
|
||||
|
||||
|
||||
# 检测购物红包弹窗
|
||||
if pixel_state.get("has_redpacket_bg", False):
|
||||
redpacket_verified = False
|
||||
@@ -930,14 +930,14 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
文本长度=len(redpacket_text),
|
||||
文本预览=redpacket_text[:50] if redpacket_text else "",
|
||||
)
|
||||
|
||||
|
||||
redpacket_keywords = ("购物红包", "邀你抢", "抢红包")
|
||||
if redpacket_text and any(kw in redpacket_text for kw in redpacket_keywords):
|
||||
redpacket_verified = True
|
||||
except Exception as e:
|
||||
redpacket_elapsed = (time.time() - step_ocr_verify_start) * 1000
|
||||
_log("步骤3[OCR确认弹窗]-购物红包异常", 耗时毫秒=redpacket_elapsed, 异常类型=type(e).__name__, 异常信息=str(e))
|
||||
|
||||
|
||||
if redpacket_verified:
|
||||
total_elapsed = (time.time() - diag_start) * 1000
|
||||
redpacket_elapsed = (time.time() - step_ocr_verify_start) * 1000
|
||||
@@ -949,11 +949,11 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
红包检测耗时毫秒=redpacket_elapsed,
|
||||
)
|
||||
return "SHOPPING_REDPACKET_POPUP", "OCR确认(购物红包弹窗)"
|
||||
|
||||
|
||||
# OCR确认后仍未匹配到弹窗,说明是直播间背景颜色误判
|
||||
ocr_verify_elapsed = (time.time() - step_ocr_verify_start) * 1000
|
||||
_log("步骤3[OCR确认弹窗]-未匹配到弹窗", 耗时毫秒=ocr_verify_elapsed, 说明="OCR确认后未匹配,判定为直播间背景颜色")
|
||||
|
||||
|
||||
# 如果识别到在直播间,并且其他阶段都没识别到,返回在直播间阶段
|
||||
if in_live_room:
|
||||
total_elapsed = (time.time() - diag_start) * 1000
|
||||
@@ -968,7 +968,7 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
)
|
||||
_log_separator(f"最终结果:IN_LIVE_ROOM(在直播间)")
|
||||
return "IN_LIVE_ROOM", f"识别到在直播间({detection_method}),其他阶段未识别"
|
||||
|
||||
|
||||
# 如果不在直播间,默认返回:在直播间内(IN_LIVE_ROOM)
|
||||
# 这种情况可能是检测失败,但为了流程继续,默认返回在直播间
|
||||
total_elapsed = (time.time() - diag_start) * 1000
|
||||
@@ -979,4 +979,4 @@ def diagnose_stage_from_current_screen(analyser): # type: ignore[misc] # noqa:
|
||||
原因="像素检测未命中,默认直播间",
|
||||
总耗时毫秒=total_elapsed,
|
||||
)
|
||||
_log_separator(f"最终结果:IN_LIVE_ROOM(默认直播间)")
|
||||
_log_separator(f"最终结果:IN_LIVE_ROOM(默认直播间)")
|
||||
@@ -10,15 +10,13 @@ from __future__ import annotations
|
||||
- 直播间图标检测
|
||||
"""
|
||||
|
||||
# pylint: disable=E1101
|
||||
|
||||
import time
|
||||
from typing import Any, Tuple, List, Optional
|
||||
from typing import Any, Tuple, List
|
||||
|
||||
from douyin.stage import douyin_stage
|
||||
from douyin.fudai import douyin_fudai_detail
|
||||
from douyin.fudai import douyin_fudai_core
|
||||
import douyin.core.douyin_flow_control as douyin_flow_control
|
||||
from douyin.reservation import douyin_reservation_logic
|
||||
from douyin.handlers import douyin_swipe_handler
|
||||
|
||||
|
||||
class StageHandler:
|
||||
@@ -100,7 +98,7 @@ class StageHandler:
|
||||
except Exception:
|
||||
# 回退到旧路径(向后兼容)
|
||||
assets_dir = os.path.join(base_dir, "assets")
|
||||
|
||||
|
||||
# 使用统一的截图路径配置
|
||||
try:
|
||||
import path_config
|
||||
@@ -135,7 +133,7 @@ class StageHandler:
|
||||
screenshot_path = alt_path
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 如果仍然不存在,记录错误
|
||||
if not os.path.exists(screenshot_path):
|
||||
try:
|
||||
@@ -178,26 +176,26 @@ class StageHandler:
|
||||
# 第一步:裁剪右上角图标区域(使用固定坐标,基于1080x2400基准分辨率)
|
||||
# 直播间图标区域:(972, 147) 到 (1047, 216) - 与像素检测区域一致
|
||||
ih, iw = img.shape[:2]
|
||||
|
||||
|
||||
# 基准分辨率
|
||||
base_width = 1080
|
||||
base_height = 2400
|
||||
|
||||
|
||||
# 固定坐标(基于1080x2400)
|
||||
base_x1 = 972
|
||||
base_y1 = 147
|
||||
base_x2 = 1047
|
||||
base_y2 = 216
|
||||
|
||||
|
||||
# 缩放坐标到实际分辨率
|
||||
scale_x = iw / base_width
|
||||
scale_y = ih / base_height
|
||||
|
||||
|
||||
roi_x1 = max(0, int(base_x1 * scale_x))
|
||||
roi_y1 = max(0, int(base_y1 * scale_y))
|
||||
roi_x2 = min(iw, int(base_x2 * scale_x))
|
||||
roi_y2 = min(ih, int(base_y2 * scale_y))
|
||||
|
||||
|
||||
# 确保区域有效
|
||||
if roi_x1 >= roi_x2 or roi_y1 >= roi_y2:
|
||||
try:
|
||||
@@ -209,7 +207,7 @@ class StageHandler:
|
||||
except Exception:
|
||||
pass
|
||||
return False, 0.0
|
||||
|
||||
|
||||
roi = img[roi_y1:roi_y2, roi_x1:roi_x2] # type: ignore[index]
|
||||
|
||||
# 同步裁剪彩色 ROI,用于后续颜色特征检测(白色比例等)
|
||||
@@ -370,10 +368,9 @@ class StageHandler:
|
||||
# 方法1:固定阈值二值化(针对白色x和深灰背景,阈值约160-180)
|
||||
# 先尝试多个阈值,选择最佳
|
||||
best_binary_score = 0.0
|
||||
best_binary_thresh = 160
|
||||
roi_binary_fixed = None
|
||||
tpl_binary_fixed = None
|
||||
|
||||
|
||||
for thresh_val in [140, 160, 180, 200]:
|
||||
try:
|
||||
_, roi_bin = cv2.threshold(roi_img, thresh_val, 255, cv2.THRESH_BINARY) # type: ignore[attr-defined]
|
||||
@@ -383,12 +380,11 @@ class StageHandler:
|
||||
_min_val, max_val, _min_loc, _max_loc = cv2.minMaxLoc(res_test) # type: ignore[attr-defined]
|
||||
if max_val > best_binary_score:
|
||||
best_binary_score = max_val
|
||||
best_binary_thresh = thresh_val
|
||||
roi_binary_fixed = roi_bin
|
||||
tpl_binary_fixed = tpl_bin
|
||||
except:
|
||||
continue
|
||||
|
||||
|
||||
# 方法2:自适应二值化(调整参数,blockSize使用较小值以提高精度)
|
||||
roi_binary_adaptive = cv2.adaptiveThreshold( # type: ignore[attr-defined]
|
||||
roi_img, 255, cv2.ADAPTIVE_THRESH_GAUSSIAN_C, cv2.THRESH_BINARY, 7, 2 # type: ignore[attr-defined]
|
||||
@@ -396,24 +392,24 @@ class StageHandler:
|
||||
tpl_binary_adaptive = cv2.adaptiveThreshold( # type: ignore[attr-defined]
|
||||
tpl, 255, cv2.ADAPTIVE_THRESH_GAUSSIAN_C, cv2.THRESH_BINARY, 7, 2 # type: ignore[attr-defined]
|
||||
)
|
||||
|
||||
|
||||
# 方法3:Otsu二值化(全局阈值)
|
||||
_, roi_binary_otsu = cv2.threshold(roi_img, 0, 255, cv2.THRESH_BINARY + cv2.THRESH_OTSU) # type: ignore[attr-defined]
|
||||
_, tpl_binary_otsu = cv2.threshold(tpl, 0, 255, cv2.THRESH_BINARY + cv2.THRESH_OTSU) # type: ignore[attr-defined]
|
||||
|
||||
|
||||
# 方法4:边缘检测(Canny,针对白色x和深灰背景,调整参数)
|
||||
roi_edges = cv2.Canny(roi_img, 50, 150) # type: ignore[attr-defined]
|
||||
tpl_edges = cv2.Canny(tpl, 50, 150) # type: ignore[attr-defined]
|
||||
|
||||
|
||||
# 方法5:边缘检测(更激进的参数,检测更多边缘)
|
||||
roi_edges_aggressive = cv2.Canny(roi_img, 30, 80) # type: ignore[attr-defined]
|
||||
tpl_edges_aggressive = cv2.Canny(tpl, 30, 80) # type: ignore[attr-defined]
|
||||
|
||||
|
||||
# 方法6:形态学处理(去除噪声,增强边缘)
|
||||
kernel = cv2.getStructuringElement(cv2.MORPH_RECT, (3, 3)) # type: ignore[attr-defined]
|
||||
roi_edges_morph = cv2.morphologyEx(roi_edges, cv2.MORPH_CLOSE, kernel) # type: ignore[attr-defined]
|
||||
tpl_edges_morph = cv2.morphologyEx(tpl_edges, cv2.MORPH_CLOSE, kernel) # type: ignore[attr-defined]
|
||||
|
||||
|
||||
# 使用固定阈值二值化图像作为主要匹配图像(针对白色x和深灰背景优化)
|
||||
if roi_binary_fixed is not None and tpl_binary_fixed is not None:
|
||||
roi_img_enhanced = roi_binary_fixed
|
||||
@@ -422,7 +418,7 @@ class StageHandler:
|
||||
# 回退到自适应二值化
|
||||
roi_img_enhanced = roi_binary_adaptive
|
||||
tpl_enhanced = tpl_binary_adaptive
|
||||
|
||||
|
||||
# 保存所有预处理图像用于多方法匹配
|
||||
roi_binary_adaptive_backup = roi_binary_adaptive
|
||||
tpl_binary_adaptive_backup = tpl_binary_adaptive
|
||||
@@ -434,7 +430,7 @@ class StageHandler:
|
||||
tpl_edges_aggressive_backup = tpl_edges_aggressive
|
||||
roi_edges_morph_backup = roi_edges_morph
|
||||
tpl_edges_morph_backup = tpl_edges_morph
|
||||
|
||||
|
||||
# 方法7:强对比度增强(针对实际测试中表现较好的配置)
|
||||
roi_contrast = cv2.convertScaleAbs(roi_img_enhanced, alpha=2.0, beta=30) # type: ignore[attr-defined]
|
||||
tpl_contrast = cv2.convertScaleAbs(tpl_enhanced, alpha=2.0, beta=30) # type: ignore[attr-defined]
|
||||
@@ -442,7 +438,7 @@ class StageHandler:
|
||||
tpl_contrast_backup = tpl_contrast
|
||||
roi_edges_morph_backup = roi_edges_morph
|
||||
tpl_edges_morph_backup = tpl_edges_morph
|
||||
|
||||
|
||||
use_edges = True
|
||||
except Exception:
|
||||
roi_img_enhanced = roi_img
|
||||
@@ -738,7 +734,6 @@ class StageHandler:
|
||||
join_ahead = float(getattr(analyser, "high_value_fudai_join_ahead_seconds", 120) or 120)
|
||||
poll_before = float(getattr(analyser, "poll_before_open_seconds", 10.0) or 10.0)
|
||||
time_window_start_ts = ft - join_ahead
|
||||
time_window_end_ts = ft + max(0.0, poll_before)
|
||||
if now_ts < time_window_start_ts:
|
||||
try:
|
||||
analyser._log_kv( # type: ignore[attr-defined]
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
"""
|
||||
工具函数模块
|
||||
"""
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@ from typing import Any, Optional
|
||||
|
||||
class ConfigManager:
|
||||
"""配置管理器类"""
|
||||
|
||||
|
||||
@staticmethod # type: ignore[misc]
|
||||
def load_config_from_file(
|
||||
analyser: Any, config_path: Optional[str] = None
|
||||
) -> None:
|
||||
"""从配置文件加载配置并设置到 analyser 对象
|
||||
|
||||
|
||||
参数:
|
||||
analyser: fudai_analyse 实例
|
||||
config_path: 配置文件路径,如果为 None 则使用 analyser.config_path
|
||||
@@ -33,71 +33,71 @@ class ConfigManager:
|
||||
import path_config
|
||||
default_config_path = path_config.get_config_path()
|
||||
config_path = getattr(analyser, "config_path", default_config_path)
|
||||
|
||||
|
||||
# 如果 config_path 仍然为 None,直接返回(使用默认值)
|
||||
if config_path is None:
|
||||
return
|
||||
|
||||
|
||||
# 如果配置文件不存在,直接返回(使用默认值)
|
||||
if not os.path.exists(config_path):
|
||||
return
|
||||
|
||||
|
||||
try:
|
||||
with open(config_path, "r", encoding="utf-8") as f:
|
||||
config = json.load(f)
|
||||
except (json.JSONDecodeError, IOError, OSError):
|
||||
# 如果 JSON 解析失败或文件读取失败,直接返回(使用默认值)
|
||||
return
|
||||
|
||||
|
||||
# 保存 needswitch 的原始值(如果已通过命令行设置,则保留)
|
||||
original_needswitch = getattr(analyser, "needswitch", None)
|
||||
|
||||
|
||||
# 加载基本配置
|
||||
if "min_prize_value_yuan" in config:
|
||||
analyser.min_prize_value_yuan = float(config["min_prize_value_yuan"] or 0.0)
|
||||
|
||||
|
||||
if "min_participants" in config:
|
||||
analyser.min_participants = int(config["min_participants"] or 0)
|
||||
|
||||
|
||||
if "max_participants" in config:
|
||||
analyser.max_participants = int(config["max_participants"] or 0)
|
||||
|
||||
|
||||
if "skip_if_countdown_gt_seconds" in config:
|
||||
analyser.skip_if_countdown_gt_seconds = int(
|
||||
config["skip_if_countdown_gt_seconds"] or 900
|
||||
)
|
||||
|
||||
|
||||
if "skip_if_countdown_lt_seconds" in config:
|
||||
analyser.skip_if_countdown_lt_seconds = int(
|
||||
config["skip_if_countdown_lt_seconds"] or 0
|
||||
)
|
||||
|
||||
|
||||
if "fudai_icon_max_wait_seconds" in config:
|
||||
analyser.fudai_icon_max_wait_seconds = float(
|
||||
config["fudai_icon_max_wait_seconds"] or 5.0
|
||||
)
|
||||
|
||||
|
||||
if "fudai_icon_retry_delay_seconds" in config:
|
||||
analyser.fudai_icon_retry_delay_seconds = float(
|
||||
config["fudai_icon_retry_delay_seconds"] or 0.6
|
||||
)
|
||||
|
||||
|
||||
# 高价值福袋配置
|
||||
if "high_value_fudai_enabled" in config:
|
||||
analyser.high_value_fudai_enabled = bool(
|
||||
config["high_value_fudai_enabled"]
|
||||
)
|
||||
|
||||
|
||||
if "high_value_fudai_threshold_yuan" in config:
|
||||
analyser.high_value_fudai_threshold_yuan = float(
|
||||
config["high_value_fudai_threshold_yuan"] or 500.0
|
||||
)
|
||||
|
||||
|
||||
if "high_value_fudai_max_reservations" in config:
|
||||
max_reservations = int(config["high_value_fudai_max_reservations"] or 3)
|
||||
# 限制最大预约数量为50
|
||||
analyser.high_value_fudai_max_reservations = min(max_reservations, 50)
|
||||
|
||||
|
||||
# needswitch 配置(如果已通过命令行设置,则保留原值)
|
||||
if original_needswitch is not None:
|
||||
# 保留命令行参数值(优先级最高)
|
||||
@@ -108,31 +108,31 @@ class ConfigManager:
|
||||
else:
|
||||
# 如果配置文件中没有,使用默认值 True
|
||||
analyser.needswitch = True
|
||||
|
||||
|
||||
# 列表配置
|
||||
if "contains_not_want" in config:
|
||||
analyser.contains_not_want = list(config["contains_not_want"] or [])
|
||||
|
||||
|
||||
if "contains_want" in config:
|
||||
analyser.contains_want = list(config["contains_want"] or [])
|
||||
|
||||
|
||||
# 阈值配置(限制在 0.0~1.0 范围内)
|
||||
if "lucky_draw_red_ratio_threshold" in config:
|
||||
threshold = float(config["lucky_draw_red_ratio_threshold"] or 0.9)
|
||||
analyser.lucky_draw_red_ratio_threshold = max(0.0, min(1.0, threshold))
|
||||
|
||||
|
||||
if "coupon_template_match_threshold" in config:
|
||||
threshold = float(config["coupon_template_match_threshold"] or 0.75)
|
||||
analyser.coupon_template_match_threshold = max(0.0, min(1.0, threshold))
|
||||
|
||||
|
||||
if "attend_button_red_ratio_threshold" in config:
|
||||
threshold = float(config["attend_button_red_ratio_threshold"] or 0.25)
|
||||
analyser.attend_button_red_ratio_threshold = max(0.0, min(1.0, threshold))
|
||||
|
||||
|
||||
if "fansclub_join_red_ratio_threshold" in config:
|
||||
threshold = float(config["fansclub_join_red_ratio_threshold"] or 0.25)
|
||||
analyser.fansclub_join_red_ratio_threshold = max(0.0, min(1.0, threshold))
|
||||
|
||||
|
||||
# 粉丝团等待/点击延迟配置
|
||||
if "fansclub_click_delay" in config:
|
||||
analyser.fansclub_click_delay = float(config["fansclub_click_delay"] or 0.6)
|
||||
@@ -152,116 +152,116 @@ class ConfigManager:
|
||||
)
|
||||
else:
|
||||
analyser.fansclub_manual_wait_seconds = 3.0
|
||||
|
||||
|
||||
# 其他配置项(根据实际需要添加)
|
||||
if "no_attend_timeout_minutes" in config:
|
||||
analyser._no_attend_timeout_minutes = float(
|
||||
config["no_attend_timeout_minutes"] or 30.0
|
||||
)
|
||||
|
||||
|
||||
if "auto_join_fansclub" in config:
|
||||
analyser.auto_join_fansclub = bool(config["auto_join_fansclub"])
|
||||
|
||||
|
||||
if "fansclub_fail_action" in config:
|
||||
analyser.fansclub_fail_action = str(config["fansclub_fail_action"] or "stay")
|
||||
|
||||
|
||||
if "high_value_fudai_join_ahead_seconds" in config:
|
||||
analyser.high_value_fudai_join_ahead_seconds = int(
|
||||
config["high_value_fudai_join_ahead_seconds"] or 120
|
||||
)
|
||||
|
||||
|
||||
if "high_value_fudai_max_swipe_back" in config:
|
||||
analyser.high_value_fudai_max_swipe_back = int(
|
||||
config["high_value_fudai_max_swipe_back"] or 35
|
||||
)
|
||||
|
||||
|
||||
if "high_value_fudai_after_action" in config:
|
||||
analyser.high_value_fudai_after_action = str(
|
||||
config["high_value_fudai_after_action"] or "continue"
|
||||
)
|
||||
|
||||
|
||||
if "high_value_fudai_after_stay_seconds" in config:
|
||||
analyser.high_value_fudai_after_stay_seconds = int(
|
||||
config["high_value_fudai_after_stay_seconds"] or 120
|
||||
)
|
||||
|
||||
|
||||
if "reservation_back_verify_enabled" in config:
|
||||
analyser.reservation_back_verify_enabled = bool(
|
||||
config["reservation_back_verify_enabled"]
|
||||
)
|
||||
|
||||
|
||||
if "record_room_title_mapping_enabled" in config:
|
||||
analyser.record_room_title_mapping_enabled = bool(
|
||||
config["record_room_title_mapping_enabled"]
|
||||
)
|
||||
|
||||
|
||||
if "reservation_back_swipe_delay" in config:
|
||||
analyser.reservation_back_swipe_delay = float(
|
||||
config["reservation_back_swipe_delay"] or 0.6
|
||||
)
|
||||
|
||||
|
||||
if "reservation_preempt_min_value_yuan" in config:
|
||||
analyser.reservation_preempt_min_value_yuan = float(
|
||||
config["reservation_preempt_min_value_yuan"] or 0.0
|
||||
)
|
||||
|
||||
|
||||
if "poll_before_open_seconds" in config:
|
||||
analyser.poll_before_open_seconds = int(
|
||||
config["poll_before_open_seconds"] or 10
|
||||
)
|
||||
|
||||
|
||||
if "reset_after_swipes_enabled" in config:
|
||||
analyser.reset_after_swipes_enabled = bool(
|
||||
config["reset_after_swipes_enabled"]
|
||||
)
|
||||
|
||||
|
||||
if "reset_after_swipes" in config:
|
||||
analyser.reset_after_swipes = int(config["reset_after_swipes"] or 10)
|
||||
|
||||
|
||||
if "fudai_click_wait_seconds" in config:
|
||||
analyser.fudai_click_wait_seconds = float(
|
||||
config["fudai_click_wait_seconds"] or 2.0
|
||||
config["fudai_click_wait_seconds"] or 1.0
|
||||
)
|
||||
|
||||
|
||||
if "switch_room_wait_after_stage_diag_seconds" in config:
|
||||
analyser.switch_room_wait_after_stage_diag_seconds = float(
|
||||
config["switch_room_wait_after_stage_diag_seconds"] or 7.0
|
||||
)
|
||||
|
||||
|
||||
if "swipe_duration_ms" in config:
|
||||
analyser.swipe_duration_ms = int(config["swipe_duration_ms"] or 600)
|
||||
|
||||
|
||||
if "fudai_finder_optimized_enabled" in config:
|
||||
analyser.fudai_finder_optimized_enabled = bool(
|
||||
config["fudai_finder_optimized_enabled"]
|
||||
)
|
||||
|
||||
|
||||
if "fudai_click_verify_enabled" in config:
|
||||
analyser.fudai_click_verify_enabled = bool(
|
||||
config["fudai_click_verify_enabled"]
|
||||
)
|
||||
|
||||
|
||||
if "fudai_find_max_retries" in config:
|
||||
analyser.fudai_find_max_retries = int(config["fudai_find_max_retries"] or 3)
|
||||
|
||||
|
||||
if "screenshot_diagnose_min_interval_seconds" in config:
|
||||
analyser.screenshot_diagnose_min_interval_seconds = float(
|
||||
config["screenshot_diagnose_min_interval_seconds"] or 8.0
|
||||
)
|
||||
|
||||
|
||||
if "live_room_match_threshold" in config:
|
||||
threshold = float(config["live_room_match_threshold"] or 0.8)
|
||||
analyser.live_room_match_threshold = max(0.0, min(1.0, threshold))
|
||||
|
||||
|
||||
if "fudai_template_match_enabled" in config:
|
||||
analyser.fudai_template_match_enabled = bool(
|
||||
config["fudai_template_match_enabled"]
|
||||
)
|
||||
|
||||
|
||||
if "fudai_template_match_threshold" in config:
|
||||
threshold = float(config["fudai_template_match_threshold"] or 0.7)
|
||||
analyser.fudai_template_match_threshold = max(0.0, min(1.0, threshold))
|
||||
|
||||
|
||||
if "y_pianyi" in config:
|
||||
analyser.y_pianyi = int(config["y_pianyi"] or 0)
|
||||
|
||||
|
||||
@@ -210,10 +210,10 @@ class HelperFunctions:
|
||||
"""保存误识别文本到记录文件"""
|
||||
false_positive_file = HelperFunctions._get_false_positive_file_path()
|
||||
os.makedirs(os.path.dirname(false_positive_file), exist_ok=True)
|
||||
|
||||
|
||||
false_positives = HelperFunctions._load_false_positives()
|
||||
false_positives.add(text.strip())
|
||||
|
||||
|
||||
try:
|
||||
with open(false_positive_file, "w", encoding="utf-8") as f:
|
||||
json.dump({"false_positives": list(false_positives)}, f, ensure_ascii=False, indent=2)
|
||||
@@ -395,4 +395,4 @@ class HelperFunctions:
|
||||
tag, f"{msg} - 异常: {type(e).__name__}"
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
pass
|
||||
@@ -93,61 +93,3 @@ def extract_participants_count(text: Optional[str]) -> int:
|
||||
return 0
|
||||
# 简化策略:返回最大值(通常人数是文本里最大的数字)
|
||||
return max(nums)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
+35
-141
@@ -1,6 +1,6 @@
|
||||
import os
|
||||
import re
|
||||
from typing import Iterable
|
||||
import unicodedata
|
||||
|
||||
|
||||
def normalize_countdown_text(text: str) -> str:
|
||||
@@ -143,146 +143,40 @@ def extract_prize_value_yuan(text: str) -> float:
|
||||
"""从 OCR 文本中抽取奖品价值金额(元),抽离自 douyin_fudai.py。"""
|
||||
if not text:
|
||||
return 0.0
|
||||
t = re.sub(r"\s+", "", str(text))
|
||||
# 先去掉倒计时类数字,避免把 00:31 解析成 31 元
|
||||
t = re.sub(r"\b\d{1,2}[::]\d{2}\b", "", t)
|
||||
|
||||
# 优先匹配带币种符号/单位的金额:参考价值¥199 / ¥199.9 / ¥199 / 199元
|
||||
# 先尝试匹配带¥符号的金额(¥符号可能被OCR识别成各种形式)
|
||||
currency_matches = re.findall(r"[¥¥\u00A5\uFFE5](\d+(?:\.\d+)?)", t)
|
||||
yuan_matches = re.findall(r"(\d+(?:\.\d+)?)元", t)
|
||||
tagged: Iterable[str] = list(currency_matches) + list(yuan_matches)
|
||||
if tagged:
|
||||
vals: list[float] = []
|
||||
for n in tagged:
|
||||
try:
|
||||
vals.append(float(n))
|
||||
except ValueError:
|
||||
pass
|
||||
if vals:
|
||||
return max(vals)
|
||||
|
||||
# 清理¥符号:OCR可能把¥符号识别成数字或其他字符,先清理掉
|
||||
# ¥符号的Unicode编码是 \u00A5,全角¥是 \uFFE5
|
||||
# 使用更精确的匹配:只在数字前清理¥符号
|
||||
t = re.sub(r"[¥¥\u00A5\uFFE5]\s*(\d)", r"\1", t) # 清理¥符号(保留后面的数字)
|
||||
# 处理¥被识别成Y/y的情况:Y/y后跟数字
|
||||
t = re.sub(r"[Yy]\s*(\d)", r"\1", t) # 清理Y/y(保留后面的数字)
|
||||
|
||||
# 注意:不在这里处理¥被识别成8的情况,因为真正的8199元是合理的
|
||||
# 将在后续提取整数时,根据上下文更智能地判断
|
||||
|
||||
# 清理后再次尝试匹配"元"后缀
|
||||
yuan_matches_after_clean = re.findall(r"(\d+(?:\.\d+)?)元", t)
|
||||
if yuan_matches_after_clean:
|
||||
vals_after_clean: list[float] = []
|
||||
for n in yuan_matches_after_clean:
|
||||
try:
|
||||
vals_after_clean.append(float(n))
|
||||
except ValueError:
|
||||
pass
|
||||
if vals_after_clean:
|
||||
return max(vals_after_clean)
|
||||
s = unicodedata.normalize("NFKC", str(text))
|
||||
values: list[float] = []
|
||||
|
||||
# 去掉常见干扰:份数/参与人数
|
||||
t = re.sub(r"共\d+份", "", t)
|
||||
t = re.sub(r"\d+人已参与", "", t)
|
||||
|
||||
# 退化:抓小数
|
||||
decimals = re.findall(r"\d+\.\d+", t)
|
||||
if decimals:
|
||||
vals = []
|
||||
for n in decimals:
|
||||
try:
|
||||
val = float(n)
|
||||
# 过滤掉明显不合理的值(比如小数点前有多个数字,可能是误识别)
|
||||
if 0.01 <= val <= 99999.99:
|
||||
vals.append(val)
|
||||
except ValueError:
|
||||
pass
|
||||
if vals:
|
||||
return max(vals)
|
||||
|
||||
# 再退化:抓整数
|
||||
ints = re.findall(r"\d+", t)
|
||||
if ints:
|
||||
vals = []
|
||||
for n in ints:
|
||||
try:
|
||||
v = int(n)
|
||||
# 处理¥被识别成8的情况:需要更智能的判断,避免误识别真正的8199元
|
||||
# 只在以下情况才考虑去掉第一个8:
|
||||
# 1. 数字非常大(>=50000),且去掉8后的数字在合理范围内(100-9999)
|
||||
# 2. 文本中没有明确的单位(如"元"),说明可能是纯数字OCR误识别
|
||||
# 3. 如果数字本身就在合理范围内(1-99999),优先保留原值(可能是真正的8199元)
|
||||
if len(n) >= 5 and n.startswith("8"): # 5位以上数字才考虑
|
||||
corrected = int(n[1:])
|
||||
# 只在原数字非常大(>=50000)且去掉8后数字在合理范围(100-9999)时,才考虑修正
|
||||
# 这样可以避免把真正的8199、81999等误识别
|
||||
if v >= 50000 and 100 <= corrected <= 9999:
|
||||
# 检查文本中是否有"元"等明确单位
|
||||
has_yuan_unit = "元" in t
|
||||
# 如果没有明确单位,更可能是误识别(¥被识别成8)
|
||||
if not has_yuan_unit:
|
||||
vals.append(float(corrected))
|
||||
else:
|
||||
# 有明确单位,保留原值(可能是真正的价值,如81999元)
|
||||
if 1 <= v <= 99999:
|
||||
vals.append(float(v))
|
||||
elif 1 <= v <= 99999:
|
||||
# 数字在合理范围内,保留原值(包括8199、81999等)
|
||||
vals.append(float(v))
|
||||
elif 1 <= v <= 99999:
|
||||
vals.append(float(v))
|
||||
except ValueError:
|
||||
for idx, ch in enumerate(s):
|
||||
if ch != "¥":
|
||||
continue
|
||||
j = idx + 1
|
||||
while j < len(s) and s[j].isspace():
|
||||
j += 1
|
||||
start = j
|
||||
has_digit = False
|
||||
dot_seen = False
|
||||
while j < len(s):
|
||||
cj = s[j]
|
||||
if cj.isdigit():
|
||||
has_digit = True
|
||||
j += 1
|
||||
continue
|
||||
if vals:
|
||||
return max(vals)
|
||||
if cj == ".":
|
||||
if dot_seen:
|
||||
break
|
||||
dot_seen = True
|
||||
j += 1
|
||||
continue
|
||||
if cj == ",":
|
||||
j += 1
|
||||
continue
|
||||
break
|
||||
if not has_digit:
|
||||
continue
|
||||
num_text = s[start:j].replace(",", "")
|
||||
try:
|
||||
values.append(float(num_text))
|
||||
except ValueError:
|
||||
continue
|
||||
|
||||
return 0.0
|
||||
|
||||
|
||||
def parse_countdown_seconds(text: str) -> int:
|
||||
"""
|
||||
将福袋倒计时文本解析为总秒数。
|
||||
|
||||
这是对 ``normalize_countdown_text`` 的简单封装,方便在其它模块或测试中直接得到秒数。
|
||||
|
||||
示例::
|
||||
|
||||
>>> parse_countdown_seconds("5分30秒")
|
||||
330
|
||||
>>> parse_countdown_seconds("30秒")
|
||||
30
|
||||
>>> parse_countdown_seconds("5:00")
|
||||
300
|
||||
"""
|
||||
norm = normalize_countdown_text(text)
|
||||
if not norm:
|
||||
return 0
|
||||
# 期望格式 "mm:ss" 或 "mm:ss后开奖"
|
||||
m = re.search(r"(\d{1,3}):(\d{1,2})", norm)
|
||||
if not m:
|
||||
return 0
|
||||
try:
|
||||
mm = int(m.group(1))
|
||||
ss = int(m.group(2))
|
||||
except ValueError:
|
||||
return 0
|
||||
return mm * 60 + ss
|
||||
|
||||
|
||||
class Tee:
|
||||
"""将 print 输出同时写入多个文件对象的简单工具类。"""
|
||||
|
||||
def __init__(self, *files):
|
||||
self.files = files
|
||||
|
||||
def write(self, obj):
|
||||
for f in self.files:
|
||||
f.write(obj)
|
||||
f.flush()
|
||||
|
||||
def flush(self):
|
||||
for f in self.files:
|
||||
f.flush()
|
||||
return max(values) if values else 0.0
|
||||
@@ -50,21 +50,3 @@ def preprocess_for_ocr(analyser: Any, cut_pic_name: str) -> str:
|
||||
return cut_pic_name
|
||||
except Exception:
|
||||
return cut_pic_name
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -16,6 +16,45 @@
|
||||
"markdown.preview.fontSize": 14,
|
||||
"editor.wordWrap": "on",
|
||||
"editor.renderWhitespace": "boundary",
|
||||
"files.exclude": {
|
||||
".git": true,
|
||||
".venv": true,
|
||||
"logs": true,
|
||||
"assets": true,
|
||||
"docs": true,
|
||||
"pic": true,
|
||||
"state": true,
|
||||
"webui": true,
|
||||
"typings": true,
|
||||
".cursor": true
|
||||
},
|
||||
"search.exclude": {
|
||||
"**/node_modules": true,
|
||||
".git": true,
|
||||
".venv": true,
|
||||
"logs": true,
|
||||
"assets": true,
|
||||
"docs": true,
|
||||
"pic": true,
|
||||
"state": true,
|
||||
"webui": true
|
||||
},
|
||||
"files.watcherExclude": {
|
||||
"**/.git/**": true,
|
||||
"**/.venv/**": true,
|
||||
"**/logs/**": true,
|
||||
"**/assets/**": true,
|
||||
"**/docs/**": true,
|
||||
"**/pic/**": true,
|
||||
"**/state/**": true,
|
||||
"**/webui/**": true,
|
||||
"**/.cursor/**": true
|
||||
},
|
||||
"search.followSymlinks": false,
|
||||
"search.useIgnoreFiles": true,
|
||||
"search.useGlobalIgnoreFiles": true,
|
||||
"git.autorefresh": false,
|
||||
"editor.largeFileOptimizations": true,
|
||||
"[markdown]": {
|
||||
"editor.wordWrap": "on",
|
||||
"editor.quickSuggestions": {
|
||||
|
||||
@@ -1,113 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
重复截图场景分析报告
|
||||
"""
|
||||
|
||||
def analyze_duplicate_screenshots():
|
||||
"""分析所有重复截图的场景"""
|
||||
|
||||
print("=" * 80)
|
||||
print("重复截图场景系统分析报告")
|
||||
print("=" * 80)
|
||||
print()
|
||||
|
||||
scenarios = [
|
||||
{
|
||||
"场景": "阶段诊断重复截图",
|
||||
"位置": "douyin/stage/douyin_stage.py",
|
||||
"问题": "阶段诊断函数内部会重新截图,但调用方可能已经截过图",
|
||||
"频率": "高 (每次诊断都可能发生)",
|
||||
"影响": "每次阶段诊断都截一次图"
|
||||
},
|
||||
{
|
||||
"场景": "预约检测后重复截图",
|
||||
"位置": "douyin/core/douyin_fudai.py",
|
||||
"问题": "预约检测使用缓存,找福袋图标强制截图",
|
||||
"频率": "中 (预约流程中)",
|
||||
"影响": "预约→福袋查找间的重复截图"
|
||||
},
|
||||
{
|
||||
"场景": "福袋查找重试截图",
|
||||
"位置": "douyin/fudai/douyin_fudai_finder.py",
|
||||
"问题": "查找失败时会重新截图重试",
|
||||
"频率": "中 (查找失败时)",
|
||||
"影响": "多次查找尝试间的重复截图"
|
||||
},
|
||||
{
|
||||
"场景": "OCR密集操作截图",
|
||||
"位置": "fudai_detail_modules/fudai_detail_reader.py",
|
||||
"问题": "OCR前停止截图服务,后续操作需要重新截图",
|
||||
"频率": "低 (仅OCR操作时)",
|
||||
"影响": "OCR过程中的额外截图"
|
||||
},
|
||||
{
|
||||
"场景": "错误处理截图",
|
||||
"位置": "多个错误处理块",
|
||||
"问题": "异常处理中重新截图确认状态",
|
||||
"频率": "低 (异常时)",
|
||||
"影响": "错误恢复时的额外截图"
|
||||
},
|
||||
{
|
||||
"场景": "不同模块间的截图",
|
||||
"位置": "各种模块接口",
|
||||
"问题": "不同模块使用不同的截图策略",
|
||||
"频率": "中",
|
||||
"影响": "模块间的重复截图"
|
||||
}
|
||||
]
|
||||
|
||||
total_scenarios = len(scenarios)
|
||||
high_freq = sum(1 for s in scenarios if s["频率"] == "高")
|
||||
med_freq = sum(1 for s in scenarios if s["频率"] == "中")
|
||||
low_freq = sum(1 for s in scenarios if s["频率"] == "低")
|
||||
|
||||
print(f"[STATS] 发现 {total_scenarios} 个重复截图场景:")
|
||||
print(f" [HIGH] 高频场景: {high_freq} 个")
|
||||
print(f" [MED] 中频场景: {med_freq} 个")
|
||||
print(f" [LOW] 低频场景: {low_freq} 个")
|
||||
print()
|
||||
|
||||
print("[ANALYSIS] 详细分析:")
|
||||
print("-" * 60)
|
||||
|
||||
for i, scenario in enumerate(scenarios, 1):
|
||||
freq_tag = {
|
||||
"高": "[HIGH]",
|
||||
"中": "[MED]",
|
||||
"低": "[LOW]"
|
||||
}[scenario["频率"]]
|
||||
|
||||
print(f"{i}. {freq_tag} {scenario['场景']}")
|
||||
print(f" [LOCATION] {scenario['位置']}")
|
||||
print(f" [ISSUE] {scenario['问题']}")
|
||||
print(f" [IMPACT] {scenario['影响']}")
|
||||
print()
|
||||
|
||||
print("[SUGGESTIONS] 优化建议:")
|
||||
print("-" * 60)
|
||||
|
||||
optimizations = [
|
||||
"1. 统一截图策略:所有模块都使用相同的截图服务",
|
||||
"2. 添加截图时间戳检查:避免短时间内重复截图",
|
||||
"3. 智能缓存管理:根据操作类型调整缓存有效期",
|
||||
"4. 模块间协调:减少不同模块间的截图竞争",
|
||||
"5. 错误处理优化:异常时优先使用现有截图",
|
||||
"6. 批量操作优化:连续操作中复用截图"
|
||||
]
|
||||
|
||||
for opt in optimizations:
|
||||
print(f" ✅ {opt}")
|
||||
|
||||
print()
|
||||
print("🎯 优先优化顺序:")
|
||||
print(" 1. 阶段诊断重复截图 (影响最大)")
|
||||
print(" 2. 预约流程重复截图 (用户可见)")
|
||||
print(" 3. 福袋查找重试截图 (性能影响)")
|
||||
print(" 4. 其他场景优化")
|
||||
|
||||
print()
|
||||
print("=" * 80)
|
||||
|
||||
if __name__ == "__main__":
|
||||
analyze_duplicate_screenshots()
|
||||
@@ -1,156 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
评估截图性能:分析后台截图服务 vs 直接截图的性能对比
|
||||
"""
|
||||
|
||||
import time
|
||||
import sys
|
||||
import os
|
||||
import statistics
|
||||
|
||||
# 添加项目根目录到路径
|
||||
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
|
||||
|
||||
def evaluate_screenshot_performance():
|
||||
"""评估截图性能"""
|
||||
|
||||
print("=" * 60)
|
||||
print("截图性能评估工具")
|
||||
print("=" * 60)
|
||||
|
||||
# 1. 分析后台截图服务的配置
|
||||
print("\n1. 后台截图服务配置分析:")
|
||||
print("-" * 40)
|
||||
|
||||
from operations.screenshot_service import ScreenshotService
|
||||
service = ScreenshotService.get_instance()
|
||||
|
||||
config_info = service.get_cache_info()
|
||||
print(f"服务运行状态: {'运行中' if config_info['running'] else '未运行'}")
|
||||
print(f"截图间隔: {config_info['interval']}秒")
|
||||
print(f"缓存有效期: {config_info['cache_valid_duration']}秒")
|
||||
print(f"最后截图时间: {config_info['last_screenshot_time']}")
|
||||
print(f"最后成功状态: {config_info['last_success']}")
|
||||
|
||||
# 2. 模拟性能测试
|
||||
print("\n2. 性能测试模拟:")
|
||||
print("-" * 40)
|
||||
|
||||
# 模拟缓存命中的情况
|
||||
print("缓存命中场景:")
|
||||
print("- 响应时间: < 1ms (直接返回缓存)")
|
||||
print("- CPU占用: 几乎为0")
|
||||
print("- 网络开销: 0")
|
||||
|
||||
# 模拟缓存失效的情况
|
||||
print("\n缓存失效场景:")
|
||||
print("- 等待后台截图: 0-6秒 (取决于后台截图进度)")
|
||||
print("- 总响应时间: 0.1-6秒")
|
||||
print("- 实际截图耗时: 1.4-1.7秒 (从日志观察)")
|
||||
|
||||
# 3. 分析优化效果
|
||||
print("\n3. 优化效果分析:")
|
||||
print("-" * 40)
|
||||
|
||||
# 计算理论性能提升
|
||||
direct_screenshot_time = 1.5 # 直接截图平均耗时(秒)
|
||||
cache_hit_time = 0.001 # 缓存命中耗时(秒)
|
||||
cache_miss_time = 2.0 # 缓存失效平均等待时间(秒)
|
||||
|
||||
# 假设缓存命中率
|
||||
cache_hit_rate = 0.8 # 80%缓存命中
|
||||
cache_miss_rate = 0.2 # 20%缓存失效
|
||||
|
||||
avg_response_time = (cache_hit_time * cache_hit_rate) + (cache_miss_time * cache_miss_rate)
|
||||
improvement_ratio = direct_screenshot_time / avg_response_time
|
||||
|
||||
print(f"直接截图平均耗时: {direct_screenshot_time}s")
|
||||
print(f"缓存命中响应时间: {cache_hit_time}s ({cache_hit_rate*100:.0f}%概率)")
|
||||
print(f"缓存失效响应时间: {cache_miss_time}s ({cache_miss_rate*100:.0f}%概率)")
|
||||
print(f"平均响应时间: {avg_response_time:.3f}s")
|
||||
print(f"性能提升倍数: {improvement_ratio:.1f}x")
|
||||
|
||||
# 4. 分析当前问题
|
||||
print("\n4. 当前问题分析:")
|
||||
print("-" * 40)
|
||||
|
||||
issues = []
|
||||
|
||||
# 检查服务状态
|
||||
if not config_info['running']:
|
||||
issues.append("[ERROR] 后台截图服务未运行")
|
||||
else:
|
||||
issues.append("[OK] 后台截图服务正在运行")
|
||||
|
||||
# 检查缓存配置
|
||||
cache_duration = config_info['cache_valid_duration']
|
||||
interval = config_info['interval']
|
||||
|
||||
if cache_duration <= interval:
|
||||
issues.append(f"[WARN] 缓存有效期({cache_duration}s) <= 截图间隔({interval}s),可能导致缓存频繁过期")
|
||||
else:
|
||||
issues.append(f"[OK] 缓存有效期({cache_duration}s) > 截图间隔({interval}s),缓存利用率良好")
|
||||
|
||||
# 检查重复截图问题
|
||||
issues.append("[WARN] 日志显示存在重复截图,可能的原因:")
|
||||
issues.append(" - 循环中多次调用阶段诊断")
|
||||
issues.append(" - 服务状态管理不当")
|
||||
issues.append(" - 并发访问导致的竞争条件")
|
||||
|
||||
for issue in issues:
|
||||
print(issue)
|
||||
|
||||
# 5. 优化建议
|
||||
print("\n5. 优化建议:")
|
||||
print("-" * 40)
|
||||
|
||||
suggestions = [
|
||||
"[DONE] 已实现: 后台截图服务避免主流程等待",
|
||||
"[DONE] 已实现: 智能缓存机制减少重复截图",
|
||||
"[DONE] 已实现: 循环期间停止服务避免重复截图",
|
||||
"[DONE] 已实现: OCR期间停止服务避免资源竞争",
|
||||
"[TODO] 可优化: 调整截图间隔与缓存有效期比例",
|
||||
"[TODO] 可优化: 实现更智能的缓存失效策略",
|
||||
"[TODO] 可优化: 优化后台线程调度优先级"
|
||||
]
|
||||
|
||||
for suggestion in suggestions:
|
||||
print(suggestion)
|
||||
|
||||
# 6. 性能对比总结
|
||||
print("\n6. 性能对比总结:")
|
||||
print("-" * 40)
|
||||
|
||||
print("原先方案 (直接截图):")
|
||||
print(f" - 每次截图耗时: {direct_screenshot_time}s")
|
||||
print(" - 响应延迟: 高")
|
||||
print(" - 系统负载: 高")
|
||||
print(" - 用户体验: 卡顿")
|
||||
|
||||
print(f"\n当前方案 (后台服务+缓存):")
|
||||
print(f" - 平均响应时间: {avg_response_time:.3f}s")
|
||||
print(" - 响应延迟: 低")
|
||||
print(" - 系统负载: 中等")
|
||||
print(" - 用户体验: 流畅")
|
||||
|
||||
print(f"\n性能提升: {improvement_ratio:.1f}倍")
|
||||
print("主要优势: 后台预加载 + 缓存复用")
|
||||
|
||||
return {
|
||||
'avg_response_time': avg_response_time,
|
||||
'improvement_ratio': improvement_ratio,
|
||||
'cache_hit_rate': cache_hit_rate,
|
||||
'issues': issues
|
||||
}
|
||||
|
||||
if __name__ == "__main__":
|
||||
result = evaluate_screenshot_performance()
|
||||
|
||||
print(f"\n{'='*60}")
|
||||
print("评估完成")
|
||||
print(f"平均响应时间: {result['avg_response_time']:.3f}秒")
|
||||
print(f"性能提升倍数: {result['improvement_ratio']:.1f}x")
|
||||
print(f"缓存命中率: {result['cache_hit_rate']*100:.0f}%")
|
||||
print(f"发现问题数量: {len([i for i in result['issues'] if '❌' in i or '⚠️' in i])}")
|
||||
print(f"{'='*60}")
|
||||
Binary file not shown.
Binary file not shown.
@@ -6,4 +6,3 @@
|
||||
"""
|
||||
|
||||
__all__ = []
|
||||
|
||||
@@ -337,4 +337,4 @@ def is_wrong_coupon_popup(analyser: Any) -> bool:
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
return False
|
||||
return False
|
||||
@@ -20,7 +20,7 @@ def close_fudai_detail(analyser: Any) -> None:
|
||||
# 计算关闭详情页的坐标(基准坐标 500, 470)
|
||||
close_x = int(500 * rx // 1080)
|
||||
close_y = int(470 * ry // 2400)
|
||||
|
||||
|
||||
# 坐标验证:检查坐标是否在合理范围内
|
||||
# 获取屏幕尺寸(如果可用)
|
||||
screen_width = rx
|
||||
@@ -35,7 +35,7 @@ def close_fudai_detail(analyser: Any) -> None:
|
||||
pass
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 验证坐标边界
|
||||
if close_x < 0 or close_x >= screen_width or close_y < 0 or close_y >= screen_height:
|
||||
try:
|
||||
@@ -55,7 +55,7 @@ def close_fudai_detail(analyser: Any) -> None:
|
||||
# 修正坐标到屏幕范围内
|
||||
close_x = max(0, min(close_x, screen_width - 1))
|
||||
close_y = max(0, min(close_y, screen_height - 1))
|
||||
|
||||
|
||||
analyser._log_kv(
|
||||
"详情",
|
||||
"close_fudai_detail:点击关闭详情页坐标",
|
||||
@@ -81,7 +81,7 @@ def close_fudai_detail(analyser: Any) -> None:
|
||||
analyser._log_kv("详情", "close_fudai_detail:使用默认坐标关闭详情页")
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
try:
|
||||
analyser.operation.click(analyser.device_id, close_x, close_y)
|
||||
except Exception as e1:
|
||||
@@ -141,7 +141,7 @@ def close_fudai_detail(analyser: Any) -> None:
|
||||
|
||||
def ensure_fudai_detail_open(analyser: Any, fudai_x: int = 0) -> bool:
|
||||
"""确保福袋详情已打开:当前实现只记录日志并假定已打开。
|
||||
|
||||
|
||||
Args:
|
||||
analyser: 分析器实例
|
||||
fudai_x: 福袋的x坐标(可选,当前实现未使用)
|
||||
@@ -160,4 +160,3 @@ def ensure_fudai_detail_open(analyser: Any, fudai_x: int = 0) -> bool:
|
||||
except Exception:
|
||||
pass
|
||||
return True
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
执行福袋详情的OCR识别和读取,包括单次读取和重试读取。
|
||||
"""
|
||||
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any, Dict, Tuple, Optional
|
||||
@@ -27,6 +28,42 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
4. 通过 `operation.check_countdown` 解析倒计时,生成 (start_ts, future_ts)。
|
||||
"""
|
||||
start_time = time.time()
|
||||
# 性能标记变量
|
||||
screenshot_reused = False
|
||||
screenshot_start = None
|
||||
screenshot_end = None
|
||||
ocr_start = None
|
||||
ocr_end = None
|
||||
wait_file_ms: Optional[float] = None
|
||||
image_load_ms: Optional[float] = None
|
||||
service_stop_ms: Optional[float] = None
|
||||
countdown_parse_ms: Optional[float] = None
|
||||
|
||||
def _log_perf(tag: str) -> None:
|
||||
try:
|
||||
total_ms = round((time.time() - start_time) * 1000, 1)
|
||||
screenshot_ms = None
|
||||
if screenshot_start is not None and screenshot_end is not None:
|
||||
screenshot_ms = round((screenshot_end - screenshot_start) * 1000, 1)
|
||||
ocr_ms = None
|
||||
if ocr_start is not None and ocr_end is not None:
|
||||
ocr_ms = round((ocr_end - ocr_start) * 1000, 1)
|
||||
analyser._log_kv(
|
||||
"性能",
|
||||
"福袋详情关键耗时(ms)",
|
||||
total_ms=total_ms,
|
||||
screenshot_ms=screenshot_ms,
|
||||
ocr_ms=ocr_ms,
|
||||
wait_file_ms=wait_file_ms,
|
||||
image_load_ms=image_load_ms,
|
||||
service_stop_ms=service_stop_ms,
|
||||
countdown_parse_ms=countdown_parse_ms,
|
||||
screenshot_reused=bool(screenshot_reused),
|
||||
tag=tag,
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 步骤1:从阶段检测结果中获取任务数量(不需要截图,直接从阶段检测结果读取)
|
||||
# 任务数量已在阶段检测中检测并保存到 analyser._fudai_detail_task_count_from_stage
|
||||
task_count = 0
|
||||
@@ -52,16 +89,17 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
pass
|
||||
# 使用默认值
|
||||
task_count = 2
|
||||
|
||||
# 清除标志,避免影响后续调用
|
||||
|
||||
# 清除任务数量标志,截图复用标志留给后续OCR阶段使用
|
||||
try:
|
||||
analyser._fudai_detail_task_count_from_stage = None
|
||||
analyser._screenshot_ready_for_ocr = False # 清除截图复用标志
|
||||
except Exception:
|
||||
# 忽略异常,继续处理
|
||||
pass
|
||||
|
||||
|
||||
# 如果任务数量为0,说明不在福袋详情页(阶段检测应该已经过滤掉了,这里作为兜底)
|
||||
# 在获取截图之前就返回错误,避免不必要的截图
|
||||
if task_count <= 0:
|
||||
@@ -77,8 +115,9 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
tup_err = ("", "", 0, 0, 0.0, (now, now + 60.0))
|
||||
elapsed = time.time() - start_time
|
||||
analyser._log_kv("福袋详情", "read_fudai_detail_once完成(任务数量为0)", elapsed_seconds=round(elapsed, 2))
|
||||
_log_perf("taskcount_zero")
|
||||
return "error", tup_err, {"reason": "not_in_fudai_detail", "task_count": task_count}
|
||||
|
||||
|
||||
# 如果任务数不在(1,2,3)范围内,默认按2个任务处理
|
||||
if task_count not in (1, 2, 3):
|
||||
task_count = 2
|
||||
@@ -93,7 +132,7 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
pass
|
||||
# 异常时使用默认值
|
||||
task_count = 2
|
||||
|
||||
|
||||
# 步骤2:获取截图(仅用于后续OCR识别内容/倒计时/价值,不是为了获取任务数量)
|
||||
# 注意:此时后台截图服务已被停止,直接调用底层截图避免递归
|
||||
|
||||
@@ -101,22 +140,41 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
screenshot_reused = False
|
||||
try:
|
||||
if getattr(analyser, '_screenshot_ready_for_ocr', False):
|
||||
analyser._screenshot_ready_for_ocr = False # 清除标志,避免重复使用
|
||||
screenshot_reused = True
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"福袋详情",
|
||||
"read_fudai_detail_once:复用阶段诊断截图",
|
||||
reason="stage_diagnosed_task_count_gt_zero"
|
||||
)
|
||||
import path_config
|
||||
pic_path = path_config.get_screenshot_path()
|
||||
except Exception:
|
||||
pass
|
||||
pic_path = os.path.join(os.path.dirname(__file__), "pic", "screenshot.png")
|
||||
|
||||
if os.path.exists(pic_path) and os.path.getsize(pic_path) >= 1024:
|
||||
analyser._screenshot_ready_for_ocr = False # 清除标志,避免重复使用
|
||||
screenshot_reused = True
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"福袋详情",
|
||||
"read_fudai_detail_once:复用阶段诊断截图",
|
||||
reason="stage_diagnosed_task_count_gt_zero",
|
||||
path=pic_path,
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
else:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"福袋详情",
|
||||
"read_fudai_detail_once:无法复用阶段诊断截图(文件不可用)",
|
||||
path=pic_path,
|
||||
size=os.path.getsize(pic_path) if os.path.exists(pic_path) else 0,
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 只有在不能复用截图时才进行新的截图
|
||||
if not screenshot_reused:
|
||||
try:
|
||||
screenshot_start = time.time()
|
||||
analyser.operation.get_screenshot(analyser.device_id, use_service=False)
|
||||
|
||||
# 等待截图文件确实存在(最多等待3秒)
|
||||
@@ -134,9 +192,15 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
break
|
||||
time.sleep(0.1)
|
||||
|
||||
screenshot_end = time.time()
|
||||
wait_file_ms = round((screenshot_end - wait_start) * 1000, 1)
|
||||
|
||||
_log_perf("after_screenshot")
|
||||
|
||||
except Exception:
|
||||
screenshot_end = time.time() if screenshot_start is not None else None
|
||||
pass
|
||||
|
||||
|
||||
# 使用统一的截图路径配置
|
||||
try:
|
||||
import path_config
|
||||
@@ -148,12 +212,15 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
pic_rgb = None
|
||||
try:
|
||||
if os.path.exists(pic_path):
|
||||
_img0 = time.time()
|
||||
pic = Image.open(pic_path)
|
||||
pic.load()
|
||||
pic_rgb = pic.convert("RGB")
|
||||
image_load_ms = round((time.time() - _img0) * 1000, 1)
|
||||
_log_perf("after_image_load")
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
if pic_rgb is None:
|
||||
try:
|
||||
analyser._log_kv("福袋详情", "read_fudai_detail_once:无法读取截图,跳过识别")
|
||||
@@ -163,8 +230,9 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
tup_err = ("", "", 0, 0, 0.0, (now, now + 60.0))
|
||||
elapsed = time.time() - start_time
|
||||
analyser._log_kv("福袋详情", "read_fudai_detail_once完成(截图失败)", elapsed_seconds=round(elapsed, 2))
|
||||
_log_perf("screenshot_failed")
|
||||
return "error", tup_err, {"reason": "screenshot_failed"}
|
||||
|
||||
|
||||
# 如果任务数不在(1,2,3)范围内,默认按2个任务处理
|
||||
if task_count not in (1, 2, 3):
|
||||
task_count = 2
|
||||
@@ -176,9 +244,11 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
from operations.screenshot_service import ScreenshotService
|
||||
service = ScreenshotService.get_instance()
|
||||
if service.is_running():
|
||||
_svc0 = time.time()
|
||||
# 临时停止后台截图服务,避免在OCR过程中继续截图
|
||||
service.stop()
|
||||
_ocr_screenshot_service_disabled = True
|
||||
service_stop_ms = round((time.time() - _svc0) * 1000, 1)
|
||||
try:
|
||||
analyser._log_kv(
|
||||
"截图服务",
|
||||
@@ -189,34 +259,37 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
pass
|
||||
except Exception as e:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
analyser._log_kv( # pyright: ignore[reportPrivateUsage]
|
||||
"截图服务",
|
||||
"停止后台截图服务失败",
|
||||
error=str(e),
|
||||
level="WARNING"
|
||||
)
|
||||
except Exception:
|
||||
except Exception: # pyright: ignore[reportTooBroadExceptionType]
|
||||
pass
|
||||
|
||||
try:
|
||||
ocr_start = time.time()
|
||||
content, time_text, participants, copies, prize_value_yuan = get_fudai_contain(
|
||||
analyser, renwu=task_count
|
||||
)
|
||||
except Exception as e:
|
||||
ocr_end = time.time()
|
||||
_log_perf("after_get_fudai_contain")
|
||||
except Exception as e: # pyright: ignore[reportTooBroadExceptionType]
|
||||
# 出现异常时,记录详细错误和 traceback 并返回占位结果,便于排查
|
||||
try:
|
||||
import traceback, json
|
||||
import traceback
|
||||
tb = traceback.format_exc()
|
||||
# 先尝试通过 analyser._log_kv 输出完整 trace(如果可用)
|
||||
try:
|
||||
analyser._log_kv(
|
||||
analyser._log_kv( # pyright: ignore[reportPrivateUsage]
|
||||
"福袋详情",
|
||||
"read_fudai_detail_once 异常",
|
||||
error=str(e),
|
||||
error_type=type(e).__name__,
|
||||
traceback=tb,
|
||||
)
|
||||
except Exception:
|
||||
except Exception: # pyright: ignore[reportTooBroadExceptionType]
|
||||
# fallback: 将 traceback 写入统一错误日志
|
||||
try:
|
||||
import path_config
|
||||
@@ -227,21 +300,22 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
ef.write("\\n")
|
||||
except Exception:
|
||||
pass
|
||||
except Exception:
|
||||
except Exception: # pyright: ignore[reportTooBroadExceptionType]
|
||||
try:
|
||||
analyser._log_kv("福袋详情", "read_fudai_detail_once 异常(无法格式化 traceback)", error=str(e))
|
||||
except Exception:
|
||||
analyser._log_kv("福袋详情", "read_fudai_detail_once 异常(无法格式化 traceback)", error=str(e)) # pyright: ignore[reportPrivateUsage]
|
||||
except Exception: # pyright: ignore[reportTooBroadExceptionType]
|
||||
pass
|
||||
now = time.time()
|
||||
tup_err = ("", "", 0, 0, 0.0, (now, now + 60.0))
|
||||
elapsed = time.time() - start_time
|
||||
try:
|
||||
analyser._log_kv("福袋详情", "read_fudai_detail_once完成(识别异常)", elapsed_seconds=round(elapsed, 2))
|
||||
except Exception:
|
||||
analyser._log_kv("福袋详情", "read_fudai_detail_once完成(识别异常)", elapsed_seconds=round(elapsed, 2)) # pyright: ignore[reportPrivateUsage]
|
||||
except Exception: # pyright: ignore[reportTooBroadExceptionType]
|
||||
pass
|
||||
_log_perf("exception_in_get_fudai_contain")
|
||||
return "error", tup_err, {}
|
||||
# 由于已全局禁用流式截图,不再重新启动服务
|
||||
|
||||
|
||||
# 检查是否检测到观看任务(通过 _is_watch_task_detected 标志)
|
||||
is_watch_task = False
|
||||
try:
|
||||
@@ -249,16 +323,16 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
# 清除标志,避免影响后续调用
|
||||
if is_watch_task:
|
||||
try:
|
||||
analyser._is_watch_task_detected = False
|
||||
except Exception:
|
||||
analyser._is_watch_task_detected = False # pyright: ignore[reportPrivateUsage]
|
||||
except Exception: # pyright: ignore[reportTooBroadExceptionType]
|
||||
pass
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 如果检测到观看任务,返回 watch_task 状态
|
||||
if is_watch_task:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
analyser._log_kv( # pyright: ignore[reportPrivateUsage]
|
||||
"福袋详情",
|
||||
"read_fudai_detail_once:检测到'观看X分钟'任务,直接跳过",
|
||||
)
|
||||
@@ -267,13 +341,14 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
now = time.time()
|
||||
tup_watch = ("", "", 0, 0, 0.0, (now, now + 60.0))
|
||||
elapsed = time.time() - start_time
|
||||
analyser._log_kv("福袋详情", "read_fudai_detail_once完成(观看任务)", elapsed_seconds=round(elapsed, 2))
|
||||
analyser._log_kv("福袋详情", "read_fudai_detail_once完成(观看任务)", elapsed_seconds=round(elapsed, 2)) # pyright: ignore[reportPrivateUsage]
|
||||
return "watch_task", tup_watch, {"reason": "watch_task_detected", "task_count": task_count}
|
||||
|
||||
# 解析倒计时 -> (剩余秒数, 未来时间戳)
|
||||
countdown_start = time.time()
|
||||
countdown_end = countdown_start + 60.0
|
||||
try:
|
||||
_cd0 = time.time()
|
||||
if time_text:
|
||||
res = analyser.operation.check_countdown(time_text)
|
||||
if isinstance(res, tuple) and len(res) == 2:
|
||||
@@ -285,6 +360,8 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
if total_seconds > 0 and isinstance(future_ts, (int, float)):
|
||||
countdown_start = float(countdown_start)
|
||||
countdown_end = float(future_ts)
|
||||
countdown_parse_ms = round((time.time() - _cd0) * 1000, 1)
|
||||
_log_perf("after_countdown_parse")
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
@@ -299,7 +376,7 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
extra: Dict[str, Any] = {
|
||||
"task_count": task_count,
|
||||
}
|
||||
|
||||
|
||||
# 获取直播间名字
|
||||
room_title = ""
|
||||
room_title_raw = ""
|
||||
@@ -308,11 +385,11 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
room_title_raw = str(getattr(analyser, "current_room_title_raw", "") or "").strip()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 输出所有识别到的内容到运行日志和行为日志
|
||||
try:
|
||||
from datetime import datetime
|
||||
|
||||
|
||||
# 格式化时间戳为可读格式
|
||||
countdown_start_str = ""
|
||||
countdown_end_str = ""
|
||||
@@ -324,12 +401,12 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
countdown_end_str = datetime.fromtimestamp(countdown_end).strftime("%Y-%m-%d %H:%M:%S")
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 计算剩余秒数
|
||||
remain_seconds = 0
|
||||
if countdown_end > countdown_start:
|
||||
remain_seconds = int(countdown_end - time.time())
|
||||
|
||||
|
||||
# 输出完整的识别结果到运行日志
|
||||
content_preview = (content or "")[:60] if content else "未识别到"
|
||||
content_full = content or ""
|
||||
@@ -360,7 +437,7 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
elapsed_seconds=round(time.time() - start_time, 2),
|
||||
level="DEBUG",
|
||||
)
|
||||
|
||||
|
||||
# 输出到行为日志(使用更详细的格式)
|
||||
content_preview = (content or "")[:60] if content else "未识别到"
|
||||
analyser._log_kv(
|
||||
@@ -383,7 +460,7 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
},
|
||||
level="DEBUG",
|
||||
)
|
||||
|
||||
|
||||
# 输出简化的运行日志(兼容原有格式)
|
||||
analyser._log_kv(
|
||||
"福袋详情",
|
||||
@@ -415,9 +492,10 @@ def read_fudai_detail_once(analyser: Any) -> Tuple[str, Tuple, dict]:
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
elapsed = time.time() - start_time
|
||||
analyser._log_kv("福袋详情", "read_fudai_detail_once完成(成功)", elapsed_seconds=round(elapsed, 2), level="DEBUG")
|
||||
_log_perf("success")
|
||||
return "ok", detail_tuple, extra
|
||||
|
||||
|
||||
@@ -473,7 +551,7 @@ def read_fudai_detail_with_retries(
|
||||
analyser.operation.delay(initial_wait)
|
||||
except Exception:
|
||||
time.sleep(initial_wait)
|
||||
|
||||
|
||||
max_attempts = 2
|
||||
try:
|
||||
max_attempts = int(getattr(analyser, "fudai_detail_max_attempts", 2) or 2)
|
||||
@@ -514,27 +592,27 @@ def read_fudai_detail_with_retries(
|
||||
current_countdown_seconds = cd_end - cd_start
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 记录第一次成功读取的结果(作为基准)
|
||||
if first_countdown_seconds is None and current_countdown_seconds is not None and status == "ok":
|
||||
first_countdown_seconds = current_countdown_seconds
|
||||
first_tuple = current_tuple
|
||||
first_attempt_time = attempt_start_time
|
||||
last_tuple = current_tuple
|
||||
|
||||
|
||||
# 优化:如果第一次识别成功且数据合理,直接返回,不进行第二次重试
|
||||
# 检查数据是否合理(有内容、有价值、倒计时合理)
|
||||
content = current_tuple[0] if len(current_tuple) > 0 else ""
|
||||
prize_value = current_tuple[4] if len(current_tuple) > 4 else 0.0
|
||||
time_text = current_tuple[1] if len(current_tuple) > 1 else ""
|
||||
|
||||
|
||||
# 如果数据看起来合理(有内容或价值>0,倒计时合理),直接返回
|
||||
is_data_reasonable = (
|
||||
(content and len(content.strip()) > 0) or
|
||||
(content and len(content.strip()) > 0) or
|
||||
(prize_value and float(prize_value) > 0) or
|
||||
(time_text and len(time_text.strip()) > 0)
|
||||
)
|
||||
|
||||
|
||||
if is_data_reasonable and current_countdown_seconds > 0:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
@@ -549,30 +627,30 @@ def read_fudai_detail_with_retries(
|
||||
pass
|
||||
# 直接返回,不进行第二次重试
|
||||
break
|
||||
|
||||
|
||||
# 倒计时一致性检查:如果后续读取的倒计时与第一次差异过大,判定为识别错误
|
||||
elif first_countdown_seconds is not None and current_countdown_seconds is not None:
|
||||
# 计算时间流逝(从第一次读取到现在的时间差)
|
||||
time_elapsed = attempt_start_time - first_attempt_time
|
||||
if time_elapsed < 0:
|
||||
time_elapsed = 0.5 # 默认假设间隔0.5秒
|
||||
|
||||
|
||||
# 预期倒计时 = 第一次倒计时 - 时间流逝(允许一定误差)
|
||||
expected_countdown = first_countdown_seconds - time_elapsed
|
||||
|
||||
|
||||
# 计算实际差异(与第一次相比)
|
||||
diff_ratio = abs(current_countdown_seconds - first_countdown_seconds) / max(first_countdown_seconds, 1.0)
|
||||
# 计算与预期的差异(考虑时间流逝)
|
||||
expected_diff_ratio = abs(current_countdown_seconds - expected_countdown) / max(expected_countdown, 1.0) if expected_countdown > 0 else 1.0
|
||||
|
||||
|
||||
# 如果差异过大(超过30%)或与预期差异过大(超过20%),判定为识别错误
|
||||
# 注意:如果当前倒计时明显大于第一次(时间应该减少),肯定是识别错误
|
||||
is_inconsistent = (
|
||||
diff_ratio > 0.3 or
|
||||
diff_ratio > 0.3 or
|
||||
expected_diff_ratio > 0.2 or
|
||||
current_countdown_seconds > first_countdown_seconds + 10 # 倒计时不应该增加
|
||||
)
|
||||
|
||||
|
||||
if is_inconsistent:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
@@ -600,15 +678,15 @@ def read_fudai_detail_with_retries(
|
||||
else:
|
||||
# 倒计时合理,更新为当前结果
|
||||
last_tuple = current_tuple
|
||||
|
||||
|
||||
# 如果没有第一次结果,直接使用当前结果
|
||||
elif first_countdown_seconds is None:
|
||||
last_tuple = current_tuple
|
||||
|
||||
|
||||
# 如果成功读取,或者检测到优惠券弹窗(已处理完毕),或者检测到观看任务,都停止重试
|
||||
if status == "ok" or status == "coupon_popup" or status == "watch_task":
|
||||
break
|
||||
|
||||
|
||||
# 如果任务数量为0,说明没有正确打开福袋详情页,尝试重新打开
|
||||
if status == "error" and isinstance(extra, dict) and extra.get("reason") == "task_count_zero":
|
||||
if attempt < max_attempts - 1:
|
||||
@@ -639,7 +717,7 @@ def read_fudai_detail_with_retries(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
if attempt < max_attempts - 1:
|
||||
try:
|
||||
analyser.operation.delay(retry_delay)
|
||||
@@ -654,11 +732,11 @@ def read_fudai_detail_with_retries(
|
||||
cd_start, cd_end = None, None
|
||||
if isinstance(cd, (tuple, list)) and len(cd) >= 2:
|
||||
cd_start, cd_end = cd[0], cd[1]
|
||||
|
||||
|
||||
# 如果是优惠券弹窗,记录日志并明确标记
|
||||
is_coupon_popup = (last_status == "coupon_popup")
|
||||
is_watch_task = (last_status == "watch_task")
|
||||
|
||||
|
||||
# 获取直播间名字(所有情况都需要,用于日志输出)
|
||||
room_title = ""
|
||||
room_title_raw = ""
|
||||
@@ -667,7 +745,7 @@ def read_fudai_detail_with_retries(
|
||||
room_title_raw = str(getattr(analyser, "current_room_title_raw", "") or "").strip()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 格式化时间信息(所有情况都需要,用于日志输出)
|
||||
cd_end_str = ""
|
||||
remain_seconds = 0
|
||||
@@ -678,7 +756,7 @@ def read_fudai_detail_with_retries(
|
||||
remain_seconds = int(cd_end - time.time()) if cd_end > time.time() else 0
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
if is_coupon_popup:
|
||||
try:
|
||||
analyser._log_kv(
|
||||
@@ -812,7 +890,7 @@ def read_fudai_detail_with_retries(
|
||||
remain_seconds=remain_seconds,
|
||||
fudai_x=fudai_x,
|
||||
)
|
||||
|
||||
|
||||
# 行为日志:完整的福袋详情
|
||||
analyser._log_kv(
|
||||
"行为",
|
||||
@@ -845,7 +923,7 @@ def read_fudai_detail_with_retries(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 将状态信息存储在 analyser 中,供调用方检查
|
||||
try:
|
||||
analyser._last_fudai_detail_status = last_status # type: ignore[attr-defined]
|
||||
@@ -856,7 +934,7 @@ def read_fudai_detail_with_retries(
|
||||
analyser._last_fudai_detail_extra = {} # type: ignore[attr-defined]
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 验证福袋详情数据的合理性(仅在成功读取时验证)
|
||||
if last_status == "ok":
|
||||
is_valid, reason = validate_fudai_detail(last_tuple, analyser)
|
||||
@@ -876,8 +954,7 @@ def read_fudai_detail_with_retries(
|
||||
analyser._last_fudai_detail_status = "validation_failed" # type: ignore[attr-defined]
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
elapsed = time.time() - start_time
|
||||
analyser._log_kv("福袋详情", "read_fudai_detail_with_retries完成", elapsed_seconds=round(elapsed, 2), status=last_status, attempts=max_attempts)
|
||||
return last_tuple
|
||||
|
||||
@@ -48,7 +48,7 @@ def _extract_room_title_candidate(raw_text: str) -> str:
|
||||
t = _strip_room_noise_text(raw_text)
|
||||
if not t:
|
||||
return ""
|
||||
|
||||
|
||||
segs = [x.strip() for x in re.split(r"[\n ]+", t) if x.strip()]
|
||||
best = ""
|
||||
best_score = -999
|
||||
@@ -67,14 +67,14 @@ def _extract_room_title_candidate(raw_text: str) -> str:
|
||||
if score > best_score:
|
||||
best_score = score
|
||||
best = seg
|
||||
|
||||
|
||||
if best:
|
||||
m = re.search(r"(.*?)(…|\.{3,})", best)
|
||||
if m:
|
||||
cand = (m.group(1) + m.group(2)).strip()
|
||||
return cand if cand else best.strip()
|
||||
return best.strip()
|
||||
|
||||
|
||||
m2 = re.search(r"(.*?)(…|\.{3,})", t)
|
||||
if m2:
|
||||
cand2 = (m2.group(1) + m2.group(2)).strip()
|
||||
@@ -155,7 +155,7 @@ def read_live_room_title_core(
|
||||
min_len: int = 3,
|
||||
) -> Tuple[str, str]:
|
||||
"""读取当前直播间顶部区域的"主播名/直播间名"(OCR,尽量轻量)。
|
||||
|
||||
|
||||
只使用指定区域 (144,144) 到 (329,185) 进行识别,避免多次截图。
|
||||
"""
|
||||
try:
|
||||
@@ -171,7 +171,7 @@ def read_live_room_title_core(
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 只使用指定区域 (144,144) 到 (329,185),只尝试一次OCR(mode 0)
|
||||
try:
|
||||
analyser.cut_pic(144, 144, 329, 185, '', 'live_room_title_mid', y_pianyi)
|
||||
@@ -191,7 +191,7 @@ def read_live_room_title_core(
|
||||
pass
|
||||
title = ""
|
||||
raw_text = ""
|
||||
|
||||
|
||||
# 更新 analyser 的属性
|
||||
try:
|
||||
analyser.current_room_title_raw = raw_text
|
||||
@@ -199,6 +199,5 @@ def read_live_room_title_core(
|
||||
analyser.current_room_title = title
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return title, raw_text
|
||||
|
||||
return title, raw_text
|
||||
@@ -15,4 +15,3 @@ def is_abnormal_time_value(v: float) -> bool:
|
||||
if v > 24 * 3600 * 7:
|
||||
return True
|
||||
return False
|
||||
|
||||
@@ -13,14 +13,14 @@ import re
|
||||
|
||||
def validate_fudai_detail(detail: Tuple, analyser: Any = None) -> Tuple[bool, str]:
|
||||
"""验证福袋详情数据的合理性。
|
||||
|
||||
|
||||
返回:
|
||||
(is_valid, reason) - is_valid=True 表示数据合理,False 表示识别出错
|
||||
reason 为失败原因描述
|
||||
"""
|
||||
if not isinstance(detail, tuple) or len(detail) < 6:
|
||||
return False, "detail_tuple_invalid"
|
||||
|
||||
|
||||
content = str(detail[0] or "").strip()
|
||||
time_text = str(detail[1] or "").strip()
|
||||
try:
|
||||
@@ -35,7 +35,7 @@ def validate_fudai_detail(detail: Tuple, analyser: Any = None) -> Tuple[bool, st
|
||||
prize_value_yuan = float(detail[4] or 0.0)
|
||||
except Exception:
|
||||
prize_value_yuan = 0.0
|
||||
|
||||
|
||||
countdown_tuple = detail[5]
|
||||
countdown_start, countdown_end = None, None
|
||||
if isinstance(countdown_tuple, (tuple, list)) and len(countdown_tuple) >= 2:
|
||||
@@ -44,19 +44,19 @@ def validate_fudai_detail(detail: Tuple, analyser: Any = None) -> Tuple[bool, st
|
||||
countdown_end = float(countdown_tuple[1] or 0.0)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 检查1:内容不能为空(至少要有一些文字)
|
||||
if not content or len(content.strip()) < 2:
|
||||
return False, "content_empty_or_too_short"
|
||||
|
||||
|
||||
# 检查2:价值应该大于0(福袋至少应该有价值)
|
||||
if prize_value_yuan <= 0:
|
||||
return False, "prize_value_zero_or_negative"
|
||||
|
||||
|
||||
# 检查3:价值应该合理(不能太大,比如超过100万)
|
||||
if prize_value_yuan > 1000000:
|
||||
return False, "prize_value_too_large"
|
||||
|
||||
|
||||
# 检查4:倒计时应该合理
|
||||
if countdown_end is not None and countdown_start is not None:
|
||||
remain_seconds = countdown_end - countdown_start
|
||||
@@ -97,23 +97,22 @@ def validate_fudai_detail(detail: Tuple, analyser: Any = None) -> Tuple[bool, st
|
||||
return False, f"countdown_mismatch_time_text (remain={int(remain_seconds)}, text={text_seconds}, diff={round(diff_ratio*100, 1)}%)"
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# 检查5:参与人数应该合理(不能是负数)
|
||||
if participants < 0:
|
||||
return False, "participants_negative"
|
||||
|
||||
|
||||
# 检查6:份数应该合理(不能是负数,至少应该是1)
|
||||
if copies < 0:
|
||||
return False, "copies_negative"
|
||||
|
||||
|
||||
# 检查7:如果份数为0,但参与人数大于0,可能识别错误
|
||||
if copies == 0 and participants > 0:
|
||||
return False, "copies_zero_but_participants_positive"
|
||||
|
||||
|
||||
# 检查8:时间文本应该存在(至少应该有倒计时信息)
|
||||
if not time_text and (countdown_end is None or countdown_end <= 0):
|
||||
return False, "no_time_text_and_no_countdown"
|
||||
|
||||
|
||||
# 所有检查通过
|
||||
return True, "ok"
|
||||
|
||||
@@ -2,54 +2,3 @@
|
||||
|
||||
本目录包含从 gui_app.py 模块化后的GUI组件。
|
||||
"""
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ def create_actions_log_viewer(
|
||||
"""
|
||||
actions_log_text = ScrolledText(parent)
|
||||
actions_log_text.pack(fill="both", expand=True, padx=10, pady=10)
|
||||
|
||||
|
||||
try:
|
||||
actions_log_text.configure(font=("Consolas", 10))
|
||||
except Exception:
|
||||
@@ -69,7 +69,7 @@ def create_actions_log_viewer(
|
||||
# 回退到旧路径(向后兼容)
|
||||
import path_config
|
||||
path = path_config.get_actions_log_path()
|
||||
|
||||
|
||||
try:
|
||||
if os.path.exists(path):
|
||||
# 仿照 web_gui 的实现:只读最后一小段,避免文件巨大
|
||||
@@ -78,7 +78,7 @@ def create_actions_log_viewer(
|
||||
actions_log_text.delete("1.0", "end")
|
||||
actions_log_text.insert("1.0", "行为日志文件为空")
|
||||
return
|
||||
|
||||
|
||||
read_bytes = min(size, 65536)
|
||||
with open(path, "rb") as f:
|
||||
if read_bytes < size:
|
||||
@@ -136,7 +136,7 @@ def create_actions_log_viewer(
|
||||
break
|
||||
else:
|
||||
actions_log_text.insert("1.0", "暂无匹配的行为日志")
|
||||
|
||||
|
||||
# 恢复之前的滚动位置,避免自动置顶
|
||||
try:
|
||||
actions_log_text.yview_moveto(scroll_position)
|
||||
@@ -154,4 +154,3 @@ def create_actions_log_viewer(
|
||||
)
|
||||
|
||||
return actions_log_text, refresh_actions_log
|
||||
|
||||
Loaded 100 of 149 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user