Fix | AppLoaded

Author: kitUIN

ShadowViewer/MainWindow.xaml.cs

@@ -72,6 +72,7 @@ private async void Content_Loaded(object sender, RoutedEventArgs e)
         LoadingGrid.Visibility = Visibility.Collapsed;
         var navigateService = DiFactory.Services.Resolve<INavigateService>();
         if (firstUri != null) navigateService.Navigate(firstUri);
+        caller.AppLoaded();
     }
 
     /// <summary>
@@ -99,9 +100,11 @@ private async Task OnLoading()
         // var currentCulture = CultureInfo.CurrentUICulture;
         try
         {
-            pluginServices.Scan<LocalPlugin>();
-            pluginServices.Scan<PluginManagerPlugin>();
-            await pluginServices.Load();
+            await pluginServices.CheckUpgradeAndRemoveAsync();
+            await pluginServices
+                .Scan<LocalPlugin>()
+                .Scan<PluginManagerPlugin>()
+                .Load();
             if (PluginManagerPlugin.Settings.PluginSecurityStatement)
             {
                 pluginServices.Scan(new DirectoryInfo(CoreSettings.Instance.PluginsPath));

ShadowViewer/Services/CallableService.cs

@@ -14,6 +14,9 @@ namespace ShadowViewer.Services;
 /// </summary>
 internal partial class CallableService(ILogger logger) : ICallableService
 {
+    /// <summary>
+    /// Logger
+    /// </summary>
     private ILogger Logger { get; } = logger;
 
     /// <summary>
@@ -24,6 +27,9 @@ internal partial class CallableService(ILogger logger) : ICallableService
     /// <inheritdoc />
     public event EventHandler<TopLevelControlEventArgs>? TopLevelControlEvent;
 
+    /// <inheritdoc />
+    public event EventHandler? AppLoadedEvent;
+
     /// <inheritdoc />
     public event EventHandler? ThemeChangedEvent;
 
@@ -51,6 +57,15 @@ public void ThemeChanged()
         Logger.Debug("触发事件{EventName}", nameof(ThemeChangedEvent));
     }
 
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    public void AppLoaded()
+    {
+        AppLoadedEvent?.Invoke(this, EventArgs.Empty);
+        Logger.Debug("触发事件{EventName}", nameof(AppLoadedEvent));
+    }
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>