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
@@ -136,7 +136,7 @@ Public Class MyButton

            End If
        Catch ex As Exception
-            Log(ex, "刷新按钮颜色出错")
+            Logger.Warn(ex, "刷新按钮颜色出错")
        End Try
    End Sub

@@ -144,7 +144,7 @@ Public Class MyButton
    Private IsMouseDown As Boolean = False
    Private Sub Button_MouseUp(sender As Object, e As MouseButtonEventArgs) Handles Me.MouseLeftButtonUp
        If Not IsMouseDown Then Return
-        Log("[Control] 按下按钮：" & Text)
+        Logger.Info($"按下按钮：{Text}")
        RaiseEvent Click(sender, e)
        RaiseCustomEvent() '自定义事件
    End Sub
@@ -164,7 +164,7 @@
                Case 13
                    Stack.Children.Add(NeoForgeDownloadListItem(Data, AddressOf NeoForgeSave_Click, True))
                Case Else
-                    Log("未知的虚拟化种类：" & Type, NotifyLevel.MsgBoxAndFeedback)
+                    Logger.Error($"未知的虚拟化种类：{Type}")
            End Select
        Next
        Stack.Children.Add(New FrameworkElement With {.Height = 18}) '下边距，同时适应折叠
@@ -296,9 +296,10 @@
            If Not IsSwapped AndAlso TypeOf SwapControl Is StackPanel Then StackInstall(SwapControl, SwapType, Title)
            '若尚未加载，会在 Loaded 事件中触发无动画的折叠，不需要在这里进行
            If Not IsLoaded Then Return
-            '更新高度
+            '更新样式
            SwapControl.Visibility = Visibility.Visible
            TriggerForceResize()
+            UpdateCursorStyle()
            '改变箭头
            AniStart(AaRotateTransform(MainSwap, If(_IsSwapped, If(SwapLogoRight, 270, 0), 180) - CType(MainSwap.RenderTransform, RotateTransform).Angle, 250,, New AniEaseOutFluent(AniEasePower.ExtraStrong)), "MyCard Swap " & Uuid, True)
        End Set
@@ -351,12 +352,18 @@
        End If

        IsSwapped = Not IsSwapped
-        Log("[Control] " & If(IsSwapped, "折叠卡片", "展开卡片") & If(Title Is Nothing, "", "：" & Title))
+        Logger.Info($"{If(IsSwapped, "折叠卡片", "展开卡片")}{If(Title Is Nothing, "", "：" & Title)}")
        RaiseEvent Swap(Me, e)
    End Sub
    Private Sub MyCard_MouseLeave_Swap(sender As Object, e As MouseEventArgs) Handles Me.MouseLeave
        IsSwapMouseDown = False
    End Sub
+    Private Sub UpdateCursorStyle() Handles Me.MouseMove
+        If _MainSwap Is Nothing Then Cursor = Nothing : Return
+        Dim Pos As Double = Mouse.GetPosition(Me).Y
+        Cursor = If(MainSwap.Visibility = Visibility.Visible AndAlso (IsSwapped OrElse (Pos <= SwapedHeight - 6 AndAlso Not (Pos = 0 AndAlso Not IsMouseDirectlyOver))),
+            Cursors.Hand, Nothing)
+    End Sub

 #End Region

@@ -59,7 +59,7 @@ Public Class MyCheckBox
            SyncUI()
            RaiseCustomEvent()
        Catch ex As Exception
-            Log(ex, "设置 Checked 失败")
+            Logger.Warn(ex, "设置 Checked 失败")
        End Try
    End Sub
    Private Sub SyncUI()
@@ -133,7 +133,7 @@ Public Class MyCheckBox
    Private AllowMouseDown As Boolean = True
    Private Sub Checkbox_MouseUp() Handles Me.MouseLeftButtonUp
        If Not MouseDowned Then Return
-        Log("[Control] 按下复选框（" & (Not Checked).ToString & "）：" & Text)
+        Logger.Info($"按下复选框（{(Not Checked)}）：{Text}")
        MouseDowned = False
        SetChecked(Not Checked, True)
        AniStart(AaColor(ShapeBorder, Border.BackgroundProperty, "ColorBrushHalfWhite", 100), "MyCheckBox Background " & Uuid)
@@ -22,7 +22,7 @@
            End If
            If HintText.Length > 0 Then TextBox.HintText = HintText
        Catch ex As Exception
-            Log(ex, "初始化可编辑文本框失败（" & If(Name, "") & "）", NotifyLevel.MsgBoxAndFeedback)
+            Logger.Error(ex, $"初始化可编辑文本框失败（{If(Name, "")}）")
        End Try
    End Sub
    Private _Text As String = SelectedItem
@@ -107,7 +107,7 @@
        Try
            CType(Template.FindName("PanPopup", Me), Grid).Opacity = FrmMain.Opacity
        Catch ex As Exception
-            Log(ex, "设置下拉框透明度失败", NotifyLevel.MsgBoxAndFeedback)
+            Logger.Error(ex, "设置下拉框透明度失败")
        End Try
    End Sub
    Private Sub MyComboBox_DropDownClosed(sender As Object, e As EventArgs) Handles Me.DropDownClosed
@@ -147,7 +147,7 @@
        ElseIf Items.Count > NewValue Then
            SelectedIndex = NewValue
        Else
-            Log($"[Setting] 尝试显示设置 {SettingService.GetKey(Me)}，但没有找到设置值 {NewValue} 的对应项", NotifyLevel.DebugModeOnly)
+            Logger.Warn($"尝试显示设置 {SettingService.GetKey(Me)}，但没有找到设置值 {NewValue} 的对应项")
            SelectedIndex = -1
            SelectedItem = Nothing
        End If
@@ -61,7 +61,7 @@
    End Operator

    Private Sub MyComboBoxItem_MouseLeftButtonUp(sender As Object, e As MouseButtonEventArgs) Handles Me.MouseLeftButtonUp
-        Log("[Control] 选择下拉列表项：" & Tostring())
+        Logger.Info($"选择下拉列表项：{Tostring()}")
    End Sub

 End Class
@@ -84,7 +84,7 @@
    '触发点击事件
    Private Sub Button_LeftMouseUp(sender As Object, e As MouseButtonEventArgs) Handles PanClick.MouseLeftButtonUp
        If IsLeftMouseHeld Then
-            Log("[Control] 按下附加按钮" & If(ToolTip = "", "", "：" & ToolTip.ToString))
+            Logger.Info($"按下附加按钮{If(ToolTip = "", "", "：" & ToolTip)}")
            RaiseEvent Click(sender, e)
            e.Handled = True
            Button_LeftMouseUp()
@@ -92,7 +92,7 @@
    End Sub
    Private Sub Button_RightMouseUp(sender As Object, e As MouseButtonEventArgs) Handles PanClick.MouseRightButtonUp
        If IsRightMouseHeld Then
-            Log("[Control] 右键按下附加按钮" & If(ToolTip = "", "", "：" & ToolTip.ToString))
+            Logger.Info($"右键按下附加按钮{If(ToolTip = "", "", "：" & ToolTip)}")
            RaiseEvent RightClick(sender, e)
            e.Handled = True
            Button_RightMouseUp()
@@ -193,7 +193,7 @@

            End If
        Catch ex As Exception
-            Log(ex, "刷新图标按钮颜色出错")
+            Logger.Warn(ex, "刷新图标按钮颜色出错")
        End Try
    End Sub

@@ -82,7 +82,7 @@ Public Class MyExtraTextButton
    '触发点击事件
    Private Sub Button_LeftMouseUp(sender As Object, e As MouseButtonEventArgs) Handles PanClick.MouseLeftButtonUp
        If Not IsLeftMouseHeld Then Return
-        Log("[Control] 按下附加图标按钮：" & Text)
+        Logger.Info($"按下附加图标按钮：{Text}")
        RaiseEvent Click(sender, e)
        e.Handled = True
        RaiseCustomEvent()
@@ -156,7 +156,7 @@ Public Class MyExtraTextButton

            End If
        Catch ex As Exception
-            Log(ex, "刷新附加图标按钮颜色出错")
+            Logger.Warn(ex, "刷新附加图标按钮颜色出错")
        End Try
    End Sub

@@ -99,7 +99,7 @@ Public Class MyHint
    End Property
    Public Property RelativeSetup As String = ""
    Private Sub MyHint_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
-        If CanClose AndAlso Settings.Get(RelativeSetup) Then Visibility = Visibility.Collapsed
+        If CanClose AndAlso Settings.Get(Of Boolean)(RelativeSetup) Then Visibility = Visibility.Collapsed
    End Sub
    Private Sub BtnClose_Click(sender As Object, e As EventArgs) Handles BtnClose.Click
        Settings.SetSafe(RelativeSetup, True)
@@ -112,7 +112,7 @@ Public Class MyHint
    Private Sub MyHint_MouseUp(sender As Object, e As MouseButtonEventArgs) Handles Me.MouseLeftButtonUp
        If Not IsMouseDown Then Return
        IsMouseDown = False
-        Log("[Control] 按下提示条" & If(String.IsNullOrEmpty(Name), "", "：" & Name))
+        Logger.Info($"按下提示条{If(String.IsNullOrEmpty(Name), "", "：" & Name)}")
        RaiseEvent Click(sender, e)
        If e.Handled Then Return
        e.Handled = True
@@ -54,7 +54,7 @@ Public Class MyIconButton
    Private IsMouseDown As Boolean = False
    Private Sub Button_MouseUp(sender As Object, e As MouseButtonEventArgs) Handles Me.MouseLeftButtonUp
        If Not IsMouseDown Then Return
-        Log("[Control] 按下图标按钮" & If(String.IsNullOrEmpty(Name), "", "：" & Name))
+        Logger.Info($"按下图标按钮{If(String.IsNullOrEmpty(Name), "", "：" & Name)}")
        RaiseEvent Click(sender, e)
        e.Handled = True
        Button_MouseUp()
@@ -160,7 +160,7 @@ Public Class MyIconButton

            End If
        Catch ex As Exception
-            Log(ex, "刷新图标按钮动画状态出错")
+            Logger.Warn(ex, "刷新图标按钮动画状态出错")
        End Try
    End Sub

@@ -70,7 +70,7 @@ Public Class MyIconTextButton
    Private IsMouseDown As Boolean = False
    Private Sub MyIconTextButton_MouseUp() Handles Me.MouseLeftButtonUp
        If Not IsMouseDown Then Return
-        Log("[Control] 按下带图标按钮：" & Text)
+        Logger.Info($"按下带图标按钮：{Text}")
        IsMouseDown = False
        RaiseEvent Click(Me, New RouteEventArgs(True))
        RaiseCustomEvent() '自定义事件
@@ -166,7 +166,7 @@ Public Class MyIconTextButton

            End If
        Catch ex As Exception
-            Log(ex, "刷新带图标按钮颜色出错")
+            Logger.Warn(ex, "刷新带图标按钮颜色出错")
        End Try
    End Sub

@@ -88,9 +88,9 @@
                Dim Bitmap As ImageSource = If(value Is Nothing, Nothing, New MyBitmap(value)) '在这里先触发可能的文件读取，尽量避免在 UI 线程中读取文件
                RunInUi(Sub() MyBase.Source = Bitmap)
            Catch ex As Exception
-                Log(ex, $"加载图片失败（{value}）")
+                Logger.Warn(ex, $"加载图片失败（{value}）")
                Try
-                    If value.StartsWithF(PathTemp) AndAlso File.Exists(value) Then File.Delete(value)
+                    If value.StartsWithF(PathTemp) Then FileUtils.Delete(value)
                Catch
                End Try
            End Try
@@ -113,7 +113,7 @@
        '从缓存加载网络图片
        Dim EnableCache As Boolean = Me.EnableCache
        Dim TempPath As String = $"{PathTemp}MyImage\{GetHash(Source)}.png{If(EnableCache, "", GetUuid())}" '不启用缓存时在末尾加上随机字符串，避免冲突
-        Dim TempFile As New FileInfo(TempPath)
+        Dim TempFile = FileUtils.GetInfo(TempPath)
        If EnableCache AndAlso TempFile.Exists Then
            ActualSource = TempPath '显示缓存的图片
            If (Date.Now - TempFile.LastWriteTime) < FileCacheExpiredTime Then Return '无需刷新缓存
@@ -130,24 +130,24 @@
                        {Source, FallbackSource}, {Source}),
                    TempPath, SimulateBrowserHeaders:=True)
                ActualSource = TempPath
-                If Not EnableCache Then File.Delete(TempPath)
+                If Not EnableCache Then FileUtils.Delete(TempPath)
            Catch ex As Exception
                Try
-                    If TempPath IsNot Nothing Then File.Delete(TempPath)
+                    If TempPath IsNot Nothing Then FileUtils.Delete(TempPath)
                Catch
                End Try
                '加载本地备用图片
                If IsLocalFallback Then
                    Try
                        ActualSource = FallbackSource
-                        Log(ex, $"下载图片失败，使用本地备用图片（{Source}）")
+                        Logger.Warn(ex, $"下载图片失败，使用本地备用图片（{Source}）")
                        Return
                    Catch exx As Exception
-                        Log(ex, $"下载图片失败（{Source}）", NotifyLevel.AllUsers)
-                        Log(exx, $"加载备用图片失败（{FallbackSource}）", NotifyLevel.AllUsers)
+                        Logger.Error(ex, $"下载图片失败（{Source}）", LogBehavior.Toast)
+                        Logger.Error(exx, $"加载备用图片失败（{FallbackSource}）", LogBehavior.Toast)
                    End Try
                Else
-                    Log(ex, $"下载图片失败（{Source}，备用：{FallbackSource}）", NotifyLevel.AllUsers)
+                    Logger.Error(ex, $"下载图片失败（{Source}，备用：{FallbackSource}）", LogBehavior.Toast)
                End If
            End Try
        End Sub, "MyImage PicLoader " & GetUuid() & "#", ThreadPriority.BelowNormal)
@@ -479,7 +479,7 @@ Public Class MyListItem
            End If

        Catch ex As Exception
-            Log(ex, "设置 Checked 失败")
+            Logger.Warn(ex, "设置 Checked 失败")
        End Try
    End Sub

@@ -515,12 +515,12 @@ Public Class MyListItem
        '实际的单击处理
        Select Case Type
            Case CheckType.Clickable
-                Log("[Control] 按下单击列表项：" & Title)
+                Logger.Info($"按下单击列表项：{Title}")
            Case CheckType.RadioBox
-                Log("[Control] 按下单选列表项：" & Title)
+                Logger.Info($"按下单选列表项：{Title}")
                If Not Checked Then SetChecked(True, True, True)
            Case CheckType.CheckBox
-                Log("[Control] 按下复选列表项（" & (Not Checked).ToString & "）：" & Title)
+                Logger.Info($"按下复选列表项（{Not Checked}）：{Title}")
                SetChecked(Not Checked, True, True)
        End Select
    End Sub
@@ -643,7 +643,7 @@ Public Class MyListItem
                Dim Entry As New HelpEntry(CustomEvent.GetAbsoluteUrls(CustomEventService.GetEventData(Me), CustomEventService.GetEventType(Me))(0))
                Entry.SetToListItem(Me)
            Catch ex As Exception
-                Log(ex, "设置帮助 MyListItem 失败", NotifyLevel.MsgBox)
+                Logger.Error(ex, "设置帮助 MyListItem 失败", LogBehavior.Alert)
                CustomEventService.SetEventType(Me, CustomEvent.EventType.None)
                CustomEventService.SetEventData(Me, "")
            End Try
@@ -76,10 +76,8 @@ Public Class MyLoading
                    If Ex Is Nothing Then
                        LabText.Text = "未知错误"
                    Else
-                        Do While Ex.InnerException IsNot Nothing
-                            Ex = Ex.InnerException
-                        Loop
-                        LabText.Text = If(Ex.IsNetworkRelated(), "网络环境不佳，请稍后再试，或使用 VPN 改善网络环境", Ex.Message)
+                        Ex = Ex.RootException()
+                        LabText.Text = If(Ex.IsBadNetwork(), "网络环境不佳，请稍后再试，或使用 VPN 改善网络环境", Ex.Message)
                    End If
                Else
                    LabText.Text = TextError
@@ -7,7 +7,7 @@
            If IconControl IsNot Nothing Then IconControl.Data = (New GeometryConverter).ConvertFromString(Icon)
        End If
        '对父级设置透明度
-        CType(Parent, ContextMenu).Opacity = Settings.Get("UiLauncherTransparent") / 1000 + 0.4
+        CType(Parent, ContextMenu).Opacity = Settings.Get(Of Integer)("UiLauncherTransparent") / 1000 + 0.4
    End Sub

    '基础
@@ -26,7 +26,7 @@
            ShapeLine.StrokeThickness = GetWPFSize(1)

        Catch ex As Exception
-            Log(ex, "输入弹窗初始化失败", NotifyLevel.AllUsers)
+            Logger.Error(ex, "输入弹窗初始化失败", LogBehavior.Toast)
        End Try
    End Sub

@@ -46,10 +46,10 @@
                AaDouble(Sub(i) TransformRotate.Angle += i, -TransformRotate.Angle, 300, 60, New AniEaseOutFluent(AniEasePower.Weak))
            }, "MyMsgBox " & Uuid)
            '记录日志
-            Log("[Control] 输入弹窗：" & LabTitle.Text)
+            Logger.Info($"输入弹窗：{LabTitle.Text}")

        Catch ex As Exception
-            Log(ex, "输入弹窗加载失败", NotifyLevel.AllUsers)
+            Logger.Error(ex, "输入弹窗加载失败", LogBehavior.Toast)
        End Try
    End Sub
    Private Sub Close()
@@ -35,7 +35,7 @@
            Next

        Catch ex As Exception
-            Log(ex, "选择弹窗初始化失败", NotifyLevel.AllUsers)
+            Logger.Error(ex, "选择弹窗初始化失败", LogBehavior.Toast)
        End Try
    End Sub

@@ -53,10 +53,10 @@
                AaDouble(Sub(i) TransformRotate.Angle += i, -TransformRotate.Angle, 300, 60, New AniEaseOutFluent(AniEasePower.Weak))
            }, "MyMsgBox " & Uuid)
            '记录日志
-            Log("[Control] 选择弹窗：" & LabTitle.Text)
+            Logger.Info($"选择弹窗：{LabTitle.Text}")

        Catch ex As Exception
-            Log(ex, "选择弹窗加载失败", NotifyLevel.AllUsers)
+            Logger.Error(ex, "选择弹窗加载失败", LogBehavior.Toast)
        End Try
    End Sub
    Private Sub Close()
@@ -25,7 +25,7 @@
            ShapeLine.StrokeThickness = GetWPFSize(1)

        Catch ex As Exception
-            Log(ex, "普通弹窗初始化失败", NotifyLevel.AllUsers)
+            Logger.Error(ex, "普通弹窗初始化失败", LogBehavior.Toast)
        End Try
    End Sub

@@ -44,10 +44,10 @@
                AaDouble(Sub(i) TransformRotate.Angle += i, -TransformRotate.Angle, 300, 60, New AniEaseOutFluent(AniEasePower.Weak))
            }, "MyMsgBox " & Uuid)
            '记录日志
-            Log("[Control] 普通弹窗：" & LabTitle.Text & vbCrLf & LabCaption.Text)
+            Logger.Info($"普通弹窗：{LabTitle.Text}{vbCrLf}{LabCaption.Text}")

        Catch ex As Exception
-            Log(ex, "普通弹窗加载失败", NotifyLevel.AllUsers)
+            Logger.Error(ex, "普通弹窗加载失败", LogBehavior.Toast)
        End Try
    End Sub
    Private Sub Close()
@@ -35,7 +35,7 @@
        Set(value As PageStates)
            If _PageState = value Then Return
            _PageState = value
-            If ModeDebug Then Log("[UI] 页面状态切换为 " & GetStringFromEnum(value))
+            Logger.Trace($"页面状态切换为 {value}")
        End Set
    End Property

@@ -59,9 +59,9 @@
    ''' <param name="PanAlways">无论是否在加载总是要显示的容器。可以为 Nothing。</param>
    ''' <param name="RealLoader">在工作线程执行的加载器。</param>
    ''' <param name="FinishedInvoke">当加载器执行完成，在 UI 线程触发的 UI 初始化事件。</param>
-    Public Sub PageLoaderInit(LoaderUi As MyLoading, PanLoader As FrameworkElement, PanContent As FrameworkElement, PanAlways As FrameworkElement,
-                              RealLoader As LoaderBase,
-                              Optional FinishedInvoke As Action(Of LoaderBase) = Nothing, Optional InputInvoke As Func(Of Object) = Nothing,
+    Public Sub PageLoaderInit(Of TIn, TOut)(LoaderUi As MyLoading, PanLoader As FrameworkElement, PanContent As FrameworkElement, PanAlways As FrameworkElement,
+                              RealLoader As LoaderTask(Of TIn, TOut),
+                              Optional FinishedInvoke As Action(Of LoaderTask(Of TIn, TOut)) = Nothing, Optional InputInvoke As Func(Of TIn) = Nothing,
                              Optional AutoRun As Boolean = True)
        '初始化参数
        Me.PanLoader = PanLoader
@@ -89,13 +89,59 @@
        If PanAlways IsNot Nothing Then PanAlways.Visibility = Visibility.Collapsed
        '初次运行加载器
        If PageLoaderAutoRun Then
-            If PageLoader.GetType.Name.StartsWithF("LoaderTask") Then
-                PageLoader.Start(CType(PageLoader, Object).StartGetInput(Nothing, PageLoaderInputInvoke))
-            Else
-                Dim Input = Nothing
-                If PageLoaderInputInvoke IsNot Nothing Then Input = PageLoaderInputInvoke()
-                PageLoader.Start(Input)
-            End If
+            '上下两个重载只有这里不一样
+            PageLoader.Start(RealLoader.StartGetInput(Nothing, PageLoaderInputInvoke))
+        End If
+        If PageLoader.State = LoadState.Finished AndAlso FinishedInvoke IsNot Nothing Then
+            RunInUiWait(Sub() FinishedInvoke(RealLoader)) '加载器已提前完成，直接触发事件
+        End If
+        '设置加载环
+        PageLoaderUi.State = RealLoader
+        AddHandler PageLoaderUi.Click, Sub() If RealLoader.State = LoadState.Failed Then PageLoaderRestart() '点击重试事件
+    End Sub
+    ''' <summary>
+    ''' 表明页面存在需要在后台执行的加载器。
+    ''' </summary>
+    ''' <param name="LoaderUi">MyLoading 控件。</param>
+    ''' <param name="PanLoader">MyLoading 控件对应的卡片。</param>
+    ''' <param name="PanContent">加载结束后出现的内容容器。</param>
+    ''' <param name="PanAlways">无论是否在加载总是要显示的容器。可以为 Nothing。</param>
+    ''' <param name="RealLoader">在工作线程执行的加载器。</param>
+    ''' <param name="FinishedInvoke">当加载器执行完成，在 UI 线程触发的 UI 初始化事件。</param>
+    Public Sub PageLoaderInit(Of TIn)(LoaderUi As MyLoading, PanLoader As FrameworkElement, PanContent As FrameworkElement, PanAlways As FrameworkElement,
+                              RealLoader As LoaderCombo(Of TIn),
+                              Optional FinishedInvoke As Action(Of LoaderCombo(Of TIn)) = Nothing, Optional InputInvoke As Func(Of TIn) = Nothing,
+                              Optional AutoRun As Boolean = True)
+        '初始化参数
+        Me.PanLoader = PanLoader
+        Me.PanContent = PanContent
+        Me.PanAlways = PanAlways
+        Me.PageLoader = RealLoader
+        Me.PageLoaderUi = LoaderUi
+        Me.PageLoaderInputInvoke = InputInvoke
+        Me.PageLoaderAutoRun = AutoRun
+        '添加结束 Invoke
+        If FinishedInvoke IsNot Nothing Then
+            AddHandler RealLoader.PreviewFinish,
+            Sub()
+                Do While PageState = MyPageRight.PageStates.PageExit OrElse PageState = MyPageRight.PageStates.ContentExit
+                    Thread.Sleep(10) '不在退出动画时执行 UI 线程操作，避免退出动画被重置
+                Loop
+                RunInUiWait(Sub() FinishedInvoke(RealLoader))
+                Thread.Sleep(20) '由于大量初始化控件会导致掉帧，延迟触发 State 改变事件
+            End Sub
+        End If
+        AddHandler RealLoader.OnStateChangedUi, Sub(Loader As LoaderBase, NewState As LoadState, OldState As LoadState) RunInUi(Sub() PageLoaderState(Loader, NewState, OldState))
+        '隐藏 UI
+        PanLoader.Visibility = Visibility.Collapsed
+        PanContent.Visibility = Visibility.Collapsed
+        If PanAlways IsNot Nothing Then PanAlways.Visibility = Visibility.Collapsed
+        '初次运行加载器
+        If PageLoaderAutoRun Then
+            '上下两个重载只有这里不一样
+            Dim Input = Nothing
+            If PageLoaderInputInvoke IsNot Nothing Then Input = PageLoaderInputInvoke()
+            PageLoader.Start(Input)
        End If
        If PageLoader.State = LoadState.Finished AndAlso FinishedInvoke IsNot Nothing Then
            RunInUiWait(Sub() FinishedInvoke(RealLoader)) '加载器已提前完成，直接触发事件
@@ -125,7 +171,7 @@
    ''' 需要根据加载器状态，从 Empty 切换到 ContentEnter、LoaderWait、LoaderEnter。
    ''' </summary>
    Public Sub PageOnEnter()
-        If ModeDebug Then Log("[UI] 已触发 PageOnEnter")
+        Logger.Trace("已触发 PageOnEnter")
        RaiseEvent PageEnter()
        Select Case PageState
            Case PageStates.Empty
@@ -155,7 +201,7 @@
            Case PageStates.ContentEnter
                '重复调用 PageOnEnter，直接忽略
            Case Else
-                Throw New Exception("在状态为 " & GetStringFromEnum(PageState) & " 时触发了 PageOnEnter 事件。")
+                Throw New Exception("在状态为 " & PageState.ToString() & " 时触发了 PageOnEnter 事件。")
        End Select
    End Sub
    Public Event PageEnter()
@@ -164,7 +210,7 @@
    ''' 需要立即切换至 PageExit 或 Empty。
    ''' </summary>
    Public Sub PageOnExit()
-        If ModeDebug Then Log("[UI] 已触发 PageOnExit")
+        Logger.Trace("已触发 PageOnExit")
        RaiseEvent PageExit()
        Select Case PageState
            Case PageStates.ContentEnter, PageStates.ContentStay
@@ -189,7 +235,7 @@
    ''' </summary>
    Public Sub PageOnForceExit()
        If PageState = PageStates.Empty Then Return
-        If ModeDebug Then Log("[UI] 已触发 PageOnForceExit")
+        Logger.Trace("已触发 PageOnForceExit")
        PageState = PageStates.Empty
        AniStop("PageRight PageChange " & PageUuid)
        '由于动画会被强制中止，所以需要手动进行隐藏
@@ -206,7 +252,7 @@
    ''' 需要在 PageEnter 事件确认要显示的子页面有哪些。
    ''' </summary>
    Public Sub PageOnContentExit()
-        If ModeDebug Then Log("[UI] 已触发 PageOnContentExit")
+        Logger.Trace("已触发 PageOnContentExit")
        If PageLoader IsNot Nothing AndAlso PageLoader.State = LoadState.Loading Then
            'Loading 的加载器可能触发进一步变化，难以预测会触发子页面的动画还是加载器完成的动画
            Throw New Exception("在调用 PageOnContentExit 时，加载器不能为 Loading 状态")
@@ -235,7 +281,7 @@
    ''' 需要根据目前状态，从 ContentEnter 切换到 ContentStay，或从 LoaderEnter 切换到 LoaderStayForce。
    ''' </summary>
    Private Sub PageOnEnterAnimationFinished()
-        If ModeDebug Then Log("[UI] 已触发 PageOnEnterAnimationFinished")
+        Logger.Trace("已触发 PageOnEnterAnimationFinished")
        Select Case PageState
            Case PageStates.ContentEnter
                PageState = PageStates.ContentStay
@@ -243,7 +289,7 @@
                PageState = PageStates.LoaderStayForce
                AniStart(AaCode(AddressOf PageOnLoaderStayFinished, 400), "PageRight PageChange " & PageUuid)
            Case Else
-                Throw New Exception("在状态为 " & GetStringFromEnum(PageState) & " 时触发了 PageOnEnterAnimationFinished 事件。")
+                Throw New Exception("在状态为 " & PageState.ToString() & " 时触发了 PageOnEnterAnimationFinished 事件。")
        End Select
    End Sub
    ''' <summary>
@@ -251,7 +297,7 @@
    ''' 需要根据目前状态，从 AllExit 切换到 Empty，或从 LoaderExit 切换到 ContentEnter，或从 ContentExit 重新触发 PageOnEnter。
    ''' </summary>
    Private Sub PageOnExitAnimationFinished()
-        If ModeDebug Then Log("[UI] 已触发 PageOnExitAnimationFinished")
+        Logger.Trace("已触发 PageOnExitAnimationFinished")
        Select Case PageState
            Case PageStates.PageExit
                PageState = PageStates.Empty
@@ -261,7 +307,7 @@
                PageState = PageStates.ContentEnter
                TriggerEnterAnimation(PanContent)
            Case Else
-                Throw New Exception("在状态为 " & GetStringFromEnum(PageState) & " 时触发了 PageOnExitAnimationFinished 事件。")
+                Throw New Exception("在状态为 " & PageState.ToString() & " 时触发了 PageOnExitAnimationFinished 事件。")
        End Select
    End Sub
    ''' <summary>
@@ -269,7 +315,7 @@
    ''' 需要从 LoaderWait 切换到 LoaderEnter。
    ''' </summary>
    Private Sub PageOnLoaderWaitFinished()
-        If ModeDebug Then Log("[UI] 已触发 PageOnLoaderWaitFinished")
+        Logger.Trace("已触发 PageOnLoaderWaitFinished")
        Select Case PageState
            Case PageStates.LoaderWait
                PageState = PageStates.LoaderEnter
@@ -279,7 +325,7 @@
                    TriggerEnterAnimation(PanLoader)
                End If
            Case Else
-                Throw New Exception("在状态为 " & GetStringFromEnum(PageState) & " 时触发了 PageOnLoaderWaitFinished 事件。")
+                Throw New Exception("在状态为 " & PageState.ToString() & " 时触发了 PageOnLoaderWaitFinished 事件。")
        End Select
    End Sub
    ''' <summary>
@@ -287,7 +333,7 @@
    ''' 需要从 LoaderStayForce 切换到 LoaderStay 或 LoaderExit。
    ''' </summary>
    Private Sub PageOnLoaderStayFinished()
-        If ModeDebug Then Log("[UI] 已触发 PageOnLoaderStayFinished")
+        Logger.Trace("已触发 PageOnLoaderStayFinished")
        Select Case PageState
            Case PageStates.LoaderStayForce
                If PageLoader.State = LoadState.Finished Then
@@ -297,7 +343,7 @@
                    PageState = PageStates.LoaderStay
                End If
            Case Else
-                Throw New Exception("在状态为 " & GetStringFromEnum(PageState) & " 时触发了 PageOnLoaderWaitFinished 事件。")
+                Throw New Exception("在状态为 " & PageState.ToString() & " 时触发了 PageOnLoaderWaitFinished 事件。")
        End Select
    End Sub

@@ -308,7 +354,7 @@
        Select Case NewState
            Case LoadState.Failed, LoadState.Loading
                If OldState = LoadState.Failed OrElse OldState = LoadState.Loading Then Return
-                If ModeDebug Then Log("[UI] 已触发 PageLoaderState (Start/Refresh)")
+                Logger.Trace("已触发 PageLoaderState (Start/Refresh)")
                '（重新）开始运行
                '需要从部分状态切换到 ReloadExit
                Select Case PageState
@@ -320,7 +366,7 @@
                End Select
            Case LoadState.Finished, LoadState.Interrupted, LoadState.Waiting
                If Not (OldState = LoadState.Failed OrElse OldState = LoadState.Loading) Then Return
-                If ModeDebug Then Log("[UI] 已触发 PageLoaderState (Stop/Interrupt)")
+                Logger.Trace("已触发 PageLoaderState (Stop/Interrupt)")
                '运行结束
                '需要从 LoaderWait 切换到 ContentEnter，或从 LoaderStay 切换到 LoaderExit
                Select Case PageState
@@ -49,12 +49,12 @@ Public Class MyRadioBox
            '自定义属性基础
            Dim IsChanged As Boolean = False
            If IsLoaded AndAlso Not value = Checked Then RaiseEvent PreviewChange(Me, New RouteEventArgs(user))
-            If Not value = Checked Then
+            If value <> Checked Then
                SetValue(CheckedProperty, value)
                IsChanged = True
            End If

-            '保证只有一个单选框选中
+            '保证最多只有一个单选框选中
            If Parent Is Nothing Then Return
            Dim RadioboxList As New List(Of MyRadioBox)
            Dim CheckedCount As Integer = 0
@@ -64,31 +64,26 @@ Public Class MyRadioBox
                    If Control.Checked Then CheckedCount += 1
                End If
            Next
-            Select Case CheckedCount '判断选中情况
-                Case 0
-                    '没有任何单选框被选中，选择第一个
-                    RadioboxList(0).Checked = True
-                Case Is > 1
-                    '选中项目多于 1 个
-                    If Checked Then
-                        '如果本控件选中，则取消其他所有控件的选中
-                        For Each Control As MyRadioBox In RadioboxList
-                            If Control.Checked AndAlso Not Control.Equals(Me) Then Control.Checked = False
-                        Next
-                    Else
-                        '如果本控件未选中，则只保留第一个选中的控件
-                        Dim FirstChecked = False
-                        For Each Control As MyRadioBox In RadioboxList
-                            If Control.Checked Then
-                                If FirstChecked Then
-                                    Control.Checked = False '修改 Checked 会自动触发 Change 事件，所以不用额外触发
-                                Else
-                                    FirstChecked = True
-                                End If
+            If CheckedCount > 1 Then
+                If Checked Then
+                    '如果本控件选中，则取消其他所有控件的选中
+                    For Each Control As MyRadioBox In RadioboxList
+                        If Control.Checked AndAlso Not Control.Equals(Me) Then Control.Checked = False
+                    Next
+                Else
+                    '如果本控件未选中，则只保留第一个选中的控件
+                    Dim FirstChecked = False
+                    For Each Control As MyRadioBox In RadioboxList
+                        If Control.Checked Then
+                            If FirstChecked Then
+                                Control.Checked = False '修改 Checked 会自动触发 Change 事件，所以不用额外触发
+                            Else
+                                FirstChecked = True
                            End If
-                        Next
-                    End If
-            End Select
+                        End If
+                    Next
+                End If
+            End If

            If IsChanged Then
                '触发事件
@@ -100,10 +95,11 @@ Public Class MyRadioBox
            End If

        Catch ex As Exception
-            Log(ex, "单选框勾选改变错误", NotifyLevel.AllUsers)
+            Logger.Error(ex, "单选框勾选改变错误", LogBehavior.Toast)
        End Try
    End Sub
    Private Sub SyncUI()
+        Cursor = If(Checked, Nothing, Cursors.Hand)
        If AniControlEnabled = 0 AndAlso IsLoaded Then '防止默认属性变更触发动画
            If Checked Then
                '由无变有
@@ -175,7 +171,7 @@ Public Class MyRadioBox
    Private AllowMouseDown As Boolean = True
    Private Sub Radiobox_MouseUp() Handles Me.MouseLeftButtonUp
        If Not MouseDowned Then Return
-        Log("[Control] 按下单选框：" & Text)
+        Logger.Info($"按下单选框：{Text}")
        SetChecked(True, True)
        MouseDowned = False
        AniStart(AaColor(ShapeBorder, Ellipse.FillProperty, "ColorBrushHalfWhite", 100), "MyRadioBox Background " & Uuid)
@@ -202,6 +198,9 @@ Public Class MyRadioBox
    Private Const AnimationTimeOfMouseIn As Integer = 100 '鼠标指向动画长度
    Private Const AnimationTimeOfMouseOut As Integer = 200 '鼠标指向动画长度
    Private Const AnimationTimeOfCheck As Integer = 150 '勾选状态变更动画长度
+    Private Sub MyRadioBox_Loaded() Handles Me.Loaded
+        Cursor = If(Checked, Nothing, Cursors.Hand)
+    End Sub
    Private Sub Radiobox_IsEnabledChanged() Handles Me.IsEnabledChanged
        If Me.IsLoaded AndAlso AniControlEnabled = 0 Then '防止默认属性变更触发动画
            '有动画
@@ -104,7 +104,7 @@ Public Class MyRadioButton
            RaiseCustomEvent()

        Catch ex As Exception
-            Log(ex, "单选按钮勾选改变错误", NotifyLevel.AllUsers)
+            Logger.Error(ex, "单选按钮勾选改变错误", LogBehavior.Toast)
        End Try
    End Sub

@@ -145,7 +145,7 @@ Public Class MyRadioButton
    Private Sub Radiobox_MouseUp() Handles Me.MouseLeftButtonUp
        If Checked Then Return
        If Not IsMouseDown Then Return
-        Log("[Control] 按下单选按钮：" & Text)
+        Logger.Info($"按下单选按钮：{Text}")
        IsMouseDown = False
        Dim e As New RouteEventArgs(True)
        RaiseEvent PreviewClick(Me, e)
@@ -167,6 +167,7 @@ Public Class MyRadioButton
    Private Const AnimationTimeOfMouseOut As Integer = 150 '鼠标移出动画长度
    Private Const AnimationTimeOfCheck As Integer = 120 '勾选状态变更动画长度
    Private Sub RefreshColor(Optional obj = Nothing, Optional e = Nothing) Handles Me.MouseEnter, Me.MouseLeave, Me.Loaded
+        Cursor = If(Checked, Nothing, Cursors.Hand)
        Try
            If IsLoaded AndAlso AniControlEnabled = 0 AndAlso Not False.Equals(e) Then '防止默认属性变更触发动画，若强制不执行动画，则 e 为 False

@@ -255,7 +256,7 @@ Public Class MyRadioButton

            End If
        Catch ex As Exception
-            Log(ex, "刷新单选按钮颜色出错")
+            Logger.Warn(ex, "刷新单选按钮颜色出错")
        End Try
    End Sub

@@ -44,7 +44,7 @@
            End If

        Catch ex As Exception
-            Log(ex, "滚动条颜色改变出错")
+            Logger.Warn(ex, "滚动条颜色改变出错")
        End Try
    End Sub

@@ -63,7 +63,7 @@ Public Class MySlider
                If AniControlEnabled = 0 Then RaiseEvent Change(Me, False)

            Catch ex As Exception
-                Log(ex, "滑动条进度改变出错", NotifyLevel.AllUsers)
+                Logger.Error(ex, "滑动条进度改变出错", LogBehavior.Toast)
            End Try
        End Set
    End Property
@@ -156,7 +156,7 @@ Public Class MySlider
            End If

        Catch ex As Exception
-            Log(ex, "滑动条颜色改变出错")
+            Logger.Warn(ex, "滑动条颜色改变出错")
        End Try
    End Sub

@@ -59,7 +59,7 @@
                If AniControlEnabled = 0 Then RaiseEvent Change(Me, False)

            Catch ex As Exception
-                Log(ex, "滑动条进度改变出错", LogLevel.Hint)
+                Logger.Warning(ex, "滑动条进度改变出错", LogLevel.Hint)
            End Try
        End Set
    End Property
@@ -228,7 +228,7 @@
            '改变文本
            RaiseEvent ValidatedTextChanged(sender, e)
        Catch ex As Exception
-            Log(ex, "进行输入验证时出错", NotifyLevel.MsgBoxAndFeedback)
+            Logger.Error(ex, "进行输入验证时出错")
        End Try
    End Sub

@@ -282,7 +282,7 @@
            End If

        Catch ex As Exception
-            Log(ex, "文本框颜色改变出错")
+            Logger.Warn(ex, "文本框颜色改变出错")
        End Try
    End Sub
    Private Sub RefreshTextColor() Handles Me.IsEnabledChanged
@@ -45,7 +45,7 @@
    Private Sub MyTextButton_MouseLeftButtonUp(sender As Object, e As MouseButtonEventArgs) Handles Me.PreviewMouseLeftButtonUp
        If Not IsMouseDown Then Return
        IsMouseDown = False
-        Log("[Control] 按下文本按钮：" & Text)
+        Logger.Info($"按下文本按钮：{Text}")
        RaiseEvent Click(Me, Nothing)
        RaiseCustomEvent()
        e.Handled = True