diff --git a/douyin/fudai/douyin_fudai_core.py b/douyin/fudai/douyin_fudai_core.py index 6d3c4bc..ebafad5 100644 --- a/douyin/fudai/douyin_fudai_core.py +++ b/douyin/fudai/douyin_fudai_core.py @@ -465,23 +465,12 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo # 价值:重模型兜底一次,兼容带符号文本 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()) + raw_val = analyser.operation.analyse_pic_word(name_val, 0) + results["value"] = str(raw_val or "") 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: @@ -933,7 +922,7 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo pass def ocr_value(): - """OCR识别福袋价值:优先用数字模型提取金额,回退文本模型。""" + """OCR识别福袋价值:使用普通OCR获取文本,支持小数点。""" start = time.time() try: try: @@ -941,16 +930,9 @@ def get_fudai_contain(analyser, renwu: int = 2) -> Tuple[str, str, int, int, flo 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 - - # 回退:再跑一次文本模型,兼容包含货币符号的情况 + # 使用普通OCR获取文本,支持小数点等 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 + return word_raw except Exception as e_inner: try: analyser._log_kv( diff --git a/gui/gui_app.py b/gui/gui_app.py index bf07b79..756d1cd 100644 --- a/gui/gui_app.py +++ b/gui/gui_app.py @@ -2890,7 +2890,7 @@ def main(): ("抽奖结果", (380, 660, 720, 755), "抽奖结果弹窗"), ("推荐页标签栏", (400, 140, 900, 200), "推荐/关注/直播标签"), ("推荐页标签栏快速检测", (400, 140, 900, 200), "推荐页快速检测"), - ("参与按钮", (306, 2030, 780, 2180), "参与福袋抽奖按钮"), + ("参与按钮", (306, 2030, 780, 2110), "参与福袋抽奖按钮"), ("无奖励确认", (340, 1195, 740, 1355), "无奖励确认弹窗"), ("奖励通知确认", (370, 1350, 680, 1440), "奖励通知确认"), ("订单确认", (370, 120, 700, 220), "订单确认页面"),