From 6c7bbf0945bbf6848329cf53ea2a4dee10dfcf8d Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 30 May 2026 16:15:24 +0800 Subject: [PATCH] =?UTF-8?q?refactor(gui):=20=E6=8A=BD=20run=5Ftab=20UI=20?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=88=B0=20components/run=5Ftab=20(2192=20?= =?UTF-8?q?=E2=86=92=202122)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gui/components/run_tab.py | 102 ++++++++++++++++++++++++++++++++++++++ gui/gui_app.py | 102 ++++++-------------------------------- 2 files changed, 118 insertions(+), 86 deletions(-) create mode 100644 gui/components/run_tab.py diff --git a/gui/components/run_tab.py b/gui/components/run_tab.py new file mode 100644 index 0000000..f2bb290 --- /dev/null +++ b/gui/components/run_tab.py @@ -0,0 +1,102 @@ +"""运行设置 Tab UI 创建逻辑(11 个 var)。 + +从 ``gui/gui_app.py`` 抽出。原本是 ``main()`` 内长 87 行的 widget 创建段。 +""" + +from __future__ import annotations + +import tkinter as tk +from tkinter import ttk +from tkinter.constants import LEFT, X +from typing import Dict + + +def setup_run_tab(parent: ttk.Notebook, *, vars_: Dict[str, tk.Variable]) -> ttk.Frame: + run_tab = ttk.Frame(parent) + parent.add(run_tab, text="运行设置") + + run_box = ttk.LabelFrame(run_tab, text="基本运行参数") + run_box.pack(fill=X, padx=10, pady=(10, 10)) + + r0 = ttk.Frame(run_box) + r0.pack(fill=X, padx=10, pady=(10, 6)) + ttk.Checkbutton(r0, text="允许切换直播间", variable=vars_["needswitch_var"]).pack(side=LEFT) + + r1 = ttk.Frame(run_box) + r1.pack(fill=X, padx=10, pady=(0, 10)) + ttk.Checkbutton(r1, text="无限循环模式", variable=vars_["infinite_loop_var"]).pack(side=LEFT) + ttk.Label(r1, text="运行时长(分钟):").pack(side=LEFT, padx=(10, 0)) + wait_minutes_spinbox = ttk.Spinbox( + r1, from_=1, to=60, textvariable=vars_["wait_minutes_var"], width=6 + ) + wait_minutes_spinbox.pack(side=LEFT, padx=(0, 12)) + + # 根据无限循环开关状态,启用/禁用运行时长输入框 + def update_wait_minutes_state(*args): + if vars_["infinite_loop_var"].get(): + wait_minutes_spinbox.config(state="disabled") + else: + wait_minutes_spinbox.config(state="normal") + + vars_["infinite_loop_var"].trace("w", update_wait_minutes_state) + update_wait_minutes_state() # 初始化状态 + + ttk.Label(r1, text="倒计时大于(秒)时不参与(高价值可预约):").pack(side=LEFT) + ttk.Spinbox(r1, from_=0, to=3600, textvariable=vars_["skip_gt_seconds_var"], width=6).pack( + side=LEFT + ) + + r2 = ttk.Frame(run_box) + r2.pack(fill=X, padx=10, pady=(0, 6)) + ttk.Checkbutton( + r2, text="切换N次后回到第一个", variable=vars_["reset_after_swipes_enabled_var"] + ).pack(side=LEFT) + ttk.Label(r2, text="次数:").pack(side=LEFT, padx=(10, 0)) + ttk.Spinbox( + r2, from_=1, to=9999, textvariable=vars_["reset_after_swipes_var"], width=6 + ).pack(side=LEFT) + ttk.Label(r2, text="(触发后会向上回退)").pack(side=LEFT, padx=(6, 0)) + + # r2_5: 滑动重置回退方式(与滑动重置配置放在一起) + r2_5 = ttk.Frame(run_box) + r2_5.pack(fill=X, padx=10, pady=(0, 10)) + ttk.Label(r2_5, text="滑动重置回退方式:").pack(side=LEFT) + ttk.Combobox( + r2_5, + values=["swipe", "back"], + textvariable=vars_["reset_after_swipes_action_var"], + state="readonly", + width=8, + ).pack(side=LEFT, padx=(6, 0)) + ttk.Label(r2_5, text="(滑动次数重置时的回退方法)").pack(side=LEFT, padx=(6, 0)) + + # r3: 启用返回键回退(单独一行) + r3 = ttk.Frame(run_box) + r3.pack(fill=X, padx=10, pady=(0, 6)) + ttk.Checkbutton( + r3, + text="启用返回键回退", + variable=vars_["enable_back_on_misses_var"], + ).pack(side=LEFT) + + r3b = ttk.Frame(run_box) + r3b.pack(fill=X, padx=10, pady=(0, 6)) + ttk.Checkbutton( + r3b, + text="启用下滑回退直播间", + variable=vars_["swipe_down_back_enabled_var"], + ).pack(side=LEFT) + ttk.Label(r3b, text="次数:").pack(side=LEFT, padx=(10, 0)) + ttk.Spinbox( + r3b, from_=1, to=9999, textvariable=vars_["swipe_down_back_count_var"], width=6 + ).pack(side=LEFT) + + # r4: 连续无福袋退出阈值(放在启用回退下一行,便于查看) + r4 = ttk.Frame(run_box) + r4.pack(fill=X, padx=10, pady=(0, 10)) + ttk.Label(r4, text="连续无福袋退出阈值:").pack(side=LEFT) + ttk.Spinbox( + r4, from_=1, to=99999, textvariable=vars_["fudai_exit_after_misses_var"], width=6 + ).pack(side=LEFT, padx=(6, 12)) + + return run_tab diff --git a/gui/gui_app.py b/gui/gui_app.py index 59ae69d..fd1ba9a 100644 --- a/gui/gui_app.py +++ b/gui/gui_app.py @@ -91,6 +91,7 @@ from gui.components.debug_tab import setup_debug_tab from gui.components.logging_tab import setup_logging_tab from gui.components.yanghao_tab import setup_yanghao_tab from gui.components.reservation_tab import setup_reservation_tab +from gui.components.run_tab import setup_run_tab # 导入日志颜色配置模块 try: @@ -763,93 +764,22 @@ def main(): # 创建左侧配置标签页 # 标签页1:运行设置 - run_tab = ttk.Frame(left_notebook) - left_notebook.add(run_tab, text="运行设置") - - run_box = ttk.LabelFrame(run_tab, text="基本运行参数") - run_box.pack(fill=X, padx=10, pady=(10, 10)) - - r0 = ttk.Frame(run_box) - r0.pack(fill=X, padx=10, pady=(10, 6)) - ttk.Checkbutton(r0, text="允许切换直播间", variable=needswitch_var).pack(side=LEFT) - - r1 = ttk.Frame(run_box) - r1.pack(fill=X, padx=10, pady=(0, 10)) - ttk.Checkbutton(r1, text="无限循环模式", variable=infinite_loop_var).pack(side=LEFT) - ttk.Label(r1, text="运行时长(分钟):").pack(side=LEFT, padx=(10, 0)) - wait_minutes_spinbox = ttk.Spinbox( - r1, from_=1, to=60, textvariable=wait_minutes_var, width=6 + setup_run_tab( + left_notebook, + vars_={ + "enable_back_on_misses_var": enable_back_on_misses_var, + "fudai_exit_after_misses_var": fudai_exit_after_misses_var, + "infinite_loop_var": infinite_loop_var, + "needswitch_var": needswitch_var, + "reset_after_swipes_action_var": reset_after_swipes_action_var, + "reset_after_swipes_enabled_var": reset_after_swipes_enabled_var, + "reset_after_swipes_var": reset_after_swipes_var, + "skip_gt_seconds_var": skip_gt_seconds_var, + "swipe_down_back_count_var": swipe_down_back_count_var, + "swipe_down_back_enabled_var": swipe_down_back_enabled_var, + "wait_minutes_var": wait_minutes_var, + }, ) - wait_minutes_spinbox.pack(side=LEFT, padx=(0, 12)) - - # 根据无限循环开关状态,启用/禁用运行时长输入框 - def update_wait_minutes_state(*args): - if infinite_loop_var.get(): - wait_minutes_spinbox.config(state="disabled") - else: - wait_minutes_spinbox.config(state="normal") - - infinite_loop_var.trace("w", update_wait_minutes_state) - update_wait_minutes_state() # 初始化状态 - - ttk.Label(r1, text="倒计时大于(秒)时不参与(高价值可预约):").pack(side=LEFT) - ttk.Spinbox(r1, from_=0, to=3600, textvariable=skip_gt_seconds_var, width=6).pack( - side=LEFT - ) - - r2 = ttk.Frame(run_box) - r2.pack(fill=X, padx=10, pady=(0, 6)) - ttk.Checkbutton( - r2, text="切换N次后回到第一个", variable=reset_after_swipes_enabled_var - ).pack(side=LEFT) - ttk.Label(r2, text="次数:").pack(side=LEFT, padx=(10, 0)) - ttk.Spinbox( - r2, from_=1, to=9999, textvariable=reset_after_swipes_var, width=6 - ).pack(side=LEFT) - ttk.Label(r2, text="(触发后会向上回退)").pack(side=LEFT, padx=(6, 0)) - - # r2_5: 滑动重置回退方式(与滑动重置配置放在一起) - r2_5 = ttk.Frame(run_box) - r2_5.pack(fill=X, padx=10, pady=(0, 10)) - ttk.Label(r2_5, text="滑动重置回退方式:").pack(side=LEFT) - ttk.Combobox( - r2_5, - values=["swipe", "back"], - textvariable=reset_after_swipes_action_var, - state="readonly", - width=8, - ).pack(side=LEFT, padx=(6, 0)) - ttk.Label(r2_5, text="(滑动次数重置时的回退方法)").pack(side=LEFT, padx=(6, 0)) - - # r3: 启用返回键回退(单独一行) - r3 = ttk.Frame(run_box) - r3.pack(fill=X, padx=10, pady=(0, 6)) - ttk.Checkbutton( - r3, - text="启用返回键回退", - variable=enable_back_on_misses_var, - ).pack(side=LEFT) - - r3b = ttk.Frame(run_box) - r3b.pack(fill=X, padx=10, pady=(0, 6)) - ttk.Checkbutton( - r3b, - text="启用下滑回退直播间", - variable=swipe_down_back_enabled_var, - ).pack(side=LEFT) - ttk.Label(r3b, text="次数:").pack(side=LEFT, padx=(10, 0)) - ttk.Spinbox( - r3b, from_=1, to=9999, textvariable=swipe_down_back_count_var, width=6 - ).pack(side=LEFT) - - # r4: 连续无福袋退出阈值(放在启用回退下一行,便于查看) - r4 = ttk.Frame(run_box) - r4.pack(fill=X, padx=10, pady=(0, 10)) - ttk.Label(r4, text="连续无福袋退出阈值:").pack(side=LEFT) - ttk.Spinbox( - r4, from_=1, to=99999, textvariable=fudai_exit_after_misses_var, width=6 - ).pack(side=LEFT, padx=(6, 12)) - # 标签页2:筛选设置 filter_tab = ttk.Frame(left_notebook) left_notebook.add(filter_tab, text="筛选设置")