diff --git a/AGENTS.md b/AGENTS.md index 2b286b1..beca9ba 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -47,7 +47,7 @@ ## 可选 USB 模拟功能(Windows 已开始实现) -用户于 2026-11-12 授权新增可选 USB 模拟,先实现 Windows。当前采用独立 Rust USB/IP 虚拟 ADB 设备 + 已签名的 USBip UDE 控制器,复用现有网络隧道,包含桌面开关、驱动检测和安装脚本;详见 docs/windows-usb.md。Linux 已按 2026-11-13 新授权完成原生 USB/IP CLI 验证,见 docs/linux-usb.md;Linux GUI 尚未接入。macOS 仍仅记录方案。以下跨平台内容保留为设计依据。 +用户于 2026-11-12 授权新增可选 USB 模拟,先实现 Windows。当前采用独立 Rust USB/IP 虚拟 ADB 设备 + 已签名的 USBip UDE 控制器,复用现有网络隧道,包含桌面开关、驱动检测和安装脚本;详见 docs/windows-usb.md。Linux 已按 2026-11-13 新授权完成原生 USB/IP CLI 验证,见 docs/linux-usb.md;Avalonia Linux GUI 已接入 pkexec 挂载;Flutter Linux GUI 尚未接入。macOS 仍仅记录方案。以下跨平台内容保留为设计依据。 ### 目标与范围 diff --git a/README.md b/README.md index d87ae34..13c1c25 100644 --- a/README.md +++ b/README.md @@ -228,4 +228,4 @@ Agent 管理发行入口:`scripts/build-desktop.ps1` 生成 `bin/desktop-win-x Linux 安装包:`bash scripts/build-linux-packages.sh`,提供 `.deb` 和 `.tar.gz`,详见 [Linux 打包](docs/linux-packaging.md)。 -Linux 原生虚拟 USB 已在 Ubuntu 实机通过 CLI 验证,部署和权限说明见 [Linux USB](docs/linux-usb.md)。Linux GUI 开关尚未接入。 +Linux 原生虚拟 USB 已在 Ubuntu 实机通过 CLI 验证,部署和权限说明见 [Linux USB](docs/linux-usb.md)。Avalonia Linux GUI 已接入 pkexec 挂载,Flutter Linux 尚未接入。 diff --git a/desktop/Ads.Desktop/DeviceConnection.cs b/desktop/Ads.Desktop/DeviceConnection.cs index 05b7b22..1b2dd33 100644 --- a/desktop/Ads.Desktop/DeviceConnection.cs +++ b/desktop/Ads.Desktop/DeviceConnection.cs @@ -34,7 +34,7 @@ public partial class DeviceConnection : ObservableObject, IDisposable private int missingUsbPolls, recoveryAttempts, stablePolls; private DateTime nextRecovery=DateTime.MinValue; private CancellationTokenSource? recoveryCancellation; - private WindowsUsbSession? usb; + private UsbSession? usb; private string? transportFile, leaseFile; private readonly Action log; private readonly SemaphoreSlim gate = new(1, 1); @@ -73,7 +73,7 @@ public partial class DeviceConnection : ObservableObject, IDisposable Model = AndroidVersion = ApiLevel = "—"; log($"连接已启动,隧道 {RawEndpoint}。"); if (Options.UsbMode) { - usb = new WindowsUsbSession(DeviceId); + usb = new UsbSession(DeviceId); await usb.StartAsync(Options.Usbip, Options.UsbPort!.Value, RawEndpoint, leaseFile!, log, lifetime.Token); Endpoint = usb.Serial; } @@ -163,7 +163,7 @@ public partial class DeviceConnection : ObservableObject, IDisposable } var newPort=ConnectionPorts.Allocate(Options.UsbPort is >=65535 ?3240:Options.UsbPort!.Value+1,new[]{Options.Port,ScreenPort??0}); Options=Options with {UsbPort=newPort};OnPropertyChanged(nameof(PortSummary)); - usb=new WindowsUsbSession(DeviceId); + usb=new UsbSession(DeviceId); await usb.StartAsync(Options.Usbip,newPort,RawEndpoint,leaseFile!,log,cancellation); Endpoint=usb.Serial;usbBroken=false;Status="USB 已重新挂载 · 等待 ADB 就绪"; } catch(OperationCanceledException) when(cancellation.IsCancellationRequested) { } diff --git a/desktop/Ads.Desktop/MainViewModel.cs b/desktop/Ads.Desktop/MainViewModel.cs index e75e71c..fbd7949 100644 --- a/desktop/Ads.Desktop/MainViewModel.cs +++ b/desktop/Ads.Desktop/MainViewModel.cs @@ -25,7 +25,7 @@ public partial class MainViewModel : ObservableObject, IDisposable [ObservableProperty] private int maxSize = 1920; [ObservableProperty] private int maxFps = 60; [ObservableProperty] private bool usbMode; - [ObservableProperty] private string usbipPath = WindowsUsbSession.DefaultUsbipPath(); + [ObservableProperty] private string usbipPath = UsbSession.DefaultUsbipPath(); [ObservableProperty] private int usbPort = 3240; [ObservableProperty] private bool relayOnly; [ObservableProperty] private string transportStatus = "尚未建立数据通道"; @@ -300,7 +300,7 @@ public partial class MainViewModel : ObservableObject, IDisposable int? usbPort = null; if (UsbMode) { usbPort = ConnectionPorts.Allocate(UsbPort, reserved); - WindowsUsbSession.Validate(UsbipPath, usbPort.Value); + UsbSession.Validate(UsbipPath, usbPort.Value); } if (sessions.Remove(device.Id, out var old)) { old.PropertyChanged -= ConnectionChanged; old.Dispose(); } var session = new DeviceConnection(device.Id, diff --git a/desktop/Ads.Desktop/MainWindow.axaml b/desktop/Ads.Desktop/MainWindow.axaml index d767feb..4e194cb 100644 --- a/desktop/Ads.Desktop/MainWindow.axaml +++ b/desktop/Ads.Desktop/MainWindow.axaml @@ -125,7 +125,7 @@ - +