refactor(gui): 抽 _try_reconnect_last_wifi 到 components/wifi_adb_reconnect (4268 → 4148)

This commit is contained in:
Your Name committed 2026-05-30 14:24:19 +08:00
1 parent 4993fad004
commit b3380042b8
2 files changed
+173 -128

No files matched your search

+165
View File
@@ -0,0 +1,165 @@
"""启动时尝试自动重连上次记住的 WiFi ADB 设备。
从 ``gui/gui_app.py`` 抽出。原本是 ``main()`` 内的闭包 ``_try_reconnect_last_wifi``,
通过 ``root.after(300, ...)`` 在 GUI 创建完成后异步触发。
依赖通过显式参数注入:
- ``root`` - 主窗口(用于线程间 ``after``)
- ``adb_exe`` - ADB 可执行路径
- ``device_var`` - 主窗口设备 StringVar(命中后写入)
- ``on_line`` - 日志回调
- ``refresh_devices`` - 刷新主窗口设备下拉的回调
"""
from __future__ import annotations
import threading
import tkinter as tk
from typing import Callable
from gui.gui_core import list_adb_devices
from gui.gui_core_pkg import (
discover_adb_devices,
get_last_wifi_target,
pick_best_match,
set_last_wifi_target,
)
from gui.gui_core_pkg.wifi_adb_scan import verify_adb_target
def try_reconnect_last_wifi(
root: tk.Misc,
*,
adb_exe: str,
device_var: tk.StringVar,
on_line: Callable[[str], None],
refresh_devices: Callable[[], None],
) -> None:
"""启动时若 adb devices 为空且配置里有 last_wifi_target,后台尝试重连。
策略:
1. 已经有可用设备:不打扰
2. 上次记录的 target 现在 verify_adb_target 成功 → 选中
3. verify 失败 → 自动扫描子网 + pick_best_match 智能匹配
4. 匹配上 → 选中,更新 last_wifi_target;匹配不上 → 日志提示
"""
last = {}
try:
last = get_last_wifi_target()
except Exception:
return
if not isinstance(last, dict) or not last.get("target"):
return
target = str(last.get("target"))
model = str(last.get("model") or "")
# 已经有设备时不打扰
try:
existing = list_adb_devices(adb_exe)
except Exception:
existing = []
if target in existing:
device_var.set(target)
on_line(f"[启动] WiFi 设备已在线: {target}" + (f" ({model})" if model else ""))
return
if existing:
on_line(
f"[启动] 当前已有设备 {existing[0]},上次 WiFi 目标 {target} 不抢占"
)
return
on_line(f"[启动] 尝试重连上次的 WiFi 设备: {target} ...")
def worker():
# 先直连
state, msg = "failed", ""
try:
state, msg = verify_adb_target(adb_exe, target)
except Exception as e:
msg = str(e)
if state == "connected":
def render_ok():
refresh_devices()
device_var.set(target)
on_line(
f"[启动] 自动重连成功: {target}"
+ (f" ({model})" if model else "")
)
root.after(0, render_ok)
return
if state == "unauthorized":
def render_unauth():
on_line(
f"[启动] 上次设备 {target} 未授权,请在手机上确认 ADB 调试"
)
root.after(0, render_unauth)
return
# state == "failed" → 不可达。换网了?自动扫一下,看能不能在新网段找到
def notify_scan_start():
on_line(
f"[启动] {target} 不可达,自动扫描局域网寻找匹配设备..."
)
root.after(0, notify_scan_start)
try:
# 如果上次记的端口非 5555,扫描时把它一起带上(覆盖 Android 11+ 随机端口)
last_port_int = 5555
if ":" in target:
try:
last_port_int = int(target.rsplit(":", 1)[1])
except ValueError:
pass
scan_ports = [5555] if last_port_int == 5555 else [5555, last_port_int]
devs = discover_adb_devices(adb_exe, ports=scan_ports)
except Exception as e:
def render_scan_err():
on_line(f"[启动] 自动扫描失败: {e}")
root.after(0, render_scan_err)
return
best = pick_best_match(devs, last)
def render_scan_done():
if best is None:
if devs:
targets_str = ", ".join(
f"{d.target}({d.adb_state})" for d in devs[:5]
)
on_line(
f"[启动] 扫描发现 {len(devs)} 台候选但无明确匹配: "
f"{targets_str}。请点'扫描 WiFi'手选"
)
else:
on_line(
f"[启动] 上次设备 {target} 不可达,扫描也未发现其它设备。"
f"请检查手机和电脑是否在同一 WiFi"
)
return
refresh_devices()
device_var.set(best.target)
# 更新记忆
try:
set_last_wifi_target(best.target, best.model or model)
except Exception:
pass
if best.target == target:
on_line(
f"[启动] 自动重连成功(扫描确认): {best.target}"
+ (f" ({best.model})" if best.model else "")
)
else:
on_line(
f"[启动] 上次目标 {target} 已变 → 智能匹配到 {best.target}"
+ (f" ({best.model})" if best.model else "")
+ "(已更新记忆)"
)
root.after(0, render_scan_done)
threading.Thread(target=worker, daemon=True).start()
+8 -128
View File
@@ -55,6 +55,7 @@ from gui.components.actions_log_view import (
refresh_actions_log as _refresh_actions_log_impl,
)
from gui.components.wifi_adb_pick_dialog import open_scan_pick_dialog as _open_scan_pick_dialog_impl
from gui.components.wifi_adb_reconnect import try_reconnect_last_wifi as _try_reconnect_last_wifi_impl
# 导入日志颜色配置模块
try:
@@ -248,134 +249,13 @@ def main():
_scan_busy = {"flag": False}
def _try_reconnect_last_wifi():
"""启动时若 adb devices 为空且配置里有 last_wifi_target,后台尝试重连。
策略:
1. 已经有可用设备:不打扰
2. 上次记录的 target 现在 verify_adb_target 成功 → 选中
3. verify 失败 → 自动扫描子网 + pick_best_match 智能匹配
4. 匹配上 → 选中,更新 last_wifi_target;匹配不上 → 日志提示
"""
last = {}
try:
last = get_last_wifi_target()
except Exception:
return
if not isinstance(last, dict) or not last.get("target"):
return
target = str(last.get("target"))
model = str(last.get("model") or "")
# 已经有设备时不打扰
try:
existing = list_adb_devices(adb_exe)
except Exception:
existing = []
if target in existing:
device_var.set(target)
on_line(f"[启动] WiFi 设备已在线: {target}" + (f" ({model})" if model else ""))
return
if existing:
on_line(
f"[启动] 当前已有设备 {existing[0]},上次 WiFi 目标 {target} 不抢占"
)
return
on_line(f"[启动] 尝试重连上次的 WiFi 设备: {target} ...")
def worker():
# 先直连
state, msg = "failed", ""
try:
state, msg = verify_adb_target(adb_exe, target)
except Exception as e:
msg = str(e)
if state == "connected":
def render_ok():
refresh_devices()
device_var.set(target)
on_line(
f"[启动] 自动重连成功: {target}"
+ (f" ({model})" if model else "")
)
root.after(0, render_ok)
return
if state == "unauthorized":
def render_unauth():
on_line(
f"[启动] 上次设备 {target} 未授权,请在手机上确认 ADB 调试"
)
root.after(0, render_unauth)
return
# state == "failed" → 不可达。换网了?自动扫一下,看能不能在新网段找到
def notify_scan_start():
on_line(
f"[启动] {target} 不可达,自动扫描局域网寻找匹配设备..."
)
root.after(0, notify_scan_start)
try:
# 如果上次记的端口非 5555,扫描时把它一起带上(覆盖 Android 11+ 随机端口)
last_port_int = 5555
if ":" in target:
try:
last_port_int = int(target.rsplit(":", 1)[1])
except ValueError:
pass
scan_ports = [5555] if last_port_int == 5555 else [5555, last_port_int]
devs = discover_adb_devices(adb_exe, ports=scan_ports)
except Exception as e:
def render_scan_err():
on_line(f"[启动] 自动扫描失败: {e}")
root.after(0, render_scan_err)
return
best = pick_best_match(devs, last)
def render_scan_done():
if best is None:
if devs:
targets_str = ", ".join(
f"{d.target}({d.adb_state})" for d in devs[:5]
)
on_line(
f"[启动] 扫描发现 {len(devs)} 台候选但无明确匹配: "
f"{targets_str}。请点'扫描 WiFi'手选"
)
else:
on_line(
f"[启动] 上次设备 {target} 不可达,扫描也未发现其它设备。"
f"请检查手机和电脑是否在同一 WiFi"
)
return
refresh_devices()
device_var.set(best.target)
# 更新记忆
try:
set_last_wifi_target(best.target, best.model or model)
except Exception:
pass
if best.target == target:
on_line(
f"[启动] 自动重连成功(扫描确认): {best.target}"
+ (f" ({best.model})" if best.model else "")
)
else:
on_line(
f"[启动] 上次目标 {target} 已变 → 智能匹配到 {best.target}"
+ (f" ({best.model})" if best.model else "")
+ "(已更新记忆)"
)
root.after(0, render_scan_done)
threading.Thread(target=worker, daemon=True).start()
_try_reconnect_last_wifi_impl(
root,
adb_exe=adb_exe,
device_var=device_var,
on_line=on_line,
refresh_devices=refresh_devices,
)
# 启动时延迟一点,等界面创建完成再尝试重连
root.after(300, _try_reconnect_last_wifi)