0.5.11

插件市场UI优化

LanMountainDesktop/App.axaml

@@ -16,23 +16,6 @@
         <local:ViewLocator/>
     </Application.DataTemplates>
 
-    <TrayIcon.Icons>
-        <TrayIcons>
-            <TrayIcon Icon="/Assets/avalonia-logo.ico"
-                      ToolTipText="LanMountainDesktop">
-                <TrayIcon.Menu>
-                    <NativeMenu>
-                        <NativeMenuItem Header="设置" Click="OnTraySettingsClick" />
-                        <NativeMenuItemSeparator />
-                        <NativeMenuItem Header="重启应用" Click="OnTrayRestartClick" />
-                        <NativeMenuItemSeparator />
-                        <NativeMenuItem Header="退出应用" Click="OnTrayExitClick" />
-                    </NativeMenu>
-                </TrayIcon.Menu>
-            </TrayIcon>
-        </TrayIcons>
-    </TrayIcon.Icons>
-  
     <Application.Styles>
         <sty:FluentAvaloniaTheme />
         <mi:MaterialIconStyles />

LanMountainDesktop/App.axaml.cs

@@ -1,4 +1,5 @@
-using Avalonia;
+using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Data.Core;
 using Avalonia.Data.Core.Plugins;
@@ -6,6 +7,7 @@ using System;
 using System.Diagnostics;
 using System.Linq;
 using Avalonia.Markup.Xaml;
+using Avalonia.Platform;
 using Avalonia.Threading;
 using LanMountainDesktop.Services;
 using LanMountainDesktop.ViewModels;
@@ -16,7 +18,11 @@ namespace LanMountainDesktop;
 
 public partial class App : Application
 {
+    private readonly AppSettingsService _appSettingsService = new();
+    private readonly LocalizationService _localizationService = new();
+
     private SettingsWindow? _traySettingsWindow;
+    private TrayIcons? _trayIcons;
     private PluginRuntimeService? _pluginRuntimeService;
 
     public PluginRuntimeService? PluginRuntimeService => _pluginRuntimeService;
@@ -32,13 +38,20 @@ public partial class App : Application
     {
         LinuxDesktopEntryInstaller.EnsureInstalled();
         InitializePluginRuntime();
+        AppSettingsService.SettingsSaved += OnAppSettingsSaved;
+        InitializeTrayIcon();
 
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            // Avoid duplicate validations from both Avalonia and the CommunityToolkit. 
+            // Avoid duplicate validations from both Avalonia and the CommunityToolkit.
             // More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
             DisableAvaloniaDataAnnotationValidation();
             desktop.ShutdownMode = Avalonia.Controls.ShutdownMode.OnExplicitShutdown;
+            desktop.Exit += (_, _) =>
+            {
+                AppSettingsService.SettingsSaved -= OnAppSettingsSaved;
+                DisposeTrayIcon();
+            };
             desktop.MainWindow = new MainWindow
             {
                 DataContext = new MainWindowViewModel(),
@@ -50,6 +63,8 @@ public partial class App : Application
 
     private void OnTrayExitClick(object? sender, EventArgs e)
     {
+        DisposeTrayIcon();
+
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
             desktop.Shutdown();
@@ -99,6 +114,17 @@ public partial class App : Application
         AppRestartService.TryRestartApplication();
     }
 
+    private void OnAppSettingsSaved(string _)
+    {
+        Dispatcher.UIThread.Post(() =>
+        {
+            if (_trayIcons is not null)
+            {
+                InitializeTrayIcon();
+            }
+        }, DispatcherPriority.Background);
+    }
+
     private void DisableAvaloniaDataAnnotationValidation()
     {
         // Get an array of plugins to remove
@@ -152,4 +178,74 @@ public partial class App : Application
             Debug.WriteLine($"[PluginRuntime] Failed to initialize plugin runtime: {ex}");
         }
     }
+
+    private void InitializeTrayIcon()
+    {
+        try
+        {
+            DisposeTrayIcon();
+
+            using var iconStream = AssetLoader.Open(new Uri("avares://LanMountainDesktop/Assets/avalonia-logo.ico"));
+            var trayIcon = new TrayIcon
+            {
+                Icon = new WindowIcon(iconStream),
+                ToolTipText = L("tray.tooltip", "LanMountainDesktop"),
+                Menu = BuildTrayMenu(),
+                IsVisible = true
+            };
+
+            _trayIcons = [trayIcon];
+            TrayIcon.SetIcons(this, _trayIcons);
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"[TrayIcon] Failed to initialize tray icon: {ex}");
+        }
+    }
+
+    private NativeMenu BuildTrayMenu()
+    {
+        var menu = new NativeMenu();
+
+        var settingsItem = new NativeMenuItem(L("tray.menu.settings", "ÉèÖÃ"));
+        settingsItem.Click += OnTraySettingsClick;
+        menu.Items.Add(settingsItem);
+
+        menu.Items.Add(new NativeMenuItemSeparator());
+
+        var restartItem = new NativeMenuItem(L("tray.menu.restart", "ÖØÆôÓ¦ÓÃ"));
+        restartItem.Click += OnTrayRestartClick;
+        menu.Items.Add(restartItem);
+
+        menu.Items.Add(new NativeMenuItemSeparator());
+
+        var exitItem = new NativeMenuItem(L("tray.menu.exit", "Í˳öÓ¦ÓÃ"));
+        exitItem.Click += OnTrayExitClick;
+        menu.Items.Add(exitItem);
+
+        return menu;
+    }
+
+    private void DisposeTrayIcon()
+    {
+        if (_trayIcons is null)
+        {
+            return;
+        }
+
+        TrayIcon.SetIcons(this, null);
+        foreach (var trayIcon in _trayIcons)
+        {
+            trayIcon.Dispose();
+        }
+
+        _trayIcons = null;
+    }
+
+    private string L(string key, string fallback)
+    {
+        var snapshot = _appSettingsService.Load();
+        var languageCode = _localizationService.NormalizeLanguageCode(snapshot.LanguageCode);
+        return _localizationService.GetString(languageCode, key, fallback);
+    }
 }

LanMountainDesktop/Localization/en-US.json

@@ -1,5 +1,9 @@
 {
     "app.title":  "LanMountainDesktop",
+    "tray.tooltip":  "LanMountainDesktop",
+    "tray.menu.settings":  "Settings",
+    "tray.menu.restart":  "Restart App",
+    "tray.menu.exit":  "Exit App",
     "button.back_to_windows":  "Back to Windows",
     "tooltip.back_to_windows":  "Back to Windows",
     "tooltip.open_settings":  "Settings",
@@ -364,6 +368,15 @@
     "market.detail.min_host_version":  "Minimum Host Version",
     "market.detail.installed_version":  "Installed Version",
     "market.detail.not_installed":  "Not installed",
+    "market.detail.readme":  "README",
+    "market.detail.plugin_information":  "Plugin Information",
+    "market.detail.author_subtitle_format":  "By {0}",
+    "market.detail.package_size":  "Package Size",
+    "market.detail.published_at":  "Published At",
+    "market.detail.updated_at":  "Updated At",
+    "market.detail.tags":  "Tags",
+    "market.detail.project":  "Project",
+    "market.detail.state":  "Install State",
     "market.detail.market_source":  "Market Source",
     "market.detail.homepage":  "Homepage",
     "market.detail.repository":  "Repository",

LanMountainDesktop/Localization/zh-CN.json

@@ -1,5 +1,9 @@
 {
     "app.title":  "LanMountainDesktop",
+    "tray.tooltip":  "LanMountainDesktop",
+    "tray.menu.settings":  "设置",
+    "tray.menu.restart":  "重启应用",
+    "tray.menu.exit":  "退出应用",
     "button.back_to_windows":  "回到Windows",
     "tooltip.back_to_windows":  "回到Windows",
     "tooltip.open_settings":  "设置",
@@ -364,6 +368,15 @@
     "market.detail.min_host_version":  "最低宿主版本",
     "market.detail.installed_version":  "已安装版本",
     "market.detail.not_installed":  "未安装",
+    "market.detail.readme":  "README",
+    "market.detail.plugin_information":  "插件信息",
+    "market.detail.author_subtitle_format":  "作者：{0}",
+    "market.detail.package_size":  "包大小",
+    "market.detail.published_at":  "首次发布",
+    "market.detail.updated_at":  "最近更新",
+    "market.detail.tags":  "标签",
+    "market.detail.project":  "项目",
+    "market.detail.state":  "安装状态",
     "market.detail.market_source":  "市场源",
     "market.detail.homepage":  "主页",
     "market.detail.repository":  "仓库",

LanMountainDesktop/plugins/PluginMarketIconService.cs

@@ -0,0 +1,47 @@
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Media.Imaging;
+
+namespace LanMountainDesktop.Views.SettingsPages;
+
+internal sealed class AirAppMarketIconService : IDisposable
+{
+    private readonly HttpClient _httpClient;
+
+    public AirAppMarketIconService()
+    {
+        _httpClient = new HttpClient
+        {
+            Timeout = TimeSpan.FromSeconds(20)
+        };
+        _httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LanMountainDesktop-PluginMarketplace/1.0");
+    }
+
+    public async Task<Bitmap> LoadAsync(
+        AirAppMarketPluginEntry plugin,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(plugin);
+
+        if (AirAppMarketDefaults.TryResolveWorkspaceFile(plugin.IconUrl, out var localIconPath))
+        {
+            return new Bitmap(localIconPath);
+        }
+
+        using var response = await _httpClient.GetAsync(plugin.IconUrl, cancellationToken);
+        response.EnsureSuccessStatusCode();
+        await using var stream = await response.Content.ReadAsStreamAsync(cancellationToken);
+        using var memory = new MemoryStream();
+        await stream.CopyToAsync(memory, cancellationToken);
+        memory.Position = 0;
+        return new Bitmap(memory);
+    }
+
+    public void Dispose()
+    {
+        _httpClient.Dispose();
+    }
+}