2.10.7

2025-09-10 01:07:30 +08:00
parent ee385912f8
commit 2210da6fda
62 changed files with 2620 additions and 2122 deletions
@@ -1,5 +1,7 @@
-Public Class PageLaunchRight
-    Implements IRefreshable
+Imports System.Windows.Threading
+
+Public Class PageLaunchRight
+    Implements IRefreshable, IDispatcherUnhandledException

    Private Sub Init() Handles Me.Loaded
        PanBack.ScrollToHome()
@@ -27,7 +29,7 @@
    ''' 刷新主页。
    ''' </summary>
    Private Sub Refresh() Handles Me.Loaded
-        RunInNewThread(
+        RunInThread(
        Sub()
            Try
                SyncLock RefreshLock
@@ -36,37 +38,20 @@
            Catch ex As Exception
                Log(ex, "加载 PCL 主页自定义信息失败", If(ModeDebug, LogLevel.Msgbox, LogLevel.Hint))
            End Try
-        End Sub, $"刷新主页 #{GetUuid()}")
+        End Sub)
    End Sub
    Private Sub RefreshReal()
-        Dim Content As String = ""
-        Dim Url As String
+        Dim Content As String = Nothing, Url As String = Nothing
        Select Case Setup.Get("UiCustomType")
            Case 1
                '加载本地文件
                Log("[Page] 主页自定义数据来源：本地文件")
                Content = ReadFile(Path & "PCL\Custom.xaml") 'ReadFile 会进行存在检测
            Case 2
+                '联网下载
                Url = Setup.Get("UiCustomNet")
-Download:
-                '加载联网文件
-                If String.IsNullOrWhiteSpace(Url) Then Exit Select
-                If Url = Setup.Get("CacheSavedPageUrl") AndAlso File.Exists(PathTemp & "Cache\Custom.xaml") Then
-                    '缓存可用
-                    Log("[Page] 主页自定义数据来源：联网缓存文件")
-                    Content = ReadFile(PathTemp & "Cache\Custom.xaml")
-                    '后台更新缓存
-                    OnlineLoader.Start(Url)
-                Else
-                    '缓存不可用
-                    Log("[Page] 主页自定义数据来源：联网全新下载")
-                    Hint("正在加载主页……")
-                    RunInUiWait(Sub() LoadContent("")) '在加载结束前清空页面
-                    Setup.Set("CacheSavedPageVersion", "")
-                    OnlineLoader.Start(Url) '下载完成后将会再次触发更新
-                    Return
-                End If
            Case 3
+                '预设
                Select Case Setup.Get("UiCustomPreset")
                    Case 0
                        Log("[Page] 主页预设：你知道吗")
@@ -88,50 +73,58 @@ Download:
                            </local:MyCard>"
                    Case 2
                        Log("[Page] 主页预设：Minecraft 新闻")
-                        Url = "https://pcl.mcnews.thestack.top"
-                        GoTo Download
+                        Url = "https://mcnews.meloong.com"
                    Case 3
                        Log("[Page] 主页预设：简单主页")
                        Url = "https://pclhomeplazaoss.lingyunawa.top:26994/d/Homepages/MFn233/Custom.xaml"
-                        GoTo Download
                    Case 4
                        Log("[Page] 主页预设：每日整合包推荐")
                        Url = "https://pclsub.sodamc.com/"
-                        GoTo Download
                    Case 5
                        Log("[Page] 主页预设：Minecraft 皮肤推荐")
                        Url = "https://forgepixel.com/pcl_sub_file"
-                        GoTo Download
                    Case 6
                        Log("[Page] 主页预设：OpenBMCLAPI 仪表盘 Lite")
                        Url = "https://pcl-bmcl.milu.ink/"
-                        GoTo Download
                    Case 7
                        Log("[Page] 主页预设：主页市场")
                        Url = "https://pclhomeplazaoss.lingyunawa.top:26994/d/Homepages/JingHai-Lingyun/Custom.xaml"
-                        GoTo Download
                    Case 8
                        Log("[Page] 主页预设：更新日志")
                        Url = "https://pclhomeplazaoss.lingyunawa.top:26994/d/Homepages/Joker2184/UpdateHomepage.xaml"
-                        GoTo Download
                    Case 9
                        Log("[Page] 主页预设：PCL 新功能说明书")
                        Url = "https://raw.gitcode.com/WForst-Breeze/WhatsNewPCL/raw/main/Custom.xaml"
-                        GoTo Download
                    Case 10
                        Log("[Page] 主页预设：OpenMCIM Dashboard")
                        Url = "https://files.mcimirror.top/PCL"
-                        GoTo Download
                    Case 11
                        Log("[Page] 主页预设：杂志主页")
                        Url = "https://pclhomeplazaoss.lingyunawa.top:26994/d/Homepages/Ext1nguisher/Custom.xaml"
-                        GoTo Download
                    Case 12
                        Log("[Page] 主页预设：PCL GitHub 仪表盘")
                        Url = "https://ddf.pcl-community.org/Custom.xaml"
-                        GoTo Download
                End Select
        End Select
+        '联网下载
+        If Not String.IsNullOrWhiteSpace(Url) Then
+            If Url = Setup.Get("CacheSavedPageUrl") AndAlso File.Exists(PathTemp & "Cache\Custom.xaml") Then
+                '缓存可用
+                Log("[Page] 主页自定义数据来源：联网缓存文件")
+                Content = ReadFile(PathTemp & "Cache\Custom.xaml")
+                '后台更新缓存
+                OnlineLoader.Start(Url)
+            Else
+                '缓存不可用
+                Log("[Page] 主页自定义数据来源：联网全新下载")
+                Hint("正在加载主页……")
+                RunInUiWait(Sub() LoadContent(Nothing)) '在加载结束前清空页面
+                Setup.Set("CacheSavedPageVersion", "")
+                OnlineLoader.Start(Url) '下载完成后将会再次触发更新
+                Return
+            End If
+        End If
+        '同步到 UI
        RunInUi(Sub() LoadContent(Content))
    End Sub
    Private RefreshLock As New Object
@@ -169,15 +162,13 @@ Download:
                Log($"[Page] 无法检查联网主页版本，将直接下载，检查源：{VersionAddress}")
            End Try
            '实际下载
-            If NeedDownload Then
-                Dim FileContent As String = NetRequestByClientRetry(Address)
-                Log($"[Page] 已联网下载主页，内容长度：{FileContent.Length}，来源：{Address}")
-                Setup.Set("CacheSavedPageUrl", Address)
-                Setup.Set("CacheSavedPageVersion", Version)
-                WriteFile(PathTemp & "Cache\Custom.xaml", FileContent)
-            End If
-            '要求刷新
-            RunInUi(AddressOf Refresh) '不直接调用 Refresh，以防止死循环（#6245）
+            If Not NeedDownload Then Return
+            Dim FileContent As String = NetRequestByClientRetry(Address)
+            Log($"[Page] 已联网下载主页，内容长度：{FileContent.Length}，来源：{Address}")
+            Setup.Set("CacheSavedPageUrl", Address)
+            Setup.Set("CacheSavedPageVersion", Version)
+            WriteFile(PathTemp & "Cache\Custom.xaml", FileContent)
+            Refresh() '要求刷新
        Catch ex As Exception
            Log(ex, $"下载主页失败（{Address}）", If(ModeDebug, LogLevel.Msgbox, LogLevel.Hint))
        End Try
@@ -215,19 +206,19 @@ Download:
    ''' 必须在 UI 线程调用。
    ''' </summary>
    Private Sub LoadContent(Content As String)
-        SyncLock LoadContentLock
-            '如果加载目标内容一致则不加载
-            Dim Hash = Content.GetHashCode()
-            If Hash = LoadedContentHash Then Return
-            LoadedContentHash = Hash
-            '实际加载内容
-            PanCustom.Children.Clear()
-            If String.IsNullOrWhiteSpace(Content) Then
-                Log($"[Page] 实例化：清空主页 UI，来源为空")
-                Return
-            End If
-            Dim LoadStartTime As Date = Date.Now
-            Try
+        Try
+            SyncLock LoadContentLock
+                '如果加载目标内容一致则不加载
+                Dim Hash = If(Content, "").GetHashCode()
+                If Hash = LoadedContentHash Then Return
+                LoadedContentHash = Hash
+                '实际加载内容
+                PanCustom.Children.Clear()
+                If String.IsNullOrWhiteSpace(Content) Then
+                    Log($"[Page] 实例化：清空主页 UI，来源为空")
+                    Return
+                End If
+                Dim LoadStartTime As Date = Date.Now
                '修改时应同时修改 PageOtherHelpDetail.Init
                Content = HelpArgumentReplace(Content)
                Do While Content.Contains("xmlns")
@@ -236,26 +227,38 @@ Download:
                Content = "<StackPanel xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation"" xmlns:sys=""clr-namespace:System;assembly=mscorlib"" xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xmlns:local=""clr-namespace:PCL;assembly=Plain Craft Launcher 2"">" & Content & "</StackPanel>"
                Log($"[Page] 实例化：加载主页 UI 开始，最终内容长度：{Content.Count}")
                PanCustom.Children.Add(GetObjectFromXML(Content))
-            Catch ex As Exception
-                If ModeDebug Then
-                    Log(ex, "加载失败的主页内容：" & vbCrLf & Content)
-                    If MyMsgBox(If(TypeOf ex Is UnauthorizedAccessException, ex.Message, $"主页内容编写有误，请根据下列错误信息进行检查：{vbCrLf}{GetExceptionSummary(ex)}"),
-                                "加载主页界面失败", "重试", "取消") = 1 Then
-                        GoTo Refresh '防止 SyncLock 死锁
-                    End If
-                Else
-                    Log(ex, "加载主页界面失败", LogLevel.Hint)
-                End If
-                Return
-            End Try
-            Dim LoadCostTime = (Date.Now - LoadStartTime).Milliseconds
-            Log($"[Page] 实例化：加载主页 UI 完成，耗时 {LoadCostTime}ms")
-            If LoadCostTime > 3000 Then Hint($"主页加载过于缓慢（花费了 {Math.Round(LoadCostTime / 1000, 1)} 秒），请向主页作者反馈此问题，或暂时停止使用该主页")
-        End SyncLock
-        Return
-Refresh:
-        ForceRefresh()
+                '加载计时
+                Dim LoadCostTime = (Date.Now - LoadStartTime).Milliseconds
+                Log($"[Page] 实例化：加载主页 UI 完成，耗时 {LoadCostTime}ms")
+                If LoadCostTime > 3000 Then Hint($"主页加载过于缓慢（花费了 {Math.Round(LoadCostTime / 1000, 1)} 秒），请向主页作者反馈此问题，或暂时停止使用该主页")
+            End SyncLock
+        Catch ex As Exception
+            Log(ex, "加载失败的主页内容：" & vbCrLf & Content)
+            OnLoadContentFailed(ex)
+        End Try
    End Sub
+    ''' <summary>
+    ''' 加载主页失败时调用。
+    ''' </summary>
+    Private Sub OnLoadContentFailed(ex As Exception)
+        If ModeDebug OrElse Setup.Get("UiCustomType") = 1 Then
+            Log(ex, "加载主页失败")
+            If MyMsgBox(If(TypeOf ex Is UnauthorizedAccessException, ex.Message, $"主页内容编写有误，请根据下列错误信息进行检查：{vbCrLf}{ex.GetBrief}"),
+                        "加载主页失败", "重试", "取消") = 1 Then ForceRefresh()
+        Else
+            Log(ex, "加载主页失败", LogLevel.Hint)
+        End If
+    End Sub
+    ''' <summary>
+    ''' 捕获主页在 Measure 和 Arrange 阶段抛出的异常。
+    ''' </summary>
+    Private Sub DispatcherUnhandledException(sender As Object, e As DispatcherUnhandledExceptionEventArgs) Implements IDispatcherUnhandledException.DispatcherUnhandledException
+        If TypeOf e.Exception IsNot Markup.XamlParseException Then Return
+        e.Handled = True
+        LoadContent(Nothing)
+        OnLoadContentFailed(e.Exception)
+    End Sub
+
    Private LoadedContentHash As Integer = -1
    Private LoadContentLock As New Object