增加SubscribeOnMainThread避免订阅更新线程时出现问题

aiqinxuancai · Sep 3, 2024 · 07c3232 · 07c3232
1 parent b7f4adb
commit 07c3232
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 42 deletions.
diff --git a/Aria2Fast/MainWindow.xaml.cs b/Aria2Fast/MainWindow.xaml.cs
@@ -105,29 +105,24 @@ private void MetroWindow_Loaded(object sender, RoutedEventArgs e)
 
             Aria2ApiManager.Instance.EventReceived
                 .OfType<LoginStartEvent>()
-                .Subscribe(async r =>
+                .SubscribeOnMainThread(async r =>
                 {
-                    Application.Current.Dispatcher.Invoke(new Action(() => {
-                        UpdateConnectionStatus(LinkStatus.Linking);
-                    }));
-
+                    UpdateConnectionStatus(LinkStatus.Linking);
                 });
 
 
             Aria2ApiManager.Instance.EventReceived
                 .OfType<LoginResultEvent>()
-                .Subscribe(async r =>
+                .SubscribeOnMainThread(async r =>
                 {
-                    Application.Current.Dispatcher.Invoke(new Action(() => {
-                        if (r.IsSuccess)
-                        {
-                            UpdateConnectionStatus(LinkStatus.Success);
-                        }
-                        else
-                        {
-                            UpdateConnectionStatus(LinkStatus.Error);
-                        }
-                    }));
+                    if (r.IsSuccess)
+                    {
+                        UpdateConnectionStatus(LinkStatus.Success);
+                    }
+                    else
+                    {
+                        UpdateConnectionStatus(LinkStatus.Error);
+                    }
 
                 });
 

diff --git a/Aria2Fast/Service/SubscriptionManager.cs b/Aria2Fast/Service/SubscriptionManager.cs
@@ -21,6 +21,7 @@
 using MemoryPack;
 using System.Reactive.Linq;
 using System.Windows;
+using System.Windows.Threading;
 
 namespace Aria2Fast.Service
 {
@@ -63,11 +64,10 @@ public SubscriptionManager()
 
             Aria2ApiManager.Instance.EventReceived
                 .OfType<LoginResultEvent>()
-                .Subscribe(async r =>
+                .SubscribeOnMainThread(async r =>
                 {
-                    //成功不成功都重载
-                    Application.Current.Dispatcher.Invoke(() => { Restart(); });
-
+                    Restart();
+
                 });
         }
 

diff --git a/Aria2Fast/Utils/ObservableExtensions.cs b/Aria2Fast/Utils/ObservableExtensions.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Reactive.Linq;
+using System.Windows;
+using System.Windows.Threading;
+
+public static class ObservableExtensions
+{
+    public static IDisposable SubscribeOnMainThread<T>(
+        this IObservable<T> source,
+        Action<T> onNext)
+    {
+        return source.Subscribe(item =>
+        {
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                onNext(item);
+            });
+        });
+    }
+}
diff --git a/Aria2Fast/View/WkySubscriptionListView.xaml.cs b/Aria2Fast/View/WkySubscriptionListView.xaml.cs
@@ -45,18 +45,16 @@ public WkySubscriptionListView(ObservableCollection<SubscriptionModel> viewModel
 
             Aria2ApiManager.Instance.EventReceived
                 .OfType<LoginResultEvent>()
-                .Subscribe(async r =>
+                .SubscribeOnMainThread(async r =>
                 {
-                    Application.Current.Dispatcher.Invoke(new Action(() => {
-                        if (r.IsSuccess)
-                        {
-                            this.SubscriptionButton.IsEnabled = true;
-                        }
-                        else
-                        {
-                            this.SubscriptionButton.IsEnabled = false;
-                        }
-                    }));
+                    if (r.IsSuccess)
+                    {
+                        this.SubscriptionButton.IsEnabled = true;
+                    }
+                    else
+                    {
+                        this.SubscriptionButton.IsEnabled = false;
+                    }
 
                 });
         }

diff --git a/Aria2Fast/View/WkyTaskListView.xaml.cs b/Aria2Fast/View/WkyTaskListView.xaml.cs
@@ -44,18 +44,16 @@ public WkyTaskListView(ObservableCollection<TaskModel> viewModel)
 
             Aria2ApiManager.Instance.EventReceived
                 .OfType<LoginResultEvent>()
-                .Subscribe(async r =>
+                .SubscribeOnMainThread(async r =>
                 {
-                    Application.Current.Dispatcher.Invoke(new Action(() => {
-                        if (r.IsSuccess)
-                        {
-                            this.AddTaskButton.IsEnabled = true;
-                        }
-                        else
-                        {
-                            this.AddTaskButton.IsEnabled = false;
-                        }
-                    }));
+                    if (r.IsSuccess)
+                    {
+                        this.AddTaskButton.IsEnabled = true;
+                    }
+                    else
+                    {
+                        this.AddTaskButton.IsEnabled = false;
+                    }
 
                 });