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,22 +41,13 @@ 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)
                 {
-                        foreach (var item in DownloadedList)
+                    SetDialogService();
-                        {
-                            if (item != null && item.DialogService == null)
-                            {
-                                item.DialogService = dialogService;
-                            }
-                        }
                 }
             });
-            });
             SetDialogService();
 
             DownloadFinishedSort finishedSort = SettingsManager.GetInstance().GetDownloadFinishedSort();
@@ -143,6 +135,8 @@ namespace DownKyi.ViewModels.DownloadManager
         #endregion
 
         private async void SetDialogService()
+        {
+            try
             {
                 await Task.Run(() =>
                 {
@@ -155,6 +149,12 @@ namespace DownKyi.ViewModels.DownloadManager
                     }
                 });
             }
+            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,22 +35,13 @@ 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)
                 {
-                        foreach (var item in DownloadingList)
+                    SetDialogService();
-                        {
-                            if (item != null && item.DialogService == null)
-                            {
-                                item.DialogService = dialogService;
-                            }
-                        }
                 }
             });
-            });
             SetDialogService();
 
         }
@@ -181,6 +173,8 @@ namespace DownKyi.ViewModels.DownloadManager
         #endregion
 
         private async void SetDialogService()
+        {
+            try
             {
                 await Task.Run(() =>
                 {
@@ -193,6 +187,12 @@ namespace DownKyi.ViewModels.DownloadManager
                     }
                 });
             }
+            catch (Exception e)
+            {
+                Core.Utils.Debugging.Console.PrintLine("SetDialogService()发生异常: {0}", e);
+                LogManager.Error($"{Tag}.SetDialogService()", e);
+            }
+        }
 
         public override void OnNavigatedFrom(NavigationContext navigationContext)
         {