Merge branch 'v1.5.x' into v1.5.x-feature-inner-downloader

DownKyi.Core/Aria2cNet/Server/AriaServer.cs

@@ -90,6 +90,7 @@ namespace DownKyi.Core.Aria2cNet.Server
 
                 ExcuteProcess("aria2c.exe",
                     $"--enable-rpc --rpc-listen-all=true --rpc-allow-origin-all=true " +
+                    $"--check-certificate=false " + // 解决问题 SSL/TLS handshake failure
                     $"--rpc-listen-port={config.ListenPort} " +
                     $"--rpc-secret={config.Token} " +
                     $"--input-file=\"{sessionFile}\" --save-session=\"{sessionFile}\" " +

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)
+                    SetDialogService();
-                    {
+                }
-                        foreach (var item in DownloadedList)
-                        {
-                            if (item != null && item.DialogService == null)
-                            {
-                                item.DialogService = dialogService;
-                            }
-                        }
-                    }
-                });
             });
             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)

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)
+                    SetDialogService();
-                    {
+                }
-                        foreach (var item in DownloadingList)
-                        {
-                            if (item != null && item.DialogService == null)
-                            {
-                                item.DialogService = dialogService;
-                            }
-                        }
-                    }
-                });
             });
             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)