diff --git a/Cargo.lock b/Cargo.lock index 52b8541..e5d1476 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 4 [[package]] name = "ads-agent" -version = "0.2.2" +version = "0.2.3" dependencies = [ "ads-core", "ads-management", @@ -21,7 +21,7 @@ dependencies = [ [[package]] name = "ads-client" -version = "0.2.2" +version = "0.2.3" dependencies = [ "ads-core", "anyhow", @@ -32,7 +32,7 @@ dependencies = [ [[package]] name = "ads-core" -version = "0.2.2" +version = "0.2.3" dependencies = [ "anyhow", "bytes", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "ads-management" -version = "0.2.2" +version = "0.2.3" dependencies = [ "ads-core", "anyhow", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "ads-usb" -version = "0.2.2" +version = "0.2.3" dependencies = [ "anyhow", "clap", @@ -78,7 +78,7 @@ dependencies = [ [[package]] name = "adsctl" -version = "0.2.2" +version = "0.2.3" dependencies = [ "ads-core", "ads-management", diff --git a/Cargo.toml b/Cargo.toml index 8ac89f0..6a45b5b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["crates/ads-core", "agent", "client", "usb", "crates/ads-management", resolver = "2" [workspace.package] -version = "0.2.2" +version = "0.2.3" edition = "2021" license = "MIT" diff --git a/desktop/Ads.Desktop.Smoke/Program.cs b/desktop/Ads.Desktop.Smoke/Program.cs index 612bc8c..279fcd6 100644 --- a/desktop/Ads.Desktop.Smoke/Program.cs +++ b/desktop/Ads.Desktop.Smoke/Program.cs @@ -19,12 +19,24 @@ internal static class Program Thread.Sleep(Timeout.Infinite); return 0; } + if (args.Contains("--encoding-child")) + { + var bytes=System.Text.Encoding.UTF8.GetBytes("连接已建立:中文日志 ✓ 📱\n"); + Console.OpenStandardOutput().Write(bytes);Console.OpenStandardError().Write(bytes); + return 0; + } + if (args.Contains("--encoding-input")) + { + using var reader=new StreamReader(Console.OpenStandardInput(),System.Text.Encoding.UTF8); + var bytes=System.Text.Encoding.UTF8.GetBytes(reader.ReadToEnd());Console.OpenStandardOutput().Write(bytes); + return 0; + } AppBuilder.Configure().UseSkia().UseHeadless(new AvaloniaHeadlessPlatformOptions { UseHeadlessDrawing = false }).SetupWithoutStarting(); using var finished = new CancellationTokenSource(); Exception? failure = null; Dispatcher.UIThread.Post(async () => { - try { if (args.Contains("--agents")) await RunAgentsAsync(args.Contains("--local-agent")); else if (args.Contains("--multi")) await RunMultiAsync(args.Contains("--usb")); else await RunAsync(args.Contains("--live"), args.Contains("--screen"), args.Contains("--usb")); } + try { if(args.Contains("--theme-preview")) await PreviewThemeAsync(); else if (args.Contains("--agents")) await RunAgentsAsync(args.Contains("--local-agent")); else if (args.Contains("--multi")) await RunMultiAsync(args.Contains("--usb")); else await RunAsync(args.Contains("--live"), args.Contains("--screen"), args.Contains("--usb")); } catch (Exception error) { failure = error; } finally { finished.Cancel(); } }); @@ -33,6 +45,38 @@ internal static class Program return 0; } + private static async Task PreviewThemeAsync() + { + var root=DesktopPaths.ProjectRoot()!; + using var vm=new MainViewModel(Path.Combine(root,"work","semi-preview"),backgroundMonitoring:false,loadLocalCredentials:false); + vm.AutoRefresh=false;vm.AgentManager.AutoRefresh=false; + vm.Devices.Add(new DeviceItem("home-phone",false,false,ComputerName:"家里的 Windows",AgentId:"home-pc")); + vm.Devices.Add(new DeviceItem("pixel-test",false,false,ComputerName:"Ubuntu 实验室",AgentId:"ubuntu-224")); + vm.Devices.Add(new DeviceItem("android-phone",true,false,ComputerName:"办公电脑",AgentId:"office-pc")); + vm.Logs.Add("13:20:10 已连接设备 · 中文日志正常显示 ✓ 📱"); + vm.Logs.Add("13:20:11 设备离线,等待自动重连。拒绝访问,请检查权限。"); + vm.AgentManager.RemoteLogText="[INFO] 设备发现完成:3 台手机。\n[INFO] 连接已建立:中文日志正常。"; + var window=new MainWindow {DataContext=vm};window.Show(); + try { + var tabs=window.FindControl("MainTabs")!; + foreach(var dark in new[]{false,true}) { + var theme=dark?"dark":"light"; + window.FindControl("ThemeSwitch")!.IsChecked=dark; + Require(Application.Current!.RequestedThemeVariant==(dark?Avalonia.Styling.ThemeVariant.Dark:Avalonia.Styling.ThemeVariant.Light),"Theme switch did not update the application"); + for(var page=0;page<4;page++) { + tabs.SelectedIndex=page;window.Width=1240;window.Height=880; + await Task.Delay(220); + using var frame=window.CaptureRenderedFrame(); + Require(frame!=null,"Semi frame was not rendered"); + frame!.Save(Path.Combine(root,"work",$"semi-{theme}-{page}.png")); + } + tabs.SelectedIndex=0;window.Width=980;window.Height=700;await Task.Delay(220); + using var compact=window.CaptureRenderedFrame();compact!.Save(Path.Combine(root,"work",$"semi-{theme}-compact.png")); + } + Console.WriteLine("PASS: Semi light/dark pages and 980x700 compact layout rendered"); + } finally { await vm.ShutdownAsync();window.Close(); } + } + private static void Require(bool condition, string message) { if (!condition) throw new InvalidOperationException(message); diff --git a/desktop/Ads.Desktop.Tests/ProcessEncodingTests.cs b/desktop/Ads.Desktop.Tests/ProcessEncodingTests.cs new file mode 100644 index 0000000..4fab5de --- /dev/null +++ b/desktop/Ads.Desktop.Tests/ProcessEncodingTests.cs @@ -0,0 +1,36 @@ +using System.Text; +using System.Diagnostics; +using Ads.Desktop; +using Xunit; +namespace Ads.Desktop.Tests; +public class ProcessEncodingTests { + const string Text="连接已建立:中文日志 ✓ 📱"; + static ProcessStartInfo Child(string argument) { + var configuration=new DirectoryInfo(AppContext.BaseDirectory).Parent!.Name; + var file=Path.Combine(DesktopPaths.ProjectRoot()!,"desktop","Ads.Desktop.Smoke","bin",configuration,"net8.0","Ads.Desktop.Smoke.dll"); + return ProcessTools.CreateStartInfo("dotnet",[file,argument]); + } + [Fact] public async Task CapturedUnicodeOutputAndErrorsAreUtf8() { + var info=Child("--encoding-child"); + Assert.Equal(65001,info.StandardOutputEncoding!.CodePage);Assert.Equal(65001,info.StandardErrorEncoding!.CodePage); + var result=await ProcessTools.RunAsync(info); + Assert.Equal(0,result.ExitCode);Assert.Equal(Text,result.Output.Trim());Assert.Equal(Text,result.Error.Trim()); + } + [Fact] public async Task StreamingUnicodeLogsAreUtf8() { + using var process=new Process {StartInfo=Child("--encoding-child")}; + var output=new TaskCompletionSource();var error=new TaskCompletionSource(); + process.OutputDataReceived+=(_,e)=>{if(e.Data!=null)output.TrySetResult(e.Data);}; + process.ErrorDataReceived+=(_,e)=>{if(e.Data!=null)error.TrySetResult(e.Data);}; + process.Start();process.BeginOutputReadLine();process.BeginErrorReadLine(); + await process.WaitForExitAsync().WaitAsync(TimeSpan.FromSeconds(10)); + Assert.Equal(Text,await output.Task.WaitAsync(TimeSpan.FromSeconds(3)));Assert.Equal(Text,await error.Task.WaitAsync(TimeSpan.FromSeconds(3))); + } + [Fact] public async Task AgentJsonInputRetainsChinese() { + var info=Child("--encoding-input");info.RedirectStandardInput=true;info.StandardInputEncoding=new UTF8Encoding(false); + using var process=Process.Start(info)!; + await process.StandardInput.WriteAsync("{\"name\":\"家里的电脑\"}");process.StandardInput.Close(); + var output=process.StandardOutput.ReadToEndAsync(); + await process.WaitForExitAsync().WaitAsync(TimeSpan.FromSeconds(10)); + Assert.Equal("{\"name\":\"家里的电脑\"}",await output); + } +} diff --git a/desktop/Ads.Desktop/Ads.Desktop.csproj b/desktop/Ads.Desktop/Ads.Desktop.csproj index 187e9a5..b5c42cf 100644 --- a/desktop/Ads.Desktop/Ads.Desktop.csproj +++ b/desktop/Ads.Desktop/Ads.Desktop.csproj @@ -1,4 +1,4 @@ - 0.2.2WinExenet8.0enableenable - + 0.2.3WinExenet8.0enableenable + diff --git a/desktop/Ads.Desktop/AgentManagementView.axaml b/desktop/Ads.Desktop/AgentManagementView.axaml index 0492b1e..9ba0258 100644 --- a/desktop/Ads.Desktop/AgentManagementView.axaml +++ b/desktop/Ads.Desktop/AgentManagementView.axaml @@ -1,9 +1,4 @@ - - - - -