Sync desktop with public relay and add verified device connection management
This commit is contained in:
1 parent
87e888af69
commit
51c4f86918
17 files changed
+1289
-118
No files matched your search
@@ -1,54 +1,115 @@
|
||||
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="Ads.Desktop.MainWindow" Title="ADS · Android 设备工作台" Width="1180" Height="820" MinWidth="900" MinHeight="640" Background="#10151F">
|
||||
<Window.Styles>
|
||||
<Style Selector="TextBox"><Setter Property="Margin" Value="0,4,0,10"/></Style>
|
||||
<Style Selector="Button"><Setter Property="Padding" Value="16,10"/><Setter Property="Margin" Value="0,0,8,0"/></Style>
|
||||
<Style Selector="TextBlock.label"><Setter Property="Foreground" Value="#9CAFC7"/></Style>
|
||||
</Window.Styles>
|
||||
<Grid RowDefinitions="Auto,*,Auto" Margin="28">
|
||||
<Grid ColumnDefinitions="*,Auto" Margin="0,0,0,22">
|
||||
<StackPanel><TextBlock Text="ANDROID DEVICE STREAMING" Foreground="#66D9C0" FontSize="12" LetterSpacing="3"/><TextBlock Text="设备工作台" FontSize="30" FontWeight="Bold" Margin="0,8,0,4"/><TextBlock Text="远程连接 · 本地调试 · 手机控制" Classes="label"/></StackPanel>
|
||||
<StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center"><Button Content="刷新设备" Command="{Binding RefreshCommand}"/><Button Content="保存配置" Command="{Binding SaveCommand}"/></StackPanel>
|
||||
</Grid>
|
||||
<TabControl Grid.Row="1">
|
||||
<TabItem Header="设备与连接">
|
||||
<Grid ColumnDefinitions="2*,3*" Margin="0,16,0,0">
|
||||
<Border Background="#192230" CornerRadius="12" Padding="18" Margin="0,0,16,0">
|
||||
<Grid RowDefinitions="Auto,*,Auto"><TextBlock Text="在线设备" FontSize="18" FontWeight="SemiBold"/>
|
||||
<ListBox Grid.Row="1" ItemsSource="{Binding Devices}" SelectedItem="{Binding SelectedDevice}" Margin="0,16,0,12" Background="Transparent">
|
||||
<ListBox.ItemTemplate><DataTemplate><StackPanel Margin="6,10"><TextBlock Text="{Binding Id}" FontSize="17"/><TextBlock Text="{Binding Description}" Foreground="#9CAFC7" Margin="0,6,0,0"/></StackPanel></DataTemplate></ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
<TextBlock Grid.Row="2" Text="{Binding DeviceSummary}" Classes="label" TextWrapping="Wrap"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
<ScrollViewer Grid.Column="1"><StackPanel Spacing="12">
|
||||
<TextBlock Text="连接管理" FontSize="22" FontWeight="SemiBold"/>
|
||||
<TextBlock Text="{Binding Status}" Foreground="#66D9C0" FontSize="16" TextWrapping="Wrap"/>
|
||||
<TextBlock Text="{Binding ActiveEndpoint}" Classes="label"/>
|
||||
<StackPanel Orientation="Horizontal"><Button Content="连接所选设备" Command="{Binding ConnectCommand}"/><Button Content="断开连接" Command="{Binding DisconnectCommand}"/></StackPanel>
|
||||
<Border Background="#192230" CornerRadius="12" Padding="20" Margin="0,12,0,0"><StackPanel Spacing="12">
|
||||
<TextBlock Text="scrcpy 手机控制" FontSize="19" FontWeight="SemiBold"/>
|
||||
<TextBlock Text="连接成功并完成手机 USB 调试授权后,在独立窗口中显示与操作手机。" TextWrapping="Wrap" Classes="label"/>
|
||||
<Grid ColumnDefinitions="*,*"><StackPanel><TextBlock Text="最大分辨率"/><TextBox Text="{Binding MaxSize}"/></StackPanel><StackPanel Grid.Column="1" Margin="12,0,0,0"><TextBlock Text="最大帧率"/><TextBox Text="{Binding MaxFps}"/></StackPanel></Grid>
|
||||
<CheckBox Content="传输手机音频" IsChecked="{Binding Audio}"/>
|
||||
<CheckBox Content="只看画面(禁止控制输入)" IsChecked="{Binding ViewOnly}"/>
|
||||
<StackPanel Orientation="Horizontal"><Button Content="打开手机控制" Command="{Binding StartScrcpyCommand}"/><Button Content="停止投屏" Command="{Binding StopScrcpyCommand}"/></StackPanel>
|
||||
</StackPanel></Border>
|
||||
<TextBlock Text="提示:unauthorized 表示需要在手机上允许调试;设备被占用时需要先释放其他客户端的连接。" TextWrapping="Wrap" Classes="label"/>
|
||||
</StackPanel></ScrollViewer>
|
||||
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
x:Class="Ads.Desktop.MainWindow" Title="ADS · 公网设备工作台"
|
||||
Width="1240" Height="880" MinWidth="980" MinHeight="700" Background="#10151F">
|
||||
<Window.Styles>
|
||||
<Style Selector="TextBox"><Setter Property="Margin" Value="0,5,0,12"/></Style>
|
||||
<Style Selector="Button"><Setter Property="Padding" Value="15,10"/><Setter Property="Margin" Value="0,0,8,8"/></Style>
|
||||
<Style Selector="TextBlock.label"><Setter Property="Foreground" Value="#9CAFC7"/></Style>
|
||||
<Style Selector="TextBlock.section"><Setter Property="FontSize" Value="18"/><Setter Property="FontWeight" Value="SemiBold"/></Style>
|
||||
<Style Selector="Border.card"><Setter Property="Background" Value="#192230"/><Setter Property="CornerRadius" Value="12"/><Setter Property="Padding" Value="20"/></Style>
|
||||
</Window.Styles>
|
||||
<Grid RowDefinitions="Auto,*,Auto" Margin="26">
|
||||
<Grid ColumnDefinitions="*,Auto" Margin="0,0,0,20">
|
||||
<StackPanel Spacing="5">
|
||||
<TextBlock Text="ANDROID DEVICE STREAMING" Foreground="#66D9C0" FontSize="11" LetterSpacing="3"/>
|
||||
<TextBlock Text="公网设备工作台" FontSize="29" FontWeight="Bold"/>
|
||||
<TextBlock Text="连接远程手机,在本机调试与控制" Classes="label"/>
|
||||
</StackPanel>
|
||||
<StackPanel Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" Spacing="8">
|
||||
<TextBlock x:Name="RelayStatusText" Text="{Binding RelayStatus}" HorizontalAlignment="Right" Foreground="#66D9C0"/>
|
||||
<StackPanel Orientation="Horizontal"><Button x:Name="RefreshButton" Content="刷新设备" Command="{Binding RefreshCommand}"/><Button Content="保存配置" Command="{Binding SaveCommand}"/></StackPanel>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Header="连接配置"><ScrollViewer><StackPanel Margin="4,18" MaxWidth="780" HorizontalAlignment="Stretch">
|
||||
<TextBlock Text="中继服务器(WSS)"/><TextBox Text="{Binding Server}" Watermark="wss://ads.ttstd.com"/>
|
||||
<TextBlock Text="客户端令牌(仅当前进程使用,不写入配置)"/><TextBox Text="{Binding Token}" PasswordChar="●"/>
|
||||
<TextBlock Text="ads-client 可执行文件"/><TextBox Text="{Binding ClientPath}"/>
|
||||
<TextBlock Text="ADB 可执行文件"/><TextBox Text="{Binding AdbPath}"/>
|
||||
<TextBlock Text="scrcpy 可执行文件(选择官方发行包中的程序)"/><TextBox Text="{Binding ScrcpyPath}"/>
|
||||
<TextBlock Text="本地 ADB 隧道端口"/><TextBox Text="{Binding Port}"/>
|
||||
<CheckBox Content="关闭窗口时保留连接并最小化到托盘" IsChecked="{Binding MinimizeToTray}" Margin="0,12"/>
|
||||
<TextBlock Text="配置修改在下一次连接时生效。令牌也可通过 ADS_CLIENT_TOKEN 环境变量提供。" TextWrapping="Wrap" Classes="label"/>
|
||||
</StackPanel></ScrollViewer></TabItem>
|
||||
<TabItem Header="运行日志"><Grid RowDefinitions="Auto,*" Margin="0,16,0,0"><StackPanel Orientation="Horizontal"><Button Content="清空日志" Command="{Binding ClearLogsCommand}"/><Button Content="导出日志" Command="{Binding ExportLogsCommand}"/></StackPanel><ListBox Grid.Row="1" ItemsSource="{Binding Logs}" Margin="0,12,0,0" FontFamily="Cascadia Mono,Consolas" FontSize="12"><ListBox.ItemTemplate><DataTemplate><TextBlock Text="{Binding}" TextWrapping="Wrap"/></DataTemplate></ListBox.ItemTemplate></ListBox></Grid></TabItem>
|
||||
</TabControl>
|
||||
<TextBlock Grid.Row="2" Text="{Binding Notice}" Foreground="#A8B7CC" Margin="0,18,0,0" TextWrapping="Wrap"/>
|
||||
</Grid>
|
||||
<TabControl x:Name="MainTabs" Grid.Row="1">
|
||||
<TabItem Header="设备与连接">
|
||||
<Grid ColumnDefinitions="320,*" Margin="0,16,0,0">
|
||||
<Border Classes="card" Margin="0,0,16,0">
|
||||
<Grid RowDefinitions="Auto,*,Auto,Auto">
|
||||
<TextBlock Text="在线设备" Classes="section"/>
|
||||
<ListBox x:Name="DeviceList" Grid.Row="1" ItemsSource="{Binding Devices}" SelectedItem="{Binding SelectedDevice}" Margin="0,14,0,12" Background="Transparent">
|
||||
<ListBox.ItemTemplate><DataTemplate><StackPanel Margin="5,10" Spacing="6"><TextBlock Text="{Binding Id}" FontSize="17" TextWrapping="Wrap"/><TextBlock Text="{Binding Description}" Classes="label" TextWrapping="Wrap"/></StackPanel></DataTemplate></ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
<TextBlock Grid.Row="2" Text="{Binding DeviceSummary}" Classes="label" TextWrapping="Wrap"/>
|
||||
<CheckBox Grid.Row="3" Content="自动刷新设备列表" IsChecked="{Binding AutoRefresh}" Margin="0,12,0,0"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
<ScrollViewer Grid.Column="1">
|
||||
<StackPanel Spacing="14">
|
||||
<Border Classes="card">
|
||||
<StackPanel Spacing="12">
|
||||
<TextBlock Text="连接管理" Classes="section"/>
|
||||
<TextBlock x:Name="ConnectionStatusText" Text="{Binding Status}" Foreground="#66D9C0" FontSize="19" TextWrapping="Wrap"/>
|
||||
<TextBlock x:Name="EndpointText" Text="{Binding ActiveEndpoint}" Classes="label" TextWrapping="Wrap"/>
|
||||
<WrapPanel><Button x:Name="ConnectButton" Content="连接所选设备" Command="{Binding ConnectCommand}"/><Button x:Name="ReconnectButton" Content="重新连接" Command="{Binding ReconnectCommand}"/><Button x:Name="DisconnectButton" Content="断开连接" Command="{Binding DisconnectCommand}"/><Button Content="复制 ADB 地址" IsEnabled="{Binding HasConnection}" Click="CopyEndpointClick"/></WrapPanel>
|
||||
<TextBlock Text="断开连接只释放本机通道,远程手机守护程序会继续在线。" TextWrapping="Wrap" Classes="label" FontSize="12"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Classes="card">
|
||||
<StackPanel Spacing="12">
|
||||
<Grid ColumnDefinitions="*,Auto"><TextBlock Text="设备信息" Classes="section"/><Button Grid.Column="1" Content="更新信息" Command="{Binding ReadDeviceInfoCommand}" Padding="12,6" Margin="0"/></Grid>
|
||||
<Grid ColumnDefinitions="2*,*,*">
|
||||
<StackPanel Spacing="5"><TextBlock Text="型号" Classes="label"/><TextBlock x:Name="ModelText" Text="{Binding Model}" FontSize="16" TextWrapping="Wrap"/></StackPanel>
|
||||
<StackPanel Grid.Column="1" Spacing="5" Margin="12,0"><TextBlock Text="Android" Classes="label"/><TextBlock Text="{Binding AndroidVersion}" FontSize="16"/></StackPanel>
|
||||
<StackPanel Grid.Column="2" Spacing="5"><TextBlock Text="API 等级" Classes="label"/><TextBlock Text="{Binding ApiLevel}" FontSize="16"/></StackPanel>
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Classes="card">
|
||||
<StackPanel Spacing="10">
|
||||
<TextBlock Text="手机画面与控制" Classes="section"/>
|
||||
<TextBlock Text="设备就绪后打开独立控制窗口,可使用鼠标和键盘。" TextWrapping="Wrap" Classes="label"/>
|
||||
<Grid ColumnDefinitions="*,*">
|
||||
<StackPanel><TextBlock Text="最大分辨率" Classes="label"/><NumericUpDown Value="{Binding MaxSize}" Minimum="256" Maximum="8192" Increment="128" Margin="0,6,8,4"/></StackPanel>
|
||||
<StackPanel Grid.Column="1"><TextBlock Text="最大帧率" Classes="label"/><NumericUpDown Value="{Binding MaxFps}" Minimum="1" Maximum="240" Increment="10" Margin="8,6,0,4"/></StackPanel>
|
||||
</Grid>
|
||||
<WrapPanel><CheckBox Content="传输音频" IsChecked="{Binding Audio}" Margin="0,0,24,0"/><CheckBox Content="只看画面" IsChecked="{Binding ViewOnly}"/></WrapPanel>
|
||||
<WrapPanel><Button x:Name="StartScreenButton" Content="打开手机控制" Command="{Binding StartScrcpyCommand}"/><Button Content="停止投屏" Command="{Binding StopScrcpyCommand}"/></WrapPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Header="连接配置">
|
||||
<ScrollViewer>
|
||||
<StackPanel Margin="4,18" MaxWidth="880" Spacing="16">
|
||||
<Border Classes="card"><StackPanel>
|
||||
<TextBlock Text="公网中继" Classes="section" Margin="0,0,0,12"/>
|
||||
<TextBlock Text="中继地址(WSS,可包含路径)"/><TextBox x:Name="ServerBox" Text="{Binding Server}" Watermark="wss://ttstd.com/ads"/>
|
||||
<TextBlock Text="直连服务器(可选)"/><TextBox x:Name="OriginBox" Text="{Binding Origin}" Watermark="175.178.213.60:443"/>
|
||||
<TextBlock Text="留空则按域名解析;指定公网 IP 时仍验证域名证书。当前部署使用此设置避开 Cloudflare 连接超时。" Classes="label" TextWrapping="Wrap"/>
|
||||
</StackPanel></Border>
|
||||
<Border Classes="card"><StackPanel Spacing="6">
|
||||
<TextBlock Text="客户端凭据" Classes="section" Margin="0,0,0,6"/>
|
||||
<TextBlock x:Name="CredentialSourceText" Text="{Binding CredentialSource}" Classes="label" TextWrapping="Wrap"/>
|
||||
<TextBox Text="{Binding Token}" PasswordChar="●" Watermark="ADS_CLIENT_TOKEN"/>
|
||||
<WrapPanel><Button Content="导入 client.env" Click="ImportCredentialsClick"/><Button Content="刷新设备" Command="{Binding RefreshCommand}"/></WrapPanel>
|
||||
<TextBlock Text="凭据自动从项目的 config/private/client.env 或环境变量读取。保存配置不保存令牌内容;不要使用 agent.env。" Classes="label" TextWrapping="Wrap"/>
|
||||
</StackPanel></Border>
|
||||
<Border Classes="card"><StackPanel>
|
||||
<Grid ColumnDefinitions="*,Auto"><TextBlock Text="本机工具" Classes="section"/><Button Grid.Column="1" Content="检查工具" Command="{Binding CheckToolsCommand}" Padding="12,6" Margin="0,0,0,10"/></Grid>
|
||||
<TextBlock Text="ads-client 可执行文件"/><Grid ColumnDefinitions="*,Auto"><TextBox Text="{Binding ClientPath}"/><Button Grid.Column="1" Content="选择" Tag="client" Click="ChooseToolClick" Margin="10,5,0,12"/></Grid>
|
||||
<TextBlock Text="ADB 可执行文件"/><Grid ColumnDefinitions="*,Auto"><TextBox Text="{Binding AdbPath}"/><Button Grid.Column="1" Content="选择" Tag="adb" Click="ChooseToolClick" Margin="10,5,0,12"/></Grid>
|
||||
<TextBlock Text="scrcpy 可执行文件"/><Grid ColumnDefinitions="*,Auto"><TextBox Text="{Binding ScrcpyPath}"/><Button Grid.Column="1" Content="选择" Tag="scrcpy" Click="ChooseToolClick" Margin="10,5,0,12"/></Grid>
|
||||
<TextBlock Text="{Binding ToolsStatus}" Classes="label" TextWrapping="Wrap"/>
|
||||
</StackPanel></Border>
|
||||
<Border Classes="card"><StackPanel Spacing="12">
|
||||
<TextBlock Text="本地连接" Classes="section"/>
|
||||
<Grid ColumnDefinitions="*,180"><TextBlock Text="本地 ADB 端口" VerticalAlignment="Center"/><NumericUpDown Grid.Column="1" Value="{Binding Port}" Minimum="1024" Maximum="65535"/></Grid>
|
||||
<CheckBox Content="关闭窗口时保留连接并最小化到托盘" IsChecked="{Binding MinimizeToTray}"/>
|
||||
<TextBlock Text="配置修改在下一次连接生效。完全退出工作台会停止本机连接;远程守护程序继续运行。" TextWrapping="Wrap" Classes="label"/>
|
||||
<Button Content="保存配置" Command="{Binding SaveCommand}" HorizontalAlignment="Left"/>
|
||||
</StackPanel></Border>
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
</TabItem>
|
||||
<TabItem Header="运行日志">
|
||||
<Grid RowDefinitions="Auto,*" Margin="0,16,0,0">
|
||||
<StackPanel Orientation="Horizontal"><Button Content="清空日志" Command="{Binding ClearLogsCommand}"/><Button Content="导出日志" Command="{Binding ExportLogsCommand}"/></StackPanel>
|
||||
<ListBox Grid.Row="1" ItemsSource="{Binding Logs}" Margin="0,8,0,0" FontFamily="Cascadia Mono,Consolas" FontSize="12"><ListBox.ItemTemplate><DataTemplate><TextBlock Text="{Binding}" TextWrapping="Wrap"/></DataTemplate></ListBox.ItemTemplate></ListBox>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<TextBlock Grid.Row="2" x:Name="NoticeText" Text="{Binding Notice}" Foreground="#A8B7CC" Margin="0,18,0,0" TextWrapping="Wrap" MaxHeight="70"/>
|
||||
</Grid>
|
||||
</Window>
|
||||
Reference in new issue
Block a user