From 3a4da15eeba231fc318b55cbeeff654ac60e279c Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Sat, 17 Jan 2026 17:48:21 +0800 Subject: [PATCH] 'commit' --- Apps/XinDianTu/Config/Setting.py | 2 +- Apps/XinDianTu/Kit.py | 24 +++++++++++------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Apps/XinDianTu/Config/Setting.py b/Apps/XinDianTu/Config/Setting.py index 8e40389..5010c76 100644 --- a/Apps/XinDianTu/Config/Setting.py +++ b/Apps/XinDianTu/Config/Setting.py @@ -12,7 +12,7 @@ WAIT_BACK_TO_LIST = 0.5 WAIT_AFTER_SCROLL = 1.0 # 坐标计算与安全防护 -SAFE_EXCLUDE_RATIO = 0.40 +SAFE_EXCLUDE_RATIO = 0.30 BOTTOM_SAFE_EXCLUDE_RATIO = 0.12 FALLBACK_WIDTH = 1080 FALLBACK_HEIGHT = 2400 diff --git a/Apps/XinDianTu/Kit.py b/Apps/XinDianTu/Kit.py index af634fb..078f153 100644 --- a/Apps/XinDianTu/Kit.py +++ b/Apps/XinDianTu/Kit.py @@ -908,20 +908,18 @@ def crop_cards_from_image(img_path, output_dir=None, save_debug=True): # 准备 _vl.jpg (只画框,不画红点) vl_img = img.copy() - logger.info(f" Step [2.1/VL] 准备在 VL 图片上绘制 {len(final_cards)} 个场站的绿色方框...") + logger.info(f" Step [2.1/VL] 准备在 VL 图片上绘制 {len(final_cards)} 个场站的绿色方框...") - for idx, (y1, y2, x1, x2) in enumerate(final_cards): - # 轻微向上扩展卡片上边界,避免漏掉标题区域 - PAD_TOP = 5 - draw_y1 = max(0, y1 - PAD_TOP) - draw_y2 = y2 - - # 计算点击点 (左上角,避免被底部按钮遮挡) - # 策略:X偏移 15%, Y偏移 20% - w_card = x2 - x1 - h_card = draw_y2 - draw_y1 - click_x = int(x1 + w_card * 0.15) - click_y = int(draw_y1 + h_card * 0.20) + for idx, (y1, y2, x1, x2) in enumerate(final_cards): + PAD_TOP = 5 + draw_y1 = max(0, y1 - PAD_TOP) + draw_y2 = y2 + + w_card = x2 - x1 + h_card = draw_y2 - draw_y1 + + click_x = int((x1 + x2) / 2) + click_y = int((draw_y1 + draw_y2) / 2) # [修改] 不再保存单张子图,只记录元数据 # card = img[y1:y2, x1:x2]