style: refine dashboard toolbar and license feedback

This commit is contained in:
Your Name committed 2026-06-27 23:25:47 +08:00
1 parent 63c726ddea
commit 383c947a03
3 files changed
+175 -34

No files matched your search

+85 -33
View File
@@ -1,9 +1,10 @@
from __future__ import annotations
import tkinter as tk
from tkinter import ttk
from tkinter import messagebox, ttk
from douyin.core.version import print_version_banner
from douyin.license.license_manager import get_default_activation_url, install_license_or_activate
from gui.components.config_io import save_ui_to_config
from gui.components.config_vars import build_config_vars
from gui.components.mousewheel_guard import disable_spinbox_mousewheel
@@ -19,7 +20,7 @@ from . import theme
from .data import load_dashboard_data
from .page_context import PageContext
from .page_registry import PAGES
from .widgets import ScrollFrame, button, clear, field_shell, nav_button, rounded_surface, status_pill
from .widgets import ScrollFrame, SlimScrollbar, button, clear, nav_button, rounded_surface, status_pill
class DashboardApp:
@@ -98,35 +99,52 @@ class DashboardApp:
font=theme.FONT_SMALL,
).pack(side="right", padx=(0, 8))
tool_row = tk.Frame(top, bg=theme.SURFACE)
tool_row.pack(fill="x", padx=20, pady=(0, 10))
for col in (1, 6):
tool_row.grid_columnconfigure(col, weight=1)
ttk.Label(tool_row, text="设备:", background=theme.SURFACE, foreground=theme.MUTED, font=("Microsoft YaHei UI", 13, "bold")).grid(row=0, column=0, sticky="w")
self.device_combo = ttk.Combobox(tool_row, textvariable=self.device_var, values=[], width=44, state="readonly")
self.device_combo.grid(row=0, column=1, sticky="ew", padx=(8, 18), pady=(0, 10))
button(tool_row, "刷新设备", self.refresh_devices, width=150).grid(row=0, column=2, sticky="e", padx=5, pady=(0, 10))
self.scan_button = button(tool_row, "扫描 WiFi", self.scan_wifi, width=136)
self.scan_button.grid(row=0, column=3, sticky="e", padx=5, pady=(0, 10))
button(tool_row, "WiFi ADB", self.open_wifi_adb, width=132).grid(row=0, column=4, sticky="e", padx=5, pady=(0, 10))
tool_row.pack(fill="x", padx=20, pady=(4, 14))
tool_row.grid_columnconfigure(0, minsize=360)
tool_row.grid_columnconfigure(1, weight=1)
tool_row.grid_columnconfigure(2, minsize=350)
y_shell = field_shell(tool_row, "Y偏移")
y_shell.grid(row=1, column=0, columnspan=2, sticky="ew", pady=(0, 2), padx=(0, 18))
y_entry = tk.Entry(
y_shell,
textvariable=self.y_var,
width=12,
bg=theme.SURFACE_ALT,
fg=theme.TEXT,
insertbackground=theme.TEAL,
relief="flat",
bd=0,
font=theme.FONT_UI,
)
y_entry.pack(fill="x", padx=11, pady=(0, 9))
actions = tk.Frame(tool_row, bg=theme.SURFACE)
actions.grid(row=1, column=2, columnspan=4, sticky="w")
button(actions, "保存配置", self.save_config, width=150).pack(side="left", padx=(0, 10))
button(actions, "截图+OCR", self.screenshot_ocr, kind="primary", width=164).pack(side="left", padx=(0, 10))
device_group = tk.Frame(tool_row, bg=theme.SURFACE)
device_group.grid(row=0, column=0, sticky="ew", padx=(0, 16))
tk.Label(
device_group,
text="设备",
bg=theme.SURFACE,
fg=theme.MUTED,
font=("Microsoft YaHei UI", 12, "bold"),
).pack(anchor="w", pady=(0, 7))
self.device_combo = ttk.Combobox(device_group, textvariable=self.device_var, values=[], width=38, state="readonly")
self.device_combo.pack(fill="x")
device_actions = tk.Frame(tool_row, bg=theme.SURFACE)
device_actions.grid(row=0, column=1, sticky="w", padx=(0, 12))
tk.Label(
device_actions,
text="设备工具",
bg=theme.SURFACE,
fg=theme.MUTED,
font=("Microsoft YaHei UI", 12, "bold"),
).pack(anchor="w", pady=(0, 7))
device_button_row = tk.Frame(device_actions, bg=theme.SURFACE)
device_button_row.pack(anchor="w")
button(device_button_row, "刷新设备", self.refresh_devices, width=136).pack(side="left", padx=(0, 9))
self.scan_button = button(device_button_row, "扫描 WiFi", self.scan_wifi, width=136)
self.scan_button.pack(side="left", padx=(0, 9))
button(device_button_row, "WiFi ADB", self.open_wifi_adb, width=126).pack(side="left")
primary_actions = tk.Frame(tool_row, bg=theme.SURFACE)
primary_actions.grid(row=0, column=2, sticky="e")
tk.Label(
primary_actions,
text="主操作",
bg=theme.SURFACE,
fg=theme.MUTED,
font=("Microsoft YaHei UI", 12, "bold"),
).pack(anchor="e", pady=(0, 7))
primary_button_row = tk.Frame(primary_actions, bg=theme.SURFACE)
primary_button_row.pack(anchor="e")
button(primary_button_row, "保存配置", self.save_config, width=138).pack(side="left", padx=(0, 10))
button(primary_button_row, "截图+OCR", self.screenshot_ocr, kind="primary", width=156).pack(side="left")
main = ttk.Frame(shell, style="Dashboard.TFrame")
main.pack(fill="both", expand=True, padx=20, pady=(6, 6))
@@ -139,12 +157,12 @@ class DashboardApp:
sidebar.grid_propagate(False)
sidebar.pack_propagate(False)
nav_canvas = tk.Canvas(sidebar, bg=theme.SURFACE, highlightthickness=0, bd=0)
nav_scroll = ttk.Scrollbar(sidebar, orient="vertical", command=nav_canvas.yview)
nav_scroll = SlimScrollbar(sidebar, command=lambda *args: nav_canvas.yview(*[a for a in args if a is not None]))
nav_inner = tk.Frame(nav_canvas, bg=theme.SURFACE)
nav_window = nav_canvas.create_window((0, 0), window=nav_inner, anchor="nw")
nav_canvas.configure(yscrollcommand=nav_scroll.set)
nav_canvas.pack(side="left", fill="both", expand=True, padx=(0, 2), pady=8)
nav_scroll.pack(side="right", fill="y", pady=10)
nav_scroll.pack(side="right", fill="y", padx=(0, 8), pady=12)
nav_canvas.pack(side="left", fill="both", expand=True, padx=(0, 4), pady=8)
nav_inner.bind("<Configure>", lambda _e: nav_canvas.configure(scrollregion=nav_canvas.bbox("all")))
nav_canvas.bind("<Configure>", lambda e: nav_canvas.itemconfigure(nav_window, width=e.width))
@@ -223,6 +241,7 @@ class DashboardApp:
"screenshot_ocr": self.screenshot_ocr,
"scan_wifi": self.scan_wifi,
"wifi_adb": self.open_wifi_adb,
"verify_license": self.verify_license,
"show_run_log": lambda: self.show_page("运行日志"),
"show_actions_log": lambda: self.show_page("行为日志"),
}
@@ -397,6 +416,39 @@ class DashboardApp:
ok = self.runner.send_back_key(self._selected_device())
self.status_var.set("返回键已发送" if ok else "发送返回键失败")
def verify_license(self) -> None:
var = self.config_vars.get("license_key_var")
raw = str(var.get() if var is not None else "").strip()
if not raw:
self.status_var.set("请输入卡密")
messagebox.showwarning("卡密验证", "请输入卡密后再验证。", parent=self.root)
return
try:
cfg = read_config()
section = cfg.get("license") if isinstance(cfg.get("license"), dict) else {}
activation_url = str(section.get("activation_url") or "").strip() or get_default_activation_url()
timeout_seconds = int(section.get("timeout_seconds") or 10)
except Exception:
activation_url = get_default_activation_url()
timeout_seconds = 10
status = install_license_or_activate(
raw,
activation_url=activation_url,
timeout_seconds=max(1, timeout_seconds),
)
if status.ok:
if var is not None:
var.set("")
self.status_var.set("卡密验证成功")
messagebox.showinfo("卡密验证", "验证成功,授权已写入本机。", parent=self.root)
else:
self.status_var.set(f"卡密验证失败:{status.message}")
messagebox.showerror(
"卡密验证失败",
f"{status.message}\n\n原因:{status.reason}",
parent=self.root,
)
def refresh_data(self) -> None:
self.data = load_dashboard_data()
self.status_var.set("已刷新")
+27 -1
View File
@@ -2,6 +2,8 @@ from __future__ import annotations
import tkinter as tk
from douyin.license.license_manager import get_license_status_payload
from . import theme
from .data import DashboardData, cfg_get
from .page_context import PageContext
@@ -166,7 +168,31 @@ def build_license(parent: tk.Misc, data: DashboardData, ctx: PageContext) -> Non
section(parent, "授权", "输入卡密后自动联网验证")
box = card(parent, "卡密验证")
box.pack(fill="x")
if "license_key_var" not in ctx.vars:
ctx.vars["license_key_var"] = tk.StringVar(value="")
pack_fields(box, ctx, [("输入卡密", "license_key_var", "")], columns=1)
try:
payload = get_license_status_payload()
except Exception as exc:
payload = {"ok": False, "message": f"读取授权状态失败:{exc}", "reason": "status_error"}
ok = bool(payload.get("ok"))
message = str(payload.get("message") or payload.get("reason") or "未知状态")
status = tk.Frame(box, bg=theme.GREEN_SOFT if ok else theme.AMBER_SOFT)
status.pack(fill="x", padx=20, pady=(0, 12))
tk.Label(
status,
text=("当前授权有效" if ok else "当前授权未通过"),
bg=status["bg"],
fg=theme.GREEN if ok else theme.AMBER,
font=("Microsoft YaHei UI", 12, "bold"),
).pack(side="left", padx=12, pady=8)
tk.Label(
status,
text=message,
bg=status["bg"],
fg=theme.TEXT,
font=theme.FONT_SMALL,
).pack(side="left", padx=(8, 12), pady=8)
row = tk.Frame(box, bg=theme.SURFACE)
row.pack(fill="x", padx=20, pady=(0, 16))
button(row, "验证卡密", None, kind="primary").pack(side="left", padx=(0, 8))
button(row, "验证卡密", ctx.action("verify_license"), kind="primary").pack(side="left", padx=(0, 8))
+63
View File
@@ -243,6 +243,69 @@ class RoundedNavButton(tk.Canvas):
self.create_text(22 if self.active else 15, 23, text=self.text, anchor="w", fill=fg, font=("Microsoft YaHei UI", 13, "bold") if self.active else theme.FONT_UI)
class SlimScrollbar(tk.Canvas):
def __init__(self, parent, *, command: Callable[[str, int | float, str | None], None] | None = None) -> None:
super().__init__(
parent,
width=14,
bg=theme.SURFACE,
highlightthickness=0,
bd=0,
cursor="hand2",
)
self.command = command
self.first = 0.0
self.last = 1.0
self._drag_y: int | None = None
self.bind("<Configure>", lambda _e: self._draw())
self.bind("<Button-1>", self._jump)
self.bind("<B1-Motion>", self._drag)
self.bind("<ButtonRelease-1>", lambda _e: setattr(self, "_drag_y", None))
def set(self, first: float | str, last: float | str) -> None:
self.first = max(0.0, min(1.0, float(first)))
self.last = max(self.first, min(1.0, float(last)))
self._draw()
def _thumb_bounds(self) -> tuple[int, int, int]:
height = max(1, self.winfo_height())
track_top = 10
track_bottom = max(track_top + 1, height - 10)
track_h = track_bottom - track_top
thumb_h = max(42, int(track_h * max(0.08, self.last - self.first)))
travel = max(1, track_h - thumb_h)
y1 = track_top + int(travel * self.first)
return y1, min(track_bottom, y1 + thumb_h), travel
def _draw(self) -> None:
self.delete("all")
height = max(1, self.winfo_height())
self.create_line(7, 10, 7, height - 10, fill=theme.BG_ALT, width=8, capstyle="round")
if self.last - self.first >= 0.995:
self.create_line(7, 10, 7, height - 10, fill=theme.BORDER, width=4, capstyle="round")
return
y1, y2, _travel = self._thumb_bounds()
self.create_line(7, y1, 7, y2, fill=theme.TEAL, width=8, capstyle="round")
self.create_line(7, y1 + 5, 7, y2 - 5, fill=theme.TEAL_DARK, width=3, capstyle="round")
def _moveto_from_y(self, y: int) -> None:
if not self.command:
return
y1, y2, travel = self._thumb_bounds()
thumb_h = max(1, y2 - y1)
track_top = 10
target = (y - track_top - thumb_h / 2) / max(1, travel)
self.command("moveto", max(0.0, min(1.0, target)), None)
def _jump(self, event) -> None:
self._drag_y = int(event.y)
self._moveto_from_y(int(event.y))
def _drag(self, event) -> None:
self._drag_y = int(event.y)
self._moveto_from_y(int(event.y))
def clear(frame: tk.Misc) -> None:
for child in frame.winfo_children():
child.destroy()