2.12.8.0

2026-05-15 22:06:22 +08:00
parent 277c020186
commit 53fe8204cf
110 changed files with 30470 additions and 4729 deletions
@@ -55,7 +55,7 @@
 #End Region

        Catch ex As Exception
-            Log(ex, "下载管理左栏监视出错", NotifyLevel.MsgBoxAndFeedback)
+            Logger.Error(ex, "下载管理左栏监视出错")
        End Try
        If FrmSpeedRight Is Nothing OrElse FrmSpeedRight.PanMain Is Nothing Then Return
        Try
@@ -63,7 +63,7 @@
                TaskRefresh(Loader)
            Next
        Catch ex As Exception
-            Log(ex, "下载管理右栏监视出错", NotifyLevel.MsgBoxAndFeedback)
+            Logger.Error(ex, "下载管理右栏监视出错")
        End Try
    End Sub
    Public Sub TaskRefresh(Loader As LoaderBase)
@@ -78,7 +78,7 @@
                If Val(Card.Tag) = NewValue Then Return
                Card.Tag = NewValue
                If Card.Children.Count <= 3 Then
-                    Log("[Watcher] 元素不足的卡片：" & Loader.Name, NotifyLevel.DebugModeOnly)
+                    Logger.Warn($"元素不足的卡片：{Loader.Name}")
                    Return
                End If
                Card = Card.Children(3)
@@ -90,7 +90,7 @@
                            Card.Children.Clear()
                            Card.Children.Add(GetObjectFromXML("<Path xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation"" Stretch=""Uniform"" Tag=""Failed"" Data=""F1 M2.5,0 L0,2.5 7.5,10 0,17.5 2.5,20 10,12.5 17.5,20 20,17.5 12.5,10 20,2.5 17.5,0 10,7.5 2.5,0Z"" Height=""15"" Width=""15"" HorizontalAlignment=""Center"" Grid.Column=""0"" Grid.Row=""0"" Fill=""{DynamicResource ColorBrush3}"" Margin=""0,1,0,0"" VerticalAlignment=""Top""/>"))
                            Dim Tb As TextBlock = GetObjectFromXML("<TextBlock xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation"" TextWrapping=""Wrap"" HorizontalAlignment=""Left"" ToolTip=""单击复制错误详情"" Grid.Column=""1"" Grid.Row=""0"" Margin=""0,0,0,5"" />")
-                            Tb.Text = Loader.Error.GetDetail()
+                            Tb.Text = Loader.Error.GetDisplay(True)
                            AddHandler Tb.MouseLeftButtonDown,
                            Sub(sender As TextBlock, e As EventArgs)
                                ClipboardSet(sender.Text, False)
@@ -106,7 +106,7 @@
 #Region "进度不同，更新卡片"
                            Try
                                If Card.Children.Count < LoaderList.Count * 2 Then
-                                    Log($"[Watcher] 刷新下载管理卡片 {Loader.Name} 失败：卡片中仅有 {Card.Children.Count} 个子项，要求至少有 {LoaderList.Count * 2} 个子项", NotifyLevel.DebugModeOnly)
+                                    Logger.Warn($"刷新下载管理卡片 {Loader.Name} 失败：卡片中仅有 {Card.Children.Count} 个子项，要求至少有 {LoaderList.Count * 2} 个子项")
                                    Exit Try
                                End If
                                Dim Row As Integer = 0
@@ -133,12 +133,12 @@
                                    Row += 1
                                Next
                            Catch ex As Exception
-                                Log(ex, $"刷新下载管理卡片 {Loader.Name} 失败", NotifyLevel.MsgBoxAndFeedback)
+                                Logger.Error(ex, $"刷新下载管理卡片 {Loader.Name} 失败")
                            End Try
 #End Region
                    End Select
                Catch ex As Exception
-                    Log(ex, "更新下载管理显示失败（" & Loader.State.ToString & "）", NotifyLevel.MsgBoxAndFeedback)
+                    Logger.Error(ex, $"更新下载管理显示失败（{Loader.State}）")
                End Try
            ElseIf Not (Loader.State = LoadState.Interrupted OrElse Loader.State = LoadState.Finished) Then
                Try
@@ -177,13 +177,13 @@
                    Try
                        Card = GetObjectFromXML(CardXAML)
                    Catch ex As Exception
-                        Log(ex, "新建下载管理卡片失败")
-                        Log("出错的卡片内容：" & vbCrLf & CardXAML)
+                        Logger.Warn(ex, "新建下载管理卡片失败")
+                        Logger.Info($"出错的卡片内容：{vbCrLf}{CardXAML}")
                        Throw
                    End Try
                    FrmSpeedRight.PanMain.Children.Insert(0, Card)
                    RightCards.Add(Loader.Name, Card)
-                    Log($"[Watcher] 新建下载管理卡片：{Loader.Name}")
+                    Logger.Info($"新建下载管理卡片：{Loader.Name}")
                    '添加取消按钮
                    Dim Cancel As New MyIconButton With {.Name = "BtnCancel", .Logo = "F1 M2,0 L0,2 8,10 0,18 2,20 10,12 18,20 20,18 12,10 20,2 18,0 10,8 2,0Z", .Height = 20, .Margin = New Thickness(0, 10, 10, 0), .LogoScale = 1.1, .HorizontalAlignment = HorizontalAlignment.Right, .VerticalAlignment = VerticalAlignment.Top}
                    Card.Children.Add(Cancel)
@@ -193,7 +193,7 @@
                        AniDispose(Card, True, Sub() If FrmSpeedRight.PanMain.Children.Count = 0 AndAlso FrmMain.PageCurrent = FormMain.PageType.DownloadManager Then FrmMain.PageBack())
                        RightCards.Remove(Loader.Name)
                        LoaderTaskbar.Remove(Loader)
-                        Log($"[Taskbar] 关闭下载管理卡片：{Loader.Name}，且移出任务列表")
+                        Logger.Info($"关闭下载管理卡片：{Loader.Name}，且移出任务列表")
                        RunInThread(Sub() Loader.Interrupt())
                    End Sub
                    '如果已经失败，再刷新一次，修改成失败的控件
@@ -203,11 +203,11 @@
                    End If
 #End Region
                Catch ex As Exception
-                    Log(ex, "添加下载管理卡片失败", NotifyLevel.MsgBoxAndFeedback)
+                    Logger.Error(ex, "添加下载管理卡片失败")
                End Try
            End If
        Catch ex As Exception
-            Log(ex, "刷新下载管理显示失败", NotifyLevel.MsgBoxAndFeedback)
+            Logger.Error(ex, "刷新下载管理显示失败")
        End Try
    End Sub
    Public Sub TaskRemove(Loader As Object)
@@ -218,7 +218,7 @@
                Dim Card As Grid = RightCards(Loader.Name)
                FrmSpeedRight.PanMain.Children.Remove(Card)
                RightCards.Remove(Loader.Name)
-                Log($"[Watcher] 移除下载管理卡片：{Loader.Name}")
+                Logger.Info($"移除下载管理卡片：{Loader.Name}")
            End Sub)
        End If
    End Sub