From 661a6cc4772166bcee32f2b29e2dbe583dab755c Mon Sep 17 00:00:00 2001
From: leiurayer <1432593898@qq.com>
Date: Sat, 14 May 2022 22:28:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=88=97=E8=A1=A8=E7=9B=91?=
 =?UTF-8?q?=E5=90=AC=E4=BA=8B=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewDownloadFinishedViewModel.cs          | 40 +++++++++----------
 .../ViewDownloadingViewModel.cs               | 40 +++++++++----------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/DownKyi/ViewModels/DownloadManager/ViewDownloadFinishedViewModel.cs b/src/DownKyi/ViewModels/DownloadManager/ViewDownloadFinishedViewModel.cs
index 9a081c3..68d520c 100644
--- a/src/DownKyi/ViewModels/DownloadManager/ViewDownloadFinishedViewModel.cs
+++ b/src/DownKyi/ViewModels/DownloadManager/ViewDownloadFinishedViewModel.cs
@@ -1,4 +1,5 @@
-using DownKyi.Core.Settings;
+using DownKyi.Core.Logging;
+using DownKyi.Core.Settings;
 using DownKyi.Services;
 using DownKyi.Utils;
 using Prism.Commands;
@@ -40,21 +41,12 @@ namespace DownKyi.ViewModels.DownloadManager
         {
             // 初始化DownloadedList
             DownloadedList = App.DownloadedList;
-            DownloadedList.CollectionChanged += new NotifyCollectionChangedEventHandler(async (object sender, NotifyCollectionChangedEventArgs e) =>
+            DownloadedList.CollectionChanged += new NotifyCollectionChangedEventHandler((sender, e) =>
             {
-                await Task.Run(() =>
+                if (e.Action == NotifyCollectionChangedAction.Add)
                 {
-                    if (e.Action == NotifyCollectionChangedAction.Add)
-                    {
-                        foreach (var item in DownloadedList)
-                        {
-                            if (item != null && item.DialogService == null)
-                            {
-                                item.DialogService = dialogService;
-                            }
-                        }
-                    }
-                });
+                    SetDialogService();
+                }
             });
             SetDialogService();
 
@@ -144,16 +136,24 @@ namespace DownKyi.ViewModels.DownloadManager
 
         private async void SetDialogService()
         {
-            await Task.Run(() =>
+            try
             {
-                foreach (var item in DownloadedList)
+                await Task.Run(() =>
                 {
-                    if (item != null && item.DialogService == null)
+                    foreach (var item in DownloadedList)
                     {
-                        item.DialogService = dialogService;
+                        if (item != null && item.DialogService == null)
+                        {
+                            item.DialogService = dialogService;
+                        }
                     }
-                }
-            });
+                });
+            }
+            catch (Exception e)
+            {
+                Core.Utils.Debugging.Console.PrintLine("SetDialogService()发生异常: {0}", e);
+                LogManager.Error($"{Tag}.SetDialogService()", e);
+            }
         }
 
         public override void OnNavigatedFrom(NavigationContext navigationContext)
diff --git a/src/DownKyi/ViewModels/DownloadManager/ViewDownloadingViewModel.cs b/src/DownKyi/ViewModels/DownloadManager/ViewDownloadingViewModel.cs
index aade091..913f57c 100644
--- a/src/DownKyi/ViewModels/DownloadManager/ViewDownloadingViewModel.cs
+++ b/src/DownKyi/ViewModels/DownloadManager/ViewDownloadingViewModel.cs
@@ -1,4 +1,5 @@
-using DownKyi.Images;
+using DownKyi.Core.Logging;
+using DownKyi.Images;
 using DownKyi.Models;
 using DownKyi.Services;
 using DownKyi.Utils;
@@ -34,21 +35,12 @@ namespace DownKyi.ViewModels.DownloadManager
         {
             // 初始化DownloadingList
             DownloadingList = App.DownloadingList;
-            DownloadingList.CollectionChanged += new NotifyCollectionChangedEventHandler(async (object sender, NotifyCollectionChangedEventArgs e) =>
+            DownloadingList.CollectionChanged += new NotifyCollectionChangedEventHandler((sender, e) =>
             {
-                await Task.Run(() =>
+                if (e.Action == NotifyCollectionChangedAction.Add)
                 {
-                    if (e.Action == NotifyCollectionChangedAction.Add)
-                    {
-                        foreach (var item in DownloadingList)
-                        {
-                            if (item != null && item.DialogService == null)
-                            {
-                                item.DialogService = dialogService;
-                            }
-                        }
-                    }
-                });
+                    SetDialogService();
+                }
             });
             SetDialogService();
 
@@ -182,16 +174,24 @@ namespace DownKyi.ViewModels.DownloadManager
 
         private async void SetDialogService()
         {
-            await Task.Run(() =>
+            try
             {
-                foreach (var item in DownloadingList)
+                await Task.Run(() =>
                 {
-                    if (item != null && item.DialogService == null)
+                    foreach (var item in DownloadingList)
                     {
-                        item.DialogService = dialogService;
+                        if (item != null && item.DialogService == null)
+                        {
+                            item.DialogService = dialogService;
+                        }
                     }
-                }
-            });
+                });
+            }
+            catch (Exception e)
+            {
+                Core.Utils.Debugging.Console.PrintLine("SetDialogService()发生异常: {0}", e);
+                LogManager.Error($"{Tag}.SetDialogService()", e);
+            }
         }
 
         public override void OnNavigatedFrom(NavigationContext navigationContext)