完成主线程调用

dotnet-campus · Dec 19, 2023 · 2fc43a8 · 2fc43a8
1 parent 718de52
commit 2fc43a8
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/src/UnoFileDownloader/UnoFileDownloader/UnoFileDownloader/App.cs b/src/UnoFileDownloader/UnoFileDownloader/UnoFileDownloader/App.cs
@@ -1,3 +1,7 @@
+using Microsoft.Extensions.DependencyInjection;
+
+using UnoFileDownloader.Utils;
+
 namespace UnoFileDownloader
 {
     public class App : Application
@@ -68,6 +72,10 @@ protected async override void OnLaunched(LaunchActivatedEventArgs args)
                     {
                         // TODO: Register your services
                         //services.AddSingleton<IMyService, MyService>();
+                        services.AddSingleton<IDispatcherQueueProvider>(c =>
+                        {
+                            return new DispatcherQueueProvider(MainWindow!.DispatcherQueue);
+                        });
                     })
                     .UseNavigation(ReactiveViewModelMappings.ViewModelMappings, RegisterRoutes)
                 );

diff --git a/src/UnoFileDownloader/UnoFileDownloader/UnoFileDownloader/Presentation/AboutModel.cs b/src/UnoFileDownloader/UnoFileDownloader/UnoFileDownloader/Presentation/AboutModel.cs
@@ -6,9 +6,11 @@
 
 using Microsoft.UI.Dispatching;
 
+using UnoFileDownloader.Utils;
+
 namespace UnoFileDownloader.Presentation
 {
-    public partial record AboutModel(INavigator Navigator)
+    public partial record AboutModel(INavigator Navigator, IDispatcherQueueProvider DispatcherQueueProvider)
     {
         public void CloseAbout()
         {
@@ -17,12 +19,12 @@ public void CloseAbout()
 
         public void GotoGitHub()
         {
-           var d = Dispatcher;
-
-            _ = Windows.System.Launcher.LaunchUriAsync(new Uri("https://github.com/dotnet-campus/dotnetCampus.FileDownloader"));
+            Dispatcher.TryEnqueue(() =>
+            {
+                _ = Windows.System.Launcher.LaunchUriAsync(new Uri("https://github.com/dotnet-campus/dotnetCampus.FileDownloader"));
+            });
         }
 
-        // 这是没有用的，返回的是空
-        protected DispatcherQueue Dispatcher { get; } = DispatcherQueue.GetForCurrentThread();
+        protected DispatcherQueue Dispatcher { get; } = DispatcherQueueProvider.Dispatcher;
     }
 }
diff --git a/src/UnoFileDownloader/UnoFileDownloader/UnoFileDownloader/Utils/DispatcherQueueProvider.cs b/src/UnoFileDownloader/UnoFileDownloader/UnoFileDownloader/Utils/DispatcherQueueProvider.cs
@@ -0,0 +1,13 @@
+using Microsoft.UI.Dispatching;
+
+namespace UnoFileDownloader.Utils
+{
+    public record DispatcherQueueProvider(DispatcherQueue Dispatcher) : IDispatcherQueueProvider
+    {
+    }
+
+    public interface IDispatcherQueueProvider
+    {
+        Microsoft.UI.Dispatching.DispatcherQueue Dispatcher { get; }
+    }
+}