fix(FeedbackWindow): 修复配置信息换行符处理问题

移除配置信息末尾的多余换行符，并在需要时添加分隔换行符

Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com>

.all-contributorsrc

@@ -16,7 +16,8 @@
       "contributions": [
         "maintenance",
         "doc",
-        "code"
+        "code",
+        "design"
       ]
     },
     {
@@ -36,7 +37,10 @@
       "contributions": [
         "blog",
         "doc",
-        "design"
+        "design",
+        "test",
+        "tutorial",
+        "video"
       ]
     },
     {
@@ -98,6 +102,44 @@
       "contributions": [
         "design"
       ]
+    },
+    {
+      "login": "doudou0720",
+      "name": "doudou0720",
+      "avatar_url": "https://avatars.githubusercontent.com/u/98651603?v=4",
+      "profile": "https://github.com/doudou0720",
+      "contributions": [
+        "code",
+        "blog"
+      ]
+    },
+    {
+      "login": "PANDAJSR",
+      "name": "PANDAJSR",
+      "avatar_url": "https://avatars.githubusercontent.com/u/170189561?v=4",
+      "profile": "https://github.com/PANDAJSR",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "LiuYan-xwx",
+      "name": "流焰xwx",
+      "avatar_url": "https://avatars.githubusercontent.com/u/66517348?v=4",
+      "profile": "http://lyxwx.top",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Super-Yyt",
+      "name": "Super-Yyt",
+      "avatar_url": "https://avatars.githubusercontent.com/u/206630707?v=4",
+      "profile": "https://github.com/Super-Yyt",
+      "contributions": [
+        "infra",
+        "blog"
+      ]
     }
   ]
 }

.devcontainer/devcontainer.json

@@ -0,0 +1,12 @@
+{
+  "image": "mcr.microsoft.com/devcontainers/dotnet",
+  "postCreateCommand": "dotnet restore",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-dotnettools.csdevkit",
+        "ms-dotnettools.csharp"
+      ]
+    }
+  }
+}

.github/ISSUE_TEMPLATE/01-bug_report.yml

@@ -1,12 +1,15 @@
 name: Bug 报告 | Bug Report
 description: 反馈软件缺陷或异常 | Report a bug to help us improve
-labels: [bug]
+type: Bug
 body:
   - type: markdown
     attributes:
       value: |
         感谢你的反馈！请详细填写以下内容，便于我们定位问题。
         Thank you for your feedback! Please fill out the following information to help us locate the issue.
+        
+        在报告问题之前，请确保你的软件已经更新到最新Beta版本，否则我们可能会无条件直接关闭该Issue，感谢配合！
+        Before reporting the issue, please make sure your software has been updated to the latest Beta version. Otherwise, we may unconditionally close this Issue without any further notice. Thank you for your cooperation!
   - type: input
     id: version
     attributes:
@@ -33,7 +36,7 @@ body:
     id: steps
     attributes:
       label: 复现步骤 | Steps to Reproduce
-      description: 如何复现该问题？如有必要可附截图/录屏 | How to reproduce this bug? Screenshots/recordings if needed
+      description: 如何复现该问题？如有必要可附截图/录屏/触发该问题的文件 | How to reproduce this bug? Screenshots/recordings/specific files if needed
       placeholder: |
         1. 
         2. 
@@ -51,6 +54,13 @@ body:
     id: extra
     attributes:
       label: 其他补充信息 | Additional Info
-      description: 其他相关信息（如日志、配置、特殊环境等）| Any other context, logs, configs, special environment, etc.
+      description: 其他相关信息（如日志文件、崩溃日志文件、配置文件、特殊环境等）| Any other context, logs, crash logs, configs, special environment, etc.
+    validations:
+      required: false
+  - type: upload
+    id: files
+    attributes:
+      label: 上传有关文件 | Upload relevant files
+      description: "你可以在此处上传相关文件 | You can upload relevant files here."
     validations:
       required: false

.github/ISSUE_TEMPLATE/02-feature_request.yml

@@ -1,6 +1,6 @@
 name: 功能请求 | Feature Request
 description: 提出你对本项目的功能建议 | Suggest an idea for this project
-labels: [enhancement]
+type: Feature
 body:
   - type: markdown
     attributes:
@@ -35,3 +35,10 @@ body:
       description: 其他补充说明或建议 | Any other context or suggestions
     validations:
       required: false
+  - type: upload
+    id: files
+    attributes:
+      label: 上传有关文件 | Upload relevant files
+      description: "你可以在此处上传相关文件 | You can upload relevant files here."
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/03-bug_report.md

@@ -0,0 +1,36 @@
+---
+name: (Markdown Template) Bug 报告 | Bug Report
+about: 反馈软件缺陷或异常 | Report a bug to help us improve
+title: "[Version x.x.x] <your title>"
+type: Bug
+---
+
+<!---请注意，你正在使用Markdown格式的Issue模板，如果你删除该模板的框架、更改问题的tag/类型/受理人或者不按照规范填写，你的Issue可能被直接关闭，如果你对Markdown不熟悉，请使用位于该选项下方的反馈入口继续反馈，感谢配合！-->
+
+<!---感谢你的反馈！请详细填写以下内容，便于我们定位问题。-->
+<!---Thank you for your feedback! Please fill out the following information to help us locate the issue.-->
+
+<!---在报告问题之前，请确保你的软件已经更新到最新Beta版本，否则我们可能会无条件直接关闭该Issue，感谢配合！-->
+<!---Before reporting the issue, please make sure your software has been updated to the latest Beta version. Otherwise, we may unconditionally close this Issue without any further notice. Thank you for your cooperation!-->
+
+### 软件版本 | App Version (必填 | Required)
+<!---可在设置中的"关于"界面查看 | You can find it on the "About" interface in the settings-->
+<!---例如 v1.2.3 | e.g. v1.2.3-->
+
+### 操作系统及版本 | OS & Version (必填 | Required)
+<!---例如 Windows 10 22H2 64位 | e.g. Windows 10 22H2 64bit-->
+
+### 问题描述 | Description (必填 | Required)
+<!---简要描述遇到的问题 | Briefly describe the problem-->
+
+### 复现步骤 | Steps to Reproduce (必填 | Required)
+<!---如何复现该问题？如有必要可附截图/录屏/触发该问题的文件 | How to reproduce this bug? Screenshots/recordings/specific files if needed-->
+1.
+2.
+3.
+
+### 期望结果 | Expected Behavior (必填 | Required)
+<!---你期望的正确行为或结果 | What did you expect to happen?-->
+
+### 其他补充信息 | Additional Info (可选 | Optional)
+<!---其他相关信息（如日志文件、崩溃日志文件、配置文件、特殊环境等）| Any other context, logs, crash logs, configs, special environment, etc.-->

.github/ISSUE_TEMPLATE/04-feature_request.md

@@ -0,0 +1,23 @@
+---
+name: (Markdown Template) 功能请求 | Feature Request
+about: 提出你对本项目的功能建议 | Suggest an idea for this project
+title: "[Feature Request] "
+type: Feature
+---
+
+<!---请注意，你正在使用Markdown格式的Issue模板，如果你删除该模板的框架、更改问题的tag/类型/受理人或者不按照规范填写，你的Issue可能被直接关闭，如果你对Markdown不熟悉，请使用位于该选项下方的反馈入口继续反馈，感谢配合！-->
+
+<!---感谢你的建议！请详细描述你的需求。-->
+<!---Thank you for your suggestion! Please describe your needs in detail.-->
+
+### 功能描述 | Description (必填 | Required)
+<!---请描述你希望添加的功能 | Describe the feature you want-->
+
+### 需求动机 | Motivation (必填 | Required)
+<!---为什么需要这个功能？| Why do you need this feature?-->
+
+### 期望设计 | Expected Design (可选 | Optional)
+<!---描述或画出你期望的界面或交互 | Describe or sketch the expected UI/UX-->
+
+### 其他补充信息 | Additional Info (可选 | Optional)
+<!---其他补充说明或建议 | Any other context or suggestions-->

.github/workflows/dotnet-desktop.yml

@@ -1,35 +1,106 @@
-name: .NET Build
+name: .NET Build & Package
 
 on:
   push:
-    branches: [ main,beta ]
-  pull_request:
-    branches: [ main ]
+    branches: [ main, beta ]
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-${{ github.head_ref || github.sha }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
 
 jobs:
-
-  build:
+  build-and-package:
+    name: Build & Package
     runs-on: windows-latest
-
+    strategy:
+      fail-fast: false
+      matrix:
+        architecture: [AnyCPU, x86]
     steps:
-    - uses: actions/checkout@v4.2.2
-
-    - name: Setup MSbuild
-      uses: microsoft/setup-msbuild@v2
-   
-    - name: Setup NuGet
-      uses: NuGet/setup-nuget@v2.0.1
+      - name: Checkout code
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 1
       
-    - name: Restore NuGet Packages
-      run: nuget restore "Ink Canvas.sln"
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v3
+      
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v5
+        with:
+          cache: true
+          cache-dependency-path: '**/packages.lock.json'
+      
+      - name: Restore Package 
+        run: dotnet restore "Ink Canvas.sln" --locked-mode
+      
+      - name: Build the Solution
+        env:
+          DLASS_SENTRY_DSN: ${{ secrets.DLASS_SENTRY_DSN }}
+        run: msbuild /p:platform="${{ matrix.architecture }}" /p:configuration="Debug" /p:GitFlow="$GITFLOW" "Ink Canvas/InkCanvasForClass.csproj" /m /p:UseMultiToolTask=true /p:EnforceProcessCountAcrossBuilds=true /verbosity:minimal -maxcpucount /p:RunAnalyzers=false
 
-    - name: Build the Solution
-      run: |
-        msbuild -t:restore /p:GitFlow="Github Action"
-        msbuild /p:platform="AnyCPU" /p:configuration="Debug" /p:GitFlow="Github Action" "Ink Canvas/InkCanvasForClass.csproj"
+      - name: Check if exe file is generated
+        id: check-exe
+        run: |
+          $exePath = "Ink Canvas\bin\Debug\${{ matrix.architecture }}\net472\InkCanvasForClass.exe"
+          
+          if (Test-Path $exePath) {
+            echo "build_success=true" >> $env:GITHUB_OUTPUT
+          } else {
+            echo "build_success=false" >> $env:GITHUB_OUTPUT
+            
+            if ("${{ github.event_name }}" -eq "workflow_dispatch") {
+              exit 1
+            }
+          }
 
-    - name: Upload to artifact
-      uses: actions/upload-artifact@v4.5.0
-      with:
-        name: InkCanvasForClass
-        path: "Ink Canvas/bin/Debug/net472"
+      - name: Create Package (if build succeeded)
+        id: create-archive
+        if: steps.check-exe.outputs.build_success == 'true'
+        env:
+          GITHUB_SHA: ${{ github.sha }}
+          GITHUB_RUN_NUMBER: ${{ github.run_number }}
+        run: |
+          $shortSha = $env:GITHUB_SHA.Substring(0, 7)
+          $version = "debug-$shortSha-$env:GITHUB_RUN_NUMBER"
+          echo "archive_name=$version" >> $env:GITHUB_OUTPUT
+      
+      - name: Upload Artifact (if build succeeded)
+        if: steps.check-exe.outputs.build_success == 'true'
+        uses: actions/upload-artifact@v7
+        with:
+          name: InkCanvasForClass.CE.debug.${{ matrix.architecture }}
+          path: "Ink Canvas/bin/Debug/${{ matrix.architecture }}/net472/*"
+
+      - name: Create Summary
+        if: always()
+        shell: bash
+        run: |
+          echo "# Build Summary" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          
+          if [ "${{ steps.check-exe.outputs.build_success }}" = "true" ]; then
+            echo "## ✅ Build Successful" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "**Commit:** \`${{ github.sha }}\`" >> $GITHUB_STEP_SUMMARY
+            echo "**Run:** #${{ github.run_number }}" >> $GITHUB_STEP_SUMMARY
+            echo "**Version:** ${{ steps.create-archive.outputs.archive_name }}" >> $GITHUB_STEP_SUMMARY
+            echo "**Architecture:** ${{ matrix.architecture }}" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "[Download Artifact](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "[Nightly.link Download](https://nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }}/InkCanvasForClass.CE.debug.${{ matrix.architecture }}.zip) \([GhProxy Fastly Mirror](https://cdn.gh-proxy.com/nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }}/InkCanvasForClass.CE.debug.${{ matrix.architecture }}.zip) / [GhProxy Mirror](https://gh-proxy.com/nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }}/InkCanvasForClass.CE.debug.${{ matrix.architecture }}.zip)\)" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "## ❌ Build Failed" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "**Event:** ${{ github.event_name }} (${{ github.event.action || 'N/A' }})" >> $GITHUB_STEP_SUMMARY
+            echo "**Commit:** \`${{ github.sha }}\`" >> $GITHUB_STEP_SUMMARY
+            echo "**Architecture:** ${{ matrix.architecture }}" >> $GITHUB_STEP_SUMMARY
+            echo "**Run:** #${{ github.run_number }}" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "Check build logs for details." >> $GITHUB_STEP_SUMMARY
+          fi

.github/workflows/prcheck.yml

@@ -0,0 +1,104 @@
+name: PR Check
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+    branches: [ main, beta ]
+    paths-ignore:
+      - '**/*.md'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-${{ github.head_ref || github.sha }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  build-and-package:
+    name: Build & Package
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        architecture: [AnyCPU, x86]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 1
+      
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v3
+      
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v5
+      
+      - name: Restore Package 
+        run: dotnet restore "Ink Canvas.sln" --locked-mode
+      
+      - name: Build the Solution
+        run: msbuild /p:platform="${{ matrix.architecture }}" /p:configuration="Debug" /p:GitFlow="$GITFLOW" "Ink Canvas/InkCanvasForClass.csproj" /m /p:UseMultiToolTask=true /p:EnforceProcessCountAcrossBuilds=true /verbosity:minimal -maxcpucount /p:RunAnalyzers=false
+
+      - name: Check if exe file is generated
+        id: check-exe
+        run: |
+          $exePath = "Ink Canvas\bin\Debug\${{ matrix.architecture }}\net472\InkCanvasForClass.exe"
+          
+          if (Test-Path $exePath) {
+            echo "build_success=true" >> $env:GITHUB_OUTPUT
+          } else {
+            echo "build_success=false" >> $env:GITHUB_OUTPUT
+            
+            if ("${{ github.event_name }}" -eq "workflow_dispatch") {
+              exit 1
+            }
+          }
+
+      - name: Create Package (if build succeeded)
+        id: create-archive
+        if: steps.check-exe.outputs.build_success == 'true'
+        env:
+          GITHUB_SHA: ${{ github.sha }}
+          GITHUB_RUN_NUMBER: ${{ github.run_number }}
+        run: |
+          $shortSha = $env:GITHUB_SHA.Substring(0, 7)
+          $version = "debug-$shortSha-$env:GITHUB_RUN_NUMBER"
+          echo "archive_name=$version" >> $env:GITHUB_OUTPUT
+      
+      - name: Upload Artifact (if build succeeded)
+        if: steps.check-exe.outputs.build_success == 'true'
+        uses: actions/upload-artifact@v7
+        with:
+          name: InkCanvasForClass.CE.debug.${{ matrix.architecture }}
+          path: "Ink Canvas/bin/Debug/${{ matrix.architecture }}/net472/*"
+        
+
+      - name: Create Summary
+        if: always()
+        shell: bash
+        run: |
+          echo "# Build Summary" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          
+          if [ "${{ steps.check-exe.outputs.build_success }}" = "true" ]; then
+            echo "## ✅ Build Successful" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "**Commit:** \`${{ github.sha }}\`" >> $GITHUB_STEP_SUMMARY
+            echo "**Run:** #${{ github.run_number }}" >> $GITHUB_STEP_SUMMARY
+            echo "**Version:** ${{ steps.create-archive.outputs.archive_name }}" >> $GITHUB_STEP_SUMMARY
+            echo "**Architecture:** ${{ matrix.architecture }}" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "[Download Artifact](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "[Nightly.link Download](https://nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }}/InkCanvasForClass.CE.debug.${{ matrix.architecture }}.zip) \([GhProxy Fastly Mirror](https://cdn.gh-proxy.com/nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }}/InkCanvasForClass.CE.debug.${{ matrix.architecture }}.zip) / [GhProxy Mirror](https://gh-proxy.com/nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }}/InkCanvasForClass.CE.debug.${{ matrix.architecture }}.zip)\)" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "## ❌ Build Failed" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "**Event:** ${{ github.event_name }} (${{ github.event.action || 'N/A' }})" >> $GITHUB_STEP_SUMMARY
+            echo "**Commit:** \`${{ github.sha }}\`" >> $GITHUB_STEP_SUMMARY
+            echo "**Architecture:** ${{ matrix.architecture }}" >> $GITHUB_STEP_SUMMARY
+            echo "**Run:** #${{ github.run_number }}" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "Check build logs for details." >> $GITHUB_STEP_SUMMARY
+          fi

.gitignore

@@ -425,4 +425,8 @@ FodyWeavers.xsd
 *.msi
 *.msix
 *.msm
-*.msp
+*.msp
+
+# Telemetry DSN configuration file (contains sensitive information)
+telemetry_dsn.txt
+**/telemetry_dsn.txt

Ink Canvas.sln

@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.33530.505
@@ -23,22 +22,22 @@ Global
 		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|ARM.Build.0 = Debug|Any CPU
-		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|ARM64.Build.0 = Debug|ARM64
+		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x64.ActiveCfg = Debug|x64
 		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x64.Build.0 = Debug|x64
-		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x86.Build.0 = Debug|Any CPU
+		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x86.ActiveCfg = Debug|x86
+		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|x86.Build.0 = Debug|x86
 		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|ARM.ActiveCfg = Release|Any CPU
 		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|ARM.Build.0 = Release|Any CPU
-		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|ARM64.ActiveCfg = Release|ARM64
-		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|ARM64.Build.0 = Release|ARM64
-		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x64.ActiveCfg = Release|x64
-		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x64.Build.0 = Release|x64
-		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x86.ActiveCfg = Release|x86
-		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x86.Build.0 = Release|x86
+		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|ARM64.Build.0 = Release|Any CPU
+		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x64.ActiveCfg = Release|Any CPU
+		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x64.Build.0 = Release|Any CPU
+		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x86.ActiveCfg = Release|Any CPU
+		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Ink Canvas/App.xaml

@@ -4,6 +4,7 @@
              xmlns:local="clr-namespace:Ink_Canvas"
              xmlns:tb="http://www.hardcodet.net/taskbar"
              xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+             xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
 >
     <Application.Resources>
         <ResourceDictionary>
@@ -13,9 +14,9 @@
             <ContextMenu Opened="SysTrayMenu_Opened" Closed="SysTrayMenu_Closed" x:Shared="false" x:Key="SysTrayMenu" Padding="6" ui:ThemeManager.RequestedTheme="Light">
                 <MenuItem IsCheckable="True" IsChecked="False" Checked="HideICCMainWindowTrayIconMenuItem_Checked" Unchecked="HideICCMainWindowTrayIconMenuItem_UnChecked" Name="HideICCMainWindowTrayIconMenuItem">
                     <MenuItem.Header>
-                        <ui:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
                             <TextBlock Name="HideICCMainWindowTrayIconMenuItemHeaderText" FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="隐藏ICC主窗口" />
-                        </ui:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
                     </MenuItem.Header>
                     <MenuItem.Icon>
                         <Image Width="28" Height="28" Margin="-2">
@@ -31,12 +32,22 @@
                         </Image>
                     </MenuItem.Icon>
                 </MenuItem>
+                <MenuItem Name="OpenSettingsTrayIconMenuItem" Click="OpenSettingsTrayIconMenuItem_Clicked">
+                    <MenuItem.Header>
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                            <TextBlock FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="打开设置" />
+                        </ikw:SimpleStackPanel>
+                    </MenuItem.Header>
+                    <MenuItem.Icon>
+                        <Image Width="28" Height="28" Margin="-2" Source="/Resources/Icons-Fluent/ic_fluent_settings_24_regular.png" />
+                    </MenuItem.Icon>
+                </MenuItem>
                 <Separator Margin="0,3" />
                 <MenuItem Name="DisableAllHotkeysMenuItem" Click="DisableAllHotkeysMenuItem_Clicked">
                     <MenuItem.Header>
-                        <ui:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
                             <TextBlock FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="禁用所有快捷键" />
-                        </ui:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
                     </MenuItem.Header>
                     <MenuItem.Icon>
                         <Image Width="28" Height="28" Margin="-2">
@@ -54,9 +65,9 @@
                 </MenuItem>
                 <MenuItem Name="ForceFullScreenTrayIconMenuItem" Click="ForceFullScreenTrayIconMenuItem_Clicked">
                     <MenuItem.Header>
-                        <ui:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
                             <TextBlock FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="强制全屏化" />
-                            <ui:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
+                            <ikw:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
                                 <Border Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="CTRL" />
                                 </Border>
@@ -64,8 +75,8 @@
                                 <Border Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="F" />
                                 </Border>
-                            </ui:SimpleStackPanel>
-                        </ui:SimpleStackPanel>
+                            </ikw:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
                     </MenuItem.Header>
                     <MenuItem.Icon>
                         <Image Width="28" Height="28" Margin="-2">
@@ -87,9 +98,9 @@
                 </MenuItem>
                 <MenuItem Name="FoldFloatingBarTrayIconMenuItem" Click="FoldFloatingBarTrayIconMenuItem_Clicked">
                     <MenuItem.Header>
-                        <ui:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
                             <TextBlock Name="FoldFloatingBarTrayIconMenuItemHeaderText" FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="切换为收纳模式" />
-                            <ui:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
+                            <ikw:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
                                 <Border Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="CTRL" />
                                 </Border>
@@ -97,8 +108,8 @@
                                 <Border Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="S" />
                                 </Border>
-                            </ui:SimpleStackPanel>
-                        </ui:SimpleStackPanel>
+                            </ikw:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
                     </MenuItem.Header>
                     <MenuItem.Icon>
                         <Grid>
@@ -132,9 +143,9 @@
                 </MenuItem>
                 <MenuItem Name="ResetFloatingBarPositionTrayIconMenuItem" Click="ResetFloatingBarPositionTrayIconMenuItem_Clicked">
                     <MenuItem.Header>
-                        <ui:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
                             <TextBlock FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="重置工具栏位置" />
-                            <ui:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
+                            <ikw:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
                                 <Border  Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="CTRL" />
                                 </Border>
@@ -142,8 +153,8 @@
                                 <Border Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="T" />
                                 </Border>
-                            </ui:SimpleStackPanel>
-                        </ui:SimpleStackPanel>
+                            </ikw:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
                     </MenuItem.Header>
                     <MenuItem.Icon>
                         <Image Width="28" Height="28" Margin="-2">
@@ -163,9 +174,9 @@
                 <Separator Margin="0,3" />
                 <MenuItem Name="RestartAppTrayIconMenuItem" Click="RestartAppTrayIconMenuItem_Clicked">
                     <MenuItem.Header>
-                        <ui:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
                             <TextBlock FontSize="14" FontWeight="Bold" VerticalAlignment="Center" Foreground="#2563eb" Text="重启软件" />
-                            <ui:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
+                            <ikw:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
                                 <Border  Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="CTRL" />
                                 </Border>
@@ -173,8 +184,8 @@
                                 <Border Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="R" />
                                 </Border>
-                            </ui:SimpleStackPanel>
-                        </ui:SimpleStackPanel>
+                            </ikw:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
                     </MenuItem.Header>
                     <MenuItem.Icon>
                         <Image Width="24" Height="24">
@@ -195,9 +206,9 @@
                 </MenuItem>
                 <MenuItem Name="CloseAppTrayIconMenuItem" Click="CloseAppTrayIconMenuItem_Clicked">
                     <MenuItem.Header>
-                        <ui:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
                             <TextBlock FontSize="14" FontWeight="Bold" VerticalAlignment="Center" Foreground="#dc2626" Text="退出软件" />
-                            <ui:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
+                            <ikw:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
                                 <Border  Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="CTRL" />
                                 </Border>
@@ -205,8 +216,8 @@
                                 <Border Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="Q" />
                                 </Border>
-                            </ui:SimpleStackPanel>
-                        </ui:SimpleStackPanel>
+                            </ikw:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
                     </MenuItem.Header>
                     <MenuItem.Icon>
                         <Image Width="24" Height="24">

Ink Canvas/App.xaml.cs

@@ -1,8 +1,10 @@
 using Hardcodet.Wpf.TaskbarNotification;
 using Ink_Canvas.Helpers;
+using Ink_Canvas.Properties;
 using iNKORE.UI.WPF.Modern.Controls;
 using Microsoft.Win32;
 using Newtonsoft.Json;
+using Sentry;
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -41,8 +43,12 @@ namespace Ink_Canvas
         public static Process watchdogProcess;
         // 新增：标记是否为软件内主动退出
         public static bool IsAppExitByUser;
+        // 新增：标记是否正在触发安装更新（用于跳过某些交互确认）
+        public static bool IsUpdateInstalling;
         // 新增：标记是否启用了UIA置顶功能
         public static bool IsUIAccessTopMostEnabled;
+        // 新增：标记是否正在显示 OOBE（首次启动向导），看门狗在此期间不判定为卡死/假死
+        public static bool IsOobeShowing;
         // 新增：退出信号文件路径
         private static string watchdogExitSignalFile = Path.Combine(Path.GetTempPath(), "icc_watchdog_exit_" + Process.GetCurrentProcess().Id + ".flag");
         // 新增：崩溃日志文件路径
@@ -59,8 +65,39 @@ namespace Ink_Canvas
         private static SplashScreen _splashScreen;
         private static bool _isSplashScreenShown = false;
 
+        [DllImport("shell32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        private static extern int SetCurrentProcessExplicitAppUserModelID(string appId);
+
         public App()
         {
+            try
+            {
+                SetCurrentProcessExplicitAppUserModelID("InkCanvasForClass.CE");
+            }
+            catch
+            {
+            }
+
+            try
+            {
+                var dsn = GetDlassTelemetryDsn();
+                if (!string.IsNullOrWhiteSpace(dsn))
+                {
+                    SentrySdk.Init(options =>
+                    {
+                        options.Dsn = dsn;
+                        options.Debug = false;
+                        options.SendDefaultPii = true;
+                        options.TracesSampleRate = 1.0;
+                        options.IsGlobalModeEnabled = true;
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"初始化 Dlass 遥测失败: {ex}", LogHelper.LogType.Warning);
+            }
+
             // 配置TLS协议以支持Windows 7
             ConfigureTlsForWindows7();
 
@@ -342,13 +379,13 @@ namespace Ink_Canvas
             try
             {
                 var exception = e.ExceptionObject as Exception;
-                
+
                 if (exception is InvalidOperationException invalidOpEx)
                 {
                     string exceptionMessage = invalidOpEx.Message ?? "";
                     string exceptionStackTrace = invalidOpEx.StackTrace ?? "";
-                        
-                    if (exceptionMessage.Contains("调用线程无法访问此对象") || 
+
+                    if (exceptionMessage.Contains("调用线程无法访问此对象") ||
                         exceptionMessage.Contains("because another thread owns it") ||
                         exceptionStackTrace.Contains("DynamicRenderer") ||
                         exceptionStackTrace.Contains("CompositionTarget.get_RootVisual"))
@@ -360,7 +397,7 @@ namespace Ink_Canvas
                         return;
                     }
                 }
-                
+
                 string errorMessage = exception?.ToString() ?? "未知异常";
                 lastErrorMessage = errorMessage;
 
@@ -376,15 +413,15 @@ namespace Ink_Canvas
                 // 尝试在最后时刻记录错误
                 try
                 {
-                    string timeStr = (appStartTime != default(DateTime) && appStartTime != DateTime.MinValue) 
-                        ? appStartTime.ToString("yyyy-MM-dd-HH-mm-ss") 
+                    string timeStr = (appStartTime != default(DateTime) && appStartTime != DateTime.MinValue)
+                        ? appStartTime.ToString("yyyy-MM-dd-HH-mm-ss")
                         : DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss");
                     File.AppendAllText(
                         Path.Combine(crashLogFile, $"Crash_{timeStr}.txt"),
                         $"[{DateTime.Now:yyyy-MM-dd HH:mm:ss}] 记录未处理异常时发生错误: {ex.Message}\r\n"
                     );
                 }
-                catch { }
+                catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
             }
         }
 
@@ -438,6 +475,7 @@ namespace Ink_Canvas
                 LogHelper.WriteLogToFile("启动画面对象创建成功，准备显示...");
                 _splashScreen.Show();
                 _isSplashScreenShown = true;
+                splashScreenStartTime = DateTime.Now;
                 LogHelper.WriteLogToFile("启动画面已显示");
             }
             catch (Exception ex)
@@ -507,6 +545,19 @@ namespace Ink_Canvas
             }
         }
 
+        private static bool IsLaunchByFileOrUri(string[] args)
+        {
+            if (args == null || args.Length == 0) return false;
+            foreach (string a in args)
+            {
+                if (string.IsNullOrWhiteSpace(a)) continue;
+                string t = a.Trim();
+                if (t.StartsWith("icc:", StringComparison.OrdinalIgnoreCase)) return true;
+                if (Path.GetExtension(t).Equals(".icstk", StringComparison.OrdinalIgnoreCase)) return true;
+            }
+            return false;
+        }
+
         // 记录崩溃日志
         private static void WriteCrashLog(string message)
         {
@@ -518,8 +569,8 @@ namespace Ink_Canvas
                     Directory.CreateDirectory(crashLogFile);
                 }
 
-                string appStartTimeStr = (appStartTime != default(DateTime) && appStartTime != DateTime.MinValue) 
-                    ? appStartTime.ToString("yyyy-MM-dd-HH-mm-ss") 
+                string appStartTimeStr = (appStartTime != default(DateTime) && appStartTime != DateTime.MinValue)
+                    ? appStartTime.ToString("yyyy-MM-dd-HH-mm-ss")
                     : DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss");
                 string logFileName = Path.Combine(crashLogFile, $"Crash_{appStartTimeStr}.txt");
 
@@ -539,7 +590,7 @@ namespace Ink_Canvas
                 // 同时记录到主日志
                 LogHelper.WriteLogToFile(message, LogHelper.LogType.Error);
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
 
         // 增加字段保存崩溃后操作设置
@@ -556,7 +607,7 @@ namespace Ink_Canvas
                     var json = File.ReadAllText(settingsPath);
                     dynamic obj = JsonConvert.DeserializeObject(json);
                     int crashAction = 0;
-                    try { crashAction = (int)(obj["startup"]["crashAction"] ?? 0); } catch { }
+                    try { crashAction = (int)(obj["startup"]["crashAction"] ?? 0); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
                     CrashAction = (CrashActionType)crashAction;
                 }
                 // 从主窗口同步
@@ -565,7 +616,7 @@ namespace Ink_Canvas
                     CrashAction = (CrashActionType)Ink_Canvas.MainWindow.Settings.Startup.CrashAction;
                 }
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
 
         private void App_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
@@ -575,9 +626,9 @@ namespace Ink_Canvas
             {
                 string exceptionMessage = invalidOpEx.Message ?? "";
                 string exceptionStackTrace = invalidOpEx.StackTrace ?? "";
-                
+
                 // 检查是否是DynamicRenderer相关的线程访问问题
-                if (exceptionMessage.Contains("调用线程无法访问此对象") || 
+                if (exceptionMessage.Contains("调用线程无法访问此对象") ||
                     exceptionMessage.Contains("because another thread owns it") ||
                     exceptionStackTrace.Contains("DynamicRenderer") ||
                     exceptionStackTrace.Contains("CompositionTarget.get_RootVisual"))
@@ -588,14 +639,14 @@ namespace Ink_Canvas
                         $"检测到DynamicRenderer线程访问异常（已安全处理）: {invalidOpEx.Message}",
                         LogHelper.LogType.Warning
                     );
-                    
+
                     // 标记为已处理，不显示错误消息，不触发重启
                     e.Handled = true;
                     return;
                 }
             }
-            
-            Ink_Canvas.MainWindow.ShowNewMessage("抱歉，出现未预期的异常，可能导致 InkCanvasForClass 运行不稳定。\n建议保存墨迹后重启应用。");
+
+            Ink_Canvas.MainWindow.ShowNewMessage(Strings.GetString("Msg_UnexpectedError"));
             LogHelper.NewLog(e.Exception.ToString());
 
             // 记录到崩溃日志
@@ -611,7 +662,7 @@ namespace Ink_Canvas
                 StartupCount.Increment();
                 if (StartupCount.GetCount() >= 5)
                 {
-                    MessageBox.Show("检测到程序已连续重启5次，已停止自动重启。请联系开发者或检查系统环境。", "重启次数过多", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show(Strings.GetString("Msg_RestartLimit"), Strings.GetString("Msg_RestartLimitTitle"), MessageBoxButton.OK, MessageBoxImage.Error);
                     StartupCount.Reset();
                     Environment.Exit(1);
                 }
@@ -620,7 +671,7 @@ namespace Ink_Canvas
                     string exePath = Process.GetCurrentProcess().MainModule.FileName;
                     Process.Start(exePath);
                 }
-                catch { }
+                catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
                 Environment.Exit(1);
             }
             // CrashActionType.NoAction 时不做处理
@@ -628,16 +679,28 @@ namespace Ink_Canvas
 
         private TaskbarIcon _taskbar;
 
+        /// <summary>
+        /// 处理应用启动流程：根据命令行与设置显示启动画面、初始化组件与遥测、处理更新相关逻辑、单实例检查并在必要时通过 IPC 与已运行实例通信，最终创建并显示主窗口并启动文件关联与 IPC 监听器。
+        /// </summary>
+        /// <param name="sender">事件的发送者（通常为 Application 对象）。</param>
+        /// <param name="e">启动事件参数；其 Args 可包含控制启动流程的标志，例如:
+        /// - "--final-app"：表示这是更新后的最终应用启动（会清理更新标记等）
+        /// - "--update-mode"：表示以更新模式启动（跳过主窗口显示）
+        /// - "--board"：直接进入白板模式
+        /// - "--show"：退出收纳模式并恢复浮动栏
+        /// - "--skip-mutex-check"：跳过单实例互斥检查
+        /// - "-m"：允许多实例启动
+        /// 另外也可能包含以 "icc:" 开头的 URI 参数或 .icstk 文件路径用于启动时的 IPC 交互。</param>
         async void App_Startup(object sender, StartupEventArgs e)
         {
-            // 初始化应用启动时间
             appStartTime = DateTime.Now;
+            appStartupStartTime = DateTime.Now;
 
             // 根据设置决定是否显示启动画面
-            if (ShouldShowSplashScreen())
+            if (ShouldShowSplashScreen() && !IsLaunchByFileOrUri(e.Args))
             {
                 ShowSplashScreen();
-                SetSplashMessage("正在启动 Ink Canvas...");
+                SetSplashMessage(Strings.GetString("Splash_Starting"));
                 SetSplashProgress(20);
                 await Task.Delay(500);
 
@@ -645,7 +708,7 @@ namespace Ink_Canvas
                 Application.Current.Dispatcher.Invoke(() => { }, DispatcherPriority.Render);
             }
 
-            System.Threading.Thread.Sleep(500);
+            await Task.Delay(500);
             RootPath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
 
             LogHelper.NewLog(string.Format("Ink Canvas Starting (Version: {0})", Assembly.GetExecutingAssembly().GetName().Version));
@@ -716,6 +779,21 @@ namespace Ink_Canvas
                 await Task.Delay(500);
             }
             DeviceIdentifier.RecordAppLaunch();
+            try
+            {
+                var systemVersion = DeviceIdentifier.GetSystemVersion();
+                if (!string.IsNullOrWhiteSpace(systemVersion))
+                {
+                    SentrySdk.ConfigureScope(scope =>
+                    {
+                        scope.SetTag("system_version", systemVersion);
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"App | 初始化系统版本遥测标签失败: {ex.Message}", LogHelper.LogType.Warning);
+            }
             LogHelper.WriteLogToFile($"App | 设备ID: {DeviceIdentifier.GetDeviceId()}");
             LogHelper.WriteLogToFile($"App | 使用频率: {DeviceIdentifier.GetUsageFrequency()}");
             LogHelper.WriteLogToFile($"App | 更新优先级: {DeviceIdentifier.GetUpdatePriority()}");
@@ -857,7 +935,7 @@ namespace Ink_Canvas
                             LogHelper.WriteLogToFile("App | 清理损坏的更新标记文件");
                         }
                     }
-                    catch { }
+                    catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
                 }
             }
 
@@ -917,6 +995,22 @@ namespace Ink_Canvas
                             LogHelper.WriteLogToFile("通过IPC发送展开浮动栏命令失败", LogHelper.LogType.Warning);
                         }
                     }
+                    // 检查是否有URI参数
+                    else if (e.Args.Any(a => a.StartsWith("icc:", StringComparison.OrdinalIgnoreCase)))
+                    {
+                        string uriArg = e.Args.FirstOrDefault(a => a.StartsWith("icc:", StringComparison.OrdinalIgnoreCase));
+                        LogHelper.WriteLogToFile($"检测到已运行实例且有URI参数: {uriArg}", LogHelper.LogType.Event);
+
+                        // 尝试通过IPC发送URI命令给已运行实例
+                        if (FileAssociationManager.TrySendUriCommandToExistingInstance(uriArg))
+                        {
+                            LogHelper.WriteLogToFile("URI命令已通过IPC发送给已运行实例", LogHelper.LogType.Event);
+                        }
+                        else
+                        {
+                            LogHelper.WriteLogToFile("通过IPC发送URI命令失败", LogHelper.LogType.Warning);
+                        }
+                    }
                     else
                     {
                         LogHelper.WriteLogToFile("检测到已运行实例，但无文件参数", LogHelper.LogType.Event);
@@ -934,7 +1028,7 @@ namespace Ink_Canvas
                             watchdogProcess.Kill();
                         }
                     }
-                    catch { }
+                    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
                     Environment.Exit(0);
                 }
             }
@@ -962,7 +1056,7 @@ namespace Ink_Canvas
                 mutex = new Mutex(true, mutexName, out bool tempRet);
 
                 // 额外等待一小段时间确保更新进程完全退出
-                Thread.Sleep(1000);
+                await Task.Delay(1000);
                 LogHelper.WriteLogToFile("App | 特殊模式等待完成，继续启动");
             }
 
@@ -983,6 +1077,18 @@ namespace Ink_Canvas
             // 主窗口加载完成后关闭启动画面
             mainWindow.Loaded += (s, args) =>
             {
+                isStartupComplete = true;
+                startupCompleteHeartbeat = DateTime.Now;
+                if (_isSplashScreenShown && splashScreenStartTime != DateTime.MinValue)
+                {
+                    LogHelper.WriteLogToFile($"启动完成心跳已记录，启动画面显示时长: {(startupCompleteHeartbeat - splashScreenStartTime).TotalSeconds:F2}秒");
+                }
+                else
+                {
+                    LogHelper.WriteLogToFile($"启动完成心跳已记录");
+                }
+                LogHelper.WriteLogToFile($"启动时长: {(startupCompleteHeartbeat - appStartupStartTime).TotalSeconds:F2}秒");
+
                 if (_isSplashScreenShown)
                 {
                     SetSplashMessage("完成初始化...");
@@ -1005,6 +1111,21 @@ namespace Ink_Canvas
 
             mainWindow.Show();
 
+            // 处理启动时的URI参数
+            string startupUriArg = e.Args.FirstOrDefault(a => a.StartsWith("icc:", StringComparison.OrdinalIgnoreCase));
+            if (!string.IsNullOrEmpty(startupUriArg))
+            {
+                LogHelper.WriteLogToFile($"App | 处理启动URI参数: {startupUriArg}", LogHelper.LogType.Event);
+                // 延迟一点执行，确保窗口初始化完成
+                Task.Delay(1000).ContinueWith(_ =>
+                {
+                    mainWindow.Dispatcher.Invoke(() =>
+                    {
+                        mainWindow.HandleUriCommand(startupUriArg);
+                    });
+                });
+            }
+
             // 注册.icstk文件关联
             try
             {
@@ -1028,6 +1149,17 @@ namespace Ink_Canvas
                 LogHelper.WriteLogToFile($"启动IPC监听器时出错: {ex.Message}", LogHelper.LogType.Error);
             }
 
+            // 初始化上传帮助类
+            try
+            {
+                LogHelper.WriteLogToFile("初始化上传帮助类");
+                Helpers.UploadHelper.Initialize();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"初始化上传帮助类时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+
         }
 
         private void ScrollViewer_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
@@ -1043,9 +1175,9 @@ namespace Ink_Canvas
                         SenderScrollViewer.ScrollToVerticalOffset(SenderScrollViewer.VerticalOffset - e.Delta * 10 * SystemInformation.MouseWheelScrollLines / (double)120);
                         e.Handled = true;
                     }
-                    catch { }
+                    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
 
         // 用于设置崩溃后操作类型
@@ -1056,37 +1188,105 @@ namespace Ink_Canvas
         }
 
         // 心跳相关
-        private static Timer heartbeatTimer;
+        private static DispatcherTimer heartbeatTimer;
         private static DateTime lastHeartbeat = DateTime.Now;
         private static Timer watchdogTimer;
+        private static bool isStartupComplete = false;
+        private static DateTime startupCompleteHeartbeat = DateTime.MinValue;
+        private static DateTime splashScreenStartTime = DateTime.MinValue;
+        private static DateTime appStartupStartTime = DateTime.MinValue;
 
+        /// <summary>
+        /// 启动并管理应用的心跳与守护检查定时器，监测启动阶段与主线程是否无响应，并在符合配置的情况下尝试静默重启应用。
+        /// </summary>
+        /// <remarks>
+        /// - 启动一个每秒更新心跳时间戳的调度定时器和一个每3秒运行的守护定时器。  
+        /// - 守护定时器在首次运行的启动阶段若检测到超过两分钟未完成启动，会根据 CrashAction 配置尝试静默重启。  
+        /// - 在启动完成后若检测到主线程超过10秒无响应，会根据 CrashAction 配置尝试静默重启。  
+        /// - 对连续重启次数有保护：若重启计数达到或超过5次，会弹出提示并停止自动重启（重置重启计数并退出进程）。  
+        /// - 在 OOBE（首次引导）展示期间不执行守护检查。  
+        /// - 该方法会产生外部可观察的副作用：可能启动新进程并调用 Environment.Exit 终止当前进程，或显示消息框。
+        /// </remarks>
         private void StartHeartbeatMonitor()
         {
-            // 主线程定时更新心跳
-            heartbeatTimer = new Timer(_ => lastHeartbeat = DateTime.Now, null, 0, 1000);
-            // 辅助线程检测心跳超时
+            heartbeatTimer = new DispatcherTimer
+            {
+                Interval = TimeSpan.FromSeconds(1)
+            };
+            heartbeatTimer.Tick += (_, __) => lastHeartbeat = DateTime.Now;
+            heartbeatTimer.Start();
+
             watchdogTimer = new Timer(_ =>
             {
-                if ((DateTime.Now - lastHeartbeat).TotalSeconds > 10)
+                if (IsOobeShowing)
+                    return;
+
+                if (!isStartupComplete && appStartupStartTime != DateTime.MinValue)
                 {
-                    LogHelper.NewLog("检测到主线程无响应，自动重启。");
-                    SyncCrashActionFromSettings(); // 新增：心跳检测时同步最新设置
-                    if (CrashAction == CrashActionType.SilentRestart)
+                    DateTime startTime = _isSplashScreenShown && splashScreenStartTime != DateTime.MinValue
+                        ? splashScreenStartTime
+                        : appStartupStartTime;
+                    TimeSpan elapsedSinceStart = DateTime.Now - startTime;
+                    if (elapsedSinceStart.TotalMinutes >= 2)
                     {
-                        StartupCount.Increment();
-                        if (StartupCount.GetCount() >= 5)
+                        string timeType = _isSplashScreenShown ? "启动画面已显示" : "应用启动开始";
+                        LogHelper.WriteLogToFile($"检测到启动假死：{timeType}{elapsedSinceStart.TotalMinutes:F2}分钟，但未收到启动完成心跳，自动重启。", LogHelper.LogType.Error);
+                        SyncCrashActionFromSettings();
+                        if (CrashAction == CrashActionType.SilentRestart)
                         {
-                            MessageBox.Show("检测到程序已连续重启5次，已停止自动重启。请联系开发者或检查系统环境。", "重启次数过多", MessageBoxButton.OK, MessageBoxImage.Error);
-                            StartupCount.Reset();
+                            StartupCount.Increment();
+                            if (StartupCount.GetCount() >= 5)
+                            {
+                                MessageBox.Show(Strings.GetString("Msg_RestartLimit"), Strings.GetString("Msg_RestartLimitTitle"), MessageBoxButton.OK, MessageBoxImage.Error);
+                                StartupCount.Reset();
+                                Environment.Exit(1);
+                            }
+                            try
+                            {
+                                string exePath = Process.GetCurrentProcess().MainModule.FileName;
+                                Process.Start(exePath);
+                            }
+                            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
                             Environment.Exit(1);
                         }
-                        try
+                        return;
+                    }
+                }
+
+                if (isStartupComplete)
+                {
+                    var now = DateTime.Now;
+                    var sinceHeartbeat = now - lastHeartbeat;
+                    var sinceStartupComplete = startupCompleteHeartbeat == DateTime.MinValue
+                        ? TimeSpan.Zero
+                        : now - startupCompleteHeartbeat;
+
+                    if (sinceStartupComplete.TotalSeconds < 30)
+                    {
+                        return;
+                    }
+
+                    if (sinceHeartbeat.TotalSeconds > 10)
+                    {
+                        LogHelper.NewLog("检测到主线程无响应，自动重启。");
+                        SyncCrashActionFromSettings();
+                        if (CrashAction == CrashActionType.SilentRestart)
                         {
-                            string exePath = Process.GetCurrentProcess().MainModule.FileName;
-                            Process.Start(exePath);
+                            StartupCount.Increment();
+                            if (StartupCount.GetCount() >= 5)
+                            {
+                                MessageBox.Show(Strings.GetString("Msg_RestartLimit"), Strings.GetString("Msg_RestartLimitTitle"), MessageBoxButton.OK, MessageBoxImage.Error);
+                                StartupCount.Reset();
+                                Environment.Exit(1);
+                            }
+                            try
+                            {
+                                string exePath = Process.GetCurrentProcess().MainModule.FileName;
+                                Process.Start(exePath);
+                            }
+                            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+                            Environment.Exit(1);
                         }
-                        catch { }
-                        Environment.Exit(1);
                     }
                 }
             }, null, 0, 3000);
@@ -1110,7 +1310,16 @@ namespace Ink_Canvas
             watchdogProcess = Process.Start(psi);
         }
 
-        // 看门狗主逻辑
+        /// <summary>
+        /// 作为守护进程监视指定的主进程，并在主进程异常退出时根据配置执行重启或退出操作。
+        /// </summary>
+        /// <remarks>
+        /// 该方法期望命令行参数格式为："--watchdog &lt;pid&gt; &lt;exitSignalFile&gt;"（args[1..3]）。
+        /// - 每 2 秒检查一次指定的主进程是否仍在运行；同时检测退出信号文件，若存在则删除该文件并以代码 0 退出守护进程。  
+        /// - 当主进程退出时，会同步崩溃处理设置（SyncCrashActionFromSettings）。若启用了 UIA 顶层访问（IsUIAccessTopMostEnabled），守护进程直接退出。  
+        /// - 若崩溃动作为 SilentRestart，则增加启动计数并：当连续重启计数达到 5 次及以上时弹出错误对话框、重置计数并以代码 1 退出；否则启动新的主进程实例。  
+        /// 方法对内部异常静默处理，并在完成后确保进程退出。
+        /// </remarks>
         public static void RunWatchdogIfNeeded()
         {
             var args = Environment.GetCommandLineArgs();
@@ -1126,37 +1335,105 @@ namespace Ink_Canvas
                         // 检查退出信号文件
                         if (File.Exists(exitSignalFile))
                         {
-                            try { File.Delete(exitSignalFile); } catch { }
+                            try { File.Delete(exitSignalFile); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
                             Environment.Exit(0);
                         }
                         Thread.Sleep(2000);
                     }
                     // 主进程异常退出，自动重启前判断崩溃后操作
                     SyncCrashActionFromSettings(); // 同步设置
-                    
+
                     if (IsUIAccessTopMostEnabled)
                     {
                         Environment.Exit(0);
                     }
-                    
+
                     if (CrashAction == CrashActionType.SilentRestart)
                     {
                         StartupCount.Increment();
                         if (StartupCount.GetCount() >= 5)
                         {
-                            MessageBox.Show("检测到程序已连续重启5次，已停止自动重启。请联系开发者或检查系统环境。", "重启次数过多", MessageBoxButton.OK, MessageBoxImage.Error);
+                            MessageBox.Show(Strings.GetString("Msg_RestartLimit"), Strings.GetString("Msg_RestartLimitTitle"), MessageBoxButton.OK, MessageBoxImage.Error);
                             StartupCount.Reset();
                             Environment.Exit(1);
                         }
-                        string exePath = Process.GetCurrentProcess().MainModule.FileName;
-                        Process.Start(exePath);
+                        else
+                        {
+                            string exePath = Process.GetCurrentProcess().MainModule.FileName;
+                            Process.Start(exePath);
+                        }
                     }
                 }
-                catch { }
+                catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
                 Environment.Exit(0);
             }
         }
 
+        internal static string GetDlassTelemetryDsn()
+        {
+            try
+            {
+                var envDsn = Environment.GetEnvironmentVariable("DLASS_SENTRY_DSN");
+                if (!string.IsNullOrWhiteSpace(envDsn))
+                {
+                    return envDsn;
+                }
+
+                try
+                {
+                    var assembly = Assembly.GetExecutingAssembly();
+                    var resourceName = "Ink_Canvas.telemetry_dsn.txt";
+                    using (Stream stream = assembly.GetManifestResourceStream(resourceName))
+                    {
+                        if (stream != null)
+                        {
+                            using (StreamReader reader = new StreamReader(stream, System.Text.Encoding.UTF8))
+                            {
+                                string dsn = reader.ReadToEnd().Trim();
+                                if (!string.IsNullOrWhiteSpace(dsn))
+                                {
+                                    return dsn;
+                                }
+                            }
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"从程序集资源读取遥测 DSN 失败: {ex.Message}", LogHelper.LogType.Warning);
+                }
+
+                string assemblyLocation = Assembly.GetExecutingAssembly().Location;
+                string currentDir = Path.GetDirectoryName(assemblyLocation);
+
+                for (int i = 0; i < 5; i++)
+                {
+                    string dsnFilePath = Path.Combine(currentDir, "telemetry_dsn.txt");
+                    if (File.Exists(dsnFilePath))
+                    {
+                        string dsn = File.ReadAllText(dsnFilePath, System.Text.Encoding.UTF8).Trim();
+                        if (!string.IsNullOrWhiteSpace(dsn))
+                        {
+                            return dsn;
+                        }
+                    }
+
+                    DirectoryInfo parentDir = Directory.GetParent(currentDir);
+                    if (parentDir == null)
+                    {
+                        break;
+                    }
+                    currentDir = parentDir.FullName;
+                }
+
+                return string.Empty;
+            }
+            catch
+            {
+                return string.Empty;
+            }
+        }
+
         private void App_Exit(object sender, ExitEventArgs e)
         {
             // 仅在软件内主动退出时关闭看门狗，并写入退出信号
@@ -1195,7 +1472,7 @@ namespace Ink_Canvas
                 {
                     LogHelper.WriteLogToFile($"退出处理时发生错误: {ex.Message}", LogHelper.LogType.Error);
                 }
-                catch { }
+                catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
             }
         }
     }

Ink Canvas/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Windows;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("CJK_mkp")]
 [assembly: AssemblyProduct("InkCanvasForClass")]
-[assembly: AssemblyCopyright("Copyright © CJK_mkp 2025")]
+[assembly: AssemblyCopyright("Copyright © CJK_mkp 2025-2026")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -19,14 +19,8 @@ using System.Windows;
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+// i18n: 默认/回退语言为简体中文，与 Strings.resx 默认文案一致。
+[assembly: System.Resources.NeutralResourcesLanguage("zh-CN", System.Resources.UltimateResourceFallbackLocation.MainAssembly)]
 
 
 [assembly: ThemeInfo(
@@ -49,5 +43,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.18.1")]
-[assembly: AssemblyFileVersion("1.7.18.1")]
+[assembly: AssemblyVersion("1.7.18.9")]
+[assembly: AssemblyFileVersion("1.7.18.9")]

Ink Canvas/Controls/QuickDrawFloatingButtonControl.xaml

@@ -6,15 +6,6 @@
              mc:Ignorable="d"
              Width="65" Height="45">
     
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <!-- 悬浮按钮资源 -->
-            <SolidColorBrush x:Key="QuickDrawFloatingButtonBackground" Color="#80000000"/>
-            <SolidColorBrush x:Key="QuickDrawFloatingButtonBorderBrush" Color="#40000000"/>
-            <SolidColorBrush x:Key="QuickDrawFloatingButtonIconForeground" Color="White"/>
-        </ResourceDictionary>
-    </UserControl.Resources>
-
     <Border Background="{DynamicResource QuickDrawFloatingButtonBackground}" 
             CornerRadius="8" 
             BorderThickness="1" 

Ink Canvas/Controls/QuickDrawFloatingButtonControl.xaml.cs

@@ -1,11 +1,10 @@
-using Ink_Canvas.Windows;
 using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Threading;
-using MouseEventArgs = System.Windows.Input.MouseEventArgs;
 using HorizontalAlignment = System.Windows.HorizontalAlignment;
+using MouseEventArgs = System.Windows.Input.MouseEventArgs;
 using VerticalAlignment = System.Windows.VerticalAlignment;
 
 namespace Ink_Canvas.Controls
@@ -33,7 +32,7 @@ namespace Ink_Canvas.Controls
             {
                 // 如果正在拖动，不触发点击事件
                 if (_isDragging) return;
-                
+
                 // 打开快抽窗口
                 var quickDrawWindow = new QuickDrawWindow();
                 quickDrawWindow.ShowDialog();
@@ -50,10 +49,10 @@ namespace Ink_Canvas.Controls
         private void DragArea_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             _isDragging = false;
-            
+
             // 记录鼠标在屏幕上的初始位置
             _dragStartPoint = this.PointToScreen(e.GetPosition(this));
-            
+
             // 记录控件的初始位置
             var parent = this.Parent as FrameworkElement;
             if (parent != null)
@@ -69,7 +68,7 @@ namespace Ink_Canvas.Controls
                     double.IsNaN(currentMargin.Left) ? 0 : currentMargin.Left,
                     double.IsNaN(currentMargin.Top) ? 0 : currentMargin.Top);
             }
-            
+
             ((UIElement)sender).CaptureMouse();
             e.Handled = true;
         }
@@ -84,7 +83,7 @@ namespace Ink_Canvas.Controls
                 // 获取鼠标在屏幕上的当前位置
                 Point currentScreenPoint = this.PointToScreen(e.GetPosition(this));
                 Vector diff = currentScreenPoint - _dragStartPoint;
-                
+
                 if (!_isDragging && (Math.Abs(diff.X) > 3 || Math.Abs(diff.Y) > 3))
                 {
                     _isDragging = true;
@@ -92,7 +91,7 @@ namespace Ink_Canvas.Controls
                     this.HorizontalAlignment = HorizontalAlignment.Left;
                     this.VerticalAlignment = VerticalAlignment.Top;
                 }
-                
+
                 if (_isDragging)
                 {
                     // 计算新位置
@@ -102,19 +101,19 @@ namespace Ink_Canvas.Controls
                         // 计算屏幕坐标相对于父容器的位置
                         var parentPoint = parent.PointFromScreen(currentScreenPoint);
                         var startParentPoint = parent.PointFromScreen(_dragStartPoint);
-                        
+
                         // 计算相对于初始位置的偏移
                         double offsetX = parentPoint.X - startParentPoint.X;
                         double offsetY = parentPoint.Y - startParentPoint.Y;
-                        
+
                         // 新位置 = 初始位置 + 偏移
                         double newLeft = _controlStartPoint.X + offsetX;
                         double newTop = _controlStartPoint.Y + offsetY;
-                        
+
                         // 限制在父容器范围内
                         newLeft = Math.Max(0, Math.Min(newLeft, parent.ActualWidth - this.ActualWidth));
                         newTop = Math.Max(0, Math.Min(newTop, parent.ActualHeight - this.ActualHeight));
-                        
+
                         // 更新Margin
                         this.Margin = new Thickness(newLeft, newTop, 0, 0);
                     }
@@ -131,17 +130,17 @@ namespace Ink_Canvas.Controls
             {
                 ((UIElement)sender).ReleaseMouseCapture();
             }
-            
+
             if (_isDragging)
             {
-                Dispatcher.BeginInvoke(new Action(() => { _isDragging = false; }), 
+                Dispatcher.BeginInvoke(new Action(() => { _isDragging = false; }),
                     DispatcherPriority.Background);
             }
             else
             {
                 _isDragging = false;
             }
-            
+
             e.Handled = true;
         }
     }

Ink Canvas/Helpers/AnimationsHelper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
@@ -73,7 +73,7 @@ namespace Ink_Canvas.Helpers
 
                 sb.Begin((FrameworkElement)element);
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
 
         public static void ShowWithSlideFromLeftAndFade(UIElement element, double duration = 0.25)
@@ -113,7 +113,7 @@ namespace Ink_Canvas.Helpers
 
                 sb.Begin((FrameworkElement)element);
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
 
         public static void ShowWithScaleFromLeft(UIElement element, double duration = 0.2)
@@ -156,7 +156,7 @@ namespace Ink_Canvas.Helpers
 
                 sb.Begin((FrameworkElement)element);
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
 
         public static void ShowWithScaleFromRight(UIElement element, double duration = 0.2)
@@ -200,7 +200,7 @@ namespace Ink_Canvas.Helpers
 
                 sb.Begin((FrameworkElement)element);
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
 
         public static void HideWithSlideAndFade(UIElement element, double duration = 0.15)
@@ -246,7 +246,7 @@ namespace Ink_Canvas.Helpers
                 element.RenderTransform = new TranslateTransform();
                 sb.Begin((FrameworkElement)element);
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
 
         public static void HideWithFadeOut(UIElement element, double duration = 0.15)

Ink Canvas/Helpers/AutoBackupManager.cs

@@ -19,7 +19,7 @@ namespace Ink_Canvas.Helpers
         /// 检查是否需要执行自动备份
         /// </summary>
         /// <param name="settings">设置对象</param>
-        /// <returns>如果需要备份返回true，否则返回false</returns>
+        /// <returns>如果需要备份返回<see langword="true"/>，否则返回<see langword="false"/></returns>
         public static bool ShouldPerformAutoBackup(Settings settings)
         {
             try
@@ -50,8 +50,11 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 执行自动备份
         /// </summary>
-        /// <param name="settings">设置对象</param>
-        /// <returns>备份是否成功</returns>
+        /// <remarks>
+        /// 为主配置文件创建一次自动备份并在成功后更新并保存设置中的最后备份时间。
+        /// </remarks>
+        /// <param name="settings">应用的设置对象；在成功备份后会更新 settings.Advanced.LastAutoBackupTime 并调用保存操作。</param>
+        /// <returns><see langword="true"/> 表示备份成功，<see langword="false"/> 表示备份失败或被跳过。</returns>
         public static bool PerformAutoBackup(Settings settings)
         {
             try
@@ -59,7 +62,7 @@ namespace Ink_Canvas.Helpers
                 // 确保备份目录存在
                 if (!Directory.Exists(BackupDir))
                 {
-                    Directory.CreateDirectory(BackupDir);
+                    ProcessProtectionManager.WithWriteAccess(BackupDir, () => Directory.CreateDirectory(BackupDir));
                 }
 
                 // 检查主配置文件是否存在
@@ -74,7 +77,7 @@ namespace Ink_Canvas.Helpers
                 string backupPath = Path.Combine(BackupDir, backupFileName);
 
                 // 复制主配置文件到备份位置
-                File.Copy(SettingsFile, backupPath, true);
+                ProcessProtectionManager.WithWriteAccess(backupPath, () => File.Copy(SettingsFile, backupPath, true));
 
                 // 更新最后备份时间
                 settings.Advanced.LastAutoBackupTime = DateTime.Now;
@@ -91,7 +94,10 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 尝试从备份恢复配置文件
         /// </summary>
-        /// <returns>恢复是否成功</returns>
+        /// <remarks>
+        /// 从最新可用的自动备份恢复主设置文件（Settings.json）。如果当前设置文件存在，会先将其复制到备份目录并加上时间戳作为“损坏”的备份副本，然后用最新备份覆盖原文件。
+        /// </remarks>
+        /// <returns><see langword="true"/> 如果恢复成功，<see langword="false"/> 否则。</returns>
         public static bool TryRestoreFromBackup()
         {
             try
@@ -138,11 +144,11 @@ namespace Ink_Canvas.Helpers
                 if (File.Exists(SettingsFile))
                 {
                     string corruptedBackup = Path.Combine(BackupDir, $"Settings_Corrupted_{DateTime.Now:yyyyMMdd_HHmmss}.json");
-                    File.Copy(SettingsFile, corruptedBackup, true);
+                    ProcessProtectionManager.WithWriteAccess(corruptedBackup, () => File.Copy(SettingsFile, corruptedBackup, true));
                 }
 
                 // 从备份恢复配置文件
-                File.Copy(latestBackup, SettingsFile, true);
+                ProcessProtectionManager.WithWriteAccess(SettingsFile, () => File.Copy(latestBackup, SettingsFile, true));
                 return true;
             }
             catch (Exception ex)
@@ -156,6 +162,10 @@ namespace Ink_Canvas.Helpers
         /// 清理过期的备份文件
         /// 保留最近30天的备份文件
         /// </summary>
+        /// <remarks>
+        /// 删除备份目录中按“备份前缀”匹配且创建时间早于 30 天的自动备份文件（即自动备份文件的命名前缀），不会删除诸如 Settings_Corrupted_*.json 之类的其他备份或错误状态文件。
+        /// 如果备份目录不存在则不执行任何操作；删除操作在受写入保护的上下文中执行，任何错误会被记录但不会抛出异常。
+        /// </remarks>
         public static void CleanupOldBackups()
         {
             try
@@ -173,7 +183,7 @@ namespace Ink_Canvas.Helpers
                 {
                     if (File.GetCreationTime(file) < cutoffDate)
                     {
-                        File.Delete(file);
+                        ProcessProtectionManager.WithWriteAccess(file, () => File.Delete(file));
                         deletedCount++;
                     }
                 }

Ink Canvas/Helpers/AutoFontSizeHelper.cs

@@ -0,0 +1,444 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media;
+using System.Windows.Threading;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// Automatically shrinks text to fit available width.
+    /// Supports TextBlock and Label.
+    /// Only shrinks, never enlarges above MaxFontSize.
+    /// </summary>
+    public static class AutoFontSizeHelper
+    {
+        public static readonly DependencyProperty IsEnabledProperty =
+            DependencyProperty.RegisterAttached(
+                "IsEnabled",
+                typeof(bool),
+                typeof(AutoFontSizeHelper),
+                new PropertyMetadata(false, OnIsEnabledChanged));
+
+        public static void SetIsEnabled(DependencyObject element, bool value) => element.SetValue(IsEnabledProperty, value);
+        public static bool GetIsEnabled(DependencyObject element) => (bool)element.GetValue(IsEnabledProperty);
+
+        public static readonly DependencyProperty MinFontSizeProperty =
+            DependencyProperty.RegisterAttached(
+                "MinFontSize",
+                typeof(double),
+                typeof(AutoFontSizeHelper),
+                new PropertyMetadata(6d, OnSizingPropertyChanged));
+
+        public static void SetMinFontSize(DependencyObject element, double value) => element.SetValue(MinFontSizeProperty, value);
+        public static double GetMinFontSize(DependencyObject element) => (double)element.GetValue(MinFontSizeProperty);
+
+        public static readonly DependencyProperty MaxFontSizeProperty =
+            DependencyProperty.RegisterAttached(
+                "MaxFontSize",
+                typeof(double),
+                typeof(AutoFontSizeHelper),
+                new PropertyMetadata(double.NaN, OnSizingPropertyChanged));
+
+        public static void SetMaxFontSize(DependencyObject element, double value) => element.SetValue(MaxFontSizeProperty, value);
+        public static double GetMaxFontSize(DependencyObject element) => (double)element.GetValue(MaxFontSizeProperty);
+
+        public static readonly DependencyProperty StepProperty =
+            DependencyProperty.RegisterAttached(
+                "Step",
+                typeof(double),
+                typeof(AutoFontSizeHelper),
+                new PropertyMetadata(0.5d, OnSizingPropertyChanged));
+
+        public static void SetStep(DependencyObject element, double value) => element.SetValue(StepProperty, value);
+        public static double GetStep(DependencyObject element) => (double)element.GetValue(StepProperty);
+
+        private static readonly DependencyProperty IsAdjustingProperty =
+            DependencyProperty.RegisterAttached(
+                "IsAdjusting",
+                typeof(bool),
+                typeof(AutoFontSizeHelper),
+                new PropertyMetadata(false));
+
+        private static void SetIsAdjusting(DependencyObject element, bool value) => element.SetValue(IsAdjustingProperty, value);
+        private static bool GetIsAdjusting(DependencyObject element) => (bool)element.GetValue(IsAdjustingProperty);
+
+        private static readonly DependencyProperty OriginalFontSizeProperty =
+            DependencyProperty.RegisterAttached(
+                "OriginalFontSize",
+                typeof(double),
+                typeof(AutoFontSizeHelper),
+                new PropertyMetadata(double.NaN));
+
+        private static void SetOriginalFontSize(DependencyObject element, double value) => element.SetValue(OriginalFontSizeProperty, value);
+        private static double GetOriginalFontSize(DependencyObject element) => (double)element.GetValue(OriginalFontSizeProperty);
+
+        private static void OnIsEnabledChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (!(d is FrameworkElement fe)) return;
+            if (!(fe is TextBlock) && !(fe is Label)) return;
+
+            if ((bool)e.NewValue)
+            {
+                var originalFontSize = GetElementFontSize(fe);
+                if (!double.IsNaN(originalFontSize) && originalFontSize > 0)
+                {
+                    SetOriginalFontSize(fe, originalFontSize);
+                }
+
+                fe.SizeChanged += Element_OnSizeChanged;
+                fe.Loaded += Element_OnLoaded;
+                fe.Unloaded += Element_OnUnloaded;
+                TryHookContentChanged(fe, true);
+
+                fe.Dispatcher.BeginInvoke(new Action(() => TryAdjust(fe)), DispatcherPriority.Loaded);
+            }
+            else
+            {
+                fe.SizeChanged -= Element_OnSizeChanged;
+                fe.Loaded -= Element_OnLoaded;
+                fe.Unloaded -= Element_OnUnloaded;
+                TryHookContentChanged(fe, false);
+            }
+        }
+
+        private static void OnSizingPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is FrameworkElement fe && GetIsEnabled(fe))
+            {
+                fe.Dispatcher.BeginInvoke(new Action(() => TryAdjust(fe)), DispatcherPriority.Loaded);
+            }
+        }
+
+        private static void Element_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            if (sender is FrameworkElement fe)
+            {
+                fe.Dispatcher.BeginInvoke(new Action(() => TryAdjust(fe)), DispatcherPriority.Loaded);
+            }
+        }
+
+        private static void Element_OnUnloaded(object sender, RoutedEventArgs e)
+        {
+            // No extra cleanup required here.
+        }
+
+        private static void Element_OnSizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            if (sender is FrameworkElement fe) TryAdjust(fe);
+        }
+
+        private static void Element_OnTextChanged(object sender, EventArgs e)
+        {
+            if (sender is FrameworkElement fe)
+            {
+                fe.Dispatcher.BeginInvoke(new Action(() => TryAdjust(fe)), DispatcherPriority.Loaded);
+            }
+        }
+
+        private static void TryHookContentChanged(FrameworkElement fe, bool add)
+        {
+            try
+            {
+                DependencyPropertyDescriptor dpd = null;
+                if (fe is TextBlock)
+                {
+                    dpd = DependencyPropertyDescriptor.FromProperty(TextBlock.TextProperty, typeof(TextBlock));
+                }
+                else if (fe is Label)
+                {
+                    dpd = DependencyPropertyDescriptor.FromProperty(ContentControl.ContentProperty, typeof(ContentControl));
+                }
+
+                if (dpd == null) return;
+                if (add) dpd.AddValueChanged(fe, Element_OnTextChanged);
+                else dpd.RemoveValueChanged(fe, Element_OnTextChanged);
+            }
+            catch
+            {
+                // Ignore descriptor issues in rare runtime cases.
+            }
+        }
+
+        private static void TryAdjust(FrameworkElement fe)
+        {
+            if (fe == null) return;
+            if (!GetIsEnabled(fe)) return;
+            if (GetIsAdjusting(fe)) return;
+
+            var text = GetElementText(fe);
+            if (string.IsNullOrEmpty(text)) return;
+
+            if (!ShouldAutoScaleForCurrentCulture(text))
+            {
+                RestoreOriginalFontSize(fe);
+                return;
+            }
+
+            var availableWidth = GetAvailableWidth(fe);
+            if (double.IsNaN(availableWidth) || availableWidth <= 1) return;
+
+            var min = GetMinFontSize(fe);
+            if (double.IsNaN(min) || min <= 0) min = 6d;
+
+            var step = GetStep(fe);
+            if (double.IsNaN(step) || step < 0.1) step = 0.5d;
+
+            var current = GetElementFontSize(fe);
+            if (double.IsNaN(current) || current <= 0) return;
+
+            var max = GetMaxFontSize(fe);
+            if (double.IsNaN(max) || max <= 0) max = current;
+            // Never enlarge: auto-fit should only reduce font size when needed.
+            if (max > current) max = current;
+
+            var startFont = Math.Min(current, max);
+            if (startFont < min) startFont = min;
+
+            SetIsAdjusting(fe, true);
+            try
+            {
+                var font = startFont;
+                var desired = MeasureTextWidth(fe, text, font);
+                if (desired <= 0) return;
+
+                while (font > min && desired > availableWidth + 0.5)
+                {
+                    font = Math.Max(min, font - step);
+                    desired = MeasureTextWidth(fe, text, font);
+                    if (desired <= 0) break;
+                }
+
+                // Hard-fit fallback: when very narrow slots (e.g., 28px) still overflow at MinFontSize,
+                // keep shrinking proportionally so text always fits in the available width.
+                if (desired > availableWidth + 0.5)
+                {
+                    var hardFont = font;
+                    for (var i = 0; i < 6 && desired > availableWidth + 0.5; i++)
+                    {
+                        var ratio = availableWidth / Math.Max(1.0, desired);
+                        hardFont = Math.Max(1.0, hardFont * ratio);
+                        desired = MeasureTextWidth(fe, text, hardFont);
+                        if (desired <= 0) break;
+                    }
+
+                    font = hardFont;
+                }
+
+                if (!double.IsNaN(font) && font > 0 && Math.Abs(current - font) > 0.01)
+                {
+                    SetElementFontSize(fe, font);
+                }
+            }
+            finally
+            {
+                SetIsAdjusting(fe, false);
+            }
+        }
+
+        private static string GetElementText(FrameworkElement fe)
+        {
+            if (fe is TextBlock tb) return tb.Text;
+            if (fe is Label label) return label.Content as string ?? label.Content?.ToString();
+            return null;
+        }
+
+        private static bool ShouldAutoScaleForCurrentCulture(string text)
+        {
+            // Requirement: auto-scale for English UI only, keep Chinese font size unchanged.
+            var culture = CultureInfo.CurrentUICulture;
+            var name = culture?.Name ?? string.Empty;
+            if (name.StartsWith("en", StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            // Fallback: if actual rendered text is Latin-heavy, still auto-scale.
+            // This avoids clipping when culture detection is out of sync.
+            if (string.IsNullOrWhiteSpace(text)) return false;
+            foreach (var ch in text)
+            {
+                if ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z'))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private static void RestoreOriginalFontSize(FrameworkElement fe)
+        {
+            var original = GetOriginalFontSize(fe);
+            if (double.IsNaN(original) || original <= 0) return;
+
+            var current = GetElementFontSize(fe);
+            if (double.IsNaN(current) || current <= 0) return;
+
+            if (Math.Abs(current - original) > 0.01)
+            {
+                SetElementFontSize(fe, original);
+            }
+        }
+
+        private static double GetElementFontSize(FrameworkElement fe)
+        {
+            if (fe is TextBlock tb) return tb.FontSize;
+            if (fe is Label label) return label.FontSize;
+            return double.NaN;
+        }
+
+        private static void SetElementFontSize(FrameworkElement fe, double value)
+        {
+            if (fe is TextBlock tb) tb.FontSize = value;
+            else if (fe is Label label) label.FontSize = value;
+        }
+
+        private static double GetAvailableWidth(FrameworkElement fe)
+        {
+            double width = double.PositiveInfinity;
+
+            // Explicit width on the element itself should be a hard cap.
+            if (!double.IsNaN(fe.Width) && !double.IsInfinity(fe.Width) && fe.Width > 1)
+            {
+                width = Math.Min(width, fe.Width - fe.Margin.Left - fe.Margin.Right);
+            }
+
+            if (!double.IsNaN(fe.MaxWidth) && !double.IsInfinity(fe.MaxWidth) && fe.MaxWidth > 1)
+            {
+                width = Math.Min(width, fe.MaxWidth - fe.Margin.Left - fe.Margin.Right);
+            }
+
+            // Prefer the real layout slot first. This is usually the most accurate
+            // "space actually assigned by layout" for the element.
+            var slot = LayoutInformation.GetLayoutSlot(fe);
+            if (!double.IsNaN(slot.Width) && !double.IsInfinity(slot.Width))
+            {
+                var slotWidth = slot.Width - fe.Margin.Left - fe.Margin.Right;
+                if (slotWidth > 1) width = Math.Min(width, slotWidth);
+            }
+
+            if (fe.ActualWidth > 1) width = Math.Min(width, fe.ActualWidth);
+
+            // Immediate parent may be a StackPanel that does not constrain width.
+            // Walk a few ancestors and take the tightest finite width as fallback.
+            DependencyObject ancestor = fe.Parent ?? VisualTreeHelper.GetParent(fe);
+            var depth = 0;
+            while (ancestor != null && depth < 8)
+            {
+                if (ancestor is FrameworkElement af && af.ActualWidth > 1)
+                {
+                    var candidate = af.ActualWidth;
+
+                    // If ancestor sets explicit width, treat it as a stronger cap.
+                    if (!double.IsNaN(af.Width) && !double.IsInfinity(af.Width) && af.Width > 1)
+                    {
+                        candidate = Math.Min(candidate, af.Width);
+                    }
+
+                    if (!double.IsNaN(af.MaxWidth) && !double.IsInfinity(af.MaxWidth) && af.MaxWidth > 1)
+                    {
+                        candidate = Math.Min(candidate, af.MaxWidth);
+                    }
+
+                    if (ancestor is Control ac)
+                    {
+                        candidate -= ac.Padding.Left + ac.Padding.Right;
+                        candidate -= ac.BorderThickness.Left + ac.BorderThickness.Right;
+                    }
+                    else if (ancestor is Border ab)
+                    {
+                        candidate -= ab.Padding.Left + ab.Padding.Right;
+                        candidate -= ab.BorderThickness.Left + ab.BorderThickness.Right;
+                    }
+
+                    if (candidate > 1) width = Math.Min(width, candidate);
+                }
+
+                ancestor = (ancestor as FrameworkElement)?.Parent ?? VisualTreeHelper.GetParent(ancestor);
+                depth++;
+            }
+
+            if (double.IsInfinity(width) || double.IsNaN(width) || width <= 1) return -1;
+
+            // Keep width as inner text area.
+            if (fe is Control control)
+            {
+                width -= control.Padding.Left + control.Padding.Right;
+                width -= control.BorderThickness.Left + control.BorderThickness.Right;
+            }
+            else if (fe is Border border)
+            {
+                width -= border.Padding.Left + border.Padding.Right;
+                width -= border.BorderThickness.Left + border.BorderThickness.Right;
+            }
+
+            return width;
+        }
+
+        private static double MeasureTextWidth(FrameworkElement fe, string text, double fontSize)
+        {
+            try
+            {
+                var dpi = VisualTreeHelper.GetDpi(fe);
+                var culture = CultureInfo.CurrentUICulture;
+
+                if (fe.Language != null)
+                {
+                    try
+                    {
+                        culture = fe.Language.GetEquivalentCulture();
+                    }
+                    catch
+                    {
+                    }
+                }
+
+                var fontFamily = SystemFonts.MessageFontFamily;
+                var fontStyle = FontStyles.Normal;
+                var fontWeight = FontWeights.Normal;
+                var fontStretch = FontStretches.Normal;
+                Brush foreground = Brushes.Black;
+                var flowDirection = FlowDirection.LeftToRight;
+
+                if (fe is TextBlock tb)
+                {
+                    fontFamily = tb.FontFamily;
+                    fontStyle = tb.FontStyle;
+                    fontWeight = tb.FontWeight;
+                    fontStretch = tb.FontStretch;
+                    foreground = tb.Foreground;
+                    flowDirection = tb.FlowDirection;
+                }
+                else if (fe is Label label)
+                {
+                    fontFamily = label.FontFamily;
+                    fontStyle = label.FontStyle;
+                    fontWeight = label.FontWeight;
+                    fontStretch = label.FontStretch;
+                    foreground = label.Foreground;
+                    flowDirection = label.FlowDirection;
+                }
+
+                var typeface = new Typeface(fontFamily, fontStyle, fontWeight, fontStretch);
+                var formatted = new FormattedText(
+                    text,
+                    culture,
+                    flowDirection,
+                    typeface,
+                    fontSize,
+                    foreground,
+                    dpi.PixelsPerDip);
+
+                return formatted.WidthIncludingTrailingWhitespace;
+            }
+            catch
+            {
+                return -1;
+            }
+        }
+    }
+}

Ink Canvas/Helpers/AutoUpdateHelper.cs

@@ -27,6 +27,87 @@ namespace Ink_Canvas.Helpers
         private static readonly string updatesFolderPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "AutoUpdate");
         private static string statusFilePath;
 
+        public static bool IsX64UpdatePackageSelected()
+        {
+            try
+            {
+                return MainWindow.Settings?.Startup?.UpdatePackageArchitecture == UpdatePackageArchitecture.X64;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        private static string NormalizeVersionForUpdate(string version)
+        {
+            if (string.IsNullOrWhiteSpace(version)) return version;
+            return version.Trim().TrimStart('v', 'V');
+        }
+
+        public static string AppendX64SuffixBeforeZipExtension(string url)
+        {
+            if (string.IsNullOrEmpty(url) || !IsX64UpdatePackageSelected()) return url;
+            int query = url.IndexOf('?');
+            string pathPart = query >= 0 ? url.Substring(0, query) : url;
+            string qs = query >= 0 ? url.Substring(query) : "";
+            const string ext = ".zip";
+            int idx = pathPart.LastIndexOf(ext, StringComparison.OrdinalIgnoreCase);
+            if (idx < 0) return url;
+            var basePart = pathPart.Substring(0, idx);
+            if (basePart.EndsWith("-x64", StringComparison.OrdinalIgnoreCase)) return url;
+            return basePart + "-x64" + ext + qs;
+        }
+
+        public static string GetUpdateZipFileName(string version)
+        {
+            var v = NormalizeVersionForUpdate(version);
+            return IsX64UpdatePackageSelected()
+                ? $"InkCanvasForClass.CE.{v}-x64.zip"
+                : $"InkCanvasForClass.CE.{v}.zip";
+        }
+
+        public static string GetUpdateDownloadStatusFilePath(string version)
+        {
+            var v = NormalizeVersionForUpdate(version);
+            string name = IsX64UpdatePackageSelected()
+                ? $"DownloadV{v}_x64Status.txt"
+                : $"DownloadV{v}Status.txt";
+            return Path.Combine(updatesFolderPath, name);
+        }
+
+        public static string GetLocalUpdateZipFilePath(string version)
+        {
+            return Path.Combine(updatesFolderPath, GetUpdateZipFileName(version));
+        }
+
+        private static string PickBrowserDownloadUrlFromAssets(JToken assets)
+        {
+            if (assets == null || !assets.Any()) return null;
+            bool wantX64 = IsX64UpdatePackageSelected();
+            string anyZip = null;
+            string x64Zip = null;
+            string nonX64Zip = null;
+            foreach (JToken a in assets)
+            {
+                string name = a["name"]?.ToString();
+                string url = a["browser_download_url"]?.ToString();
+                if (string.IsNullOrEmpty(name) || string.IsNullOrEmpty(url)) continue;
+                if (!name.EndsWith(".zip", StringComparison.OrdinalIgnoreCase)) continue;
+                if (anyZip == null) anyZip = url;
+                if (name.EndsWith("-x64.zip", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (x64Zip == null) x64Zip = url;
+                }
+                else
+                {
+                    if (nonX64Zip == null) nonX64Zip = url;
+                }
+            }
+            if (wantX64)
+                return x64Zip ?? anyZip;
+            return nonX64Zip ?? anyZip;
+        }
 
         // 线路组结构体（包含版本、下载、日志地址）
         public class UpdateLineGroup
@@ -74,6 +155,99 @@ namespace Ink_Canvas.Helpers
                         GroupName = "inkeys",
                         DownloadUrlFormat = "https://iccce.inkeys.top/Release/InkCanvasForClass.CE.{0}.zip",
                         LogUrl = "https://bgithub.xyz/InkCanvasForClass/community/raw/refs/heads/main/UpdateLog.md"
+                    },
+                    new UpdateLineGroup
+                    {
+                        GroupName = "gh-proxy",
+                        VersionUrl = "https://gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community/refs/heads/main/AutomaticUpdateVersionControl.txt",
+                        DownloadUrlFormat = "https://gh-proxy.org/https://github.com/InkCanvasForClass/community/releases/download/{0}/InkCanvasForClass.CE.{0}.zip",
+                        LogUrl = "https://gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community/refs/heads/main/UpdateLog.md"
+                    },
+                    new UpdateLineGroup
+                    {
+                        GroupName = "hk.gh-proxy",
+                        VersionUrl = "https://hk.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community/refs/heads/main/AutomaticUpdateVersionControl.txt",
+                        DownloadUrlFormat = "https://hk.gh-proxy.org/https://github.com/InkCanvasForClass/community/releases/download/{0}/InkCanvasForClass.CE.{0}.zip",
+                        LogUrl = "https://hk.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community/refs/heads/main/UpdateLog.md"
+                    },
+                    new UpdateLineGroup
+                    {
+                        GroupName = "cdn.gh-proxy",
+                        VersionUrl = "https://cdn.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community/refs/heads/main/AutomaticUpdateVersionControl.txt",
+                        DownloadUrlFormat = "https://cdn.gh-proxy.org/https://github.com/InkCanvasForClass/community/releases/download/{0}/InkCanvasForClass.CE.{0}.zip",
+                        LogUrl = "https://cdn.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community/refs/heads/main/UpdateLog.md"
+                    },
+                    new UpdateLineGroup
+                    {
+                        GroupName = "edgeone.gh-proxy",
+                        VersionUrl = "https://edgeone.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community/refs/heads/main/AutomaticUpdateVersionControl.txt",
+                        DownloadUrlFormat = "https://edgeone.gh-proxy.org/https://github.com/InkCanvasForClass/community/releases/download/{0}/InkCanvasForClass.CE.{0}.zip",
+                        LogUrl = "https://edgeone.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community/refs/heads/main/UpdateLog.md"
+                    }
+                }
+            },
+            { UpdateChannel.Preview, new List<UpdateLineGroup>
+                {
+                    new UpdateLineGroup
+                    {
+                        GroupName = "GitHub主线",
+                        VersionUrl = "https://github.com/InkCanvasForClass/community-beta/raw/refs/heads/main/AutomaticUpdateVersionControl.txt",
+                        DownloadUrlFormat = "https://github.com/InkCanvasForClass/community-beta/releases/download/{0}/InkCanvasForClass.CE.{0}.zip",
+                        LogUrl = "https://github.com/InkCanvasForClass/community-beta/raw/refs/heads/main/UpdateLog.md"
+                    },
+                    new UpdateLineGroup
+                    {
+                        GroupName = "bgithub备用",
+                        VersionUrl = "https://bgithub.xyz/InkCanvasForClass/community-beta/raw/refs/heads/main/AutomaticUpdateVersionControl.txt",
+                        DownloadUrlFormat = "https://bgithub.xyz/InkCanvasForClass/community-beta/releases/download/{0}/InkCanvasForClass.CE.{0}.zip",
+                        LogUrl = "https://bgithub.xyz/InkCanvasForClass/community-beta/raw/refs/heads/main/UpdateLog.md"
+                    },
+                    new UpdateLineGroup
+                    {
+                        GroupName = "kkgithub线路",
+                        VersionUrl = "https://kkgithub.com/InkCanvasForClass/community-beta/raw/refs/heads/main/AutomaticUpdateVersionControl.txt",
+                        DownloadUrlFormat = "https://kkgithub.com/InkCanvasForClass/community-beta/releases/download/{0}/InkCanvasForClass.CE.{0}.zip",
+                        LogUrl = "https://kkgithub.com/InkCanvasForClass/community-beta/raw/refs/heads/main/UpdateLog.md"
+                    },
+                    new UpdateLineGroup
+                    {
+                        GroupName = "智教联盟",
+                        DownloadUrlFormat = "https://get.smart-teach.cn/d/Ningbo-S3/shared/jiangling/community-beta/InkCanvasForClass.CE.{0}.zip",
+                        LogUrl = "https://bgithub.xyz/InkCanvasForClass/community-beta/raw/refs/heads/main/UpdateLog.md"
+                    },
+                    new UpdateLineGroup
+                    {
+                        GroupName = "inkeys",
+                        DownloadUrlFormat = "https://iccce.inkeys.top/Beta/InkCanvasForClass.CE.{0}.zip",
+                        LogUrl = "https://bgithub.xyz/InkCanvasForClass/community-beta/raw/refs/heads/main/UpdateLog.md"
+                    },
+                    new UpdateLineGroup
+                    {
+                        GroupName = "gh-proxy",
+                        VersionUrl = "https://gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community-beta/refs/heads/main/AutomaticUpdateVersionControl.txt",
+                        DownloadUrlFormat = "https://gh-proxy.org/https://github.com/InkCanvasForClass/community-beta/releases/download/{0}/InkCanvasForClass.CE.{0}.zip",
+                        LogUrl = "https://gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community-beta/refs/heads/main/UpdateLog.md"
+                    },
+                    new UpdateLineGroup
+                    {
+                        GroupName = "hk.gh-proxy",
+                        VersionUrl = "https://hk.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community-beta/refs/heads/main/AutomaticUpdateVersionControl.txt",
+                        DownloadUrlFormat = "https://hk.gh-proxy.org/https://github.com/InkCanvasForClass/community-beta/releases/download/{0}/InkCanvasForClass.CE.{0}.zip",
+                        LogUrl = "https://hk.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community-beta/refs/heads/main/UpdateLog.md"
+                    },
+                    new UpdateLineGroup
+                    {
+                        GroupName = "cdn.gh-proxy",
+                        VersionUrl = "https://cdn.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community-beta/refs/heads/main/AutomaticUpdateVersionControl.txt",
+                        DownloadUrlFormat = "https://cdn.gh-proxy.org/https://github.com/InkCanvasForClass/community-beta/releases/download/{0}/InkCanvasForClass.CE.{0}.zip",
+                        LogUrl = "https://cdn.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community-beta/refs/heads/main/UpdateLog.md"
+                    },
+                    new UpdateLineGroup
+                    {
+                        GroupName = "edgeone.gh-proxy",
+                        VersionUrl = "https://edgeone.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community-beta/refs/heads/main/AutomaticUpdateVersionControl.txt",
+                        DownloadUrlFormat = "https://edgeone.gh-proxy.org/https://github.com/InkCanvasForClass/community-beta/releases/download/{0}/InkCanvasForClass.CE.{0}.zip",
+                        LogUrl = "https://edgeone.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community-beta/refs/heads/main/UpdateLog.md"
                     }
                 }
             },
@@ -111,6 +285,34 @@ namespace Ink_Canvas.Helpers
                         GroupName = "inkeys",
                         DownloadUrlFormat = "https://iccce.inkeys.top/Beta/InkCanvasForClass.CE.{0}.zip",
                         LogUrl = "https://bgithub.xyz/InkCanvasForClass/community-beta/raw/refs/heads/main/UpdateLog.md"
+                    },
+                    new UpdateLineGroup
+                    {
+                        GroupName = "gh-proxy",
+                        VersionUrl = "https://gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community-beta/refs/heads/main/AutomaticUpdateVersionControl.txt",
+                        DownloadUrlFormat = "https://gh-proxy.org/https://github.com/InkCanvasForClass/community-beta/releases/download/{0}/InkCanvasForClass.CE.{0}.zip",
+                        LogUrl = "https://gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community-beta/refs/heads/main/UpdateLog.md"
+                    },
+                    new UpdateLineGroup
+                    {
+                        GroupName = "hk.gh-proxy",
+                        VersionUrl = "https://hk.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community-beta/refs/heads/main/AutomaticUpdateVersionControl.txt",
+                        DownloadUrlFormat = "https://hk.gh-proxy.org/https://github.com/InkCanvasForClass/community-beta/releases/download/{0}/InkCanvasForClass.CE.{0}.zip",
+                        LogUrl = "https://hk.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community-beta/refs/heads/main/UpdateLog.md"
+                    },
+                    new UpdateLineGroup
+                    {
+                        GroupName = "cdn.gh-proxy",
+                        VersionUrl = "https://cdn.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community-beta/refs/heads/main/AutomaticUpdateVersionControl.txt",
+                        DownloadUrlFormat = "https://cdn.gh-proxy.org/https://github.com/InkCanvasForClass/community-beta/releases/download/{0}/InkCanvasForClass.CE.{0}.zip",
+                        LogUrl = "https://cdn.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community-beta/refs/heads/main/UpdateLog.md"
+                    },
+                    new UpdateLineGroup
+                    {
+                        GroupName = "edgeone.gh-proxy",
+                        VersionUrl = "https://edgeone.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community-beta/refs/heads/main/AutomaticUpdateVersionControl.txt",
+                        DownloadUrlFormat = "https://edgeone.gh-proxy.org/https://github.com/InkCanvasForClass/community-beta/releases/download/{0}/InkCanvasForClass.CE.{0}.zip",
+                        LogUrl = "https://edgeone.gh-proxy.org/https://raw.githubusercontent.com/InkCanvasForClass/community-beta/refs/heads/main/UpdateLog.md"
                     }
                 }
             }
@@ -167,7 +369,7 @@ namespace Ink_Canvas.Helpers
                     }
                 }
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
             return -1;
         }
 
@@ -188,14 +390,46 @@ namespace Ink_Canvas.Helpers
 
             foreach (var group in groups)
             {
-                // 跳过"智教联盟"和"inkeys"线路组，不参与延迟检测和排序
+                string testUrl = null;
                 if (group.GroupName == "智教联盟" || group.GroupName == "inkeys")
                 {
-                    LogHelper.WriteLogToFile($"AutoUpdate | 跳过{group.GroupName}线路组延迟检测");
+                    try
+                    {
+                        if (!string.IsNullOrEmpty(group.DownloadUrlFormat))
+                        {
+                            testUrl = group.DownloadUrlFormat.Replace("{0}", "test");
+                            testUrl = AppendX64SuffixBeforeZipExtension(testUrl);
+                        }
+                    }
+                    catch
+                    {
+                        testUrl = null;
+                    }
+                }
+                else
+                {
+                    testUrl = group.VersionUrl;
+                }
+
+                if (string.IsNullOrEmpty(testUrl))
+                {
+                    LogHelper.WriteLogToFile($"AutoUpdate | 线路组 {group.GroupName} 缺少可用测速地址，跳过", LogHelper.LogType.Warning);
                     continue;
                 }
-                LogHelper.WriteLogToFile($"AutoUpdate | 检测线路组: {group.GroupName} ({group.VersionUrl})");
-                var delay = await GetUrlDelay(group.VersionUrl);
+
+                LogHelper.WriteLogToFile($"AutoUpdate | 检测线路组: {group.GroupName} ({testUrl})");
+
+                long delay;
+
+                if (group.GroupName == "智教联盟" || group.GroupName == "inkeys")
+                {
+                    delay = await GetDownloadUrlDelay(testUrl);
+                }
+                else
+                {
+                    delay = await GetUrlDelay(testUrl);
+                }
+
                 if (delay >= 0)
                 {
                     LogHelper.WriteLogToFile($"AutoUpdate | 线路组 {group.GroupName} 延迟: {delay}ms");
@@ -213,20 +447,12 @@ namespace Ink_Canvas.Helpers
                 .Select(x => x.group)
                 .ToList();
 
-            // 将"inkeys"线路组插入到最前面（如果存在）
-            var inkeysGroup = groups.FirstOrDefault(g => g.GroupName == "inkeys");
+            var inkeysGroup = orderedGroups.FirstOrDefault(g => g.GroupName == "inkeys");
             if (inkeysGroup != null)
             {
+                orderedGroups.Remove(inkeysGroup);
                 orderedGroups.Insert(0, inkeysGroup);
-                LogHelper.WriteLogToFile("AutoUpdate | inkeys线路组已插入到首位");
-            }
-
-            // 将"智教联盟"线路组插入到第二位（如果存在）
-            var zhiJiaoGroup = groups.FirstOrDefault(g => g.GroupName == "智教联盟");
-            if (zhiJiaoGroup != null)
-            {
-                orderedGroups.Insert(1, zhiJiaoGroup);
-                LogHelper.WriteLogToFile("AutoUpdate | 智教联盟线路组已插入到第二位");
+                LogHelper.WriteLogToFile("AutoUpdate | inkeys线路组已默认优先");
             }
 
             if (orderedGroups.Count > 0)
@@ -245,6 +471,47 @@ namespace Ink_Canvas.Helpers
             return orderedGroups;
         }
 
+        private static async Task<long> GetDownloadUrlDelay(string url)
+        {
+            try
+            {
+                var osVersion = Environment.OSVersion;
+                bool isWindows7 = osVersion.Version.Major == 6 && osVersion.Version.Minor == 1;
+
+                if (isWindows7)
+                {
+                    using (var handler = new HttpClientHandler())
+                    {
+                        handler.ServerCertificateCustomValidationCallback = (sender, cert, chain, sslPolicyErrors) => true;
+
+                        using (var client = new HttpClient(handler))
+                        {
+                            client.Timeout = TimeSpan.FromSeconds(5);
+                            var sw = Stopwatch.StartNew();
+                            var resp = await client.SendAsync(new HttpRequestMessage(HttpMethod.Head, url));
+                            sw.Stop();
+                            return sw.ElapsedMilliseconds;
+                        }
+                    }
+                }
+                else
+                {
+                    using (var client = new HttpClient())
+                    {
+                        client.Timeout = TimeSpan.FromSeconds(5);
+                        var sw = Stopwatch.StartNew();
+                        var resp = await client.SendAsync(new HttpRequestMessage(HttpMethod.Head, url));
+                        sw.Stop();
+                        return sw.ElapsedMilliseconds;
+                    }
+                }
+            }
+            catch
+            {
+                return -1;
+            }
+        }
+
         // 获取远程版本号
         private static async Task<string> GetRemoteVersion(string fileUrl)
         {
@@ -407,7 +674,7 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                string apiUrl = channel == UpdateChannel.Beta
+                string apiUrl = (channel == UpdateChannel.Beta || channel == UpdateChannel.Preview)
                     ? "https://api.github.com/repos/InkCanvasForClass/community-beta/releases"
                     : "https://api.github.com/repos/InkCanvasForClass/community/releases";
                 using (var client = new HttpClient())
@@ -423,7 +690,7 @@ namespace Ink_Canvas.Helpers
                         if (version == targetVersion || version == $"v{targetVersion}" || version == $"V{targetVersion}")
                         {
                             string releaseNotes = release["body"]?.ToString();
-                            string downloadUrl = release["assets"]?.First?["browser_download_url"]?.ToString();
+                            string downloadUrl = PickBrowserDownloadUrlFromAssets(release["assets"]);
 
                             // 解析发布时间
                             DateTime? releaseTime = null;
@@ -449,28 +716,58 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                string apiUrl = channel == UpdateChannel.Beta
-                    ? "https://api.github.com/repos/InkCanvasForClass/community-beta/releases/latest"
-                    : "https://api.github.com/repos/InkCanvasForClass/community/releases/latest";
-                using (var client = new HttpClient())
+                if (channel == UpdateChannel.Beta)
                 {
-                    client.DefaultRequestHeaders.Add("User-Agent", "ICC-CE Auto Updater");
-                    LogHelper.WriteLogToFile("AutoUpdate | 使用GitHub API调用");
-                    var response = await client.GetStringAsync(apiUrl);
-                    var json = JObject.Parse(response);
-                    string version = json["tag_name"]?.ToString();
-                    string releaseNotes = json["body"]?.ToString();
-                    string downloadUrl = json["assets"]?.First?["browser_download_url"]?.ToString();
-
-                    // 解析发布时间
-                    DateTime? releaseTime = null;
-                    if (json["published_at"] != null && DateTime.TryParse(json["published_at"].ToString(), out DateTime parsedTime))
+                    string apiUrl = "https://api.github.com/repos/InkCanvasForClass/community-beta/releases";
+                    using (var client = new HttpClient())
                     {
-                        releaseTime = parsedTime;
-                    }
+                        client.DefaultRequestHeaders.Add("User-Agent", "ICC-CE Auto Updater");
+                        LogHelper.WriteLogToFile("AutoUpdate | 使用GitHub API调用");
+                        var response = await client.GetStringAsync(apiUrl);
+                        var releases = JArray.Parse(response);
 
-                    if (!string.IsNullOrEmpty(version) && !string.IsNullOrEmpty(downloadUrl))
-                        return (version, downloadUrl, releaseNotes, releaseTime);
+                        if (releases.Count > 0)
+                        {
+                            var latestRelease = releases[0];
+                            string version = latestRelease["tag_name"]?.ToString();
+                            string releaseNotes = latestRelease["body"]?.ToString();
+                            string downloadUrl = PickBrowserDownloadUrlFromAssets(latestRelease["assets"]);
+
+                            DateTime? releaseTime = null;
+                            if (latestRelease["published_at"] != null && DateTime.TryParse(latestRelease["published_at"].ToString(), out DateTime parsedTime))
+                            {
+                                releaseTime = parsedTime;
+                            }
+
+                            if (!string.IsNullOrEmpty(version) && !string.IsNullOrEmpty(downloadUrl))
+                                return (version, downloadUrl, releaseNotes, releaseTime);
+                        }
+                    }
+                }
+                else
+                {
+                    string apiUrl = channel == UpdateChannel.Preview
+                        ? "https://api.github.com/repos/InkCanvasForClass/community-beta/releases/latest"
+                        : "https://api.github.com/repos/InkCanvasForClass/community/releases/latest";
+                    using (var client = new HttpClient())
+                    {
+                        client.DefaultRequestHeaders.Add("User-Agent", "ICC-CE Auto Updater");
+                        LogHelper.WriteLogToFile("AutoUpdate | 使用GitHub API调用");
+                        var response = await client.GetStringAsync(apiUrl);
+                        var json = JObject.Parse(response);
+                        string version = json["tag_name"]?.ToString();
+                        string releaseNotes = json["body"]?.ToString();
+                        string downloadUrl = PickBrowserDownloadUrlFromAssets(json["assets"]);
+
+                        DateTime? releaseTime = null;
+                        if (json["published_at"] != null && DateTime.TryParse(json["published_at"].ToString(), out DateTime parsedTime))
+                        {
+                            releaseTime = parsedTime;
+                        }
+
+                        if (!string.IsNullOrEmpty(version) && !string.IsNullOrEmpty(downloadUrl))
+                            return (version, downloadUrl, releaseNotes, releaseTime);
+                    }
                 }
             }
             catch (Exception ex)
@@ -650,7 +947,8 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                statusFilePath = Path.Combine(updatesFolderPath, $"DownloadV{version}Status.txt");
+                version = NormalizeVersionForUpdate(version);
+                statusFilePath = GetUpdateDownloadStatusFilePath(version);
 
                 if (File.Exists(statusFilePath) && File.ReadAllText(statusFilePath).Trim().ToLower() == "true")
                 {
@@ -666,34 +964,25 @@ namespace Ink_Canvas.Helpers
                     LogHelper.WriteLogToFile($"AutoUpdate | 创建更新目录: {updatesFolderPath}");
                 }
 
-                string zipFilePath = Path.Combine(updatesFolderPath, $"InkCanvasForClass.CE.{version}.zip");
+                string zipFilePath = GetLocalUpdateZipFilePath(version);
                 LogHelper.WriteLogToFile($"AutoUpdate | 目标文件路径: {zipFilePath}");
 
                 SaveDownloadStatus(false);
 
-                // 优先尝试"inkeys"线路组和"智教联盟"线路组
-                var zhiJiaoGroup = groups.FirstOrDefault(g => g.GroupName == "智教联盟");
+                // 优先尝试"inkeys"线路组
                 var inkeysGroup = groups.FirstOrDefault(g => g.GroupName == "inkeys");
-                if (inkeysGroup != null || zhiJiaoGroup != null)
+                if (inkeysGroup != null)
                 {
-                    var priorityGroups = new List<UpdateLineGroup>();
-                    if (inkeysGroup != null)
-                    {
-                        priorityGroups.Add(inkeysGroup);
-                        LogHelper.WriteLogToFile("AutoUpdate | 下载时优先尝试inkeys线路组");
-                    }
-                    if (zhiJiaoGroup != null)
-                    {
-                        priorityGroups.Add(zhiJiaoGroup);
-                        LogHelper.WriteLogToFile("AutoUpdate | 下载时优先尝试智教联盟线路组");
-                    }
-                    groups = priorityGroups.Concat(groups.Where(g => g.GroupName != "智教联盟" && g.GroupName != "inkeys")).ToList();
+                    groups.Remove(inkeysGroup);
+                    groups.Insert(0, inkeysGroup);
+                    LogHelper.WriteLogToFile("AutoUpdate | 下载时优先尝试inkeys线路组");
                 }
 
                 // 依次尝试每个线路组
                 foreach (var group in groups)
                 {
                     string url = string.Format(group.DownloadUrlFormat, version);
+                    url = AppendX64SuffixBeforeZipExtension(url);
                     // 智教联盟需要先获取真实下载地址
                     if (group.GroupName == "智教联盟")
                     {
@@ -925,7 +1214,7 @@ namespace Ink_Canvas.Helpers
                                     // 清理可能损坏的分块文件
                                     if (File.Exists(tempPath))
                                     {
-                                        try { File.Delete(tempPath); } catch { }
+                                        try { File.Delete(tempPath); } catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
                                     }
 
                                     // 增加重试间隔，避免频繁重试
@@ -1111,11 +1400,17 @@ namespace Ink_Canvas.Helpers
                         return resp.Content.Headers.ContentLength.Value;
                 }
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
             return -1;
         }
 
-        // 保存下载状态
+        /// <summary>
+        /// 将下载完成状态写入预定义的状态文件以供后续检查。
+        /// </summary>
+        /// <param name="isSuccess">指示下载是否成功；将以字符串形式写入状态文件（"True" 或 "False"）。</param>
+        /// <remarks>
+        /// 如果状态文件路径为空则不执行任何操作；方法内部捕获异常并记录日志，不会向调用方抛出异常。
+        /// </remarks>
         private static void SaveDownloadStatus(bool isSuccess)
         {
             try
@@ -1136,11 +1431,32 @@ namespace Ink_Canvas.Helpers
             }
         }
 
-        // 安装新版本应用 - 优化版本，不使用命令行
+        /// <summary>
+        /// 安装指定版本的更新包并启动新版本进程以完成替换，然后退出当前应用程序。
+        /// </summary>
+        /// <remarks>
+        /// 该方法会临时将 App.IsUpdateInstalling 置为 true、尝试关闭进程保护（并在结束时还原）、在必要时备份当前设置、解压更新 ZIP、启动解压后的新可执行文件（以更新模式传递旧进程 ID、解压路径和目标路径等参数），并在新进程启动后关闭当前进程。方法会记录日志并在遇到错误时安全退出相应步骤，但不会抛出异常给调用方以外的上下文。</remarks>
+        /// <param name="version">要安装的版本号，用于定位更新包文件名（与 <see cref="GetLocalUpdateZipFilePath"/> 一致；选择 x64 包时为 InkCanvasForClass.CE.{version}-x64.zip）。</param>
+        /// <param name="isInSilence">指示是否以静默模式启动新版本（影响传递给新进程的参数和可能的用户提示）。</param>
         public static void InstallNewVersionApp(string version, bool isInSilence)
         {
+            bool wasProcessProtectionEnabled = false;
             try
             {
+                wasProcessProtectionEnabled = ProcessProtectionManager.Enabled;
+            }
+            catch
+            {
+            }
+
+            try
+            {
+                App.IsUpdateInstalling = true;
+                if (wasProcessProtectionEnabled)
+                {
+                    try { ProcessProtectionManager.SetEnabled(false); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+                }
+
                 // 在更新前备份设置文件
                 try
                 {
@@ -1171,7 +1487,7 @@ namespace Ink_Canvas.Helpers
                     LogHelper.WriteLogToFile($"更新前自动备份设置时出错: {ex.Message}", LogHelper.LogType.Error);
                 }
 
-                string zipFilePath = Path.Combine(updatesFolderPath, $"InkCanvasForClass.CE.{version}.zip");
+                string zipFilePath = GetLocalUpdateZipFilePath(version);
                 LogHelper.WriteLogToFile($"AutoUpdate | 检查ZIP文件: {zipFilePath}");
 
                 if (!File.Exists(zipFilePath))
@@ -1226,7 +1542,7 @@ namespace Ink_Canvas.Helpers
                 try
                 {
                     LogHelper.WriteLogToFile($"AutoUpdate | 开始解压ZIP文件到: {extractPath}");
-                    ZipFile.ExtractToDirectory(zipFilePath, extractPath);
+                    SafeZipExtractor.ExtractZipSafely(zipFilePath, extractPath, overwrite: true);
                     LogHelper.WriteLogToFile("AutoUpdate | ZIP文件解压完成");
                 }
                 catch (Exception ex)
@@ -1301,6 +1617,18 @@ namespace Ink_Canvas.Helpers
                     LogHelper.WriteLogToFile($"AutoUpdate | 内部异常: {ex.InnerException.Message}", LogHelper.LogType.Error);
                 }
             }
+            finally
+            {
+                // 确保无论更新成功还是失败，都恢复标志位和进程保护状态
+                App.IsUpdateInstalling = false;
+                try
+                {
+                    ProcessProtectionManager.SetEnabled(wasProcessProtectionEnabled);
+                }
+                catch
+                {
+                }
+            }
         }
 
         // 处理更新模式的启动参数
@@ -1854,16 +2182,16 @@ namespace Ink_Canvas.Helpers
                 {
                     foreach (string file in Directory.GetFiles(updatesFolderPath, "*", SearchOption.AllDirectories))
                     {
-                        try { File.Delete(file); } catch { }
+                        try { File.Delete(file); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
                     }
                     foreach (string dir in Directory.GetDirectories(updatesFolderPath))
                     {
-                        try { Directory.Delete(dir, true); } catch { }
+                        try { Directory.Delete(dir, true); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
                     }
-                    try { Directory.Delete(updatesFolderPath, true); } catch { }
+                    try { Directory.Delete(updatesFolderPath, true); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
                 }
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
 
         // 版本修复方法，强制下载并安装指定通道的最新版本
@@ -1913,7 +2241,7 @@ namespace Ink_Canvas.Helpers
             var result = new List<(string, string, string)>();
             try
             {
-                string apiUrl = channel == UpdateChannel.Beta
+                string apiUrl = (channel == UpdateChannel.Beta || channel == UpdateChannel.Preview)
                     ? "https://api.github.com/repos/InkCanvasForClass/community-beta/releases"
                     : "https://api.github.com/repos/InkCanvasForClass/community/releases";
                 using (var client = new HttpClient())
@@ -1926,7 +2254,7 @@ namespace Ink_Canvas.Helpers
                     {
                         string version = item["tag_name"]?.ToString();
                         string releaseNotes = item["body"]?.ToString();
-                        string downloadUrl = item["assets"]?.First?["browser_download_url"]?.ToString();
+                        string downloadUrl = PickBrowserDownloadUrlFromAssets(item["assets"]);
                         if (!string.IsNullOrEmpty(version) && !string.IsNullOrEmpty(downloadUrl))
                             result.Add((version, downloadUrl, releaseNotes));
                     }
@@ -2072,4 +2400,4 @@ namespace Ink_Canvas.Helpers
             return currentTime >= StartTime || currentTime <= EndTime;
         }
     }
-}
+}

Ink Canvas/Helpers/BaseUploadQueue.cs

@@ -0,0 +1,603 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 上传队列项数据（用于序列化）
+    /// </summary>
+    public class UploadQueueItemData
+    {
+        [JsonProperty("file_path")]
+        public string FilePath { get; set; }
+
+        [JsonProperty("retry_count")]
+        public int RetryCount { get; set; }
+
+        [JsonProperty("added_time")]
+        public DateTime AddedTime { get; set; }
+    }
+
+    /// <summary>
+    /// 上传队列项
+    /// </summary>
+    public class UploadQueueItem
+    {
+        public string FilePath { get; set; }
+        public int RetryCount { get; set; }
+    }
+
+    /// <summary>
+    /// 通用上传队列基类
+    /// </summary>
+    public abstract class BaseUploadQueue : IDisposable
+    {
+        protected const int BATCH_SIZE = 10; // 批量上传大小
+        protected const int MAX_RETRY_COUNT = 3; // 最大重试次数
+
+        /// <summary>
+        /// 上传队列
+        /// </summary>
+        protected readonly ConcurrentQueue<UploadQueueItem> _uploadQueue = new ConcurrentQueue<UploadQueueItem>();
+
+        /// <summary>
+        /// 队列处理锁，防止并发处理
+        /// </summary>
+        protected readonly SemaphoreSlim _queueProcessingLock = new SemaphoreSlim(1, 1);
+
+        /// <summary>
+        /// 队列保存锁，防止并发保存
+        /// </summary>
+        protected readonly SemaphoreSlim _queueSaveLock = new SemaphoreSlim(1, 1);
+
+        /// <summary>
+        /// 是否已初始化队列
+        /// </summary>
+        protected bool _isQueueInitialized = false;
+
+        /// <summary>
+        /// 是否已释放资源
+        /// </summary>
+        private bool _disposed = false;
+
+        /// <summary>
+        /// 队列文件名
+        /// </summary>
+        protected abstract string QueueFileName { get; }
+
+        /// <summary>
+        /// 允许的文件扩展名
+        /// </summary>
+        protected virtual HashSet<string> AllowedExtensions => new HashSet<string> { ".png", ".icstk", ".xml", ".zip" };
+
+        /// <summary>
+        /// 获取队列文件路径
+        /// </summary>
+        protected string GetQueueFilePath()
+        {
+            var configsDir = Path.Combine(App.RootPath, "Configs");
+            if (!Directory.Exists(configsDir))
+            {
+                Directory.CreateDirectory(configsDir);
+            }
+            return Path.Combine(configsDir, QueueFileName);
+        }
+
+        /// <summary>
+        /// 获取最大文件大小
+        /// </summary>
+        /// <param name="extension">文件扩展名</param>
+        /// <returns>最大文件大小（字节）</returns>
+        protected virtual long GetMaxFileSize(string extension)
+        {
+            return extension == ".zip" ? 50 * 1024 * 1024 : 10 * 1024 * 1024;
+        }
+
+        /// <summary>
+        /// 初始化上传队列
+        /// </summary>
+        public void InitializeQueue()
+        {
+            if (_isQueueInitialized)
+            {
+                return;
+            }
+
+            try
+            {
+                var queueFilePath = GetQueueFilePath();
+                if (!File.Exists(queueFilePath))
+                {
+                    _isQueueInitialized = true;
+                    return;
+                }
+
+                var jsonContent = File.ReadAllText(queueFilePath);
+                if (string.IsNullOrWhiteSpace(jsonContent))
+                {
+                    _isQueueInitialized = true;
+                    return;
+                }
+
+                var queueData = JsonConvert.DeserializeObject<List<UploadQueueItemData>>(jsonContent);
+                if (queueData == null || queueData.Count == 0)
+                {
+                    _isQueueInitialized = true;
+                    return;
+                }
+
+                int restoredCount = 0;
+                int skippedCount = 0;
+
+                foreach (var item in queueData)
+                {
+                    // 验证文件是否存在
+                    if (!File.Exists(item.FilePath))
+                    {
+                        skippedCount++;
+                        continue;
+                    }
+
+                    // 验证文件格式和大小
+                    if (!IsValidFile(item.FilePath))
+                    {
+                        skippedCount++;
+                        continue;
+                    }
+
+                    // 恢复队列项
+                    _uploadQueue.Enqueue(new UploadQueueItem
+                    {
+                        FilePath = item.FilePath,
+                        RetryCount = item.RetryCount
+                    });
+                    restoredCount++;
+                }
+
+                _isQueueInitialized = true;
+
+                if (restoredCount > 0)
+                {
+                    LogHelper.WriteLogToFile($"[{GetType().Name}] 已恢复上传队列：{restoredCount}个文件，跳过{skippedCount}个无效文件", LogHelper.LogType.Event);
+                    // 如果恢复了队列，触发处理
+                    _ = Task.Run(async () =>
+                    {
+                        try
+                        {
+                            await ProcessUploadQueueAsync().ConfigureAwait(false);
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"[{GetType().Name}] 恢复上传队列后处理时出错: {ex}", LogHelper.LogType.Error);
+                        }
+                    });
+                }
+                else if (skippedCount > 0)
+                {
+                    LogHelper.WriteLogToFile($"[{GetType().Name}] 队列恢复完成：跳过{skippedCount}个无效文件", LogHelper.LogType.Event);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"[{GetType().Name}] 恢复上传队列时出错: {ex.Message}", LogHelper.LogType.Error);
+                _isQueueInitialized = true; // 即使出错也标记为已初始化，避免重复尝试
+            }
+        }
+
+        /// <summary>
+        /// 保存队列到文件
+        /// </summary>
+        protected async Task SaveQueueToFileAsync(CancellationToken cancellationToken = default)
+        {
+            if (!await _queueSaveLock.WaitAsync(1000, cancellationToken)) // 最多等待1秒
+            {
+                return; // 如果无法获取锁，跳过保存（避免阻塞）
+            }
+
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                var queueData = new List<UploadQueueItemData>();
+
+                // 将队列转换为可序列化的格式
+                foreach (var item in _uploadQueue)
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    queueData.Add(new UploadQueueItemData
+                    {
+                        FilePath = item.FilePath,
+                        RetryCount = item.RetryCount,
+                        AddedTime = DateTime.Now
+                    });
+                }
+
+                var queueFilePath = GetQueueFilePath();
+
+                // 如果队列为空，清空文件
+                if (queueData.Count == 0)
+                {
+                    ClearQueueFile();
+                    return;
+                }
+
+                var jsonContent = JsonConvert.SerializeObject(queueData, Formatting.Indented);
+
+                // 使用进程保护的写入门控，避免安全面板中"进程文件保护"占用导致无法写入
+                var tempFilePath = queueFilePath + ".tmp";
+                ProcessProtectionManager.WithWriteAccess(queueFilePath, () =>
+                {
+                    File.WriteAllText(tempFilePath, jsonContent);
+                    if (File.Exists(queueFilePath))
+                        File.Delete(queueFilePath);
+                    File.Move(tempFilePath, queueFilePath);
+                });
+            }
+            catch (OperationCanceledException)
+            {
+                // 取消操作，静默处理
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"[{GetType().Name}] 保存上传队列时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+            finally
+            {
+                _queueSaveLock.Release();
+            }
+        }
+
+        /// <summary>
+        /// 清空队列文件
+        /// </summary>
+        protected void ClearQueueFile()
+        {
+            try
+            {
+                var queueFilePath = GetQueueFilePath();
+                ProcessProtectionManager.WithWriteAccess(queueFilePath, () =>
+                {
+                    if (File.Exists(queueFilePath))
+                        File.WriteAllText(queueFilePath, "[]");
+                });
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"[{GetType().Name}] 清空队列文件时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 将文件加入上传队列
+        /// </summary>
+        protected void EnqueueFile(string filePath, int retryCount = 0, CancellationToken cancellationToken = default)
+        {
+            _uploadQueue.Enqueue(new UploadQueueItem
+            {
+                FilePath = filePath,
+                RetryCount = retryCount
+            });
+
+            // 异步保存队列到文件
+            _ = Task.Run(async () =>
+            {
+                try
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+                    await SaveQueueToFileAsync(cancellationToken).ConfigureAwait(false);
+                }
+                catch (OperationCanceledException)
+                {
+                    // 取消操作，静默处理
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"[{GetType().Name}] 保存上传队列时出错（后台任务）: {ex}", LogHelper.LogType.Error);
+                }
+            }, cancellationToken);
+
+            // 触发队列处理
+            _ = ProcessUploadQueueAsync(cancellationToken);
+        }
+
+        /// <summary>
+        /// 处理上传队列，批量上传文件
+        /// </summary>
+        protected async Task ProcessUploadQueueAsync(CancellationToken cancellationToken = default)
+        {
+            // 使用信号量防止并发处理
+            if (!await _queueProcessingLock.WaitAsync(0, cancellationToken))
+            {
+                return; // 已有处理任务在运行
+            }
+
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                var filesToUpload = new List<UploadQueueItem>();
+
+                // 从队列中取出最多BATCH_SIZE个文件
+                int count = 0;
+                while (count < BATCH_SIZE && _uploadQueue.TryDequeue(out UploadQueueItem item))
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    // 再次检查文件是否存在
+                    if (File.Exists(item.FilePath) && IsValidFile(item.FilePath))
+                    {
+                        filesToUpload.Add(item);
+                        count++;
+                    }
+                }
+
+                if (filesToUpload.Count == 0)
+                {
+                    return;
+                }
+
+                // 检查是否启用
+                if (!IsUploadEnabled())
+                {
+                    LogHelper.WriteLogToFile($"[{GetType().Name}] 上传失败：上传未启用", LogHelper.LogType.Error);
+                    // 将文件重新加入队列
+                    foreach (var item in filesToUpload)
+                    {
+                        EnqueueFile(item.FilePath, item.RetryCount, cancellationToken);
+                    }
+                    return;
+                }
+
+                // 并发上传所有文件，并处理失败重试
+                var uploadTasks = filesToUpload.Select(async item =>
+                {
+                    try
+                    {
+                        cancellationToken.ThrowIfCancellationRequested();
+                        var success = await UploadFileInternalAsync(item.FilePath, cancellationToken);
+                        if (!success)
+                        {
+                            // 检查是否是可重试的错误
+                            if (IsRetryableError(item.FilePath))
+                            {
+                                // 检查重试次数
+                                if (item.RetryCount < MAX_RETRY_COUNT)
+                                {
+                                    LogHelper.WriteLogToFile($"[{GetType().Name}] 上传失败，将重试 ({item.RetryCount + 1}/{MAX_RETRY_COUNT}): {Path.GetFileName(item.FilePath)}", LogHelper.LogType.Event);
+                                    EnqueueFile(item.FilePath, item.RetryCount + 1, cancellationToken);
+                                }
+                                else
+                                {
+                                    LogHelper.WriteLogToFile($"[{GetType().Name}] 上传失败，已达到最大重试次数: {Path.GetFileName(item.FilePath)}", LogHelper.LogType.Error);
+                                }
+                            }
+                        }
+                        return success;
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        // 取消操作，将文件重新加入队列
+                        EnqueueFile(item.FilePath, item.RetryCount, cancellationToken);
+                        throw;
+                    }
+                    catch (Exception ex)
+                    {
+                        // 检查是否是可重试的错误（超时、网络错误等）
+                        var errorMessage = ex.Message.ToLower();
+                        bool isRetryable = errorMessage.Contains("超时") ||
+                                          errorMessage.Contains("timeout") ||
+                                          errorMessage.Contains("网络错误") ||
+                                          errorMessage.Contains("network") ||
+                                          errorMessage.Contains("408") || // 请求超时
+                                          errorMessage.Contains("423") || // 资源锁定
+                                          errorMessage.Contains("429") || // 请求过多
+                                          errorMessage.Contains("500") || // 服务器错误
+                                          errorMessage.Contains("502") || // 网关错误
+                                          errorMessage.Contains("503") || // 服务不可用
+                                          errorMessage.Contains("504"); // 网关超时
+
+                        if (isRetryable && IsRetryableError(item.FilePath))
+                        {
+                            // 检查重试次数
+                            if (item.RetryCount < MAX_RETRY_COUNT)
+                            {
+                                LogHelper.WriteLogToFile($"[{GetType().Name}] 上传失败({ex.Message})，将重试 ({item.RetryCount + 1}/{MAX_RETRY_COUNT}): {Path.GetFileName(item.FilePath)}", LogHelper.LogType.Error);
+                                EnqueueFile(item.FilePath, item.RetryCount + 1, cancellationToken);
+                            }
+                            else
+                            {
+                                LogHelper.WriteLogToFile($"[{GetType().Name}] 上传失败，已达到最大重试次数: {Path.GetFileName(item.FilePath)}", LogHelper.LogType.Error);
+                            }
+                        }
+                        else
+                        {
+                            LogHelper.WriteLogToFile($"[{GetType().Name}] 上传失败（不可重试）: {Path.GetFileName(item.FilePath)} - {ex.Message}", LogHelper.LogType.Error);
+                        }
+                        return false;
+                    }
+                });
+                await Task.WhenAll(uploadTasks).ConfigureAwait(false);
+
+                // 上传完成后保存队列状态
+                await SaveQueueToFileAsync(cancellationToken).ConfigureAwait(false);
+
+                // 检查队列中是否还有文件，如果有就继续处理
+                if (_uploadQueue.Count > 0)
+                {
+                    _ = Task.Run(async () =>
+                    {
+                        try
+                        {
+                            await ProcessUploadQueueAsync(cancellationToken).ConfigureAwait(false);
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"[{GetType().Name}] 继续处理上传队列时出错: {ex}", LogHelper.LogType.Error);
+                        }
+                    }, cancellationToken);
+                }
+            }
+            finally
+            {
+                _queueProcessingLock.Release();
+            }
+        }
+
+        /// <summary>
+        /// 验证文件是否有效
+        /// </summary>
+        protected virtual bool IsValidFile(string filePath)
+        {
+            try
+            {
+                var fileExtension = Path.GetExtension(filePath).ToLower();
+                if (!AllowedExtensions.Contains(fileExtension))
+                {
+                    return false;
+                }
+
+                var fileInfo = new FileInfo(filePath);
+                long maxSize = GetMaxFileSize(fileExtension);
+                if (fileInfo.Length > maxSize)
+                {
+                    LogHelper.WriteLogToFile($"[{GetType().Name}] 上传失败：文件过大（{fileInfo.Length / 1024 / 1024:F2}MB），超过{maxSize / 1024 / 1024}MB限制", LogHelper.LogType.Error);
+                    return false;
+                }
+
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 判断错误是否可重试
+        /// </summary>
+        protected bool IsRetryableError(string filePath)
+        {
+            // 检查文件是否存在
+            if (!File.Exists(filePath))
+            {
+                return false; // 文件不存在，不可重试
+            }
+
+            // 检查文件是否有效
+            if (!IsValidFile(filePath))
+            {
+                return false; // 文件无效，不可重试
+            }
+
+            // 检查是否启用
+            if (!IsUploadEnabled())
+            {
+                return false; // 上传未启用，不可重试
+            }
+
+            // 其他错误（超时、网络错误等）可以重试
+            return true;
+        }
+
+        /// <summary>
+        /// 检查上传是否启用
+        /// </summary>
+        protected abstract bool IsUploadEnabled();
+
+        /// <summary>
+        /// 内部上传方法，执行实际上传操作
+        /// </summary>
+        protected abstract Task<bool> UploadFileInternalAsync(string filePath, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// 异步上传文件
+        /// </summary>
+        public async Task<bool> UploadFileAsync(string filePath, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                // 检查是否启用
+                if (!IsUploadEnabled())
+                {
+                    return false;
+                }
+
+                // 基本验证
+                if (!File.Exists(filePath))
+                {
+                    LogHelper.WriteLogToFile($"[{GetType().Name}] 上传失败：文件不存在 - {filePath}", LogHelper.LogType.Error);
+                    return false;
+                }
+
+                if (!IsValidFile(filePath))
+                {
+                    return false;
+                }
+
+                // 确保队列已初始化
+                if (!_isQueueInitialized)
+                {
+                    InitializeQueue();
+                }
+
+                // 加入队列
+                EnqueueFile(filePath, 0, cancellationToken);
+
+                return true;
+            }
+            catch (OperationCanceledException)
+            {
+                LogHelper.WriteLogToFile($"[{GetType().Name}] 上传被取消: {Path.GetFileName(filePath)}", LogHelper.LogType.Event);
+                throw;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"[{GetType().Name}] 加入上传队列时出错: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 释放资源
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// 释放资源
+        /// </summary>
+        /// <param name="disposing">是否手动释放</param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposed)
+            {
+                if (disposing)
+                {
+                    _queueProcessingLock?.Dispose();
+                    _queueSaveLock?.Dispose();
+                }
+                _disposed = true;
+            }
+        }
+
+        /// <summary>
+        /// 析构函数
+        /// </summary>
+        ~BaseUploadQueue()
+        {
+            Dispose(false);
+        }
+    }
+}

Ink Canvas/Helpers/CameraService.cs

@@ -40,13 +40,13 @@ namespace Ink_Canvas.Helpers
         public int ResolutionWidth
         {
             get => _resolutionWidth;
-            set => _resolutionWidth = Math.Max(320, Math.Min(1920, value));
+            set => _resolutionWidth = Math.Max(320, Math.Min(3840, value));
         }
 
         public int ResolutionHeight
         {
             get => _resolutionHeight;
-            set => _resolutionHeight = Math.Max(240, Math.Min(1080, value));
+            set => _resolutionHeight = Math.Max(240, Math.Min(2160, value));
         }
 
         public CameraService()
@@ -283,8 +283,8 @@ namespace Ink_Canvas.Helpers
 
                                 int targetWidth = _resolutionWidth;
                                 int targetHeight = _resolutionHeight;
-                                
-                                if (_rotationAngle == 1 || _rotationAngle == 3) 
+
+                                if (_rotationAngle == 1 || _rotationAngle == 3)
                                 {
                                     targetWidth = _resolutionHeight;
                                     targetHeight = _resolutionWidth;

Ink Canvas/Helpers/ComPPTLinkManager.cs

@@ -0,0 +1,109 @@
+using System;
+
+namespace Ink_Canvas.Helpers
+{
+    public class ComPPTLinkManager : IPPTLinkManager
+    {
+        private readonly PPTManager _inner;
+
+        public ComPPTLinkManager()
+        {
+            _inner = new PPTManager();
+
+            _inner.SlideShowBegin += wn => SlideShowBegin?.Invoke(wn);
+            _inner.SlideShowNextSlide += wn => SlideShowNextSlide?.Invoke(wn);
+            _inner.SlideShowEnd += pres => SlideShowEnd?.Invoke(pres);
+            _inner.PresentationOpen += pres => PresentationOpen?.Invoke(pres);
+            _inner.PresentationClose += pres => PresentationClose?.Invoke(pres);
+            _inner.PPTConnectionChanged += connected => PPTConnectionChanged?.Invoke(connected);
+            _inner.SlideShowStateChanged += inSlideShow => SlideShowStateChanged?.Invoke(inSlideShow);
+        }
+
+        #region IPPTLinkManager 事件
+        public event Action<object> SlideShowBegin;
+        public event Action<object> SlideShowNextSlide;
+        public event Action<object> SlideShowEnd;
+        public event Action<object> PresentationOpen;
+        public event Action<object> PresentationClose;
+        public event Action<bool> PPTConnectionChanged;
+        public event Action<bool> SlideShowStateChanged;
+        #endregion
+
+        #region IPPTLinkManager 属性
+        public bool IsConnected => _inner.IsConnected;
+
+        public bool IsInSlideShow => _inner.IsInSlideShow;
+
+        public bool IsSupportWPS
+        {
+            get => _inner.IsSupportWPS;
+            set => _inner.IsSupportWPS = value;
+        }
+
+        public bool SkipAnimationsWhenNavigating
+        {
+            get => _inner.SkipAnimationsWhenNavigating;
+            set => _inner.SkipAnimationsWhenNavigating = value;
+        }
+
+        public int SlidesCount => _inner.SlidesCount;
+
+        public object PPTApplication => _inner.PPTApplication;
+        #endregion
+
+        #region 生命周期管理
+        /// <summary>
+        /// 开始监控本地 PowerPoint 的连接与运行状态，并在状态变化时触发相应事件。
+        /// </summary>
+        public void StartMonitoring() => _inner.StartMonitoring();
+
+        /// <summary>
+        /// 停止对 PowerPoint 的监控，断开当前连接并停止触发相关事件。
+        /// </summary>
+        public void StopMonitoring() => _inner.StopMonitoring();
+
+        /// <summary>
+        /// 强制断开当前 COM PPT 连接并停止对其监控，同时写入事件日志。
+        /// </summary>
+        /// <remarks>
+        /// 会向日志记录一条事件信息并调用内部管理器停止监控；该方法不会重新启动监控或重新初始化内部管理器实例。
+        /// </remarks>
+        public void ReloadConnection()
+        {
+            LogHelper.WriteLogToFile("COM PPT 执行热重载：强制断开并重新连接", LogHelper.LogType.Event);
+            _inner.StopMonitoring();
+        }
+        #endregion
+
+        #region 放映控制
+        public bool TryStartSlideShow() => _inner.TryStartSlideShow();
+
+        public bool TryEndSlideShow() => _inner.TryEndSlideShow();
+        #endregion
+
+        #region 导航控制
+        public bool TryNavigateToSlide(int slideNumber) => _inner.TryNavigateToSlide(slideNumber);
+
+        public bool TryNavigateNext() => _inner.TryNavigateNext();
+
+        public bool TryNavigatePrevious() => _inner.TryNavigatePrevious();
+        #endregion
+
+        #region 查询
+        public int GetCurrentSlideNumber() => _inner.GetCurrentSlideNumber();
+
+        public string GetPresentationName() => _inner.GetPresentationName();
+
+        public bool TryShowSlideNavigation() => _inner.TryShowSlideNavigation();
+
+        public object GetCurrentActivePresentation() => _inner.GetCurrentActivePresentation();
+        #endregion
+
+        #region IDisposable
+        public void Dispose()
+        {
+            _inner?.Dispose();
+        }
+        #endregion
+    }
+}

Ink Canvas/Helpers/ConfigProfileManager.cs

@@ -0,0 +1,161 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 提供多配置文件保存、切换与热重载支持。
+    /// 方案保存在 Configs/Profiles 目录下，当前生效的配置仍为 Configs/Settings.json。
+    /// </summary>
+    public static class ConfigProfileManager
+    {
+        private static readonly string ProfilesDir = Path.Combine(App.RootPath, "Configs", "Profiles");
+        private static readonly string SettingsFilePath = Path.Combine(App.RootPath, "Configs", "Settings.json");
+        private const string ProfileExtension = ".json";
+
+        /// <summary>将配置文件名称转为安全文件名（去掉非法字符）。</summary>
+        private static string ToSafeFileName(string profileName)
+        {
+            if (string.IsNullOrWhiteSpace(profileName)) return "未命名";
+            var invalid = Path.GetInvalidFileNameChars();
+            var name = string.Join("_", profileName.Trim().Split(invalid, StringSplitOptions.RemoveEmptyEntries));
+            return string.IsNullOrEmpty(name) ? "未命名" : name;
+        }
+
+        /// <summary>确保配置文件目录存在。</summary>
+        public static void EnsureProfilesDirectory()
+        {
+            try
+            {
+                if (!Directory.Exists(ProfilesDir))
+                {
+                    ProcessProtectionManager.WithWriteAccess(ProfilesDir, () => Directory.CreateDirectory(ProfilesDir));
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"创建配置文件目录失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>获取所有配置文件名称（不含扩展名），按名称排序。</summary>
+        public static IReadOnlyList<string> ListProfileNames()
+        {
+            try
+            {
+                EnsureProfilesDirectory();
+                if (!Directory.Exists(ProfilesDir)) return Array.Empty<string>();
+                var files = Directory.GetFiles(ProfilesDir, "*" + ProfileExtension);
+                return files
+                    .Select(f => Path.GetFileNameWithoutExtension(f))
+                    .Where(n => !string.IsNullOrEmpty(n))
+                    .OrderBy(n => n, StringComparer.OrdinalIgnoreCase)
+                    .ToList();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"列举配置文件失败: {ex.Message}", LogHelper.LogType.Error);
+                return Array.Empty<string>();
+            }
+        }
+
+        /// <summary>获取某配置文件对应的文件路径。</summary>
+        public static string GetProfilePath(string profileName)
+        {
+            var safe = ToSafeFileName(profileName);
+            return Path.Combine(ProfilesDir, safe + ProfileExtension);
+        }
+
+        /// <summary>将当前配置的 JSON 内容保存为指定名称的配置文件。</summary>
+        /// <param name="profileName">配置文件显示名称（会转为安全文件名）。</param>
+        /// <param name="settingsJson">已序列化好的 Settings JSON 字符串。</param>
+        /// <returns>成功返回 true。</returns>
+        public static bool SaveAsProfile(string profileName, string settingsJson)
+        {
+            try
+            {
+                if (string.IsNullOrWhiteSpace(settingsJson))
+                {
+                    LogHelper.WriteLogToFile("配置文件保存失败：内容为空", LogHelper.LogType.Warning);
+                    return false;
+                }
+                EnsureProfilesDirectory();
+                var path = GetProfilePath(profileName);
+                ProcessProtectionManager.WithWriteAccess(path, () => File.WriteAllText(path, settingsJson));
+                LogHelper.WriteLogToFile($"配置文件已保存: {ToSafeFileName(profileName)}", LogHelper.LogType.Event);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"保存配置文件失败: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        /// <summary>将指定配置文件应用到当前配置（覆盖 Configs/Settings.json），供主窗口随后热重载。</summary>
+        /// <param name="profileName">配置文件名称（与 ListProfileNames 中一致，或与保存时使用的显示名一致）。</param>
+        /// <returns>成功返回 true；文件不存在或复制失败返回 false。</returns>
+        public static bool ApplyProfile(string profileName)
+        {
+            try
+            {
+                var path = GetProfilePath(profileName);
+                if (!File.Exists(path))
+                {
+                    LogHelper.WriteLogToFile($"配置文件文件不存在: {path}", LogHelper.LogType.Warning);
+                    return false;
+                }
+                var json = File.ReadAllText(path);
+                if (string.IsNullOrWhiteSpace(json))
+                {
+                    LogHelper.WriteLogToFile("配置文件内容为空", LogHelper.LogType.Warning);
+                    return false;
+                }
+                // 可选：校验是否为合法 Settings JSON
+                try
+                {
+                    JsonConvert.DeserializeObject<Settings>(json);
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"配置文件格式无效: {ex.Message}", LogHelper.LogType.Error);
+                    return false;
+                }
+                var configsDir = Path.GetDirectoryName(SettingsFilePath);
+                if (!string.IsNullOrEmpty(configsDir) && !Directory.Exists(configsDir))
+                {
+                    ProcessProtectionManager.WithWriteAccess(configsDir, () => Directory.CreateDirectory(configsDir));
+                }
+                ProcessProtectionManager.WithWriteAccess(SettingsFilePath, () => File.WriteAllText(SettingsFilePath, json));
+                LogHelper.WriteLogToFile($"已应用配置文件: {profileName}（请热重载以生效）", LogHelper.LogType.Event);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"应用配置文件失败: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        /// <summary>删除指定名称的配置文件。</summary>
+        public static bool DeleteProfile(string profileName)
+        {
+            try
+            {
+                var path = GetProfilePath(profileName);
+                if (!File.Exists(path)) return true;
+                ProcessProtectionManager.WithWriteAccess(path, () => File.Delete(path));
+                LogHelper.WriteLogToFile($"已删除配置文件: {profileName}", LogHelper.LogType.Event);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"删除配置文件失败: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+    }
+}

Ink Canvas/Helpers/Converters.cs

@@ -135,4 +135,21 @@ namespace Ink_Canvas.Converter
             return Visibility.Visible;
         }
     }
+
+    public class RippleEffectTranslationConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is double d)
+            {
+                return -d / 2;
+            }
+            return 0.0;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return null;
+        }
+    }
 }

Ink Canvas/Helpers/DeviceIdentifier.cs

@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using OSVersionExtension;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -46,20 +47,40 @@ namespace Ink_Canvas.Helpers
             {
                 try
                 {
-                    // 1. 尝试从主文件读取设备ID
-                    string deviceId = LoadDeviceIdFromFile(DeviceIdFilePath);
-                    if (!string.IsNullOrEmpty(deviceId))
+                    // 计算当前设备的硬件指纹
+                    string currentHardwareFingerprint = GenerateHardwareFingerprint();
+
+                    // 1. 尝试从主文件读取设备ID及其硬件指纹
+                    var storedInfo = LoadDeviceIdFromFile(DeviceIdFilePath);
+                    if (storedInfo != null && !string.IsNullOrEmpty(storedInfo.DeviceId) && IsValidDeviceId(storedInfo.DeviceId))
                     {
-                        LogHelper.WriteLogToFile($"DeviceIdentifier | 从主文件读取设备ID: {deviceId}");
-                        return deviceId;
+                        if (!string.IsNullOrEmpty(storedInfo.HardwareFingerprint))
+                        {
+                            if (storedInfo.HardwareFingerprint == currentHardwareFingerprint)
+                            {
+                                LogHelper.WriteLogToFile($"DeviceIdentifier | 从主文件读取设备ID且硬件信息一致: {storedInfo.DeviceId}");
+                                return storedInfo.DeviceId;
+                            }
+
+                            LogHelper.WriteLogToFile("DeviceIdentifier | 检测到当前硬件信息与保存的设备ID不一致，将重新生成设备ID");
+                        }
+                        else
+                        {
+                            LogHelper.WriteLogToFile("DeviceIdentifier | 检测到旧格式设备ID文件（无硬件信息），将基于当前硬件重新生成设备ID并升级文件格式");
+                        }
                     }
 
-                    // 2. 生成新的设备ID
-                    string newDeviceId = GenerateDeviceId();
+                    // 2. 基于当前硬件指纹生成新的设备ID
+                    string newDeviceId = GenerateDeviceIdFromFingerprint(currentHardwareFingerprint);
                     LogHelper.WriteLogToFile($"DeviceIdentifier | 生成新设备ID: {newDeviceId}");
 
-                    // 3. 保存到主文件
-                    SaveDeviceIdToFile(DeviceIdFilePath, newDeviceId);
+                    // 3. 保存到主文件（包含硬件指纹）
+                    var newInfo = new DeviceIdInfo
+                    {
+                        DeviceId = newDeviceId,
+                        HardwareFingerprint = currentHardwareFingerprint
+                    };
+                    SaveDeviceIdToFile(DeviceIdFilePath, newInfo);
 
                     return newDeviceId;
                 }
@@ -79,143 +100,9 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                // 收集硬件信息
-                var hardwareInfo = new StringBuilder();
-
-                // 使用反射获取硬件信息，避免直接引用System.Management
-                try
-                {
-                    // 尝试加载System.Management程序集
-                    var assembly = Assembly.Load("System.Management");
-                    if (assembly != null)
-                    {
-                        // CPU信息
-                        try
-                        {
-                            var searcherType = assembly.GetType("System.Management.ManagementObjectSearcher");
-                            var searcher = Activator.CreateInstance(searcherType, "SELECT ProcessorId FROM Win32_Processor");
-                            var getMethod = searcherType.GetMethod("Get");
-                            var enumerator = getMethod.Invoke(searcher, null);
-
-                            var moveNextMethod = enumerator.GetType().GetMethod("MoveNext");
-                            var currentProperty = enumerator.GetType().GetProperty("Current");
-
-                            if ((bool)moveNextMethod.Invoke(enumerator, null))
-                            {
-                                var obj = currentProperty.GetValue(enumerator);
-                                var indexer = obj.GetType().GetProperty("Item", new[] { typeof(string) });
-                                var processorId = indexer.GetValue(obj, new object[] { "ProcessorId" });
-                                hardwareInfo.Append(processorId?.ToString() ?? "");
-                            }
-
-                            var disposeMethod = searcher.GetType().GetMethod("Dispose");
-                            disposeMethod?.Invoke(searcher, null);
-                        }
-                        catch { }
-
-                        // 主板序列号
-                        try
-                        {
-                            var searcherType = assembly.GetType("System.Management.ManagementObjectSearcher");
-                            var searcher = Activator.CreateInstance(searcherType, "SELECT SerialNumber FROM Win32_BaseBoard");
-                            var getMethod = searcherType.GetMethod("Get");
-                            var enumerator = getMethod.Invoke(searcher, null);
-
-                            var moveNextMethod = enumerator.GetType().GetMethod("MoveNext");
-                            var currentProperty = enumerator.GetType().GetProperty("Current");
-
-                            if ((bool)moveNextMethod.Invoke(enumerator, null))
-                            {
-                                var obj = currentProperty.GetValue(enumerator);
-                                var indexer = obj.GetType().GetProperty("Item", new[] { typeof(string) });
-                                var serialNumber = indexer.GetValue(obj, new object[] { "SerialNumber" });
-                                hardwareInfo.Append(serialNumber?.ToString() ?? "");
-                            }
-
-                            var disposeMethod = searcher.GetType().GetMethod("Dispose");
-                            disposeMethod?.Invoke(searcher, null);
-                        }
-                        catch { }
-
-                        // BIOS序列号
-                        try
-                        {
-                            var searcherType = assembly.GetType("System.Management.ManagementObjectSearcher");
-                            var searcher = Activator.CreateInstance(searcherType, "SELECT SerialNumber FROM Win32_BIOS");
-                            var getMethod = searcherType.GetMethod("Get");
-                            var enumerator = getMethod.Invoke(searcher, null);
-
-                            var moveNextMethod = enumerator.GetType().GetMethod("MoveNext");
-                            var currentProperty = enumerator.GetType().GetProperty("Current");
-
-                            if ((bool)moveNextMethod.Invoke(enumerator, null))
-                            {
-                                var obj = currentProperty.GetValue(enumerator);
-                                var indexer = obj.GetType().GetProperty("Item", new[] { typeof(string) });
-                                var serialNumber = indexer.GetValue(obj, new object[] { "SerialNumber" });
-                                hardwareInfo.Append(serialNumber?.ToString() ?? "");
-                            }
-
-                            var disposeMethod = searcher.GetType().GetMethod("Dispose");
-                            disposeMethod?.Invoke(searcher, null);
-                        }
-                        catch { }
-
-                        // 主硬盘序列号
-                        try
-                        {
-                            var searcherType = assembly.GetType("System.Management.ManagementObjectSearcher");
-                            var searcher = Activator.CreateInstance(searcherType, "SELECT SerialNumber FROM Win32_DiskDrive WHERE MediaType='Fixed hard disk media'");
-                            var getMethod = searcherType.GetMethod("Get");
-                            var enumerator = getMethod.Invoke(searcher, null);
-
-                            var moveNextMethod = enumerator.GetType().GetMethod("MoveNext");
-                            var currentProperty = enumerator.GetType().GetProperty("Current");
-
-                            if ((bool)moveNextMethod.Invoke(enumerator, null))
-                            {
-                                var obj = currentProperty.GetValue(enumerator);
-                                var indexer = obj.GetType().GetProperty("Item", new[] { typeof(string) });
-                                var serialNumber = indexer.GetValue(obj, new object[] { "SerialNumber" });
-                                hardwareInfo.Append(serialNumber?.ToString() ?? "");
-                            }
-
-                            var disposeMethod = searcher.GetType().GetMethod("Dispose");
-                            disposeMethod?.Invoke(searcher, null);
-                        }
-                        catch { }
-                    }
-                }
-                catch { }
-
-                // 如果硬件信息不足，添加系统信息
-                if (hardwareInfo.Length < 10)
-                {
-                    hardwareInfo.Append(Environment.MachineName);
-                    hardwareInfo.Append(Environment.UserName);
-                    hardwareInfo.Append(Environment.OSVersion);
-                }
-
-                // 生成哈希
-                using (var sha256 = SHA256.Create())
-                {
-                    byte[] hashBytes = sha256.ComputeHash(Encoding.UTF8.GetBytes(hardwareInfo.ToString()));
-                    string hashString = BitConverter.ToString(hashBytes).Replace("-", "");
-
-                    // 取前25个字符，确保唯一性
-                    string deviceId = hashString.Substring(0, 25);
-
-                    // 添加校验位（第25位）
-                    int checksum = 0;
-                    for (int i = 0; i < 24; i++)
-                    {
-                        checksum += Convert.ToInt32(deviceId[i]);
-                    }
-                    checksum %= 36; // 0-9, A-Z
-                    char checksumChar = checksum < 10 ? (char)(checksum + '0') : (char)(checksum - 10 + 'A');
-
-                    return deviceId.Substring(0, 24) + checksumChar;
-                }
+                // 基于当前硬件指纹生成设备ID
+                string hardwareFingerprint = GenerateHardwareFingerprint();
+                return GenerateDeviceIdFromFingerprint(hardwareFingerprint);
             }
             catch (Exception ex)
             {
@@ -224,6 +111,157 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        /// <summary>
+        /// 生成当前设备的硬件指纹字符串（用于生成和校验设备ID）
+        /// </summary>
+        private static string GenerateHardwareFingerprint()
+        {
+            // 收集硬件信息
+            var hardwareInfo = new StringBuilder();
+
+            try
+            {
+                var assembly = Assembly.Load("System.Management");
+                if (assembly != null)
+                {
+                    // CPU信息
+                    try
+                    {
+                        var searcherType = assembly.GetType("System.Management.ManagementObjectSearcher");
+                        var searcher = Activator.CreateInstance(searcherType, "SELECT ProcessorId FROM Win32_Processor");
+                        var getMethod = searcherType.GetMethod("Get");
+                        var enumerator = getMethod.Invoke(searcher, null);
+
+                        var moveNextMethod = enumerator.GetType().GetMethod("MoveNext");
+                        var currentProperty = enumerator.GetType().GetProperty("Current");
+
+                        if ((bool)moveNextMethod.Invoke(enumerator, null))
+                        {
+                            var obj = currentProperty.GetValue(enumerator);
+                            var indexer = obj.GetType().GetProperty("Item", new[] { typeof(string) });
+                            var processorId = indexer.GetValue(obj, new object[] { "ProcessorId" });
+                            hardwareInfo.Append(processorId?.ToString() ?? "");
+                        }
+
+                        var disposeMethod = searcher.GetType().GetMethod("Dispose");
+                        disposeMethod?.Invoke(searcher, null);
+                    }
+                    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+
+                    // 主板序列号
+                    try
+                    {
+                        var searcherType = assembly.GetType("System.Management.ManagementObjectSearcher");
+                        var searcher = Activator.CreateInstance(searcherType, "SELECT SerialNumber FROM Win32_BaseBoard");
+                        var getMethod = searcherType.GetMethod("Get");
+                        var enumerator = getMethod.Invoke(searcher, null);
+
+                        var moveNextMethod = enumerator.GetType().GetMethod("MoveNext");
+                        var currentProperty = enumerator.GetType().GetProperty("Current");
+
+                        if ((bool)moveNextMethod.Invoke(enumerator, null))
+                        {
+                            var obj = currentProperty.GetValue(enumerator);
+                            var indexer = obj.GetType().GetProperty("Item", new[] { typeof(string) });
+                            var serialNumber = indexer.GetValue(obj, new object[] { "SerialNumber" });
+                            hardwareInfo.Append(serialNumber?.ToString() ?? "");
+                        }
+
+                        var disposeMethod = searcher.GetType().GetMethod("Dispose");
+                        disposeMethod?.Invoke(searcher, null);
+                    }
+                    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+
+                    // BIOS序列号
+                    try
+                    {
+                        var searcherType = assembly.GetType("System.Management.ManagementObjectSearcher");
+                        var searcher = Activator.CreateInstance(searcherType, "SELECT SerialNumber FROM Win32_BIOS");
+                        var getMethod = searcherType.GetMethod("Get");
+                        var enumerator = getMethod.Invoke(searcher, null);
+
+                        var moveNextMethod = enumerator.GetType().GetMethod("MoveNext");
+                        var currentProperty = enumerator.GetType().GetProperty("Current");
+
+                        if ((bool)moveNextMethod.Invoke(enumerator, null))
+                        {
+                            var obj = currentProperty.GetValue(enumerator);
+                            var indexer = obj.GetType().GetProperty("Item", new[] { typeof(string) });
+                            var serialNumber = indexer.GetValue(obj, new object[] { "SerialNumber" });
+                            hardwareInfo.Append(serialNumber?.ToString() ?? "");
+                        }
+
+                        var disposeMethod = searcher.GetType().GetMethod("Dispose");
+                        disposeMethod?.Invoke(searcher, null);
+                    }
+                    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+
+                    // 主硬盘序列号
+                    try
+                    {
+                        var searcherType = assembly.GetType("System.Management.ManagementObjectSearcher");
+                        var searcher = Activator.CreateInstance(searcherType, "SELECT SerialNumber FROM Win32_DiskDrive WHERE MediaType='Fixed hard disk media'");
+                        var getMethod = searcherType.GetMethod("Get");
+                        var enumerator = getMethod.Invoke(searcher, null);
+
+                        var moveNextMethod = enumerator.GetType().GetMethod("MoveNext");
+                        var currentProperty = enumerator.GetType().GetProperty("Current");
+
+                        if ((bool)moveNextMethod.Invoke(enumerator, null))
+                        {
+                            var obj = currentProperty.GetValue(enumerator);
+                            var indexer = obj.GetType().GetProperty("Item", new[] { typeof(string) });
+                            var serialNumber = indexer.GetValue(obj, new object[] { "SerialNumber" });
+                            hardwareInfo.Append(serialNumber?.ToString() ?? "");
+                        }
+
+                        var disposeMethod = searcher.GetType().GetMethod("Dispose");
+                        disposeMethod?.Invoke(searcher, null);
+                    }
+                    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+                }
+            }
+            catch
+            {
+            }
+
+            if (hardwareInfo.Length < 10)
+            {
+                hardwareInfo.Append(Environment.MachineName);
+                hardwareInfo.Append(Environment.UserName);
+                hardwareInfo.Append(Environment.OSVersion);
+            }
+
+            return hardwareInfo.ToString();
+        }
+
+        /// <summary>
+        /// 基于硬件指纹生成25字符的设备ID
+        /// </summary>
+        private static string GenerateDeviceIdFromFingerprint(string hardwareFingerprint)
+        {
+            // 生成哈希
+            using (var sha256 = SHA256.Create())
+            {
+                byte[] hashBytes = sha256.ComputeHash(Encoding.UTF8.GetBytes(hardwareFingerprint ?? string.Empty));
+                string hashString = BitConverter.ToString(hashBytes).Replace("-", "");
+
+                // 取前25个字符，确保唯一性
+                string deviceId = hashString.Substring(0, 25);
+
+                // 添加校验位（第25位）
+                int checksum = 0;
+                for (int i = 0; i < 24; i++)
+                {
+                    checksum += Convert.ToInt32(deviceId[i]);
+                }
+                checksum %= 36; // 0-9, A-Z
+                char checksumChar = checksum < 10 ? (char)(checksum + '0') : (char)(checksum - 10 + 'A');
+
+                return deviceId.Substring(0, 24) + checksumChar;
+            }
+        }
+
         /// <summary>
         /// 生成备用设备ID（基于时间戳）
         /// </summary>
@@ -282,16 +320,33 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 从文件加载设备ID
         /// </summary>
-        private static string LoadDeviceIdFromFile(string filePath)
+        private static DeviceIdInfo LoadDeviceIdFromFile(string filePath)
         {
             try
             {
                 if (File.Exists(filePath))
                 {
                     string content = File.ReadAllText(filePath).Trim();
+
+                    try
+                    {
+                        var info = JsonConvert.DeserializeObject<DeviceIdInfo>(content);
+                        if (info != null && !string.IsNullOrEmpty(info.DeviceId) && IsValidDeviceId(info.DeviceId))
+                        {
+                            return info;
+                        }
+                    }
+                    catch
+                    {
+                    }
+
                     if (IsValidDeviceId(content))
                     {
-                        return content;
+                        return new DeviceIdInfo
+                        {
+                            DeviceId = content,
+                            HardwareFingerprint = null
+                        };
                     }
                 }
             }
@@ -305,7 +360,12 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 保存设备ID到文件
         /// </summary>
-        private static void SaveDeviceIdToFile(string filePath, string deviceId)
+        /// <remarks>
+        /// 将设备标识信息以格式化的 JSON 写入指定文件，并确保目标目录存在；在失败时记录错误但不抛出异常。
+        /// </remarks>
+        /// <param name="filePath">目标文件的完整路径，用于保存设备标识信息。</param>
+        /// <param name="info">要保存的设备标识信息对象（包含 DeviceId 和 可选的硬件指纹）。</param>
+        private static void SaveDeviceIdToFile(string filePath, DeviceIdInfo info)
         {
             try
             {
@@ -313,10 +373,11 @@ namespace Ink_Canvas.Helpers
                 var directory = Path.GetDirectoryName(filePath);
                 if (!Directory.Exists(directory))
                 {
-                    Directory.CreateDirectory(directory);
+                    ProcessProtectionManager.WithWriteAccess(directory, () => Directory.CreateDirectory(directory));
                 }
 
-                File.WriteAllText(filePath, deviceId);
+                string json = JsonConvert.SerializeObject(info, Formatting.Indented);
+                ProcessProtectionManager.WithWriteAccess(filePath, () => File.WriteAllText(filePath, json));
 
                 LogHelper.WriteLogToFile($"DeviceIdentifier | 设备ID已保存到: {filePath}");
             }
@@ -326,6 +387,14 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        private class DeviceIdInfo
+        {
+            [JsonProperty("deviceId")]
+            public string DeviceId { get; set; }
+
+            [JsonProperty("hardwareFingerprint")]
+            public string HardwareFingerprint { get; set; }
+        }
 
 
         /// <summary>
@@ -342,7 +411,9 @@ namespace Ink_Canvas.Helpers
             [JsonProperty("launchCount")]
             public int LaunchCount { get; set; }
 
-            // 新的秒级精度字段
+            [JsonProperty("systemVersion")]
+            public string SystemVersion { get; set; }
+
             [JsonProperty("totalUsageSeconds")]
             public long TotalUsageSeconds { get; set; }
 
@@ -363,6 +434,9 @@ namespace Ink_Canvas.Helpers
             [JsonProperty("lastModified")]
             public DateTime LastModified { get; set; }
 
+            [JsonProperty("updateChannel")]
+            public Ink_Canvas.UpdateChannel UpdateChannel { get; set; } = Ink_Canvas.UpdateChannel.Release;
+
             // 每周统计数据（秒级精度）
             [JsonProperty("weeklyLaunchCount")]
             public int WeeklyLaunchCount { get; set; }
@@ -501,6 +575,20 @@ namespace Ink_Canvas.Helpers
                     // 记录每周启动次数
                     stats.RecordWeeklyLaunch();
 
+                    try
+                    {
+                        var osName = OSVersion.GetOperatingSystem();
+                        var osVersion = OSVersion.GetOSVersion();
+                        string versionText = osVersion != null
+                            ? $"{osName} {osVersion.Version}"
+                            : osName.ToString();
+                        stats.SystemVersion = versionText;
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"DeviceIdentifier | 刷新系统版本信息失败: {ex.Message}", LogHelper.LogType.Warning);
+                    }
+
                     // 计算使用频率
                     CalculateUsageFrequency(stats);
 
@@ -536,8 +624,6 @@ namespace Ink_Canvas.Helpers
                         // 更新秒级精度数据
                         stats.TotalUsageSeconds += sessionSeconds;
 
-
-
                         // 记录每周使用时长（秒级精度）
                         stats.RecordWeeklyUsage(sessionSeconds);
 
@@ -545,7 +631,6 @@ namespace Ink_Canvas.Helpers
                         if (stats.LaunchCount > 0)
                         {
                             stats.AverageSessionSeconds = (double)stats.TotalUsageSeconds / stats.LaunchCount;
-
                         }
                     }
 
@@ -565,6 +650,20 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        public static string GetSystemVersion()
+        {
+            try
+            {
+                var stats = LoadUsageStats();
+                return stats.SystemVersion;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"DeviceIdentifier | 获取系统版本失败: {ex.Message}", LogHelper.LogType.Error);
+                return null;
+            }
+        }
+
         /// <summary>
         /// 计算使用频率和更新优先级（基于真实的每周统计数据）
         /// 通过多维度评分系统确定用户类型：高频(≥80分)、中频(40-79分)、低频(<40分)
@@ -905,7 +1004,7 @@ namespace Ink_Canvas.Helpers
                 var directory = Path.GetDirectoryName(filePath);
                 if (!Directory.Exists(directory))
                 {
-                    Directory.CreateDirectory(directory);
+                    ProcessProtectionManager.WithWriteAccess(directory, () => Directory.CreateDirectory(directory));
                 }
 
                 string json = JsonConvert.SerializeObject(stats, Formatting.Indented);
@@ -929,7 +1028,7 @@ namespace Ink_Canvas.Helpers
                     checksum.CopyTo(finalData, 0);
                     encryptedData.CopyTo(finalData, checksum.Length);
 
-                    File.WriteAllBytes(filePath, finalData);
+                    ProcessProtectionManager.WithWriteAccess(filePath, () => File.WriteAllBytes(filePath, finalData));
 
                     LogHelper.WriteLogToFile($"DeviceIdentifier | 加密使用统计已保存到: {filePath}");
                 }
@@ -940,6 +1039,40 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        public static void UpdateUsageChannel(Ink_Canvas.UpdateChannel channel)
+        {
+            try
+            {
+                lock (fileLock)
+                {
+                    var stats = LoadUsageStats();
+                    if (stats == null)
+                    {
+                        stats = new UsageStats
+                        {
+                            DeviceId = DeviceId,
+                            LastLaunchTime = DateTime.Now,
+                            LaunchCount = 0,
+                            TotalUsageSeconds = 0,
+                            AverageSessionSeconds = 0,
+                            LastUpdateCheck = DateTime.MinValue,
+                            UpdatePriority = UpdatePriority.Medium,
+                            UsageFrequency = UsageFrequency.Medium
+                        };
+                    }
+
+                    stats.UpdateChannel = channel;
+                    SaveUsageStats(stats);
+
+                    LogHelper.WriteLogToFile($"DeviceIdentifier | 更新使用统计中的通道信息: {channel}");
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"DeviceIdentifier | 更新通道信息到使用统计失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
         /// <summary>
         /// 记录更新检查时间
         /// </summary>
@@ -960,6 +1093,23 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        /// <summary>
+        /// 获取上次更新检查时间
+        /// </summary>
+        public static DateTime GetLastUpdateCheck()
+        {
+            try
+            {
+                var stats = LoadUsageStats();
+                return stats.LastUpdateCheck;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"DeviceIdentifier | 获取上次更新检查时间失败: {ex.Message}", LogHelper.LogType.Error);
+                return DateTime.MinValue;
+            }
+        }
+
 
         /// <summary>
         /// 从备份文件恢复使用统计数据
@@ -1092,15 +1242,13 @@ namespace Ink_Canvas.Helpers
                     int versionDiff = CalculateVersionGenerationDifference(localVersion, updateVersion);
                     LogHelper.WriteLogToFile($"DeviceIdentifier | 无法获取版本发布时间，使用版本号差异判断 - 本地版本: {localVersion}, 远程版本: {updateVersion}, 代数差异: {versionDiff}");
 
-                    // 当版本号代数差异大于3时自动更新
-                    if (versionDiff > 3)
+                    if (versionDiff >= 1)
                     {
-                        LogHelper.WriteLogToFile($"DeviceIdentifier | 版本号代数差异({versionDiff})大于3，自动更新");
-                        return true;
+                        LogHelper.WriteLogToFile($"DeviceIdentifier | 版本号代数差异({versionDiff})>=1，允许更新");
                     }
                     else
                     {
-                        LogHelper.WriteLogToFile($"DeviceIdentifier | 版本号代数差异({versionDiff})不大于3，暂不更新");
+                        LogHelper.WriteLogToFile($"DeviceIdentifier | 版本号代数差异({versionDiff})<1，可能是相同版本或降级，暂不更新");
                         return false;
                     }
                 }
@@ -1476,4 +1624,3 @@ namespace Ink_Canvas.Helpers
         }
     }
 }
-

Ink Canvas/Helpers/DlassApiClient.cs

@@ -1,10 +1,10 @@
-using Ink_Canvas.Helpers;
 using Newtonsoft.Json;
 using System;
 using System.IO;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Ink_Canvas.Helpers
@@ -14,7 +14,7 @@ namespace Ink_Canvas.Helpers
     /// </summary>
     public class DlassApiClient : IDisposable
     {
-        private const string DEFAULT_BASE_URL = "https://dlass.tech"; 
+        private const string DEFAULT_BASE_URL = "https://dlass.tech";
         private readonly string _appId;
         private readonly string _appSecret;
         private readonly string _baseUrl;
@@ -37,13 +37,13 @@ namespace Ink_Canvas.Helpers
             _appSecret = appSecret ?? throw new ArgumentNullException(nameof(appSecret));
             _userToken = userToken;
             _baseUrl = baseUrl ?? DEFAULT_BASE_URL;
-            
+
             _baseUrl = _baseUrl.TrimEnd('/');
             if (!_baseUrl.StartsWith("http://") && !_baseUrl.StartsWith("https://"))
             {
                 _baseUrl = "https://" + _baseUrl;
             }
-            
+
             _httpClient = new HttpClient
             {
                 BaseAddress = new Uri(_baseUrl),
@@ -55,7 +55,8 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 获取访问令牌（Access Token）
         /// </summary>
-        public async Task<string> GetAccessTokenAsync()
+        /// <param name="cancellationToken">取消令牌</param>
+        public async Task<string> GetAccessTokenAsync(CancellationToken cancellationToken = default)
         {
             if (!string.IsNullOrEmpty(_userToken))
             {
@@ -69,6 +70,8 @@ namespace Ink_Canvas.Helpers
 
             try
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 var requestData = new
                 {
                     app_id = _appId,
@@ -79,7 +82,7 @@ namespace Ink_Canvas.Helpers
                 var json = JsonConvert.SerializeObject(requestData);
                 var content = new StringContent(json, Encoding.UTF8, "application/json");
 
-                var response = await _httpClient.PostAsync("/oauth/token", content);
+                var response = await _httpClient.PostAsync("/oauth/token", content, cancellationToken);
                 var responseContent = await response.Content.ReadAsStringAsync();
 
                 if (response.IsSuccessStatusCode)
@@ -94,14 +97,14 @@ namespace Ink_Canvas.Helpers
                     throw new Exception($"获取Access Token失败: {response.StatusCode}");
                 }
             }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
             catch (HttpRequestException httpEx)
             {
                 throw new Exception($"获取Access Token时网络错误: {httpEx.Message}", httpEx);
             }
-            catch (TaskCanceledException timeoutEx)
-            {
-                throw new Exception("获取Access Token时请求超时", timeoutEx);
-            }
             catch (Exception ex)
             {
                 throw new Exception($"获取Access Token时出错: {ex.Message}", ex);
@@ -111,18 +114,23 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 发送GET请求
         /// </summary>
-        public async Task<T> GetAsync<T>(string endpoint, bool requireAuth = true)
+        /// <param name="endpoint">API端点</param>
+        /// <param name="requireAuth">是否需要认证</param>
+        /// <param name="cancellationToken">取消令牌</param>
+        public async Task<T> GetAsync<T>(string endpoint, bool requireAuth = true, CancellationToken cancellationToken = default)
         {
             try
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 string token = null;
                 if (requireAuth)
                 {
-                    token = await GetAccessTokenAsync();
+                    token = await GetAccessTokenAsync(cancellationToken);
                 }
 
                 var request = new HttpRequestMessage(HttpMethod.Get, endpoint);
-                
+
                 if (requireAuth && !string.IsNullOrEmpty(token))
                 {
                     if (!string.IsNullOrEmpty(_userToken))
@@ -135,7 +143,7 @@ namespace Ink_Canvas.Helpers
                     }
                 }
 
-                var response = await _httpClient.SendAsync(request);
+                var response = await _httpClient.SendAsync(request, cancellationToken);
                 var content = await response.Content.ReadAsStringAsync();
 
                 if (response.IsSuccessStatusCode)
@@ -151,14 +159,14 @@ namespace Ink_Canvas.Helpers
                     throw new Exception($"API请求失败: {response.StatusCode} - {content}");
                 }
             }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
             catch (HttpRequestException httpEx)
             {
                 throw new Exception($"发送请求时出错: {httpEx.Message}", httpEx);
             }
-            catch (TaskCanceledException timeoutEx)
-            {
-                throw new Exception($"请求超时: {endpoint}", timeoutEx);
-            }
             catch (Exception ex)
             {
                 throw new Exception($"发送请求时出错: {ex.Message}", ex);
@@ -168,18 +176,24 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 发送POST请求
         /// </summary>
-        public async Task<T> PostAsync<T>(string endpoint, object data = null, bool requireAuth = true)
+        /// <param name="endpoint">API端点</param>
+        /// <param name="data">请求数据</param>
+        /// <param name="requireAuth">是否需要认证</param>
+        /// <param name="cancellationToken">取消令牌</param>
+        public async Task<T> PostAsync<T>(string endpoint, object data = null, bool requireAuth = true, CancellationToken cancellationToken = default)
         {
             try
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 string token = null;
                 if (requireAuth)
                 {
-                    token = await GetAccessTokenAsync();
+                    token = await GetAccessTokenAsync(cancellationToken);
                 }
 
                 var request = new HttpRequestMessage(HttpMethod.Post, endpoint);
-                
+
                 if (requireAuth && !string.IsNullOrEmpty(token))
                 {
                     if (!string.IsNullOrEmpty(_userToken))
@@ -198,7 +212,7 @@ namespace Ink_Canvas.Helpers
                     request.Content = new StringContent(json, Encoding.UTF8, "application/json");
                 }
 
-                var response = await _httpClient.SendAsync(request);
+                var response = await _httpClient.SendAsync(request, cancellationToken);
                 var content = await response.Content.ReadAsStringAsync();
 
                 if (response.IsSuccessStatusCode)
@@ -214,14 +228,14 @@ namespace Ink_Canvas.Helpers
                     throw new Exception($"API请求失败: {response.StatusCode} - {content}");
                 }
             }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
             catch (HttpRequestException httpEx)
             {
                 throw new Exception($"发送请求时出错: {httpEx.Message}", httpEx);
             }
-            catch (TaskCanceledException timeoutEx)
-            {
-                throw new Exception($"请求超时: {endpoint}", timeoutEx);
-            }
             catch (Exception ex)
             {
                 throw new Exception($"发送请求时出错: {ex.Message}", ex);
@@ -231,18 +245,24 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 发送PUT请求
         /// </summary>
-        public async Task<T> PutAsync<T>(string endpoint, object data = null, bool requireAuth = true)
+        /// <param name="endpoint">API端点</param>
+        /// <param name="data">请求数据</param>
+        /// <param name="requireAuth">是否需要认证</param>
+        /// <param name="cancellationToken">取消令牌</param>
+        public async Task<T> PutAsync<T>(string endpoint, object data = null, bool requireAuth = true, CancellationToken cancellationToken = default)
         {
             try
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 string token = null;
                 if (requireAuth)
                 {
-                    token = await GetAccessTokenAsync();
+                    token = await GetAccessTokenAsync(cancellationToken);
                 }
 
                 var request = new HttpRequestMessage(HttpMethod.Put, endpoint);
-                
+
                 if (requireAuth && !string.IsNullOrEmpty(token))
                 {
                     // 如果是用户token，使用X-User-Token header
@@ -262,7 +282,7 @@ namespace Ink_Canvas.Helpers
                     request.Content = new StringContent(json, Encoding.UTF8, "application/json");
                 }
 
-                var response = await _httpClient.SendAsync(request);
+                var response = await _httpClient.SendAsync(request, cancellationToken);
                 var content = await response.Content.ReadAsStringAsync();
 
                 if (response.IsSuccessStatusCode)
@@ -278,14 +298,14 @@ namespace Ink_Canvas.Helpers
                     throw new Exception($"API请求失败: {response.StatusCode} - {content}");
                 }
             }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
             catch (HttpRequestException httpEx)
             {
                 throw new Exception($"发送请求时出错: {httpEx.Message}", httpEx);
             }
-            catch (TaskCanceledException timeoutEx)
-            {
-                throw new Exception($"请求超时: {endpoint}", timeoutEx);
-            }
             catch (Exception ex)
             {
                 throw new Exception($"发送请求时出错: {ex.Message}", ex);
@@ -295,18 +315,23 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 发送DELETE请求
         /// </summary>
-        public async Task<bool> DeleteAsync(string endpoint, bool requireAuth = true)
+        /// <param name="endpoint">API端点</param>
+        /// <param name="requireAuth">是否需要认证</param>
+        /// <param name="cancellationToken">取消令牌</param>
+        public async Task<bool> DeleteAsync(string endpoint, bool requireAuth = true, CancellationToken cancellationToken = default)
         {
             try
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 string token = null;
                 if (requireAuth)
                 {
-                    token = await GetAccessTokenAsync();
+                    token = await GetAccessTokenAsync(cancellationToken);
                 }
 
                 var request = new HttpRequestMessage(HttpMethod.Delete, endpoint);
-                
+
                 if (requireAuth && !string.IsNullOrEmpty(token))
                 {
                     // 如果是用户token，使用X-User-Token header
@@ -320,7 +345,7 @@ namespace Ink_Canvas.Helpers
                     }
                 }
 
-                var response = await _httpClient.SendAsync(request);
+                var response = await _httpClient.SendAsync(request, cancellationToken);
 
                 if (response.IsSuccessStatusCode)
                 {
@@ -331,11 +356,11 @@ namespace Ink_Canvas.Helpers
                     return false;
                 }
             }
-            catch (HttpRequestException)
+            catch (OperationCanceledException)
             {
-                return false;
+                throw;
             }
-            catch (TaskCanceledException)
+            catch (HttpRequestException)
             {
                 return false;
             }
@@ -355,24 +380,27 @@ namespace Ink_Canvas.Helpers
         /// <param name="title">笔记标题（可选）</param>
         /// <param name="description">笔记描述（可选）</param>
         /// <param name="tags">笔记标签（可选）</param>
-        public async Task<T> UploadNoteAsync<T>(string endpoint, string filePath, string boardId, string secretKey, string title = null, string description = null, string tags = null)
+        /// <param name="cancellationToken">取消令牌</param>
+        public async Task<T> UploadNoteAsync<T>(string endpoint, string filePath, string boardId, string secretKey, string title = null, string description = null, string tags = null, CancellationToken cancellationToken = default)
         {
             try
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 if (!File.Exists(filePath))
                 {
                     throw new FileNotFoundException($"文件不存在: {filePath}");
                 }
 
                 var request = new HttpRequestMessage(HttpMethod.Post, endpoint);
-                
+
                 // 设置白板认证头
                 request.Headers.Add("X-Board-ID", boardId);
                 request.Headers.Add("X-Secret-Key", secretKey);
 
                 // 创建multipart/form-data内容
                 var content = new MultipartFormDataContent();
-                
+
                 // 添加文件
                 var fileContent = new ByteArrayContent(File.ReadAllBytes(filePath));
                 var fileName = Path.GetFileName(filePath);
@@ -395,7 +423,7 @@ namespace Ink_Canvas.Helpers
 
                 request.Content = content;
 
-                var response = await _httpClient.SendAsync(request);
+                var response = await _httpClient.SendAsync(request, cancellationToken);
                 var responseContent = await response.Content.ReadAsStringAsync();
 
                 if (response.IsSuccessStatusCode)
@@ -411,14 +439,14 @@ namespace Ink_Canvas.Helpers
                     throw new Exception($"上传文件失败: {response.StatusCode} - {responseContent}");
                 }
             }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
             catch (HttpRequestException httpEx)
             {
                 throw new Exception($"上传文件时网络错误: {httpEx.Message}", httpEx);
             }
-            catch (TaskCanceledException timeoutEx)
-            {
-                throw new Exception($"上传文件超时: {endpoint}", timeoutEx);
-            }
             catch (Exception ex)
             {
                 throw new Exception($"上传文件时出错: {ex.Message}", ex);

Ink Canvas/Helpers/DlassNoteUploader.cs

@@ -1,758 +0,0 @@
-using Ink_Canvas.Helpers;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Ink_Canvas.Helpers
-{
-    /// <summary>
-    /// Dlass笔记自动上传辅助类
-    /// </summary>
-    public class DlassNoteUploader
-    {
-        private const string APP_ID = "app_WkjocWqsrVY7T6zQV2CfiA";
-        private const string APP_SECRET = "o7dx5b5ASGUMcM72PCpmRQYAhSijqaOVHoGyBK0IxbA";
-        private const int BATCH_SIZE = 10; // 批量上传大小
-        private const int MAX_RETRY_COUNT = 3; // 最大重试次数
-        private const string QUEUE_FILE_NAME = "DlassUploadQueue.json"; 
-
-        /// <summary>
-        /// 上传队列项
-        /// </summary>
-        private class UploadQueueItemData
-        {
-            [JsonProperty("file_path")]
-            public string FilePath { get; set; }
-
-            [JsonProperty("retry_count")]
-            public int RetryCount { get; set; }
-
-            [JsonProperty("added_time")]
-            public DateTime AddedTime { get; set; }
-        }
-
-        /// <summary>
-        /// 上传队列项
-        /// </summary>
-        private class UploadQueueItem
-        {
-            public string FilePath { get; set; }
-            public int RetryCount { get; set; }
-        }
-
-        /// <summary>
-        /// 上传队列
-        /// </summary>
-        private static readonly ConcurrentQueue<UploadQueueItem> _uploadQueue = new ConcurrentQueue<UploadQueueItem>();
-
-        /// <summary>
-        /// 队列处理锁，防止并发处理
-        /// </summary>
-        private static readonly SemaphoreSlim _queueProcessingLock = new SemaphoreSlim(1, 1);
-
-        /// <summary>
-        /// 队列保存锁，防止并发保存
-        /// </summary>
-        private static readonly SemaphoreSlim _queueSaveLock = new SemaphoreSlim(1, 1);
-
-        /// <summary>
-        /// 是否已初始化队列
-        /// </summary>
-        private static bool _isQueueInitialized = false;
-
-        /// <summary>
-        /// 获取队列文件路径
-        /// </summary>
-        private static string GetQueueFilePath()
-        {
-            var configsDir = Path.Combine(App.RootPath, "Configs");
-            if (!Directory.Exists(configsDir))
-            {
-                Directory.CreateDirectory(configsDir);
-            }
-            return Path.Combine(configsDir, QUEUE_FILE_NAME);
-        }
-
-        /// <summary>
-        /// 初始化上传队列
-        /// </summary>
-        public static void InitializeQueue()
-        {
-            if (_isQueueInitialized)
-            {
-                return;
-            }
-
-            try
-            {
-                var queueFilePath = GetQueueFilePath();
-                if (!File.Exists(queueFilePath))
-                {
-                    _isQueueInitialized = true;
-                    return;
-                }
-
-                var jsonContent = File.ReadAllText(queueFilePath);
-                if (string.IsNullOrWhiteSpace(jsonContent))
-                {
-                    _isQueueInitialized = true;
-                    return;
-                }
-
-                var queueData = JsonConvert.DeserializeObject<List<UploadQueueItemData>>(jsonContent);
-                if (queueData == null || queueData.Count == 0)
-                {
-                    _isQueueInitialized = true;
-                    return;
-                }
-
-                int restoredCount = 0;
-                int skippedCount = 0;
-
-                foreach (var item in queueData)
-                {
-                    // 验证文件是否存在
-                    if (!File.Exists(item.FilePath))
-                    {
-                        skippedCount++;
-                        continue;
-                    }
-
-                    // 验证文件格式和大小
-                    var fileExtension = Path.GetExtension(item.FilePath).ToLower();
-                    if (fileExtension != ".png" && fileExtension != ".icstk" && fileExtension != ".zip")
-                    {
-                        skippedCount++;
-                        continue;
-                    }
-
-                    try
-                    {
-                        var fileInfo = new FileInfo(item.FilePath);
-                        long maxSize = fileExtension == ".zip" ? 50 * 1024 * 1024 : 10 * 1024 * 1024;
-                        if (fileInfo.Length > maxSize)
-                        {
-                            skippedCount++;
-                            continue;
-                        }
-                    }
-                    catch
-                    {
-                        skippedCount++;
-                        continue;
-                    }
-
-                    // 恢复队列项
-                    _uploadQueue.Enqueue(new UploadQueueItem
-                    {
-                        FilePath = item.FilePath,
-                        RetryCount = item.RetryCount
-                    });
-                    restoredCount++;
-                }
-
-                _isQueueInitialized = true;
-
-                if (restoredCount > 0)
-                {
-                    LogHelper.WriteLogToFile($"已恢复上传队列：{restoredCount}个文件，跳过{skippedCount}个无效文件", LogHelper.LogType.Event);
-                    // 如果恢复了队列，触发处理
-                    _ = ProcessUploadQueueAsync();
-                }
-                else if (skippedCount > 0)
-                {
-                    LogHelper.WriteLogToFile($"队列恢复完成：跳过{skippedCount}个无效文件", LogHelper.LogType.Event);
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"恢复上传队列时出错: {ex.Message}", LogHelper.LogType.Error);
-                _isQueueInitialized = true; // 即使出错也标记为已初始化，避免重复尝试
-            }
-        }
-
-        /// <summary>
-        /// 保存队列到文件
-        /// </summary>
-        private static async Task SaveQueueToFileAsync()
-        {
-            if (!await _queueSaveLock.WaitAsync(1000)) // 最多等待1秒
-            {
-                return; // 如果无法获取锁，跳过保存（避免阻塞）
-            }
-
-            try
-            {
-                var queueData = new List<UploadQueueItemData>();
-                
-                // 将队列转换为可序列化的格式
-                foreach (var item in _uploadQueue)
-                {
-                    queueData.Add(new UploadQueueItemData
-                    {
-                        FilePath = item.FilePath,
-                        RetryCount = item.RetryCount,
-                        AddedTime = DateTime.Now
-                    });
-                }
-
-                var queueFilePath = GetQueueFilePath();
-                
-                // 如果队列为空，清空文件
-                if (queueData.Count == 0)
-                {
-                    ClearQueueFile();
-                    return;
-                }
-
-                var jsonContent = JsonConvert.SerializeObject(queueData, Formatting.Indented);
-                
-                // 使用临时文件写入，然后替换，确保原子性
-                var tempFilePath = queueFilePath + ".tmp";
-                File.WriteAllText(tempFilePath, jsonContent);
-                
-                // 如果原文件存在，先删除
-                if (File.Exists(queueFilePath))
-                {
-                    File.Delete(queueFilePath);
-                }
-                
-                // 重命名临时文件
-                File.Move(tempFilePath, queueFilePath);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"保存上传队列时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-            finally
-            {
-                _queueSaveLock.Release();
-            }
-        }
-
-        /// <summary>
-        /// 清空队列文件
-        /// </summary>
-        private static void ClearQueueFile()
-        {
-            try
-            {
-                var queueFilePath = GetQueueFilePath();
-                if (File.Exists(queueFilePath))
-                {
-                    File.WriteAllText(queueFilePath, "[]");
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"清空队列文件时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 上传笔记响应模型
-        /// </summary>
-        public class UploadNoteResponse
-        {
-            [JsonProperty("success")]
-            public bool Success { get; set; }
-
-            [JsonProperty("message")]
-            public string Message { get; set; }
-
-            [JsonProperty("note_id")]
-            public int? NoteId { get; set; }
-
-            [JsonProperty("filename")]
-            public string Filename { get; set; }
-
-            [JsonProperty("file_path")]
-            public string FilePath { get; set; }
-
-            [JsonProperty("file_url")]
-            public string FileUrl { get; set; }
-        }
-
-        /// <summary>
-        /// 白板信息模型（用于查找白板）
-        /// </summary>
-        private class WhiteboardInfo
-        {
-            [JsonProperty("id")]
-            public int Id { get; set; }
-
-            [JsonProperty("name")]
-            public string Name { get; set; }
-
-            [JsonProperty("board_id")]
-            public string BoardId { get; set; }
-
-            [JsonProperty("secret_key")]
-            public string SecretKey { get; set; }
-
-            [JsonProperty("class_name")]
-            public string ClassName { get; set; }
-
-            [JsonProperty("class_id")]
-            public int ClassId { get; set; }
-        }
-
-        /// <summary>
-        /// 认证响应模型
-        /// </summary>
-        private class AuthWithTokenResponse
-        {
-            [JsonProperty("success")]
-            public bool Success { get; set; }
-
-            [JsonProperty("whiteboards")]
-            public List<WhiteboardInfo> Whiteboards { get; set; }
-        }
-
-        /// <summary>
-        /// 异步上传笔记文件到Dlass（支持PNG、ICSTK和ZIP格式）
-        /// </summary>
-        /// <param name="filePath">文件路径（支持PNG、ICSTK和ZIP）</param>
-        /// <returns>是否成功加入队列（不等待实际上传完成）</returns>
-        public static async Task<bool> UploadNoteFileAsync(string filePath)
-        {
-            try
-            {
-                // 检查是否启用自动上传
-                if (MainWindow.Settings?.Dlass?.IsAutoUploadNotes != true)
-                {
-                    return false;
-                }
-
-                // 基本验证
-                if (!File.Exists(filePath))
-                {
-                    LogHelper.WriteLogToFile($"上传失败：文件不存在 - {filePath}", LogHelper.LogType.Error);
-                    return false;
-                }
-
-                var fileExtension = Path.GetExtension(filePath).ToLower();
-                if (fileExtension != ".png" && fileExtension != ".icstk" && fileExtension != ".zip")
-                {
-                    return false;
-                }
-
-                var fileInfo = new FileInfo(filePath);
-                long maxSize = fileExtension == ".zip" ? 50 * 1024 * 1024 : 10 * 1024 * 1024;
-                if (fileInfo.Length > maxSize)
-                {
-                    LogHelper.WriteLogToFile($"上传失败：文件过大（{fileInfo.Length / 1024 / 1024}MB），超过{maxSize / 1024 / 1024}MB限制", LogHelper.LogType.Error);
-                    return false;
-                }
-
-                // 获取上传延迟时间（分钟）
-                var delayMinutes = MainWindow.Settings?.Dlass?.AutoUploadDelayMinutes ?? 0;
-
-                // 如果设置了延迟时间，在后台任务中等待后再加入队列
-                if (delayMinutes > 0)
-                {
-                    _ = Task.Run(async () =>
-                    {
-                        await Task.Delay(TimeSpan.FromMinutes(delayMinutes));
-                        EnqueueFile(filePath);
-                    });
-                }
-                else
-                {
-                    EnqueueFile(filePath);
-                }
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"加入上传队列时出错: {ex.Message}", LogHelper.LogType.Error);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// 将文件加入上传队列
-        /// </summary>
-        private static void EnqueueFile(string filePath, int retryCount = 0)
-        {
-            _uploadQueue.Enqueue(new UploadQueueItem
-            {
-                FilePath = filePath,
-                RetryCount = retryCount
-            });
-
-            // 异步保存队列到文件
-            _ = Task.Run(async () => await SaveQueueToFileAsync());
-
-            // 如果队列达到批量大小，触发批量上传
-            if (_uploadQueue.Count >= BATCH_SIZE)
-            {
-                _ = ProcessUploadQueueAsync();
-            }
-        }
-
-        /// <summary>
-        /// 处理上传队列，批量上传文件
-        /// </summary>
-        private static async Task ProcessUploadQueueAsync()
-        {
-            // 使用信号量防止并发处理
-            if (!await _queueProcessingLock.WaitAsync(0))
-            {
-                return; // 已有处理任务在运行
-            }
-
-            try
-            {
-                var filesToUpload = new List<UploadQueueItem>();
-
-                // 从队列中取出最多BATCH_SIZE个文件
-                while (filesToUpload.Count < BATCH_SIZE && _uploadQueue.TryDequeue(out UploadQueueItem item))
-                {
-                    // 再次检查文件是否存在
-                    if (File.Exists(item.FilePath))
-                    {
-                        filesToUpload.Add(item);
-                    }
-                }
-
-                if (filesToUpload.Count == 0)
-                {
-                    return;
-                }
-
-                // 获取共享的白板信息（同一批次的所有文件共享认证信息）
-                WhiteboardInfo sharedWhiteboard = null;
-                string apiBaseUrl = null;
-                string userToken = null;
-                
-                try
-                {
-                    var selectedClassName = MainWindow.Settings?.Dlass?.SelectedClassName;
-                    if (string.IsNullOrEmpty(selectedClassName))
-                    {
-                        LogHelper.WriteLogToFile("上传失败：未选择班级", LogHelper.LogType.Error);
-                        // 将文件重新加入队列
-                        foreach (var item in filesToUpload)
-                        {
-                            EnqueueFile(item.FilePath, item.RetryCount);
-                        }
-                        return;
-                    }
-
-                    userToken = MainWindow.Settings?.Dlass?.UserToken;
-                    if (string.IsNullOrEmpty(userToken))
-                    {
-                        LogHelper.WriteLogToFile("上传失败：未设置用户Token", LogHelper.LogType.Error);
-                        // 将文件重新加入队列
-                        foreach (var item in filesToUpload)
-                        {
-                            EnqueueFile(item.FilePath, item.RetryCount);
-                        }
-                        return;
-                    }
-
-                    apiBaseUrl = MainWindow.Settings?.Dlass?.ApiBaseUrl ?? "https://dlass.tech";
-
-                    // 获取白板信息（只获取一次，所有文件共享）
-                    using (var apiClient = new DlassApiClient(APP_ID, APP_SECRET, apiBaseUrl, userToken))
-                    {
-                        var authData = new
-                        {
-                            app_id = APP_ID,
-                            app_secret = APP_SECRET,
-                            user_token = userToken
-                        };
-
-                        var authResult = await apiClient.PostAsync<AuthWithTokenResponse>("/api/whiteboard/framework/auth-with-token", authData, requireAuth: false);
-
-                        if (authResult == null || !authResult.Success || authResult.Whiteboards == null)
-                        {
-                            LogHelper.WriteLogToFile("上传失败：无法获取白板信息", LogHelper.LogType.Error);
-                            // 将文件重新加入队列
-                            foreach (var item in filesToUpload)
-                            {
-                                EnqueueFile(item.FilePath, item.RetryCount);
-                            }
-                            return;
-                        }
-
-                        sharedWhiteboard = authResult.Whiteboards
-                            .FirstOrDefault(w => !string.IsNullOrEmpty(w.ClassName) && w.ClassName == selectedClassName);
-
-                        if (sharedWhiteboard == null || string.IsNullOrEmpty(sharedWhiteboard.BoardId) || string.IsNullOrEmpty(sharedWhiteboard.SecretKey))
-                        {
-                            LogHelper.WriteLogToFile($"上传失败：未找到班级'{selectedClassName}'对应的白板", LogHelper.LogType.Error);
-                            // 将文件重新加入队列
-                            foreach (var item in filesToUpload)
-                            {
-                                EnqueueFile(item.FilePath, item.RetryCount);
-                            }
-                            return;
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteLogToFile($"批量上传获取白板信息时出错: {ex.Message}", LogHelper.LogType.Error);
-                    // 将文件重新加入队列
-                    foreach (var item in filesToUpload)
-                    {
-                        EnqueueFile(item.FilePath, item.RetryCount);
-                    }
-                    return;
-                }
-
-                // 并发上传所有文件（共享白板信息），并处理失败重试
-                var uploadTasks = filesToUpload.Select(async item =>
-                {
-                    try
-                    {
-                        var success = await UploadFileInternalAsync(item.FilePath, sharedWhiteboard, apiBaseUrl, userToken);
-                        if (!success)
-                        {
-                            // 检查是否是可重试的错误
-                            if (IsRetryableError(item.FilePath))
-                            {
-                                // 检查重试次数
-                                if (item.RetryCount < MAX_RETRY_COUNT)
-                                {
-                                    LogHelper.WriteLogToFile($"上传失败，将重试 ({item.RetryCount + 1}/{MAX_RETRY_COUNT}): {Path.GetFileName(item.FilePath)}", LogHelper.LogType.Event);
-                                    EnqueueFile(item.FilePath, item.RetryCount + 1);
-                                }
-                                else
-                                {
-                                    LogHelper.WriteLogToFile($"上传失败，已达到最大重试次数: {Path.GetFileName(item.FilePath)}", LogHelper.LogType.Error);
-                                }
-                            }
-                        }
-                        return success;
-                    }
-                    catch (Exception ex)
-                    {
-                        // 检查是否是可重试的错误（超时、网络错误等）
-                        var errorMessage = ex.Message.ToLower();
-                        bool isRetryable = errorMessage.Contains("超时") || 
-                                          errorMessage.Contains("timeout") ||
-                                          errorMessage.Contains("网络错误") ||
-                                          errorMessage.Contains("network");
-                        
-                        if (isRetryable && IsRetryableError(item.FilePath))
-                        {
-                            // 检查重试次数
-                            if (item.RetryCount < MAX_RETRY_COUNT)
-                            {
-                                LogHelper.WriteLogToFile($"上传失败({ex.Message})，将重试 ({item.RetryCount + 1}/{MAX_RETRY_COUNT}): {Path.GetFileName(item.FilePath)}", LogHelper.LogType.Event);
-                                EnqueueFile(item.FilePath, item.RetryCount + 1);
-                            }
-                            else
-                            {
-                                LogHelper.WriteLogToFile($"上传失败，已达到最大重试次数: {Path.GetFileName(item.FilePath)}", LogHelper.LogType.Error);
-                            }
-                        }
-                        return false;
-                    }
-                });
-                await Task.WhenAll(uploadTasks);
-
-                // 上传完成后保存队列状态
-                await SaveQueueToFileAsync();
-
-                // 如果队列达到批量大小，继续处理
-                if (_uploadQueue.Count >= BATCH_SIZE)
-                {
-                    _ = ProcessUploadQueueAsync();
-                }
-            }
-            finally
-            {
-                _queueProcessingLock.Release();
-            }
-        }
-
-        /// <summary>
-        /// 内部上传方法，执行实际上传操作
-        /// </summary>
-        /// <param name="filePath">文件路径</param>
-        /// <param name="whiteboard">白板信息（如果为null则重新获取）</param>
-        /// <param name="apiBaseUrl">API基础URL（如果为null则从设置获取）</param>
-        /// <param name="userToken">用户Token（如果为null则从设置获取）</param>
-        private static async Task<bool> UploadFileInternalAsync(string filePath, WhiteboardInfo whiteboard = null, string apiBaseUrl = null, string userToken = null)
-        {
-            try
-            {
-                // 再次检查文件是否存在（可能在队列等待时被删除）
-                if (!File.Exists(filePath))
-                {
-                    return false;
-                }
-
-                // 检查文件扩展名
-                var fileExtension = Path.GetExtension(filePath).ToLower();
-                if (fileExtension != ".png" && fileExtension != ".icstk" && fileExtension != ".zip")
-                {
-                    return false;
-                }
-
-                // 检查文件大小（最大10MB，ZIP文件可能更大，允许50MB）
-                var fileInfo = new FileInfo(filePath);
-                long maxSize = fileExtension == ".zip" ? 50 * 1024 * 1024 : 10 * 1024 * 1024;
-                if (fileInfo.Length > maxSize)
-                {
-                    LogHelper.WriteLogToFile($"上传失败：文件过大（{fileInfo.Length / 1024 / 1024}MB），超过{maxSize / 1024 / 1024}MB限制", LogHelper.LogType.Error);
-                    return false;
-                }
-
-                // 如果白板信息未提供，则重新获取
-                if (whiteboard == null)
-                {
-                    var selectedClassName = MainWindow.Settings?.Dlass?.SelectedClassName;
-                    if (string.IsNullOrEmpty(selectedClassName))
-                    {
-                        LogHelper.WriteLogToFile("上传失败：未选择班级", LogHelper.LogType.Error);
-                        return false;
-                    }
-
-                    userToken = userToken ?? MainWindow.Settings?.Dlass?.UserToken;
-                    if (string.IsNullOrEmpty(userToken))
-                    {
-                        LogHelper.WriteLogToFile("上传失败：未设置用户Token", LogHelper.LogType.Error);
-                        return false;
-                    }
-
-                    apiBaseUrl = apiBaseUrl ?? MainWindow.Settings?.Dlass?.ApiBaseUrl ?? "https://dlass.tech";
-
-                    // 创建API客户端并获取白板信息
-                    using (var apiClient = new DlassApiClient(APP_ID, APP_SECRET, apiBaseUrl, userToken))
-                    {
-                        var authData = new
-                        {
-                            app_id = APP_ID,
-                            app_secret = APP_SECRET,
-                            user_token = userToken
-                        };
-
-                        var authResult = await apiClient.PostAsync<AuthWithTokenResponse>("/api/whiteboard/framework/auth-with-token", authData, requireAuth: false);
-
-                        if (authResult == null || !authResult.Success || authResult.Whiteboards == null)
-                        {
-                            LogHelper.WriteLogToFile("上传失败：无法获取白板信息", LogHelper.LogType.Error);
-                            return false;
-                        }
-
-                        // 查找匹配班级的白板
-                        whiteboard = authResult.Whiteboards
-                            .FirstOrDefault(w => !string.IsNullOrEmpty(w.ClassName) && w.ClassName == selectedClassName);
-
-                        if (whiteboard == null || string.IsNullOrEmpty(whiteboard.BoardId) || string.IsNullOrEmpty(whiteboard.SecretKey))
-                        {
-                            LogHelper.WriteLogToFile($"上传失败：未找到班级'{selectedClassName}'对应的白板", LogHelper.LogType.Error);
-                            return false;
-                        }
-                    }
-                }
-
-                // 获取API基础URL和用户Token（如果未提供）
-                apiBaseUrl = apiBaseUrl ?? MainWindow.Settings?.Dlass?.ApiBaseUrl ?? "https://dlass.tech";
-                userToken = userToken ?? MainWindow.Settings?.Dlass?.UserToken;
-
-                // 准备上传参数
-                var fileName = Path.GetFileNameWithoutExtension(filePath);
-                var title = fileName;
-                string fileType;
-                string tags;
-                if (fileExtension == ".zip")
-                {
-                    fileType = "多页面墨迹压缩包";
-                    tags = "自动上传,多页面,zip,压缩包";
-                }
-                else if (fileExtension == ".icstk")
-                {
-                    fileType = "墨迹文件";
-                    tags = "自动上传,墨迹,icstk";
-                }
-                else
-                {
-                    fileType = "笔记";
-                    tags = "自动上传,笔记,png";
-                }
-                var description = $"自动上传的{fileType} - {DateTime.Now:yyyy-MM-dd HH:mm:ss}";
-
-                // 创建API客户端并上传文件
-                using (var apiClient = new DlassApiClient(APP_ID, APP_SECRET, apiBaseUrl, userToken))
-                {
-                    var uploadResult = await apiClient.UploadNoteAsync<UploadNoteResponse>(
-                        "/api/whiteboard/upload_note",
-                        filePath,
-                        whiteboard.BoardId,
-                        whiteboard.SecretKey,
-                        title,
-                        description,
-                        tags);
-
-                    if (uploadResult != null && uploadResult.Success)
-                    {
-                        LogHelper.WriteLogToFile($"笔记上传成功：{fileName} -> {uploadResult.FileUrl}", LogHelper.LogType.Event);
-                        return true;
-                    }
-                    else
-                    {
-                        LogHelper.WriteLogToFile($"上传失败：服务器响应失败 - {uploadResult?.Message ?? "未知错误"}", LogHelper.LogType.Error);
-                        return false;
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                // 记录错误信息，抛出异常以便调用方判断是否可重试
-                LogHelper.WriteLogToFile($"上传笔记时出错: {ex.Message}", LogHelper.LogType.Error);
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// 判断错误是否可重试（超时、网络错误等）
-        /// </summary>
-        private static bool IsRetryableError(string filePath)
-        {
-            // 检查文件是否存在
-            if (!File.Exists(filePath))
-            {
-                return false; // 文件不存在，不可重试
-            }
-
-            // 检查文件扩展名
-            var fileExtension = Path.GetExtension(filePath).ToLower();
-            if (fileExtension != ".png" && fileExtension != ".icstk" && fileExtension != ".zip")
-            {
-                return false; // 文件格式错误，不可重试
-            }
-
-            // 检查文件大小
-            try
-            {
-                var fileInfo = new FileInfo(filePath);
-                long maxSize = fileExtension == ".zip" ? 50 * 1024 * 1024 : 10 * 1024 * 1024;
-                if (fileInfo.Length > maxSize)
-                {
-                    return false; // 文件过大，不可重试
-                }
-            }
-            catch
-            {
-                return false; // 无法读取文件信息，不可重试
-            }
-
-            // 其他错误（超时、网络错误等）可以重试
-            return true;
-        }
-    }
-}
-
-

Ink Canvas/Helpers/DlassUploadQueue.cs

@@ -0,0 +1,257 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// Dlass上传队列
+    /// </summary>
+    public class DlassUploadQueue : BaseUploadQueue
+    {
+        private const string APP_ID = "app_WkjocWqsrVY7T6zQV2CfiA";
+        private const string APP_SECRET = "o7dx5b5ASGUMcM72PCpmRQYAhSijqaOVHoGyBK0IxbA";
+
+        /// <summary>
+        /// 队列文件名
+        /// </summary>
+        protected override string QueueFileName => "DlassUploadQueue.json";
+
+        /// <summary>
+        /// 上传笔记响应模型
+        /// </summary>
+        public class UploadNoteResponse
+        {
+            [JsonProperty("success")]
+            public bool Success { get; set; }
+
+            [JsonProperty("message")]
+            public string Message { get; set; }
+
+            [JsonProperty("note_id")]
+            public int? NoteId { get; set; }
+
+            [JsonProperty("filename")]
+            public string Filename { get; set; }
+
+            [JsonProperty("file_path")]
+            public string FilePath { get; set; }
+
+            [JsonProperty("file_url")]
+            public string FileUrl { get; set; }
+        }
+
+        /// <summary>
+        /// 白板信息模型（用于查找白板）
+        /// </summary>
+        private class WhiteboardInfo
+        {
+            [JsonProperty("id")]
+            public int Id { get; set; }
+
+            [JsonProperty("name")]
+            public string Name { get; set; }
+
+            [JsonProperty("board_id")]
+            public string BoardId { get; set; }
+
+            [JsonProperty("secret_key")]
+            public string SecretKey { get; set; }
+
+            [JsonProperty("class_name")]
+            public string ClassName { get; set; }
+
+            [JsonProperty("class_id")]
+            public int ClassId { get; set; }
+        }
+
+        /// <summary>
+        /// 认证响应模型
+        /// </summary>
+        private class AuthWithTokenResponse
+        {
+            [JsonProperty("success")]
+            public bool Success { get; set; }
+
+            [JsonProperty("whiteboards")]
+            public List<WhiteboardInfo> Whiteboards { get; set; }
+        }
+
+        /// <summary>
+        /// 检查上传是否启用
+        /// </summary>
+        protected override bool IsUploadEnabled()
+        {
+            return MainWindow.Settings?.Dlass?.IsAutoUploadNotes == true;
+        }
+
+        /// <summary>
+        /// 内部上传方法，执行实际上传操作
+        /// </summary>
+        protected override async Task<bool> UploadFileInternalAsync(string filePath, CancellationToken cancellationToken)
+        {
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                // 再次检查文件是否存在（可能在队列等待时被删除）
+                if (!File.Exists(filePath))
+                {
+                    return false;
+                }
+
+                // 获取白板信息
+                var whiteboard = await GetWhiteboardInfo(cancellationToken);
+                if (whiteboard == null)
+                {
+                    return false;
+                }
+
+                // 获取API基础URL和用户Token
+                var apiBaseUrl = MainWindow.Settings?.Dlass?.ApiBaseUrl ?? "https://dlass.tech";
+                var userToken = MainWindow.Settings?.Dlass?.UserToken;
+
+                // 准备上传参数
+                var fileName = Path.GetFileNameWithoutExtension(filePath);
+                var fileExtension = Path.GetExtension(filePath).ToLower();
+                var title = fileName;
+                string fileType;
+                string tags;
+                if (fileExtension == ".zip")
+                {
+                    fileType = "多页面墨迹压缩包";
+                    tags = "自动上传,多页面,zip,压缩包";
+                }
+                else if (fileExtension == ".icstk")
+                {
+                    fileType = "墨迹文件";
+                    tags = "自动上传,墨迹,icstk";
+                }
+                else if (fileExtension == ".xml")
+                {
+                    fileType = "XML文件";
+                    tags = "自动上传,xml";
+                }
+                else
+                {
+                    fileType = "笔记";
+                    tags = "自动上传,笔记,png";
+                }
+                var description = $"自动上传的{fileType} - {DateTime.Now:yyyy-MM-dd HH:mm:ss}";
+
+                // 创建API客户端并上传文件
+                var apiClient = new DlassApiClient(APP_ID, APP_SECRET, apiBaseUrl, userToken);
+                try
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    var uploadResult = await apiClient.UploadNoteAsync<UploadNoteResponse>(
+                        "/api/whiteboard/upload_note",
+                        filePath,
+                        whiteboard.BoardId,
+                        whiteboard.SecretKey,
+                        title,
+                        description,
+                        tags,
+                        cancellationToken);
+
+                    if (uploadResult != null && uploadResult.Success)
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+                finally
+                {
+                    apiClient.Dispose();
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// 获取白板信息
+        /// </summary>
+        private async Task<WhiteboardInfo> GetWhiteboardInfo(CancellationToken cancellationToken)
+        {
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                var selectedClassName = MainWindow.Settings?.Dlass?.SelectedClassName;
+                if (string.IsNullOrEmpty(selectedClassName))
+                {
+                    LogHelper.WriteLogToFile("[DlassUploadQueue] 上传失败：未选择班级", LogHelper.LogType.Error);
+                    return null;
+                }
+
+                var userToken = MainWindow.Settings?.Dlass?.UserToken;
+                if (string.IsNullOrEmpty(userToken))
+                {
+                    LogHelper.WriteLogToFile("[DlassUploadQueue] 上传失败：未设置用户Token", LogHelper.LogType.Error);
+                    return null;
+                }
+
+                var apiBaseUrl = MainWindow.Settings?.Dlass?.ApiBaseUrl ?? "https://dlass.tech";
+
+                // 创建API客户端并获取白板信息
+                var apiClient = new DlassApiClient(APP_ID, APP_SECRET, apiBaseUrl, userToken);
+                try
+                {
+                    var authData = new
+                    {
+                        app_id = APP_ID,
+                        app_secret = APP_SECRET,
+                        user_token = userToken
+                    };
+
+                    var authResult = await apiClient.PostAsync<AuthWithTokenResponse>("/api/whiteboard/framework/auth-with-token", authData, requireAuth: false, cancellationToken: cancellationToken);
+
+                    if (authResult == null || !authResult.Success || authResult.Whiteboards == null)
+                    {
+                        LogHelper.WriteLogToFile("[DlassUploadQueue] 上传失败：无法获取白板信息", LogHelper.LogType.Error);
+                        return null;
+                    }
+
+                    // 查找匹配班级的白板
+                    var whiteboard = authResult.Whiteboards
+                        .FirstOrDefault(w => !string.IsNullOrEmpty(w.ClassName) && w.ClassName == selectedClassName);
+
+                    if (whiteboard == null || string.IsNullOrEmpty(whiteboard.BoardId) || string.IsNullOrEmpty(whiteboard.SecretKey))
+                    {
+                        LogHelper.WriteLogToFile($"[DlassUploadQueue] 上传失败：未找到班级'{selectedClassName}'对应的白板", LogHelper.LogType.Error);
+                        return null;
+                    }
+
+                    return whiteboard;
+                }
+                finally
+                {
+                    apiClient.Dispose();
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
+    }
+}

Ink Canvas/Helpers/ExternalCallerLauncher.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Ink_Canvas.Helpers
+{
+    public static class ExternalCallerLauncher
+    {
+        private static readonly string[] ClassIslandProtocols =
+        {
+            "classisland://plugins/IslandCaller/Simple/1",
+            "classisland://plugins/IslandCaller/Simple",
+            "classisland://plugins/IslandCaller/Run"
+        };
+
+        public static string[] GetProtocolsByType(int externalCallerType)
+        {
+            switch (externalCallerType)
+            {
+                case 0:
+                    return ClassIslandProtocols;
+                case 1:
+                    return new[]
+                    {
+                        "secrandom://roll_call/quick_draw",
+                        "secrandom://direct_extraction"
+                    };
+                case 2:
+                    return new[] { "namepicker://" };
+                default:
+                    return ClassIslandProtocols;
+            }
+        }
+
+        public static string[] GetProtocolsByName(string externalCallerName)
+        {
+            switch (externalCallerName)
+            {
+                case "ClassIsland":
+                    return ClassIslandProtocols;
+                case "SecRandom":
+                    return new[]
+                    {
+                        "secrandom://roll_call/quick_draw",
+                        "secrandom://direct_extraction"
+                    };
+                case "NamePicker":
+                    return new[] { "namepicker://" };
+                default:
+                    return ClassIslandProtocols;
+            }
+        }
+
+        public static bool TryLaunch(IEnumerable<string> protocols, out Exception lastException)
+        {
+            lastException = null;
+            if (protocols == null) return false;
+
+            foreach (var protocol in protocols)
+            {
+                if (string.IsNullOrWhiteSpace(protocol)) continue;
+
+                try
+                {
+                    Process.Start(new ProcessStartInfo
+                    {
+                        FileName = protocol,
+                        UseShellExecute = true
+                    });
+                    return true;
+                }
+                catch (Exception ex)
+                {
+                    lastException = ex;
+                }
+            }
+
+            return false;
+        }
+    }
+}

Ink Canvas/Helpers/FileAssociationManager.cs

@@ -26,6 +26,7 @@ namespace Ink_Canvas.Helpers
         private const string IpcFilePrefix = "InkCanvasFileAssociation_";
         private const string IpcBoardModePrefix = "InkCanvasBoardMode_";
         private const string IpcShowModePrefix = "InkCanvasShowMode_";
+        private const string IpcUriCommandPrefix = "InkCanvasUriCommand_";
         private const int IpcTimeout = 5000; // 5秒超时
 
         /// <summary>
@@ -361,6 +362,57 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        /// <summary>
+        /// 尝试通过IPC将URI命令发送给已运行的实例
+        /// </summary>
+        /// <param name="uri">URI命令</param>
+        /// <returns>是否成功发送</returns>
+        public static bool TrySendUriCommandToExistingInstance(string uri)
+        {
+            try
+            {
+                LogHelper.WriteLogToFile($"尝试通过IPC发送URI命令给已运行实例: {uri}", LogHelper.LogType.Event);
+
+                // 创建IPC文件
+                string tempDir = Path.GetTempPath();
+                string ipcFileName = IpcUriCommandPrefix + Guid.NewGuid().ToString("N") + ".tmp";
+                string ipcFilePath = Path.Combine(tempDir, ipcFileName);
+
+                // 写入URI命令到IPC文件
+                File.WriteAllText(ipcFilePath, uri, Encoding.UTF8);
+
+                // 创建事件通知已运行实例
+                using (EventWaitHandle ipcEvent = new EventWaitHandle(false, EventResetMode.ManualReset, IpcEventName))
+                {
+                    ipcEvent.Set();
+                }
+
+                // 等待一段时间让已运行实例处理命令
+                Thread.Sleep(1000);
+
+                // 清理IPC文件
+                try
+                {
+                    if (File.Exists(ipcFilePath))
+                    {
+                        File.Delete(ipcFilePath);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"清理IPC文件失败: {ex.Message}", LogHelper.LogType.Warning);
+                }
+
+                LogHelper.WriteLogToFile("IPC URI命令发送完成", LogHelper.LogType.Event);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"通过IPC发送URI命令失败: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
         /// <summary>
         /// 启动IPC监听器，等待其他实例发送文件路径
         /// </summary>
@@ -467,7 +519,7 @@ namespace Ink_Canvas.Helpers
                                 File.Delete(ipcFile);
                             }
                         }
-                        catch { }
+                        catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
                     }
                 }
 
@@ -518,7 +570,7 @@ namespace Ink_Canvas.Helpers
                                 File.Delete(ipcFile);
                             }
                         }
-                        catch { }
+                        catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
                     }
                 }
 
@@ -573,7 +625,57 @@ namespace Ink_Canvas.Helpers
                                 File.Delete(ipcFile);
                             }
                         }
-                        catch { }
+                        catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
+                    }
+                }
+
+                // 处理URI命令IPC文件
+                string[] uriCommandFiles = Directory.GetFiles(tempDir, IpcUriCommandPrefix + "*.tmp");
+                foreach (string ipcFile in uriCommandFiles)
+                {
+                    try
+                    {
+                        // 读取命令内容
+                        string uri = File.ReadAllText(ipcFile, Encoding.UTF8);
+
+                        if (!string.IsNullOrEmpty(uri))
+                        {
+                            LogHelper.WriteLogToFile($"IPC接收到URI命令: {uri}", LogHelper.LogType.Event);
+
+                            // 在UI线程中处理URI命令
+                            Application.Current.Dispatcher.BeginInvoke(new Action(() =>
+                            {
+                                try
+                                {
+                                    // 获取主窗口并处理URI命令
+                                    if (Application.Current.MainWindow is MainWindow mainWindow)
+                                    {
+                                        mainWindow.HandleUriCommand(uri);
+                                    }
+                                }
+                                catch (Exception ex)
+                                {
+                                    LogHelper.WriteLogToFile($"IPC处理URI命令失败: {ex.Message}", LogHelper.LogType.Error);
+                                }
+                            }));
+                        }
+
+                        // 删除IPC文件
+                        File.Delete(ipcFile);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"处理URI命令IPC文件失败: {ex.Message}", LogHelper.LogType.Warning);
+
+                        // 尝试删除损坏的IPC文件
+                        try
+                        {
+                            if (File.Exists(ipcFile))
+                            {
+                                File.Delete(ipcFile);
+                            }
+                        }
+                        catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
                     }
                 }
             }

Ink Canvas/Helpers/ForegroundWindowInfo.cs

@@ -36,6 +36,24 @@ namespace Ink_Canvas.Helpers
             public int Height => Bottom - Top;
         }
 
+        [StructLayout(LayoutKind.Sequential)]
+        private struct MONITORINFO
+        {
+            public uint cbSize;
+            public RECT rcMonitor;
+            public RECT rcWork;
+            public uint dwFlags;
+        }
+
+        [DllImport("user32.dll")]
+        private static extern bool GetMonitorInfo(IntPtr hMonitor, ref MONITORINFO lpmi);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr MonitorFromWindow(IntPtr hwnd, uint dwFlags);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr MonitorFromRect(ref RECT lprc, uint dwFlags);
+
         public static string WindowTitle()
         {
             IntPtr foregroundWindowHandle = GetForegroundWindow();
@@ -106,10 +124,28 @@ namespace Ink_Canvas.Helpers
 
         public static double GetTaskbarHeight(Screen screen, double dpiScaleY)
         {
-            // 获取工作区和屏幕高度的差值
-            var workingArea = screen.WorkingArea;
-            var bounds = screen.Bounds;
-            int taskbarHeight = bounds.Height - workingArea.Height;
+            // 创建RECT结构体表示屏幕边界
+            RECT screenRect = new RECT
+            {
+                Left = screen.Bounds.Left,
+                Top = screen.Bounds.Top,
+                Right = screen.Bounds.Right,
+                Bottom = screen.Bounds.Bottom
+            };
+
+            // 获取屏幕句柄
+            const uint MONITOR_DEFAULTTONEAREST = 0x00000002;
+            IntPtr hMonitor = MonitorFromRect(ref screenRect, MONITOR_DEFAULTTONEAREST);
+
+            // 初始化MONITORINFO结构体
+            MONITORINFO monitorInfo = new MONITORINFO();
+            monitorInfo.cbSize = (uint)Marshal.SizeOf(typeof(MONITORINFO));
+
+            // 获取监视器信息
+            GetMonitorInfo(hMonitor, ref monitorInfo);
+
+            // 计算任务栏高度：monitorInfo.rcMonitor.bottom减去monitorInfo.rcWork.bottom的值
+            int taskbarHeight = monitorInfo.rcMonitor.Bottom - monitorInfo.rcWork.Bottom;
             // 考虑 DPI 缩放
             return taskbarHeight / dpiScaleY;
         }

Ink Canvas/Helpers/GlobalHotkeyManager.cs

@@ -392,6 +392,13 @@ namespace Ink_Canvas.Helpers
                 }
                 else
                 {
+                    if (_registeredHotkeys.Count == 0)
+                    {
+                        if (ShouldEnableHotkeysBasedOnContext())
+                        {
+                            LoadHotkeysFromSettings();
+                        }
+                    }
                 }
             }
             catch (Exception ex)
@@ -447,6 +454,11 @@ namespace Ink_Canvas.Helpers
                     {
                         // 如果设置允许，则在鼠标模式下也启用快捷键
                         EnableHotkeyRegistration();
+
+                        if (_hotkeysShouldBeRegistered && _registeredHotkeys.Count == 0)
+                        {
+                            LoadHotkeysFromSettings();
+                        }
                     }
                     else
                     {
@@ -458,6 +470,11 @@ namespace Ink_Canvas.Helpers
                 {
                     // 非鼠标模式下启用快捷键
                     EnableHotkeyRegistration();
+
+                    if (_hotkeysShouldBeRegistered && _registeredHotkeys.Count == 0)
+                    {
+                        LoadHotkeysFromSettings();
+                    }
                 }
             }
             catch (Exception ex)

Ink Canvas/Helpers/HardwareAcceleratedInkProcessor.cs

@@ -186,11 +186,11 @@ namespace Ink_Canvas.Helpers
         }
 
         /// <summary>
-        /// 释放GPU资源
+        /// 释放GPU相关资源标记
         /// </summary>
         public void Dispose()
         {
-            _renderTarget?.Clear();
+
             _isInitialized = false;
         }
     }

Ink Canvas/Helpers/HashHelper.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 哈希计算辅助类，用于路径/标识等短字符串的 MD5 前缀哈希。
+    /// </summary>
+    internal static class HashHelper
+    {
+        /// <summary>
+        /// 对给定路径字符串计算 MD5 哈希，返回前 8 位十六进制字符串。
+        /// </summary>
+        /// <param name="filePath">文件路径或任意字符串</param>
+        /// <returns>8 位十六进制字符串；异常或空输入时返回 "error" 或 "unknown"</returns>
+        public static string GetFileHash(string filePath)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(filePath)) return "unknown";
+                using (var md5 = MD5.Create())
+                {
+                    byte[] hash = md5.ComputeHash(Encoding.UTF8.GetBytes(filePath));
+                    return BitConverter.ToString(hash).Replace("-", "").Substring(0, 8);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"计算文件哈希失败: {ex}", LogHelper.LogType.Error);
+                return "error";
+            }
+        }
+    }
+}

Ink Canvas/Helpers/IPPTLinkManager.cs

@@ -0,0 +1,63 @@
+using System;
+
+namespace Ink_Canvas.Helpers
+{
+    public interface IPPTLinkManager : IDisposable
+    {
+        event Action<object> SlideShowBegin;
+        event Action<object> SlideShowNextSlide;
+        event Action<object> SlideShowEnd;
+        event Action<object> PresentationOpen;
+        event Action<object> PresentationClose;
+        event Action<bool> PPTConnectionChanged;
+        event Action<bool> SlideShowStateChanged;
+
+        bool IsConnected { get; }
+        bool IsInSlideShow { get; }
+        bool IsSupportWPS { get; set; }
+        bool SkipAnimationsWhenNavigating { get; set; }
+        int SlidesCount { get; }
+
+        object PPTApplication { get; }
+
+        /// <summary>
+        /// 开始监视与 PowerPoint 的连接以及幻灯片放映相关状态，并在状态变化时触发对应事件。
+        /// </summary>
+        void StartMonitoring();
+        /// <summary>
+        /// 停止监控 PowerPoint 的连接与事件，停止接收并处理与演示文稿和幻灯片放映相关的通知。
+        /// </summary>
+        void StopMonitoring();
+
+        /// <summary>
+        /// 重新加载或重建与 PowerPoint 的连接。
+        /// </summary>
+        /// <remarks>
+        /// 调用后实现应刷新内部连接与状态，必要时重建与 PowerPoint 的会话；此操作可能导致 IsConnected 变化并触发 PPTConnectionChanged 或其他相关事件（例如 SlideShowStateChanged）。
+        /// </remarks>
+        void ReloadConnection();
+
+        /// <summary>
+        /// 尝试启动当前演示文稿的放映模式。
+        /// </summary>
+        /// <returns><c>true</c> 如果放映已成功启动，<c>false</c> 否则。</returns>
+        bool TryStartSlideShow();
+        /// <summary>
+        /// 尝试结束当前正在进行的幻灯片放映。
+        /// </summary>
+        /// <returns><c>true</c> 如果放映已成功结束，<c>false</c> 否则。</returns>
+        bool TryEndSlideShow();
+
+        // 导航控制
+        bool TryNavigateToSlide(int slideNumber);
+        bool TryNavigateNext();
+        bool TryNavigatePrevious();
+
+        // 查询
+        int GetCurrentSlideNumber();
+        string GetPresentationName();
+        bool TryShowSlideNavigation();
+        object GetCurrentActivePresentation();
+    }
+}
+

Ink Canvas/Helpers/InkFadeManager.cs

@@ -264,7 +264,6 @@ namespace Ink_Canvas.Helpers
         public void Enable()
         {
             IsEnabled = true;
-            LogHelper.WriteLogToFile("墨迹渐隐功能已启用");
         }
 
         /// <summary>
@@ -273,7 +272,6 @@ namespace Ink_Canvas.Helpers
         public void Disable()
         {
             IsEnabled = false;
-            LogHelper.WriteLogToFile("墨迹渐隐功能已禁用");
         }
         #endregion
 
@@ -894,4 +892,4 @@ namespace Ink_Canvas.Helpers
         }
         #endregion
     }
-}
+}

Ink Canvas/Helpers/InkRecognitionManager.cs

@@ -0,0 +1,257 @@
+using System;
+using System.Threading.Tasks;
+using System.Windows.Ink;
+
+namespace Ink_Canvas.Helpers
+{
+    public sealed class InkRecognitionManager
+    {
+        private static InkRecognitionManager _instance;
+        private static readonly object _lock = new object();
+
+        private ModernInkProcessor _modernProcessor;
+        private ModernInkAnalyzer _modernAnalyzer;
+        private bool _isModernSystemAvailable;
+        private bool _isInitialized;
+
+        public static InkRecognitionManager Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    lock (_lock)
+                    {
+                        if (_instance == null)
+                            _instance = new InkRecognitionManager();
+                    }
+                }
+
+                return _instance;
+            }
+        }
+
+        private InkRecognitionManager()
+        {
+            Initialize();
+        }
+
+        private void Initialize()
+        {
+            try
+            {
+                var tryModern = WinRtInkShapeRecognizer.IsApiAvailable && Environment.Is64BitProcess;
+
+                _isModernSystemAvailable = false;
+                if (tryModern)
+                {
+                    try
+                    {
+                        _modernProcessor = new ModernInkProcessor();
+                        _modernAnalyzer = new ModernInkAnalyzer();
+                        _isModernSystemAvailable = true;
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile("WinRT 墨迹初始化失败: " + ex.Message, LogHelper.LogType.Warning);
+                        _isModernSystemAvailable = false;
+                        _modernProcessor = null;
+                        _modernAnalyzer = null;
+                    }
+                }
+
+                _isInitialized = true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile("墨迹识别管理器初始化失败: " + ex.Message, LogHelper.LogType.Error);
+                _isInitialized = false;
+            }
+        }
+
+        public Task<InkShapeRecognitionResult> RecognizeShapeAsync(
+            StrokeCollection strokes,
+            ShapeRecognitionEngineMode mode)
+        {
+            if (!_isInitialized || strokes == null || strokes.Count == 0)
+                return Task.FromResult(InkShapeRecognitionResult.Empty);
+
+            try
+            {
+                if (ShapeRecognitionRouter.ResolveUseWinRt(mode)
+                    && WinRtInkShapeRecognizer.IsApiAvailable)
+                {
+                    return RecognizeShapeWinRtOnDispatcherContext(strokes);
+                }
+
+                var legacy = InkRecognizeHelper.RecognizeShapeIACore(strokes);
+                return Task.FromResult(InkRecognizeHelper.FromIACoreOrEmpty(legacy));
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile("墨迹形状识别失败: " + ex.Message, LogHelper.LogType.Error);
+                return Task.FromResult(InkShapeRecognitionResult.Empty);
+            }
+        }
+
+        private static async Task<InkShapeRecognitionResult> RecognizeShapeWinRtOnDispatcherContext(
+            StrokeCollection strokes)
+        {
+            return await WinRtInkShapeRecognizer.RecognizeShapeAsync(strokes).ConfigureAwait(true);
+        }
+
+        /// <param name="applyHandwritingBeautify">为 true 且走 WinRT 时，将识别成功的词替换为手写风格字体的轮廓墨迹（见设置中的字体列表）。</param>
+        /// <param name="handwritingFontFamilyList">逗号分隔的字体回退列表（WPF FontFamily）；null 时使用内置默认。</param>
+        public Task<StrokeCollection> CorrectInkAsync(
+            StrokeCollection strokes,
+            ShapeRecognitionEngineMode mode,
+            bool applyHandwritingBeautify = false,
+            string handwritingFontFamilyList = null)
+        {
+            if (!_isInitialized)
+            {
+                LogHelper.WriteLogToFile("[手写体] CorrectInkAsync 跳过：InkRecognitionManager 未初始化。", LogHelper.LogType.Info);
+                return Task.FromResult(strokes);
+            }
+
+            if (strokes == null || strokes.Count == 0)
+            {
+                LogHelper.WriteLogToFile("[手写体] CorrectInkAsync 跳过：无笔画。", LogHelper.LogType.Info);
+                return Task.FromResult(strokes);
+            }
+
+            try
+            {
+                var useWinRt = ShapeRecognitionRouter.ResolveUseWinRt(mode);
+                if (!applyHandwritingBeautify)
+                {
+                    LogHelper.WriteLogToFile(
+                        "[手写体] CorrectInkAsync 跳过：未开启「识别转手写体字形」（applyHandwritingBeautify=false）。笔画数=" +
+                        strokes.Count,
+                        LogHelper.LogType.Info);
+                    return Task.FromResult(strokes);
+                }
+
+                if (!useWinRt)
+                {
+                    LogHelper.WriteLogToFile(
+                        "[手写体] CorrectInkAsync 跳过：当前引擎非 WinRT（模式=" + mode + "）。笔画数=" + strokes.Count,
+                        LogHelper.LogType.Info);
+                    return Task.FromResult(strokes);
+                }
+
+                if (!Environment.Is64BitProcess)
+                {
+                    LogHelper.WriteLogToFile(
+                        "[手写体] CorrectInkAsync 跳过：非 64 位进程，WinRT 手写体替换不可用。笔画数=" + strokes.Count,
+                        LogHelper.LogType.Info);
+                    return Task.FromResult(strokes);
+                }
+
+                if (_modernAnalyzer == null)
+                {
+                    LogHelper.WriteLogToFile(
+                        "[手写体] CorrectInkAsync 跳过：ModernInkAnalyzer 未就绪（WinRT 初始化失败？）。笔画数=" +
+                        strokes.Count,
+                        LogHelper.LogType.Warning);
+                    return Task.FromResult(strokes);
+                }
+
+                LogHelper.WriteLogToFile(
+                    "[手写体] CorrectInkAsync 开始：笔画数=" + strokes.Count +
+                    "，字体=" + (string.IsNullOrWhiteSpace(handwritingFontFamilyList) ? "(默认)" : handwritingFontFamilyList.Trim()),
+                    LogHelper.LogType.Info);
+                return _modernAnalyzer.AnalyzeAndCorrectAsync(strokes, handwritingFontFamilyList);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile("墨迹纠正失败: " + ex.Message, LogHelper.LogType.Error);
+                return Task.FromResult(strokes);
+            }
+        }
+
+        /// <summary>
+        /// WinRT 手写体识别（需 64 位进程、Windows 10+ 及系统手写识别组件）。返回分词候选与包围框，供剪贴板或插件使用。
+        /// </summary>
+        public Task<HandwritingRecognitionResult> RecognizeHandwritingAsync(
+            StrokeCollection strokes,
+            ShapeRecognitionEngineMode mode)
+        {
+            if (!_isInitialized || strokes == null || strokes.Count == 0)
+                return Task.FromResult(HandwritingRecognitionResult.Empty);
+
+            try
+            {
+                if (!Environment.Is64BitProcess
+                    || !ShapeRecognitionRouter.ResolveUseWinRt(mode)
+                    || !WinRtHandwritingRecognizer.IsApiAvailable)
+                    return Task.FromResult(HandwritingRecognitionResult.Empty);
+
+                return WinRtHandwritingRecognizer.RecognizeHandwritingAsync(strokes);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile("手写识别失败: " + ex.Message, LogHelper.LogType.Error);
+                return Task.FromResult(HandwritingRecognitionResult.Empty);
+            }
+        }
+
+        public bool IsValidShapeType(string shapeName)
+        {
+            return !string.IsNullOrEmpty(shapeName)
+                   && (shapeName.Contains("Triangle") || shapeName.Contains("Circle")
+                       || shapeName.Contains("Rectangle") || shapeName.Contains("Diamond")
+                       || shapeName.Contains("Parallelogram") || shapeName.Contains("Square")
+                       || shapeName.Contains("Ellipse") || shapeName.Contains("Line")
+                       || shapeName.Contains("Arrow"));
+        }
+
+        public string GetSystemInfo()
+        {
+            return _isModernSystemAvailable
+                ? $"现代化64位墨迹识别系统 (Windows Runtime API) - 进程架构: {Environment.Is64BitProcess}"
+                : $"传统墨迹识别系统 (IACore) - 进程架构: {Environment.Is64BitProcess}";
+        }
+
+        public void Dispose()
+        {
+            _modernProcessor?.Dispose();
+            _modernAnalyzer?.Dispose();
+            _isInitialized = false;
+        }
+    }
+
+    internal sealed class ModernInkProcessor : IDisposable
+    {
+        public ModernInkProcessor()
+        {
+            if (!WinRtInkShapeRecognizer.IsApiAvailable)
+                throw new InvalidOperationException("WinRT 墨迹分析需要 Windows 10 及以上。");
+        }
+
+        public Task<InkShapeRecognitionResult> RecognizeShapeAsync(StrokeCollection strokes)
+        {
+            return WinRtInkShapeRecognizer.RecognizeShapeAsync(strokes);
+        }
+
+        public void Dispose()
+        {
+        }
+    }
+
+    internal sealed class ModernInkAnalyzer : IDisposable
+    {
+        public Task<StrokeCollection> AnalyzeAndCorrectAsync(
+            StrokeCollection strokes,
+            string handwritingFontFamilyList)
+        {
+            return WinRtHandwritingRecognizer.ConvertRecognizedTextToHandwritingInkAsync(
+                strokes,
+                handwritingFontFamilyList);
+        }
+
+        public void Dispose()
+        {
+        }
+    }
+}

Ink Canvas/Helpers/InkRecognizeHelper.cs

@@ -1,4 +1,6 @@
-using System.Linq;
+using Ink_Canvas;
+using System.Linq;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Ink;
 using System.Windows.Media;
@@ -7,8 +9,8 @@ namespace Ink_Canvas.Helpers
 {
     public class InkRecognizeHelper
     {
-        //识别形状
-        public static ShapeRecognizeResult RecognizeShape(StrokeCollection strokes)
+        /// <summary>IACore / IAWinFX 形状识别（典型用于 32 位进程）。</summary>
+        public static ShapeRecognizeResult RecognizeShapeIACore(StrokeCollection strokes)
         {
             if (strokes == null || strokes.Count == 0)
                 return default;
@@ -25,19 +27,29 @@ namespace Ink_Canvas.Helpers
                 var alternates = analyzer.GetAlternates();
                 if (alternates.Count > 0)
                 {
-                    while ((!alternates[0].Strokes.Contains(strokes.Last()) ||
-                        !IsContainShapeType(((InkDrawingNode)alternates[0].AlternateNodes[0]).GetShapeName()))
-                        && strokesCount >= 2)
+                    while (strokesCount >= 2)
                     {
+                        var alt0 = alternates[0];
+                        if (alt0?.AlternateNodes == null || alt0.AlternateNodes.Count == 0)
+                            break;
+                        var drawNode = alt0.AlternateNodes[0] as InkDrawingNode;
+                        if (drawNode == null)
+                            break;
+                        var shapeOk = IsContainShapeType(drawNode.GetShapeName());
+                        if (alt0.Strokes.Contains(strokes.Last()) && shapeOk)
+                            break;
                         analyzer.RemoveStroke(strokes[strokes.Count - strokesCount]);
                         strokesCount--;
                         sfsaf = analyzer.Analyze();
                         if (sfsaf.Successful)
-                        {
                             alternates = analyzer.GetAlternates();
-                        }
+                        else
+                            break;
+                        if (alternates.Count == 0)
+                            break;
                     }
-                    analysisAlternate = alternates[0];
+                    if (alternates.Count > 0)
+                        analysisAlternate = alternates[0];
                 }
             }
 
@@ -46,12 +58,116 @@ namespace Ink_Canvas.Helpers
             if (analysisAlternate != null && analysisAlternate.AlternateNodes.Count > 0)
             {
                 var node = analysisAlternate.AlternateNodes[0] as InkDrawingNode;
+                if (node == null)
+                    return default;
                 return new ShapeRecognizeResult(node.Centroid, node.HotPoints, analysisAlternate, node);
             }
 
             return default;
         }
 
+        /// <summary>兼容旧调用：等价于 <see cref="RecognizeShapeIACore"/>。</summary>
+        public static ShapeRecognizeResult RecognizeShape(StrokeCollection strokes) =>
+            RecognizeShapeIACore(strokes);
+
+        /// <summary>按设置选择 WinRT（<see cref="InkRecognitionManager"/>）或 IACore；WinRT 请用 <see cref="RecognizeShapeUnifiedAsync"/>。</summary>
+        public static InkShapeRecognitionResult RecognizeShapeUnified(
+            StrokeCollection strokes,
+            ShapeRecognitionEngineMode mode)
+        {
+            if (strokes == null || strokes.Count == 0)
+                return InkShapeRecognitionResult.Empty;
+
+            if (ShapeRecognitionRouter.ResolveUseWinRt(mode))
+                return InkShapeRecognitionResult.Empty;
+
+            var legacy = RecognizeShapeIACore(strokes);
+            return FromIACoreOrEmpty(legacy);
+        }
+
+        /// <summary>与 CE 反编译版 <c>InkRecognitionManager.RecognizeShapeAsync</c> 对齐的统一入口。</summary>
+        public static Task<InkShapeRecognitionResult> RecognizeShapeUnifiedAsync(
+            StrokeCollection strokes,
+            ShapeRecognitionEngineMode mode)
+        {
+            if (strokes == null || strokes.Count == 0)
+                return Task.FromResult(InkShapeRecognitionResult.Empty);
+
+            return InkRecognitionManager.Instance.RecognizeShapeAsync(strokes, mode);
+        }
+
+        public static void WarmupShapeRecognition(ShapeRecognitionEngineMode mode)
+        {
+            try
+            {
+                _ = InkRecognitionManager.Instance;
+                if (ShapeRecognitionRouter.ResolveUseWinRt(mode))
+                {
+                    WinRtInkShapeRecognizer.Warmup();
+                    WinRtHandwritingRecognizer.Warmup();
+                }
+                else
+                    RecognizeShapeIACore(new StrokeCollection());
+            }
+            catch
+            {
+                // 预热失败不影响启动
+            }
+        }
+
+        /// <summary>WinRT 手写识别（64 位 + Windows 10+）。</summary>
+        public static Task<HandwritingRecognitionResult> RecognizeHandwritingUnifiedAsync(
+            StrokeCollection strokes,
+            ShapeRecognitionEngineMode mode) =>
+            InkRecognitionManager.Instance.RecognizeHandwritingAsync(strokes, mode);
+
+        /// <summary>WinRT 下将识别成功的词替换为手写体字形墨迹；是否应用由设置「WinRT 识别转手写体字形」控制。</summary>
+        public static Task<StrokeCollection> CorrectHandwritingStrokesUnifiedAsync(
+            StrokeCollection strokes,
+            ShapeRecognitionEngineMode mode) =>
+            InkRecognitionManager.Instance.CorrectInkAsync(
+                strokes,
+                mode,
+                MainWindow.Settings?.InkToShape?.EnableWinRtHandwritingStrokeBeautify ?? false,
+                MainWindow.Settings?.InkToShape?.HandwritingCorrectionFontFamily);
+
+        /// <summary>显式指定是否应用手写体字形替换（忽略开关）；字体仍从设置读取。</summary>
+        public static Task<StrokeCollection> CorrectHandwritingStrokesUnifiedAsync(
+            StrokeCollection strokes,
+            ShapeRecognitionEngineMode mode,
+            bool applyHandwritingBeautify) =>
+            InkRecognitionManager.Instance.CorrectInkAsync(
+                strokes,
+                mode,
+                applyHandwritingBeautify,
+                MainWindow.Settings?.InkToShape?.HandwritingCorrectionFontFamily);
+
+        internal static InkShapeRecognitionResult FromIACoreOrEmpty(ShapeRecognizeResult legacy)
+        {
+            if (legacy?.InkDrawingNode == null)
+                return InkShapeRecognitionResult.Empty;
+
+            var node = legacy.InkDrawingNode;
+            var shape = node.GetShape();
+            var hot = ClonePointCollection(node.HotPoints);
+            return new InkShapeRecognitionResult(
+                node.GetShapeName(),
+                legacy.Centroid,
+                hot,
+                shape.Width,
+                shape.Height,
+                node.Strokes);
+        }
+
+        private static PointCollection ClonePointCollection(PointCollection src)
+        {
+            var dst = new PointCollection();
+            if (src == null) return dst;
+            foreach (System.Windows.Point p in src)
+                dst.Add(p);
+            return dst;
+        }
+
         public static bool IsContainShapeType(string name)
         {
             if (name.Contains("Triangle") || name.Contains("Circle") ||

Ink Canvas/Helpers/InkShapeRecognition.cs

@@ -0,0 +1,86 @@
+using OSVersionExtension;
+using System;
+using System.Windows;
+using System.Windows.Ink;
+using System.Windows.Media;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>墨迹形状识别后端：自动 / IACore / WinRT。</summary>
+    public enum ShapeRecognitionEngineMode
+    {
+        Auto = 0,
+        IACore = 1,
+        WinRT = 2,
+    }
+
+    public static class ShapeRecognitionRouter
+    {
+        /// <summary>
+        /// 自动模式：按当前进程位数选择——<c>64</c> 位进程用 WinRT，<c>32</c> 位进程（含 x86 目标在 WOW64 下运行）用 IACore。
+        /// </summary>
+        public static bool ResolveUseWinRt(ShapeRecognitionEngineMode mode)
+        {
+            if (mode == ShapeRecognitionEngineMode.WinRT) return true;
+            if (mode == ShapeRecognitionEngineMode.IACore) return false;
+            return Environment.Is64BitProcess;
+        }
+
+        public static bool ShouldRunShapeRecognition(bool inkToShapeEnabled, ShapeRecognitionEngineMode mode)
+        {
+            if (!inkToShapeEnabled) return false;
+            if (ResolveUseWinRt(mode))
+                return OSVersion.GetOperatingSystem() >= OSVersionExtension.OperatingSystem.Windows10;
+            return !Environment.Is64BitProcess;
+        }
+
+        public static ShapeRecognitionEngineMode FromSettingsInt(int value)
+        {
+            if (value == (int)ShapeRecognitionEngineMode.IACore) return ShapeRecognitionEngineMode.IACore;
+            if (value == (int)ShapeRecognitionEngineMode.WinRT) return ShapeRecognitionEngineMode.WinRT;
+            return ShapeRecognitionEngineMode.Auto;
+        }
+    }
+
+    /// <summary>与具体识别后端无关的形状识别结果，供统一纠正模块消费。</summary>
+    public sealed class InkShapeRecognitionResult
+    {
+        public static readonly InkShapeRecognitionResult Empty = new InkShapeRecognitionResult();
+
+        private InkShapeRecognitionResult()
+        {
+            IsSuccess = false;
+            ShapeName = string.Empty;
+            Centroid = new Point();
+            HotPoints = new PointCollection();
+            StrokesToRemove = new StrokeCollection();
+        }
+
+        public InkShapeRecognitionResult(
+            string shapeName,
+            Point centroid,
+            PointCollection hotPoints,
+            double shapeWidth,
+            double shapeHeight,
+            StrokeCollection strokesToRemove)
+        {
+            ShapeName = shapeName ?? string.Empty;
+            Centroid = centroid;
+            HotPoints = hotPoints ?? new PointCollection();
+            ShapeWidth = shapeWidth;
+            ShapeHeight = shapeHeight;
+            StrokesToRemove = strokesToRemove ?? new StrokeCollection();
+            IsSuccess = StrokesToRemove.Count > 0
+                        && !string.IsNullOrEmpty(ShapeName)
+                        && ShapeName != "Drawing";
+        }
+
+        public bool IsSuccess { get; }
+        public string ShapeName { get; }
+        public Point Centroid { get; set; }
+        public PointCollection HotPoints { get; }
+        public double ShapeWidth { get; }
+        public double ShapeHeight { get; }
+        public StrokeCollection StrokesToRemove { get; }
+    }
+}

Ink Canvas/Helpers/LocalizationHelper.cs

@@ -0,0 +1,57 @@
+using Ink_Canvas.Properties;
+using System.Globalization;
+using System.Threading;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// i18n 本地化辅助：设置/获取当前 UI 语言，便于后续从配置切换语言。
+    /// </summary>
+    public static class LocalizationHelper
+    {
+        /// <summary>
+        /// 当前 UI 语言（如 "zh-CN", "en-US"）。未设置时使用系统当前 UI 语言。
+        /// </summary>
+        public static CultureInfo CurrentCulture
+        {
+            get => Thread.CurrentThread.CurrentUICulture;
+            set
+            {
+                if (value == null) return;
+                Thread.CurrentThread.CurrentUICulture = value;
+                Strings.Culture = value;
+            }
+        }
+
+        /// <summary>
+        /// 使用指定语言名称设置当前 UI 语言（如 "zh-CN", "en-US"）。
+        /// 若名称无效则保持当前语言不变。
+        /// </summary>
+        public static bool TrySetCulture(string cultureName)
+        {
+            try
+            {
+                if (string.IsNullOrWhiteSpace(cultureName))
+                {
+                    CurrentCulture = CultureInfo.InstalledUICulture;
+                    return true;
+                }
+                var culture = CultureInfo.GetCultureInfo(cultureName);
+                CurrentCulture = culture;
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 获取本地化字符串。优先使用强类型属性，未知键时用此方法。
+        /// </summary>
+        public static string GetString(string key)
+        {
+            return Strings.GetString(key);
+        }
+    }
+}

Ink Canvas/Helpers/LogHelper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
@@ -29,6 +29,11 @@ namespace Ink_Canvas.Helpers
             WriteLogToFile(msg, LogType.Error);
         }
 
+        /// <summary>
+        /// 将一条日志消息记录到应用的日志文件中（可能是单一日志文件或按启动时间存档的文件），同时在日志条目中包含时间戳、线程 ID 和调用者信息，并遵循应用的日志设置。
+        /// </summary>
+        /// <param name="str">要记录的日志文本消息。</param>
+        /// <param name="logType">日志的类型/等级，用于在日志条目中标识（例如 Info、Error、Warning 等）。</param>
         public static void WriteLogToFile(string str, LogType logType = LogType.Info)
         {
             // 检查日志是否启用
@@ -62,7 +67,7 @@ namespace Ink_Canvas.Helpers
 
                 if (!Directory.Exists(App.RootPath))
                 {
-                    Directory.CreateDirectory(App.RootPath);
+                    ProcessProtectionManager.WithWriteAccess(App.RootPath, () => Directory.CreateDirectory(App.RootPath));
                 }
 
                 var threadId = Thread.CurrentThread.ManagedThreadId;
@@ -78,14 +83,30 @@ namespace Ink_Canvas.Helpers
                     }
                 }
                 string logLine = string.Format("{0} [T{1}] [{2}] [{3}] {4}", DateTime.Now.ToString("O"), threadId, strLogType, callerInfo, str);
-                using (StreamWriter sw = new StreamWriter(file, true))
+                ProcessProtectionManager.WithWriteAccess(file, () =>
                 {
-                    sw.WriteLine(logLine);
-                }
+                    using (StreamWriter sw = new StreamWriter(file, true))
+                    {
+                        sw.WriteLine(logLine);
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[LogHelper] WriteLogToFile failed: {ex.Message}");
             }
-            catch { }
         }
 
+        /// <summary>
+        /// 检查指定日志文件夹的总大小，并在超过 MaxLogsFolderSizeBytes 时删除该文件夹下的所有文件并记录清理日志。
+        /// </summary>
+        /// <param name="logsPath">要检查和清理的日志文件夹路径。</param>
+        /// <remarks>
+        /// - 如果目录不存在则直接返回。 
+        /// - 当总大小超过 MaxLogsFolderSizeBytes 时，会尝试删除目录下的每个文件（单个删除失败将被忽略）。 
+        /// - 清理完成后会向该目录下的 Log_{AppStartTime}.txt 写入一条带有时间戳和 [Cleanup] 标签的记录。 
+        /// - 方法内部捕获并忽略所有异常以避免影响调用者流程。
+        /// </remarks>
         private static void CheckAndCleanLogsFolder(string logsPath)
         {
             try
@@ -111,18 +132,28 @@ namespace Ink_Canvas.Helpers
                         {
                             file.Delete();
                         }
-                        catch { }
+                        catch (Exception ex)
+                        {
+                            System.Diagnostics.Debug.WriteLine($"[LogHelper] Delete log file failed: {ex.Message}");
+                        }
                     }
 
                     // 记录清理操作
                     string cleanupMessage = $"Logs folder exceeded size limit ({totalSize / 1024.0 / 1024.0:F2} MB > {MaxLogsFolderSizeBytes / 1024.0 / 1024.0:F2} MB). Folder cleaned.";
-                    using (StreamWriter sw = new StreamWriter(Path.Combine(logsPath, $"Log_{AppStartTime}.txt"), true))
+                    var logFile = Path.Combine(logsPath, $"Log_{AppStartTime}.txt");
+                    ProcessProtectionManager.WithWriteAccess(logFile, () =>
                     {
-                        sw.WriteLine($"{DateTime.Now:O} [Cleanup] {cleanupMessage}");
-                    }
+                        using (StreamWriter sw = new StreamWriter(logFile, true))
+                        {
+                            sw.WriteLine($"{DateTime.Now:O} [Cleanup] {cleanupMessage}");
+                        }
+                    });
                 }
             }
-            catch { }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[LogHelper] CheckAndCleanLogsFolder failed: {ex.Message}");
+            }
         }
 
         internal static void WriteLogToFile(string v, object warning)
@@ -139,4 +170,4 @@ namespace Ink_Canvas.Helpers
             Warning
         }
     }
-}
+}

Ink Canvas/Helpers/MultiTouchInput.cs

@@ -1,4 +1,5 @@
-using System;
+using System;
+using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Ink;
 using System.Windows.Input;
@@ -8,30 +9,52 @@ namespace Ink_Canvas.Helpers
 {
     public class VisualCanvas : FrameworkElement
     {
+        private readonly List<DrawingVisual> _visuals = new List<DrawingVisual>();
+
         protected override Visual GetVisualChild(int index)
         {
-            return Visual;
+            if (index < 0 || index >= _visuals.Count)
+                throw new ArgumentOutOfRangeException(nameof(index));
+            return _visuals[index];
         }
 
-        protected override int VisualChildrenCount => 1;
+        protected override int VisualChildrenCount => _visuals.Count;
 
-        public VisualCanvas(DrawingVisual visual)
+        public VisualCanvas()
         {
-            Visual = visual;
+            CacheMode = new BitmapCache();
+
+            RenderOptions.SetBitmapScalingMode(this, BitmapScalingMode.HighQuality);
+            RenderOptions.SetEdgeMode(this, EdgeMode.Aliased);
+            RenderOptions.SetCachingHint(this, CachingHint.Cache);
+        }
+
+        public void AddVisual(DrawingVisual visual)
+        {
+            if (visual == null) return;
+            _visuals.Add(visual);
             AddVisualChild(visual);
         }
+        public void Clear()
+        {
+            foreach (var visual in _visuals)
+            {
+                RemoveVisualChild(visual);
+            }
+            _visuals.Clear();
+        }
 
-        public DrawingVisual Visual { get; }
+        public IReadOnlyList<DrawingVisual> Visuals => _visuals;
     }
 
     /// <summary>
     /// 用于显示笔迹的类 
     /// </summary>
-    public class StrokeVisual : DrawingVisual
+    public class StrokeVisual
     {
-        private bool _needsRedraw = true;
-        private int _lastPointCount = 0;
-        private const int REDRAW_THRESHOLD = 3;
+        private int _lastDrawnPointCount = 0;
+        private const int INCREMENTAL_DRAW_THRESHOLD = 2;
+        private VisualCanvas _visualCanvas;
 
         /// <summary>
         ///     创建显示笔迹的类
@@ -47,17 +70,12 @@ namespace Ink_Canvas.Helpers
         }
 
         /// <summary>
-        ///     创建显示笔迹的类
+        /// 创建显示笔迹的类
         /// </summary>
         /// <param name="drawingAttributes"></param>
         public StrokeVisual(DrawingAttributes drawingAttributes)
         {
             _drawingAttributes = drawingAttributes;
-
-            // 启用硬件加速
-            RenderOptions.SetBitmapScalingMode(this, BitmapScalingMode.HighQuality);
-            RenderOptions.SetEdgeMode(this, EdgeMode.Aliased);
-            RenderOptions.SetCachingHint(this, CachingHint.Cache);
         }
 
         /// <summary>
@@ -65,6 +83,14 @@ namespace Ink_Canvas.Helpers
         /// </summary>
         public Stroke Stroke { set; get; }
 
+        /// <summary>
+        /// 设置关联的VisualCanvas
+        /// </summary>
+        public void SetVisualCanvas(VisualCanvas visualCanvas)
+        {
+            _visualCanvas = visualCanvas;
+        }
+
         /// <summary>
         /// 在笔迹中添加点
         /// </summary>
@@ -75,16 +101,75 @@ namespace Ink_Canvas.Helpers
             {
                 var collection = new StylusPointCollection { point };
                 Stroke = new Stroke(collection) { DrawingAttributes = _drawingAttributes };
-                _lastPointCount = 1;
             }
             else
             {
                 Stroke.StylusPoints.Add(point);
-                _lastPointCount++;
+            }
+        }
+
+        /// <summary>
+        /// 绘制点段到新的DrawingVisual
+        /// </summary>
+        private static double PressureToVisualScale(float pressureFactor, bool ignorePressure)
+        {
+            if (ignorePressure)
+                return 1.0;
+            // 与 WPF 墨迹观感接近：0.5 为标称，压低变细、抬高变粗（预览此前固定 Pen 宽，等同忽略压感）
+            return Math.Max(0.22, Math.Min(2.1, 0.42 + 1.16 * pressureFactor));
+        }
+
+        private void DrawSegmentToNewVisual(int startIndex, int endIndex)
+        {
+            if (Stroke == null || Stroke.StylusPoints.Count == 0 || _visualCanvas == null) return;
+            if (startIndex >= endIndex || startIndex < 0 || endIndex > Stroke.StylusPoints.Count) return;
+
+            var points = Stroke.StylusPoints;
+            var drawingAttributes = Stroke.DrawingAttributes;
+            var ignorePressure = drawingAttributes.IgnorePressure;
+
+            // 创建新的DrawingVisual用于绘制这个点段
+            var segmentVisual = new DrawingVisual();
+
+            RenderOptions.SetBitmapScalingMode(segmentVisual, BitmapScalingMode.HighQuality);
+            RenderOptions.SetEdgeMode(segmentVisual, EdgeMode.Aliased);
+            RenderOptions.SetCachingHint(segmentVisual, CachingHint.Cache);
+
+            using (var dc = segmentVisual.RenderOpen())
+            {
+                // 绘制指定范围内的点段
+                if (endIndex - startIndex >= 2)
+                {
+                    // 多个点，绘制线段
+                    for (int i = startIndex; i < endIndex - 1 && i < points.Count - 1; i++)
+                    {
+                        var startPoint = new Point(points[i].X, points[i].Y);
+                        var endPoint = new Point(points[i + 1].X, points[i + 1].Y);
+                        var s0 = PressureToVisualScale(points[i].PressureFactor, ignorePressure);
+                        var s1 = PressureToVisualScale(points[i + 1].PressureFactor, ignorePressure);
+                        var thickness = Math.Max(0.35, (drawingAttributes.Width * s0 + drawingAttributes.Width * s1) / 2.0);
+                        var pen = new Pen(new SolidColorBrush(drawingAttributes.Color), thickness)
+                        {
+                            StartLineCap = PenLineCap.Round,
+                            EndLineCap = PenLineCap.Round,
+                            LineJoin = PenLineJoin.Round
+                        };
+                        dc.DrawLine(pen, startPoint, endPoint);
+                    }
+                }
+                else if (endIndex - startIndex == 1 && startIndex < points.Count)
+                {
+                    // 只有一个点，绘制圆点
+                    var brush = new SolidColorBrush(drawingAttributes.Color);
+                    var point = points[startIndex];
+                    var s = PressureToVisualScale(point.PressureFactor, ignorePressure);
+                    dc.DrawEllipse(brush, null, new Point(point.X, point.Y),
+                        drawingAttributes.Width * s / 2, drawingAttributes.Height * s / 2);
+                }
             }
 
-            // 标记需要重绘
-            _needsRedraw = true;
+            // 将新的DrawingVisual添加到VisualCanvas中
+            _visualCanvas.AddVisual(segmentVisual);
         }
 
         /// <summary>
@@ -92,22 +177,35 @@ namespace Ink_Canvas.Helpers
         /// </summary>
         public void Redraw()
         {
-            if (!_needsRedraw || Stroke == null) return;
+            if (Stroke == null || _visualCanvas == null) return;
 
-            if (_lastPointCount % REDRAW_THRESHOLD != 0 && _lastPointCount > REDRAW_THRESHOLD)
-            {
-                return;
-            }
+            var currentPointCount = Stroke.StylusPoints.Count;
+            if (currentPointCount == 0) return;
 
-            try
+            // 计算新增的点数
+            int newPointCount = currentPointCount - _lastDrawnPointCount;
+
+            // 如果新增点数达到阈值，才进行增量绘制
+            if (newPointCount >= INCREMENTAL_DRAW_THRESHOLD || _lastDrawnPointCount == 0)
             {
-                using (var dc = RenderOpen())
+                try
                 {
-                    Stroke.Draw(dc);
+                    if (_lastDrawnPointCount == 0)
+                    {
+                        // 首次绘制：绘制所有点
+                        DrawSegmentToNewVisual(0, currentPointCount);
+                        _lastDrawnPointCount = currentPointCount;
+                    }
+                    else
+                    {
+                        // 从上次绘制的最后一个点开始
+                        int startIndex = Math.Max(0, _lastDrawnPointCount - 1);
+                        DrawSegmentToNewVisual(startIndex, currentPointCount);
+                        _lastDrawnPointCount = currentPointCount;
+                    }
                 }
-                _needsRedraw = false;
+                catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
             }
-            catch { }
         }
 
         /// <summary>
@@ -115,15 +213,15 @@ namespace Ink_Canvas.Helpers
         /// </summary>
         public void ForceRedraw()
         {
-            _needsRedraw = true;
+            if (_visualCanvas != null)
+            {
+                _visualCanvas.Clear();
+            }
+            _lastDrawnPointCount = 0;
             Redraw();
         }
 
         private readonly DrawingAttributes _drawingAttributes;
 
-        public static implicit operator Stroke(StrokeVisual v)
-        {
-            throw new NotImplementedException();
-        }
     }
 }

Ink Canvas/Helpers/PPTInkManager.cs

@@ -1,15 +1,13 @@
-using Microsoft.Office.Interop.PowerPoint;
+using Microsoft.Office.Interop.PowerPoint;
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
-using System.Security.Cryptography;
-using System.Text;
 using System.Windows.Ink;
 
 namespace Ink_Canvas.Helpers
 {
     /// <summary>
-    /// PPT墨迹管理器 - 负责PPT中墨迹的保存、加载和同步
+    /// PPT墨迹管理器 - 负责按幻灯片保存/加载墨迹、自动保存与内存管理。
     /// </summary>
     public class PPTInkManager : IDisposable
     {
@@ -21,7 +19,8 @@ namespace Ink_Canvas.Helpers
 
         #region Private Fields
         private MemoryStream[] _memoryStreams;
-        private int _maxSlides = 100;
+        private const int DefaultMaxSlides = 100;
+        private int _maxSlides = DefaultMaxSlides;
         private string _currentPresentationId = "";
         private readonly object _lockObject = new object();
         private bool _disposed;
@@ -34,50 +33,70 @@ namespace Ink_Canvas.Helpers
         // 添加快速切换保护机制
         private DateTime _lastSwitchTime = DateTime.MinValue;
         private int _lastSwitchSlideIndex = -1;
-        private const int MinSwitchIntervalMs = 100; // 最小切换间隔100毫秒
+        private const int MinSwitchIntervalMs = 100;
 
-        // 内存管理相关字段
-        private long _totalMemoryUsage = 0;
-        private const long MaxMemoryUsageBytes = 100 * 1024 * 1024; // 100MB限制
+        private long _totalMemoryUsage;
+        private const long MaxMemoryUsageBytes = 100 * 1024 * 1024; // 100MB
         private DateTime _lastMemoryCleanup = DateTime.MinValue;
-        private const int MemoryCleanupIntervalMinutes = 5; // 5分钟清理一次
+        private const int MemoryCleanupIntervalMinutes = 5;
+
+        private const string StrokeFileExtension = ".icstk";
         #endregion
 
         #region Constructor
+        /// <summary>
+        /// 初始化 PPTInkManager 实例并为内部内存流分配初始容量以跟踪默认最大幻灯片数加上备用槽位。
+        /// </summary>
         public PPTInkManager()
         {
-            InitializeMemoryStreams();
+            InitializeMemoryStreams(DefaultMaxSlides + 2);
         }
 
-        private void InitializeMemoryStreams()
+        /// <summary>
+        /// 根据指定容量初始化用于存储每页墨迹的内存流数组。
+        /// </summary>
+        /// <param name="capacity">期望的数组容量；如果小于 2，则会使用 2 作为最小容量。</param>
+        private void InitializeMemoryStreams(int capacity)
         {
-            _memoryStreams = new MemoryStream[_maxSlides + 2];
+            if (_memoryStreams != null)
+            {
+                for (int i = 0; i < _memoryStreams.Length; i++)
+                {
+                    try { _memoryStreams[i]?.Dispose(); } catch (Exception ex) { LogHelper.WriteLogToFile($"InitializeMemoryStreams 释放内存流 {i} 失败: {ex}", LogHelper.LogType.Warning); }
+                }
+            }
+            _memoryStreams = new MemoryStream[Math.Max(2, capacity)];
         }
         #endregion
 
         #region Public Methods
+
         /// <summary>
         /// 初始化新的演示文稿
         /// </summary>
+        /// <remarks>
+        /// 为新的或当前的演示文稿初始化墨迹管理器的内部状态。
+        /// 方法会清除所有内存中的笔迹数据，重置墨迹写入锁与快速切换追踪，并根据演示文稿的幻灯片数量分配内部内存缓冲区。
+        /// 如果已启用自动保存且设置了 <see cref="AutoSaveLocation"/>，则会尝试加载磁盘上的已保存墨迹文件。
+        /// </remarks>
+        /// <param name="presentation">要初始化的 PowerPoint Presentation 实例；为 null 时方法不执行任何操作并直接返回。</param>
         public void InitializePresentation(Presentation presentation)
         {
+            ThrowIfDisposed();
             if (presentation == null) return;
 
             lock (_lockObject)
             {
                 try
                 {
-                    // 完全清理之前的墨迹状态
-                    ClearAllStrokes();
-
-                    // 重置墨迹锁定状态
+                    ClearAllStrokesInternal();
                     _inkLockUntil = DateTime.MinValue;
                     _lockedSlideIndex = -1;
+                    _lastSwitchSlideIndex = -1;
+                    _lastSwitchTime = DateTime.MinValue;
 
-                    // 生成演示文稿唯一标识符
                     _currentPresentationId = GeneratePresentationId(presentation);
 
-                    // 重新初始化内存流数组
                     int slideCount = 0;
                     try
                     {
@@ -85,21 +104,17 @@ namespace Ink_Canvas.Helpers
                     }
                     catch (COMException comEx)
                     {
-                        var hr = (uint)comEx.HResult;
-                        if (hr == 0x80048010)
-                        {
-                            return;
-                        }
+                        uint hr = (uint)comEx.HResult;
+                        if (hr == 0x80048010) return;
                         throw;
                     }
-                    _memoryStreams = new MemoryStream[slideCount + 2];
 
-                    // 如果启用自动保存，尝试加载已保存的墨迹
+                    int capacity = slideCount + 2;
+                    _maxSlides = Math.Max(_maxSlides, slideCount);
+                    _memoryStreams = new MemoryStream[capacity];
+
                     if (IsAutoSaveEnabled && !string.IsNullOrEmpty(AutoSaveLocation))
-                    {
                         LoadSavedStrokes();
-                    }
-
                 }
                 catch (Exception ex)
                 {
@@ -111,48 +126,25 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 保存当前页面的墨迹
         /// </summary>
+        /// <remarks>
+        /// 将指定幻灯片的墨迹保存到内部内存缓存，并在必要时触发内存清理。
+        /// </remarks>
+        /// <param name="slideIndex">要保存的幻灯片索引（从 1 开始）。方法在索引小于或等于 0 时不执行任何操作。</param>
+        /// <param name="strokes">要保存的墨迹集合；为 null 时方法不执行任何操作。</param>
         public void SaveCurrentSlideStrokes(int slideIndex, StrokeCollection strokes)
         {
+            ThrowIfDisposed();
             if (slideIndex <= 0 || strokes == null) return;
 
             lock (_lockObject)
             {
                 try
                 {
-                    // 检查墨迹锁定 
-                    if (!CanWriteInk(slideIndex))
-                    {
-                        if (DateTime.Now < _inkLockUntil)
-                        {
-                        }
-                        return;
-                    }
+                    if (!CanWriteInk(slideIndex)) return;
+                    if (slideIndex >= _memoryStreams.Length) return;
 
-                    if (slideIndex < _memoryStreams.Length)
-                    {
-                        // 先释放旧的内存流，防止内存泄漏
-                        try
-                        {
-                            _memoryStreams[slideIndex]?.Dispose();
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.WriteLogToFile($"释放旧内存流失败: {ex}", LogHelper.LogType.Warning);
-                        }
-
-                        // 创建新的内存流
-                        var ms = new MemoryStream();
-                        strokes.Save(ms);
-                        ms.Position = 0;
-                        _memoryStreams[slideIndex] = ms;
-
-                        if (ms.Length > 0)
-                        {
-                        }
-
-                        // 检查内存使用情况
-                        CheckAndPerformMemoryCleanup();
-                    }
+                    ReplaceSlideStream(slideIndex, strokes);
+                    CheckAndPerformMemoryCleanup();
                 }
                 catch (Exception ex)
                 {
@@ -162,36 +154,25 @@ namespace Ink_Canvas.Helpers
         }
 
         /// <summary>
-        /// 强制保存指定页面的墨迹
+        /// 强制保存指定页墨迹到内存（不受锁定限制）。用于放映结束前保存当前画布到当前页。
         /// </summary>
+        /// <remarks>
+        /// 强制将指定幻灯片的墨迹保存到内部内存缓存，覆盖该幻灯片已有的墨迹数据。
+        /// </remarks>
+        /// <param name="slideIndex">要保存的幻灯片索引（从 1 开始）。</param>
+        /// <param name="strokes">要保存的墨迹集合，不能为空。</param>
         public void ForceSaveSlideStrokes(int slideIndex, StrokeCollection strokes)
         {
+            ThrowIfDisposed();
             if (slideIndex <= 0 || strokes == null) return;
 
             lock (_lockObject)
             {
                 try
                 {
-                    if (slideIndex < _memoryStreams.Length)
-                    {
-                        // 先释放旧的内存流，防止内存泄漏
-                        try
-                        {
-                            _memoryStreams[slideIndex]?.Dispose();
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.WriteLogToFile($"释放旧内存流失败: {ex}", LogHelper.LogType.Warning);
-                        }
-
-                        // 创建新的内存流
-                        var ms = new MemoryStream();
-                        strokes.Save(ms);
-                        ms.Position = 0;
-                        _memoryStreams[slideIndex] = ms;
-
-                        LogHelper.WriteLogToFile($"已强制保存第{slideIndex}页墨迹，大小: {ms.Length} bytes", LogHelper.LogType.Trace);
-                    }
+                    if (slideIndex >= _memoryStreams.Length) return;
+                    ReplaceSlideStream(slideIndex, strokes);
+                    LogHelper.WriteLogToFile($"已强制保存第{slideIndex}页墨迹", LogHelper.LogType.Trace);
                 }
                 catch (Exception ex)
                 {
@@ -203,8 +184,14 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 加载指定页面的墨迹
         /// </summary>
+        /// <remarks>
+        /// 加载并返回指定幻灯片的墨迹集合。
+        /// </remarks>
+        /// <param name="slideIndex">要加载的幻灯片索引（从1开始）。</param>
+        /// <returns>包含指定幻灯片的墨迹的 StrokeCollection；如果该幻灯片没有已保存的墨迹或加载失败，则返回空的 StrokeCollection。</returns>
         public StrokeCollection LoadSlideStrokes(int slideIndex)
         {
+            ThrowIfDisposed();
             if (slideIndex <= 0) return new StrokeCollection();
 
             lock (_lockObject)
@@ -214,8 +201,7 @@ namespace Ink_Canvas.Helpers
                     if (slideIndex < _memoryStreams.Length && _memoryStreams[slideIndex] != null && _memoryStreams[slideIndex].Length > 0)
                     {
                         _memoryStreams[slideIndex].Position = 0;
-                        var strokes = new StrokeCollection(_memoryStreams[slideIndex]);
-                        return strokes;
+                        return new StrokeCollection(_memoryStreams[slideIndex]);
                     }
                 }
                 catch (Exception ex)
@@ -230,36 +216,30 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 切换到指定页面并加载墨迹
         /// </summary>
+        /// <remarks>
+        /// 切换到指定幻灯片并返回该幻灯片的已加载笔迹集合。
+        /// </remarks>
+        /// <param name="slideIndex">要切换到的幻灯片索引（从 1 开始）。</param>
+        /// <param name="currentStrokes">可选的当前笔迹集合，用于在切换时提供当前画面状态。</param>
+        /// <returns>`StrokeCollection`：指定幻灯片已加载的笔迹集合；若加载失败则返回一个空的 `StrokeCollection`。</returns>
         public StrokeCollection SwitchToSlide(int slideIndex, StrokeCollection currentStrokes = null)
         {
+            ThrowIfDisposed();
             lock (_lockObject)
             {
                 try
                 {
-                    // 检查快速切换保护
                     var now = DateTime.Now;
-                    if (now - _lastSwitchTime < TimeSpan.FromMilliseconds(MinSwitchIntervalMs) &&
-                        _lastSwitchSlideIndex == slideIndex)
+                    if (now - _lastSwitchTime < TimeSpan.FromMilliseconds(MinSwitchIntervalMs) && _lastSwitchSlideIndex == slideIndex)
                     {
-                        LogHelper.WriteLogToFile($"快速切换保护：忽略重复的页面切换请求 {slideIndex}", LogHelper.LogType.Warning);
+                        LogHelper.WriteLogToFile($"快速切换保护：忽略重复请求 页{slideIndex}", LogHelper.LogType.Trace);
                         return LoadSlideStrokes(slideIndex);
                     }
 
-
-                    // 设置墨迹锁定
                     LockInkForSlide(slideIndex);
-
-                    // 加载新页面的墨迹
-                    var newStrokes = LoadSlideStrokes(slideIndex);
-
-                    // 更新切换记录
+                    StrokeCollection newStrokes = LoadSlideStrokes(slideIndex);
                     _lastSwitchTime = now;
                     _lastSwitchSlideIndex = slideIndex;
-
-                    if (newStrokes.Count > 0)
-                    {
-                    }
-
                     return newStrokes;
                 }
                 catch (Exception ex)
@@ -273,95 +253,66 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 保存所有墨迹到文件
         /// </summary>
-        /// <param name="presentation">演示文稿对象</param>
-        /// <param name="currentSlideIndex">当前播放的页码，如果提供则使用此值保存位置，否则使用_lockedSlideIndex</param>
+        /// <remarks>
+        /// 将内存中当前演示文稿的每页墨迹保存到磁盘，并根据情况写入当前播放位置文件。
+        /// 仅在 IsAutoSaveEnabled 为真且 AutoSaveLocation 已设置时执行。会在演示文稿专属文件夹中写入按页编号的墨迹文件（带 `.icstk` 扩展名）和可选的 Position 文件。遇到特定 COM 错误（HRESULT 0x80048010）时会中止保存当前幻灯片计数读取而不抛出异常；单页保存失败会记录错误并继续处理其他页。
+        /// </remarks>
+        /// <param name="presentation">要保存墨迹的 PowerPoint 演示文稿对象。</param>
+        /// <param name="currentSlideIndex">当前播放的页码；如果大于 0 则以此值写入 Position 文件，否则使用当前被锁定的页码或最后切换的页码作为保存位置。</param>
         public void SaveAllStrokesToFile(Presentation presentation, int currentSlideIndex = -1)
         {
+            ThrowIfDisposed();
             if (!IsAutoSaveEnabled || string.IsNullOrEmpty(AutoSaveLocation) || presentation == null) return;
 
             lock (_lockObject)
             {
                 try
                 {
-                    var folderPath = GetPresentationFolderPath();
+                    string folderPath = GetPresentationFolderPath();
                     if (!Directory.Exists(folderPath))
-                    {
                         Directory.CreateDirectory(folderPath);
+
+                    int positionToSave = currentSlideIndex > 0 ? currentSlideIndex : (_lockedSlideIndex > 0 ? _lockedSlideIndex : _lastSwitchSlideIndex);
+                    if (positionToSave > 0)
+                    {
+                        try { File.WriteAllText(Path.Combine(folderPath, "Position"), positionToSave.ToString()); }
+                        catch (Exception ex) { LogHelper.WriteLogToFile($"保存 Position 失败: {ex}", LogHelper.LogType.Warning); }
                     }
 
-                    // 保存位置信息
-                    try
-                    {
-                        // 优先使用传入的当前页码，否则使用锁定的页码
-                        int positionToSave = currentSlideIndex > 0 ? currentSlideIndex : _lockedSlideIndex;
-                        // 如果都没有有效值，尝试使用最后切换的页码
-                        if (positionToSave <= 0 && _lastSwitchSlideIndex > 0)
-                        {
-                            positionToSave = _lastSwitchSlideIndex;
-                        }
-                        
-                        if (positionToSave > 0)
-                        {
-                            File.WriteAllText(Path.Combine(folderPath, "Position"), positionToSave.ToString());
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.WriteLogToFile($"保存位置信息失败: {ex}", LogHelper.LogType.Error);
-                    }
-
-                    // 保存所有页面的墨迹
-                    int savedCount = 0;
                     int slideCount = 0;
-
-                    try
-                    {
-                        slideCount = presentation.Slides.Count;
-                    }
+                    try { slideCount = presentation.Slides.Count; }
                     catch (COMException comEx)
                     {
-                        var hr = (uint)comEx.HResult;
-                        if (hr == 0x80048010)
-                        {
-                            return;
-                        }
+                        if ((uint)comEx.HResult == 0x80048010) return;
                         throw;
                     }
 
                     for (int i = 1; i <= slideCount && i < _memoryStreams.Length; i++)
                     {
-                        if (_memoryStreams[i] != null)
+                        if (_memoryStreams[i] == null) continue;
+                        try
                         {
-                            try
+                            if (_memoryStreams[i].Length > 8)
                             {
-                                if (_memoryStreams[i].Length > 8)
+                                _memoryStreams[i].Position = 0;
+                                byte[] buf = new byte[_memoryStreams[i].Length];
+                                int read = _memoryStreams[i].Read(buf, 0, buf.Length);
+                                if (read > 0)
                                 {
-                                    var srcBuf = new byte[_memoryStreams[i].Length];
-                                    _memoryStreams[i].Position = 0;
-                                    var byteLength = _memoryStreams[i].Read(srcBuf, 0, srcBuf.Length);
-
-                                    var filePath = Path.Combine(folderPath, i.ToString("0000") + ".icstk");
-                                    File.WriteAllBytes(filePath, srcBuf);
-                                    savedCount++;
-
-                                }
-                                else
-                                {
-                                    // 删除空的墨迹文件
-                                    var filePath = Path.Combine(folderPath, i.ToString("0000") + ".icstk");
-                                    if (File.Exists(filePath))
-                                    {
-                                        File.Delete(filePath);
-                                    }
+                                    string basePath = Path.Combine(folderPath, i.ToString("0000"));
+                                    File.WriteAllBytes(basePath + StrokeFileExtension, buf);
                                 }
                             }
-                            catch (Exception ex)
+                            else
                             {
-                                LogHelper.WriteLogToFile($"保存第{i}页墨迹失败: {ex}", LogHelper.LogType.Error);
+                                TryDeleteStrokeFile(folderPath, i);
                             }
                         }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"保存第{i}页墨迹到文件失败: {ex}", LogHelper.LogType.Error);
+                        }
                     }
-
                 }
                 catch (Exception ex)
                 {
@@ -373,41 +324,50 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 从文件加载已保存的墨迹
         /// </summary>
+        /// <remarks>
+        /// 从自动保存目录加载已保存的幻灯片墨迹数据到内存流中，供后续显示和编辑使用。
+        /// 仅在启用自动保存且已设置 AutoSaveLocation 时执行。函数获取当前演示文稿的自动保存文件夹，遍历以 <c>.icstk</c> 为扩展名的文件，
+        /// 将文件名（去除扩展名）解析为幻灯片索引并在合法且文件大小大于 8 字节时加载到对应的内存流槽位。对单个文件的读取失败会记录错误并继续处理其他文件；
+        /// 若成功加载则会记录已加载页数。方法在内部使用锁以保证线程安全。
+        /// </remarks>
         public void LoadSavedStrokes()
         {
+            ThrowIfDisposed();
             if (!IsAutoSaveEnabled || string.IsNullOrEmpty(AutoSaveLocation)) return;
 
             lock (_lockObject)
             {
                 try
                 {
-                    var folderPath = GetPresentationFolderPath();
+                    string folderPath = GetPresentationFolderPath();
                     if (!Directory.Exists(folderPath)) return;
 
-                    var files = new DirectoryInfo(folderPath).GetFiles("*.icstk");
+                    var dir = new DirectoryInfo(folderPath);
                     int loadedCount = 0;
-
-                    foreach (var file in files)
+                    foreach (FileInfo file in dir.GetFiles("*" + StrokeFileExtension))
                     {
+                        string nameWithoutExt = Path.GetFileNameWithoutExtension(file.Name);
+                        if (!int.TryParse(nameWithoutExt, out int slideIndex) || slideIndex <= 0) continue;
+                        if (slideIndex >= _memoryStreams.Length) continue;
+
                         try
                         {
-                            if (int.TryParse(Path.GetFileNameWithoutExtension(file.Name), out int slideIndex))
+                            byte[] bytes = File.ReadAllBytes(file.FullName);
+                            if (bytes.Length > 8)
                             {
-                                if (slideIndex > 0 && slideIndex < _memoryStreams.Length)
-                                {
-                                    var fileBytes = File.ReadAllBytes(file.FullName);
-                                    _memoryStreams[slideIndex] = new MemoryStream(fileBytes);
-                                    _memoryStreams[slideIndex].Position = 0;
-                                    loadedCount++;
-                                }
+                                _memoryStreams[slideIndex] = new MemoryStream(bytes);
+                                _memoryStreams[slideIndex].Position = 0;
+                                loadedCount++;
                             }
                         }
                         catch (Exception ex)
                         {
-                            LogHelper.WriteLogToFile($"加载墨迹文件{file.Name}失败: {ex}", LogHelper.LogType.Error);
+                            LogHelper.WriteLogToFile($"加载墨迹文件 {file.Name} 失败: {ex}", LogHelper.LogType.Error);
                         }
                     }
 
+                    if (loadedCount > 0)
+                        LogHelper.WriteLogToFile($"已从磁盘加载 {loadedCount} 页墨迹", LogHelper.LogType.Trace);
                 }
                 catch (Exception ex)
                 {
@@ -419,87 +379,53 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 清除所有墨迹
         /// </summary>
+        /// <remarks>
+        /// 清除并释放当前演示文稿所有幻灯片的墨迹数据和相关内存资源。
+        /// 该方法在内部加锁以保证线程安全；会处置并清空所有内部存储的墨迹流、重建内部流数组并清空 CurrentStrokes。
+        /// </remarks>
         public void ClearAllStrokes()
         {
+            ThrowIfDisposed();
             lock (_lockObject)
             {
-                try
-                {
-                    // 安全释放所有内存流
-                    if (_memoryStreams != null)
-                    {
-                        for (int i = 0; i < _memoryStreams.Length; i++)
-                        {
-                            try
-                            {
-                                _memoryStreams[i]?.Dispose();
-                            }
-                            catch (Exception ex)
-                            {
-                                LogHelper.WriteLogToFile($"释放内存流{i}失败: {ex}", LogHelper.LogType.Warning);
-                            }
-                            finally
-                            {
-                                _memoryStreams[i] = null;
-                            }
-                        }
-
-                        // 重新初始化数组
-                        _memoryStreams = new MemoryStream[_maxSlides + 2];
-                    }
-
-                    CurrentStrokes?.Clear();
-                    LogHelper.WriteLogToFile("已清除所有墨迹", LogHelper.LogType.Trace);
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteLogToFile($"清除墨迹失败: {ex}", LogHelper.LogType.Error);
-                }
+                ClearAllStrokesInternal();
             }
         }
 
         /// <summary>
-        /// 翻页后锁定墨迹写入
+        /// 为指定幻灯片设置短时墨迹写入锁，防止在该时间窗口内对其他幻灯片进行写入操作。
         /// </summary>
+        /// <param name="slideIndex">要上锁的幻灯片索引（大于 0）。锁从调用时刻开始，持续 InkLockMilliseconds 毫秒。</param>
         public void LockInkForSlide(int slideIndex)
         {
+            ThrowIfDisposed();
             _inkLockUntil = DateTime.Now.AddMilliseconds(InkLockMilliseconds);
             _lockedSlideIndex = slideIndex;
         }
 
         /// <summary>
-        /// 检查是否可以写入墨迹
+        /// 确定在当前滑页上下文中是否允许写入墨迹（基于短期的墨迹写入锁与容差窗口）。
         /// </summary>
+        /// <param name="currentSlideIndex">当前尝试写入墨迹的幻灯片索引（从 1 开始）。</param>
+        /// <returns>`true` 如果允许写入墨迹（锁已过期、目标为被锁定的幻灯片，或处于短暂的容差窗口内），`false` 否则。</returns>
         public bool CanWriteInk(int currentSlideIndex)
         {
-            // 如果锁定时间已过，允许写入
-            if (DateTime.Now >= _inkLockUntil)
-            {
-                return true;
-            }
-
-            // 如果当前页面与锁定页面相同，允许写入（用户在当前页面绘制）
-            if (currentSlideIndex == _lockedSlideIndex)
-            {
-                return true;
-            }
-
-            // 如果当前页面不是锁定页面，但锁定时间很短（小于50ms），允许写入
-            // 这样可以确保旧页面的墨迹能够及时保存
-            if (DateTime.Now - (_inkLockUntil.AddMilliseconds(-InkLockMilliseconds)) < TimeSpan.FromMilliseconds(50))
-            {
-                return true;
-            }
-
-            // 只有在快速切换且页面不同时才锁定
+            ThrowIfDisposed();
+            if (DateTime.Now >= _inkLockUntil) return true;
+            if (currentSlideIndex == _lockedSlideIndex) return true;
+            if (DateTime.Now - (_inkLockUntil.AddMilliseconds(-InkLockMilliseconds)) < TimeSpan.FromMilliseconds(50)) return true;
             return false;
         }
 
         /// <summary>
-        /// 重置墨迹锁定状态
+        /// 重置与墨迹书写和幻灯片切换相关的锁与跟踪状态为初始（未锁定）值。
         /// </summary>
+        /// <remarks>
+        /// 将内部的墨迹写入到期时间、当前被锁定的幻灯片索引、上次切换时间和上次切换的幻灯片索引均恢复为默认未设置状态。
+        /// </remarks>
         public void ResetLockState()
         {
+            ThrowIfDisposed();
             lock (_lockObject)
             {
                 _inkLockUntil = DateTime.MinValue;
@@ -509,51 +435,90 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        #endregion
+
+        #region Private Helpers
+
         /// <summary>
-        /// 检查并执行内存清理
+        /// 释放并清除类内用于存储各页墨迹的所有内存流，清空当前画笔集合，并重置内部内存流数组容量为 _maxSlides + 2。
         /// </summary>
+        /// <remarks>
+        /// - 会逐个释放已存在的 MemoryStream（忽略释放过程中的异常），并将对应槽位设为 null。
+        /// - 会清空 CurrentStrokes 集合。 
+        /// - 会记录一条跟踪日志，指示已完成清除操作。
+        /// </remarks>
+        private void ClearAllStrokesInternal()
+        {
+            if (_memoryStreams != null)
+            {
+                for (int i = 0; i < _memoryStreams.Length; i++)
+                {
+                    try { _memoryStreams[i]?.Dispose(); }
+                    catch (Exception ex) { LogHelper.WriteLogToFile($"释放内存流 {i} 失败: {ex}", LogHelper.LogType.Warning); }
+                    finally { _memoryStreams[i] = null; }
+                }
+                _memoryStreams = new MemoryStream[_maxSlides + 2];
+            }
+            CurrentStrokes?.Clear();
+            LogHelper.WriteLogToFile("已清除所有墨迹", LogHelper.LogType.Trace);
+        }
+
+        /// <summary>
+        /// 用指定的笔迹集合替换内部存储中对应幻灯片索引的内存流：释放（并忽略释放错误）旧流，将 <paramref name="strokes"/> 序列化到新的 <see cref="MemoryStream"/> 并保存回内部数组。
+        /// </summary>
+        /// <param name="slideIndex">要替换的幻灯片索引（内部内存流数组的索引）。</param>
+        /// <param name="strokes">要序列化并保存到内存流的笔迹集合。</param>
+        private void ReplaceSlideStream(int slideIndex, StrokeCollection strokes)
+        {
+            try { _memoryStreams[slideIndex]?.Dispose(); } catch (Exception ex) { LogHelper.WriteLogToFile($"释放旧内存流失败: {ex}", LogHelper.LogType.Warning); }
+            var ms = new MemoryStream();
+            strokes.Save(ms);
+            ms.Position = 0;
+            _memoryStreams[slideIndex] = ms;
+        }
+
+        /// <summary>
+        /// 从指定文件夹删除对应幻灯片的笔迹文件（按四位索引命名）；如果文件不存在或删除失败则静默忽略错误。
+        /// </summary>
+        /// <param name="folderPath">存放笔迹文件的文件夹路径。</param>
+        /// <param name="slideIndex">用于生成文件名的幻灯片索引（格式化为四位，例如 1 -> "0001"）。</param>
+        private void TryDeleteStrokeFile(string folderPath, int slideIndex)
+        {
+            try
+            {
+                string path = Path.Combine(folderPath, slideIndex.ToString("0000") + StrokeFileExtension);
+                if (File.Exists(path)) File.Delete(path);
+            }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+        }
+
+        /// <summary>
+        /// 检查当前墨迹内存使用状况并在超过阈值时触发清理操作。
+        /// </summary>
+        /// <remarks>
+        /// 会更新内部的内存使用统计并刷新上次清理时间；当总占用超过 MaxMemoryUsageBytes 时，会记录警告并调用 CleanupInactiveSlideStrokes 清理不活跃幻灯页的墨迹流。若检查或清理过程中发生异常，会记录错误日志。
+        /// </remarks>
         private void CheckAndPerformMemoryCleanup()
         {
             try
             {
                 var now = DateTime.Now;
+                if (now - _lastMemoryCleanup < TimeSpan.FromMinutes(MemoryCleanupIntervalMinutes)) return;
 
-                // 检查是否需要执行内存清理
-                if (now - _lastMemoryCleanup < TimeSpan.FromMinutes(MemoryCleanupIntervalMinutes))
-                {
-                    return;
-                }
-
-                // 计算当前内存使用量
                 long currentMemoryUsage = 0;
                 if (_memoryStreams != null)
                 {
                     for (int i = 0; i < _memoryStreams.Length; i++)
-                    {
-                        if (_memoryStreams[i] != null)
-                        {
-                            currentMemoryUsage += _memoryStreams[i].Length;
-                        }
-                    }
+                        if (_memoryStreams[i] != null) currentMemoryUsage += _memoryStreams[i].Length;
                 }
-
                 _totalMemoryUsage = currentMemoryUsage;
 
-                // 如果内存使用量超过限制，执行清理
                 if (currentMemoryUsage > MaxMemoryUsageBytes)
                 {
-                    LogHelper.WriteLogToFile($"内存使用量超限 ({currentMemoryUsage / 1024 / 1024}MB)，开始清理", LogHelper.LogType.Warning);
-
-                    // 清理非当前页面的墨迹
+                    LogHelper.WriteLogToFile($"墨迹内存超限 ({currentMemoryUsage / (1024 * 1024)}MB)，执行清理", LogHelper.LogType.Warning);
                     CleanupInactiveSlideStrokes();
-
-                    _lastMemoryCleanup = now;
-                    LogHelper.WriteLogToFile($"内存清理完成，当前使用量: {_totalMemoryUsage / 1024 / 1024}MB", LogHelper.LogType.Trace);
-                }
-                else
-                {
-                    _lastMemoryCleanup = now;
                 }
+                _lastMemoryCleanup = now;
             }
             catch (Exception ex)
             {
@@ -562,111 +527,78 @@ namespace Ink_Canvas.Helpers
         }
 
         /// <summary>
-        /// 清理非活跃页面的墨迹
+        /// 清理不活跃幻灯片的内存化墨迹数据以回收内存空间。
         /// </summary>
+        /// <remarks>
+        /// 将释放除当前锁定幻灯片与最近切换幻灯片之外的每页内存流（若存在），并将对应数组项设为 null；完成后若有释放，会记录已清理页数与释放的总大小（KB）。
+        /// </remarks>
         private void CleanupInactiveSlideStrokes()
         {
-            try
+            if (_memoryStreams == null) return;
+            int cleaned = 0;
+            long freed = 0;
+            for (int i = 0; i < _memoryStreams.Length; i++)
             {
-                if (_memoryStreams == null) return;
-
-                int cleanedCount = 0;
-                long freedMemory = 0;
-
-                for (int i = 0; i < _memoryStreams.Length; i++)
+                if (i == _lockedSlideIndex || i == _lastSwitchSlideIndex) continue;
+                if (_memoryStreams[i] != null)
                 {
-                    // 保留当前锁定页面和最近访问的页面
-                    if (i == _lockedSlideIndex || i == _lastSwitchSlideIndex)
-                    {
-                        continue;
-                    }
-
-                    if (_memoryStreams[i] != null)
-                    {
-                        long memorySize = _memoryStreams[i].Length;
-
-                        try
-                        {
-                            _memoryStreams[i].Dispose();
-                            freedMemory += memorySize;
-                            cleanedCount++;
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.WriteLogToFile($"清理页面{i}墨迹失败: {ex}", LogHelper.LogType.Warning);
-                        }
-                        finally
-                        {
-                            _memoryStreams[i] = null;
-                        }
-                    }
-                }
-
-                if (cleanedCount > 0)
-                {
-                    LogHelper.WriteLogToFile($"已清理{cleanedCount}个页面的墨迹，释放内存: {freedMemory / 1024}KB", LogHelper.LogType.Trace);
+                    long len = _memoryStreams[i].Length;
+                    try { _memoryStreams[i].Dispose(); freed += len; cleaned++; }
+                    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+                    finally { _memoryStreams[i] = null; }
                 }
             }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"清理非活跃页面墨迹失败: {ex}", LogHelper.LogType.Error);
-            }
+            if (cleaned > 0)
+                LogHelper.WriteLogToFile($"已清理 {cleaned} 页墨迹，释放 {freed / 1024}KB", LogHelper.LogType.Trace);
         }
-        #endregion
 
-        #region Private Methods
+        /// <summary>
+        /// 生成基于演示文稿名称、幻灯片数量和路径哈希的标识符字符串。
+        /// </summary>
+        /// <returns>由 `名称_幻灯片数_路径哈希` 组成的标识符；若生成失败则返回形如 `unknown_{ticks}` 的回退标识符。</returns>
         private string GeneratePresentationId(Presentation presentation)
         {
             try
             {
-                var presentationPath = presentation.FullName;
-                var fileHash = GetFileHash(presentationPath);
-                return $"{presentation.Name}_{presentation.Slides.Count}_{fileHash}";
+                string path = presentation.FullName;
+                string hash = HashHelper.GetFileHash(path);
+                return $"{presentation.Name}_{presentation.Slides.Count}_{hash}";
             }
             catch (Exception ex)
             {
-                LogHelper.WriteLogToFile($"生成演示文稿ID失败: {ex}", LogHelper.LogType.Error);
+                LogHelper.WriteLogToFile($"生成演示文稿 ID 失败: {ex}", LogHelper.LogType.Error);
                 return $"unknown_{DateTime.Now.Ticks}";
             }
         }
 
-        private string GetFileHash(string filePath)
-        {
-            try
-            {
-                if (string.IsNullOrEmpty(filePath)) return "unknown";
-
-                using (var md5 = MD5.Create())
-                {
-                    byte[] hashBytes = md5.ComputeHash(Encoding.UTF8.GetBytes(filePath));
-                    return BitConverter.ToString(hashBytes).Replace("-", "").Substring(0, 8);
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"计算文件哈希值失败: {ex}", LogHelper.LogType.Error);
-                return "error";
-            }
-        }
-
         private string GetPresentationFolderPath()
         {
             return Path.Combine(AutoSaveLocation, "Auto Saved - Presentations", _currentPresentationId);
         }
+
         #endregion
 
         #region Dispose
+
+        /// <summary>
+        /// 释放 PPTInkManager 持有的资源并清除所有内存中的笔迹数据。
+        /// </summary>
+        /// <remarks>
+        /// 调用后该实例将进入已释放状态，不应再被使用。方法为幂等且线程安全：如果已释放则立即返回，否则在同步区内清理资源并标记为已释放。
+        /// </remarks>
         public void Dispose()
         {
-            if (!_disposed)
-            {
-                lock (_lockObject)
-                {
-                    ClearAllStrokes();
-                }
-                _disposed = true;
-            }
+            if (_disposed) return;
+            lock (_lockObject) { ClearAllStrokesInternal(); }
+            _disposed = true;
+            GC.SuppressFinalize(this);
         }
+
+        private void ThrowIfDisposed()
+        {
+            if (_disposed) throw new ObjectDisposedException(nameof(PPTInkManager));
+        }
+
         #endregion
     }
-}
+}

Ink Canvas/Helpers/PPTROTConnectionHelper.cs

@@ -0,0 +1,522 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.ComTypes;
+using System.Text;
+
+namespace Ink_Canvas.Helpers
+{
+    public static class PPTROTConnectionHelper
+    {
+        #region Win32 API Declarations
+        [DllImport("ole32.dll")]
+        private static extern int GetRunningObjectTable(int reserved, out IRunningObjectTable prot);
+
+        [DllImport("ole32.dll")]
+        private static extern int CreateBindCtx(int reserved, out IBindCtx ppbc);
+
+        [DllImport("user32.dll")]
+        private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr GetForegroundWindow();
+
+        [DllImport("user32.dll")]
+        private static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool IsWindowVisible(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        private static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct RECT
+        {
+            public int Left;
+            public int Top;
+            public int Right;
+            public int Bottom;
+        }
+        #endregion
+
+        #region Constants
+        private static readonly Guid PowerPointApplicationGuid = new Guid("91493441-5A91-11CF-8700-00AA0060263B");
+
+        private static readonly string[] PptLikeExtensions = new[]
+        {
+            ".pptx", ".pptm", ".ppt",
+            ".ppsx", ".ppsm", ".pps",
+            ".potx", ".potm", ".pot",
+            ".dps", ".dpt"
+        };
+        #endregion
+
+        #region Public Methods
+        public static Microsoft.Office.Interop.PowerPoint.Application TryConnectViaROT(bool isSupportWPS = false)
+        {
+            try
+            {
+                object bestApp = GetAnyActivePowerPoint(null, out int bestPriority, out _);
+
+                if (bestApp != null && bestPriority > 0)
+                {
+                    try
+                    {
+                        Type appType = typeof(Microsoft.Office.Interop.PowerPoint.Application);
+                        Microsoft.Office.Interop.PowerPoint.Application pptApp = null;
+                        if (appType.IsInstanceOfType(bestApp))
+                        {
+                            pptApp = (Microsoft.Office.Interop.PowerPoint.Application)bestApp;
+                        }
+                        if (pptApp != null)
+                        {
+                            try
+                            {
+                                var nameObj = pptApp.GetType().InvokeMember("Name", BindingFlags.GetProperty, null, pptApp, null);
+                                SafeReleaseComObject(nameObj);
+                                return pptApp;
+                            }
+                            catch (Exception ex)
+                            {
+                                LogHelper.WriteLogToFile($"ROT 连接验证 Name 不可用（将依赖 SlideShowWindows）: {ex.Message}", LogHelper.LogType.Warning);
+                                return pptApp;
+                            }
+                        }
+                        else
+                        {
+                            SafeReleaseComObject(bestApp);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"ROT 连接验证失败: {ex.Message}", LogHelper.LogType.Warning);
+                        SafeReleaseComObject(bestApp);
+                    }
+                }
+                else if (bestApp != null)
+                {
+                    SafeReleaseComObject(bestApp);
+                }
+
+                try
+                {
+                    var pptApp = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
+                    if (pptApp != null && Marshal.IsComObject(pptApp))
+                    {
+                        try
+                        {
+                            var _ = pptApp.Name;
+                        }
+                        catch (COMException)
+                        {
+                        }
+                        return pptApp;
+                    }
+                }
+                catch (COMException) { }
+                catch (InvalidCastException) { }
+
+                if (isSupportWPS)
+                {
+                    try
+                    {
+                        var wpsApp = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("kwpp.Application");
+                        if (wpsApp != null && Marshal.IsComObject(wpsApp))
+                        {
+                            try
+                            {
+                                var _ = wpsApp.Name;
+                            }
+                            catch (COMException)
+                            {
+                            }
+                            return wpsApp;
+                        }
+                    }
+                    catch (COMException) { }
+                    catch (InvalidCastException) { }
+                }
+
+                return null;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"ROT 连接过程发生异常: {ex}", LogHelper.LogType.Error);
+                return null;
+            }
+        }
+        #endregion
+
+        #region Public Methods
+        /// <summary>
+        /// 在系统的运行对象表（ROT）中查找并返回最合适的正在运行的 PowerPoint 应用实例。
+        /// </summary>
+        /// <param name="targetApp">可选的目标 PowerPoint COM 对象，用于优先比较；传入 null 表示不指定目标。</param>
+        /// <param name="bestPriority">输出参数：返回找到的最佳实例的优先级（0 表示未找到或无活动演示）。</param>
+        /// <param name="targetPriority">输出参数：返回与 <paramref name="targetApp"/> 对应实例的优先级（如果未提供或未命中则为 0）。</param>
+        /// <returns>最合适的 PowerPoint 应用对象（通常为 COM Application 实例），若未找到则返回 null。</returns>
+        public static object GetAnyActivePowerPoint(object targetApp, out int bestPriority, out int targetPriority)
+        {
+            IRunningObjectTable rot = null;
+            IEnumMoniker enumMoniker = null;
+
+            object bestApp = null;
+            bestPriority = 0;
+            targetPriority = 0;
+            int highestPriority = 0;
+
+            List<object> foundAppObjects = new List<object>();
+
+            try
+            {
+                int hr = GetRunningObjectTable(0, out rot);
+                if (hr != 0 || rot == null)
+                {
+                    LogHelper.WriteLogToFile("无法获取 Running Object Table", LogHelper.LogType.Warning);
+                    return null;
+                }
+
+                rot.EnumRunning(out enumMoniker);
+                if (enumMoniker == null)
+                {
+                    LogHelper.WriteLogToFile("无法枚举 ROT 中的对象", LogHelper.LogType.Warning);
+                    return null;
+                }
+
+                IMoniker[] moniker = new IMoniker[1];
+                IntPtr fetched = IntPtr.Zero;
+
+                while (enumMoniker.Next(1, moniker, fetched) == 0)
+                {
+                    IBindCtx bindCtx = null;
+                    object comObject = null;
+                    dynamic candidateApp = null;
+                    string displayName = "Unknown";
+                    dynamic activePres = null;
+                    dynamic ssWindow = null;
+                    bool keepAlive = false;
+
+                    try
+                    {
+                        CreateBindCtx(0, out bindCtx);
+                        moniker[0].GetDisplayName(bindCtx, null, out displayName);
+
+                        if (LooksLikePresentationFile(displayName) || displayName == "!{91493441-5A91-11CF-8700-00AA0060263B}")
+                        {
+                            rot.GetObject(moniker[0], out comObject);
+                            if (comObject != null)
+                            {
+                                try
+                                {
+                                    object appObj = comObject.GetType().InvokeMember("Application", BindingFlags.GetProperty, null, comObject, null);
+                                    candidateApp = appObj;
+                                }
+                                catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+                            }
+                        }
+                        bool isDuplicate = false;
+                        if (candidateApp != null)
+                        {
+                            foreach (var processedApp in foundAppObjects)
+                            {
+                                if (AreComObjectsEqual((object)candidateApp, processedApp))
+                                {
+                                    isDuplicate = true;
+                                    break;
+                                }
+                            }
+
+                            if (!isDuplicate)
+                            {
+                                foundAppObjects.Add(candidateApp);
+                                keepAlive = true;
+                            }
+                        }
+
+                        if (candidateApp != null && !isDuplicate)
+                        {
+                            int currentPriority = 0;
+                            bool isTarget = false;
+
+                            if (targetApp != null && AreComObjectsEqual((object)candidateApp, targetApp))
+                            {
+                                isTarget = true;
+                            }
+
+                            try
+                            {
+                                try
+                                {
+                                    activePres = candidateApp.ActivePresentation;
+                                }
+                                catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+
+                                if (activePres != null)
+                                {
+                                    currentPriority = 1;
+
+                                    try
+                                    {
+                                        ssWindow = activePres.SlideShowWindow;
+                                    }
+                                    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+
+                                    if (ssWindow != null)
+                                    {
+                                        currentPriority = 2;
+
+                                        try
+                                        {
+                                            bool isActive = false;
+                                            try
+                                            {
+                                                object val = ssWindow.Active;
+                                                if (val is int && (int)val == -1) isActive = true;
+                                                else if (val is bool && (bool)val == true) isActive = true;
+                                            }
+                                            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+
+                                            if (isActive)
+                                            {
+                                                currentPriority = 3;
+                                            }
+                                            else
+                                            {
+                                                if (IsSlideShowWindowActive(ssWindow))
+                                                {
+                                                    currentPriority = 3;
+                                                }
+                                            }
+                                        }
+                                        catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+                                    }
+                                }
+                            }
+                            catch (Exception ex)
+                            {
+                                LogHelper.WriteLogToFile($"计算优先级时出错: {ex.Message}", LogHelper.LogType.Warning);
+                            }
+
+                            if (isTarget)
+                            {
+                                targetPriority = currentPriority;
+                            }
+
+                            if (currentPriority > 0)
+                            {
+                                if (currentPriority > highestPriority)
+                                {
+                                    highestPriority = currentPriority;
+                                    SafeReleaseComObject(bestApp);
+                                    bestApp = candidateApp;
+                                    candidateApp = null;
+                                }
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"ROT 枚举循环中出错: {ex.Message}", LogHelper.LogType.Warning);
+                    }
+                    finally
+                    {
+                        SafeReleaseComObject(ssWindow);
+                        SafeReleaseComObject(activePres);
+
+                        if (!keepAlive)
+                        {
+                            SafeReleaseComObject(candidateApp);
+                        }
+
+                        CleanUpLoopObjects(bindCtx, moniker[0], comObject);
+                    }
+                }
+
+                bestPriority = highestPriority;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"ROT 扫描关键错误: {ex}", LogHelper.LogType.Error);
+            }
+            finally
+            {
+                if (foundAppObjects != null)
+                {
+                    foreach (var cachedApp in foundAppObjects)
+                    {
+                        if (bestApp != null && ReferenceEquals(cachedApp, bestApp))
+                            continue;
+
+                        SafeReleaseComObject(cachedApp);
+                    }
+                    foundAppObjects.Clear();
+                }
+
+                if (enumMoniker != null) Marshal.ReleaseComObject(enumMoniker);
+                if (rot != null) Marshal.ReleaseComObject(rot);
+            }
+
+            return bestApp;
+        }
+
+        public static bool AreComObjectsEqual(object o1, object o2)
+        {
+            if (o1 == null || o2 == null) return false;
+            if (ReferenceEquals(o1, o2)) return true;
+
+            IntPtr pUnk1 = IntPtr.Zero;
+            IntPtr pUnk2 = IntPtr.Zero;
+            try
+            {
+                pUnk1 = Marshal.GetIUnknownForObject(o1);
+                pUnk2 = Marshal.GetIUnknownForObject(o2);
+                return pUnk1 == pUnk2;
+            }
+            catch { return false; }
+            finally
+            {
+                if (pUnk1 != IntPtr.Zero) Marshal.Release(pUnk1);
+                if (pUnk2 != IntPtr.Zero) Marshal.Release(pUnk2);
+            }
+        }
+
+        private static bool LooksLikePresentationFile(string displayName)
+        {
+            if (string.IsNullOrEmpty(displayName))
+                return false;
+
+            string lower = displayName.ToLowerInvariant();
+            foreach (var ext in PptLikeExtensions)
+            {
+                if (lower.Contains(ext))
+                    return true;
+            }
+            return false;
+        }
+
+        public static bool IsSlideShowWindowActive(object sswObj)
+        {
+            try
+            {
+                dynamic ssw = sswObj;
+
+                IntPtr foregroundHwnd = GetForegroundWindow();
+                if (foregroundHwnd == IntPtr.Zero) return false;
+
+                uint fgPid;
+                GetWindowThreadProcessId(foregroundHwnd, out fgPid);
+
+                IntPtr sswHwnd = IntPtr.Zero;
+                try
+                {
+                    sswHwnd = GetPptHwndFromSlideShowWindow(sswObj);
+                }
+                catch { return false; }
+                if (sswHwnd == IntPtr.Zero) return false;
+
+                uint sswPid;
+                GetWindowThreadProcessId(sswHwnd, out sswPid);
+
+                if (fgPid == sswPid) return true;
+
+                try
+                {
+                    using (Process fgProc = Process.GetProcessById((int)fgPid))
+                    using (Process appProc = Process.GetProcessById((int)sswPid))
+                    {
+                        string fgName = fgProc.ProcessName.ToLower();
+                        string appName = appProc.ProcessName.ToLower();
+
+                        if (fgName.StartsWith("wps") && appName.StartsWith("wpp"))
+                        {
+                            return true;
+                        }
+                    }
+                }
+                catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+
+                return false;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        private static IntPtr GetPptHwndFromSlideShowWindow(object pptSlideShowWindowObj)
+        {
+            IntPtr hwnd = IntPtr.Zero;
+            if (pptSlideShowWindowObj == null) return IntPtr.Zero;
+
+            try
+            {
+                Microsoft.Office.Interop.PowerPoint.SlideShowWindow slideWindow = (Microsoft.Office.Interop.PowerPoint.SlideShowWindow)pptSlideShowWindowObj;
+
+                int hwndVal = slideWindow.HWND;
+
+                hwnd = new IntPtr(hwndVal);
+            }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+
+            return hwnd;
+        }
+
+        public static void SafeReleaseComObject(object comObj)
+        {
+            if (comObj == null) return;
+
+            if (Marshal.IsComObject(comObj))
+            {
+                try
+                {
+                    Marshal.ReleaseComObject(comObj);
+                }
+                catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+            }
+        }
+
+        private static void CleanUpLoopObjects(IBindCtx bindCtx, IMoniker moniker, object comObject)
+        {
+            if (comObject != null && Marshal.IsComObject(comObject))
+                Marshal.ReleaseComObject(comObject);
+            if (moniker != null)
+                Marshal.ReleaseComObject(moniker);
+            if (bindCtx != null)
+                Marshal.ReleaseComObject(bindCtx);
+        }
+
+        public static int GetSlideShowWindowsCount(Microsoft.Office.Interop.PowerPoint.Application pptApp)
+        {
+            try
+            {
+                if (pptApp == null) return 0;
+                return pptApp.SlideShowWindows.Count;
+            }
+            catch
+            {
+                return 0;
+            }
+        }
+
+        public static bool IsValidSlideShowWindow(object pptSlideShowWindow)
+        {
+            if (pptSlideShowWindow == null) return false;
+
+            try
+            {
+                dynamic ssw = pptSlideShowWindow;
+                var _ = ssw.Active;
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+        #endregion
+    }
+}

Ink Canvas/Helpers/PPTUIManager.cs

@@ -23,6 +23,10 @@ namespace Ink_Canvas.Helpers
         public int PPTRBButtonPosition { get; set; } = 0;
         public bool EnablePPTButtonPageClickable { get; set; } = true;
         public bool EnablePPTButtonLongPressPageTurn { get; set; } = true;
+        public double PPTLSButtonOpacity { get; set; } = 0.5;
+        public double PPTRSButtonOpacity { get; set; } = 0.5;
+        public double PPTLBButtonOpacity { get; set; } = 0.5;
+        public double PPTRBButtonOpacity { get; set; } = 0.5;
         #endregion
 
         #region Private Fields
@@ -97,6 +101,8 @@ namespace Ink_Canvas.Helpers
 
                         UpdateNavigationPanelsVisibility();
                         UpdateNavigationButtonStyles();
+                        _mainWindow.UpdatePPTTimeCapsuleVisibility();
+                        _mainWindow.UpdatePPTQuickPanelVisibility();
                         if (MainWindow.Settings.Advanced.IsEnableAvoidFullScreenHelper)
                         {
                             // 设置为画板模式，允许全屏操作
@@ -107,6 +113,8 @@ namespace Ink_Canvas.Helpers
                                     System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width,
                                     System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height, true);
                             }), DispatcherPriority.ApplicationIdle);
+
+                            _mainWindow.isFullScreenApplied = true; // 标记已应用全屏处理
                         }
                     }
                     else
@@ -114,6 +122,8 @@ namespace Ink_Canvas.Helpers
                         _mainWindow.BtnPPTSlideShow.Visibility = Visibility.Visible;
                         _mainWindow.BtnPPTSlideShowEnd.Visibility = Visibility.Collapsed;
                         HideAllNavigationPanels();
+                        _mainWindow.UpdatePPTTimeCapsuleVisibility();
+                        _mainWindow.UpdatePPTQuickPanelVisibility();
                         if (MainWindow.Settings.Advanced.IsEnableAvoidFullScreenHelper)
                         {
                             // 恢复为非画板模式，重新启用全屏限制
@@ -127,6 +137,8 @@ namespace Ink_Canvas.Helpers
                                     workingArea.X, workingArea.Y,
                                     workingArea.Width, workingArea.Height, true);
                             }), DispatcherPriority.ApplicationIdle);
+
+                            _mainWindow.isFullScreenApplied = false; // 标记全屏处理已还原
                         }
                     }
                 }
@@ -377,10 +389,9 @@ namespace Ink_Canvas.Helpers
                 _mainWindow.PPTLSPageButton.Visibility = pageButtonVisibility;
                 _mainWindow.PPTRSPageButton.Visibility = pageButtonVisibility;
 
-                // 透明度设置
-                var opacity = options[1] == '2' ? 0.5 : 1.0;
-                _mainWindow.PPTBtnLSBorder.Opacity = opacity;
-                _mainWindow.PPTBtnRSBorder.Opacity = opacity;
+                // 透明度设置 - 直接使用用户设置的透明度值
+                _mainWindow.PPTBtnLSBorder.Opacity = PPTLSButtonOpacity;
+                _mainWindow.PPTBtnRSBorder.Opacity = PPTRSButtonOpacity;
 
                 // 颜色主题
                 bool isDarkTheme = options[2] == '2';
@@ -406,10 +417,9 @@ namespace Ink_Canvas.Helpers
                 _mainWindow.PPTLBPageButton.Visibility = pageButtonVisibility;
                 _mainWindow.PPTRBPageButton.Visibility = pageButtonVisibility;
 
-                // 透明度设置
-                var opacity = options[1] == '2' ? 0.5 : 1.0;
-                _mainWindow.PPTBtnLBBorder.Opacity = opacity;
-                _mainWindow.PPTBtnRBBorder.Opacity = opacity;
+                // 透明度设置 - 直接使用用户设置的透明度值
+                _mainWindow.PPTBtnLBBorder.Opacity = PPTLBButtonOpacity;
+                _mainWindow.PPTBtnRBBorder.Opacity = PPTRBButtonOpacity;
 
                 // 颜色主题
                 bool isDarkTheme = options[2] == '2';

Ink Canvas/Helpers/Plugins/BuiltIn/SuperLauncher/LauncherButton.cs

@@ -1,4 +1,4 @@
-using iNKORE.UI.WPF.Modern.Controls;
+using iNKORE.UI.WPF.Controls;
 using System;
 using System.Windows;
 using System.Windows.Controls;

Ink Canvas/Helpers/Plugins/BuiltIn/SuperLauncher/LauncherWindow.xaml.cs

@@ -207,7 +207,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                     {
                         Dispatcher.BeginInvoke(new Action(() =>
                         {
-                            try { Close(); } catch { }
+                            try { Close(); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
 
                             // 启动应用程序任务
                             launchTask.Start();
@@ -224,7 +224,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
             catch (Exception ex)
             {
                 LogHelper.WriteLogToFile($"应用按钮点击事件出错: {ex.Message}", LogHelper.LogType.Error);
-                try { IsClosing = true; Close(); } catch { }
+                try { IsClosing = true; Close(); } catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
             }
         }
 

Ink Canvas/Helpers/ProcessProtectionManager.cs

@@ -0,0 +1,561 @@
+using Microsoft.Win32.SafeHandles;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+namespace Ink_Canvas.Helpers
+{
+    internal static class ProcessProtectionManager
+    {
+        private static readonly object _lock = new object();
+        private static readonly Dictionary<string, FileStream> _lockedFiles = new Dictionary<string, FileStream>(StringComparer.OrdinalIgnoreCase);
+        private static readonly Dictionary<string, SafeFileHandle> _lockedDirs = new Dictionary<string, SafeFileHandle>(StringComparer.OrdinalIgnoreCase);
+        private static bool _enabled;
+        private static int _writeGate;
+        private static readonly string[] _excludedSubDirectories = new[]
+        {
+            "Configs",
+            "Saves",
+            "Backups",
+            "Logs",
+            "AutoUpdate"
+        };
+
+        public static bool Enabled
+        {
+            get { lock (_lock) return _enabled; }
+        }
+
+        /// <summary>
+        /// 从应用设置读取 EnableProcessProtection 并相应地启用或禁用进程保护。
+        /// </summary>
+        public static void ApplyFromSettings()
+        {
+            try
+            {
+                var settings = MainWindow.Settings;
+                var enabled = settings?.Security != null && settings.Security.EnableProcessProtection;
+                SetEnabled(enabled);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"ProcessProtectionManager.ApplyFromSettings 失败: {ex.Message}", LogHelper.LogType.Warning);
+            }
+        }
+
+        /// <summary>
+        /// 切换进程保护的启用状态；在状态发生变化时触发相应的启用或禁用操作并保证线程安全。
+        /// </summary>
+        /// <param name="enabled">为 `true` 时启用进程保护，为 `false` 时禁用进程保护。</param>
+        public static void SetEnabled(bool enabled)
+        {
+            lock (_lock)
+            {
+                if (_enabled == enabled) return;
+                _enabled = enabled;
+            }
+
+            ThreadPool.QueueUserWorkItem(_ =>
+            {
+                try
+                {
+                    if (enabled) Enable();
+                    else Disable();
+                }
+                catch (Exception ex)
+                {
+                    try
+                    {
+                        LogHelper.WriteLogToFile($"ProcessProtectionManager.SetEnabled 后台执行失败: {ex.Message}", LogHelper.LogType.Warning);
+                    }
+                    catch { }
+                }
+            });
+        }
+
+        /// <summary>
+        /// 在受进程保护的上下文中执行对指定目标的写入操作；在执行时会在必要情况下临时释放针对目标路径及其父目录的锁，执行完成后恢复这些锁。
+        /// </summary>
+        /// <param name="targetPath">目标文件或目录的路径，用于确定需要临时释放和随后恢复的锁。</param>
+        /// <param name="action">执行写入的操作委托，不能为空。</param>
+        /// <remarks>
+        /// 如果 ProcessProtectionManager.Enabled 为 false，会直接执行 <paramref name="action"/>；
+        /// 若在有限时间内无法获取写入门闩，会记录警告并降级为直接执行 <paramref name="action"/>。方法在内部处理异常，不会抛出异常给调用者。
+        /// </remarks>
+        public static void WithWriteAccess(string targetPath, Action action)
+        {
+            if (action == null) return;
+
+            if (!Enabled)
+            {
+                action();
+                return;
+            }
+
+            const int gateTimeoutMs = 10_000;
+            if (!TryEnterWriteGate(gateTimeoutMs))
+            {
+                try
+                {
+                    LogHelper.WriteLogToFile($"ProcessProtectionManager.WithWriteAccess: 获取写入门闩超时({gateTimeoutMs}ms)，将降级释放目标路径锁后执行写入。目标: {targetPath}",
+                        LogHelper.LogType.Warning);
+                }
+                catch (Exception ex)
+                {
+                    System.Diagnostics.Debug.WriteLine($"[ProcessProtectionManager] 写日志失败: {ex.Message}");
+                }
+
+                var normPath = NormalizePath(targetPath);
+                var dirsChain = GetDirChainToRoot(normPath);
+                Dictionary<string, SafeFileHandle> fallbackDirs = null;
+                Dictionary<string, FileStream> fallbackFiles = null;
+
+                try
+                {
+                    lock (_lock)
+                    {
+                        fallbackDirs = new Dictionary<string, SafeFileHandle>(StringComparer.OrdinalIgnoreCase);
+                        fallbackFiles = new Dictionary<string, FileStream>(StringComparer.OrdinalIgnoreCase);
+
+                        foreach (var dir in dirsChain)
+                        {
+                            if (_lockedDirs.TryGetValue(dir, out var handle))
+                            {
+                                _lockedDirs.Remove(dir);
+                                fallbackDirs[dir] = handle;
+                            }
+                        }
+
+                        if (!string.IsNullOrWhiteSpace(normPath) && File.Exists(normPath) && _lockedFiles.TryGetValue(normPath, out var fs))
+                        {
+                            _lockedFiles.Remove(normPath);
+                            fallbackFiles[normPath] = fs;
+                        }
+                    }
+
+                    if (fallbackFiles != null)
+                    {
+                        foreach (var kv in fallbackFiles)
+                        {
+                            try { kv.Value.Dispose(); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+                        }
+                    }
+                    if (fallbackDirs != null)
+                    {
+                        foreach (var kv in fallbackDirs)
+                        {
+                            try { kv.Value.Dispose(); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+                        }
+                    }
+
+                    action();
+                }
+                finally
+                {
+                    try
+                    {
+                        if (Enabled)
+                        {
+                            Enable(rescanRoot: false, rescanDirs: dirsChain);
+                        }
+                    }
+                    catch { }
+                }
+                return;
+            }
+
+            var normalized = NormalizePath(targetPath);
+            var dirsToToggle = GetDirChainToRoot(normalized);
+
+            Dictionary<string, SafeFileHandle> releasedDirs = null;
+            Dictionary<string, FileStream> releasedFiles = null;
+
+            try
+            {
+                lock (_lock)
+                {
+                    releasedDirs = new Dictionary<string, SafeFileHandle>(StringComparer.OrdinalIgnoreCase);
+                    releasedFiles = new Dictionary<string, FileStream>(StringComparer.OrdinalIgnoreCase);
+
+                    foreach (var dir in dirsToToggle)
+                    {
+                        if (_lockedDirs.TryGetValue(dir, out var handle))
+                        {
+                            _lockedDirs.Remove(dir);
+                            releasedDirs[dir] = handle;
+                        }
+                    }
+
+                    if (!string.IsNullOrWhiteSpace(normalized) && File.Exists(normalized) && _lockedFiles.TryGetValue(normalized, out var fs))
+                    {
+                        _lockedFiles.Remove(normalized);
+                        releasedFiles[normalized] = fs;
+                    }
+                }
+
+                if (releasedFiles != null)
+                {
+                    foreach (var kv in releasedFiles)
+                    {
+                        try { kv.Value.Dispose(); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+                    }
+                }
+                if (releasedDirs != null)
+                {
+                    foreach (var kv in releasedDirs)
+                    {
+                        try { kv.Value.Dispose(); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+                    }
+                }
+
+                action();
+            }
+            finally
+            {
+                try
+                {
+                    if (Enabled)
+                    {
+                        Enable(rescanRoot: false, rescanDirs: dirsToToggle);
+                    }
+                }
+                catch
+                {
+                }
+
+                Interlocked.Exchange(ref _writeGate, 0);
+            }
+        }
+
+        /// <summary>
+        /// 尝试在指定的毫秒数内获取写入门控（write gate）。
+        /// </summary>
+        /// <param name="timeoutMs">等待超时时间（毫秒）。小于或等于 0 时视为 1 毫秒。</param>
+        /// <returns>`true` 如果在指定时间内成功获取到写入门控，`false` 否则。</returns>
+        private static bool TryEnterWriteGate(int timeoutMs)
+        {
+            if (timeoutMs <= 0) timeoutMs = 1;
+
+            var start = Environment.TickCount;
+            while (Interlocked.CompareExchange(ref _writeGate, 1, 0) != 0)
+            {
+                var elapsed = unchecked(Environment.TickCount - start);
+                if (elapsed >= timeoutMs) return false;
+
+                if (elapsed < 2000) Thread.Sleep(10);
+                else Thread.Sleep(50);
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// 启用进程保护并对应用根路径进行完整重扫描以锁定需要保护的目录和文件。
+        /// </summary>
+        private static void Enable()
+        {
+            Enable(rescanRoot: true, rescanDirs: null);
+        }
+
+        /// <summary>
+        /// 在应用根目录或提供的路径集合上建立目录句柄和文件读取锁以启用进程保护。
+        /// </summary>
+        /// <param name="rescanRoot">为 true 时对 App.RootPath 进行递归扫描并锁定其下的目录与文件；为 false 时仅处理 <paramref name="rescanDirs"/> 指定的路径（若为 null 则不处理）。</param>
+        /// <param name="rescanDirs">当 <paramref name="rescanRoot"/> 为 false 时，按项对存在的目录建立目录锁，对存在的文件建立文件锁；可为 null。</param>
+        private static void Enable(bool rescanRoot, IEnumerable<string> rescanDirs)
+        {
+            try
+            {
+                var root = App.RootPath;
+                if (string.IsNullOrWhiteSpace(root) || !Directory.Exists(root)) return;
+                root = NormalizePath(root);
+
+                if (rescanRoot)
+                {
+                    LockDirectoryRecursive(root);
+                }
+                else if (rescanDirs != null)
+                {
+                    foreach (var d in rescanDirs)
+                    {
+                        if (Directory.Exists(d))
+                        {
+                            LockDirectory(d);
+                        }
+                    }
+                }
+
+                if (rescanRoot)
+                {
+                    LockFilesRecursive(root);
+                }
+                else if (rescanDirs != null)
+                {
+                    foreach (var d in rescanDirs)
+                    {
+                        if (Directory.Exists(d))
+                        {
+                            LockFilesRecursive(d);
+                        }
+                        else if (File.Exists(d))
+                        {
+                            LockFile(d);
+                        }
+                    }
+                }
+            }
+            catch
+            {
+            }
+        }
+
+        /// <summary>
+        /// 释放并清除当前进程持有的所有文件和目录锁定句柄与流资源。
+        /// </summary>
+        /// <remarks>
+        /// 在内部同步锁定下逐一 Dispose 已记录的 FileStream 和 SafeFileHandle，并清空对应的缓存字典；
+        /// 释放过程中发生的异常会被忽略（吞掉）。
+        /// </remarks>
+        private static void Disable()
+        {
+            lock (_lock)
+            {
+                foreach (var kv in _lockedFiles)
+                {
+                    try { kv.Value.Dispose(); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+                }
+                _lockedFiles.Clear();
+
+                foreach (var kv in _lockedDirs)
+                {
+                    try { kv.Value.Dispose(); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+                }
+                _lockedDirs.Clear();
+            }
+        }
+
+        /// <summary>
+        /// 递归地尝试为指定目录及其所有子目录建立并保持目录句柄锁定，跳过配置的排除目录。
+        /// </summary>
+        /// <param name="root">起始目录的路径；从此路径开始遍历并对符合条件的子目录尝试建立锁定。</param>
+        /// <remarks>遇到的异常会被捕获并忽略，不会向调用方抛出。</remarks>
+        private static void LockDirectoryRecursive(string root)
+        {
+            try
+            {
+                if (!IsExcludedPath(root))
+                {
+                    LockDirectory(root);
+                }
+                foreach (var dir in Directory.GetDirectories(root, "*", SearchOption.AllDirectories))
+                {
+                    if (!IsExcludedPath(dir))
+                    {
+                        LockDirectory(dir);
+                    }
+                }
+            }
+            catch
+            {
+            }
+        }
+
+        /// <summary>
+        /// 递归扫描指定根目录下的所有文件，并为具有特定扩展名的文件建立读取锁定以防止被进程修改或替换。
+        /// </summary>
+        /// <param name="root">要开始扫描的根目录路径。</param>
+        /// <remarks>
+        /// 仅处理扩展名为 `.exe`, `.dll`, `.config`, `.manifest`, `.dat`, `.enc` 的文件，以及应用根目录下的点名名单 `Names.txt`；
+        /// 会跳过被 IsExcludedPath 判定为排除的路径。遇到任何 I/O 或访问错误时会静默忽略，不会抛出异常。</remarks>
+        private static void LockFilesRecursive(string root)
+        {
+            try
+            {
+                var rollCallNamesPath = NormalizePath(Path.Combine(root, "Names.txt"));
+                foreach (var file in Directory.GetFiles(root, "*", SearchOption.AllDirectories))
+                {
+                    if (!IsExcludedPath(file))
+                    {
+                        var ext = Path.GetExtension(file);
+                        var normFile = NormalizePath(file);
+                        if (string.Equals(normFile, rollCallNamesPath, StringComparison.OrdinalIgnoreCase) ||
+                            string.Equals(ext, ".exe", StringComparison.OrdinalIgnoreCase) ||
+                            string.Equals(ext, ".dll", StringComparison.OrdinalIgnoreCase) ||
+                            string.Equals(ext, ".config", StringComparison.OrdinalIgnoreCase) ||
+                            string.Equals(ext, ".manifest", StringComparison.OrdinalIgnoreCase) ||
+                            string.Equals(ext, ".dat", StringComparison.OrdinalIgnoreCase) ||
+                            string.Equals(ext, ".enc", StringComparison.OrdinalIgnoreCase))
+                        {
+                            LockFile(file);
+                        }
+                    }
+                }
+            }
+            catch
+            {
+            }
+        }
+
+        /// <summary>
+        /// 以只读方式打开并保留指定文件的句柄，将其加入内部锁定缓存以减少该文件被外部修改或删除的可能性。
+        /// </summary>
+        /// <param name="filePath">要锁定的文件的路径（会被规范化为完整路径）。</param>
+        private static void LockFile(string filePath)
+        {
+            filePath = NormalizePath(filePath);
+            lock (_lock)
+            {
+                if (_lockedFiles.ContainsKey(filePath)) return;
+                try
+                {
+                    var fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
+                    _lockedFiles[filePath] = fs;
+                }
+                catch
+                {
+                }
+            }
+        }
+
+        /// <summary>
+        /// 尝试为指定目录获取一个用于保持目录打开的句柄并将其保存为内部锁定记录；若目录已被记录则不作任何操作，发生错误时静默忽略。
+        /// </summary>
+        /// <param name="dirPath">要锁定的目录路径；调用时会对路径进行规范化（转换为完整路径并移除多余分隔符）。</param>
+        private static void LockDirectory(string dirPath)
+        {
+            dirPath = NormalizePath(dirPath);
+            lock (_lock)
+            {
+                if (_lockedDirs.ContainsKey(dirPath)) return;
+                try
+                {
+                    var handle = CreateDirectoryHandle(dirPath);
+                    if (handle != null && !handle.IsInvalid)
+                    {
+                        _lockedDirs[dirPath] = handle;
+                    }
+                }
+                catch
+                {
+                }
+            }
+        }
+
+        /// <summary>
+        /// 将路径标准化为不含末尾路径分隔符的绝对路径。
+        /// </summary>
+        /// <param name="p">要规范化的路径；如果为 null、空或仅空白，则返回原值。</param>
+        /// <returns>规范化后的路径：在解析成功时返回去除末尾分隔符的绝对路径；在解析失败时返回原始输入。</returns>
+        private static string NormalizePath(string p)
+        {
+            try
+            {
+                if (string.IsNullOrWhiteSpace(p)) return p;
+                return Path.GetFullPath(p.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar));
+            }
+            catch
+            {
+                return p;
+            }
+        }
+
+        /// <summary>
+        /// 构建从指定路径向上直到应用根目录（App.RootPath）的目录链，并按从下到上的顺序返回已规范化的目录路径。
+        /// </summary>
+        /// <param name="path">起始路径，既可为文件路径也可为目录路径；若为文件则使用其所在目录作为起点。</param>
+        /// <returns>包含起始目录及其各级父目录直到并包含应用根目录的列表；当根路径无效或未能匹配到根目录时返回空列表。</returns>
+        private static List<string> GetDirChainToRoot(string path)
+        {
+            var list = new List<string>();
+            try
+            {
+                var root = NormalizePath(App.RootPath);
+                if (string.IsNullOrWhiteSpace(root)) return list;
+
+                string dir = Directory.Exists(path) ? NormalizePath(path) : NormalizePath(Path.GetDirectoryName(path));
+                while (!string.IsNullOrWhiteSpace(dir))
+                {
+                    if (!dir.StartsWith(root, StringComparison.OrdinalIgnoreCase)) break;
+                    list.Add(dir);
+                    if (string.Equals(dir, root, StringComparison.OrdinalIgnoreCase)) break;
+                    dir = NormalizePath(Path.GetDirectoryName(dir));
+                }
+            }
+            catch
+            {
+            }
+            return list;
+        }
+
+        /// <summary>
+        /// 检查给定路径是否位于应用根目录下的受排除子目录之一。
+        /// </summary>
+        /// <param name="path">要检查的文件或目录路径。</param>
+        /// <returns>`true` 如果路径位于任何配置为排除的子目录下，`false` 否则。</returns>
+        private static bool IsExcludedPath(string path)
+        {
+            try
+            {
+                var root = NormalizePath(App.RootPath);
+                if (string.IsNullOrWhiteSpace(root)) return false;
+                path = NormalizePath(path);
+                foreach (var name in _excludedSubDirectories)
+                {
+                    var prefix = Path.Combine(root, name);
+                    if (path.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return true;
+                    }
+                }
+            }
+            catch
+            {
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 为指定目录打开一个文件句柄，便于对该目录进行锁定或访问其元数据。
+        /// </summary>
+        /// <param name="dirPath">目标目录的完整路径。</param>
+        /// <returns>表示已打开目录的 <see cref="SafeFileHandle"/>；若无法打开则返回无效的句柄，调用方应检查句柄有效性。</returns>
+        private static SafeFileHandle CreateDirectoryHandle(string dirPath)
+        {
+            const uint GENERIC_READ = 0x80000000;
+            const uint FILE_SHARE_READ = 0x00000001;
+            const uint OPEN_EXISTING = 3;
+            const uint FILE_FLAG_BACKUP_SEMANTICS = 0x02000000;
+
+            return CreateFile(
+                dirPath,
+                GENERIC_READ,
+                FILE_SHARE_READ,
+                IntPtr.Zero,
+                OPEN_EXISTING,
+                FILE_FLAG_BACKUP_SEMANTICS,
+                IntPtr.Zero);
+        }
+
+        /// <summary>
+        /// 使用原生 CreateFile API 打开或创建一个文件/目录并返回底层句柄的包装函数声明。
+        /// </summary>
+        /// <param name="lpFileName">要打开或创建的文件或目录的完整路径（UTF-16 编码）。</param>
+        /// <param name="dwDesiredAccess">请求的访问权限位掩码（例如读取或写入访问）。</param>
+        /// <param name="dwShareMode">共享模式位掩码，指定其他进程可以如何共享此文件句柄。</param>
+        /// <param name="lpSecurityAttributes">指向安全属性结构的指针，或为 <see cref="IntPtr.Zero"/> 表示默认安全性。</param>
+        /// <param name="dwCreationDisposition">指定如何处理已存在或不存在的文件（例如打开、创建或截断）。</param>
+        /// <param name="dwFlagsAndAttributes">文件属性和标志位，用于控制文件或目录的特殊行为（例如备份语义）。</param>
+        /// <param name="hTemplateFile">用于创建新文件时的模板句柄，通常为 <see cref="IntPtr.Zero"/>。</param>
+        /// <returns>表示文件或目录句柄的 <see cref="Microsoft.Win32.SafeHandles.SafeFileHandle"/>；调用失败时返回无效的句柄（可通过检查句柄或调用 <see cref="System.Runtime.InteropServices.Marshal.GetLastWin32Error"/> 获取错误码）。</returns>
+        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        private static extern SafeFileHandle CreateFile(
+            string lpFileName,
+            uint dwDesiredAccess,
+            uint dwShareMode,
+            IntPtr lpSecurityAttributes,
+            uint dwCreationDisposition,
+            uint dwFlagsAndAttributes,
+            IntPtr hTemplateFile);
+    }
+}

Ink Canvas/Helpers/SafeZipExtractor.cs

@@ -0,0 +1,75 @@
+using System;
+using System.IO;
+using System.IO.Compression;
+
+namespace Ink_Canvas.Helpers
+{
+    public static class SafeZipExtractor
+    {
+        /// <param name="zipFilePath">ZIP 文件路径</param>
+        /// <param name="extractPath">解压目标目录</param>
+        /// <param name="overwrite">是否覆盖已存在文件</param>
+        public static void ExtractZipSafely(string zipFilePath, string extractPath, bool overwrite = true)
+        {
+            if (string.IsNullOrWhiteSpace(zipFilePath))
+                throw new ArgumentNullException(nameof(zipFilePath));
+            if (string.IsNullOrWhiteSpace(extractPath))
+                throw new ArgumentNullException(nameof(extractPath));
+
+            var fullExtractPath = Path.GetFullPath(extractPath);
+            Directory.CreateDirectory(fullExtractPath);
+
+            using (var zip = ZipFile.OpenRead(zipFilePath))
+            {
+                foreach (var entry in zip.Entries)
+                {
+                    // 跳过空条目
+                    if (string.IsNullOrEmpty(entry.FullName))
+                        continue;
+
+                    // 防止绝对路径和盘符前缀
+                    if (Path.IsPathRooted(entry.FullName))
+                        continue;
+
+                    // 统一路径分隔符
+                    var normalized = entry.FullName.Replace('/', Path.DirectorySeparatorChar);
+
+                    // 拒绝包含 .. 的路径，防止目录穿越
+                    if (normalized.Contains(".." + Path.DirectorySeparatorChar) ||
+                        normalized.StartsWith(".." + Path.DirectorySeparatorChar, StringComparison.Ordinal))
+                    {
+                        continue;
+                    }
+
+                    var destinationPath = Path.GetFullPath(
+                        Path.Combine(fullExtractPath, normalized));
+
+                    // 再次确认仍然在目标目录下
+                    if (!destinationPath.StartsWith(fullExtractPath, StringComparison.OrdinalIgnoreCase))
+                        continue;
+
+                    // 目录条目
+                    if (entry.FullName.EndsWith("/", StringComparison.Ordinal) ||
+                        entry.FullName.EndsWith("\\", StringComparison.Ordinal))
+                    {
+                        Directory.CreateDirectory(destinationPath);
+                        continue;
+                    }
+
+                    Directory.CreateDirectory(Path.GetDirectoryName(destinationPath) ?? fullExtractPath);
+
+                    if (!overwrite && File.Exists(destinationPath))
+                        continue;
+
+                    using (var input = entry.Open())
+                    using (var output = File.Create(destinationPath))
+                    {
+                        input.CopyTo(output);
+                    }
+                }
+            }
+        }
+    }
+}
+
+

Ink Canvas/Helpers/SecurityManager.cs

@@ -0,0 +1,330 @@
+using iNKORE.UI.WPF.Controls;
+using iNKORE.UI.WPF.Modern.Controls;
+using System;
+using System.Security.Cryptography;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using MessageBox = iNKORE.UI.WPF.Modern.Controls.MessageBox;
+
+namespace Ink_Canvas.Helpers
+{
+    internal static class SecurityManager
+    {
+        private const int Pbkdf2Iterations = 120_000;
+        private const int SaltSizeBytes = 16;
+        private const int HashSizeBytes = 32;
+
+        /// <summary>
+        /// 检查设置中是否启用了密码安全功能。
+        /// </summary>
+        /// <param name="settings">应用程序设置对象（可能为 null）。</param>
+        /// <returns>`true` 当 settings 非 null 且其 Security 部分存在且已启用密码功能；`false` 否则。</returns>
+        public static bool IsPasswordFeatureEnabled(Settings settings)
+        => settings?.Security != null && settings.Security.PasswordEnabled;
+
+        /// <summary>
+        /// 确定给定设置中是否已配置密码（存在非空的密码盐和密码哈希）。
+        /// </summary>
+        /// <param name="settings">应用的设置；为 null 或未包含 Security 部分时视为未配置密码。</param>
+        /// <returns>`true` 如果设置包含非空的 PasswordSalt 和 PasswordHash，否则 `false`。</returns>
+        public static bool HasPasswordConfigured(Settings settings)
+            => settings?.Security != null
+                && !string.IsNullOrWhiteSpace(settings.Security.PasswordSalt)
+                && !string.IsNullOrWhiteSpace(settings.Security.PasswordHash);
+
+        /// <summary>
+        /// 确定在退出应用时是否需要输入密码。
+        /// </summary>
+        /// <param name="settings">应用配置；如果为 null，则视为未启用或未配置密码。</param>
+        /// <returns>`true` 当密码功能已启用、已配置密码且设置要求在退出时需要密码，`false` 否则。</returns>
+        public static bool IsPasswordRequiredForExit(Settings settings)
+            => IsPasswordFeatureEnabled(settings) && HasPasswordConfigured(settings) && settings.Security.RequirePasswordOnExit;
+
+        /// <summary>
+        /// 确定在进入设置界面时是否需要输入密码。
+        /// </summary>
+        /// <param name="settings">应用配置；为 null 或未启用密码功能时视为未配置密码。</param>
+        /// <returns>`true` 如果已启用密码功能、已配置密码且已设置为在进入设置时要求密码，`false` 否则。</returns>
+        public static bool IsPasswordRequiredForEnterSettings(Settings settings)
+            => IsPasswordFeatureEnabled(settings) && HasPasswordConfigured(settings) && settings.Security.RequirePasswordOnEnterSettings;
+
+        /// <summary>
+        /// 指示在重置配置时是否需要输入密码。
+        /// </summary>
+        /// <param name="settings">应用设置对象；如果为 null 或未启用密码功能，则视为不需要密码。</param>
+        /// <returns>`true` 如果已启用密码功能、已有配置的密码且设置要求在重置配置时进行密码验证；`false` 否则。</returns>
+        public static bool IsPasswordRequiredForResetConfig(Settings settings)
+            => IsPasswordFeatureEnabled(settings) && HasPasswordConfigured(settings) && settings.Security.RequirePasswordOnResetConfig;
+
+        /// <summary>
+        /// 指示在修改或清空点名名单前是否需要输入安全密码。
+        /// </summary>
+        /// <param name="settings">应用设置对象。</param>
+        /// <returns>当已启用密码功能、已配置密码且开启了对应开关时返回 true；否则返回 false。</returns>
+        public static bool IsPasswordRequiredForModifyOrClearNameList(Settings settings)
+            => IsPasswordFeatureEnabled(settings)
+               && HasPasswordConfigured(settings)
+               && settings.Security.RequirePasswordOnModifyOrClearNameList;
+
+        /// <summary>
+        /// 将提供的明文密码与 Settings 中存储的密码散列进行比对以验证密码是否正确。
+        /// </summary>
+        /// <param name="settings">包含存储的密码盐和哈希的设置对象（使用 Base64 编码的 PasswordSalt 和 PasswordHash）。</param>
+        /// <param name="password">要验证的明文密码。</param>
+        /// <returns>`true` 如果密码与存储的哈希匹配，`false` 否则（包括未配置密码、password 为 null 或在解析/派生过程中发生错误）。</returns>
+        public static bool VerifyPassword(Settings settings, string password)
+        {
+            if (!HasPasswordConfigured(settings)) return false;
+            if (password == null) return false;
+
+            try
+            {
+                var salt = Convert.FromBase64String(settings.Security.PasswordSalt);
+                var expected = Convert.FromBase64String(settings.Security.PasswordHash);
+
+                var actual = DeriveKey(password, salt, expected.Length);
+                return FixedTimeEquals(actual, expected);
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 如果已配置密码，显示一个对话框提示用户输入密码并验证；如果未配置密码则直接允许通过。
+        /// </summary>
+        /// <returns>`true` 如果未配置密码或用户确认并输入了正确的密码，`false` 如果用户取消或验证失败。</returns>
+        public static async Task<bool> PromptAndVerifyAsync(Settings settings, Window owner, string title, string message)
+        {
+            if (!HasPasswordConfigured(settings)) return true;
+
+            var dialog = new ContentDialog
+            {
+                Title = title,
+                PrimaryButtonText = "确定",
+                SecondaryButtonText = "取消"
+            };
+
+            var panel = new SimpleStackPanel
+            {
+                Spacing = 12,
+                Margin = new Thickness(0, 10, 0, 0)
+            };
+
+            var textBlock = new TextBlock
+            {
+                Text = message,
+                TextWrapping = TextWrapping.Wrap
+            };
+
+            var passwordBox = new PasswordBox
+            {
+                Height = 32
+            };
+
+            panel.Children.Add(textBlock);
+            panel.Children.Add(passwordBox);
+            dialog.Content = panel;
+
+            var result = await dialog.ShowAsync();
+            if (result != ContentDialogResult.Primary) return false;
+
+            return VerifyPassword(settings, passwordBox.Password);
+        }
+
+        /// <summary>
+        /// 显示一个对话框让用户输入并确认新密码，成功时返回该密码。
+        /// </summary>
+        /// <param name="owner">对话框的所属窗口（用于指定父窗口）。</param>
+        /// <returns>用户输入的新密码；如果用户取消或输入无效（长度不足或两次不匹配），则返回 <c>null</c>。</returns>
+        public static async Task<string> PromptSetNewPasswordAsync(Window owner)
+        {
+            var dialog = new ContentDialog
+            {
+                Title = "设置安全密码",
+                PrimaryButtonText = "确定",
+                SecondaryButtonText = "取消"
+            };
+
+            var panel = new SimpleStackPanel
+            {
+                Spacing = 12,
+                Margin = new Thickness(0, 10, 0, 0)
+            };
+
+            var tipText = new TextBlock
+            {
+                Text = "请输入新密码",
+                TextWrapping = TextWrapping.Wrap
+            };
+
+            var newPwdBox = new PasswordBox { Height = 32, Margin = new Thickness(0, 4, 0, 0) };
+            var confirmPwdBox = new PasswordBox { Height = 32, Margin = new Thickness(0, 4, 0, 0) };
+
+            panel.Children.Add(tipText);
+            panel.Children.Add(new TextBlock { Text = "新密码", Margin = new Thickness(0, 4, 0, 0) });
+            panel.Children.Add(newPwdBox);
+            panel.Children.Add(new TextBlock { Text = "确认新密码", Margin = new Thickness(0, 8, 0, 0) });
+            panel.Children.Add(confirmPwdBox);
+            dialog.Content = panel;
+
+            var result = await dialog.ShowAsync();
+            if (result != ContentDialogResult.Primary) return null;
+
+            var pwd = newPwdBox.Password ?? "";
+            var confirm = confirmPwdBox.Password ?? "";
+
+            if (string.IsNullOrWhiteSpace(pwd) || pwd.Length < 4)
+            {
+                MessageBox.Show("密码长度过短。", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
+                return null;
+            }
+            if (!string.Equals(pwd, confirm, StringComparison.Ordinal))
+            {
+                MessageBox.Show("两次输入的密码不一致。", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
+                return null;
+            }
+
+            return pwd;
+        }
+
+        /// <summary>
+        /// 弹出对话框以更改已配置的安全密码；如果尚未配置密码则转而提示设置新密码。
+        /// </summary>
+        /// <param name="settings">应用配置对象，包含当前存储的密码信息。</param>
+        /// <param name="owner">对话框的父窗口（用于定位/所有权）。</param>
+        /// <returns>用户成功更改后返回新的密码字符串；当用户取消、验证失败或校验不通过时返回 <c>null</c>。</returns>
+        public static async Task<string> PromptChangePasswordAsync(Settings settings, Window owner)
+        {
+            if (!HasPasswordConfigured(settings))
+            {
+                return await PromptSetNewPasswordAsync(owner);
+            }
+
+            var dialog = new ContentDialog
+            {
+                Title = "修改安全密码",
+                PrimaryButtonText = "确定",
+                SecondaryButtonText = "取消"
+            };
+
+            var panel = new SimpleStackPanel
+            {
+                Spacing = 12,
+                Margin = new Thickness(0, 10, 0, 0)
+            };
+
+            var tipText = new TextBlock
+            {
+                Text = "请输入当前密码，并设置新密码。",
+                TextWrapping = TextWrapping.Wrap
+            };
+
+            var currentBox = new PasswordBox { Height = 32, Margin = new Thickness(0, 4, 0, 0) };
+            var newPwdBox = new PasswordBox { Height = 32, Margin = new Thickness(0, 4, 0, 0) };
+            var confirmPwdBox = new PasswordBox { Height = 32, Margin = new Thickness(0, 4, 0, 0) };
+
+            panel.Children.Add(tipText);
+            panel.Children.Add(new TextBlock { Text = "当前密码", Margin = new Thickness(0, 4, 0, 0) });
+            panel.Children.Add(currentBox);
+            panel.Children.Add(new TextBlock { Text = "新密码", Margin = new Thickness(0, 8, 0, 0) });
+            panel.Children.Add(newPwdBox);
+            panel.Children.Add(new TextBlock { Text = "确认新密码", Margin = new Thickness(0, 8, 0, 0) });
+            panel.Children.Add(confirmPwdBox);
+            dialog.Content = panel;
+
+            var result = await dialog.ShowAsync();
+            if (result != ContentDialogResult.Primary) return null;
+
+            var current = currentBox.Password ?? "";
+            var newPwd = newPwdBox.Password ?? "";
+            var confirm = confirmPwdBox.Password ?? "";
+
+            if (!VerifyPassword(settings, current))
+            {
+                MessageBox.Show("当前密码错误。", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
+                return null;
+            }
+
+            if (string.IsNullOrWhiteSpace(newPwd) || newPwd.Length < 4)
+            {
+                MessageBox.Show("新密码长度过短。", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
+                return null;
+            }
+            if (!string.Equals(newPwd, confirm, StringComparison.Ordinal))
+            {
+                MessageBox.Show("两次输入的新密码不一致。", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
+                return null;
+            }
+
+            return newPwd;
+        }
+
+        /// <summary>
+        /// 为指定 Settings 生成并存储新的密码盐与哈希到 settings.Security 中。
+        /// </summary>
+        /// <param name="settings">要更新的设置对象；如果为 null 或其 Security 为 null 则不执行任何操作。</param>
+        /// <param name="password">用于派生哈希的原始密码字符串。</param>
+        public static void SetPassword(Settings settings, string password)
+        {
+            if (settings?.Security == null) return;
+
+            var salt = new byte[SaltSizeBytes];
+            using (var rng = RandomNumberGenerator.Create())
+            {
+                rng.GetBytes(salt);
+            }
+            var hash = DeriveKey(password, salt, HashSizeBytes);
+
+            settings.Security.PasswordSalt = Convert.ToBase64String(salt);
+            settings.Security.PasswordHash = Convert.ToBase64String(hash);
+        }
+
+        /// <summary>
+        /// 清除设置中存储的密码信息。
+        /// </summary>
+        /// <param name="settings">要更新的设置对象；将把其 Security.PasswordSalt 和 Security.PasswordHash 设为空字符串。若 <paramref name="settings"/> 为 null 或其 Security 为 null 则不执行任何操作。</param>
+        public static void ClearPassword(Settings settings)
+        {
+            if (settings?.Security == null) return;
+            settings.Security.PasswordSalt = "";
+            settings.Security.PasswordHash = "";
+        }
+
+        /// <summary>
+        /// 使用 PBKDF2（Rfc2898）从给定的密码和盐派生指定长度的密钥字节。
+        /// </summary>
+        /// <param name="password">用于派生的密码字符串。</param>
+        /// <param name="salt">用于派生的盐字节数组（不可为 null）。</param>
+        /// <param name="keyBytes">要返回的密钥字节长度（以字节为单位）。</param>
+        /// <returns>派生出的密钥字节数组，长度等于 <paramref name="keyBytes"/>。</returns>
+        private static byte[] DeriveKey(string password, byte[] salt, int keyBytes)
+        {
+            // 注意：Rfc2898DeriveBytes 在 net472 默认 HMACSHA1
+            using (var kdf = new Rfc2898DeriveBytes(password, salt, Pbkdf2Iterations))
+            {
+                return kdf.GetBytes(keyBytes);
+            }
+        }
+
+        /// <summary>
+        /// 以固定时间方式比较两个字节数组的内容是否完全相同，防止基于时序的比对攻击。
+        /// </summary>
+        /// <param name="a">要比较的第一个字节数组。</param>
+        /// <param name="b">要比较的第二个字节数组。</param>
+        /// <returns>`true` 如果两个数组长度相同且所有字节相等，`false` 否则。</returns>
+        private static bool FixedTimeEquals(byte[] a, byte[] b)
+        {
+            if (a == null || b == null) return false;
+            if (a.Length != b.Length) return false;
+            var diff = 0;
+            for (int i = 0; i < a.Length; i++)
+            {
+                diff |= a[i] ^ b[i];
+            }
+            return diff == 0;
+        }
+    }
+}

Ink Canvas/Helpers/SoftwareLauncher.cs

@@ -1,72 +1,151 @@
-using Microsoft.Win32;
+using Microsoft.Win32;
 using System;
 using System.Diagnostics;
 using System.IO;
-using System.Runtime.InteropServices;
+using System.Windows;
 
 namespace Ink_Canvas.Helpers
 {
-    internal class SoftwareLauncher
+    internal static class SoftwareLauncher
     {
-        [DllImport("user32.dll")]
-        private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
-
+        /// <summary>与 ICA 一致：在「程序和功能」卸载列表中按 DisplayName 匹配后启动 sweclauncher.exe。</summary>
         public static void LaunchEasiCamera(string softwareName)
         {
             string executablePath = FindEasiCameraExecutablePath(softwareName);
 
-            if (!string.IsNullOrEmpty(executablePath))
+            if (string.IsNullOrEmpty(executablePath))
             {
-                try
-                {
-                    Process.Start(executablePath);
-                    //Console.WriteLine(softwareName + " 启动成功！");
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine("启动失败: " + ex.Message);
-                    //MessageBox.Show("启动失败: " + ex.Message);
-                }
+                MessageBox.Show(
+                    "未找到希沃视频展台安装信息（已扫描 64 位与 32 位卸载注册表）。请确认已通过官方安装包安装「希沃视频展台」。",
+                    "Ink Canvas",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Information);
+                return;
+            }
+
+            try
+            {
+                var directory = Path.GetDirectoryName(executablePath);
+                var psi = new ProcessStartInfo
+                {
+                    FileName = executablePath,
+                    UseShellExecute = true,
+                    WorkingDirectory = string.IsNullOrEmpty(directory) ? Environment.SystemDirectory : directory
+                };
+                Process.Start(psi);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(
+                    "无法启动希沃视频展台：" + ex.Message,
+                    "Ink Canvas",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Warning);
             }
-            //Console.WriteLine(softwareName + " 未找到可执行文件路径。");
         }
 
         private static string FindEasiCameraExecutablePath(string softwareName)
         {
-            string executablePath = null;
+            if (string.IsNullOrWhiteSpace(softwareName))
+                return null;
 
-            using (RegistryKey key = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Uninstall"))
+            // 64 位进程默认只枚举 64 位注册表视图；32 位希沃常写在 WOW6432Node 下，需一并扫描。
+            string[] uninstallRoots =
             {
-                foreach (string subkeyName in key.GetSubKeyNames())
-                {
-                    using (RegistryKey subkey = key.OpenSubKey(subkeyName))
-                    {
-                        string displayName = subkey.GetValue("DisplayName") as string;
-                        string installLocation = subkey.GetValue("InstallLocation") as string;
-                        string uninstallString = subkey.GetValue("UninstallString") as string;
+                @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall",
+                @"SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall",
+            };
 
-                        if (!string.IsNullOrEmpty(displayName) && displayName.Contains(softwareName))
-                        {
-                            if (!string.IsNullOrEmpty(installLocation))
-                            {
-                                executablePath = Path.Combine(installLocation, "sweclauncher.exe");
-                            }
-                            else if (!string.IsNullOrEmpty(uninstallString))
-                            {
-                                int lastSlashIndex = uninstallString.LastIndexOf("\\");
-                                if (lastSlashIndex >= 0)
-                                {
-                                    string folderPath = uninstallString.Substring(0, lastSlashIndex);
-                                    executablePath = Path.Combine(folderPath, "sweclauncher", "sweclauncher.exe");
-                                }
-                            }
-                            break;
-                        }
-                    }
+            foreach (string root in uninstallRoots)
+            {
+                using (RegistryKey key = Registry.LocalMachine.OpenSubKey(root))
+                {
+                    if (key == null) continue;
+                    string found = FindInUninstallKey(key, softwareName);
+                    if (!string.IsNullOrEmpty(found))
+                        return found;
                 }
             }
 
-            return executablePath;
+            return null;
+        }
+
+        private static string FindInUninstallKey(RegistryKey uninstallKey, string softwareName)
+        {
+            foreach (string subkeyName in uninstallKey.GetSubKeyNames())
+            {
+                using (RegistryKey subkey = uninstallKey.OpenSubKey(subkeyName))
+                {
+                    if (subkey == null) continue;
+
+                    string displayName = subkey.GetValue("DisplayName") as string;
+                    if (string.IsNullOrEmpty(displayName) || !displayName.Contains(softwareName))
+                        continue;
+
+                    string installLocation = subkey.GetValue("InstallLocation") as string;
+                    string uninstallString = subkey.GetValue("UninstallString") as string;
+
+                    string resolved = TryResolveSweclauncher(installLocation, uninstallString);
+                    if (!string.IsNullOrEmpty(resolved) && File.Exists(resolved))
+                        return resolved;
+                }
+            }
+
+            return null;
+        }
+
+        private static string TryResolveSweclauncher(string installLocation, string uninstallString)
+        {
+            if (!string.IsNullOrWhiteSpace(installLocation))
+            {
+                string fromLoc = ResolveSweclauncherUnderInstallRoot(installLocation.Trim().TrimEnd('\\'));
+                if (!string.IsNullOrEmpty(fromLoc))
+                    return fromLoc;
+            }
+
+            if (!string.IsNullOrWhiteSpace(uninstallString))
+            {
+                // 常见："...\uninstall.exe" 或带引号路径
+                string trimmed = uninstallString.Trim();
+                if (trimmed.Length >= 2 && trimmed[0] == '"')
+                {
+                    int end = trimmed.IndexOf('"', 1);
+                    if (end > 1)
+                        trimmed = trimmed.Substring(1, end - 1);
+                }
+
+                int lastSlash = trimmed.LastIndexOf('\\');
+                if (lastSlash < 0)
+                    return null;
+
+                string folderPath = trimmed.Substring(0, lastSlash);
+                string candidate = Path.Combine(folderPath, "sweclauncher", "sweclauncher.exe");
+                if (File.Exists(candidate))
+                    return candidate;
+
+                candidate = Path.Combine(folderPath, "sweclauncher.exe");
+                if (File.Exists(candidate))
+                    return candidate;
+            }
+
+            return null;
+        }
+
+        private static string ResolveSweclauncherUnderInstallRoot(string installRoot)
+        {
+            string[] candidates =
+            {
+                Path.Combine(installRoot, "sweclauncher.exe"),
+                Path.Combine(installRoot, "sweclauncher", "sweclauncher.exe"),
+            };
+
+            foreach (string p in candidates)
+            {
+                if (File.Exists(p))
+                    return p;
+            }
+
+            return null;
         }
     }
 }

Ink Canvas/Helpers/StartupCount.cs

@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 
 namespace Ink_Canvas.Helpers
@@ -18,7 +19,7 @@ namespace Ink_Canvas.Helpers
                         return count;
                 }
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
             return 0;
         }
 
@@ -31,7 +32,7 @@ namespace Ink_Canvas.Helpers
                 {
                     File.WriteAllText(CountFilePath, count.ToString());
                 }
-                catch { }
+                catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
             }
         }
 
@@ -44,7 +45,7 @@ namespace Ink_Canvas.Helpers
                     if (File.Exists(CountFilePath))
                         File.Delete(CountFilePath);
                 }
-                catch { }
+                catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
             }
         }
     }

Ink Canvas/Helpers/TelemetryUploader.cs

@@ -0,0 +1,209 @@
+using Sentry;
+using System;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace Ink_Canvas.Helpers
+{
+    internal static class TelemetryUploader
+    {
+        private static readonly Regex EmailRegex = new Regex(
+            @"(?i)\b[a-z0-9._%+\-]+@[a-z0-9.\-]+\.[a-z]{2,}\b",
+            RegexOptions.Compiled);
+
+        private static readonly Regex PhoneRegex = new Regex(
+            @"\b1[3-9]\d{9}\b",
+            RegexOptions.Compiled);
+
+        private static readonly Regex IPv4Regex = new Regex(
+            @"\b(?:\d{1,3}\.){3}\d{1,3}\b",
+            RegexOptions.Compiled);
+
+        private static readonly Regex WindowsPathRegex = new Regex(
+            @"\b[A-Za-z]:\\[^\s<>|]+\b",
+            RegexOptions.Compiled);
+
+        private static readonly Regex UncPathRegex = new Regex(
+            @"\\\\[^\s]+",
+            RegexOptions.Compiled);
+
+        private static readonly Regex KeyValueSecretRegex = new Regex(
+            @"(?i)(\b(?:access[_-]?token|refresh[_-]?token|token|password|passwd|pwd|secret|authorization)\b\s*[:=]\s*)([^\s,;]+)",
+            RegexOptions.Compiled);
+
+        private static readonly Regex JsonSecretRegex = new Regex(
+            "(?i)(\"(?:access_token|refresh_token|token|password|passwd|pwd|secret|authorization)\"\\s*:\\s*\")([^\"]*)(\")",
+            RegexOptions.Compiled);
+
+        private static readonly Regex UrlSecretRegex = new Regex(
+            @"(?i)([?&](?:access_token|token|password|pwd|secret)=)[^&\s]+",
+            RegexOptions.Compiled);
+
+        public static Task UploadTelemetryIfNeededAsync()
+        {
+            return Task.Run(() =>
+            {
+                try
+                {
+                    var settings = MainWindow.Settings;
+                    if (settings == null || settings.Startup == null)
+                    {
+                        return;
+                    }
+
+                    var level = settings.Startup.TelemetryUploadLevel;
+                    if (level == TelemetryUploadLevel.None)
+                    {
+                        return;
+                    }
+
+                    string deviceId = DeviceIdentifier.GetDeviceId();
+                    if (string.IsNullOrWhiteSpace(deviceId) || deviceId.Length < 5)
+                    {
+                        LogHelper.WriteLogToFile("TelemetryUploader | 设备ID无效，取消遥测上传", LogHelper.LogType.Warning);
+                        return;
+                    }
+
+                    // Basic 和 Extended 均上传崩溃日志（脱敏）
+                    object crashFile = TryGetLatestSanitizedFile(
+                        Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Crashes"),
+                        "Crash_*.txt",
+                        "崩溃日志");
+
+                    // Extended 额外上传运行日志（脱敏）
+                    object runtimeLogFile = null;
+                    if (level == TelemetryUploadLevel.Extended)
+                    {
+                        runtimeLogFile = TryGetLatestSanitizedFile(
+                            Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Logs"),
+                            "Log_*.txt",
+                            "运行日志");
+                    }
+
+                    var telemetryData = new
+                    {
+                        telemetry_level = level.ToString(),
+                        device_id = deviceId,
+                        update_channel = settings.Startup.UpdateChannel.ToString(),
+                        app_version = Assembly.GetExecutingAssembly().GetName().Version.ToString(),
+                        os_version = Environment.OSVersion.VersionString,
+                        has_crash_log = crashFile != null,
+                        has_runtime_log = runtimeLogFile != null
+                    };
+
+                    // 通过 Sentry 上报一个包含遥测信息的事件
+                    string userName = Environment.UserName;
+                    SentrySdk.ConfigureScope(scope =>
+                    {
+                        scope.User = new SentryUser
+                        {
+                            Id = deviceId,
+                            Username = userName,
+                            Email = $"{userName}",
+                            IpAddress = "{{auto}}"
+                        };
+                    });
+
+                    var evt = new SentryEvent
+                    {
+                        Message = "ICC CE Telemetry",
+                        Level = SentryLevel.Info
+                    };
+
+                    evt.User = new SentryUser
+                    {
+                        Id = deviceId,
+                        Username = userName,
+                        Email = $"{userName}",
+                        IpAddress = "{{auto}}"
+                    };
+
+                    evt.SetTag("telemetry_level", level.ToString());
+                    evt.SetTag("device_id", deviceId);
+                    evt.SetTag("update_channel", settings.Startup.UpdateChannel.ToString());
+                    evt.SetTag("app_version", Assembly.GetExecutingAssembly().GetName().Version.ToString());
+                    evt.SetTag("os_version", Environment.OSVersion.VersionString);
+                    evt.SetExtra("telemetry_data", telemetryData);
+
+                    if (crashFile != null)
+                    {
+                        evt.SetExtra("crash_file", crashFile);
+                    }
+
+                    if (runtimeLogFile != null)
+                    {
+                        evt.SetExtra("runtime_log_file", runtimeLogFile);
+                    }
+
+                    SentrySdk.CaptureEvent(evt);
+                    LogHelper.WriteLogToFile("TelemetryUploader | 遥测数据已通过 Sentry 上报", LogHelper.LogType.Event);
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"TelemetryUploader | 遥测上传失败: {ex.Message}", LogHelper.LogType.Warning);
+                }
+            });
+        }
+
+        private static object TryGetLatestSanitizedFile(string directory, string pattern, string fileType)
+        {
+            try
+            {
+                if (!Directory.Exists(directory))
+                {
+                    return null;
+                }
+
+                var latest = new DirectoryInfo(directory)
+                    .GetFiles(pattern)
+                    .OrderByDescending(file => file.LastWriteTime)
+                    .FirstOrDefault();
+
+                if (latest == null)
+                {
+                    return null;
+                }
+
+                string content = File.ReadAllText(latest.FullName);
+                string sanitizedContent = SanitizeLogContent(content);
+
+                return new
+                {
+                    file_type = fileType,
+                    file_name = latest.Name,
+                    last_write_time = latest.LastWriteTime.ToString("o"),
+                    content = sanitizedContent
+                };
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile(
+                    $"TelemetryUploader | 收集{fileType}失败: {ex.Message}",
+                    LogHelper.LogType.Warning);
+                return null;
+            }
+        }
+
+        private static string SanitizeLogContent(string content)
+        {
+            if (string.IsNullOrEmpty(content))
+            {
+                return content;
+            }
+
+            string sanitized = content;
+            sanitized = EmailRegex.Replace(sanitized, "[REDACTED_EMAIL]");
+            sanitized = PhoneRegex.Replace(sanitized, "[REDACTED_PHONE]");
+            sanitized = IPv4Regex.Replace(sanitized, "[REDACTED_IP]");
+            sanitized = WindowsPathRegex.Replace(sanitized, "[REDACTED_PATH]");
+            sanitized = UncPathRegex.Replace(sanitized, "[REDACTED_PATH]");
+            sanitized = UrlSecretRegex.Replace(sanitized, "$1[REDACTED]");
+            sanitized = KeyValueSecretRegex.Replace(sanitized, "$1[REDACTED]");
+            sanitized = JsonSecretRegex.Replace(sanitized, "$1[REDACTED]$3");
+            return sanitized;
+        }
+    }
+}

Ink Canvas/Helpers/TimeMachine.cs

@@ -92,6 +92,11 @@ namespace Ink_Canvas.Helpers
 
         public TimeMachineHistory Undo()
         {
+            if (_currentIndex < 0 || _currentIndex >= _currentStrokeHistory.Count)
+            {
+                return null;
+            }
+
             var item = _currentStrokeHistory[_currentIndex];
             item.StrokeHasBeenCleared = !item.StrokeHasBeenCleared;
             _currentIndex--;
@@ -102,6 +107,11 @@ namespace Ink_Canvas.Helpers
 
         public TimeMachineHistory Redo()
         {
+            if (_currentStrokeHistory.Count == 0 || _currentIndex >= _currentStrokeHistory.Count - 1)
+            {
+                return null;
+            }
+
             var item = _currentStrokeHistory[++_currentIndex];
             item.StrokeHasBeenCleared = !item.StrokeHasBeenCleared;
             NotifyUndoRedoState();

Ink Canvas/Helpers/UploadHelper.cs

@@ -0,0 +1,269 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 上传提供者接口
+    /// </summary>
+    public interface IUploadProvider
+    {
+        /// <summary>
+        /// 提供者名称
+        /// </summary>
+        string Name { get; }
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        bool IsEnabled { get; }
+
+        /// <summary>
+        /// 上传文件
+        /// </summary>
+        /// <param name="filePath">文件路径</param>
+        /// <param name="cancellationToken">取消令牌</param>
+        /// <returns>是否上传成功</returns>
+        Task<bool> UploadAsync(string filePath, CancellationToken cancellationToken = default);
+    }
+
+    /// <summary>
+    /// Dlass上传提供者
+    /// </summary>
+    public class DlassUploadProvider : IUploadProvider
+    {
+        public static readonly DlassUploadQueue Queue = new DlassUploadQueue();
+
+        /// <summary>
+        /// 提供者名称
+        /// </summary>
+        public string Name => "Dlass";
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public bool IsEnabled => MainWindow.Settings?.Upload?.EnabledProviders?.Contains(Name) ?? false;
+
+        /// <summary>
+        /// 上传文件
+        /// </summary>
+        /// <param name="filePath">文件路径</param>
+        /// <param name="cancellationToken">取消令牌</param>
+        /// <returns>是否上传成功</returns>
+        public async Task<bool> UploadAsync(string filePath, CancellationToken cancellationToken = default)
+        {
+            return await Queue.UploadFileAsync(filePath, cancellationToken).ConfigureAwait(false);
+        }
+    }
+
+    /// <summary>
+    /// WebDav上传提供者
+    /// </summary>
+    public class WebDavUploadProvider : IUploadProvider
+    {
+        public static readonly WebDavUploadQueue Queue = new WebDavUploadQueue();
+
+        /// <summary>
+        /// 提供者名称
+        /// </summary>
+        public string Name => "WebDav";
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public bool IsEnabled => MainWindow.Settings?.Upload?.EnabledProviders?.Contains(Name) ?? false;
+
+        /// <summary>
+        /// 上传文件
+        /// </summary>
+        /// <param name="filePath">文件路径</param>
+        /// <param name="cancellationToken">取消令牌</param>
+        /// <returns>是否上传成功</returns>
+        public async Task<bool> UploadAsync(string filePath, CancellationToken cancellationToken = default)
+        {
+            return await Queue.UploadFileAsync(filePath, cancellationToken).ConfigureAwait(false);
+        }
+    }
+
+
+
+    /// <summary>
+    /// 上传帮助类
+    /// </summary>
+    public static class UploadHelper
+    {
+        private static readonly List<IUploadProvider> _providers = new List<IUploadProvider>();
+        private static bool _initialized;
+        private static readonly object s_sync = new object();
+
+        /// <summary>
+        /// 初始化上传帮助类
+        /// </summary>
+        public static void Initialize()
+        {
+            lock (s_sync)
+            {
+                if (_initialized)
+                    return;
+
+                // 注册默认上传提供者
+                RegisterProviderInternal(new DlassUploadProvider());
+                RegisterProviderInternal(new WebDavUploadProvider());
+
+                // 注册上传队列
+                UploadQueueHelper.RegisterQueue(DlassUploadProvider.Queue);
+                UploadQueueHelper.RegisterQueue(WebDavUploadProvider.Queue);
+
+                // 初始化所有上传队列
+                UploadQueueHelper.InitializeAllQueues();
+
+                _initialized = true;
+            }
+        }
+
+        /// <summary>
+        /// 注册上传提供者
+        /// </summary>
+        /// <param name="provider">上传提供者</param>
+        public static void RegisterProvider(IUploadProvider provider)
+        {
+            if (provider == null)
+                return;
+
+            lock (s_sync)
+            {
+                RegisterProviderInternal(provider);
+            }
+        }
+
+        private static void RegisterProviderInternal(IUploadProvider provider)
+        {
+            if (provider != null)
+            {
+                bool providerExists = _providers.Any(p => p.GetType() == provider.GetType());
+                if (!providerExists)
+                {
+                    _providers.Add(provider);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 上传文件到所有启用的提供者
+        /// </summary>
+        /// <param name="filePath">文件路径</param>
+        /// <param name="cancellationToken">取消令牌</param>
+        /// <returns>是否至少有一个提供者上传成功</returns>
+        public static async Task<bool> UploadFileAsync(string filePath, CancellationToken cancellationToken = default)
+        {
+            if (!_initialized)
+            {
+                Initialize();
+            }
+
+            List<IUploadProvider> providersSnapshot;
+            lock (s_sync)
+            {
+                providersSnapshot = new List<IUploadProvider>(_providers);
+            }
+
+            bool anySuccess = false;
+
+            // 获取上传延迟时间
+            int delayMinutes = MainWindow.Settings?.Upload?.UploadDelayMinutes ?? 0;
+
+            // 应用上传延迟
+            if (delayMinutes > 0)
+            {
+                LogHelper.WriteLogToFile($"上传延迟 {delayMinutes} 分钟", LogHelper.LogType.Event);
+                cancellationToken.ThrowIfCancellationRequested();
+                await Task.Delay(TimeSpan.FromMinutes(delayMinutes), cancellationToken).ConfigureAwait(false);
+            }
+
+            // 上传前验证文件是否存在且可访问
+            if (!File.Exists(filePath))
+            {
+                LogHelper.WriteLogToFile($"上传失败：文件不存在 - {filePath}", LogHelper.LogType.Error);
+                return false;
+            }
+
+            try
+            {
+                // 检查文件是否可访问
+                using (var fileStream = File.OpenRead(filePath))
+                {
+                    // 文件可访问
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"上传失败：文件不可访问 - {filePath}, 原因: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+
+            foreach (var provider in providersSnapshot)
+            {
+                try
+                {
+                    if (provider.IsEnabled)
+                    {
+                        bool success = await provider.UploadAsync(filePath, cancellationToken).ConfigureAwait(false);
+                        if (success)
+                        {
+                            anySuccess = true;
+                        }
+                    }
+                }
+                catch (OperationCanceledException)
+                {
+                    LogHelper.WriteLogToFile($"上传被取消: {provider.Name}", LogHelper.LogType.Event);
+                    throw;
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"使用 {provider.Name} 上传失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+
+            return anySuccess;
+        }
+
+        /// <summary>
+        /// 获取所有上传提供者
+        /// </summary>
+        /// <returns>上传提供者列表</returns>
+        public static List<IUploadProvider> GetProviders()
+        {
+            if (!_initialized)
+            {
+                Initialize();
+            }
+
+            lock (s_sync)
+            {
+                return new List<IUploadProvider>(_providers);
+            }
+        }
+
+        /// <summary>
+        /// 获取所有启用的上传提供者
+        /// </summary>
+        /// <returns>启用的上传提供者列表</returns>
+        public static List<IUploadProvider> GetEnabledProviders()
+        {
+            if (!_initialized)
+            {
+                Initialize();
+            }
+
+            lock (s_sync)
+            {
+                return _providers.FindAll(p => p.IsEnabled);
+            }
+        }
+    }
+}

Ink Canvas/Helpers/UploadQueueHelper.cs

@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 上传队列帮助类，提供统一的队列管理功能
+    /// </summary>
+    public static class UploadQueueHelper
+    {
+        private static readonly List<BaseUploadQueue> _queues = new List<BaseUploadQueue>();
+        private static readonly object _syncLock = new object();
+        private static volatile bool _initialized = false;
+
+        /// <summary>
+        /// 初始化所有上传队列
+        /// </summary>
+        public static void InitializeAllQueues()
+        {
+            lock (_syncLock)
+            {
+                if (_initialized)
+                    return;
+
+                // 初始化所有注册的队列
+                foreach (var queue in _queues)
+                {
+                    try
+                    {
+                        queue.InitializeQueue();
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"[UploadQueueHelper] 初始化队列时出错: {ex.Message}", LogHelper.LogType.Error);
+                    }
+                }
+
+                _initialized = true;
+            }
+        }
+
+        /// <summary>
+        /// 注册上传队列
+        /// </summary>
+        /// <param name="queue">上传队列实例</param>
+        public static void RegisterQueue(BaseUploadQueue queue)
+        {
+            if (queue == null)
+                return;
+
+            lock (_syncLock)
+            {
+                if (!_queues.Contains(queue))
+                {
+                    try
+                    {
+                        // 先初始化队列，再添加到列表
+                        queue.InitializeQueue();
+                        _queues.Add(queue);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"[UploadQueueHelper] 注册队列时出错: {ex.Message}", LogHelper.LogType.Error);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取所有注册的上传队列
+        /// </summary>
+        /// <returns>上传队列列表</returns>
+        public static IReadOnlyList<BaseUploadQueue> GetAllQueues()
+        {
+            lock (_syncLock)
+            {
+                return new List<BaseUploadQueue>(_queues).AsReadOnly();
+            }
+        }
+
+        /// <summary>
+        /// 确保所有队列都已初始化
+        /// </summary>
+        public static void EnsureQueuesInitialized()
+        {
+            if (!_initialized)
+            {
+                InitializeAllQueues();
+            }
+        }
+    }
+}

Ink Canvas/Helpers/UriSchemeHelper.cs

@@ -0,0 +1,118 @@
+using Microsoft.Win32;
+using System;
+using System.Diagnostics;
+
+namespace Ink_Canvas.Helpers
+{
+    public static class UriSchemeHelper
+    {
+        private const string SchemeName = "icc";
+        private const string FriendlyName = "URL:Ink Canvas Protocol";
+
+        public static bool RegisterUriScheme()
+        {
+            try
+            {
+                string exePath = Process.GetCurrentProcess().MainModule.FileName;
+
+                // 使用 CurrentUser\Software\Classes 代替 ClassesRoot，无需管理员权限
+                using (RegistryKey key = Registry.CurrentUser.CreateSubKey(@"Software\Classes\" + SchemeName))
+                {
+                    key.SetValue("", FriendlyName);
+                    key.SetValue("URL Protocol", "");
+
+                    using (RegistryKey defaultIconKey = key.CreateSubKey("DefaultIcon"))
+                    {
+                        // 修正引号转义
+                        defaultIconKey.SetValue("", "\"" + exePath + "\",1");
+                    }
+
+                    using (RegistryKey shellKey = key.CreateSubKey("shell"))
+                    using (RegistryKey openKey = shellKey.CreateSubKey("open"))
+                    using (RegistryKey commandKey = openKey.CreateSubKey("command"))
+                    {
+                        // 修正引号转义
+                        commandKey.SetValue("", "\"" + exePath + "\" \"%1\"");
+                    }
+                }
+                LogHelper.WriteLogToFile($"成功注册URI Scheme: {SchemeName}://", LogHelper.LogType.Event);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"注册URI Scheme失败: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        public static bool UnregisterUriScheme()
+        {
+            try
+            {
+                // 使用 CurrentUser\Software\Classes
+                Registry.CurrentUser.DeleteSubKeyTree(@"Software\Classes\" + SchemeName, false);
+                LogHelper.WriteLogToFile($"成功注销URI Scheme: {SchemeName}://", LogHelper.LogType.Event);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"注销URI Scheme失败: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        public static bool IsUriSchemeRegistered()
+        {
+            try
+            {
+                // 使用 CurrentUser\Software\Classes
+                using (RegistryKey key = Registry.CurrentUser.OpenSubKey(@"Software\Classes\" + SchemeName))
+                {
+                    if (key == null) return false;
+                    // 修正反斜杠路径
+                    using (RegistryKey shellKey = key.OpenSubKey(@"shell\open\command"))
+                    {
+                        if (shellKey == null) return false;
+                        string command = shellKey.GetValue("") as string;
+                        if (string.IsNullOrEmpty(command)) return false;
+
+                        // 提取第一个标记作为可执行文件路径（处理带引号的情况）
+                        string registeredExePath = "";
+                        if (command.StartsWith("\""))
+                        {
+                            int nextQuote = command.IndexOf("\"", 1);
+                            if (nextQuote > 1)
+                            {
+                                registeredExePath = command.Substring(1, nextQuote - 1);
+                            }
+                        }
+                        else
+                        {
+                            int firstSpace = command.IndexOf(" ");
+                            registeredExePath = firstSpace > 0 ? command.Substring(0, firstSpace) : command;
+                        }
+
+                        if (string.IsNullOrEmpty(registeredExePath)) return false;
+
+                        string currentExePath = Process.GetCurrentProcess().MainModule.FileName;
+
+                        try
+                        {
+                            string normalizedRegisteredPath = System.IO.Path.GetFullPath(registeredExePath);
+                            string normalizedCurrentPath = System.IO.Path.GetFullPath(currentExePath);
+                            return string.Equals(normalizedRegisteredPath, normalizedCurrentPath, StringComparison.OrdinalIgnoreCase);
+                        }
+                        catch
+                        {
+                            return string.Equals(registeredExePath, currentExePath, StringComparison.OrdinalIgnoreCase);
+                        }
+                    }
+                }
+            }
+            catch
+            {
+                return false;
+            }
+        }
+    }
+}

Ink Canvas/Helpers/WebDavUploadQueue.cs

@@ -0,0 +1,61 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// WebDAV上传队列
+    /// </summary>
+    public class WebDavUploadQueue : BaseUploadQueue
+    {
+        /// <summary>
+        /// 队列文件名
+        /// </summary>
+        protected override string QueueFileName => "WebDavUploadQueue.json";
+
+        /// <summary>
+        /// 检查上传是否启用
+        /// </summary>
+        protected override bool IsUploadEnabled()
+        {
+            return WebDavUploader.IsWebDavEnabled();
+        }
+
+        /// <summary>
+        /// 内部上传方法，执行实际上传操作
+        /// </summary>
+        protected override async Task<bool> UploadFileInternalAsync(string filePath, CancellationToken cancellationToken)
+        {
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                // 再次检查文件是否存在（可能在队列等待时被删除）
+                if (!File.Exists(filePath))
+                {
+                    return false;
+                }
+
+                // 检查WebDAV是否仍然启用
+                if (!WebDavUploader.IsWebDavEnabled())
+                {
+                    return false;
+                }
+
+                // 调用WebDavUploader进行实际上传
+                var success = await WebDavUploader.UploadFileAsync(filePath, cancellationToken);
+                return success;
+            }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+        }
+    }
+}

Ink Canvas/Helpers/WebDavUploader.cs

@@ -0,0 +1,171 @@
+using System;
+using System.IO;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using WebDav;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// WebDav上传工具类
+    /// </summary>
+    public static class WebDavUploader
+    {
+        /// <summary>
+        /// 上传文件到WebDav服务器
+        /// </summary>
+        /// <param name="filePath">文件路径</param>
+        /// <param name="cancellationToken">取消令牌</param>
+        /// <returns>是否上传成功</returns>
+        public static async Task<bool> UploadFileAsync(string filePath, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                // 检查文件是否存在
+                if (!File.Exists(filePath))
+                {
+                    return false;
+                }
+
+                // 获取WebDav设置
+                var webDavUrl = MainWindow.Settings?.Dlass?.WebDavUrl;
+                var username = MainWindow.Settings?.Dlass?.WebDavUsername;
+                var password = MainWindow.Settings?.Dlass?.WebDavPassword;
+                var rootDirectory = MainWindow.Settings?.Dlass?.WebDavRootDirectory;
+
+                // 验证设置
+                if (string.IsNullOrEmpty(webDavUrl))
+                {
+                    return false;
+                }
+
+                // 构建完整的目标路径
+                var fileName = Path.GetFileName(filePath);
+                var targetPath = Path.Combine(rootDirectory ?? string.Empty, fileName).Replace("\\", "/");
+                if (targetPath.StartsWith("/"))
+                {
+                    targetPath = targetPath.Substring(1);
+                }
+
+                // 创建WebDav客户端
+                var clientParams = new WebDavClientParams
+                {
+                    BaseAddress = new Uri(webDavUrl),
+                    Credentials = new NetworkCredential(username ?? string.Empty, password ?? string.Empty)
+                };
+
+                using (var client = new WebDavClient(clientParams))
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    // 先直接尝试上传文件
+                    using (var fileStream = File.OpenRead(filePath))
+                    {
+                        // 检查取消令牌
+                        cancellationToken.ThrowIfCancellationRequested();
+
+                        var result = await client.PutFile(targetPath, fileStream);
+                        if (result.IsSuccessful)
+                        {
+                            return true;
+                        }
+                        else
+                        {
+                            // 上传失败，尝试创建目录
+                            var directoryPath = Path.GetDirectoryName(targetPath);
+                            if (!string.IsNullOrEmpty(directoryPath))
+                            {
+                                await EnsureDirectoryExistsAsync(client, directoryPath, cancellationToken);
+
+                                // 再次尝试上传文件
+                                cancellationToken.ThrowIfCancellationRequested();
+                                using (var retryStream = File.OpenRead(filePath))
+                                {
+                                    var retryResult = await client.PutFile(targetPath, retryStream);
+                                    return retryResult.IsSuccessful;
+                                }
+                            }
+                            else
+                            {
+                                // 没有目录路径，直接返回失败
+                                return false;
+                            }
+                        }
+                    }
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 确保WebDav目录存在
+        /// </summary>
+        /// <param name="client">WebDav客户端</param>
+        /// <param name="directoryPath">目录路径</param>
+        /// <param name="cancellationToken">取消令牌</param>
+        private static async Task EnsureDirectoryExistsAsync(IWebDavClient client, string directoryPath, CancellationToken cancellationToken)
+        {
+            try
+            {
+                // 分割路径并逐级创建目录
+                var pathParts = directoryPath.Split('/');
+                var currentPath = string.Empty;
+
+                foreach (var part in pathParts)
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    if (string.IsNullOrEmpty(part))
+                        continue;
+
+                    currentPath = Path.Combine(currentPath, part).Replace("\\", "/");
+
+                    // 检查取消令牌
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    // 尝试创建目录
+                    await client.Mkcol(currentPath);
+                }
+            }
+            catch (Exception)
+            {
+                // 静默处理目录创建错误
+            }
+        }
+
+        /// <summary>
+        /// 检查WebDAV是否已启用
+        /// </summary>
+        /// <returns>是否启用</returns>
+        public static bool IsWebDavEnabled()
+        {
+            // 检查WebDav设置是否有效
+            var webDavUrl = MainWindow.Settings?.Dlass?.WebDavUrl;
+            if (string.IsNullOrEmpty(webDavUrl))
+            {
+                return false;
+            }
+
+            // 尝试解析URL
+            try
+            {
+                new Uri(webDavUrl);
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+    }
+}

Ink Canvas/Helpers/WinRtHandwritingRecognizer.cs

@@ -0,0 +1,599 @@
+using OSVersionExtension;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Media;
+using WinAnalysis = global::Windows.UI.Input.Inking.Analysis;
+using WinRtInk = global::Windows.UI.Input.Inking;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// WinRT 手写体识别，以及将识别结果用手写风格字体轮廓转为墨迹笔画（「识别转手写体字形」）。
+    /// </summary>
+    internal static class WinRtHandwritingRecognizer
+    {
+        private static void LogHandwriting(string message, LogHelper.LogType logType = LogHelper.LogType.Info)
+        {
+            LogHelper.WriteLogToFile("[手写体] " + message, logType);
+        }
+
+        public static bool IsApiAvailable =>
+            OSVersion.GetOperatingSystem() >= OSVersionExtension.OperatingSystem.Windows10;
+
+        public static void Warmup()
+        {
+            if (!IsApiAvailable || !Environment.Is64BitProcess) return;
+            try
+            {
+                var d = Application.Current?.Dispatcher;
+                if (d == null) return;
+                d.BeginInvoke(new Action(async () =>
+                {
+                    try
+                    {
+                        await RecognizeHandwritingAsync(new StrokeCollection()).ConfigureAwait(true);
+                    }
+                    catch
+                    {
+                        // ignore
+                    }
+                }));
+            }
+            catch
+            {
+                // ignore
+            }
+        }
+
+        /// <summary>
+        /// 将当前笔画集合识别为文字片段（含候选）：先用墨迹分析得到分词与 <see cref="WinAnalysis.InkAnalysisInkWord.RecognizedText"/>，
+        /// 再对每一分词用 <see cref="WinRtInk.InkRecognizerContainer"/> 取 <c>GetTextCandidates</c>（与当前 SDK 中部分版本的
+        /// <see cref="WinRtInk.InkRecognitionResult"/> 未暴露笔画映射的局限兼容）。
+        /// </summary>
+        public static async Task<HandwritingRecognitionResult> RecognizeHandwritingAsync(StrokeCollection strokes)
+        {
+            if (!IsApiAvailable || strokes == null || strokes.Count == 0)
+                return HandwritingRecognitionResult.Empty;
+
+            var traceRecognition = strokes.Count > 0;
+
+            try
+            {
+                var analyzer = new WinAnalysis.InkAnalyzer();
+                var idToWpf = new Dictionary<uint, Stroke>();
+
+                foreach (Stroke s in strokes)
+                {
+                    var ink = WinRtInkShapeRecognizer.CreateInkStrokeFromWpf(s);
+                    if (ink == null) continue;
+                    analyzer.AddDataForStroke(ink);
+                    analyzer.SetStrokeDataKind(ink.Id, WinAnalysis.InkAnalysisStrokeKind.Writing);
+                    idToWpf[ink.Id] = s;
+                }
+
+                if (idToWpf.Count == 0)
+                {
+                    if (traceRecognition)
+                        LogHandwriting("识别：无有效 WinRT 笔画（全部转换失败），输入笔画数=" + strokes.Count);
+                    return HandwritingRecognitionResult.Empty;
+                }
+
+                var analysisResult = await analyzer.AnalyzeAsync().AsTask().ConfigureAwait(true);
+                if (analysisResult == null || analysisResult.Status != WinAnalysis.InkAnalysisStatus.Updated)
+                {
+                    if (traceRecognition)
+                        LogHandwriting(
+                            "识别：AnalyzeAsync 未得到 Updated，Status=" +
+                            (analysisResult == null ? "null" : analysisResult.Status.ToString()) +
+                            "，有效笔画数=" + idToWpf.Count);
+                    return HandwritingRecognitionResult.Empty;
+                }
+
+                var wordNodes = analyzer.AnalysisRoot?.FindNodes(WinAnalysis.InkAnalysisNodeKind.InkWord);
+                if (wordNodes == null || wordNodes.Count == 0)
+                {
+                    if (traceRecognition)
+                        LogHandwriting("识别：未找到 InkWord 节点（可能被判为绘图或非书写），有效笔画数=" + idToWpf.Count);
+                    return HandwritingRecognitionResult.Empty;
+                }
+
+                var recognizer = new WinRtInk.InkRecognizerContainer();
+                var segments = new List<HandwritingWordSegment>();
+
+                foreach (var node in wordNodes)
+                {
+                    if (!(node is WinAnalysis.InkAnalysisInkWord word))
+                        continue;
+
+                    var ids = word.GetStrokeIds();
+                    if (ids == null || ids.Count == 0)
+                        continue;
+
+                    var group = new List<Stroke>();
+                    foreach (var sid in ids)
+                    {
+                        if (idToWpf.TryGetValue(sid, out var st))
+                            group.Add(st);
+                    }
+
+                    if (group.Count == 0)
+                        continue;
+
+                    var wbr = word.BoundingRect;
+                    var wpfRect = new Rect(wbr.X, wbr.Y, wbr.Width, wbr.Height);
+                    var analysisText = word.RecognizedText ?? string.Empty;
+
+                    IReadOnlyList<string> candList = Array.Empty<string>();
+                    try
+                    {
+                        if (recognizer != null)
+                        {
+                            var mini = new WinRtInk.InkStrokeContainer();
+                            foreach (var st in group)
+                            {
+                                var ink = WinRtInkShapeRecognizer.CreateInkStrokeFromWpf(st);
+                                if (ink != null)
+                                    mini.AddStroke(ink);
+                            }
+
+                            var miniStrokes = mini.GetStrokes();
+                            if (miniStrokes != null && miniStrokes.Count > 0)
+                            {
+                                var rr = await recognizer
+                                    .RecognizeAsync(mini, WinRtInk.InkRecognitionTarget.All)
+                                    .AsTask()
+                                    .ConfigureAwait(true);
+                                if (rr != null && rr.Count > 0 && rr[0] != null)
+                                {
+                                    var cands = rr[0].GetTextCandidates();
+                                    if (cands != null && cands.Count > 0)
+                                        candList = cands.ToList();
+                                }
+                            }
+                        }
+                    }
+                    catch
+                    {
+                        candList = Array.Empty<string>();
+                    }
+
+                    var primary = candList.Count > 0 ? candList[0] : analysisText;
+                    var mergedCandidates = new List<string>();
+                    if (candList.Count > 0)
+                    {
+                        foreach (var c in candList)
+                        {
+                            if (!string.IsNullOrEmpty(c) && !mergedCandidates.Contains(c))
+                                mergedCandidates.Add(c);
+                        }
+                    }
+
+                    if (!string.IsNullOrEmpty(analysisText) && !mergedCandidates.Contains(analysisText))
+                        mergedCandidates.Insert(0, analysisText);
+
+                    if (mergedCandidates.Count == 0 && !string.IsNullOrEmpty(primary))
+                        mergedCandidates.Add(primary);
+
+                    segments.Add(new HandwritingWordSegment(
+                        primary,
+                        mergedCandidates,
+                        wpfRect,
+                        group));
+                }
+
+                if (segments.Count == 0)
+                {
+                    if (traceRecognition)
+                        LogHandwriting("识别：分词列表为空（InkWord 无有效笔画映射）。");
+                    return HandwritingRecognitionResult.Empty;
+                }
+
+                var hr = new HandwritingRecognitionResult(segments);
+                if (traceRecognition)
+                {
+                    var preview = hr.CombinedText;
+                    if (preview.Length > 120)
+                        preview = preview.Substring(0, 117) + "...";
+                    LogHandwriting(
+                        "识别成功：词数=" + segments.Count +
+                        "，合并文本=\"" + preview + "\"" +
+                        "，进程位数=" + (Environment.Is64BitProcess ? "x64" : "x86"));
+                    for (var i = 0; i < segments.Count; i++)
+                    {
+                        var seg = segments[i];
+                        var t = seg.Text ?? "";
+                        if (t.Length > 40)
+                            t = t.Substring(0, 37) + "...";
+                        LogHandwriting(
+                            "  词[" + i + "] 文本=\"" + t + "\"，笔画数=" + seg.Strokes.Count +
+                            "，候选数=" + (seg.TextCandidates?.Count ?? 0) +
+                            "，框=(" + Math.Round(seg.BoundingRectangle.X, 1) + "," +
+                            Math.Round(seg.BoundingRectangle.Y, 1) + "," +
+                            Math.Round(seg.BoundingRectangle.Width, 1) + "×" +
+                            Math.Round(seg.BoundingRectangle.Height, 1) + ")");
+                    }
+                }
+
+                return hr;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile("WinRT 手写识别失败: " + ex.Message, LogHelper.LogType.Warning);
+                if (strokes != null && strokes.Count > 0)
+                    LogHandwriting("识别异常：" + ex.Message, LogHelper.LogType.Warning);
+                return HandwritingRecognitionResult.Empty;
+            }
+        }
+
+        private const string DefaultHandwritingFontFamilyList = "Ink Free,KaiTi,Segoe Script";
+
+        /// <summary>
+        /// 识别手写词后，将「有识别文本」的分词替换为指定手写风格字体的字形轮廓墨迹；未识别或空文本的词保留原笔画。
+        /// </summary>
+        public static async Task<StrokeCollection> ConvertRecognizedTextToHandwritingInkAsync(
+            StrokeCollection strokes,
+            string handwritingFontFamilyList)
+        {
+            if (!IsApiAvailable || strokes == null || strokes.Count == 0)
+            {
+                if (strokes != null && strokes.Count > 0 && !IsApiAvailable)
+                    LogHandwriting("字形替换：跳过，IsApiAvailable=false。");
+                return strokes;
+            }
+
+            var fontList = string.IsNullOrWhiteSpace(handwritingFontFamilyList)
+                ? DefaultHandwritingFontFamilyList
+                : handwritingFontFamilyList.Trim();
+            LogHandwriting(
+                "字形替换开始：输入笔画数=" + strokes.Count +
+                "，字体链=\"" + fontList + "\"" +
+                "，PixelsPerDip=" + Math.Round(GetPixelsPerDipSafe(), 3));
+
+            try
+            {
+                var reco = await RecognizeHandwritingAsync(strokes).ConfigureAwait(true);
+                if (!reco.IsSuccess || reco.Words == null || reco.Words.Count == 0)
+                {
+                    LogHandwriting(
+                        "字形替换中止：识别未成功（IsSuccess=" + reco.IsSuccess +
+                        "，词数=" + (reco.Words?.Count ?? 0) + "），原样返回笔画。");
+                    return strokes;
+                }
+
+                var firstStrokeToSegment = new Dictionary<Stroke, HandwritingWordSegment>();
+                foreach (var w in reco.Words)
+                {
+                    if (w?.Strokes == null || w.Strokes.Count == 0)
+                        continue;
+                    var ordered = w.Strokes.OrderBy(st => IndexOfStrokeInCollection(strokes, st)).ToList();
+                    var first = ordered[0];
+                    if (!firstStrokeToSegment.ContainsKey(first))
+                        firstStrokeToSegment[first] = w;
+                }
+
+                if (firstStrokeToSegment.Count == 0)
+                {
+                    LogHandwriting("字形替换中止：无法建立「首笔画→分词」映射，原样返回。");
+                    return strokes;
+                }
+
+                var consumed = new HashSet<Stroke>();
+                var result = new StrokeCollection();
+                var pixelsPerDip = GetPixelsPerDipSafe();
+                var replacedWordCount = 0;
+                var keptOriginalWordCount = 0;
+                var glyphStrokeTotal = 0;
+
+                foreach (Stroke s in strokes)
+                {
+                    if (consumed.Contains(s))
+                        continue;
+
+                    if (!firstStrokeToSegment.TryGetValue(s, out var seg))
+                    {
+                        result.Add(s);
+                        continue;
+                    }
+
+                    if (string.IsNullOrWhiteSpace(seg.Text))
+                    {
+                        LogHandwriting(
+                            "  分词：文本为空，保留原笔画，笔画数=" + seg.Strokes.Count);
+                        keptOriginalWordCount++;
+                        foreach (var z in seg.Strokes)
+                        {
+                            if (!consumed.Contains(z))
+                            {
+                                result.Add(z);
+                                consumed.Add(z);
+                            }
+                        }
+
+                        continue;
+                    }
+
+                    var templateDa = seg.Strokes[0]?.DrawingAttributes?.Clone() ?? new DrawingAttributes();
+                    OutlineAttributesForGlyphInk(templateDa);
+
+                    var glyphStrokes = CreateHandwritingGlyphStrokes(
+                        seg.Text.Trim(),
+                        seg.BoundingRectangle,
+                        templateDa,
+                        fontList,
+                        pixelsPerDip);
+
+                    if (glyphStrokes == null || glyphStrokes.Count == 0)
+                    {
+                        LogHandwriting(
+                            "  分词：字形轮廓生成失败，保留原笔画。文本=\"" +
+                            (seg.Text.Length > 30 ? seg.Text.Substring(0, 27) + "..." : seg.Text) + "\"");
+                        keptOriginalWordCount++;
+                        foreach (var z in seg.Strokes)
+                        {
+                            if (!consumed.Contains(z))
+                            {
+                                result.Add(z);
+                                consumed.Add(z);
+                            }
+                        }
+
+                        continue;
+                    }
+
+                    foreach (var nk in glyphStrokes)
+                        result.Add(nk);
+                    glyphStrokeTotal += glyphStrokes.Count;
+                    replacedWordCount++;
+                    LogHandwriting(
+                        "  分词：已替换为手写体字形墨迹，文本=\"" +
+                        (seg.Text.Length > 30 ? seg.Text.Substring(0, 27) + "..." : seg.Text) +
+                        "\"，生成笔画数=" + glyphStrokes.Count + "，移除原笔画数=" + seg.Strokes.Count);
+
+                    foreach (var z in seg.Strokes)
+                        consumed.Add(z);
+                }
+
+                LogHandwriting(
+                    "字形替换结束：输出笔画数=" + result.Count +
+                    "（输入=" + strokes.Count + "），替换词数=" + replacedWordCount +
+                    "，保留原迹词数=" + keptOriginalWordCount +
+                    "，字形子笔画合计=" + glyphStrokeTotal);
+                return result;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile("WinRT 手写体字形替换失败: " + ex.Message, LogHelper.LogType.Warning);
+                LogHandwriting("字形替换异常：" + ex, LogHelper.LogType.Warning);
+                return strokes;
+            }
+        }
+
+        private static int IndexOfStrokeInCollection(StrokeCollection collection, Stroke stroke)
+        {
+            if (collection == null || stroke == null)
+                return int.MaxValue;
+            for (var i = 0; i < collection.Count; i++)
+            {
+                if (ReferenceEquals(collection[i], stroke))
+                    return i;
+            }
+
+            return int.MaxValue;
+        }
+
+        private static void OutlineAttributesForGlyphInk(DrawingAttributes da)
+        {
+            if (da == null) return;
+            var w = Math.Max(0.8, Math.Min(da.Width, da.Height) * 0.2);
+            da.Width = w;
+            da.Height = w;
+            da.StylusTip = StylusTip.Ellipse;
+            da.IsHighlighter = false;
+        }
+
+        private static double GetPixelsPerDipSafe()
+        {
+            try
+            {
+                if (Application.Current?.MainWindow is Visual v)
+                    return VisualTreeHelper.GetDpi(v).PixelsPerDip;
+            }
+            catch
+            {
+                // ignore
+            }
+
+            return 1.0;
+        }
+
+        private static Typeface ResolveHandwritingTypeface(string fontFamilyList)
+        {
+            try
+            {
+                var ff = new FontFamily(fontFamilyList ?? DefaultHandwritingFontFamilyList);
+                return new Typeface(ff, FontStyles.Normal, FontWeights.Normal, FontStretches.Normal);
+            }
+            catch
+            {
+                return new Typeface(
+                    SystemFonts.MessageFontFamily,
+                    SystemFonts.MessageFontStyle,
+                    SystemFonts.MessageFontWeight,
+                    FontStretches.Normal);
+            }
+        }
+
+        private static List<Stroke> CreateHandwritingGlyphStrokes(
+            string text,
+            Rect placeRect,
+            DrawingAttributes templateDa,
+            string fontFamilyList,
+            double pixelsPerDip)
+        {
+            var list = new List<Stroke>();
+            if (string.IsNullOrEmpty(text) || placeRect.Width < 1 || placeRect.Height < 1)
+                return list;
+
+            var typeface = ResolveHandwritingTypeface(fontFamilyList);
+            var culture = CultureInfo.CurrentCulture;
+            var em = Math.Max(6.0, placeRect.Height * 0.72);
+            FormattedText ft = null;
+
+            for (var i = 0; i < 14; i++)
+            {
+                ft = new FormattedText(
+                    text,
+                    culture,
+                    FlowDirection.LeftToRight,
+                    typeface,
+                    em,
+                    Brushes.Black,
+                    new NumberSubstitution(NumberCultureSource.Text, culture, NumberSubstitutionMethod.Context),
+                    TextFormattingMode.Display,
+                    pixelsPerDip);
+
+                if (ft.Width <= placeRect.Width * 0.96 && ft.Height <= placeRect.Height * 0.96)
+                    break;
+
+                em *= 0.9;
+                if (em < 4.5)
+                    break;
+            }
+
+            if (ft == null || ft.Width < 0.5 || ft.Height < 0.5)
+                return list;
+
+            var scale = Math.Min(
+                placeRect.Width * 0.94 / Math.Max(1e-6, ft.Width),
+                placeRect.Height * 0.94 / Math.Max(1e-6, ft.Height));
+            var tx = placeRect.Left + (placeRect.Width - ft.Width * scale) / 2.0;
+            var ty = placeRect.Top + (placeRect.Height - ft.Height * scale) / 2.0;
+
+            Geometry geom;
+            try
+            {
+                geom = ft.BuildGeometry(new Point(0, 0));
+            }
+            catch
+            {
+                return list;
+            }
+
+            if (geom == null || geom.IsEmpty())
+                return list;
+
+            var m = new Matrix(scale, 0, 0, scale, tx, ty);
+            geom.Transform = new MatrixTransform(m);
+            return StrokesFromOutlinedGeometry(geom, templateDa, 0.35);
+        }
+
+        private static List<Stroke> StrokesFromOutlinedGeometry(Geometry geometry, DrawingAttributes da, double tolerance)
+        {
+            var list = new List<Stroke>();
+            if (geometry == null || geometry.IsEmpty() || da == null)
+                return list;
+
+            Geometry outlined;
+            try
+            {
+                outlined = geometry.GetOutlinedPathGeometry(tolerance, ToleranceType.Absolute);
+            }
+            catch
+            {
+                return list;
+            }
+
+            if (outlined == null || outlined.IsEmpty())
+                return list;
+
+            Geometry flat;
+            try
+            {
+                flat = outlined.GetFlattenedPathGeometry(tolerance, ToleranceType.Absolute);
+            }
+            catch
+            {
+                return list;
+            }
+
+            if (!(flat is PathGeometry pg))
+                return list;
+
+            foreach (var fig in pg.Figures)
+            {
+                var pts = new StylusPointCollection();
+                pts.Add(new StylusPoint(fig.StartPoint.X, fig.StartPoint.Y, 0.5f));
+                foreach (var seg in fig.Segments)
+                {
+                    switch (seg)
+                    {
+                        case LineSegment ls:
+                            pts.Add(new StylusPoint(ls.Point.X, ls.Point.Y, 0.5f));
+                            break;
+                        case PolyLineSegment pls:
+                            foreach (var p in pls.Points)
+                                pts.Add(new StylusPoint(p.X, p.Y, 0.5f));
+                            break;
+                    }
+                }
+
+                if (pts.Count >= 2)
+                    list.Add(new Stroke(pts) { DrawingAttributes = da.Clone() });
+            }
+
+            return list;
+        }
+    }
+
+    /// <summary>单个手写词片段的识别结果。</summary>
+    public sealed class HandwritingWordSegment
+    {
+        public HandwritingWordSegment(
+            string text,
+            IReadOnlyList<string> textCandidates,
+            Rect boundingRectangle,
+            IReadOnlyList<Stroke> strokes)
+        {
+            Text = text ?? string.Empty;
+            TextCandidates = textCandidates ?? Array.Empty<string>();
+            BoundingRectangle = boundingRectangle;
+            Strokes = strokes ?? Array.Empty<Stroke>();
+        }
+
+        public string Text { get; }
+        public IReadOnlyList<string> TextCandidates { get; }
+        public Rect BoundingRectangle { get; }
+        public IReadOnlyList<Stroke> Strokes { get; }
+    }
+
+    /// <summary>一次手写识别批次的汇总结果。</summary>
+    public sealed class HandwritingRecognitionResult
+    {
+        public static readonly HandwritingRecognitionResult Empty = new HandwritingRecognitionResult();
+
+        private HandwritingRecognitionResult()
+        {
+            Words = Array.Empty<HandwritingWordSegment>();
+            IsSuccess = false;
+            CombinedText = string.Empty;
+        }
+
+        public HandwritingRecognitionResult(IReadOnlyList<HandwritingWordSegment> words)
+        {
+            Words = words ?? Array.Empty<HandwritingWordSegment>();
+            IsSuccess = Words.Count > 0;
+            CombinedText = string.Join("", Words.Select(w => w.Text ?? string.Empty));
+        }
+
+        public bool IsSuccess { get; }
+        public IReadOnlyList<HandwritingWordSegment> Words { get; }
+        public string CombinedText { get; }
+    }
+}

Ink Canvas/Helpers/WinRtInkShapeRecognizer.cs

@@ -0,0 +1,261 @@
+using OSVersionExtension;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Media;
+using SysPoint = System.Windows.Point;
+using WinRtInkAnalyzer = global::Windows.UI.Input.Inking.Analysis.InkAnalyzer;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>基于 Windows.UI.Input.Inking.Analysis 的形状识别（适用于 64 位进程等场景）。</summary>
+    internal static class WinRtInkShapeRecognizer
+    {
+        public static bool IsApiAvailable =>
+            OSVersion.GetOperatingSystem() >= OSVersionExtension.OperatingSystem.Windows10;
+
+        public static void Warmup()
+        {
+            if (!IsApiAvailable) return;
+            try
+            {
+                var d = Application.Current?.Dispatcher;
+                if (d == null) return;
+                d.BeginInvoke(new Action(async () =>
+                {
+                    try
+                    {
+                        await RecognizeShapeAsync(new StrokeCollection());
+                    }
+                    catch
+                    {
+                        // ignore
+                    }
+                }));
+            }
+            catch
+            {
+                // ignore
+            }
+        }
+
+        /// <summary>由 <see cref="ModernInkProcessor"/> / <see cref="InkRecognitionManager"/> 在 UI 上 await（勿在收笔回调中同步阻塞）。</summary>
+        internal static async Task<InkShapeRecognitionResult> RecognizeShapeAsync(StrokeCollection strokes)
+        {
+            if (!IsApiAvailable || strokes == null || strokes.Count == 0)
+                return InkShapeRecognitionResult.Empty;
+
+            try
+            {
+                var analyzer = new WinRtInkAnalyzer();
+                var added = 0;
+                foreach (Stroke s in strokes)
+                {
+                    var inkStroke = CreateInkStrokeFromWpf(s);
+                    if (inkStroke == null)
+                        continue;
+
+                    analyzer.AddDataForStroke(inkStroke);
+                    analyzer.SetStrokeDataKind(
+                        inkStroke.Id,
+                        global::Windows.UI.Input.Inking.Analysis.InkAnalysisStrokeKind.Drawing);
+                    added++;
+                }
+
+                if (added == 0)
+                    return InkShapeRecognitionResult.Empty;
+
+                await analyzer.AnalyzeAsync().AsTask().ConfigureAwait(true);
+
+                var drawing = FindPrimaryDrawing(analyzer);
+                if (drawing == null)
+                    return InkShapeRecognitionResult.Empty;
+
+                if (drawing.DrawingKind == global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind.Drawing)
+                    return InkShapeRecognitionResult.Empty;
+
+                var name = MapDrawingKindToShapeName(drawing.DrawingKind);
+                if (string.IsNullOrEmpty(name) || name == "Drawing")
+                    return InkShapeRecognitionResult.Empty;
+
+                var winPts = CopyWinRtPoints(drawing);
+                var hot = ToWpfPointCollection(winPts);
+                var c = drawing.Center;
+                var centroid = new SysPoint(c.X, c.Y);
+                BoundsFromPoints(winPts, out double w, out double h);
+
+                var toRemove = new StrokeCollection();
+                foreach (Stroke s in strokes)
+                    toRemove.Add(s);
+
+                return new InkShapeRecognitionResult(name, centroid, hot, w, h, toRemove);
+            }
+            catch (Exception)
+            {
+                return InkShapeRecognitionResult.Empty;
+            }
+        }
+
+        /// <summary>供 WinRT 手写等模块复用：将 WPF <see cref="Stroke"/> 转为 WinRT <see cref="global::Windows.UI.Input.Inking.InkStroke"/>。</summary>
+        internal static global::Windows.UI.Input.Inking.InkStroke CreateInkStrokeFromWpf(Stroke stroke)
+        {
+            if (stroke?.StylusPoints == null || stroke.StylusPoints.Count == 0)
+                return null;
+
+            var da = stroke.DrawingAttributes;
+            var wda = new global::Windows.UI.Input.Inking.InkDrawingAttributes
+            {
+                PenTip = global::Windows.UI.Input.Inking.PenTipShape.Circle,
+                Color = global::Windows.UI.Color.FromArgb(da.Color.A, da.Color.R, da.Color.G, da.Color.B),
+                Size = new global::Windows.Foundation.Size((float)da.Width, (float)da.Height)
+            };
+
+            var builder = new global::Windows.UI.Input.Inking.InkStrokeBuilder();
+            builder.SetDefaultDrawingAttributes(wda);
+
+            var points = new List<global::Windows.Foundation.Point>(stroke.StylusPoints.Count);
+            foreach (StylusPoint sp in stroke.StylusPoints)
+            {
+                var pi = sp.ToPoint();
+                points.Add(new global::Windows.Foundation.Point((float)pi.X, (float)pi.Y));
+            }
+
+            if (points.Count == 0)
+                return null;
+
+            return builder.CreateStroke(points);
+        }
+
+        private static global::Windows.UI.Input.Inking.Analysis.InkAnalysisInkDrawing FindPrimaryDrawing(
+            WinRtInkAnalyzer analyzer)
+        {
+            global::Windows.UI.Input.Inking.Analysis.InkAnalysisInkDrawing best = null;
+            double bestArea = -1;
+            if (analyzer?.AnalysisRoot != null)
+                Visit(analyzer.AnalysisRoot);
+            return best;
+
+            void Visit(global::Windows.UI.Input.Inking.Analysis.IInkAnalysisNode node)
+            {
+                if (node == null) return;
+
+                if (node is global::Windows.UI.Input.Inking.Analysis.InkAnalysisInkDrawing d &&
+                    d.DrawingKind != global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind.Drawing)
+                {
+                    double area = EstimateDrawingArea(d);
+                    if (area > bestArea)
+                    {
+                        bestArea = area;
+                        best = d;
+                    }
+                }
+
+                // WinRT IInkAnalysisNode.Children 可能为 null，不可直接 foreach。
+                var children = node.Children;
+                if (children == null) return;
+
+                foreach (var child in children)
+                    Visit(child);
+            }
+        }
+
+        private static double EstimateDrawingArea(global::Windows.UI.Input.Inking.Analysis.InkAnalysisInkDrawing drawing)
+        {
+            var pts = CopyWinRtPoints(drawing);
+            BoundsFromPoints(pts, out double w, out double h);
+            return w * h;
+        }
+
+        private static global::Windows.Foundation.Point[] CopyWinRtPoints(
+            global::Windows.UI.Input.Inking.Analysis.InkAnalysisInkDrawing drawing)
+        {
+            var src = drawing?.Points;
+            if (src == null)
+                return Array.Empty<global::Windows.Foundation.Point>();
+
+            var n = src.Count;
+            if (n == 0)
+                return Array.Empty<global::Windows.Foundation.Point>();
+
+            var arr = new global::Windows.Foundation.Point[n];
+            for (var i = 0; i < n; i++)
+                arr[i] = src[i];
+            return arr;
+        }
+
+        private static void BoundsFromPoints(
+            System.Collections.Generic.IReadOnlyList<global::Windows.Foundation.Point> points,
+            out double w,
+            out double h)
+        {
+            if (points == null || points.Count == 0)
+            {
+                w = h = 0;
+                return;
+            }
+
+            double minX = double.MaxValue, maxX = double.MinValue, minY = double.MaxValue, maxY = double.MinValue;
+            for (int i = 0; i < points.Count; i++)
+            {
+                var pt = points[i];
+                minX = Math.Min(minX, pt.X);
+                maxX = Math.Max(maxX, pt.X);
+                minY = Math.Min(minY, pt.Y);
+                maxY = Math.Max(maxY, pt.Y);
+            }
+
+            w = Math.Max(0, maxX - minX);
+            h = Math.Max(0, maxY - minY);
+        }
+
+        private static PointCollection ToWpfPointCollection(
+            System.Collections.Generic.IReadOnlyList<global::Windows.Foundation.Point> points)
+        {
+            var hot = new PointCollection();
+            if (points == null) return hot;
+            for (int i = 0; i < points.Count; i++)
+            {
+                var pt = points[i];
+                hot.Add(new SysPoint(pt.X, pt.Y));
+            }
+
+            return hot;
+        }
+
+        private static string MapDrawingKindToShapeName(
+            global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind kind)
+        {
+            switch (kind)
+            {
+                case global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind.Circle:
+                    return "Circle";
+                case global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind.Ellipse:
+                    return "Ellipse";
+                case global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind.Triangle:
+                case global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind.IsoscelesTriangle:
+                case global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind.EquilateralTriangle:
+                case global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind.RightTriangle:
+                    return "Triangle";
+                case global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind.Rectangle:
+                    return "Rectangle";
+                case global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind.Square:
+                    return "Square";
+                case global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind.Diamond:
+                    return "Diamond";
+                case global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind.Trapezoid:
+                    return "Trapezoid";
+                case global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind.Parallelogram:
+                    return "Parallelogram";
+                case global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind.Quadrilateral:
+                    return "Quadrilateral";
+                default:
+                    return kind == global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind.Drawing
+                        ? "Drawing"
+                        : kind.ToString();
+            }
+        }
+    }
+}

Ink Canvas/Helpers/WindowOverviewModel.cs

@@ -0,0 +1,611 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 矩形结构体（用于窗口位置和大小）
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public struct WindowRect
+    {
+        public int Left;
+        public int Top;
+        public int Right;
+        public int Bottom;
+
+        public int Width => Right - Left;
+        public int Height => Bottom - Top;
+    }
+
+    /// <summary>
+    /// 窗口信息结构
+    /// </summary>
+    public class WindowInfo
+    {
+        public IntPtr Handle { get; set; }
+        public string Title { get; set; }
+        public string ClassName { get; set; }
+        public string ProcessName { get; set; }
+        public string ProcessPath { get; set; }
+        public WindowRect Rect { get; set; }
+        public bool IsVisible { get; set; }
+        public bool IsMinimized { get; set; }
+        public bool IsMaximized { get; set; }
+        public int ZOrder { get; set; }
+        public uint ProcessId { get; set; }
+        public bool IsFullScreen { get; set; }
+
+        /// <summary>
+        /// 计算窗口是否覆盖指定区域
+        /// </summary>
+        public bool CoversArea(WindowRect area)
+        {
+            if (!IsVisible || IsMinimized) return false;
+
+            // 计算交集
+            int left = Math.Max(Rect.Left, area.Left);
+            int top = Math.Max(Rect.Top, area.Top);
+            int right = Math.Min(Rect.Right, area.Right);
+            int bottom = Math.Min(Rect.Bottom, area.Bottom);
+
+            // 如果有交集，说明窗口覆盖了该区域
+            return left < right && top < bottom;
+        }
+
+        /// <summary>
+        /// 计算窗口覆盖指定区域的比例
+        /// </summary>
+        public double GetCoverageRatio(WindowRect area)
+        {
+            if (!IsVisible || IsMinimized) return 0.0;
+
+            // 计算交集
+            int left = Math.Max(Rect.Left, area.Left);
+            int top = Math.Max(Rect.Top, area.Top);
+            int right = Math.Min(Rect.Right, area.Right);
+            int bottom = Math.Min(Rect.Bottom, area.Bottom);
+
+            if (left >= right || top >= bottom) return 0.0;
+
+            // 计算交集面积
+            double intersectionArea = (right - left) * (bottom - top);
+            // 计算目标区域面积
+            double targetArea = area.Width * area.Height;
+
+            if (targetArea == 0) return 0.0;
+
+            return intersectionArea / targetArea;
+        }
+    }
+
+    /// <summary>
+    /// 窗口概览模型 - 实时监控桌面所有可见窗口并计算遮挡情况
+    /// </summary>
+    public class WindowOverviewModel : IDisposable
+    {
+        #region Win32 API Declarations
+        [DllImport("user32.dll")]
+        private static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, IntPtr lParam);
+
+        [DllImport("user32.dll")]
+        private static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
+
+        [DllImport("user32.dll")]
+        private static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool GetWindowRect(IntPtr hWnd, out WindowRect lpRect);
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool IsWindowVisible(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool IsIconic(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool IsZoomed(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr GetForegroundWindow();
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr GetWindow(IntPtr hWnd, uint uCmd);
+
+        private const uint GW_HWNDNEXT = 2;
+        private const uint GW_HWNDPREV = 3;
+
+        private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
+        #endregion
+
+        private readonly object _lockObject = new object();
+        private List<WindowInfo> _windows = new List<WindowInfo>();
+        private Timer _updateTimer;
+        private bool _isDisposed = false;
+        private readonly int _updateInterval = 1000; // 更新间隔（毫秒）
+
+        private readonly Dictionary<uint, ProcessCacheInfo> _processCache = new Dictionary<uint, ProcessCacheInfo>();
+        private readonly object _processCacheLock = new object();
+        private DateTime _lastProcessCacheCleanup = DateTime.Now;
+        private const int PROCESS_CACHE_CLEANUP_INTERVAL_MS = 30000;
+
+        // 窗口缓存，用于增量更新
+        private readonly Dictionary<IntPtr, WindowInfo> _windowCache = new Dictionary<IntPtr, WindowInfo>();
+
+        /// <summary>
+        /// 进程缓存信息
+        /// </summary>
+        private class ProcessCacheInfo
+        {
+            public string ProcessName { get; set; }
+            public string ProcessPath { get; set; }
+            public DateTime LastAccessTime { get; set; }
+        }
+
+        /// <summary>
+        /// 窗口列表更新事件
+        /// </summary>
+        public event EventHandler<List<WindowInfo>> WindowsUpdated;
+
+        /// <summary>
+        /// 当前窗口列表（按Z顺序排序，最上层在前）
+        /// </summary>
+        public List<WindowInfo> Windows
+        {
+            get
+            {
+                lock (_lockObject)
+                {
+                    return new List<WindowInfo>(_windows);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        public WindowOverviewModel()
+        {
+            // 立即执行一次更新
+            UpdateWindows();
+
+            // 启动定时器，定期更新窗口列表
+            _updateTimer = new Timer(OnUpdateTimer, null, _updateInterval, _updateInterval);
+        }
+
+        /// <summary>
+        /// 定时器回调
+        /// </summary>
+        private void OnUpdateTimer(object state)
+        {
+            if (_isDisposed) return;
+
+            try
+            {
+                UpdateWindows();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"窗口概览模型更新失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 获取进程信息
+        /// </summary>
+        private (string processName, string processPath) GetProcessInfo(uint processId)
+        {
+            lock (_processCacheLock)
+            {
+                // 定期清理缓存
+                var now = DateTime.Now;
+                if ((now - _lastProcessCacheCleanup).TotalMilliseconds > PROCESS_CACHE_CLEANUP_INTERVAL_MS)
+                {
+                    var keysToRemove = _processCache
+                        .Where(kvp => (now - kvp.Value.LastAccessTime).TotalMilliseconds > PROCESS_CACHE_CLEANUP_INTERVAL_MS)
+                        .Select(kvp => kvp.Key)
+                        .ToList();
+
+                    foreach (var key in keysToRemove)
+                    {
+                        _processCache.Remove(key);
+                    }
+
+                    _lastProcessCacheCleanup = now;
+                }
+
+                // 检查缓存
+                if (_processCache.TryGetValue(processId, out var cachedInfo))
+                {
+                    cachedInfo.LastAccessTime = now;
+                    return (cachedInfo.ProcessName, cachedInfo.ProcessPath);
+                }
+
+                // 缓存未命中，获取进程信息
+                string processName = "Unknown";
+                string processPath = "Unknown";
+
+                try
+                {
+                    Process process = Process.GetProcessById((int)processId);
+                    processName = process.ProcessName;
+                    try
+                    {
+                        processPath = process.MainModule?.FileName ?? "Unknown";
+                    }
+                    catch
+                    {
+                        processPath = "Unknown";
+                    }
+                }
+                catch
+                {
+                    // 进程可能已退出
+                }
+
+                // 添加到缓存
+                _processCache[processId] = new ProcessCacheInfo
+                {
+                    ProcessName = processName,
+                    ProcessPath = processPath,
+                    LastAccessTime = now
+                };
+
+                return (processName, processPath);
+            }
+        }
+
+        /// <summary>
+        /// 检查窗口信息是否发生变化
+        /// </summary>
+        private bool HasWindowChanged(IntPtr hWnd, WindowRect rect, bool isMinimized, bool isMaximized, bool isFullScreen)
+        {
+            if (!_windowCache.TryGetValue(hWnd, out var cachedWindow))
+            {
+                return true; // 新窗口
+            }
+
+            // 检查关键属性是否变化
+            return cachedWindow.Rect.Left != rect.Left ||
+                   cachedWindow.Rect.Top != rect.Top ||
+                   cachedWindow.Rect.Right != rect.Right ||
+                   cachedWindow.Rect.Bottom != rect.Bottom ||
+                   cachedWindow.IsMinimized != isMinimized ||
+                   cachedWindow.IsMaximized != isMaximized ||
+                   cachedWindow.IsFullScreen != isFullScreen;
+        }
+
+        /// <summary>
+        /// 更新窗口列表
+        /// </summary>
+        public void UpdateWindows()
+        {
+            var windows = new List<WindowInfo>();
+            var zOrder = 0;
+            var currentWindowHandles = new HashSet<IntPtr>();
+
+            EnumWindows((hWnd, lParam) =>
+            {
+                try
+                {
+                    // 检查窗口是否可见
+                    if (!IsWindowVisible(hWnd)) return true;
+
+                    // 检查窗口是否最小化
+                    bool isMinimized = IsIconic(hWnd);
+                    if (isMinimized) return true;
+
+                    // 获取窗口矩形
+                    if (!GetWindowRect(hWnd, out WindowRect rect)) return true;
+
+                    // 过滤掉无效的窗口
+                    if (rect.Width <= 0 || rect.Height <= 0) return true;
+                    if (rect.Right < rect.Left || rect.Bottom < rect.Top) return true;
+
+                    // 检查是否最大化
+                    bool isMaximized = IsZoomed(hWnd);
+
+                    // 检查是否全屏（窗口大小接近屏幕大小）
+                    bool isFullScreen = false;
+                    try
+                    {
+                        var screen = System.Windows.Forms.Screen.FromHandle(hWnd);
+                        var screenBounds = screen.Bounds;
+                        // 如果窗口大小接近屏幕大小（允许10像素误差），认为是全屏
+                        isFullScreen = rect.Width >= screenBounds.Width - 10 &&
+                                      rect.Height >= screenBounds.Height - 10 &&
+                                      Math.Abs(rect.Left - screenBounds.Left) <= 10 &&
+                                      Math.Abs(rect.Top - screenBounds.Top) <= 10;
+                    }
+                    catch
+                    {
+                        // 无法获取屏幕信息，使用默认值
+                    }
+
+                    // 检查窗口是否发生变化
+                    bool windowChanged = HasWindowChanged(hWnd, rect, isMinimized, isMaximized, isFullScreen);
+
+                    // 获取进程信息
+                    GetWindowThreadProcessId(hWnd, out uint processId);
+
+                    // 使用缓存的进程信息
+                    var (processName, processPath) = GetProcessInfo(processId);
+
+                    // 跳过当前应用程序的窗口（避免检测到自己）
+                    if (processName == "InkCanvasForClass" || processName == "Ink Canvas")
+                    {
+                        return true;
+                    }
+
+                    // 如果窗口信息未变化且已缓存，尝试重用缓存的数据
+                    WindowInfo windowInfo;
+                    if (!windowChanged && _windowCache.TryGetValue(hWnd, out var cachedInfo))
+                    {
+                        // 重用缓存的窗口信息，只更新Z顺序和可能变化的状态
+                        windowInfo = new WindowInfo
+                        {
+                            Handle = hWnd,
+                            Title = cachedInfo.Title,
+                            ClassName = cachedInfo.ClassName,
+                            ProcessName = cachedInfo.ProcessName,
+                            ProcessPath = cachedInfo.ProcessPath,
+                            Rect = rect, // 使用最新的rect（虽然理论上应该相同）
+                            IsVisible = true,
+                            IsMinimized = false,
+                            IsMaximized = isMaximized,
+                            ZOrder = zOrder++,
+                            ProcessId = processId,
+                            IsFullScreen = isFullScreen
+                        };
+
+                        // 更新缓存以保持ZOrder等属性最新
+                        _windowCache[hWnd] = windowInfo;
+                    }
+                    else
+                    {
+                        // 窗口信息变化或新窗口，需要获取完整信息
+                        // 获取窗口标题
+                        const int nChars = 256;
+                        StringBuilder windowTitle = new StringBuilder(nChars);
+                        GetWindowText(hWnd, windowTitle, nChars);
+                        string title = windowTitle.ToString();
+
+                        // 获取窗口类名
+                        StringBuilder className = new StringBuilder(nChars);
+                        GetClassName(hWnd, className, nChars);
+                        string classNameStr = className.ToString();
+
+                        windowInfo = new WindowInfo
+                        {
+                            Handle = hWnd,
+                            Title = title,
+                            ClassName = classNameStr,
+                            ProcessName = processName,
+                            ProcessPath = processPath,
+                            Rect = rect,
+                            IsVisible = true,
+                            IsMinimized = false,
+                            IsMaximized = isMaximized,
+                            ZOrder = zOrder++,
+                            ProcessId = processId,
+                            IsFullScreen = isFullScreen
+                        };
+
+                        // 更新缓存
+                        _windowCache[hWnd] = windowInfo;
+                    }
+
+                    windows.Add(windowInfo);
+                    currentWindowHandles.Add(hWnd);
+                }
+                catch
+                {
+                    // 忽略单个窗口的错误，继续枚举其他窗口
+                }
+
+                return true; // 继续枚举
+            }, IntPtr.Zero);
+
+            // 清理已关闭的窗口缓存
+            var handlesToRemove = _windowCache.Keys.Where(h => !currentWindowHandles.Contains(h)).ToList();
+            foreach (var handle in handlesToRemove)
+            {
+                _windowCache.Remove(handle);
+            }
+
+            windows = windows.OrderByDescending(w => w.ZOrder).ToList();
+
+            lock (_lockObject)
+            {
+                _windows = windows;
+            }
+
+            // 触发更新事件
+            WindowsUpdated?.Invoke(this, windows);
+        }
+
+        /// <summary>
+        /// 检查指定区域是否被其他窗口覆盖
+        /// </summary>
+        /// <param name="area">要检查的区域</param>
+        /// <param name="excludeProcessNames">要排除的进程名列表（例如当前应用程序）</param>
+        /// <param name="coverageThreshold">覆盖阈值（0.0-1.0），超过此阈值认为被覆盖</param>
+        /// <returns>如果被覆盖返回true</returns>
+        public bool IsAreaCovered(WindowRect area, List<string> excludeProcessNames = null, double coverageThreshold = 0.5)
+        {
+            lock (_lockObject)
+            {
+                excludeProcessNames = excludeProcessNames ?? new List<string>();
+
+                // 从最上层窗口开始检查
+                foreach (var window in _windows)
+                {
+                    // 跳过排除的进程
+                    if (excludeProcessNames.Contains(window.ProcessName)) continue;
+
+                    // 计算覆盖比例
+                    double coverage = window.GetCoverageRatio(area);
+                    if (coverage >= coverageThreshold)
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 检查指定区域是否被全屏窗口覆盖
+        /// </summary>
+        /// <param name="area">要检查的区域</param>
+        /// <param name="excludeProcessNames">要排除的进程名列表</param>
+        /// <returns>如果被全屏窗口覆盖返回true</returns>
+        public bool IsAreaCoveredByFullScreenWindow(WindowRect area, List<string> excludeProcessNames = null)
+        {
+            lock (_lockObject)
+            {
+                excludeProcessNames = excludeProcessNames ?? new List<string>();
+
+                // 查找全屏窗口
+                foreach (var window in _windows)
+                {
+                    // 跳过排除的进程
+                    if (excludeProcessNames.Contains(window.ProcessName)) continue;
+
+                    // 只检查全屏窗口
+                    if (window.IsFullScreen && window.CoversArea(area))
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 获取覆盖指定区域的所有窗口
+        /// </summary>
+        /// <param name="area">要检查的区域</param>
+        /// <param name="excludeProcessNames">要排除的进程名列表</param>
+        /// <param name="coverageThreshold">覆盖阈值</param>
+        /// <returns>覆盖该区域的窗口列表（按Z顺序，最上层在前）</returns>
+        public List<WindowInfo> GetCoveringWindows(WindowRect area, List<string> excludeProcessNames = null, double coverageThreshold = 0.1)
+        {
+            lock (_lockObject)
+            {
+                excludeProcessNames = excludeProcessNames ?? new List<string>();
+                var coveringWindows = new List<WindowInfo>();
+
+                foreach (var window in _windows)
+                {
+                    // 跳过排除的进程
+                    if (excludeProcessNames.Contains(window.ProcessName)) continue;
+
+                    // 计算覆盖比例
+                    double coverage = window.GetCoverageRatio(area);
+                    if (coverage >= coverageThreshold)
+                    {
+                        coveringWindows.Add(window);
+                    }
+                }
+
+                return coveringWindows;
+            }
+        }
+
+        /// <summary>
+        /// 检查是否有全屏窗口
+        /// </summary>
+        /// <param name="excludeProcessNames">要排除的进程名列表</param>
+        /// <returns>如果有全屏窗口返回true</returns>
+        public bool HasFullScreenWindow(List<string> excludeProcessNames = null)
+        {
+            lock (_lockObject)
+            {
+                excludeProcessNames = excludeProcessNames ?? new List<string>();
+
+                return _windows.Any(w => !excludeProcessNames.Contains(w.ProcessName) && w.IsFullScreen);
+            }
+        }
+
+        /// <summary>
+        /// 获取所有全屏窗口
+        /// </summary>
+        /// <param name="excludeProcessNames">要排除的进程名列表</param>
+        /// <returns>全屏窗口列表</returns>
+        public List<WindowInfo> GetFullScreenWindows(List<string> excludeProcessNames = null)
+        {
+            lock (_lockObject)
+            {
+                excludeProcessNames = excludeProcessNames ?? new List<string>();
+
+                return _windows.Where(w => !excludeProcessNames.Contains(w.ProcessName) && w.IsFullScreen).ToList();
+            }
+        }
+
+        /// <summary>
+        /// 根据进程名查找窗口
+        /// </summary>
+        /// <param name="processName">进程名</param>
+        /// <returns>匹配的窗口列表</returns>
+        public List<WindowInfo> FindWindowsByProcessName(string processName)
+        {
+            lock (_lockObject)
+            {
+                return _windows.Where(w => w.ProcessName.Equals(processName, StringComparison.OrdinalIgnoreCase)).ToList();
+            }
+        }
+
+        /// <summary>
+        /// 根据窗口标题查找窗口
+        /// </summary>
+        /// <param name="title">窗口标题（支持部分匹配）</param>
+        /// <returns>匹配的窗口列表</returns>
+        public List<WindowInfo> FindWindowsByTitle(string title)
+        {
+            lock (_lockObject)
+            {
+                return _windows.Where(w => w.Title.IndexOf(title, StringComparison.OrdinalIgnoreCase) >= 0).ToList();
+            }
+        }
+
+        /// <summary>
+        /// 释放资源
+        /// </summary>
+        public void Dispose()
+        {
+            if (_isDisposed) return;
+
+            _isDisposed = true;
+            _updateTimer?.Dispose();
+            _updateTimer = null;
+
+            lock (_lockObject)
+            {
+                _windows.Clear();
+            }
+
+            lock (_processCacheLock)
+            {
+                _processCache.Clear();
+            }
+
+            _windowCache.Clear();
+        }
+    }
+}
+

Ink Canvas/Helpers/WindowsNotificationHelper.cs

@@ -0,0 +1,62 @@
+using Hardcodet.Wpf.TaskbarNotification;
+using Microsoft.Toolkit.Uwp.Notifications;
+using System;
+using System.Windows;
+
+namespace Ink_Canvas.Helpers
+{
+    internal static class WindowsNotificationHelper
+    {
+        private const string APP_ID = "InkCanvasForClass.CE";
+
+        public static void ShowNewVersionToast(string version)
+        {
+            try
+            {
+                var os = Environment.OSVersion.Version;
+
+                if (os.Major == 6 && os.Minor == 1)
+                {
+                    ShowBalloonForWin7(version);
+                }
+                else
+                {
+                    ShowToastForModernWindows(version);
+                }
+            }
+            catch
+            {
+            }
+        }
+
+        private static void ShowBalloonForWin7(string version)
+        {
+            Application.Current?.Dispatcher.Invoke(() =>
+            {
+                try
+                {
+                    var taskbar = Application.Current.Resources["TaskbarTrayIcon"] as TaskbarIcon;
+                    if (taskbar == null) return;
+
+                    taskbar.Visibility = Visibility.Visible;
+
+                    taskbar.ShowBalloonTip(
+                        "InkCanvasForClass CE",
+                        $"发现新版本！：{version}",
+                        BalloonIcon.Info);
+                }
+                catch
+                {
+                }
+            });
+        }
+
+        private static void ShowToastForModernWindows(string version)
+        {
+            new ToastContentBuilder()
+                .AddText("InkCanvasForClass CE")
+                .AddText($"发现新版本！：{version}")
+                .Show();
+        }
+    }
+}

Ink Canvas/InkCanvasForClass.csproj

@@ -1,10 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <RuntimeIdentifiers>win;win-x86;win-x64;win-arm64</RuntimeIdentifiers>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Ink_Canvas</RootNamespace>
     <AssemblyName>InkCanvasForClass</AssemblyName>
     <TargetFramework>net472</TargetFramework>
+    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>false</IsWebBootstrapper>
@@ -24,91 +25,78 @@
     <BootstrapperEnabled>false</BootstrapperEnabled>
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>
-    <Configurations>Debug;Release;x86 Debug</Configurations>
+    <Configurations>Debug;Release</Configurations>
+    <Platforms>AnyCPU;x86;x64;ARM64</Platforms>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>embedded</DebugType>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <Prefer32Bit>True</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x86 Debug|AnyCPU'">
-    <DebugType>embedded</DebugType>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <Prefer32Bit>True</Prefer32Bit>
+    <OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>embedded</DebugType>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <Prefer32Bit>True</Prefer32Bit>
+    <OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Resources\icc.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DebugType>full</DebugType>
-    <LangVersion>7.3</LangVersion>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x86 Debug|x86'">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DebugType>full</DebugType>
+    <OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
+    <DebugType>embedded</DebugType>
     <LangVersion>7.3</LangVersion>
+    <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DebugType>pdbonly</DebugType>
+    <OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
+    <DebugType>embedded</DebugType>
     <LangVersion>7.3</LangVersion>
+    <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Title>InkCanvasForClass</Title>
-    <Version>5.0.4</Version>
-    <Authors>Dubi906w</Authors>
+    <Version>1.7</Version>
+    <Authors>CJK_mkp</Authors>
     <Product>InkCanvasForClass</Product>
-    <Copyright>© Copyright HARKOTEK Studio 2024-now</Copyright>
-    <PackageProjectUrl>https://icc.bliemhax.com</PackageProjectUrl>
+    <Copyright>© Copyright  CJK_mkp 2025-now</Copyright>
+    <PackageProjectUrl>https://inkcanvasforclass.github.io</PackageProjectUrl>
     <FileVersion>bundled</FileVersion>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
     <DebugType>full</DebugType>
     <LangVersion>7.3</LangVersion>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x86 Debug|ARM64'">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DebugType>full</DebugType>
-    <LangVersion>7.3</LangVersion>
-    <Prefer32Bit>true</Prefer32Bit>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
     <DebugType>pdbonly</DebugType>
     <LangVersion>7.3</LangVersion>
-    <Prefer32Bit>true</Prefer32Bit>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DebugType>full</DebugType>
+    <OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
+    <DebugType>none</DebugType>
+    <DebugSymbols>false</DebugSymbols>
     <LangVersion>7.3</LangVersion>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x86 Debug|x64'">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DebugType>full</DebugType>
-    <LangVersion>7.3</LangVersion>
-    <Prefer32Bit>true</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DebugType>pdbonly</DebugType>
+    <OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
+    <DebugType>none</DebugType>
+    <DebugSymbols>false</DebugSymbols>
     <LangVersion>7.3</LangVersion>
-    <Prefer32Bit>true</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="IACore">
@@ -146,22 +134,30 @@
   <ItemGroup>
     <PackageReference Include="Costura.Fody" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
-    <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.27" />
+    <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="2.0.1" />
+    <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.10.2.1" />
+    <PackageReference Include="iNKORE.UI.WPF" Version="1.2.8" />
     <PackageReference Include="MdXaml" Version="1.27.0" />
     <PackageReference Include="Microsoft.Office.Interop.PowerPoint" Version="15.0.4420.1018" />
+    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.2" />
     <PackageReference Include="MicrosoftOfficeCore" Version="15.0.0" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
+    <PackageReference Include="Microsoft.International.Converters.PinYinConverter" Version="1.0.0" />
+    <PackageReference Include="Sentry" Version="6.2.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NHotkey.Wpf" Version="3.0.0" />
-    <PackageReference Include="OSVersionExt" Version="3.0.0" />
-  <PackageReference Include="AForge.Video" Version="2.2.5" />
-  <PackageReference Include="AForge.Video.DirectShow" Version="2.2.5" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+    <PackageReference Include="NHotkey.Wpf" Version="4.0.0" />
+    <PackageReference Include="OSVersionExt" Version="4.1.0" />
+    <PackageReference Include="AForge.Video" Version="2.2.5" />
+    <PackageReference Include="AForge.Video.DirectShow" Version="2.2.5" />
+    <PackageReference Include="AForge.Imaging" Version="2.2.5" />
+    <PackageReference Include="AForge.Math" Version="2.2.5" />
+    <PackageReference Include="WebDav.Client" Version="2.9.0" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(MSBuildRuntimeType)' == 'Full'">
     <COMReference Include="IWshRuntimeLibrary">
       <Guid>{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}</Guid>
       <VersionMajor>1</VersionMajor>
@@ -180,15 +176,18 @@
       <Isolated>False</Isolated>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
-    <COMReference Include="VBIDE">
-      <Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
-      <VersionMajor>5</VersionMajor>
-      <VersionMinor>3</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
+  </ItemGroup>
+  <ItemGroup Condition="'$(MSBuildRuntimeType)' != 'Full'">
+    <Reference Include="Interop.IWshRuntimeLibrary">
+      <HintPath>libs\Interop.IWshRuntimeLibrary.dll</HintPath>
+      <Private>False</Private>
       <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
+    </Reference>
+    <Reference Include="Interop.stdole">
+      <HintPath>libs\Interop.stdole.dll</HintPath>
+      <Private>False</Private>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\TimerDownNotice.wav" />
@@ -267,6 +266,7 @@
     <Resource Include="Resources\DeveloperAvatars\STBBRD.png" />
     <Resource Include="Resources\DeveloperAvatars\WXRIW.png" />
     <Resource Include="Resources\DeveloperAvatars\PrefacedCorg.jpg" />
+    <Resource Include="Resources\DeveloperAvatars\PANDA-JSR.jpg" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Icons-png\down.png" />
@@ -292,6 +292,17 @@
   <ItemGroup>
     <Resource Include="Resources\Icons-Fluent\ic_fluent_delete_24_regular.png" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="privacy.txt" />
+    <EmbeddedResource Include="telemetry_dsn.txt" Condition="Exists('telemetry_dsn.txt') AND '$(DLASS_SENTRY_DSN)' == ''">
+      <Link>telemetry_dsn.txt</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="$(MSBuildProjectDirectory)\telemetry_dsn.generated.txt" Condition="'$(DLASS_SENTRY_DSN)' != ''">
+      <Link>telemetry_dsn.txt</Link>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </EmbeddedResource>
+  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Icons-Fluent\ic_fluent_cursorWITHdelete_24_regular.png" />
   </ItemGroup>
@@ -552,6 +563,14 @@
   <ItemGroup>
     <Compile Remove="AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Remove="Properties\Strings.en-US.resx" />
+    <EmbeddedResource Remove="**\Strings.en-US.resx" />
+    <None Include="Properties\Strings.en-US.resx" />
+    <EmbeddedResource Include="Properties\Strings.enUS.xml">
+      <LogicalName>Ink_Canvas.Properties.Strings.enUS.xml</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
   <ItemGroup>
     <None Remove="MainWindow.xaml~RF6c3144.TMP" />
     <None Remove="Resources\Cursors\Cursor.cur" />
@@ -654,4 +673,11 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
-</Project>
+  <Target Name="GenerateTelemetryDsn" BeforeTargets="PrepareResources" Condition="'$(DLASS_SENTRY_DSN)' != ''">
+    <WriteLinesToFile File="$(MSBuildProjectDirectory)\telemetry_dsn.generated.txt" Lines="$(DLASS_SENTRY_DSN)" Overwrite="true" />
+  </Target>
+
+  <Target Name="CleanTelemetryDsn" AfterTargets="Build;Clean" Condition="Exists('$(MSBuildProjectDirectory)\telemetry_dsn.generated.txt')">
+    <Delete Files="$(MSBuildProjectDirectory)\telemetry_dsn.generated.txt" />
+  </Target>
+</Project>

Ink Canvas/MainWindow_cs/ConfigHelper.cs

@@ -1,5 +1,11 @@
-namespace Ink_Canvas
+namespace Ink_Canvas
 {
+    /// <summary>
+    /// 配置助手类（预留），用于未来扩展配置相关的辅助方法。
+    /// </summary>
+    /// <remarks>
+    /// 该类目前为预留类，用于未来扩展配置相关的辅助方法。
+    /// </remarks>
     internal class ConfigHelper
     {
     }

Ink Canvas/MainWindow_cs/MW_AutoFold.cs

@@ -1,4 +1,4 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using iNKORE.UI.WPF.Modern;
 using System;
 using System.Threading;
@@ -13,9 +13,31 @@ namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
+        /// <summary>
+        /// 浮动栏是否折叠的标志。
+        /// </summary>
         public bool isFloatingBarFolded;
+
+        /// <summary>
+        /// 浮动栏正在改变隐藏模式的标志，用于防止重复操作。
+        /// </summary>
         private bool isFloatingBarChangingHideMode;
 
+        /// <summary>
+        /// 立即关闭白板模式，恢复到批注模式。
+        /// </summary>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 检查是否正在显示或隐藏黑板，如果是则直接返回
+        /// 2. 设置显示/隐藏黑板的标志为true
+        /// 3. 立即隐藏所有子面板
+        /// 4. 如果启用了自动切换多指手势，则关闭多指平移
+        /// 5. 隐藏所有水印
+        /// 6. 切换到批注模式
+        /// 7. 设置退出按钮前景色为白色
+        /// 8. 设置应用主题为深色
+        /// 9. 200毫秒后重置显示/隐藏黑板的标志为false
+        /// </remarks>
         private void CloseWhiteboardImmediately()
         {
             if (isDisplayingOrHidingBlackboard) return;
@@ -38,11 +60,35 @@ namespace Ink_Canvas
             }).Start();
         }
 
+        /// <summary>
+        /// 处理折叠浮动栏的鼠标点击事件。
+        /// </summary>
+        /// <param name="sender">事件发送者。</param>
+        /// <param name="e">鼠标按钮事件参数。</param>
         public async void FoldFloatingBar_MouseUp(object sender, MouseButtonEventArgs e)
         {
             await FoldFloatingBar(sender);
         }
 
+        /// <summary>
+        /// 折叠浮动栏，将其收纳到侧边栏。
+        /// </summary>
+        /// <param name="sender">事件发送者。</param>
+        /// <param name="isAutoFoldCommand">是否为自动折叠命令。</param>
+        /// <returns>表示异步操作的任务。</returns>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 检查是否应该拒绝操作（如点击了折叠图标但上次鼠标按下的对象不是折叠图标）
+        /// 2. 设置折叠/展开标志
+        /// 3. 检查浮动栏是否已经折叠或正在改变隐藏模式，如果是则直接返回
+        /// 4. 处理墨迹重放相关的UI元素
+        /// 5. 设置浮动栏状态标志，关闭白板模式（如果当前在白板模式）
+        /// 6. 如果是用户手动折叠且画布上有较多墨迹，显示通知
+        /// 7. 清空画布墨迹
+        /// 8. 隐藏PPT导航面板和浮动栏拖动网格
+        /// 9. 执行浮动栏和侧边栏的动画
+        /// 10. 如果开启了彻底隐藏，则隐藏主窗口
+        /// </remarks>
         public async Task FoldFloatingBar(object sender, bool isAutoFoldCommand = false)
         {
             var isShouldRejectAction = false;
@@ -54,7 +100,10 @@ namespace Ink_Canvas
                 if (sender == Fold_Icon && lastBorderMouseDownObject != Fold_Icon) isShouldRejectAction = true;
             });
 
-            if (isShouldRejectAction) return;
+            if (isShouldRejectAction)
+            {
+                return;
+            }
 
             // FloatingBarIcons_MouseUp_New(sender);
             if (sender == null)
@@ -63,7 +112,12 @@ namespace Ink_Canvas
                 foldFloatingBarByUser = true;
             unfoldFloatingBarByUser = false;
 
-            if (isFloatingBarChangingHideMode) return;
+            if (isFloatingBarFolded) return;
+
+            if (isFloatingBarChangingHideMode)
+            {
+                return;
+            }
 
             await Dispatcher.InvokeAsync(() =>
             {
@@ -103,8 +157,28 @@ namespace Ink_Canvas
                 HideSubPanels("cursor");
                 SidePannelMarginAnimation(-10);
             });
+
+            // 新增：如果开启了彻底隐藏，则隐藏主窗口
+            if (Settings.Automation.ThoroughlyHideWhenFolded)
+            {
+                await Dispatcher.InvokeAsync(() =>
+                {
+                    this.Visibility = Visibility.Hidden;
+                });
+            }
         }
 
+        /// <summary>
+        /// 处理左侧展开按钮显示快捷面板的鼠标点击事件。
+        /// </summary>
+        /// <param name="sender">事件发送者。</param>
+        /// <param name="e">鼠标按钮事件参数。</param>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 检查是否显示快捷面板
+        /// 2. 如果显示快捷面板，则隐藏右侧快捷面板，显示左侧快捷面板并执行动画
+        /// 3. 否则，调用展开浮动栏的方法
+        /// </remarks>
         private async void LeftUnFoldButtonDisplayQuickPanel_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (Settings.Appearance.IsShowQuickPanel)
@@ -135,6 +209,17 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理右侧展开按钮显示快捷面板的鼠标点击事件。
+        /// </summary>
+        /// <param name="sender">事件发送者。</param>
+        /// <param name="e">鼠标按钮事件参数。</param>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 检查是否显示快捷面板
+        /// 2. 如果显示快捷面板，则隐藏左侧快捷面板，显示右侧快捷面板并执行动画
+        /// 3. 否则，调用展开浮动栏的方法
+        /// </remarks>
         private async void RightUnFoldButtonDisplayQuickPanel_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (Settings.Appearance.IsShowQuickPanel)
@@ -165,6 +250,15 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 隐藏左侧快捷面板。
+        /// </summary>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 检查左侧快捷面板是否可见，如果不可见则直接返回
+        /// 2. 执行左侧快捷面板的隐藏动画
+        /// 3. 等待动画完成后，设置左侧快捷面板的边距并将其折叠
+        /// </remarks>
         private async void HideLeftQuickPanel()
         {
             if (LeftUnFoldButtonQuickPanel.Visibility == Visibility.Visible)
@@ -190,6 +284,15 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 隐藏右侧快捷面板。
+        /// </summary>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 检查右侧快捷面板是否可见，如果不可见则直接返回
+        /// 2. 执行右侧快捷面板的隐藏动画
+        /// 3. 等待动画完成后，设置右侧快捷面板的边距并将其折叠
+        /// </remarks>
         private async void HideRightQuickPanel()
         {
             if (RightUnFoldButtonQuickPanel.Visibility == Visibility.Visible)
@@ -215,19 +318,61 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理隐藏快捷面板的鼠标点击事件。
+        /// </summary>
+        /// <param name="sender">事件发送者。</param>
+        /// <param name="e">鼠标按钮事件参数。</param>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 隐藏左侧快捷面板
+        /// 2. 隐藏右侧快捷面板
+        /// </remarks>
         private void HideQuickPanel_MouseUp(object sender, MouseButtonEventArgs e)
         {
             HideLeftQuickPanel();
             HideRightQuickPanel();
         }
 
+        /// <summary>
+        /// 处理展开浮动栏的鼠标点击事件。
+        /// </summary>
+        /// <param name="sender">事件发送者。</param>
+        /// <param name="e">鼠标按钮事件参数。</param>
         public async void UnFoldFloatingBar_MouseUp(object sender, MouseButtonEventArgs e)
         {
             await UnFoldFloatingBar(sender);
         }
 
+        /// <summary>
+        /// 展开浮动栏，将其从侧边栏恢复到正常状态。
+        /// </summary>
+        /// <param name="sender">事件发送者。</param>
+        /// <returns>表示异步操作的任务。</returns>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 如果之前彻底隐藏了主窗口，先恢复显示
+        /// 2. 隐藏左右侧快捷面板
+        /// 3. 设置展开/折叠标志
+        /// 4. 检查浮动栏是否正在改变隐藏模式，如果是则直接返回
+        /// 5. 设置浮动栏状态标志，标记为未折叠
+        /// 6. 根据设置决定是否自动切换至批注模式
+        /// 7. 根据PPT放映模式和设置显示或隐藏翻页按钮
+        /// 8. 在屏幕模式下显示浮动栏并执行动画
+        /// 9. 执行侧边栏动画
+        /// 10. 等待UI完全更新后，重新设置当前选中模式的按钮高亮状态
+        /// </remarks>
         public async Task UnFoldFloatingBar(object sender)
         {
+            // 新增：如果之前彻底隐藏了，先恢复显示
+            if (this.Visibility != Visibility.Visible)
+            {
+                await Dispatcher.InvokeAsync(() =>
+                {
+                    this.Visibility = Visibility.Visible;
+                });
+            }
+
             await Dispatcher.InvokeAsync(() =>
             {
                 LeftUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
@@ -239,7 +384,11 @@ namespace Ink_Canvas
                 unfoldFloatingBarByUser = true;
             foldFloatingBarByUser = false;
 
-            if (isFloatingBarChangingHideMode) return;
+            if (isFloatingBarChangingHideMode)
+            {
+                return;
+            }
+
 
             await Dispatcher.InvokeAsync(() =>
             {
@@ -326,6 +475,21 @@ namespace Ink_Canvas
 
         }
 
+        /// <summary>
+        /// 执行侧边栏边距动画，用于折叠或展开侧边栏。
+        /// </summary>
+        /// <param name="MarginFromEdge">侧边栏距边缘的边距值。可能的值：-50（完全折叠）, -10（半展开）</param>
+        /// <param name="isNoAnimation">是否禁用动画效果。</param>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 如果边距值为-10（半展开），则显示左侧边栏
+        /// 2. 创建并执行左侧边栏的边距动画
+        /// 3. 创建并执行右侧边栏的边距动画
+        /// 4. 等待600毫秒让动画完成
+        /// 5. 直接设置侧边栏的最终边距值
+        /// 6. 如果边距值为-50（完全折叠），则隐藏左侧边栏
+        /// 7. 重置浮动栏正在改变隐藏模式的标志为false
+        /// </remarks>
         private async void SidePannelMarginAnimation(int MarginFromEdge, bool isNoAnimation = false) // Possible value: -50, -10
         {
             await Dispatcher.InvokeAsync(() =>
@@ -361,5 +525,85 @@ namespace Ink_Canvas
             });
             isFloatingBarChangingHideMode = false;
         }
+
+        private bool IsFloatingBarUiAbsentFromScreens()
+        {
+            try
+            {
+                if (ViewboxFloatingBar == null) return true;
+                if (Settings?.Automation?.ThoroughlyHideWhenFolded == true &&
+                    (!IsVisible || Visibility != Visibility.Visible))
+                    return true;
+                if (ViewboxFloatingBar.Visibility != Visibility.Visible)
+                    return true;
+                return IsOutsideOfScreenHelper.IsOutsideOfScreen(ViewboxFloatingBar);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"启动收纳校验：检测浮动栏可见性时出错: {ex.Message}", LogHelper.LogType.Warning);
+                return true;
+            }
+        }
+
+        private async Task WaitUntilFloatingBarHideModeIdleAsync(TimeSpan timeout)
+        {
+            var start = DateTime.UtcNow;
+            while (DateTime.UtcNow - start < timeout)
+            {
+                bool busy = await Dispatcher.InvokeAsync(() => isFloatingBarChangingHideMode);
+                if (!busy) return;
+                await Task.Delay(50).ConfigureAwait(false);
+            }
+        }
+
+
+        private async Task WaitForStartupFoldSettledAsync(TimeSpan timeout)
+        {
+            var start = DateTime.UtcNow;
+            while (DateTime.UtcNow - start < timeout)
+            {
+                var settled = await Dispatcher.InvokeAsync(() => isFloatingBarFolded && !isFloatingBarChangingHideMode);
+                if (settled) return;
+                await Task.Delay(50).ConfigureAwait(false);
+            }
+        }
+
+
+        private async Task VerifyStartupFoldAbsenceAfterDelayAsync()
+        {
+            try
+            {
+                if (!Settings.Startup.IsFoldAtStartup || App.StartWithBoardMode || App.StartWithShowMode)
+                    return;
+
+                await WaitForStartupFoldSettledAsync(TimeSpan.FromSeconds(30)).ConfigureAwait(false);
+                await Task.Delay(3000).ConfigureAwait(false);
+
+                bool needRetry = await Dispatcher.InvokeAsync(() =>
+                {
+                    if (!isFloatingBarFolded) return false;
+                    if (currentMode != 0) return false;
+                    return !IsFloatingBarUiAbsentFromScreens();
+                });
+
+                if (!needRetry) return;
+
+                LogHelper.WriteLogToFile("启动收纳校验：检测到浮动栏仍在屏幕上，将展开后等待 0.2s 再次收纳", LogHelper.LogType.Event);
+
+                await UnFoldFloatingBar(null);
+                await WaitUntilFloatingBarHideModeIdleAsync(TimeSpan.FromSeconds(15)).ConfigureAwait(false);
+                await Task.Delay(200).ConfigureAwait(false);
+                await FoldFloatingBar(new object()).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"启动收纳校验失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        private void ScheduleStartupFoldAbsenceVerification()
+        {
+            _ = VerifyStartupFoldAbsenceAfterDelayAsync();
+        }
     }
 }

Ink Canvas/MainWindow_cs/MW_AutoStart.cs

@@ -1,4 +1,4 @@
-using IWshRuntimeLibrary;
+using IWshRuntimeLibrary;
 using System;
 using System.Windows;
 using Application = System.Windows.Forms.Application;
@@ -8,6 +8,22 @@ namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
+        /// <summary>
+        /// 创建开机自启动快捷方式。
+        /// </summary>
+        /// <param name="exeName">可执行文件名，用于命名快捷方式。</param>
+        /// <returns>创建成功返回true，失败返回false。</returns>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 创建Windows Shell对象
+        /// 2. 在启动文件夹中创建快捷方式
+        /// 3. 设置快捷方式的目标路径为当前可执行文件路径
+        /// 4. 设置工作目录为当前目录
+        /// 5. 设置窗口样式为普通窗口
+        /// 6. 设置快捷方式描述
+        /// 7. 保存快捷方式
+        /// 8. 捕获可能的异常，确保方法不会因异常而崩溃
+        /// </remarks>
         public static bool StartAutomaticallyCreate(string exeName)
         {
             try
@@ -34,6 +50,16 @@ namespace Ink_Canvas
             return false;
         }
 
+        /// <summary>
+        /// 删除开机自启动快捷方式。
+        /// </summary>
+        /// <param name="exeName">可执行文件名，用于定位要删除的快捷方式。</param>
+        /// <returns>删除成功返回true，失败返回false。</returns>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 在启动文件夹中删除指定名称的快捷方式
+        /// 2. 捕获可能的异常，确保方法不会因异常而崩溃
+        /// </remarks>
         public static bool StartAutomaticallyDel(string exeName)
         {
             try

Ink Canvas/MainWindow_cs/MW_AutoTheme.cs

@@ -1,19 +1,29 @@
-using iNKORE.UI.WPF.Modern;
+using iNKORE.UI.WPF.Modern;
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
+using System.Windows.Threading;
 using Application = System.Windows.Application;
-using ui = iNKORE.UI.WPF.Modern.Controls;
+using ui = iNKORE.UI.WPF.Controls;
 
 namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
+        /// <summary>
+        /// 浮动栏前景色，根据当前主题动态更新。
+        /// </summary>
         private Color FloatBarForegroundColor;
 
+        /// <summary>
+        /// 应用并切换到指定的主题（"Light" 或 "Dark"），更新主题资源并刷新相关 UI 元素以反映主题变化。
+        /// </summary>
+        /// <param name="theme">主题标识，支持 "Light" 或 "Dark"（区分大小写）。</param>
+        /// <param name="autoSwitchIcon">若为 true，则根据主题自动切换并保存浮动工具栏的图标设置。</param>
         private void SetTheme(string theme, bool autoSwitchIcon = false)
         {
             // 清理现有的主题资源
@@ -35,22 +45,38 @@ namespace Ink_Canvas
 
             if (theme == "Light")
             {
+                // 先加载主题
                 var rd1 = new ResourceDictionary
-                { Source = new Uri("Resources/Styles/Light.xaml", UriKind.Relative) };
+                {
+                    Source = new Uri("Resources/Styles/Light.xaml", UriKind.Relative)
+                };
                 Application.Current.Resources.MergedDictionaries.Add(rd1);
 
-                // 在主题资源之后添加其他资源
-                var rd2 = new ResourceDictionary
-                { Source = new Uri("Resources/DrawShapeImageDictionary.xaml", UriKind.Relative) };
-                Application.Current.Resources.MergedDictionaries.Add(rd2);
+                // 异步加载图形资源，避免阻塞启动
+                _ = Task.Run(async () =>
+                {
+                    await Task.Delay(100);
+                    Dispatcher.Invoke(() =>
+                    {
+                        var rd2 = new ResourceDictionary
+                        {
+                            Source = new Uri("Resources/DrawShapeImageDictionary.xaml", UriKind.Relative)
+                        };
+                        Application.Current.Resources.MergedDictionaries.Add(rd2);
 
-                var rd3 = new ResourceDictionary
-                { Source = new Uri("Resources/SeewoImageDictionary.xaml", UriKind.Relative) };
-                Application.Current.Resources.MergedDictionaries.Add(rd3);
+                        var rd3 = new ResourceDictionary
+                        {
+                            Source = new Uri("Resources/SeewoImageDictionary.xaml", UriKind.Relative)
+                        };
+                        Application.Current.Resources.MergedDictionaries.Add(rd3);
 
-                var rd4 = new ResourceDictionary
-                { Source = new Uri("Resources/IconImageDictionary.xaml", UriKind.Relative) };
-                Application.Current.Resources.MergedDictionaries.Add(rd4);
+                        var rd4 = new ResourceDictionary
+                        {
+                            Source = new Uri("Resources/IconImageDictionary.xaml", UriKind.Relative)
+                        };
+                        Application.Current.Resources.MergedDictionaries.Add(rd4);
+                    });
+                });
 
                 ThemeManager.SetRequestedTheme(window, ElementTheme.Light);
 
@@ -83,21 +109,35 @@ namespace Ink_Canvas
             }
             else if (theme == "Dark")
             {
+                // 先加载主题
                 var rd1 = new ResourceDictionary { Source = new Uri("Resources/Styles/Dark.xaml", UriKind.Relative) };
                 Application.Current.Resources.MergedDictionaries.Add(rd1);
 
-                // 在主题资源之后添加其他资源
-                var rd2 = new ResourceDictionary
-                { Source = new Uri("Resources/DrawShapeImageDictionary.xaml", UriKind.Relative) };
-                Application.Current.Resources.MergedDictionaries.Add(rd2);
+                // 异步加载图形资源，避免阻塞启动
+                _ = Task.Run(async () =>
+                {
+                    await Task.Delay(100);
+                    Dispatcher.Invoke(() =>
+                    {
+                        var rd2 = new ResourceDictionary
+                        {
+                            Source = new Uri("Resources/DrawShapeImageDictionary.xaml", UriKind.Relative)
+                        };
+                        Application.Current.Resources.MergedDictionaries.Add(rd2);
 
-                var rd3 = new ResourceDictionary
-                { Source = new Uri("Resources/SeewoImageDictionary.xaml", UriKind.Relative) };
-                Application.Current.Resources.MergedDictionaries.Add(rd3);
+                        var rd3 = new ResourceDictionary
+                        {
+                            Source = new Uri("Resources/SeewoImageDictionary.xaml", UriKind.Relative)
+                        };
+                        Application.Current.Resources.MergedDictionaries.Add(rd3);
 
-                var rd4 = new ResourceDictionary
-                { Source = new Uri("Resources/IconImageDictionary.xaml", UriKind.Relative) };
-                Application.Current.Resources.MergedDictionaries.Add(rd4);
+                        var rd4 = new ResourceDictionary
+                        {
+                            Source = new Uri("Resources/IconImageDictionary.xaml", UriKind.Relative)
+                        };
+                        Application.Current.Resources.MergedDictionaries.Add(rd4);
+                    });
+                });
 
                 ThemeManager.SetRequestedTheme(window, ElementTheme.Dark);
 
@@ -296,6 +336,18 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理系统主题偏好变化事件，根据当前设置更新应用主题。
+        /// </summary>
+        /// <param name="sender">事件发送者。</param>
+        /// <param name="e">用户偏好变化事件参数。</param>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 根据当前主题设置（Settings.Appearance.Theme）决定使用哪种主题
+        /// 2. 如果设置为0（浅色主题），则设置为Light主题
+        /// 3. 如果设置为1（深色主题），则设置为Dark主题
+        /// 4. 如果设置为2（跟随系统主题），则根据系统主题设置应用相应的主题
+        /// </remarks>
         private void SystemEvents_UserPreferenceChanged(object sender, UserPreferenceChangedEventArgs e)
         {
             switch (Settings.Appearance.Theme)
@@ -313,6 +365,17 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 检查系统主题是否为浅色主题。
+        /// </summary>
+        /// <returns>系统主题为浅色返回true，深色返回false。</returns>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 从注册表中读取系统主题设置
+        /// 2. 检查"SystemUsesLightTheme"键的值
+        /// 3. 如果值为1，则表示系统使用浅色主题
+        /// 4. 捕获可能的异常，确保方法不会因异常而崩溃
+        /// </remarks>
         private bool IsSystemThemeLight()
         {
             var light = false;
@@ -325,7 +388,7 @@ namespace Ink_Canvas
                 if (themeKey != null) keyValue = (int)themeKey.GetValue("SystemUsesLightTheme");
                 if (keyValue == 1) light = true;
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
 
             return light;
         }
@@ -536,13 +599,13 @@ namespace Ink_Canvas
                         operatingGuideWindow.RefreshTheme();
                     }
                 }
-                
+
                 // 刷新计时器控件
                 if (TimerControl != null)
                 {
                     TimerControl.RefreshTheme();
                 }
-                
+
                 if (MinimizedTimerControl != null)
                 {
                     MinimizedTimerControl.RefreshTheme();

Ink Canvas/MainWindow_cs/MW_BoardControls.cs

@@ -1,27 +1,62 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Ink;
 using System.Windows.Media;
+using System.Windows.Threading;
 
 namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
+        /// <summary>
+        /// 存储每个白板页面的墨迹集合
+        /// </summary>
         private StrokeCollection[] strokeCollections = new StrokeCollection[101];
+
+        /// <summary>
+        /// 存储每个白板页面的最后操作模式是否为重做
+        /// </summary>
         private bool[] whiteboadLastModeIsRedo = new bool[101];
+
+        /// <summary>
+        /// 存储最后一次触摸按下时的墨迹集合
+        /// </summary>
         private StrokeCollection lastTouchDownStrokeCollection = new StrokeCollection();
+
+        /// <summary>
+        /// 当前白板页面索引
+        /// </summary>
         private int CurrentWhiteboardIndex = 1;
+
+        /// <summary>
+        /// 白板页面总数
+        /// </summary>
         private int WhiteboardTotalCount = 1;
+
+        /// <summary>
+        /// 存储每个白板页面的时间机器历史记录
+        /// </summary>
         private TimeMachineHistory[][] TimeMachineHistories = new TimeMachineHistory[101][];
+
+        /// <summary>
+        /// 存储每个白板页面的多指书写模式状态
+        /// </summary>
         private bool[] savedMultiTouchModeStates = new bool[101];
 
-        // 保存每页白板图片信息
+        /// <summary>
+        /// 将当前画布上的所有未保存的图片/媒体和墨迹提交到时间机器历史并将导出结果保存为指定页的快照。
+        /// </summary>
+        /// <param name="isBackupMain">为 true 时将导出结果保存到主备份槽（索引 0）；为 false 时保存到当前白板索引。</param>
+        /// <remarks>
+        /// - 会提交画布上缺失于历史记录的 Image/MediaElement（但跳过 Tag 等于 VideoPresenterLiveFrameTag 的 Image）和缺失的墨迹；  
+        /// - 导出后把结果存入 TimeMachineHistories 的相应索引，并保存当前多指书写模式到 savedMultiTouchModeStates；  
+        /// - 导出后会清除时间机器的临时墨迹历史以释放内存。  
+        /// - 此方法有副作用：修改 TimeMachineHistories、savedMultiTouchModeStates，并通过 timeMachine 的提交方法改变其内部历史状态。
+        /// </remarks>
         private void SaveStrokes(bool isBackupMain = false)
         {
             // 确保画布上的所有UI元素都被保存到时间机器历史记录中
@@ -48,6 +83,10 @@ namespace Ink_Canvas
             {
                 if (child is Image || child is MediaElement)
                 {
+                    if (child is Image img && img.Tag is string tag && tag == VideoPresenterLiveFrameTag)
+                    {
+                        continue;
+                    }
                     if (!elementsInHistory.Contains(child))
                     {
                         timeMachine.CommitElementInsertHistory(child);
@@ -116,6 +155,15 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 清除画布上的所有墨迹并执行内存清理
+        /// </summary>
+        /// <param name="isErasedByCode">是否由代码触发的清除操作</param>
+        /// <remarks>
+        /// - 根据参数设置当前提交类型
+        /// - 清除画布上的所有墨迹
+        /// - 恢复当前提交类型为用户输入
+        /// </remarks>
         private void ClearStrokes(bool isErasedByCode)
         {
             _currentCommitType = CommitReason.ClearingCanvas;
@@ -123,24 +171,32 @@ namespace Ink_Canvas
 
             inkCanvas.Strokes.Clear();
 
-            // 执行内存清理
-            PerformLightweightMemoryCleanup();
-
             _currentCommitType = CommitReason.UserInput;
         }
 
-        /// <summary>
-        /// 执行内存清理
-        /// </summary>
-        private void PerformLightweightMemoryCleanup()
+        private static HashSet<UIElement> CollectRemovedElementsFromHistory(TimeMachineHistory[] history)
         {
-            Task.Run(() =>
+            var set = new HashSet<UIElement>();
+            if (history == null) return set;
+            foreach (var h in history)
             {
-                GC.Collect();
-            });
+                if (h.CommitType == TimeMachineHistoryType.ElementInsert && h.StrokeHasBeenCleared && h.InsertedElement != null)
+                    set.Add(h.InsertedElement);
+            }
+            return set;
         }
 
-        // 恢复每页白板图片信息
+        /// <summary>
+        /// 恢复指定白板页面的墨迹和元素信息
+        /// </summary>
+        /// <param name="isBackupMain">是否恢复主备份页面</param>
+        /// <remarks>
+        /// - 隐藏图片选择工具栏
+        /// - 清空当前画布的墨迹和所有内容
+        /// - 从时间机器历史记录中恢复页面内容
+        /// - 恢复多指书写模式状态
+        /// - 包含异常处理
+        /// </remarks>
         private void RestoreStrokes(bool isBackupMain = false)
         {
             try
@@ -175,17 +231,40 @@ namespace Ink_Canvas
                 if (isBackupMain)
                 {
                     timeMachine.ImportTimeMachineHistory(TimeMachineHistories[0]);
-                    foreach (var item in TimeMachineHistories[0]) ApplyHistoryToCanvas(item);
-                    // 恢复多指书写模式状态
+                    var removed0 = CollectRemovedElementsFromHistory(TimeMachineHistories[0]);
+                    var elementsToProcess = new List<UIElement>();
+                    foreach (var item in TimeMachineHistories[0])
+                    {
+                        if (item.CommitType == TimeMachineHistoryType.ElementInsert &&
+                            !item.StrokeHasBeenCleared &&
+                            item.InsertedElement != null &&
+                            !removed0.Contains(item.InsertedElement))
+                        {
+                            elementsToProcess.Add(item.InsertedElement);
+                        }
+                        ApplyHistoryToCanvas(item, null, removed0);
+                    }
                     RestoreMultiTouchModeState(0);
+                    ProcessElementsAfterRestore(elementsToProcess);
                 }
                 else
                 {
                     timeMachine.ImportTimeMachineHistory(TimeMachineHistories[CurrentWhiteboardIndex]);
-                    // 通过时间机器历史恢复所有内容（墨迹和图片）
-                    foreach (var item in TimeMachineHistories[CurrentWhiteboardIndex]) ApplyHistoryToCanvas(item);
-                    // 恢复多指书写模式状态
+                    var removed = CollectRemovedElementsFromHistory(TimeMachineHistories[CurrentWhiteboardIndex]);
+                    var elementsToProcess = new List<UIElement>();
+                    foreach (var item in TimeMachineHistories[CurrentWhiteboardIndex])
+                    {
+                        if (item.CommitType == TimeMachineHistoryType.ElementInsert &&
+                            !item.StrokeHasBeenCleared &&
+                            item.InsertedElement != null &&
+                            !removed.Contains(item.InsertedElement))
+                        {
+                            elementsToProcess.Add(item.InsertedElement);
+                        }
+                        ApplyHistoryToCanvas(item, null, removed);
+                    }
                     RestoreMultiTouchModeState(CurrentWhiteboardIndex);
+                    ProcessElementsAfterRestore(elementsToProcess);
                 }
 
 
@@ -196,6 +275,45 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 在恢复页面后统一处理所有图片/媒体元素的位置和事件绑定，提升含图片页面的加载性能。
+        /// 先批量添加所有元素到画布，再统一处理位置和事件，减少布局更新次数。
+        /// </summary>
+        private void ProcessElementsAfterRestore(List<UIElement> elements)
+        {
+            if (elements == null || elements.Count == 0) return;
+
+            // 使用低优先级异步处理，让 UI 先响应，图片位置和事件绑定稍后完成
+            Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new Action(() =>
+            {
+                foreach (var element in elements)
+                {
+                    if (!inkCanvas.Children.Contains(element)) continue;
+
+                    if (element is Image img)
+                    {
+                        double left = InkCanvas.GetLeft(img);
+                        double top = InkCanvas.GetTop(img);
+                        if (double.IsNaN(left) || double.IsNaN(top))
+                        {
+                            CenterAndScaleElement(img);
+                        }
+                        BindElementEvents(img);
+                    }
+                    else if (element is MediaElement media)
+                    {
+                        double left = InkCanvas.GetLeft(media);
+                        double top = InkCanvas.GetTop(media);
+                        if (double.IsNaN(left) || double.IsNaN(top))
+                        {
+                            CenterAndScaleElement(media);
+                        }
+                        BindElementEvents(media);
+                    }
+                }
+            }));
+        }
+
         /// <summary>
         /// 恢复多指书写模式状态
         /// </summary>
@@ -229,6 +347,16 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理白板页面索引按钮点击事件，显示或隐藏侧边页面列表
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 处理左侧页面列表按钮点击：显示或隐藏左侧页面列表
+        /// - 处理右侧页面列表按钮点击：显示或隐藏右侧页面列表
+        /// - 显示页面列表时会刷新列表内容并滚动到当前页面
+        /// </remarks>
         private async void BtnWhiteBoardPageIndex_Click(object sender, EventArgs e)
         {
             if (sender == BtnLeftPageListWB)
@@ -274,6 +402,12 @@ namespace Ink_Canvas
 
         }
 
+        /// <summary>
+        /// 切换到前一白板页并在切换过程中保存与恢复画布和相关状态（如果当前已是第一页则不执行任何操作）。
+        /// </summary>
+        /// <remarks>
+        /// 该方法在切换前会取消当前选中元素（同时保留并恢复编辑模式）、调用视频呈现器的离开页前钩子、保存当前页的笔迹与元素、清空画布；切换到前一页后恢复该页内容、调用视频呈现器的页已更改钩子并刷新页面索引显示。
+        /// </remarks>
         private void BtnWhiteBoardSwitchPrevious_Click(object sender, EventArgs e)
         {
             if (CurrentWhiteboardIndex <= 1) return;
@@ -289,22 +423,30 @@ namespace Ink_Canvas
                 currentSelectedElement = null;
             }
 
+            VideoPresenter_BeforePageLeave();
             SaveStrokes();
 
             ClearStrokes(true);
             CurrentWhiteboardIndex--;
 
             RestoreStrokes();
+            VideoPresenter_OnPageChanged();
 
             UpdateIndexInfoDisplay();
         }
 
+        /// <summary>
+        /// 切换到白板的下一页；在到达最后一页时会新增一页。方法在切页前保存当前页面的笔迹/多媒体状态，在切页后恢复目标页面的内容并更新界面状态。
+        /// </summary>
+        /// <param name="sender">触发事件的源对象（通常为按钮）。</param>
+        /// <param name="e">事件参数。</param>
         private void BtnWhiteBoardSwitchNext_Click(object sender, EventArgs e)
         {
-            Trace.WriteLine("113223234");
+            if (CurrentWhiteboardIndex < WhiteboardTotalCount &&
+                Settings.Automation.IsAutoSaveStrokesAtClear &&
+                inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber)
+                CaptureAndEnqueueScreenshotSave(isHideNotification: true);
 
-            if (Settings.Automation.IsAutoSaveStrokesAtClear &&
-                inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber) SaveScreenShot(true);
             if (CurrentWhiteboardIndex >= WhiteboardTotalCount)
             {
                 // 在最后一页时，点击"新页面"按钮直接新增一页
@@ -323,21 +465,34 @@ namespace Ink_Canvas
                 currentSelectedElement = null;
             }
 
+            VideoPresenter_BeforePageLeave();
             SaveStrokes();
 
             ClearStrokes(true);
             CurrentWhiteboardIndex++;
 
             RestoreStrokes();
+            VideoPresenter_OnPageChanged();
 
             UpdateIndexInfoDisplay();
         }
 
+        /// <summary>
+        /// 在白板集合中添加一个新页面：在切换前保存并清除当前页面的笔迹与状态，插入新空白页面，恢复并刷新与页面相关的 UI 状态。
+        /// </summary>
+        /// <remarks>
+        /// - 在达到最大页面数（99）时不执行任何操作。  
+        /// - 在切换前若启用了自动保存且笔迹数量超过阈值，会保存当前画面截图。  
+        /// - 若有选中元素，会取消选中并恢复编辑模式。  
+        /// - 将当前页面的历史保存到时间轴并清空画布，然后在白板集合中插入一个空白页面（其历史为 null），随后恢复该页面并触发页面变更回调。  
+        /// - 更新页码显示并在达到上限时禁用添加按钮；若侧边页列表可见，则刷新该列表。  
+        /// </remarks>
         private void BtnWhiteBoardAdd_Click(object sender, EventArgs e)
         {
             if (WhiteboardTotalCount >= 99) return;
             if (Settings.Automation.IsAutoSaveStrokesAtClear &&
-                inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber) SaveScreenShot(true);
+                inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber)
+                CaptureAndEnqueueScreenshotSave(isHideNotification: true);
 
             // 隐藏图片选择工具栏
             if (currentSelectedElement != null)
@@ -350,6 +505,7 @@ namespace Ink_Canvas
                 currentSelectedElement = null;
             }
 
+            VideoPresenter_BeforePageLeave();
             SaveStrokes();
             ClearStrokes(true);
 
@@ -357,14 +513,20 @@ namespace Ink_Canvas
             CurrentWhiteboardIndex++;
 
             if (CurrentWhiteboardIndex != WhiteboardTotalCount)
+            {
                 for (var i = WhiteboardTotalCount; i > CurrentWhiteboardIndex; i--)
+                {
                     TimeMachineHistories[i] = TimeMachineHistories[i - 1];
+                    savedMultiTouchModeStates[i] = savedMultiTouchModeStates[i - 1];
+                }
+            }
 
             // 确保新页面的历史记录为空
             TimeMachineHistories[CurrentWhiteboardIndex] = null;
 
             // 恢复新页面（这会清空画布，因为历史记录为null）
             RestoreStrokes();
+            VideoPresenter_OnPageChanged();
 
             UpdateIndexInfoDisplay();
 
@@ -376,36 +538,93 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理白板页面删除按钮点击事件，删除当前白板页面
+        /// </summary>
         private void BtnWhiteBoardDelete_Click(object sender, RoutedEventArgs e)
         {
-            // 隐藏图片选择工具栏
+            DeleteWhiteBoardPageByIndex(CurrentWhiteboardIndex);
+        }
+
+        /// <summary>
+        /// 按页码删除指定白板页（用于预览列表等）。仅当总页数大于 1 时有效。
+        /// </summary>
+        /// <param name="pageIndex">要删除的页码（1 到 WhiteboardTotalCount）</param>
+        private void DeleteWhiteBoardPageByIndex(int pageIndex)
+        {
+            if (WhiteboardTotalCount <= 1 || pageIndex < 1 || pageIndex > WhiteboardTotalCount)
+                return;
+
             if (currentSelectedElement != null)
             {
-                // 保存当前编辑模式
                 var previousEditingMode = inkCanvas.EditingMode;
                 UnselectElement(currentSelectedElement);
-                // 恢复编辑模式
                 inkCanvas.EditingMode = previousEditingMode;
                 currentSelectedElement = null;
             }
 
-            ClearStrokes(true);
+            if (pageIndex == CurrentWhiteboardIndex)
+            {
+                ClearStrokes(true);
 
-            if (CurrentWhiteboardIndex != WhiteboardTotalCount)
-                for (var i = CurrentWhiteboardIndex; i <= WhiteboardTotalCount; i++)
-                    TimeMachineHistories[i] = TimeMachineHistories[i + 1];
-            else
+                var oldTotal = WhiteboardTotalCount;
+                if (CurrentWhiteboardIndex != oldTotal)
+                {
+                    for (var i = CurrentWhiteboardIndex; i < oldTotal; i++)
+                    {
+                        TimeMachineHistories[i] = FlattenPageHistory(TimeMachineHistories[i + 1]);
+                        savedMultiTouchModeStates[i] = savedMultiTouchModeStates[i + 1];
+                    }
+                }
+                else
+                {
+                    CurrentWhiteboardIndex--;
+                }
+
+                TimeMachineHistories[oldTotal] = null;
+                WhiteboardTotalCount--;
+                RestoreStrokes();
+            }
+            else if (pageIndex < CurrentWhiteboardIndex)
+            {
+                for (var i = pageIndex; i < WhiteboardTotalCount; i++)
+                {
+                    TimeMachineHistories[i] = FlattenPageHistory(TimeMachineHistories[i + 1]);
+                    savedMultiTouchModeStates[i] = savedMultiTouchModeStates[i + 1];
+                }
+                TimeMachineHistories[WhiteboardTotalCount] = null;
+                WhiteboardTotalCount--;
                 CurrentWhiteboardIndex--;
-
-            WhiteboardTotalCount--;
-
-            RestoreStrokes();
+            }
+            else
+            {
+                for (var i = pageIndex; i < WhiteboardTotalCount; i++)
+                {
+                    TimeMachineHistories[i] = FlattenPageHistory(TimeMachineHistories[i + 1]);
+                    savedMultiTouchModeStates[i] = savedMultiTouchModeStates[i + 1];
+                }
+                TimeMachineHistories[WhiteboardTotalCount] = null;
+                WhiteboardTotalCount--;
+            }
 
             UpdateIndexInfoDisplay();
-
             if (WhiteboardTotalCount < 99) BtnWhiteBoardAdd.IsEnabled = true;
+            if (BoardBorderLeftPageListView?.Visibility == Visibility.Visible ||
+                BoardBorderRightPageListView?.Visibility == Visibility.Visible)
+                RefreshBlackBoardSidePageListView();
         }
 
+        /// <summary>
+        /// 更新白板页码信息显示和按钮状态
+        /// </summary>
+        /// <remarks>
+        /// - 更新页码显示文本
+        /// - 设置下一页按钮文本（根据是否为最后一页）
+        /// - 启用或禁用下一页按钮（根据是否为最后一页和最大页面数）
+        /// - 设置按钮颜色和透明度
+        /// - 启用或禁用上一页按钮（根据是否为第一页）
+        /// - 设置删除按钮状态（根据页面总数）
+        /// </remarks>
         private void UpdateIndexInfoDisplay()
         {
             TextBlockWhiteBoardIndexInfo.Text =

Ink Canvas/MainWindow_cs/MW_BoardIcons.cs

@@ -12,6 +12,19 @@ namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
+        /// <summary>
+        /// 处理背景颜色按钮点击事件，显示或隐藏背景颜色选项面板
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 检查应用是否已加载
+        /// - 创建背景选项面板（如果不存在）
+        /// - 显示或隐藏背景选项面板
+        /// - 隐藏其他可能显示的面板
+        /// - 处理白板/黑板模式切换
+        /// - 更新背景颜色和墨迹颜色
+        /// </remarks>
         private void BoardChangeBackgroundColorBtn_MouseUp(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
@@ -124,7 +137,18 @@ namespace Ink_Canvas
             CheckColorTheme(true);
         }
 
-        // 创建背景选项面板
+        /// <summary>
+        /// 创建背景颜色选项面板
+        /// </summary>
+        /// <remarks>
+        /// - 加载自定义背景色
+        /// - 创建背景选项面板UI
+        /// - 添加标题栏和关闭按钮
+        /// - 添加白板/黑板模式选择按钮
+        /// - 添加RGB颜色选择器
+        /// - 添加颜色预览和应用按钮
+        /// - 将面板添加到主网格
+        /// </remarks>
         private void CreateBackgroundPalette()
         {
             // 确保加载自定义背景色
@@ -543,7 +567,13 @@ namespace Ink_Canvas
             }
         }
 
-        // 更新背景按钮状态
+        /// <summary>
+        /// 更新背景颜色选项面板中的按钮状态
+        /// </summary>
+        /// <remarks>
+        /// - 更新白板和黑板按钮的背景和前景色
+        /// - 根据当前使用的模式设置按钮状态
+        /// </remarks>
         private void UpdateBackgroundButtonsState()
         {
             if (BackgroundPalette != null && BackgroundPalette.Child is StackPanel stackPanel)
@@ -582,10 +612,14 @@ namespace Ink_Canvas
             }
         }
 
-        // 添加成员变量保存背景面板引用
+        /// <summary>
+        /// 背景颜色选项面板
+        /// </summary>
         private Border BackgroundPalette { get; set; }
 
-        // 添加成员变量保存当前自定义背景色
+        /// <summary>
+        /// 当前自定义背景色
+        /// </summary>
         private Color? CustomBackgroundColor { get; set; }
 
         /// <summary>
@@ -702,6 +736,17 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理套索工具图标点击事件，切换到选择模式
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 禁用橡皮擦模式
+        /// - 禁用形状绘制模式
+        /// - 设置当前工具模式为选择模式
+        /// - 根据编辑模式设置光标
+        /// </remarks>
         private void BoardLassoIcon_Click(object sender, RoutedEventArgs e)
         {
             forceEraser = false;
@@ -712,6 +757,22 @@ namespace Ink_Canvas
             SetCursorBasedOnEditingMode(inkCanvas);
         }
 
+        /// <summary>
+        /// 处理橡皮擦图标点击事件，切换到按笔画擦除模式
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 禁用高级橡皮擦系统
+        /// - 启用橡皮擦模式
+        /// - 设置橡皮擦形状为圆形
+        /// - 设置当前工具模式为按笔画擦除
+        /// - 禁用形状绘制模式
+        /// - 重置钢笔类型和属性
+        /// - 触发编辑模式变更事件
+        /// - 取消单指拖动模式
+        /// - 隐藏子面板
+        /// </remarks>
         private void BoardEraserIconByStrokes_Click(object sender, RoutedEventArgs e)
         {
             //if (BoardEraserByStrokes.Background.ToString() == "#FF679CF4") {
@@ -740,6 +801,18 @@ namespace Ink_Canvas
             //}
         }
 
+        /// <summary>
+        /// 处理删除图标点击事件，清空画布内容
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 调用钢笔图标点击事件
+        /// - 调用符号删除鼠标抬起事件
+        /// - 根据设置决定是否清空图片
+        /// - 如果设置为清空图片，则清空所有子元素
+        /// - 否则，保存非笔画元素并在清空后恢复
+        /// </remarks>
         private void BoardSymbolIconDelete_MouseUp(object sender, RoutedEventArgs e)
         {
             PenIcon_Click(null, null);
@@ -764,6 +837,19 @@ namespace Ink_Canvas
                 Debug.WriteLine($"BoardSymbolIconDelete: inkCanvas.Children.Count after restore: {inkCanvas.Children.Count}");
             }
         }
+        /// <summary>
+        /// 处理删除墨迹和历史记录图标点击事件，清空画布内容和时间机器历史
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 调用钢笔图标点击事件
+        /// - 调用符号删除鼠标抬起事件
+        /// - 根据设置决定是否清空时间机器历史
+        /// - 根据设置决定是否清空图片
+        /// - 如果设置为清空图片，则清空所有子元素
+        /// - 否则，保存非笔画元素并在清空后恢复
+        /// </remarks>
         private void BoardSymbolIconDeleteInkAndHistories_MouseUp(object sender, RoutedEventArgs e)
         {
             PenIcon_Click(null, null);
@@ -790,12 +876,31 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理启动希沃视频展台图标点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 调用图片黑板鼠标抬起事件
+        /// - 启动希沃视频展台软件
+        /// </remarks>
         private void BoardLaunchEasiCamera_MouseUp(object sender, MouseButtonEventArgs e)
         {
             ImageBlackboard_MouseUp(null, null);
             SoftwareLauncher.LaunchEasiCamera("希沃视频展台");
         }
 
+        /// <summary>
+        /// 处理启动Desmos计算器图标点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 立即隐藏所有子面板
+        /// - 调用图片黑板鼠标抬起事件
+        /// - 打开Desmos计算器网页
+        /// </remarks>
         private void BoardLaunchDesmos_MouseUp(object sender, MouseButtonEventArgs e)
         {
             HideSubPanelsImmediately();

Ink Canvas/MainWindow_cs/MW_ClipboardHandler.cs

@@ -1,12 +1,13 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using System;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using System.Windows.Forms;
 using System.Windows.Ink;
 using System.Windows.Input;
+using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
@@ -19,17 +20,75 @@ namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
+        /// <summary>
+        /// 剪贴板更新消息常量
+        /// </summary>
+        private const int WM_CLIPBOARDUPDATE = 0x031D;
+
+        /// <summary>
+        /// 添加剪贴板格式监听器
+        /// </summary>
+        /// <param name="hwnd">窗口句柄</param>
+        /// <returns>操作是否成功</returns>
+        [DllImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool AddClipboardFormatListener(IntPtr hwnd);
+
+        /// <summary>
+        /// 移除剪贴板格式监听器
+        /// </summary>
+        /// <param name="hwnd">窗口句柄</param>
+        /// <returns>操作是否成功</returns>
+        [DllImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool RemoveClipboardFormatListener(IntPtr hwnd);
+
+        /// <summary>
+        /// 剪贴板监控启用状态
+        /// </summary>
         private bool isClipboardMonitoringEnabled;
+
+        /// <summary>
+        /// 最后一次剪贴板图像
+        /// </summary>
         private BitmapSource lastClipboardImage;
 
-        // 初始化剪贴板监控
+        /// <summary>
+        /// 剪贴板窗口句柄源
+        /// </summary>
+        private HwndSource _clipboardHwndSource;
+
+        /// <summary>
+        /// 最后一次粘贴通知时间
+        /// </summary>
+        private DateTime _lastPasteNotificationTime = DateTime.MinValue;
+
+        /// <summary>
+        /// 粘贴通知防抖时间（秒）
+        /// </summary>
+        private const int PasteNotificationDebounceSeconds = 4;
+
+        /// <summary>
+        /// 启用并初始化对系统剪贴板变更的监控，确保窗口消息钩子在可用时安装并订阅剪贴板更新事件。
+        /// </summary>
+        /// <remarks>
+        /// 在首次调用时订阅内部的 ClipboardNotification.ClipboardUpdate 事件、将监控标志设为已启用，并在窗口句柄可用时安装窗口消息钩子；若句柄尚不可用则延迟到 SourceInitialized 事件完成后安装。此方法会异步调度 EnsureClipboardHookInstalled 以在加载优先级下最终确认钩子已安装。发生异常时记录错误但不会抛出。
+        /// </remarks>
         private void InitializeClipboardMonitoring()
         {
             try
             {
-                // 监听剪贴板变化
+                if (isClipboardMonitoringEnabled)
+                    return;
+
                 ClipboardNotification.ClipboardUpdate += OnClipboardUpdate;
                 isClipboardMonitoringEnabled = true;
+
+                if (new WindowInteropHelper(this).Handle != IntPtr.Zero)
+                    OnSourceInitializedForClipboard(this, EventArgs.Empty);
+                else
+                    SourceInitialized += OnSourceInitializedForClipboard;
+                Dispatcher.BeginInvoke(new Action(EnsureClipboardHookInstalled), DispatcherPriority.Loaded);
             }
             catch (Exception ex)
             {
@@ -37,24 +96,82 @@ namespace Ink_Canvas
             }
         }
 
-        // 剪贴板内容变化事件处理
+        /// <summary>
+        /// — 在窗口句柄可用且尚未安装钩子时，为接收剪贴板更新消息安装窗口消息钩子。
+        /// </summary>
+        private void EnsureClipboardHookInstalled()
+        {
+            if (_clipboardHwndSource != null) return;
+            var handle = new WindowInteropHelper(this).Handle;
+            if (handle == IntPtr.Zero) return;
+            OnSourceInitializedForClipboard(this, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// 在窗口初始化后安装用于接收系统剪贴板更改消息的窗口钩子并注册剪贴板格式监听器。
+        /// </summary>
+        /// <remarks>
+        /// 将当前窗口的 HwndSource 与 ClipboardWndProc 消息钩子关联，并调用 AddClipboardFormatListener 注册剪贴板更新通知；若无法获取窗口句柄则不执行任何操作。
+        /// </remarks>
+        private void OnSourceInitializedForClipboard(object sender, EventArgs e)
+        {
+            SourceInitialized -= OnSourceInitializedForClipboard;
+            try
+            {
+                var handle = new WindowInteropHelper(this).Handle;
+                if (handle == IntPtr.Zero) return;
+
+                _clipboardHwndSource = HwndSource.FromHwnd(handle);
+                _clipboardHwndSource?.AddHook(ClipboardWndProc);
+
+                if (!AddClipboardFormatListener(handle))
+                    LogHelper.WriteLogToFile($"AddClipboardFormatListener 失败: {Marshal.GetLastWin32Error()}", LogHelper.LogType.Warning);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"安装剪贴板监听失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 处理窗口消息，响应剪贴板更新事件
+        /// </summary>
+        /// <param name="hwnd">窗口句柄</param>
+        /// <param name="msg">消息类型</param>
+        /// <param name="wParam">消息参数W</param>
+        /// <param name="lParam">消息参数L</param>
+        /// <param name="handled">消息是否已处理</param>
+        /// <returns>处理结果</returns>
+        /// <remarks>
+        /// - 当收到剪贴板更新消息时，通知剪贴板变更
+        /// - 标记消息为已处理
+        /// </remarks>
+        private IntPtr ClipboardWndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            if (msg == WM_CLIPBOARDUPDATE)
+            {
+                Dispatcher.BeginInvoke(new Action(() => ClipboardNotification.NotifyFromMessage()), DispatcherPriority.Background);
+                handled = true;
+            }
+            return IntPtr.Zero;
+        }
+
+        /// <summary>
+        /// 在剪贴板内容变化时检查剪贴板是否包含图像并缓存该图像。
+        /// </summary>
+        /// <remarks>
+        /// 如果剪贴板包含图像，则读取该图像并更新字段 <c>lastClipboardImage</c>；否则不做任何操作。方法内部会捕获异常并记录日志，不会向上抛出。 
+        /// </remarks>
         private void OnClipboardUpdate()
         {
             try
             {
-                if (Clipboard.ContainsImage())
-                {
-                    var clipboardImage = Clipboard.GetImage();
-                    if (clipboardImage != null && clipboardImage != lastClipboardImage)
-                    {
-                        lastClipboardImage = clipboardImage;
-                        // 在白板模式下显示粘贴提示
-                        if (currentMode == 1) // 白板模式
-                        {
-                            ShowPasteNotification();
-                        }
-                    }
-                }
+                if (!Clipboard.ContainsImage())
+                    return;
+
+                var clipboardImage = Clipboard.GetImage();
+                if (clipboardImage != null)
+                    lastClipboardImage = clipboardImage;
             }
             catch (Exception ex)
             {
@@ -62,23 +179,51 @@ namespace Ink_Canvas
             }
         }
 
-        // 显示粘贴提示
-        private void ShowPasteNotification()
+        /// <summary>
+        /// 在进入白板时检查系统剪贴板是否包含图片；如果存在图片且与上次提示间隔超过预设节流时间，则显示粘贴提示。
+        /// </summary>
+        public void CheckClipboardImageAndShowPasteNotificationWhenEnteringBoard()
         {
             try
             {
-                Dispatcher.Invoke(() =>
-                {
-                    ShowNotification("检测到剪贴板中有图片，右键点击白板可粘贴");
-                });
+                if (!Clipboard.ContainsImage())
+                    return;
+
+                bool debounceElapsed = (DateTime.Now - _lastPasteNotificationTime).TotalSeconds >= PasteNotificationDebounceSeconds;
+                if (!debounceElapsed)
+                    return;
+
+                _lastPasteNotificationTime = DateTime.Now;
+                ShowPasteNotification();
             }
             catch (Exception ex)
             {
-                LogHelper.WriteLogToFile($"显示粘贴提示失败: {ex.Message}", LogHelper.LogType.Error);
+                LogHelper.WriteLogToFile($"进入白板时检测剪贴板失败: {ex.Message}", LogHelper.LogType.Error);
             }
         }
 
-        // 处理右键菜单显示
+        /// <summary>
+        /// 在界面上显示提示，告知用户剪贴板中存在图片并可在白板上右键粘贴。
+        /// </summary>
+        private void ShowPasteNotification()
+        {
+            Dispatcher.BeginInvoke(new Action(() =>
+            {
+                try
+                {
+                    ShowNotification("检测到剪贴板中有图片，右键点击白板可粘贴");
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"显示粘贴提示失败: {ex.Message}", LogHelper.LogType.Error);
+                }
+            }), DispatcherPriority.Normal);
+        }
+
+        /// <summary>
+        /// 在指定位置显示包含“粘贴图片”项的右键菜单（仅在剪贴板包含图片时显示）。
+        /// </summary>
+        /// <param name="position">右键菜单应定位的画布坐标；该位置会传递给粘贴操作以确定图片粘贴位置。</param>
         private void ShowPasteContextMenu(Point position)
         {
             try
@@ -107,7 +252,26 @@ namespace Ink_Canvas
             }
         }
 
-        // 从剪贴板粘贴图片
+        /// <summary>
+        /// 从剪贴板粘贴图片到画布
+        /// </summary>
+        /// <param name="position">粘贴位置（可选）</param>
+        /// <returns>异步任务</returns>
+        /// <remarks>
+        /// - 检查剪贴板是否包含图片
+        /// - 创建Image控件并设置属性
+        /// - 生成唯一名称
+        /// - 初始化变换组
+        /// - 设置图片属性，避免被InkCanvas选择系统处理
+        /// - 添加到画布
+        /// - 等待图片加载完成后进行居中处理
+        /// - 如果有指定位置，调整到指定位置
+        /// - 绑定事件处理器
+        /// - 提交到历史记录
+        /// - 插入图片后切换到选择模式并刷新浮动栏高光显示
+        /// - 显示通知
+        /// - 包含异常处理
+        /// </remarks>
         private async Task PasteImageFromClipboard(Point? position = null)
         {
             try
@@ -223,7 +387,17 @@ namespace Ink_Canvas
 
 
 
-        // 处理白板右键事件
+        /// <summary>
+        /// 处理白板右键事件，显示粘贴图片菜单
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 只在白板模式下处理
+        /// - 检查是否有图片在剪贴板中
+        /// - 显示粘贴上下文菜单
+        /// - 包含异常处理
+        /// </remarks>
         private void InkCanvas_MouseRightButtonUp(object sender, MouseButtonEventArgs e)
         {
             try
@@ -244,7 +418,17 @@ namespace Ink_Canvas
             }
         }
 
-        // 处理全局粘贴快捷键
+        /// <summary>
+        /// 处理全局粘贴快捷键，粘贴剪贴板中的图片
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 只在白板模式下处理
+        /// - 检查剪贴板是否包含图片
+        /// - 从剪贴板粘贴图片
+        /// - 包含异常处理
+        /// </remarks>
         internal async void HandleGlobalPaste(object sender, ExecutedRoutedEventArgs e)
         {
             try
@@ -263,7 +447,16 @@ namespace Ink_Canvas
             }
         }
 
-        // 清理剪贴板监控
+        /// <summary>
+        /// 清理剪贴板监控资源
+        /// </summary>
+        /// <remarks>
+        /// - 取消订阅剪贴板更新事件
+        /// - 移除剪贴板格式监听器
+        /// - 移除窗口消息钩子
+        /// - 重置相关变量
+        /// - 包含异常处理
+        /// </remarks>
         private void CleanupClipboardMonitoring()
         {
             try
@@ -273,6 +466,13 @@ namespace Ink_Canvas
                     ClipboardNotification.ClipboardUpdate -= OnClipboardUpdate;
                     isClipboardMonitoringEnabled = false;
                 }
+
+                var handle = new WindowInteropHelper(this).Handle;
+                if (handle != IntPtr.Zero)
+                    RemoveClipboardFormatListener(handle);
+
+                _clipboardHwndSource?.RemoveHook(ClipboardWndProc);
+                _clipboardHwndSource = null;
             }
             catch (Exception ex)
             {
@@ -281,47 +481,60 @@ namespace Ink_Canvas
         }
     }
 
-    // 剪贴板通知类
+    /// <summary>
+    /// 剪贴板通知类，用于监控剪贴板变化
+    /// </summary>
     public static class ClipboardNotification
     {
+        /// <summary>
+        /// 剪贴板更新事件
+        /// </summary>
         public static event Action ClipboardUpdate;
 
-        private static Timer clipboardTimer;
+        /// <summary>
+        /// 最后一次剪贴板文本
+        /// </summary>
         private static string lastClipboardText = "";
+
+        /// <summary>
+        /// 最后一次是否有图片
+        /// </summary>
         private static bool lastHadImage;
 
-        static ClipboardNotification()
-        {
-            clipboardTimer = new Timer();
-            clipboardTimer.Interval = 500; // 每500ms检查一次
-            clipboardTimer.Tick += CheckClipboard;
-            clipboardTimer.Start();
-        }
-
-        private static void CheckClipboard(object sender, EventArgs e)
+        /// <summary>
+        /// 检查当前系统剪贴板的文本与图像状态，并在检测到相关变化或存在图像时触发 <see cref="ClipboardUpdate"/> 事件以通知订阅者。
+        /// </summary>
+        /// <remarks>
+        /// 会比较当前剪贴板的图像存在性与文本内容与内部缓存的上一状态；若图像存在性发生变化、文本内容发生变化，或当前存在图像，则更新缓存并调用 <see cref="ClipboardUpdate"/>。方法内部捕获异常并将错误记录到日志，而不是向调用方抛出异常。
+        /// </remarks>
+        public static void NotifyFromMessage()
         {
             try
             {
                 bool currentHasImage = Clipboard.ContainsImage();
                 string currentText = Clipboard.ContainsText() ? Clipboard.GetText() : "";
 
-                if (currentHasImage != lastHadImage || currentText != lastClipboardText)
+                if (currentHasImage != lastHadImage || currentText != lastClipboardText || currentHasImage)
                 {
                     lastHadImage = currentHasImage;
                     lastClipboardText = currentText;
                     ClipboardUpdate?.Invoke();
                 }
             }
-            catch
+            catch (Exception ex)
             {
-                // 忽略剪贴板访问错误
+                LogHelper.WriteLogToFile($"剪贴板 NotifyFromMessage 异常: {ex.Message}", LogHelper.LogType.Error);
             }
         }
 
+        /// <summary>
+        /// 停止剪贴板监控
+        /// </summary>
+        /// <remarks>
+        /// 当前实现为空方法，预留用于未来扩展
+        /// </remarks>
         public static void Stop()
         {
-            clipboardTimer?.Stop();
-            clipboardTimer?.Dispose();
         }
     }
-}
+}

Ink Canvas/MainWindow_cs/MW_Colors.cs

@@ -1,4 +1,4 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -14,11 +14,27 @@ namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
+        /// <summary>
+        /// 当前墨水颜色
+        /// </summary>
         private int inkColor = 1;
 
-        private void ColorSwitchCheck()
+        /// <summary>
+        /// 颜色切换检查，处理颜色变更和相关UI状态
+        /// </summary>
+        /// <param name="hidePanels">是否隐藏面板</param>
+        /// <remarks>
+        /// - 隐藏相关面板
+        /// - 处理透明背景情况
+        /// - 处理选中笔画的颜色更新
+        /// - 提交笔画属性历史记录
+        /// - 设置工具模式为墨水模式
+        /// - 取消单指拖动模式
+        /// - 检查颜色主题
+        /// </remarks>
+        private void ColorSwitchCheck(bool hidePanels = true)
         {
-            if (penType != 1)
+            if (hidePanels)
             {
                 HideSubPanels("color");
             }
@@ -76,11 +92,40 @@ namespace Ink_Canvas
             isLongPressSelected = false;
         }
 
-        private bool isUselightThemeColor, isDesktopUselightThemeColor;
-        private int penType; // 0是签字笔，1是荧光笔
-        private int lastDesktopInkColor = 1, lastBoardInkColor = 5;
+        /// <summary>
+        /// 是否使用亮色主题颜色
+        /// </summary>
+        private bool isUselightThemeColor;
+
+        /// <summary>
+        /// 桌面模式是否使用亮色主题颜色
+        /// </summary>
+        private bool isDesktopUselightThemeColor;
+
+        /// <summary>
+        /// 笔类型（0是签字笔，1是荧光笔）
+        /// </summary>
+        private int penType;
+
+        /// <summary>
+        /// 桌面模式最后使用的墨水颜色
+        /// </summary>
+        private int lastDesktopInkColor = 1;
+
+        /// <summary>
+        /// 白板模式最后使用的墨水颜色
+        /// </summary>
+        private int lastBoardInkColor = 5;
+
+        /// <summary>
+        /// 荧光笔颜色
+        /// </summary>
         private int highlighterColor = 102;
 
+        /// <summary>
+        /// 根据当前模式、画笔类型与主题设置，应用并同步画布颜色、笔触颜色与界面配色指示器。
+        /// </summary>
+        /// <param name="changeColorTheme">为 true 时（且非桌面模式）根据白板/黑板设置刷新背景色、水印色和亮/暗主题标志；为 false 则仅同步颜色相关状态。</param>
         private void CheckColorTheme(bool changeColorTheme = false)
         {
             if (changeColorTheme)
@@ -131,6 +176,12 @@ namespace Ink_Canvas
             }
 
             double alpha = inkCanvas.DefaultDrawingAttributes.Color.A;
+            if (penType == 0 && Settings?.Canvas != null)
+            {
+                double settingAlpha = Settings.Canvas.InkAlpha;
+                if (settingAlpha >= 0 && settingAlpha <= 255)
+                    alpha = settingAlpha;
+            }
 
             if (penType == 0)
             {
@@ -432,6 +483,15 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 检查并更新最后使用的颜色
+        /// </summary>
+        /// <param name="inkColor">墨水颜色</param>
+        /// <param name="isHighlighter">是否为荧光笔</param>
+        /// <remarks>
+        /// - 如果是荧光笔，更新荧光笔颜色
+        /// - 否则，根据当前模式更新相应的最后使用颜色
+        /// </remarks>
         private void CheckLastColor(int inkColor, bool isHighlighter = false)
         {
             if (isHighlighter)
@@ -445,6 +505,16 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 检查并更新笔类型UI状态
+        /// </summary>
+        /// <returns>异步任务</returns>
+        /// <remarks>
+        /// - 根据笔类型显示或隐藏相应的面板
+        /// - 更新标签按钮的样式和状态
+        /// - 执行面板动画
+        /// - 处理签字笔和荧光笔的不同UI状态
+        /// </remarks>
         private async void CheckPenTypeUIState()
         {
             if (penType == 0)
@@ -584,6 +654,17 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 切换到默认签字笔
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 设置笔类型为0（签字笔）
+        /// - 更新笔类型UI状态
+        /// - 检查颜色主题
+        /// - 设置画笔属性（宽度、高度、笔尖形状、是否为荧光笔）
+        /// </remarks>
         private void SwitchToDefaultPen(object sender, MouseButtonEventArgs e)
         {
             penType = 0;
@@ -595,6 +676,18 @@ namespace Ink_Canvas
             drawingAttributes.IsHighlighter = false;
         }
 
+        /// <summary>
+        /// 切换到荧光笔
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 设置笔类型为1（荧光笔）
+        /// - 更新笔类型UI状态
+        /// - 检查颜色主题
+        /// - 设置画笔属性（宽度、高度、笔尖形状、是否为荧光笔）
+        /// - 确保荧光笔模式切换后正确更新颜色和快捷调色板指示器
+        /// </remarks>
         private void SwitchToHighlighterPen(object sender, MouseButtonEventArgs e)
         {
             penType = 1;
@@ -606,63 +699,113 @@ namespace Ink_Canvas
             drawingAttributes.IsHighlighter = true;
 
             // 确保荧光笔模式切换后正确更新颜色和快捷调色板指示器
-            ColorSwitchCheck();
+            ColorSwitchCheck(false);
         }
 
+        /// <summary>
+        /// 处理黑色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnColorBlack_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(0);
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理红色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnColorRed_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(1);
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理绿色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnColorGreen_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(2);
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理蓝色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnColorBlue_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(3);
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理黄色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnColorYellow_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(4);
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理白色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnColorWhite_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(5);
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理粉色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnColorPink_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(6);
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理橙色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnColorOrange_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(8);
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理青色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnColorTeal_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(7);
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理荧光笔黑色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnHighlighterColorBlack_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(100, true);
@@ -671,6 +814,11 @@ namespace Ink_Canvas
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理荧光笔白色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnHighlighterColorWhite_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(101, true);
@@ -679,6 +827,11 @@ namespace Ink_Canvas
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理荧光笔红色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnHighlighterColorRed_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(102, true);
@@ -687,6 +840,11 @@ namespace Ink_Canvas
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理荧光笔黄色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnHighlighterColorYellow_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(103, true);
@@ -695,6 +853,11 @@ namespace Ink_Canvas
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理荧光笔绿色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnHighlighterColorGreen_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(104, true);
@@ -703,6 +866,11 @@ namespace Ink_Canvas
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理荧光笔锌色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnHighlighterColorZinc_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(105, true);
@@ -711,6 +879,11 @@ namespace Ink_Canvas
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理荧光笔蓝色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnHighlighterColorBlue_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(106, true);
@@ -719,6 +892,11 @@ namespace Ink_Canvas
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理荧光笔紫色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnHighlighterColorPurple_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(107, true);
@@ -727,6 +905,11 @@ namespace Ink_Canvas
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理荧光笔青色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnHighlighterColorTeal_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(108, true);
@@ -735,6 +918,11 @@ namespace Ink_Canvas
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 处理荧光笔橙色按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
         private void BtnHighlighterColorOrange_Click(object sender, RoutedEventArgs e)
         {
             CheckLastColor(109, true);
@@ -743,6 +931,15 @@ namespace Ink_Canvas
             ColorSwitchCheck();
         }
 
+        /// <summary>
+        /// 将字符串转换为颜色对象
+        /// </summary>
+        /// <param name="colorStr">颜色字符串（格式：#FFFFFFFF）</param>
+        /// <returns>颜色对象</returns>
+        /// <remarks>
+        /// - 解析颜色字符串为ARGB值
+        /// - 转换为Color对象返回
+        /// </remarks>
         private Color StringToColor(string colorStr)
         {
             var argb = new byte[4];
@@ -757,6 +954,15 @@ namespace Ink_Canvas
             return Color.FromArgb(argb[0], argb[1], argb[2], argb[3]); //#FFFFFFFF
         }
 
+        /// <summary>
+        /// 将字符转换为字节
+        /// </summary>
+        /// <param name="c">字符</param>
+        /// <returns>字节值</returns>
+        /// <remarks>
+        /// - 将十六进制字符转换为对应的字节值
+        /// - 支持0-9和A-F字符
+        /// </remarks>
         private static byte toByte(char c)
         {
             var b = (byte)"0123456789ABCDEF".IndexOf(c);

Ink Canvas/MainWindow_cs/MW_ElementsControls.cs

@@ -1,4 +1,4 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using Microsoft.Win32;
 using System;
 using System.Diagnostics;
@@ -19,12 +19,40 @@ namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
-        // 当前选中的可操作元素
+        /// <summary>
+        /// 当前选中的可操作元素
+        /// </summary>
         private FrameworkElement currentSelectedElement;
+
+        /// <summary>
+        /// 是否正在拖动
+        /// </summary>
         private bool isDragging;
+
+        /// <summary>
+        /// 拖动起始点
+        /// </summary>
         private Point dragStartPoint;
 
         #region Image
+        /// <summary>
+        /// 处理图片插入按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 打开文件选择对话框，选择图片文件
+        /// - 创建并压缩图片
+        /// - 设置图片属性，避免被InkCanvas选择系统处理
+        /// - 初始化InkCanvas选择设置
+        /// - 添加图片到画布
+        /// - 等待图片加载完成后进行后续处理
+        /// - 初始化TransformGroup
+        /// - 居中缩放图片
+        /// - 绑定事件处理器
+        /// - 提交到时间机器历史记录
+        /// - 插入图片后切换到选择模式并刷新浮动栏高光显示
+        /// </remarks>
         private async void BtnImageInsert_Click(object sender, RoutedEventArgs e)
         {
             OpenFileDialog openFileDialog = new OpenFileDialog();
@@ -79,7 +107,15 @@ namespace Ink_Canvas
             }
         }
 
-        // 初始化元素的TransformGroup
+        /// <summary>
+        /// 初始化元素的TransformGroup
+        /// </summary>
+        /// <param name="element">要初始化的元素</param>
+        /// <remarks>
+        /// - 创建TransformGroup
+        /// - 添加ScaleTransform、TranslateTransform和RotateTransform
+        /// - 设置元素的RenderTransform
+        /// </remarks>
         private void InitializeElementTransform(FrameworkElement element)
         {
             var transformGroup = new TransformGroup();
@@ -89,7 +125,17 @@ namespace Ink_Canvas
             element.RenderTransform = transformGroup;
         }
 
-        // 绑定元素事件处理器
+        /// <summary>
+        /// 绑定元素事件处理器
+        /// </summary>
+        /// <param name="element">要绑定事件的元素</param>
+        /// <remarks>
+        /// - 绑定鼠标事件（MouseLeftButtonDown、MouseLeftButtonUp、MouseMove、MouseWheel）
+        /// - 启用触摸操作
+        /// - 绑定触摸事件（ManipulationDelta、ManipulationCompleted）
+        /// - 设置光标为手形
+        /// - 禁用InkCanvas对图片的选择处理
+        /// </remarks>
         private void BindElementEvents(FrameworkElement element)
         {
             // 鼠标事件
@@ -111,11 +157,29 @@ namespace Ink_Canvas
             element.Focusable = false;
         }
 
-        // 鼠标左键按下事件
+        /// <summary>
+        /// 处理元素鼠标左键按下事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 检查编辑模式是否为选择模式
+        /// - 取消之前选中的元素
+        /// - 选中当前元素
+        /// - 开始拖动
+        /// - 捕获鼠标
+        /// - 设置光标为全尺寸光标
+        /// </remarks>
         private void Element_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             if (sender is FrameworkElement element)
             {
+                if (inkCanvas.EditingMode != InkCanvasEditingMode.Select)
+                {
+                    e.Handled = false;
+                    return;
+                }
+
                 // 取消之前选中的元素
                 if (currentSelectedElement != null && currentSelectedElement != element)
                 {
@@ -139,7 +203,16 @@ namespace Ink_Canvas
             }
         }
 
-        // 鼠标左键释放事件
+        /// <summary>
+        /// 处理元素鼠标左键释放事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 停止拖动
+        /// - 释放鼠标捕获
+        /// - 恢复光标为手形
+        /// </remarks>
         private void Element_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
             if (sender is FrameworkElement element)
@@ -152,7 +225,16 @@ namespace Ink_Canvas
             }
         }
 
-        // 触摸释放事件
+        /// <summary>
+        /// 处理元素触摸释放事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 停止拖动
+        /// - 释放触摸捕获
+        /// - 恢复光标为手形
+        /// </remarks>
         private void Element_TouchUp(object sender, TouchEventArgs e)
         {
             if (sender is FrameworkElement element)
@@ -165,7 +247,19 @@ namespace Ink_Canvas
             }
         }
 
-        // 鼠标移动事件
+        /// <summary>
+        /// 处理元素鼠标移动事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 检查是否正在拖动且鼠标已捕获
+        /// - 获取当前鼠标位置
+        /// - 应用鼠标拖动变换
+        /// - 如果是图片元素，更新工具栏位置
+        /// - 如果是图片元素，更新选择点位置
+        /// - 更新拖动起始点
+        /// </remarks>
         private void Element_MouseMove(object sender, MouseEventArgs e)
         {
             if (sender is FrameworkElement element && isDragging && element.IsMouseCaptured)
@@ -192,7 +286,16 @@ namespace Ink_Canvas
             }
         }
 
-        // 鼠标滚轮事件 - 缩放
+        /// <summary>
+        /// 处理元素鼠标滚轮事件 - 缩放
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 应用滚轮缩放变换
+        /// - 如果是图片元素，更新工具栏位置
+        /// - 如果是图片元素，更新选择点位置
+        /// </remarks>
         private void Element_MouseWheel(object sender, MouseWheelEventArgs e)
         {
             if (sender is FrameworkElement element)
@@ -218,11 +321,29 @@ namespace Ink_Canvas
             }
         }
 
-        // 触摸按下事件
+        /// <summary>
+        /// 处理元素触摸按下事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 检查编辑模式是否为选择模式
+        /// - 取消之前选中的元素
+        /// - 选中当前元素
+        /// - 开始拖动
+        /// - 捕获触摸
+        /// - 设置光标为全尺寸光标
+        /// </remarks>
         private void Element_TouchDown(object sender, TouchEventArgs e)
         {
             if (sender is FrameworkElement element)
             {
+                if (inkCanvas.EditingMode != InkCanvasEditingMode.Select)
+                {
+                    e.Handled = false;
+                    return;
+                }
+
                 // 取消之前选中的元素
                 if (currentSelectedElement != null && currentSelectedElement != element)
                 {
@@ -246,7 +367,18 @@ namespace Ink_Canvas
             }
         }
 
-        // 触摸操作事件
+        /// <summary>
+        /// 处理元素触摸操作事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 检查是否是双指手势
+        /// - 双指手势时，让画布级别的手势处理
+        /// - 单指手势时，应用触摸拖动变换
+        /// - 如果是图片元素，更新工具栏位置
+        /// - 如果是图片元素，更新选择点位置
+        /// </remarks>
         private void Element_ManipulationDelta(object sender, ManipulationDeltaEventArgs e)
         {
             if (sender is FrameworkElement element)
@@ -279,13 +411,30 @@ namespace Ink_Canvas
             }
         }
 
-        // 触摸操作完成事件
+        /// <summary>
+        /// 处理元素触摸操作完成事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 可以在这里添加操作完成后的处理逻辑
+        /// </remarks>
         private void Element_ManipulationCompleted(object sender, ManipulationCompletedEventArgs e)
         {
             // 可以在这里添加操作完成后的处理逻辑
         }
 
-        // 应用平移变换
+        /// <summary>
+        /// 应用平移变换到元素
+        /// </summary>
+        /// <param name="element">要变换的元素</param>
+        /// <param name="deltaX">X轴偏移量</param>
+        /// <param name="deltaY">Y轴偏移量</param>
+        /// <remarks>
+        /// - 获取元素的TransformGroup
+        /// - 查找TranslateTransform
+        /// - 应用平移变换
+        /// </remarks>
         private void ApplyTranslateTransform(FrameworkElement element, double deltaX, double deltaY)
         {
             if (element.RenderTransform is TransformGroup transformGroup)
@@ -299,7 +448,19 @@ namespace Ink_Canvas
             }
         }
 
-        // 应用缩放变换
+        /// <summary>
+        /// 应用缩放变换到元素
+        /// </summary>
+        /// <param name="element">要变换的元素</param>
+        /// <param name="scaleFactor">缩放因子</param>
+        /// <param name="center">缩放中心</param>
+        /// <remarks>
+        /// - 获取元素的TransformGroup
+        /// - 查找ScaleTransform
+        /// - 设置缩放中心
+        /// - 应用缩放
+        /// - 限制缩放范围（0.1到5.0）
+        /// </remarks>
         private void ApplyScaleTransform(FrameworkElement element, double scaleFactor, Point center)
         {
             if (element.RenderTransform is TransformGroup transformGroup)
@@ -322,7 +483,16 @@ namespace Ink_Canvas
             }
         }
 
-        // 应用旋转变换
+        /// <summary>
+        /// 应用旋转变换到元素
+        /// </summary>
+        /// <param name="element">要变换的元素</param>
+        /// <param name="angle">旋转角度</param>
+        /// <remarks>
+        /// - 获取元素的TransformGroup
+        /// - 查找RotateTransform
+        /// - 应用旋转变换
+        /// </remarks>
         private void ApplyRotateTransform(FrameworkElement element, double angle)
         {
             if (element.RenderTransform is TransformGroup transformGroup)
@@ -335,7 +505,19 @@ namespace Ink_Canvas
             }
         }
 
-        // 选中元素
+        /// <summary>
+        /// 选中元素
+        /// </summary>
+        /// <param name="element">要选中的元素</param>
+        /// <remarks>
+        /// - 设置当前选中元素
+        /// - 根据元素类型显示不同的选择工具栏
+        /// - 如果是图片元素，显示图片选择工具栏和缩放选择点
+        /// - 如果不是图片元素，隐藏图片选择工具栏和缩放选择点
+        /// - 确保选择框不显示，避免蓝色边框
+        /// - 禁用InkCanvas的选择功能，去除控制点
+        /// - 保持选择模式，这样用户可以直接点击墨迹来选择
+        /// </remarks>
         private void SelectElement(FrameworkElement element)
         {
             currentSelectedElement = element;
@@ -388,7 +570,16 @@ namespace Ink_Canvas
             }
         }
 
-        // 取消选中元素
+        /// <summary>
+        /// 取消选中元素
+        /// </summary>
+        /// <param name="element">要取消选中的元素</param>
+        /// <remarks>
+        /// - 隐藏图片选择工具栏
+        /// - 隐藏图片缩放选择点
+        /// - 确保选择框隐藏
+        /// - 确保InkCanvas处于选择模式，这样用户可以直接点击墨迹来选择
+        /// </remarks>
         private void UnselectElement(FrameworkElement element)
         {
             // 去除选中效果
@@ -418,7 +609,16 @@ namespace Ink_Canvas
             }
         }
 
-        // 应用矩阵变换到元素
+        /// <summary>
+        /// 应用矩阵变换到元素
+        /// </summary>
+        /// <param name="element">要变换的元素</param>
+        /// <param name="matrix">变换矩阵</param>
+        /// <remarks>
+        /// - 获取元素的RenderTransform，如果不存在则创建新的TransformGroup
+        /// - 创建MatrixTransform
+        /// - 将MatrixTransform添加到TransformGroup
+        /// </remarks>
         private void ApplyElementMatrixTransform(FrameworkElement element, Matrix matrix)
         {
             if (element.RenderTransform is TransformGroup transformGroup)
@@ -431,7 +631,19 @@ namespace Ink_Canvas
             }
         }
 
-        // 滚轮缩放的核心机制
+        /// <summary>
+        /// 处理滚轮缩放的核心机制
+        /// </summary>
+        /// <param name="element">要缩放的元素</param>
+        /// <param name="e">鼠标滚轮事件参数</param>
+        /// <remarks>
+        /// - 根据滚轮方向确定缩放比例（向上1.1倍，向下0.9倍）
+        /// - 计算选中元素的中心点作为缩放中心
+        /// - 创建 Matrix 对象并应用 ScaleAt 变换
+        /// - 对选中的图片元素应用矩阵变换
+        /// - 对选中的笔画应用 Transform 方法
+        /// - 包含异常处理
+        /// </remarks>
         private void ApplyWheelScaleTransform(FrameworkElement element, MouseWheelEventArgs e)
         {
             try
@@ -464,7 +676,20 @@ namespace Ink_Canvas
             }
         }
 
-        // 矩阵变换的完整实现
+        /// <summary>
+        /// 矩阵变换的完整实现
+        /// </summary>
+        /// <param name="element">要变换的元素</param>
+        /// <param name="matrix">变换矩阵</param>
+        /// <param name="saveHistory">是否保存历史记录</param>
+        /// <remarks>
+        /// - 获取元素的 RenderTransform，如果不存在则创建新的 TransformGroup
+        /// - 保存初始变换状态用于历史记录
+        /// - 创建新的 TransformGroup 并添加 MatrixTransform
+        /// - 将新的变换组添加到现有的变换组中
+        /// - 如果启用了历史记录，提交变换历史
+        /// - 包含异常处理
+        /// </remarks>
         private void ApplyMatrixTransformToElement(FrameworkElement element, Matrix matrix, bool saveHistory = true)
         {
             try
@@ -501,7 +726,20 @@ namespace Ink_Canvas
             }
         }
 
-        // 鼠标拖动的完整实现机制
+        /// <summary>
+        /// 鼠标拖动的完整实现机制
+        /// </summary>
+        /// <param name="element">要拖动的元素</param>
+        /// <param name="currentPoint">当前鼠标位置</param>
+        /// <param name="startPoint">起始鼠标位置</param>
+        /// <remarks>
+        /// - 计算鼠标移动的位移向量
+        /// - 创建 Matrix 对象并应用 Translate 变换
+        /// - 对选中的图片元素应用矩阵变换
+        /// - 对选中的笔画应用变换
+        /// - 更新选择框的位置（如果有选择框）
+        /// - 包含异常处理
+        /// </remarks>
         private void ApplyMouseDragTransform(FrameworkElement element, Point currentPoint, Point startPoint)
         {
             try
@@ -534,7 +772,15 @@ namespace Ink_Canvas
             }
         }
 
-        // 更新选择框位置
+        /// <summary>
+        /// 更新选择框位置
+        /// </summary>
+        /// <param name="delta">位移向量</param>
+        /// <remarks>
+        /// - 更新选择框位置的逻辑
+        /// - 更新 BorderStrokeSelectionControl 的位置
+        /// - 包含异常处理
+        /// </remarks>
         private void UpdateSelectionBorderPosition(Vector delta)
         {
             try
@@ -558,7 +804,17 @@ namespace Ink_Canvas
             }
         }
 
-        // 提交变换历史
+        /// <summary>
+        /// 提交变换历史
+        /// </summary>
+        /// <param name="element">变换的元素</param>
+        /// <param name="initialTransform">初始变换</param>
+        /// <param name="finalTransform">最终变换</param>
+        /// <remarks>
+        /// - 提交变换历史到时间机器的逻辑
+        /// - 记录变换前后的状态
+        /// - 包含异常处理
+        /// </remarks>
         private void CommitTransformHistory(FrameworkElement element, TransformGroup initialTransform, TransformGroup finalTransform)
         {
             try
@@ -573,7 +829,21 @@ namespace Ink_Canvas
             }
         }
 
-        // 触摸拖动的完整实现
+        /// <summary>
+        /// 触摸拖动的完整实现
+        /// </summary>
+        /// <param name="element">要操作的元素</param>
+        /// <param name="e">操作事件参数</param>
+        /// <remarks>
+        /// - 支持单指拖动和多指手势
+        /// - 可以同时进行平移、旋转和缩放
+        /// - 通过 ManipulationDelta 获取手势变化信息
+        /// - 应用平移
+        /// - 支持两指缩放和旋转操作
+        /// - 应用变换到元素
+        /// - 应用变换到选中的笔画
+        /// - 包含异常处理
+        /// </remarks>
         private void ApplyTouchManipulationTransform(FrameworkElement element, ManipulationDeltaEventArgs e)
         {
             try
@@ -631,6 +901,19 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 创建并压缩图片
+        /// </summary>
+        /// <param name="filePath">图片文件路径</param>
+        /// <returns>创建的Image对象</returns>
+        /// <remarks>
+        /// - 创建文件依赖目录
+        /// - 复制文件到依赖目录
+        /// - 创建BitmapImage
+        /// - 如果图片尺寸大于1920x1080且设置了压缩图片，则压缩图片
+        /// - 否则使用原始尺寸
+        /// - 返回创建的Image对象
+        /// </remarks>
         private async Task<Image> CreateAndCompressImageAsync(string filePath)
         {
             string savePath = Path.Combine(Settings.Automation.AutoSavedStrokesLocation, "File Dependency");
@@ -685,6 +968,21 @@ namespace Ink_Canvas
         #endregion
 
         #region Media
+        /// <summary>
+        /// 处理媒体插入按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 打开文件选择对话框，选择媒体文件
+        /// - 读取媒体文件字节
+        /// - 创建MediaElement
+        /// - 居中缩放MediaElement
+        /// - 设置位置并添加到画布
+        /// - 设置LoadedBehavior和UnloadedBehavior为Manual
+        /// - 媒体加载完成后播放并立即暂停
+        /// - 提交到时间机器历史记录
+        /// </remarks>
         private async void BtnMediaInsert_Click(object sender, RoutedEventArgs e)
         {
             OpenFileDialog openFileDialog = new OpenFileDialog();
@@ -720,6 +1018,20 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 创建MediaElement
+        /// </summary>
+        /// <param name="filePath">媒体文件路径</param>
+        /// <returns>创建的MediaElement对象</returns>
+        /// <remarks>
+        /// - 创建文件依赖目录
+        /// - 创建MediaElement
+        /// - 设置Source、名称、LoadedBehavior和UnloadedBehavior
+        /// - 设置宽度和高度
+        /// - 复制文件到依赖目录
+        /// - 更新Source为新文件路径
+        /// - 返回创建的MediaElement对象
+        /// </remarks>
         private async Task<MediaElement> CreateMediaElementAsync(string filePath)
         {
             string savePath = Path.Combine(Settings.Automation.AutoSavedStrokesLocation, "File Dependency");
@@ -976,6 +1288,29 @@ namespace Ink_Canvas
 
         #endregion
 
+        /// <summary>
+        /// 居中并缩放元素
+        /// </summary>
+        /// <param name="element">要居中缩放的元素</param>
+        /// <remarks>
+        /// - 确保元素已加载且有有效尺寸
+        /// - 如果元素尺寸无效，等待加载完成后再处理
+        /// - 获取画布的实际尺寸
+        /// - 如果画布尺寸为0，使用窗口尺寸作为备选
+        /// - 如果仍然为0，使用屏幕尺寸
+        /// - 计算最大允许尺寸（画布的70%）
+        /// - 获取元素的当前尺寸
+        /// - 计算缩放比例
+        /// - 如果元素本身比最大尺寸小，不进行缩放
+        /// - 计算新的尺寸
+        /// - 设置元素尺寸
+        /// - 计算居中位置
+        /// - 确保位置不为负数
+        /// - 设置位置
+        /// - 保持TransformGroup，不清除RenderTransform
+        /// - 只有在没有TransformGroup时才创建
+        /// - 包含异常处理
+        /// </remarks>
         private void CenterAndScaleElement(FrameworkElement element)
         {
             try
@@ -1067,7 +1402,13 @@ namespace Ink_Canvas
             }
         }
 
-        // 初始化InkCanvas选择设置
+        /// <summary>
+        /// 初始化InkCanvas选择设置
+        /// </summary>
+        /// <remarks>
+        /// - 清除当前选择，避免显示控制点
+        /// - 设置编辑模式为非选择模式
+        /// </remarks>
         private void InitializeInkCanvasSelectionSettings()
         {
             if (inkCanvas != null)
@@ -1079,7 +1420,17 @@ namespace Ink_Canvas
             }
         }
 
-        // 更新图片选择工具栏位置
+        /// <summary>
+        /// 更新图片选择工具栏位置
+        /// </summary>
+        /// <param name="element">图片元素</param>
+        /// <remarks>
+        /// - 获取元素的实际边界（考虑变换）
+        /// - 计算工具栏位置（显示在图片下方）
+        /// - 确保工具栏不超出画布边界
+        /// - 设置工具栏位置
+        /// - 包含异常处理
+        /// </remarks>
         private void UpdateImageSelectionToolbarPosition(FrameworkElement element)
         {
             try
@@ -1109,7 +1460,22 @@ namespace Ink_Canvas
             }
         }
 
-        // 获取元素的实际边界（考虑变换）
+        /// <summary>
+        /// 获取元素的实际边界（考虑变换）
+        /// </summary>
+        /// <param name="element">要获取边界的元素</param>
+        /// <returns>元素的实际边界</returns>
+        /// <remarks>
+        /// - 获取元素的Left和Top位置
+        /// - 如果值为NaN，设为0
+        /// - 获取元素的宽度和高度
+        /// - 检查是否有RenderTransform
+        /// - 如果有变换，使用变换后的边界
+        /// - 变换失败时回退到简单计算
+        /// - 没有变换时直接使用位置和大小
+        /// - 包含异常处理
+        /// - 回退到基本计算
+        /// </remarks>
         private Rect GetElementActualBounds(FrameworkElement element)
         {
             try
@@ -1158,7 +1524,20 @@ namespace Ink_Canvas
 
         #region Image Selection Toolbar Event Handlers
 
-        // 图片克隆功能
+        /// <summary>
+        /// 处理图片克隆功能
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 检查当前选中元素是否为图片
+        /// - 创建克隆图片
+        /// - 添加到画布
+        /// - 初始化变换
+        /// - 绑定事件
+        /// - 记录历史
+        /// - 包含异常处理
+        /// </remarks>
         private void BorderImageClone_MouseUp(object sender, MouseButtonEventArgs e)
         {
             try
@@ -1189,7 +1568,22 @@ namespace Ink_Canvas
             }
         }
 
-        // 图片克隆到新页面
+        /// <summary>
+        /// 处理图片克隆到新页面功能
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 检查当前选中元素是否为图片
+        /// - 创建新页面
+        /// - 创建克隆图片
+        /// - 设置图片属性，避免被InkCanvas选择系统处理
+        /// - 初始化变换
+        /// - 绑定事件
+        /// - 添加到新页面的画布
+        /// - 记录历史
+        /// - 包含异常处理
+        /// </remarks>
         private void BorderImageCloneToNewBoard_MouseUp(object sender, MouseButtonEventArgs e)
         {
             try
@@ -1230,7 +1624,17 @@ namespace Ink_Canvas
             }
         }
 
-        // 图片左旋转
+        /// <summary>
+        /// 处理图片左旋转功能
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 检查当前是否有选中元素
+        /// - 应用旋转变换（向左旋转45度）
+        /// - 如果是图片元素，更新工具栏位置
+        /// - 包含异常处理
+        /// </remarks>
         private void BorderImageRotateLeft_MouseUp(object sender, MouseButtonEventArgs e)
         {
             try
@@ -1254,7 +1658,17 @@ namespace Ink_Canvas
             }
         }
 
-        // 图片右旋转
+        /// <summary>
+        /// 处理图片右旋转功能
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 检查当前是否有选中元素
+        /// - 应用旋转变换（向右旋转45度）
+        /// - 如果是图片元素，更新工具栏位置
+        /// - 包含异常处理
+        /// </remarks>
         private void BorderImageRotateRight_MouseUp(object sender, MouseButtonEventArgs e)
         {
             try
@@ -1278,7 +1692,18 @@ namespace Ink_Canvas
             }
         }
 
-        // 图片缩放减小
+        /// <summary>
+        /// 处理图片缩放减小功能
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 检查当前是否有选中元素
+        /// - 计算元素中心点
+        /// - 应用缩放变换（缩小到0.9倍）
+        /// - 如果是图片元素，更新工具栏位置
+        /// - 包含异常处理
+        /// </remarks>
         private void GridImageScaleDecrease_MouseUp(object sender, MouseButtonEventArgs e)
         {
             try
@@ -1303,7 +1728,18 @@ namespace Ink_Canvas
             }
         }
 
-        // 图片缩放增大
+        /// <summary>
+        /// 处理图片缩放增大功能
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 检查当前是否有选中元素
+        /// - 计算元素中心点
+        /// - 应用缩放变换（放大到1.1倍）
+        /// - 如果是图片元素，更新工具栏位置
+        /// - 包含异常处理
+        /// </remarks>
         private void GridImageScaleIncrease_MouseUp(object sender, MouseButtonEventArgs e)
         {
             try
@@ -1328,7 +1764,19 @@ namespace Ink_Canvas
             }
         }
 
-        // 图片删除
+        /// <summary>
+        /// 处理图片删除功能
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 检查当前是否有选中元素
+        /// - 保存删除前的编辑模式
+        /// - 记录删除历史
+        /// - 从画布中移除
+        /// - 清除选中状态
+        /// - 包含异常处理
+        /// </remarks>
         private void BorderImageDelete_MouseUp(object sender, MouseButtonEventArgs e)
         {
             try

Ink Canvas/MainWindow_cs/MW_Eraser.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Linq;
 using System.Windows;
@@ -174,6 +174,9 @@ namespace Ink_Canvas
                 AddedStroke = null;
                 ReplacedStroke = null;
             }
+
+            // 橡皮擦自动切换回批注
+            HandleEraserOperationEnded();
         }
 
         /// <summary>

Ink Canvas/MainWindow_cs/MW_FloatingWindowInterceptor.cs

@@ -296,6 +296,8 @@ namespace Ink_Canvas
         /// <summary>
         /// 设置拦截规则
         /// </summary>
+        /// <param name="type">拦截类型</param>
+        /// <param name="enabled">是否启用拦截</param>
         private void SetInterceptRule(FloatingWindowInterceptor.InterceptType type, bool enabled)
         {
             try

Ink Canvas/MainWindow_cs/MW_Hotkeys.cs

@@ -1,10 +1,16 @@
-using System.Windows;
+using System;
+using System.Windows;
 using System.Windows.Input;
 
 namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
+        /// <summary>
+        /// 鼠标滚轮事件处理，用于PPT翻页
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">鼠标滚轮事件参数</param>
         private void Window_MouseWheel(object sender, MouseWheelEventArgs e)
         {
             if (BtnPPTSlideShowEnd.Visibility != Visibility.Visible || currentMode != 0) return;
@@ -18,6 +24,11 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 键盘按键预览事件处理，用于PPT翻页
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">键盘事件参数</param>
         private void Main_Grid_PreviewKeyDown(object sender, KeyEventArgs e)
         {
             if (BtnPPTSlideShowEnd.Visibility != Visibility.Visible || currentMode != 0) return;
@@ -33,40 +44,80 @@ namespace Ink_Canvas
         }
 
 
+        /// <summary>
+        /// 撤销操作热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
         private void HotKey_Undo(object sender, ExecutedRoutedEventArgs e)
         {
             try
             {
                 SymbolIconUndo_MouseUp(lastBorderMouseDownObject, null);
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
 
+        /// <summary>
+        /// 重做操作热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
         private void HotKey_Redo(object sender, ExecutedRoutedEventArgs e)
         {
             try
             {
                 SymbolIconRedo_MouseUp(lastBorderMouseDownObject, null);
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
 
+        /// <summary>
+        /// 清空画布热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
         private void HotKey_Clear(object sender, ExecutedRoutedEventArgs e)
         {
             SymbolIconDelete_MouseUp(lastBorderMouseDownObject, null);
         }
 
 
+        /// <summary>
+        /// 退出PPT放映热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
         internal void KeyExit(object sender, ExecutedRoutedEventArgs e)
         {
+            if (currentMode != 0)
+            {
+                ImageBlackboard_MouseUp(lastBorderMouseDownObject, null);
+                return;
+            }
+
             if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible) BtnPPTSlideShowEnd_Click(BtnPPTSlideShowEnd, null);
         }
 
+        /// <summary>
+        /// 切换到绘图工具热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
         private void KeyChangeToDrawTool(object sender, ExecutedRoutedEventArgs e)
         {
             PenIcon_Click(lastBorderMouseDownObject, null);
         }
 
+        /// <summary>
+        /// 退出绘图工具热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
+        /// <remarks>
+        /// 在白板模式下，alt+q 退出白板模式
+        /// 在非白板模式下，alt+q 切换到鼠标模式
+        /// </remarks>
         internal void KeyChangeToQuitDrawTool(object sender, ExecutedRoutedEventArgs e)
         {
             if (currentMode != 0)
@@ -81,12 +132,24 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 切换到选择工具热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
+        /// <remarks>仅当画布控件面板可见时生效</remarks>
         private void KeyChangeToSelect(object sender, ExecutedRoutedEventArgs e)
         {
             if (StackPanelCanvasControls.Visibility == Visibility.Visible)
                 SymbolIconSelect_MouseUp(lastBorderMouseDownObject, null);
         }
 
+        /// <summary>
+        /// 切换到橡皮擦工具热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
+        /// <remarks>仅当画布控件面板可见时生效，根据当前橡皮擦状态选择相应的橡皮擦模式</remarks>
         private void KeyChangeToEraser(object sender, ExecutedRoutedEventArgs e)
         {
             if (StackPanelCanvasControls.Visibility == Visibility.Visible)
@@ -98,24 +161,45 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 切换到白板模式热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
         private void KeyChangeToBoard(object sender, ExecutedRoutedEventArgs e)
         {
             ImageBlackboard_MouseUp(lastBorderMouseDownObject, null);
         }
 
+        /// <summary>
+        /// 屏幕截图热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
         private void KeyCapture(object sender, ExecutedRoutedEventArgs e)
         {
             SaveScreenShotToDesktop();
         }
 
+        /// <summary>
+        /// 绘制直线热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
+        /// <remarks>仅当画布控件面板可见时生效</remarks>
         private void KeyDrawLine(object sender, ExecutedRoutedEventArgs e)
         {
             if (StackPanelCanvasControls.Visibility == Visibility.Visible) BtnDrawLine_Click(lastMouseDownSender, null);
         }
 
+        /// <summary>
+        /// 隐藏工具栏热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
         private void KeyHide(object sender, ExecutedRoutedEventArgs e)
         {
             SymbolIconEmoji_MouseUp(null, null);
         }
     }
-}
+}

Ink Canvas/MainWindow_cs/MW_Icons.cs

@@ -1,74 +1,179 @@
-namespace Ink_Canvas
+namespace Ink_Canvas
 {
+    /// <summary>
+    /// 图标几何路径定义类，包含各种工具图标的XAML几何路径
+    /// </summary>
+    /// <remarks>
+    /// 该类定义了应用程序中使用的所有工具图标，包括：
+    /// - 光标图标
+    /// - 画笔图标
+    /// - 橡皮擦图标
+    /// - 选择工具图标
+    /// - 手势图标
+    /// - 老版本浮动栏图标
+    /// 每个图标都有实线(Lined)和虚线(Solid)两种变体
+    /// </remarks>
     public static class XamlGraphicsIconGeometries
     {
+        /// <summary>
+        /// 虚线光标图标
+        /// </summary>
+        /// <remarks>用于表示鼠标模式的图标</remarks>
         public static string LinedCursorIcon =
             "F1 M24,24z M0,0z M5.72106,15.9716L3.71327,3.00395C3.6389,2.6693 3.65747,2.41831 3.76902,2.25099 3.88057,2.08366 4.0479,2 4.271,2 4.4941,2 4.71711,2.07437 4.94021,2.2231 6.72502,3.39438 9.28149,5.10481 12.6094,7.3544 15.677,9.45526 18.1125,11.1285 19.9159,12.3742 20.1204,12.5229 20.2505,12.6995 20.3062,12.904 20.362,13.1085 20.3249,13.2944 20.1947,13.4618 20.0832,13.6105 19.8973,13.6849 19.637,13.6849L13.3902,13.6849 17.6291,19.7365C17.722,19.8666 17.75,20.0153 17.7128,20.1827 17.6942,20.3314 17.6198,20.4522 17.4897,20.5452L15.5654,21.8838C15.4353,21.9768 15.2865,22.0139 15.1192,21.9953 14.9704,21.9582 14.8496,21.8745 14.7566,21.7444L10.2389,15.2745 7.58956,19.9038C7.45942,20.1269 7.30144,20.2756 7.11552,20.35 6.92961,20.4058 6.75292,20.3872 6.5856,20.2942 6.43686,20.2013 6.34392,20.0339 6.30673,19.7922L6.00007,17.8959C5.88852,17.0779,5.79543,16.4364,5.72106,15.9716z";
 
+        /// <summary>
+        /// 实线光标图标
+        /// </summary>
+        /// <remarks>用于表示鼠标模式的图标</remarks>
         public static string SolidCursorIcon =
             "F1 M24,24z M0,0z M5.72106,15.9716L3.71327,3.00395C3.6389,2.6693 3.65747,2.41831 3.76902,2.25099 3.88057,2.08366 4.0479,2 4.271,2 4.4941,2 4.71711,2.07437 4.94021,2.2231 6.72502,3.39438 9.28149,5.10481 12.6094,7.3544 15.677,9.45526 18.1125,11.1285 19.9159,12.3742 20.1204,12.5229 20.2505,12.6995 20.3062,12.904 20.362,13.1085 20.3249,13.2944 20.1947,13.4618 20.0832,13.6105 19.8973,13.6849 19.637,13.6849L13.3902,13.6849 17.6291,19.7365C17.722,19.8666 17.75,20.0153 17.7128,20.1827 17.6942,20.3314 17.6198,20.4522 17.4897,20.5452L15.5654,21.8838C15.4353,21.9768 15.2865,22.0139 15.1192,21.9953 14.9704,21.9582 14.8496,21.8745 14.7566,21.7444L10.2389,15.2745 7.58956,19.9038C7.45942,20.1269 7.30144,20.2756 7.11552,20.35 6.92961,20.4058 6.75292,20.3872 6.5856,20.2942 6.43686,20.2013 6.34392,20.0339 6.30673,19.7922L6.00007,17.8959C5.88852,17.0779,5.79543,16.4364,5.72106,15.9716z";
 
+        /// <summary>
+        /// 虚线画笔图标
+        /// </summary>
+        /// <remarks>用于表示画笔工具的图标</remarks>
         public static string LinedPenIcon =
             "F1 M24,24z M0,0z M16.996,2.34419L21.6823,7.00397C21.8941,7.23343 22,7.49819 22,7.79825 22,8.09831 21.8941,8.35425 21.6823,8.56606L10.8271,19.4212 4.57877,13.1994 15.4339,2.34419C15.6457,2.11473 15.9017,2 16.2018,2 16.5195,2 16.7842,2.11473 16.996,2.34419z M9.63571,20.5862L9.50333,20.6391 2.6725,21.9894C2.47834,22.0247 2.31066,21.9718 2.16946,21.8306 2.02825,21.707 1.97529,21.5481 2.01059,21.354L3.38736,14.5232C3.38736,14.4879,3.40502,14.4349,3.44032,14.3643L9.63571,20.5862z";
 
+        /// <summary>
+        /// 实线画笔图标
+        /// </summary>
+        /// <remarks>用于表示画笔工具的图标</remarks>
         public static string SolidPenIcon =
             "F1 M24,24z M0,0z M16.996,2.34419L21.6823,7.00397C21.8941,7.23343 22,7.49819 22,7.79825 22,8.09831 21.8941,8.35425 21.6823,8.56606L10.8271,19.4212 4.57877,13.1994 15.4339,2.34419C15.6457,2.11473 15.9017,2 16.2018,2 16.5195,2 16.7842,2.11473 16.996,2.34419z M9.63571,20.5862L9.50333,20.6391 2.6725,21.9894C2.47834,22.0247 2.31066,21.9718 2.16946,21.8306 2.02825,21.707 1.97529,21.5481 2.01059,21.354L3.38736,14.5232C3.38736,14.4879,3.40502,14.4349,3.44032,14.3643L9.63571,20.5862z";
 
+        /// <summary>
+        /// 虚线橡皮擦图标（按笔画擦除模式）
+        /// </summary>
+        /// <remarks>用于表示橡皮擦工具的按笔画擦除模式的图标</remarks>
         public static string LinedEraserStrokeIcon =
             "F1 M24,24z M0,0z M19.0625,7.99501C19.2863,7.99501 19.4861,8.06695 19.662,8.21083 19.8538,8.35471 19.9897,8.53856 20.0696,8.76237 20.4054,9.94539 20.7011,11.2563 20.9569,12.6951 21.1967,14.0859 21.3646,15.4368 21.4605,16.7477L21.4845,17.2993C21.5005,17.5551 21.5084,17.9068 21.5084,18.3544 21.5084,19.2017 21.2926,19.8412 20.861,20.2728 20.4453,20.7044 19.7099,21.0482 18.6548,21.3039 18.3191,21.3679 17.7836,20.4327 17.0482,18.4983 16.5845,20.8643 16.1129,22.0313 15.6333,21.9994 13.9227,21.9674 12.468,21.8954 11.269,21.7835L10.8134,21.7356C9.83817,21.6077 8.86297,21.4398 7.88778,21.232 7.1524,21.0721 6.32109,20.8563 5.39386,20.5845 4.61051,20.3447 3.97904,20.089 3.49944,19.8172 3.01984,19.5454 2.70809,19.2337 2.56421,18.882 2.40434,18.4823 2.50827,18.0746 2.87596,17.659L3.09176,17.3952 3.18769,17.2273 3.23565,17.1074 3.37954,16.8197 3.47544,16.5559 3.6433,15.9324 3.73923,15.6207 3.85912,15.1411 4.17088,13.5824 4.57853,11.1844 4.98621,9.05013C5.03417,8.79435 5.16203,8.55455 5.36986,8.33073 5.59367,8.10692 5.8255,7.99501 6.0653,7.99501L19.0625,7.99501z M14.4823,2C14.7861,2 15.0418,2.08793 15.2496,2.26378 15.4575,2.43963 15.5614,2.64746 15.5614,2.88726L15.5614,4.99751 19.0625,4.99751C19.3343,4.99751 19.5661,5.10142 19.7579,5.30925 19.9498,5.50109 20.0457,5.73289 20.0457,6.00467 20.0457,6.27644 19.9498,6.51624 19.7579,6.72407 19.5661,6.91591 19.3343,7.01183 19.0625,7.01183L6.0653,7.01183C5.79352,7.01183 5.55372,6.91591 5.34589,6.72407 5.15405,6.51624 5.05814,6.27644 5.05814,6.00467 5.05814,5.73289 5.15405,5.50109 5.34589,5.30925 5.55372,5.10142 5.79352,4.99751 6.0653,4.99751L9.56638,4.99751 9.56638,2.88726C9.56638,2.66345 9.65432,2.47161 9.83017,2.31174 10.022,2.15187 10.2538,2.05595 10.5256,2.02398L10.6455,2 14.4823,2z";
 
+        /// <summary>
+        /// 实线橡皮擦图标（按笔画擦除模式）
+        /// </summary>
+        /// <remarks>用于表示橡皮擦工具的按笔画擦除模式的图标</remarks>
         public static string SolidEraserStrokeIcon =
             "F1 M24,24z M0,0z M19.0625,7.99501C19.2863,7.99501 19.4861,8.06695 19.662,8.21083 19.8538,8.35471 19.9897,8.53856 20.0696,8.76237 20.4054,9.94539 20.7011,11.2563 20.9569,12.6951 21.1967,14.0859 21.3646,15.4368 21.4605,16.7477L21.4845,17.2993C21.5005,17.5551 21.5084,17.9068 21.5084,18.3544 21.5084,19.2017 21.2926,19.8412 20.861,20.2728 20.4453,20.7044 19.7099,21.0482 18.6548,21.3039 18.3191,21.3679 17.7836,20.4327 17.0482,18.4983 16.5845,20.8643 16.1129,22.0313 15.6333,21.9994 13.9227,21.9674 12.468,21.8954 11.269,21.7835L10.8134,21.7356C9.83817,21.6077 8.86297,21.4398 7.88778,21.232 7.1524,21.0721 6.32109,20.8563 5.39386,20.5845 4.61051,20.3447 3.97904,20.089 3.49944,19.8172 3.01984,19.5454 2.70809,19.2337 2.56421,18.882 2.40434,18.4823 2.50827,18.0746 2.87596,17.659L3.09176,17.3952 3.18769,17.2273 3.23565,17.1074 3.37954,16.8197 3.47544,16.5559 3.6433,15.9324 3.73923,15.6207 3.85912,15.1411 4.17088,13.5824 4.57853,11.1844 4.98621,9.05013C5.03417,8.79435 5.16203,8.55455 5.36986,8.33073 5.59367,8.10692 5.8255,7.99501 6.0653,7.99501L19.0625,7.99501z M14.4823,2C14.7861,2 15.0418,2.08793 15.2496,2.26378 15.4575,2.43963 15.5614,2.64746 15.5614,2.88726L15.5614,4.99751 19.0625,4.99751C19.3343,4.99751 19.5661,5.10142 19.7579,5.30925 19.9498,5.50109 20.0457,5.73289 20.0457,6.00467 20.0457,6.27644 19.9498,6.51624 19.7579,6.72407 19.5661,6.91591 19.3343,7.01183 19.0625,7.01183L6.0653,7.01183C5.79352,7.01183 5.55372,6.91591 5.34589,6.72407 5.15405,6.51624 5.05814,6.27644 5.05814,6.00467 5.05814,5.73289 5.15405,5.50109 5.34589,5.30925 5.55372,5.10142 5.79352,4.99751 6.0653,4.99751L9.56638,4.99751 9.56638,2.88726C9.56638,2.66345 9.65432,2.47161 9.83017,2.31174 10.022,2.15187 10.2538,2.05595 10.5256,2.02398L10.6455,2 14.4823,2z";
 
+        /// <summary>
+        /// 虚线橡皮擦图标（圆形擦除模式）
+        /// </summary>
+        /// <remarks>用于表示橡皮擦工具的圆形擦除模式的图标</remarks>
         public static string LinedEraserCircleIcon =
             "F1 M24,24z M0,0z M15.0665,2.29557L21.6921,8.92118C21.8892,9.11823 21.9877,9.36453 21.9877,9.6601 21.9877,9.93924 21.8892,10.1773 21.6921,10.3744L10.3621,21.6798C10.165,21.8933 9.92694,22 9.6478,22 9.36865,22 9.12235,21.8933 8.90888,21.6798L2.30789,15.0788C2.11085,14.8654 2.01233,14.619 2.01233,14.3399 2.01233,14.0608 2.11085,13.8227 2.30789,13.6256L13.6133,2.29557C13.8103,2.09852 14.0485,2 14.3276,2 14.6232,2 14.8695,2.09852 15.0665,2.29557z M8.19458,11.5813C8.09606,11.4828 7.97292,11.4335 7.82514,11.4335 7.69377,11.4335 7.57883,11.4828 7.48031,11.5813L5.28818,13.7734C5.18965,13.8719 5.14041,13.9951 5.14041,14.1429 5.14041,14.2906 5.18965,14.4138 5.28818,14.5123L9.47539,18.6995C9.59033,18.8144 9.71347,18.8719 9.84483,18.8719 9.99261,18.8719 10.1158,18.8144 10.2143,18.6995L12.4064,16.5074C12.5049,16.4089 12.5542,16.2939 12.5542,16.1626 12.5542,16.0148 12.5049,15.8916 12.4064,15.7931L8.19458,11.5813z";
 
+        /// <summary>
+        /// 实线橡皮擦图标（圆形擦除模式）
+        /// </summary>
+        /// <remarks>用于表示橡皮擦工具的圆形擦除模式的图标</remarks>
         public static string SolidEraserCircleIcon =
             "F1 M24,24z M0,0z M15.0665,2.29557L21.6921,8.92118C21.8892,9.11823 21.9877,9.36453 21.9877,9.6601 21.9877,9.93924 21.8892,10.1773 21.6921,10.3744L10.3621,21.6798C10.165,21.8933 9.92694,22 9.6478,22 9.36865,22 9.12235,21.8933 8.90888,21.6798L2.30789,15.0788C2.11085,14.8654 2.01233,14.619 2.01233,14.3399 2.01233,14.0608 2.11085,13.8227 2.30789,13.6256L13.6133,2.29557C13.8103,2.09852 14.0485,2 14.3276,2 14.6232,2 14.8695,2.09852 15.0665,2.29557z M8.19458,11.5813C8.09606,11.4828 7.97292,11.4335 7.82514,11.4335 7.69377,11.4335 7.57883,11.4828 7.48031,11.5813L5.28818,13.7734C5.18965,13.8719 5.14041,13.9951 5.14041,14.1429 5.14041,14.2906 5.18965,14.4138 5.28818,14.5123L9.47539,18.6995C9.59033,18.8144 9.71347,18.8719 9.84483,18.8719 9.99261,18.8719 10.1158,18.8144 10.2143,18.6995L12.4064,16.5074C12.5049,16.4089 12.5542,16.2939 12.5542,16.1626 12.5542,16.0148 12.5049,15.8916 12.4064,15.7931L8.19458,11.5813z";
 
+        /// <summary>
+        /// 虚线套索选择工具图标
+        /// </summary>
+        /// <remarks>用于表示套索选择工具的图标</remarks>
         public static string LinedLassoSelectIcon =
             "F0 M24,24z M0,0z M21.1749,3.19033C21.2959,3.31432,21.3512,3.45083,21.3512,3.62667L21.3512,15.7344 18.9141,14.0608 18.9141,5.43716 5.30084,5.43716 5.30084,19.0505 14.7641,19.0505 15.0947,21.4876 3.49029,21.4876C3.31451,21.4876 3.178,21.4323 3.05397,21.3113 2.92046,21.1636 2.86368,21.0107 2.86368,20.8334L2.86368,3.62667C2.86368,3.44751 2.92108,3.30918 3.04695,3.18331 3.17285,3.0574 3.31118,3 3.49029,3L20.697,3C20.8743,3,21.0272,3.0568,21.1749,3.19033z M15.042,13.7475L16.02,20.0637C16.0562,20.2901,16.1015,20.6026,16.1559,21.001L16.3052,21.9247C16.3234,22.0424 16.3686,22.1239 16.4411,22.1692 16.5226,22.2144 16.6086,22.2235 16.6992,22.1963 16.7897,22.1601 16.8667,22.0877 16.9301,21.979L18.2205,19.7242 20.421,22.8755C20.4663,22.9389 20.5251,22.9796 20.5976,22.9978 20.6791,23.0068 20.7515,22.9887 20.8149,22.9434L21.7522,22.2914C21.8156,22.2461 21.8518,22.1873 21.8609,22.1148 21.879,22.0333 21.8654,21.9609 21.8201,21.8975L19.7555,18.9499 22.7981,18.9499C22.9249,18.9499 23.0154,18.9137 23.0698,18.8412 23.1332,18.7597 23.1512,18.6692 23.1241,18.5696 23.0969,18.47 23.0336,18.3839 22.934,18.3115 22.0556,17.7048 20.8693,16.8898 19.3751,15.8665 17.7542,14.7708 16.509,13.9377 15.6396,13.3672 15.531,13.2947 15.4224,13.2585 15.3137,13.2585 15.205,13.2585 15.1235,13.2992 15.0692,13.3807 15.0149,13.4622 15.0058,13.5845 15.042,13.7475z";
 
+        /// <summary>
+        /// 实线套索选择工具图标
+        /// </summary>
+        /// <remarks>用于表示套索选择工具的图标</remarks>
         public static string SolidLassoSelectIcon =
             "F0 M24,24z M0,0z M21.1749,3.19033C21.2959,3.31432,21.3512,3.45083,21.3512,3.62667L21.3512,15.7344 18.9141,14.0608 18.9141,5.43716 5.30084,5.43716 5.30084,19.0505 14.7641,19.0505 15.0947,21.4876 3.49029,21.4876C3.31451,21.4876 3.178,21.4323 3.05397,21.3113 2.92046,21.1636 2.86368,21.0107 2.86368,20.8334L2.86368,3.62667C2.86368,3.44751 2.92108,3.30918 3.04695,3.18331 3.17285,3.0574 3.31118,3 3.49029,3L20.697,3C20.8743,3,21.0272,3.0568,21.1749,3.19033z M15.042,13.7475L16.02,20.0637C16.0562,20.2901,16.1015,20.6026,16.1559,21.001L16.3052,21.9247C16.3234,22.0424 16.3686,22.1239 16.4411,22.1692 16.5226,22.2144 16.6086,22.2235 16.6992,22.1963 16.7897,22.1601 16.8667,22.0877 16.9301,21.979L18.2205,19.7242 20.421,22.8755C20.4663,22.9389 20.5251,22.9796 20.5976,22.9978 20.6791,23.0068 20.7515,22.9887 20.8149,22.9434L21.7522,22.2914C21.8156,22.2461 21.8518,22.1873 21.8609,22.1148 21.879,22.0333 21.8654,21.9609 21.8201,21.8975L19.7555,18.9499 22.7981,18.9499C22.9249,18.9499 23.0154,18.9137 23.0698,18.8412 23.1332,18.7597 23.1512,18.6692 23.1241,18.5696 23.0969,18.47 23.0336,18.3839 22.934,18.3115 22.0556,17.7048 20.8693,16.8898 19.3751,15.8665 17.7542,14.7708 16.509,13.9377 15.6396,13.3672 15.531,13.2947 15.4224,13.2585 15.3137,13.2585 15.205,13.2585 15.1235,13.2992 15.0692,13.3807 15.0149,13.4622 15.0058,13.5845 15.042,13.7475z";
 
+        /// <summary>
+        /// 禁用手势图标
+        /// </summary>
+        /// <remarks>用于表示手势功能已禁用的图标</remarks>
         public static string DisabledGestureIcon =
             "F0 M24,24z M0,0z M7.82154,10.0753L7.82154,3.74613C7.82154,3.06603 8.08946,2.40655 8.57377,1.92224 9.05808,1.43793 9.70726,1.17001 10.3977,1.17001 11.0881,1.17001 11.7372,1.43793 12.2216,1.92224 12.7059,2.40655 12.9738,3.05573 12.9738,3.74613L12.9738,6.37308C13.1415,6.33947 13.3139,6.32225 13.489,6.32225 14.1794,6.32225 14.8286,6.59016 15.3129,7.07447 15.4484,7.21001 15.567,7.35845 15.6675,7.5171 15.9551,7.40916 16.2634,7.35269 16.5803,7.35269 17.2707,7.35269 17.9199,7.62061 18.4042,8.10492 18.5461,8.24683 18.6695,8.4029 18.7729,8.57001 19.6856,8.26338 20.7674,8.45871 21.4647,9.15599 21.949,9.6403 22.2169,10.2998 22.2169,10.9799L22.2169,15.6169C22.2169,17.5438 21.4647,19.3574 20.1045,20.7176 18.7443,22.0778 16.9307,22.83 15.0038,22.83L13.149,22.83 13.1799,22.8094 12.8398,22.8094C11.7682,22.7579 10.7068,22.4694 9.75878,21.9541 8.70773,21.3874 7.81124,20.563 7.15175,19.5738L6.94566,19.2647C6.60562,18.7494 5.49273,16.8019 3.52458,13.3087 3.19484,12.7213 3.1021,12.0412 3.27727,11.3818 3.45245,10.7326 3.86463,10.1761 4.44168,9.83608 5.00842,9.49604 5.66791,9.35177 6.31709,9.43421 6.86548,9.50385 7.39181,9.7279 7.82154,10.0753z M10.037,3.38547C10.1297,3.28243 10.2637,3.23091 10.3977,3.23091 10.5316,3.23091 10.6656,3.29273 10.7583,3.38547 10.8614,3.47821 10.9129,3.61217 10.9129,3.74613L10.9129,11.4745C10.9129,12.0412 11.3766,12.5049 11.9433,12.5049 12.5101,12.5049 12.9738,12.0412 12.9738,11.4745L12.9738,8.89836C12.9738,8.7644 13.0356,8.63045 13.1283,8.53771 13.2211,8.43466 13.355,8.38314 13.489,8.38314 13.623,8.38314 13.7569,8.44497 13.8497,8.53771 13.9527,8.63045 14.0042,8.7644 14.0042,8.89836L14.0042,11.4745C14.0042,12.0412 14.4679,12.5049 15.0347,12.5049 15.6014,12.5049 16.0651,12.0412 16.0651,11.4745L16.0651,9.92881C16.0651,9.79485 16.1269,9.66089 16.2197,9.56815 16.3124,9.46511 16.4464,9.41359 16.5803,9.41359 16.7143,9.41359 16.8483,9.47541 16.941,9.56815 17.044,9.66089 17.0956,9.79485 17.0956,9.92881L17.0956,10.5869C17.0752,10.7163 17.0646,10.8477 17.0646,10.9799 17.0646,11.0661 17.0754,11.1499 17.0956,11.2301L17.0956,11.4745C17.0956,12.0412 17.5593,12.5049 18.126,12.5049 18.6928,12.5049 19.1565,12.0412 19.1565,11.4745L19.1565,10.8128C19.1834,10.7399 19.2266,10.6727 19.2801,10.6192 19.4759,10.4234 19.8159,10.4234 20.0117,10.6192 20.1148,10.712 20.1663,10.8459 20.1663,10.9799L20.1663,15.6169C20.1663,16.9977 19.6408,18.296 18.6618,19.2647 17.6829,20.2333 16.3949,20.7691 15.0141,20.7691L13.1593,20.7691C12.3143,20.7691 11.4796,20.5527 10.7274,20.1509 9.98548,19.749 9.3363,19.1616 8.8726,18.4506L8.66651,18.1415C8.35737,17.6675 7.23419,15.7096 5.31756,12.2988 5.24543,12.1752 5.23512,12.0412 5.26604,11.9073 5.30725,11.7733 5.38969,11.6703 5.50304,11.5981 5.66791,11.4951 5.874,11.4539 6.06978,11.4745 6.26557,11.5054 6.45105,11.5878 6.59531,11.7321L8.11007,13.2469C8.49419,13.631 9.10425,13.648 9.50833,13.2978 9.73651,13.1084 9.88244,12.8229 9.88244,12.5049L9.88244,3.74613C9.88244,3.61217,9.94426,3.47821,10.037,3.38547z M2.99905,6.31195L1.78313,4.65293 2.61779,4.04497C3.46275,3.4267,4.37985,2.89087,5.33817,2.46838L6.27587,2.0459 7.12084,3.93162 6.18313,4.3541C5.35878,4.72506,4.56533,5.17846,3.83372,5.71429L2.99905,6.32225 2.99905,6.31195z M18.2806,5.20935L19.1565,5.75549 20.259,4.01404 19.3831,3.4679C18.1157,2.67446,16.7452,2.0768,15.3026,1.68523L14.303,1.41731 13.7672,3.40607 14.7667,3.67399C16.0033,4.00373,17.1883,4.51895,18.2806,5.20935z";
 
+        /// <summary>
+        /// 启用手势图标
+        /// </summary>
+        /// <remarks>用于表示手势功能已启用的图标</remarks>
         public static string EnabledGestureIcon =
             "F1 M24,24z M0,0z M7.29844,9.85586L7.29844,3.52668C7.29844,2.84658 7.56636,2.1871 8.05067,1.70279 8.53498,1.21848 9.18416,0.950562 9.87456,0.950562 10.565,0.950562 11.2141,1.21848 11.6984,1.70279 12.1828,2.1871 12.4507,2.83628 12.4507,3.52668L12.4507,6.15363C12.6184,6.12002 12.7908,6.10279 12.9659,6.10279 13.6563,6.10279 14.3055,6.37071 14.7898,6.85502 14.9253,6.99055 15.0439,7.139 15.1444,7.29765 15.432,7.18971 15.7403,7.13324 16.0572,7.13324 16.7476,7.13324 17.3968,7.40116 17.8811,7.88547 18.023,8.02738 18.1464,8.18344 18.2498,8.35055 19.1625,8.04393 20.2443,8.23925 20.9416,8.93654 21.4259,9.42085 21.6938,10.0803 21.6938,10.7604L21.6938,14.2958C21.1174,13.741,20.4192,13.3118,19.6432,13.0524L19.6432,10.7604C19.6432,10.6265 19.5917,10.4925 19.4886,10.3998 19.2928,10.204 18.9528,10.204 18.757,10.3998 18.7035,10.4532 18.6603,10.5204 18.6334,10.5934L18.6334,11.255C18.6334,11.8218 18.1697,12.2855 17.6029,12.2855 17.0362,12.2855 16.5725,11.8218 16.5725,11.255L16.5725,11.0106C16.5523,10.9304 16.5415,10.8466 16.5415,10.7604 16.5415,10.6283 16.5521,10.4969 16.5725,10.3674L16.5725,9.70936C16.5725,9.5754 16.5209,9.44144 16.4179,9.3487 16.3252,9.25596 16.1912,9.19413 16.0572,9.19413 15.9233,9.19413 15.7893,9.24566 15.6966,9.3487 15.6038,9.44144 15.542,9.5754 15.542,9.70936L15.542,11.255C15.542,11.8218 15.0783,12.2855 14.5116,12.2855 13.9448,12.2855 13.4811,11.8218 13.4811,11.255L13.4811,8.67891C13.4811,8.54495 13.4296,8.41099 13.3266,8.31825 13.2338,8.22551 13.0999,8.16369 12.9659,8.16369 12.8319,8.16369 12.698,8.21521 12.6052,8.31825 12.5125,8.41099 12.4507,8.54495 12.4507,8.67891L12.4507,11.255C12.4507,11.8218 11.987,12.2855 11.4202,12.2855 10.8535,12.2855 10.3898,11.8218 10.3898,11.255L10.3898,3.52668C10.3898,3.39272 10.3383,3.25876 10.2352,3.16602 10.1425,3.07328 10.0085,3.01145 9.87456,3.01145 9.7406,3.01145 9.60664,3.06298 9.5139,3.16602 9.42116,3.25876 9.35933,3.39272 9.35933,3.52668L9.35933,12.2855C9.35933,12.6034 9.21341,12.8889 8.98523,13.0783 8.58114,13.4285 7.97109,13.4115 7.58697,13.0274L6.07221,11.5127C5.92795,11.3684 5.74247,11.286 5.54668,11.255 5.3509,11.2344 5.14481,11.2756 4.97994,11.3787 4.86659,11.4508 4.78415,11.5539 4.74293,11.6878 4.71202,11.8218 4.72232,11.9557 4.79446,12.0794 6.71109,15.4902 7.83427,17.448 8.14341,17.922L8.3495,18.2312C8.8132,18.9422 9.46238,19.5295 10.2043,19.9314 10.9565,20.3333 11.7912,20.5497 12.6362,20.5497L12.9829,20.5497C13.3696,21.3681 13.9542,22.0748 14.6748,22.608 14.6102,22.6097 14.5455,22.6106 14.4807,22.6106L12.6258,22.6106 12.6568,22.59 12.3167,22.59C11.2451,22.5384 10.1837,22.2499 9.23568,21.7347 8.18463,21.1679 7.28814,20.3436 6.62865,19.3544L6.42256,19.0452C6.08251,18.53 4.96963,16.5824 3.00148,13.0892 2.67174,12.5019 2.579,11.8218 2.75417,11.1623 2.92935,10.5131 3.34153,9.95668 3.91858,9.61663 4.48532,9.27658 5.14481,9.13232 5.79399,9.21476 6.34238,9.28439 6.86871,9.50845 7.29844,9.85586z M2.47595,6.0925L1.26003,4.43348 2.09469,3.82551C2.93965,3.20725,3.85675,2.67141,4.81507,2.24893L5.75277,1.82645 6.59774,3.71216 5.66003,4.13465C4.83567,4.50561,4.04223,4.959,3.31061,5.49484L2.47595,6.1028 2.47595,6.0925z M17.7575,4.9899L18.6334,5.53604 19.7359,3.79458 18.86,3.24845C17.5926,2.455,16.2221,1.85734,14.7795,1.46577L13.7799,1.19786 13.2441,3.18662 14.2436,3.45454C15.4802,3.78428,16.6652,4.2995,17.7575,4.9899z";
 
+        /// <summary>
+        /// 启用手势图标徽章（带勾选标记）
+        /// </summary>
+        /// <remarks>用于表示手势功能已启用并带有勾选标记的图标</remarks>
         public static string EnabledGestureIconBadgeCheck =
             "M22.74,18.2234C22.74,20.8888 20.5793,23.0494 17.914,23.0494 15.2487,23.0494 13.088,20.8888 13.088,18.2234 13.088,15.5581 15.2487,13.3975 17.914,13.3975 20.5793,13.3975 22.74,15.5581 22.74,18.2234z M21.1673,15.8009C21.4651,16.0889,21.473,16.5637,21.1851,16.8614L17.5425,20.6282C17.4012,20.7743 17.2066,20.8568 17.0034,20.8568 16.8001,20.8568 16.6055,20.7743 16.4642,20.6282L14.6429,18.7448C14.355,18.447 14.3629,17.9722 14.6607,17.6843 14.9585,17.3963 15.4333,17.4043 15.7212,17.7021L17.0034,19.0279 20.1068,15.8187C20.3947,15.5209,20.8695,15.513,21.1673,15.8009z";
 
         // 老版浮动栏按钮图标
+        /// <summary>
+        /// 老版虚线光标图标
+        /// </summary>
+        /// <remarks>老版浮动栏中用于表示鼠标模式的图标</remarks>
         public static string LegacyLinedCursorIcon =
             "F0 M24,24z M0,0z M3.85151,2.7073C3.52422,2.57095 3.147,2.64558 2.89629,2.89629 2.64558,3.147 2.57095,3.52422 2.7073,3.85151L9.7773,20.8215C9.91729,21.1575 10.2507,21.3718 10.6145,21.3595 10.9783,21.3473 11.2965,21.1111 11.4135,20.7664L13.4711,14.7085 18.8963,20.1337C19.238,20.4754 19.792,20.4754 20.1337,20.1337 20.4754,19.792 20.4754,19.238 20.1337,18.8963L14.7085,13.4711 20.7664,11.4135C21.1111,11.2965 21.3473,10.9783 21.3595,10.6145 21.3718,10.2507 21.1575,9.91729 20.8215,9.7773L3.85151,2.7073z M10.5017,18.0097L5.13984,5.13984 18.0097,10.5017 12.8136,12.2665C12.5561,12.3539,12.3539,12.5561,12.2665,12.8136L10.5017,18.0097z";
 
+        /// <summary>
+        /// 老版实线光标图标
+        /// </summary>
+        /// <remarks>老版浮动栏中用于表示鼠标模式的图标</remarks>
         public static string LegacySolidCursorIcon =
             "F0 M24,24z M0,0z M2.89629,2.89629C3.147,2.64558,3.52422,2.57095,3.85151,2.7073L20.8215,9.7773C21.1575,9.91729 21.3718,10.2507 21.3595,10.6145 21.3473,10.9783 21.1111,11.2965 20.7664,11.4135L14.7085,13.4711 20.1337,18.8963C20.4754,19.238 20.4754,19.792 20.1337,20.1337 19.792,20.4754 19.238,20.4754 18.8963,20.1337L13.4711,14.7085 11.4135,20.7664C11.2965,21.1111 10.9783,21.3473 10.6145,21.3595 10.2507,21.3718 9.91729,21.1575 9.7773,20.8215L2.7073,3.85151C2.57095,3.52422,2.64558,3.147,2.89629,2.89629z";
 
+        /// <summary>
+        /// 老版虚线画笔图标
+        /// </summary>
+        /// <remarks>老版浮动栏中用于表示画笔工具的图标</remarks>
         public static string LegacyLinedPenIcon =
             "F0 M24,24z M0,0z M18.7033,4.39761C18.4948,4.31644 18.2714,4.27922 18.0473,4.28846 17.8233,4.29771 17.6038,4.3532 17.403,4.4512 17.2022,4.54919 17.0246,4.68744 16.8813,4.8568 16.8665,4.87422 16.8511,4.89102 16.8349,4.90716L15.7108,6.03131 17.9591,8.27962 19.0832,7.15546C19.1021,7.13662 19.1218,7.11869 19.1424,7.10176 19.3143,6.96037 19.4543,6.7853 19.5537,6.58793 19.6531,6.39058 19.7099,6.1751 19.7207,5.95519 19.7314,5.73528 19.6959,5.51545 19.6163,5.30962 19.5367,5.10378 19.4147,4.91625 19.2576,4.75914 19.1004,4.60201 18.9117,4.47877 18.7033,4.39761z M16.7944,9.44428L14.5461,7.19597 5.47079,16.2713 4.62767,19.3627 7.7191,18.5196 16.7944,9.44428z M13.9636,5.44913L4.15148,15.2613C4.05014,15.3626,3.977,15.4886,3.93929,15.6269L2.65942,20.3198C2.58166,20.6049 2.66264,20.9098 2.87161,21.1188 3.08059,21.3277 3.38551,21.4087 3.67063,21.331L8.36347,20.0511C8.50174,20.0134,8.62777,19.9402,8.72911,19.8389L20.2217,8.34636C20.5551,8.06468 20.8283,7.71873 21.0247,7.3289 21.2275,6.92628 21.3437,6.48586 21.3658,6.03572 21.3878,5.58559 21.3151,5.13594 21.1525,4.71552 20.99,4.29512 20.7411,3.91338 20.4222,3.59447 20.1033,3.27558 19.7214,3.0265 19.3009,2.86277 18.8804,2.69905 18.4304,2.62417 17.9794,2.64278 17.5285,2.66139 17.0862,2.77308 16.6807,2.97095 16.2862,3.16344 15.9348,3.43348 15.6478,3.76494L13.9636,5.44913z";
 
+        /// <summary>
+        /// 老版实线画笔图标
+        /// </summary>
+        /// <remarks>老版浮动栏中用于表示画笔工具的图标</remarks>
         public static string LegacySolidPenIcon =
             "F1 M24,24z M0,0z M19.3332,2.85933C18.9193,2.69814 18.4762,2.62442 18.0322,2.64274 17.5882,2.66106 17.1527,2.77103 16.7535,2.96583 16.3643,3.15575 16.0177,3.42232 15.7349,3.74956L14.5672,4.91725 19.0731,9.4231 20.2373,8.25888C20.5666,7.98121 20.8364,7.63993 21.0302,7.25528 21.2298,6.85899 21.3442,6.42551 21.3659,5.98249 21.3876,5.53947 21.3161,5.09692 21.1561,4.68313 20.996,4.26934 20.7511,3.89359 20.4372,3.57966 20.1232,3.26574 19.7472,3.02052 19.3332,2.85933z M18.0085,10.4877L13.5026,5.98183 4.14128,15.3432C4.04864,15.4358,3.98179,15.551,3.94732,15.6774L2.65684,20.4091C2.58577,20.6698 2.65979,20.9485 2.8508,21.1395 3.04182,21.3305 3.32054,21.4045 3.58117,21.3335L8.3129,20.043C8.43929,20.0085,8.5545,19.9417,8.64713,19.849L18.0085,10.4877z";
 
+        /// <summary>
+        /// 老版虚线橡皮擦图标（按笔画擦除模式）
+        /// </summary>
+        /// <remarks>老版浮动栏中用于表示橡皮擦工具的按笔画擦除模式的图标</remarks>
         public static string LegacyLinedEraserStrokeIcon =
             "F0 M25,24z M0,0z M7.32029,21.36L13.0098,21.36 13.0122,21.36 21.5471,21.36C21.989,21.36 22.3473,21.0017 22.3473,20.5598 22.3473,20.1179 21.989,19.7596 21.5471,19.7596L14.9429,19.7596 21.4352,13.2673C22.7372,12.0786,22.6872,10.1353,21.449,8.89707L16.1515,3.59952C14.9628,2.29751,13.0195,2.34754,11.7813,3.58572L2.68992,12.6771C1.3879,13.8657,1.43793,15.8091,2.67611,17.0473L6.75447,21.1256C6.90453,21.2757,7.10807,21.36,7.32029,21.36z M14.9771,4.68685C14.4571,4.10907,13.5664,4.06392,12.9129,4.71737L6.55503,11.0753 13.9595,18.4797 20.3174,12.1218C20.3273,12.1119 20.3375,12.1022 20.3479,12.0929 20.9257,11.5729 20.9708,10.6822 20.3174,10.0287L15.006,4.71737C14.9961,4.70745,14.9864,4.69727,14.9771,4.68685z M12.8278,19.6114L5.42338,12.2069 3.80776,13.8225C3.79784,13.8324 3.78766,13.8421 3.77724,13.8515 3.19947,14.3715 3.15431,15.2622 3.80776,15.9156L7.65174,19.7596 12.6796,19.7596 12.8278,19.6114z";
 
+        /// <summary>
+        /// 老版实线橡皮擦图标（按笔画擦除模式）
+        /// </summary>
+        /// <remarks>老版浮动栏中用于表示橡皮擦工具的按笔画擦除模式的图标</remarks>
         public static string LegacySolidEraserStrokeIcon =
             "F1 M24,24z M0,0z M11.6199,3.61372C12.8916,2.34202,14.8995,2.2837,16.1307,3.62964L21.3433,8.84225C22.615,10.1139,22.6733,12.1218,21.3274,13.353L15.1877,19.4927 5.46434,9.76928 11.6199,3.61372z M7.33167,21.36C7.08919,21.36 6.86831,21.2676 6.70232,21.116 6.69184,21.1064 6.68155,21.0966 6.67147,21.0865L2.65671,17.0718C1.385,15.8001,1.32668,13.7922,2.67262,12.561L4.14394,11.0897 12.5469,19.4927 21.3367,19.4927C21.8523,19.4927 22.2703,19.9107 22.2703,20.4263 22.2703,20.942 21.8523,21.36 21.3367,21.36L7.33167,21.36z";
 
+        /// <summary>
+        /// 老版虚线橡皮擦图标（圆形擦除模式）
+        /// </summary>
+        /// <remarks>老版浮动栏中用于表示橡皮擦工具的圆形擦除模式的图标</remarks>
         public static string LegacyLinedEraserCircleIcon =
             "F0 M25,24z M0,0z M2.47995,17.1206L6.56736,21.208C6.57733,21.218 6.58749,21.2277 6.59783,21.237 6.66429,21.2971 6.7405,21.3466 6.82381,21.3829L6.83712,21.3885C6.84698,21.3926 6.85693,21.3965 6.86698,21.4003 6.86818,21.4007 6.86937,21.4011 6.87057,21.4016 6.94576,21.4289 7.02412,21.4451 7.10303,21.45L7.12183,21.451 7.13076,21.4513 7.13345,21.4514 7.15549,21.4517 17.0847,21.4517C17.5973,22.3438 18.5597,22.9445 19.6624,22.9445 21.3031,22.9445 22.6332,21.6144 22.6332,19.9737 22.6332,18.3329 21.3031,17.0028 19.6624,17.0028 18.0839,17.0028 16.793,18.2338 16.6972,19.7882L14.8669,19.7882 21.3224,13.3327C22.6404,12.1289,22.5884,10.1619,21.3367,8.91021L16.0278,3.60138C14.8241,2.28336,12.8571,2.33535,11.6053,3.58706L2.49426,12.6981C1.17625,13.9019,1.22824,15.8689,2.47995,17.1206z M14.8072,4.7316C14.2984,4.16633,13.4255,4.11939,12.7816,4.76332L6.43063,11.1143 13.8094,18.4931 20.1604,12.1421C20.1707,12.1318 20.1813,12.1218 20.1921,12.112 20.7574,11.6033 20.8043,10.7304 20.1604,10.0865L14.8373,4.76332C14.8269,4.75301,14.8169,4.74243,14.8072,4.7316z M3.65621,13.8887C3.6459,13.899 3.63532,13.9091 3.62448,13.9188 3.05922,14.4276 3.01228,15.3004 3.65621,15.9444L7.50001,19.7882 12.752,19.7882 5.25437,12.2906 3.65621,13.8887z";
 
+        /// <summary>
+        /// 老版实线橡皮擦图标（圆形擦除模式）
+        /// </summary>
+        /// <remarks>老版浮动栏中用于表示橡皮擦工具的圆形擦除模式的图标</remarks>
         public static string LegacySolidEraserCircleIcon =
             "F1 M24,24z M0,0z M15.0919,19.6686L21.4282,13.3322C22.7462,12.1285,22.6942,10.1616,21.4426,8.90993L16.134,3.60133C14.9303,2.28338,12.9633,2.33537,11.7117,3.58702L5.36097,9.93771 15.0919,19.6686z M6.67201,21.2053C6.82267,21.3569,7.03137,21.4508,7.26201,21.4508L17.1907,21.4508C17.7033,22.3429 18.6657,22.9437 19.7683,22.9437 21.409,22.9437 22.7391,21.6136 22.7391,19.9729 22.7391,18.3322 21.409,17.0022 19.7683,17.0022 18.19,17.0022 16.8991,18.2331 16.8033,19.7874L12.8583,19.7874 4.18476,11.1139 2.60098,12.6977C1.28303,13.9014,1.33502,15.8683,2.58667,17.12L6.67201,21.2053z";
 
+        /// <summary>
+        /// 老版虚线套索选择工具图标
+        /// </summary>
+        /// <remarks>老版浮动栏中用于表示套索选择工具的图标</remarks>
         public static string LegacyLinedLassoSelectIcon =
             "F0 M24,24z M0,0z M14.4715,12.7092L14.4715,18.7882 15.8291,16.7546C15.9688,16.5453,16.2038,16.4196,16.4554,16.4196L19.0106,16.4196 14.4715,12.7092z M14.6618,10.9193C14.4981,10.784 14.2733,10.6788 14.0025,10.6788 13.9951,10.6788 13.9877,10.6789 13.9803,10.6791 13.7083,10.6872 13.4502,10.8008 13.2607,10.9961 13.0712,11.1913 12.9653,11.4526 12.9653,11.7246L12.9653,20.3314C12.9653,20.3403 12.9655,20.3491 12.9658,20.358 12.9734,20.5733 13.0468,20.7811 13.176,20.9534 13.3053,21.1258 13.4842,21.2544 13.6888,21.3219 13.765,21.3471 13.8447,21.36 13.925,21.36L14.0025,21.36C14.1661,21.36 14.3276,21.3218 14.474,21.2486 14.6204,21.1754 14.7477,21.0692 14.8459,20.9382 14.8542,20.9272 14.8622,20.9159 14.8698,20.9045L16.8582,17.9258 20.3145,17.9258C20.5287,17.9281 20.7384,17.8641 20.9149,17.7424 21.0941,17.6187 21.2299,17.4417 21.3029,17.2365 21.3759,17.0313 21.3825,16.8084 21.3217,16.5993 21.262,16.3936 21.14,16.2117 20.9729,16.0782L14.6618,10.9193z M8.14548,20.0044C7.70454,19.6737 7.34665,19.2448 7.10016,18.7519 6.94658,18.4447 6.83887,18.1179 6.7795,17.7818 7.131,17.6605 7.45404,17.4604 7.72196,17.1924 7.74959,17.1648 7.7765,17.1366 7.80267,17.1078 8.5567,17.4118 9.3392,17.6365 10.1444,17.7694 10.5548,17.8372 10.9424,17.5594 11.0101,17.149 11.0779,16.7387 10.8001,16.3511 10.3897,16.2833 9.72172,16.1731 9.06686,15.9883 8.42926,15.7362 8.44084,15.6393 8.44672,15.5413 8.44672,15.4427 8.44672,14.7865 8.18602,14.1571 7.72196,13.693 7.25791,13.229 6.62852,12.9682 5.97224,12.9682 5.65536,12.9682 5.34474,13.029 5.05598,13.1441 4.47073,12.3026 4.15196,11.303 4.14328,10.2756 4.14532,7.03688 7.49758,4.1462 11.9971,4.1462 16.4941,4.1462 19.8451,7.03371 19.8508,10.2703 19.8388,10.7807 19.7549,11.2869 19.6016,11.7739 19.4767,12.1706 19.697,12.5934 20.0938,12.7183 20.4905,12.8432 20.9134,12.6228 21.0383,12.2261 21.2351,11.6008 21.3424,10.9507 21.3568,10.2952L21.357,10.2786C21.357,5.91009 16.9982,2.64 11.9971,2.64 6.9959,2.64 2.63705,5.91009 2.63705,10.2786L2.6371,10.2845C2.6479,11.6579 3.08647,12.993 3.89074,14.1047 3.63615,14.5007 3.49777,14.9646 3.49777,15.4427 3.49777,16.099 3.75847,16.7284 4.22252,17.1924 4.51465,17.4846 4.87229,17.6961 5.26092,17.8128 5.33333,18.3726 5.49917,18.9179 5.75297,19.4255 6.10404,20.1276 6.61375,20.7383 7.24176,21.2093 7.5745,21.4589 8.04654,21.3915 8.2961,21.0587 8.54566,20.726 8.47822,20.2539 8.14548,20.0044z M5.97224,14.4745C5.71544,14.4745 5.46916,14.5765 5.28757,14.7581 5.10598,14.9396 5.00397,15.1859 5.00397,15.4427 5.00397,15.6995 5.10598,15.9458 5.28757,16.1274 5.46916,16.309 5.71544,16.411 5.97224,16.411 6.22904,16.411 6.47533,16.309 6.65692,16.1274 6.8385,15.9458 6.94052,15.6995 6.94052,15.4427 6.94052,15.1859 6.8385,14.9396 6.65692,14.7581 6.47533,14.5765 6.22904,14.4745 5.97224,14.4745z";
 
+        /// <summary>
+        /// 老版实线套索选择工具图标
+        /// </summary>
+        /// <remarks>老版浮动栏中用于表示套索选择工具的图标</remarks>
         public static string LegacySolidLassoSelectIcon =
             "F1 M24,24z M0,0z M14.6618,10.9193C14.4981,10.784 14.2733,10.6788 14.0025,10.6788 13.9951,10.6788 13.9877,10.6789 13.9803,10.6791 13.7083,10.6872 13.4502,10.8008 13.2607,10.9961 13.0712,11.1913 12.9653,11.4526 12.9653,11.7246L12.9653,20.3314C12.9653,20.3403 12.9655,20.3491 12.9658,20.358 12.9734,20.5733 13.0468,20.7811 13.176,20.9534 13.3053,21.1258 13.4842,21.2544 13.6888,21.3219 13.765,21.3471 13.8447,21.36 13.925,21.36L14.0025,21.36C14.1661,21.36 14.3276,21.3218 14.474,21.2486 14.6204,21.1754 14.7477,21.0692 14.8459,20.9382 14.8542,20.9272 14.8622,20.9159 14.8698,20.9045L16.8582,17.9258 20.3145,17.9258C20.5287,17.9281 20.7384,17.8641 20.9149,17.7424 21.0941,17.6187 21.2299,17.4417 21.3029,17.2365 21.3759,17.0313 21.3825,16.8084 21.3217,16.5993 21.262,16.3936 21.14,16.2117 20.9729,16.0782L14.6618,10.9193z M8.14548,20.0044C7.70454,19.6737 7.34665,19.2448 7.10016,18.7519 6.94658,18.4447 6.83888,18.1179 6.7795,17.7818 7.131,17.6605 7.45404,17.4604 7.72196,17.1924 7.74959,17.1648 7.77649,17.1366 7.80267,17.1078 8.5567,17.4118 9.3392,17.6365 10.1444,17.7694 10.5548,17.8372 10.9424,17.5594 11.0101,17.149 11.0779,16.7387 10.8001,16.3511 10.3897,16.2833 9.72172,16.1731 9.06686,15.9883 8.42926,15.7362 8.44084,15.6393 8.44672,15.5413 8.44672,15.4427 8.44672,14.7865 8.18602,14.1571 7.72196,13.693 7.25791,13.229 6.62852,12.9682 5.97224,12.9682 5.65536,12.9682 5.34474,13.029 5.05598,13.1441 4.47073,12.3026 4.15196,11.303 4.14328,10.2756 4.14532,7.03688 7.49758,4.1462 11.9971,4.1462 16.4941,4.1462 19.8451,7.03371 19.8508,10.2703 19.8388,10.7807 19.7549,11.2869 19.6016,11.7739 19.4767,12.1706 19.697,12.5934 20.0938,12.7183 20.4905,12.8432 20.9134,12.6228 21.0383,12.2261 21.2351,11.6008 21.3424,10.9507 21.3568,10.2952L21.357,10.2786C21.357,5.91009 16.9982,2.64 11.9971,2.64 6.9959,2.64 2.63705,5.91009 2.63705,10.2786L2.6371,10.2845C2.6479,11.6579 3.08647,12.993 3.89074,14.1047 3.63615,14.5007 3.49777,14.9646 3.49777,15.4427 3.49777,16.099 3.75847,16.7284 4.22252,17.1924 4.51465,17.4846 4.87229,17.6961 5.26092,17.8128 5.33333,18.3726 5.49917,18.9178 5.75297,19.4255 6.10404,20.1276 6.61375,20.7383 7.24176,21.2093 7.5745,21.4589 8.04654,21.3915 8.2961,21.0587 8.54566,20.726 8.47822,20.2539 8.14548,20.0044z";
     }

Ink Canvas/MainWindow_cs/MW_ImageInsert.cs

@@ -29,19 +29,33 @@ namespace Ink_Canvas
         public List<Point> Path;
         public Bitmap CameraImage;
         public BitmapSource CameraBitmapSource;
+        public bool AddToWhiteboard;
 
-        public ScreenshotResult(Rectangle area, List<Point> path = null, Bitmap cameraImage = null, BitmapSource cameraBitmapSource = null)
+        public ScreenshotResult(Rectangle area, List<Point> path = null, Bitmap cameraImage = null,
+            BitmapSource cameraBitmapSource = null, bool addToWhiteboard = false)
         {
             Area = area;
             Path = path;
             CameraImage = cameraImage;
             CameraBitmapSource = cameraBitmapSource;
+            AddToWhiteboard = addToWhiteboard;
         }
     }
 
     public partial class MainWindow : Window
     {
-        // 截图并插入到画布
+        /// <summary>
+        /// 截图并插入到画布
+        /// </summary>
+        /// <returns>异步任务</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 隐藏主窗口以避免截图包含窗口本身
+        /// 2. 启动区域选择截图
+        /// 3. 恢复窗口显示
+        /// 4. 处理截图结果并插入到画布
+        /// 5. 支持摄像头截图和区域截图
+        /// </remarks>
         private async Task CaptureScreenshotAndInsert()
         {
             try
@@ -61,11 +75,17 @@ namespace Ink_Canvas
 
                 if (screenshotResult.HasValue)
                 {
+                    if (screenshotResult.Value.AddToWhiteboard)
+                    {
+                        await AddScreenshotToNewWhiteboardPage(screenshotResult.Value);
+                        return;
+                    }
+
                     // 检查是否是摄像头截图
                     if (screenshotResult.Value.CameraBitmapSource != null)
                     {
                         // 摄像头截图（使用BitmapSource）
-                        await InsertBitmapSourceToCanvas(screenshotResult.Value.CameraBitmapSource);
+                        await InsertBitmapSourceToCanvas(screenshotResult.Value.CameraBitmapSource, "摄像头截图已插入到画布", "插入摄像头截图失败");
                     }
                     else if (screenshotResult.Value.CameraImage != null)
                     {
@@ -118,7 +138,18 @@ namespace Ink_Canvas
             }
         }
 
-        // 直接全屏截图并插入到画布
+        /// <summary>
+        /// 直接全屏截图并插入到画布
+        /// </summary>
+        /// <returns>异步任务</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 隐藏主窗口以避免截图包含窗口本身
+        /// 2. 获取虚拟屏幕边界
+        /// 3. 截取全屏
+        /// 4. 将截图转换为WPF Image并插入到画布
+        /// 5. 恢复窗口显示
+        /// </remarks>
         private async Task CaptureFullScreenAndInsert()
         {
             try
@@ -158,7 +189,16 @@ namespace Ink_Canvas
             }
         }
 
-        // 显示截图区域选择器
+        /// <summary>
+        /// 显示截图区域选择器
+        /// </summary>
+        /// <returns>截图结果，包含区域、路径和摄像头截图信息</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 显示截图选择器窗口
+        /// 2. 获取用户选择的区域或摄像头截图
+        /// 3. 返回截图结果
+        /// </remarks>
         private async Task<ScreenshotResult?> ShowScreenshotSelector()
         {
             ScreenshotResult? result = null;
@@ -177,7 +217,8 @@ namespace Ink_Canvas
                                 Rectangle.Empty, // 摄像头截图不需要区域
                                 null, // 摄像头截图不需要路径
                                 null, // 不再使用Bitmap
-                                selectorWindow.CameraBitmapSource // 摄像头BitmapSource
+                                selectorWindow.CameraBitmapSource, // 摄像头BitmapSource
+                                selectorWindow.ShouldAddToWhiteboard
                             );
                         }
                         else if (selectorWindow.CameraImage != null)
@@ -185,14 +226,19 @@ namespace Ink_Canvas
                             result = new ScreenshotResult(
                                 Rectangle.Empty, // 摄像头截图不需要区域
                                 null, // 摄像头截图不需要路径
-                                selectorWindow.CameraImage // 摄像头图像
+                                selectorWindow.CameraImage, // 摄像头图像
+                                null,
+                                selectorWindow.ShouldAddToWhiteboard
                             );
                         }
                         else
                         {
                             result = new ScreenshotResult(
                                 selectorWindow.SelectedArea.Value,
-                                selectorWindow.SelectedPath
+                                selectorWindow.SelectedPath,
+                                null,
+                                null,
+                                selectorWindow.ShouldAddToWhiteboard
                             );
                         }
                     }
@@ -206,7 +252,19 @@ namespace Ink_Canvas
             return result;
         }
 
-        // 截取指定屏幕区域
+        /// <summary>
+        /// 截取指定屏幕区域
+        /// </summary>
+        /// <param name="area">要截取的屏幕区域</param>
+        /// <returns>截取的位图</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 确保区域在有效范围内
+        /// 2. 调整区域边界，确保不超出屏幕范围
+        /// 3. 创建支持透明度的位图
+        /// 4. 设置高质量渲染
+        /// 5. 截取屏幕区域
+        /// </remarks>
         private Bitmap CaptureScreenArea(Rectangle area)
         {
             try
@@ -246,7 +304,25 @@ namespace Ink_Canvas
             }
         }
 
-        // 将截图插入到画布
+        /// <summary>
+        /// 将截图插入到画布
+        /// </summary>
+        /// <param name="bitmap">要插入的位图</param>
+        /// <returns>异步任务</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 验证位图有效性
+        /// 2. 将Bitmap转换为WPF BitmapSource
+        /// 3. 创建WPF Image控件
+        /// 4. 生成唯一名称
+        /// 5. 初始化TransformGroup
+        /// 6. 设置截图属性，避免被InkCanvas选择系统处理
+        /// 7. 初始化InkCanvas选择设置
+        /// 8. 等待图片加载完成后进行居中处理
+        /// 9. 添加到画布
+        /// 10. 提交历史记录
+        /// 11. 插入图片后切换到选择模式并刷新浮动栏高光显示
+        /// </remarks>
         private async Task InsertScreenshotToCanvas(Bitmap bitmap)
         {
             try
@@ -325,8 +401,24 @@ namespace Ink_Canvas
             }
         }
 
-        // 将BitmapSource插入到画布（用于摄像头截图）
-        private async Task InsertBitmapSourceToCanvas(BitmapSource bitmapSource)
+        /// <summary>
+        /// 将BitmapSource插入到画布（用于摄像头截图）
+        /// </summary>
+        /// <param name="bitmapSource">要插入的BitmapSource</param>
+        /// <returns>异步任务</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 创建WPF Image控件
+        /// 2. 生成唯一名称
+        /// 3. 初始化TransformGroup
+        /// 4. 设置截图属性，避免被InkCanvas选择系统处理
+        /// 5. 初始化InkCanvas选择设置
+        /// 6. 等待图片加载完成后进行居中处理
+        /// 7. 添加到画布
+        /// 8. 提交历史记录
+        /// 9. 插入图片后切换到选择模式并刷新浮动栏高光显示
+        /// </remarks>
+        private async Task InsertBitmapSourceToCanvas(BitmapSource bitmapSource, string successMessage = "截图已插入到画布", string failureMessagePrefix = "插入截图失败")
         {
             try
             {
@@ -375,16 +467,22 @@ namespace Ink_Canvas
                 UpdateCurrentToolMode("select");
                 HideSubPanels("select");
 
-                ShowNotification("摄像头截图已插入到画布");
+                ShowNotification(successMessage);
             }
             catch (Exception ex)
             {
-                ShowNotification($"插入摄像头截图失败: {ex.Message}");
+                ShowNotification($"{failureMessagePrefix}: {ex.Message}");
                 LogHelper.WriteLogToFile($"插入摄像头截图失败: {ex.Message}", LogHelper.LogType.Error);
             }
         }
 
-        // 初始化截图的TransformGroup
+        /// <summary>
+        /// 初始化截图的TransformGroup
+        /// </summary>
+        /// <param name="image">要初始化的Image控件</param>
+        /// <remarks>
+        /// 该方法会为截图创建一个包含缩放、平移和旋转变换的TransformGroup。
+        /// </remarks>
         private void InitializeScreenshotTransform(Image image)
         {
             var transformGroup = new TransformGroup();
@@ -394,7 +492,17 @@ namespace Ink_Canvas
             image.RenderTransform = transformGroup;
         }
 
-        // 绑定截图事件处理器
+        /// <summary>
+        /// 绑定截图事件处理器
+        /// </summary>
+        /// <param name="image">要绑定事件的Image控件</param>
+        /// <remarks>
+        /// 该方法会为截图绑定以下事件：
+        /// 1. 鼠标事件（按下、释放、移动、滚轮）
+        /// 2. 触摸事件（按下、释放、操作）
+        /// 3. 设置光标为手形
+        /// 4. 禁用InkCanvas对截图的选择处理
+        /// </remarks>
         private void BindScreenshotEvents(Image image)
         {
             // 鼠标事件
@@ -418,7 +526,27 @@ namespace Ink_Canvas
             image.Focusable = false;
         }
 
-        // 专门为截图优化的居中缩放方法
+        /// <summary>
+        /// 专门为截图优化的居中缩放方法
+        /// </summary>
+        /// <param name="image">要居中缩放的Image控件</param>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 确保图片已加载
+        /// 2. 获取画布的实际尺寸
+        /// 3. 如果画布尺寸为0，使用窗口尺寸作为备选
+        /// 4. 如果仍然为0，使用屏幕尺寸
+        /// 5. 计算最大允许尺寸（画布的80%）
+        /// 6. 获取图片的原始尺寸
+        /// 7. 计算缩放比例
+        /// 8. 如果图片本身比最大尺寸小，不进行缩放
+        /// 9. 计算新的尺寸
+        /// 10. 设置图片尺寸
+        /// 11. 计算居中位置
+        /// 12. 确保位置不为负数
+        /// 13. 设置位置
+        /// 14. 保持滚轮缩放和拖动功能
+        /// </remarks>
         private void CenterAndScaleScreenshot(Image image)
         {
             try
@@ -502,7 +630,27 @@ namespace Ink_Canvas
             }
         }
 
-        // 应用形状遮罩到截图
+        /// <summary>
+        /// 应用形状遮罩到截图
+        /// </summary>
+        /// <param name="bitmap">要应用遮罩的位图</param>
+        /// <param name="path">遮罩路径</param>
+        /// <param name="area">截图区域</param>
+        /// <returns>应用遮罩后的位图</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 验证路径参数
+        /// 2. 获取DPI缩放比例
+        /// 3. 创建结果位图，确保支持透明度
+        /// 4. 首先将整个位图设置为透明
+        /// 5. 创建路径
+        /// 6. 转换WPF坐标到GDI+坐标，考虑DPI缩放和屏幕偏移
+        /// 7. 添加路径
+        /// 8. 验证路径是否有效
+        /// 9. 设置裁剪区域为路径内部
+        /// 10. 在裁剪区域内绘制原始图像
+        /// 11. 重置裁剪区域，确保后续操作不受影响
+        /// </remarks>
         private Bitmap ApplyShapeMask(Bitmap bitmap, List<Point> path, Rectangle area)
         {
             try
@@ -588,7 +736,21 @@ namespace Ink_Canvas
             }
         }
 
-        // 将System.Drawing.Bitmap转换为WPF BitmapSource
+        /// <summary>
+        /// 将System.Drawing.Bitmap转换为WPF BitmapSource
+        /// </summary>
+        /// <param name="bitmap">要转换的位图</param>
+        /// <returns>转换后的BitmapSource</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 验证位图有效性
+        /// 2. 验证位图尺寸
+        /// 3. 使用更安全的方法转换位图
+        /// 4. 根据像素格式选择合适的WPF像素格式
+        /// 5. 创建BitmapSource
+        /// 6. 冻结BitmapSource以提高性能
+        /// 7. 如果转换失败，尝试使用备用方法
+        /// </remarks>
         private BitmapSource ConvertBitmapToBitmapSource(Bitmap bitmap)
         {
             try
@@ -673,7 +835,19 @@ namespace Ink_Canvas
             }
         }
 
-        // 备用的位图转换方法（使用内存流）
+        /// <summary>
+        /// 备用的位图转换方法（使用内存流）
+        /// </summary>
+        /// <param name="bitmap">要转换的位图</param>
+        /// <returns>转换后的BitmapSource</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 验证位图有效性
+        /// 2. 创建一个新的位图，确保格式正确
+        /// 3. 在内存流中保存为PNG格式
+        /// 4. 创建BitmapImage并加载内存流中的数据
+        /// 5. 冻结BitmapImage以提高性能
+        /// </remarks>
         private BitmapSource ConvertBitmapToBitmapSourceFallback(Bitmap bitmap)
         {
             try
@@ -682,11 +856,12 @@ namespace Ink_Canvas
                 if (bitmap == null || bitmap.Width <= 0 || bitmap.Height <= 0)
                     return null;
 
-                // 创建一个新的位图，确保格式正确
-                using (var convertedBitmap = new Bitmap(bitmap.Width, bitmap.Height, PixelFormat.Format24bppRgb))
+                // 创建一个新的位图，确保保留Alpha通道
+                using (var convertedBitmap = new Bitmap(bitmap.Width, bitmap.Height, PixelFormat.Format32bppArgb))
                 {
                     using (var graphics = Graphics.FromImage(convertedBitmap))
                     {
+                        graphics.CompositingMode = CompositingMode.SourceCopy;
                         graphics.DrawImage(bitmap, 0, 0);
                     }
 
@@ -713,7 +888,21 @@ namespace Ink_Canvas
             }
         }
 
-        // 最简单的位图转换方法
+        /// <summary>
+        /// 最简单的位图转换方法
+        /// </summary>
+        /// <param name="bitmap">要转换的位图</param>
+        /// <returns>转换后的BitmapSource</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 验证位图有效性
+        /// 2. 使用最基础的方法：直接保存为PNG然后加载
+        /// 3. 创建临时文件
+        /// 4. 将位图保存为PNG格式到临时文件
+        /// 5. 创建BitmapImage并加载临时文件
+        /// 6. 冻结BitmapImage以提高性能
+        /// 7. 清理临时文件
+        /// </remarks>
         private BitmapSource ConvertBitmapToBitmapSourceSimple(Bitmap bitmap)
         {
             try
@@ -760,7 +949,14 @@ namespace Ink_Canvas
             }
         }
 
-        // 获取DPI缩放比例
+        /// <summary>
+        /// 获取DPI缩放比例
+        /// </summary>
+        /// <returns>DPI缩放比例</returns>
+        /// <remarks>
+        /// 该方法会从当前窗口的PresentationSource获取DPI缩放比例。
+        /// 如果无法获取，则返回默认值1.0。
+        /// </remarks>
         private double GetDpiScale()
         {
             var source = PresentationSource.FromVisual(this);
@@ -771,4 +967,4 @@ namespace Ink_Canvas
             return 1.0; // 默认DPI
         }
     }
-}
+}

Ink Canvas/MainWindow_cs/MW_Notification.cs

@@ -1,4 +1,4 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using System;
 using System.Linq;
 using System.Threading;
@@ -11,16 +11,35 @@ namespace Ink_Canvas
         private int lastNotificationShowTime;
         private int notificationShowTime = 2500;
 
+        /// <summary>
+        /// 静态方法，用于在主窗口中显示通知
+        /// </summary>
+        /// <param name="notice">要显示的通知文本</param>
+        /// <param name="isShowImmediately">指示是否应立即显示通知</param>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 获取应用程序中的主窗口实例
+        /// 2. 调用主窗口的ShowNotification方法显示通知
+        /// </remarks>
         public static void ShowNewMessage(string notice, bool isShowImmediately = true)
         {
             (Application.Current?.Windows.Cast<Window>().FirstOrDefault(window => window is MainWindow) as MainWindow)
                 ?.ShowNotification(notice, isShowImmediately);
         }
 
+        /// <summary>
+        /// 在窗口中显示带从底部滑入并淡入的通知文本，并在配置的时长后自动隐藏（若未被新通知覆盖）。
+        /// </summary>
+        /// <param name="notice">要显示的通知文本。</param>
+        /// <param name="isShowImmediately">指示是否应立即显示通知；当前实现默认立即显示。</param>
         public void ShowNotification(string notice, bool isShowImmediately = true)
         {
             try
             {
+                if (TextBlockNotice == null || GridNotifications == null)
+                {
+                    return;
+                }
                 lastNotificationShowTime = Environment.TickCount;
 
                 TextBlockNotice.Text = notice;
@@ -36,7 +55,10 @@ namespace Ink_Canvas
                         });
                 }).Start();
             }
-            catch { }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"ShowNotification 异常: {ex.Message}", LogHelper.LogType.Error);
+            }
         }
     }
 }

Ink Canvas/MainWindow_cs/MW_PageListView.cs

@@ -1,10 +1,11 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Ink;
 using System.Windows.Input;
+using System.Windows.Media;
 
 namespace Ink_Canvas
 {
@@ -19,8 +20,11 @@ namespace Ink_Canvas
         ObservableCollection<PageListViewItem> blackBoardSidePageListViewObservableCollection = new ObservableCollection<PageListViewItem>();
 
         /// <summary>
-        /// <para>刷新白板的缩略图页面列表。</para>
+        /// 刷新白板的缩略图页面列表，更新左右侧缩略页列表，使其与当前白板页及历史快照一致，并将左右列表的选中项同步到当前白板页。
         /// </summary>
+        /// <remarks>
+        /// 为每页生成或更新对应的 PageListViewItem（通过应用时间线历史并裁剪到画布边界），用当前画布的笔迹替换当前页的条目，并将两个侧边 ListView 的 SelectedIndex 设置为当前白板索引 - 1。
+        /// </remarks>
         private void RefreshBlackBoardSidePageListView()
         {
             if (blackBoardSidePageListViewObservableCollection.Count == WhiteboardTotalCount)
@@ -66,6 +70,79 @@ namespace Ink_Canvas
             BlackBoardRightSidePageListView.SelectedIndex = CurrentWhiteboardIndex - 1;
         }
 
+        /// <summary>
+        /// 根据传入相对于 <paramref name="scrollViewer"/> 的点，查找并选中列表中对应的缩略图项；在需要时切换当前白板页并更新画布状态与左右侧缩略图选择状态。
+        /// </summary>
+        /// <param name="listView">承载页面缩略图的 ListView。</param>
+        /// <param name="scrollViewer">包含该 ListView 的 ScrollViewer，用于将触点坐标从滚动视图坐标系转换到 ListView。</param>
+        /// <param name="pointInScrollViewer">相对于 <paramref name="scrollViewer"/> 的触点坐标（用于命中测试）。</param>
+        /// <remarks>
+        /// - 如果命中到 ListViewItem，会隐藏左右侧页面边框、在必要时保存/清空/恢复画笔笔迹并更新 CurrentWhiteboardIndex 与显示信息；还会将左右两侧 ListView 的 SelectedIndex 同步为命中项索引。 
+        /// - 在查找命中或切换过程中发生的异常将被捕获并忽略，不会向上抛出。
+        /// </remarks>
+        private void TrySwitchWhiteboardPageByTouchPoint(ListView listView, ScrollViewer scrollViewer, Point pointInScrollViewer)
+        {
+            if (listView == null || scrollViewer == null) return;
+            try
+            {
+                var transform = scrollViewer.TransformToVisual(listView);
+                if (transform == null) return;
+                var pointInListView = transform.Transform(pointInScrollViewer);
+                var hit = VisualTreeHelper.HitTest(listView, pointInListView);
+                if (hit?.VisualHit == null) return;
+                var container = FindAncestorOfType<ListViewItem>(hit.VisualHit);
+                if (container == null) return;
+                int index = listView.ItemContainerGenerator.IndexFromContainer(container);
+                if (index < 0 || index >= blackBoardSidePageListViewObservableCollection.Count) return;
+                var item = blackBoardSidePageListViewObservableCollection[index];
+                if (item == null) return;
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderLeftPageListView);
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderRightPageListView);
+                if (index + 1 != CurrentWhiteboardIndex)
+                {
+                    if (currentSelectedElement != null)
+                    {
+                        var previousEditingMode = inkCanvas.EditingMode;
+                        UnselectElement(currentSelectedElement);
+                        inkCanvas.EditingMode = previousEditingMode;
+                        currentSelectedElement = null;
+                    }
+                    SaveStrokes();
+                    ClearStrokes(true);
+                    CurrentWhiteboardIndex = index + 1;
+                    RestoreStrokes();
+                    UpdateIndexInfoDisplay();
+                }
+                BlackBoardLeftSidePageListView.SelectedIndex = index;
+                BlackBoardRightSidePageListView.SelectedIndex = index;
+            }
+            catch
+            {
+                // 忽略命中测试或切换过程中的异常
+            }
+        }
+
+        /// <summary>
+        /// 在视觉树中自下而上查找并返回第一个匹配指定类型的祖先元素。
+        /// </summary>
+        /// <typeparam name="T">要查找的祖先类型，必须继承自 <see cref="DependencyObject"/>。</typeparam>
+        /// <param name="current">起始节点；从此节点开始向上遍历视觉树。</param>
+        /// <returns>找到的第一个类型为 <typeparamref name="T"/> 的祖先元素，未找到时返回 <c>null</c>。</returns>
+        private static T FindAncestorOfType<T>(DependencyObject current) where T : DependencyObject
+        {
+            while (current != null)
+            {
+                if (current is T found) return found;
+                current = VisualTreeHelper.GetParent(current);
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 将指定元素在给定 ScrollViewer 中滚动，使该元素与可视区域的顶部对齐。
+        /// </summary>
+        /// <param name="element">要对齐到顶部的元素。</param>
+        /// <param name="scrollViewer">包含该元素的目标 ScrollViewer。</param>
         public static void ScrollViewToVerticalTop(FrameworkElement element, ScrollViewer scrollViewer)
         {
             if (element == null || scrollViewer == null)
@@ -86,6 +163,24 @@ namespace Ink_Canvas
         }
 
 
+        /// <summary>
+        /// 左侧页面列表视图的鼠标释放事件处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 隐藏左右侧页面边框
+        /// 2. 获取选中的项目和索引
+        /// 3. 只有当选择的页面与当前页面不同时才进行切换
+        /// 4. 如果有选中的元素，先取消选择
+        /// 5. 保存当前页面的笔画
+        /// 6. 清空画布
+        /// 7. 更新当前白板索引
+        /// 8. 恢复新页面的笔画
+        /// 9. 更新索引信息显示
+        /// 10. 更新选择索引
+        /// </remarks>
         private void BlackBoardLeftSidePageListView_OnMouseUp(object sender, MouseButtonEventArgs e)
         {
             AnimationsHelper.HideWithSlideAndFade(BoardBorderLeftPageListView);
@@ -119,6 +214,24 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 右侧页面列表视图的鼠标释放事件处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 隐藏左右侧页面边框
+        /// 2. 获取选中的项目和索引
+        /// 3. 只有当选择的页面与当前页面不同时才进行切换
+        /// 4. 如果有选中的元素，先取消选择
+        /// 5. 保存当前页面的笔画
+        /// 6. 清空画布
+        /// 7. 更新当前白板索引
+        /// 8. 恢复新页面的笔画
+        /// 9. 更新索引信息显示
+        /// 10. 更新选择索引
+        /// </remarks>
         private void BlackBoardRightSidePageListView_OnMouseUp(object sender, MouseButtonEventArgs e)
         {
             AnimationsHelper.HideWithSlideAndFade(BoardBorderLeftPageListView);
@@ -152,5 +265,14 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 预览列表中某页的“删除”按钮点击：删除该页，并阻止事件继续冒泡（避免触发选中/切页）。
+        /// </summary>
+        private void WhiteBoardPageListItem_DeleteClick(object sender, RoutedEventArgs e)
+        {
+            e.Handled = true;
+            if (sender is FrameworkElement fe && fe.DataContext is PageListViewItem item)
+                DeleteWhiteBoardPageByIndex(item.Index);
+        }
     }
-}
+}

Ink Canvas/MainWindow_cs/MW_Save&OpenStrokes.cs

@@ -6,6 +6,7 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
 using System.IO.Compression;
+using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -15,6 +16,8 @@ using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using System.Xml;
+using System.Xml.Linq;
 using Color = System.Drawing.Color;
 using File = System.IO.File;
 using Image = System.Windows.Controls.Image;
@@ -35,6 +38,18 @@ namespace Ink_Canvas
     }
     public partial class MainWindow : Window
     {
+        /// <summary>
+        /// 保存墨迹的鼠标释放事件处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 检查是否是当前按下的对象，且墨迹画布是否可见
+        /// 2. 隐藏工具面板
+        /// 3. 隐藏通知面板
+        /// 4. 调用SaveInkCanvasStrokes方法保存墨迹
+        /// </remarks>
         private void SymbolIconSaveStrokes_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (lastBorderMouseDownObject != sender || inkCanvas.Visibility != Visibility.Visible) return;
@@ -47,6 +62,23 @@ namespace Ink_Canvas
             SaveInkCanvasStrokes(true, true);
         }
 
+        /// <summary>
+        /// 保存墨迹画布的墨迹
+        /// </summary>
+        /// <param name="newNotice">是否显示新的通知</param>
+        /// <param name="saveByUser">是否是用户手动保存</param>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 根据保存类型和模式确定保存路径
+        /// 2. 创建保存目录
+        /// 3. 根据当前模式生成保存文件名
+        /// 4. 根据设置选择保存模式：
+        ///    - 全页面保存模式：保存为图像或压缩包
+        ///    - XML保存模式：保存为XML文件或压缩包
+        ///    - 常规保存模式：保存为二进制格式或XML格式
+        /// 5. 异步上传保存的文件到Dlass
+        /// 6. 保存元素信息
+        /// </remarks>
         private void SaveInkCanvasStrokes(bool newNotice = true, bool saveByUser = false)
         {
             try
@@ -63,7 +95,125 @@ namespace Ink_Canvas
                     //savePathWithName = savePath + @"\" + DateTime.Now.ToString("u").Replace(':', '-') + ".icstk";
                     savePathWithName = savePath + @"\" + DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss-fff") + ".icstk";
 
-                if (Settings.Automation.IsSaveFullPageStrokes)
+                if (Settings.Automation.IsSaveStrokesAsXML)
+                {
+                    // XML保存模式 - 检查是否存在多页面墨迹
+                    bool hasMultiplePages = false;
+                    List<StrokeCollection> allPageStrokes = new List<StrokeCollection>();
+
+                    // 检查PPT放映模式下的多页面墨迹
+                    if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible && _pptManager?.IsConnected == true)
+                    {
+                        hasMultiplePages = true;
+                        var totalSlides = _pptManager.SlidesCount;
+                        var currentSlide = _pptManager.GetCurrentSlideNumber();
+
+                        for (int i = 1; i <= totalSlides; i++)
+                        {
+                            var slideStrokes = _singlePPTInkManager?.LoadSlideStrokes(i);
+                            if (slideStrokes != null && slideStrokes.Count > 0)
+                            {
+                                allPageStrokes.Add(slideStrokes);
+                            }
+                            else if (i == currentSlide && inkCanvas.Strokes.Count > 0)
+                            {
+                                allPageStrokes.Add(inkCanvas.Strokes.Clone());
+                            }
+                            else
+                            {
+                                allPageStrokes.Add(new StrokeCollection());
+                            }
+                        }
+                    }
+                    // 检查白板模式下的多页面墨迹
+                    else if (currentMode != 0 && WhiteboardTotalCount > 1)
+                    {
+                        hasMultiplePages = true;
+                        for (int i = 1; i <= WhiteboardTotalCount; i++)
+                        {
+                            if (TimeMachineHistories[i] != null)
+                            {
+                                var strokes = ApplyHistoriesToNewStrokeCollection(TimeMachineHistories[i]);
+                                allPageStrokes.Add(strokes);
+                            }
+                            else
+                            {
+                                allPageStrokes.Add(new StrokeCollection());
+                            }
+                        }
+                    }
+
+                    if (hasMultiplePages && allPageStrokes.Count > 0)
+                    {
+                        // 检查是否是PPT模式
+                        bool isPPTMode = BtnPPTSlideShowEnd.Visibility == Visibility.Visible && _pptManager?.IsConnected == true;
+
+                        if (isPPTMode)
+                        {
+                            // PPT模式：保存为多个XML文件
+                            string basePath = Path.GetDirectoryName(savePathWithName);
+                            string baseFileName = Path.GetFileNameWithoutExtension(savePathWithName);
+
+                            int savedCount = 0;
+                            for (int i = 0; i < allPageStrokes.Count; i++)
+                            {
+                                var strokes = allPageStrokes[i];
+                                if (strokes.Count > 0)
+                                {
+                                    string pageFileName = Path.Combine(basePath, $"{baseFileName}_Page-{i + 1}.xml");
+                                    SaveStrokesAsXML(strokes, pageFileName, false);
+                                    savedCount++;
+
+                                    // 异步上传每个XML文件
+                                    _ = Task.Run(async () =>
+                                    {
+                                        try
+                                        {
+                                            await Helpers.UploadHelper.UploadFileAsync(pageFileName);
+                                        }
+                                        catch (Exception)
+                                        {
+                                        }
+                                    });
+                                }
+                            }
+
+                            if (newNotice)
+                            {
+                                Task.Delay(100).ContinueWith(t =>
+                                {
+                                    Dispatcher.Invoke(() =>
+                                    {
+                                        ShowNotification($"多页面XML墨迹成功保存为 {savedCount} 个XML文件");
+                                    });
+                                });
+                            }
+                        }
+                        else
+                        {
+                            // 非PPT模式：保存为XML压缩包
+                            string zipFileName = Path.ChangeExtension(savePathWithName, "zip");
+                            SaveMultiPageStrokesAsXMLZip(allPageStrokes, zipFileName, newNotice);
+                        }
+                    }
+                    else
+                    {
+                        // 单页面XML保存
+                        string xmlPath = Path.ChangeExtension(savePathWithName, ".xml");
+                        SaveStrokesAsXML(inkCanvas.Strokes, xmlPath);
+                        if (newNotice)
+                        {
+                            Task.Delay(100).ContinueWith(t =>
+                            {
+                                Dispatcher.Invoke(() =>
+                                {
+                                    ShowNotification("墨迹成功保存为XML格式至 " + xmlPath);
+                                });
+                            });
+                        }
+                    }
+                }
+                else if (Settings.Automation.IsSaveFullPageStrokes)
                 {
                     // 全页面保存模式 - 检查是否存在多页面墨迹
                     bool hasMultiplePages = false;
@@ -129,47 +279,165 @@ namespace Ink_Canvas
                 }
                 else
                 {
-                    // 常规保存模式 - 仅保存墨迹对象
-                    var fs = new FileStream(savePathWithName, FileMode.Create);
-                    inkCanvas.Strokes.Save(fs);
-                    fs.Close();
-                    _ = Task.Run(async () =>
-                    {
-                        try
-                        {
-                            var delayMinutes = Settings?.Dlass?.AutoUploadDelayMinutes ?? 0;
-                            if (delayMinutes > 0)
-                            {
-                                await Task.Delay(TimeSpan.FromMinutes(delayMinutes));
-                            }
+                    // 常规保存模式 - 检查是否存在多页面墨迹
+                    bool hasMultiplePages = false;
+                    List<StrokeCollection> allPageStrokes = new List<StrokeCollection>();
 
-                            await Helpers.DlassNoteUploader.UploadNoteFileAsync(savePathWithName);
-                        }
-                        catch (Exception)
-                        {
-                        }
-                    });
-                    
-                    // 保存元素信息
-                    var elementInfos = new List<CanvasElementInfo>();
-                    foreach (var child in inkCanvas.Children)
+                    // 检查PPT放映模式下的多页面墨迹
+                    if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible && _pptManager?.IsConnected == true)
                     {
-                        if (child is Image img && img.Source is BitmapImage bmp)
+                        hasMultiplePages = true;
+                        var totalSlides = _pptManager.SlidesCount;
+                        var currentSlide = _pptManager.GetCurrentSlideNumber();
+
+                        for (int i = 1; i <= totalSlides; i++)
                         {
-                            elementInfos.Add(new CanvasElementInfo
+                            var slideStrokes = _singlePPTInkManager?.LoadSlideStrokes(i);
+                            if (slideStrokes != null && slideStrokes.Count > 0)
                             {
-                                Type = "Image",
-                                SourcePath = bmp.UriSource?.LocalPath ?? "",
-                                Left = InkCanvas.GetLeft(img),
-                                Top = InkCanvas.GetTop(img),
-                                Width = img.Width,
-                                Height = img.Height,
-                                Stretch = img.Stretch.ToString()
+                                allPageStrokes.Add(slideStrokes);
+                            }
+                            else if (i == currentSlide && inkCanvas.Strokes.Count > 0)
+                            {
+                                allPageStrokes.Add(inkCanvas.Strokes.Clone());
+                            }
+                            else
+                            {
+                                allPageStrokes.Add(new StrokeCollection());
+                            }
+                        }
+                    }
+                    // 检查白板模式下的多页面墨迹
+                    else if (currentMode != 0 && WhiteboardTotalCount > 1)
+                    {
+                        hasMultiplePages = true;
+                        for (int i = 1; i <= WhiteboardTotalCount; i++)
+                        {
+                            if (TimeMachineHistories[i] != null)
+                            {
+                                var strokes = ApplyHistoriesToNewStrokeCollection(TimeMachineHistories[i]);
+                                allPageStrokes.Add(strokes);
+                            }
+                            else
+                            {
+                                allPageStrokes.Add(new StrokeCollection());
+                            }
+                        }
+                    }
+
+                    if (hasMultiplePages && allPageStrokes.Count > 0)
+                    {
+                        // 多页面保存为多个icstk文件
+                        string basePath = Path.GetDirectoryName(savePathWithName);
+                        string baseFileName = Path.GetFileNameWithoutExtension(savePathWithName);
+
+                        for (int i = 0; i < allPageStrokes.Count; i++)
+                        {
+                            var strokes = allPageStrokes[i];
+                            if (strokes.Count > 0)
+                            {
+                                string pageFileName = Path.Combine(basePath, $"{baseFileName}_Page-{i + 1}.icstk");
+                                using (var fs = new FileStream(pageFileName, FileMode.Create))
+                                {
+                                    strokes.Save(fs);
+                                }
+
+                                // 异步上传每个icstk文件
+                                _ = Task.Run(async () =>
+                                {
+                                    try
+                                    {
+                                        await Helpers.UploadHelper.UploadFileAsync(pageFileName);
+                                    }
+                                    catch (Exception)
+                                    {
+                                    }
+                                });
+                            }
+                        }
+
+                        if (newNotice)
+                        {
+                            Task.Delay(100).ContinueWith(t =>
+                            {
+                                Dispatcher.Invoke(() =>
+                                {
+                                    ShowNotification($"多页面墨迹成功保存为 {allPageStrokes.Count} 个icstk文件");
+                                });
                             });
                         }
                     }
-                    File.WriteAllText(Path.ChangeExtension(savePathWithName, ".elements.json"), JsonConvert.SerializeObject(elementInfos, Formatting.Indented));
-                    if (newNotice) ShowNotification("墨迹成功保存至 " + savePathWithName);
+                    else
+                    {
+                        // 单页面保存
+                        if (Settings.Automation.IsSaveStrokesAsXML)
+                        {
+                            // 保存为XML格式
+                            string xmlPath = Path.ChangeExtension(savePathWithName, ".xml");
+                            SaveStrokesAsXML(inkCanvas.Strokes, xmlPath);
+                            if (newNotice)
+                            {
+                                Task.Delay(100).ContinueWith(t =>
+                                {
+                                    Dispatcher.Invoke(() =>
+                                    {
+                                        ShowNotification("墨迹成功保存为XML格式至 " + xmlPath);
+                                    });
+                                });
+                            }
+                        }
+                        else
+                        {
+                            // 保存为二进制格式
+                            var fs = new FileStream(savePathWithName, FileMode.Create);
+                            inkCanvas.Strokes.Save(fs);
+                            fs.Close();
+                            if (newNotice)
+                            {
+                                Task.Delay(100).ContinueWith(t =>
+                                {
+                                    Dispatcher.Invoke(() =>
+                                    {
+                                        ShowNotification("墨迹成功保存至 " + savePathWithName);
+                                    });
+                                });
+                            }
+                        }
+
+                        // 异步上传文件
+                        _ = Task.Run(async () =>
+                        {
+                            try
+                            {
+                                string uploadPath = Settings.Automation.IsSaveStrokesAsXML ? Path.ChangeExtension(savePathWithName, ".xml") : savePathWithName;
+                                await Helpers.UploadHelper.UploadFileAsync(uploadPath);
+                            }
+                            catch (Exception)
+                            {
+                            }
+                        });
+
+                        // 保存元素信息
+                        var elementInfos = new List<CanvasElementInfo>();
+                        foreach (var child in inkCanvas.Children)
+                        {
+                            if (child is Image img && img.Source is BitmapImage bmp)
+                            {
+                                elementInfos.Add(new CanvasElementInfo
+                                {
+                                    Type = "Image",
+                                    SourcePath = bmp.UriSource?.LocalPath ?? "",
+                                    Left = InkCanvas.GetLeft(img),
+                                    Top = InkCanvas.GetTop(img),
+                                    Width = img.Width,
+                                    Height = img.Height,
+                                    Stretch = img.Stretch.ToString()
+                                });
+                            }
+                        }
+                        string elementsPath = Settings.Automation.IsSaveStrokesAsXML ? Path.ChangeExtension(savePathWithName, ".elements.json") : Path.ChangeExtension(savePathWithName, ".elements.json");
+                        File.WriteAllText(elementsPath, JsonConvert.SerializeObject(elementInfos, Newtonsoft.Json.Formatting.Indented));
+                    }
                 }
             }
             catch (Exception ex)
@@ -179,6 +447,201 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 将StrokeCollection保存为XML格式
+        /// </summary>
+        private void SaveStrokesAsXML(StrokeCollection strokes, string xmlPath, bool triggerUpload = true)
+        {
+            try
+            {
+                // 使用XDocument创建XML文档
+                XDocument doc = new XDocument(
+                    new XDeclaration("1.0", "utf-8", "yes"),
+                    new XElement("InkCanvasStrokes",
+                        new XAttribute("Version", "1.0"),
+                        new XAttribute("StrokeCount", strokes.Count),
+                        new XAttribute("SaveTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")),
+                        from stroke in strokes
+                        select new XElement("Stroke",
+                            new XAttribute("DrawingAttributes", SerializeDrawingAttributes(stroke.DrawingAttributes)),
+                            new XElement("StylusPoints",
+                                from point in stroke.StylusPoints
+                                select new XElement("StylusPoint",
+                                    new XAttribute("X", point.X),
+                                    new XAttribute("Y", point.Y),
+                                    new XAttribute("PressureFactor", point.PressureFactor)
+                                )
+                            )
+                        )
+                    )
+                );
+
+                // 保存XML文件
+                using (var writer = new XmlTextWriter(xmlPath, Encoding.UTF8))
+                {
+                    writer.Formatting = System.Xml.Formatting.Indented;
+                    doc.Save(writer);
+                }
+
+                // 同时保存元素信息
+                var elementInfos = new List<CanvasElementInfo>();
+                foreach (var child in inkCanvas.Children)
+                {
+                    if (child is Image img && img.Source is BitmapImage bmp)
+                    {
+                        elementInfos.Add(new CanvasElementInfo
+                        {
+                            Type = "Image",
+                            SourcePath = bmp.UriSource?.LocalPath ?? "",
+                            Left = InkCanvas.GetLeft(img),
+                            Top = InkCanvas.GetTop(img),
+                            Width = img.Width,
+                            Height = img.Height,
+                            Stretch = img.Stretch.ToString()
+                        });
+                    }
+                }
+                File.WriteAllText(Path.ChangeExtension(xmlPath, ".elements.json"), JsonConvert.SerializeObject(elementInfos, Newtonsoft.Json.Formatting.Indented));
+
+                // 异步上传到Dlass
+                if (triggerUpload)
+                {
+                    _ = Task.Run(async () =>
+                    {
+                        try
+                        {
+                            await Helpers.UploadHelper.UploadFileAsync(xmlPath);
+                        }
+                        catch (Exception)
+                        {
+                        }
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"保存XML格式墨迹失败: {ex}", LogHelper.LogType.Error);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// 序列化DrawingAttributes为字符串
+        /// </summary>
+        private string SerializeDrawingAttributes(DrawingAttributes da)
+        {
+            var sb = new StringBuilder();
+            sb.Append($"Color={da.Color};");
+            sb.Append($"Width={da.Width};");
+            sb.Append($"Height={da.Height};");
+            sb.Append($"FitToCurve={da.FitToCurve};");
+            sb.Append($"IsHighlighter={da.IsHighlighter};");
+            sb.Append($"IgnorePressure={da.IgnorePressure};");
+            sb.Append($"StylusTip={da.StylusTip};");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// 将多页面墨迹保存为XML格式压缩包
+        /// </summary>
+        private void SaveMultiPageStrokesAsXMLZip(List<StrokeCollection> allPageStrokes, string zipFileName, bool newNotice)
+        {
+            try
+            {
+                // 创建临时目录来存放文件
+                string tempDir = Path.Combine(Path.GetTempPath(), $"InkCanvas_MultiPage_XML_{DateTime.Now:yyyyMMdd_HHmmss}");
+                Directory.CreateDirectory(tempDir);
+
+                try
+                {
+                    // 保存所有页面的XML文件到临时目录
+                    for (int i = 0; i < allPageStrokes.Count; i++)
+                    {
+                        var strokes = allPageStrokes[i];
+                        if (strokes.Count > 0)
+                        {
+                            // 保存XML文件（临时文件，不触发上传）
+                            string xmlFileName = Path.Combine(tempDir, $"page_{i + 1:D4}.xml");
+                            SaveStrokesAsXML(strokes, xmlFileName, false);
+                        }
+                    }
+
+                    // 保存元数据信息
+                    string metadataFile = Path.Combine(tempDir, "metadata.txt");
+                    using (var writer = new StreamWriter(metadataFile, false, Encoding.UTF8))
+                    {
+                        writer.WriteLine($"保存时间: {DateTime.Now:yyyy-MM-dd HH:mm:ss}");
+                        writer.WriteLine($"总页数: {allPageStrokes.Count}");
+                        writer.WriteLine($"模式: {(currentMode == 0 ? "PPT放映" : "白板")}");
+                        writer.WriteLine($"格式: XML");
+                        if (currentMode != 0)
+                        {
+                            writer.WriteLine($"当前页面: {CurrentWhiteboardIndex}");
+                            writer.WriteLine($"总页面数: {WhiteboardTotalCount}");
+                        }
+                        else if (pptApplication != null)
+                        {
+                            writer.WriteLine($"PPT名称: {pptApplication.SlideShowWindows[1].Presentation.Name}");
+                            writer.WriteLine($"PPT总页数: {pptApplication.SlideShowWindows[1].Presentation.Slides.Count}");
+                            writer.WriteLine($"PPT文件路径: {pptApplication.SlideShowWindows[1].Presentation.FullName}");
+                        }
+
+                        for (int i = 0; i < allPageStrokes.Count; i++)
+                        {
+                            writer.WriteLine($"页面 {i + 1}: {allPageStrokes[i].Count} 条墨迹");
+                        }
+                    }
+
+                    // 创建ZIP文件
+                    if (File.Exists(zipFileName))
+                        File.Delete(zipFileName);
+
+                    ZipFile.CreateFromDirectory(tempDir, zipFileName);
+
+                    // 异步上传ZIP文件到Dlass
+                    _ = Task.Run(async () =>
+                    {
+                        try
+                        {
+                            await Helpers.UploadHelper.UploadFileAsync(zipFileName);
+                        }
+                        catch (Exception)
+                        {
+                        }
+                    });
+
+                    if (newNotice)
+                    {
+                        Task.Delay(100).ContinueWith(t =>
+                        {
+                            Dispatcher.Invoke(() =>
+                            {
+                                ShowNotification($"多页面XML墨迹成功保存至压缩包 {zipFileName}");
+                            });
+                        });
+                    }
+                }
+                finally
+                {
+                    // 清理临时目录
+                    try
+                    {
+                        if (Directory.Exists(tempDir))
+                            Directory.Delete(tempDir, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"清理临时目录失败: {ex}", LogHelper.LogType.Warning);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"保存多页面XML墨迹压缩包失败: {ex}", LogHelper.LogType.Error);
+                throw;
+            }
+        }
+
         /// <summary>
         /// 将多页面墨迹保存为压缩包
         /// </summary>
@@ -251,20 +714,23 @@ namespace Ink_Canvas
                     {
                         try
                         {
-                            var delayMinutes = Settings?.Dlass?.AutoUploadDelayMinutes ?? 0;
-                            if (delayMinutes > 0)
-                            {
-                                await Task.Delay(TimeSpan.FromMinutes(delayMinutes));
-                            }
-
-                            await Helpers.DlassNoteUploader.UploadNoteFileAsync(zipFileName);
+                            await Helpers.UploadHelper.UploadFileAsync(zipFileName);
                         }
                         catch (Exception)
                         {
                         }
                     });
 
-                    if (newNotice) ShowNotification($"多页面墨迹成功保存至压缩包 {zipFileName}");
+                    if (newNotice)
+                    {
+                        Task.Delay(100).ContinueWith(t =>
+                        {
+                            Dispatcher.Invoke(() =>
+                            {
+                                ShowNotification($"多页面墨迹成功保存至压缩包 {zipFileName}");
+                            });
+                        });
+                    }
                 }
                 finally
                 {
@@ -351,13 +817,7 @@ namespace Ink_Canvas
                     {
                         try
                         {
-                            var delayMinutes = Settings?.Dlass?.AutoUploadDelayMinutes ?? 0;
-                            if (delayMinutes > 0)
-                            {
-                                await Task.Delay(TimeSpan.FromMinutes(delayMinutes));
-                            }
-
-                            await Helpers.DlassNoteUploader.UploadNoteFileAsync(imagePathWithName);
+                            await Helpers.UploadHelper.UploadFileAsync(imagePathWithName);
                         }
                         catch (Exception)
                         {
@@ -367,7 +827,16 @@ namespace Ink_Canvas
             }
 
             // 显示提示
-            if (newNotice) ShowNotification("墨迹成功全页面保存至 " + Path.ChangeExtension(savePathWithName, "png"));
+            if (newNotice)
+            {
+                Task.Delay(100).ContinueWith(t =>
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        ShowNotification("墨迹成功全页面保存至 " + Path.ChangeExtension(savePathWithName, "png"));
+                    });
+                });
+            }
         }
 
         /// <summary>
@@ -402,6 +871,22 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 打开墨迹文件的鼠标释放事件处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 检查是否是当前按下的对象
+        /// 2. 隐藏工具面板
+        /// 3. 打开文件选择对话框
+        /// 4. 根据文件扩展名选择不同的打开方式：
+        ///    - .zip：处理ICC压缩包
+        ///    - .xml：处理XML格式墨迹文件
+        ///    - 其他：处理单个墨迹文件（二进制格式）
+        /// 5. 如果墨迹画布不可见，切换到鼠标模式
+        /// </remarks>
         private void SymbolIconOpenStrokes_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (lastBorderMouseDownObject != sender) return;
@@ -411,7 +896,7 @@ namespace Ink_Canvas
             var openFileDialog = new OpenFileDialog();
             openFileDialog.InitialDirectory = Settings.Automation.AutoSavedStrokesLocation;
             openFileDialog.Title = "打开墨迹文件";
-            openFileDialog.Filter = "Ink Canvas Strokes File (*.icstk)|*.icstk|ICC压缩包 (*.zip)|*.zip";
+            openFileDialog.Filter = "Ink Canvas Strokes File (*.icstk)|*.icstk|XML墨迹文件 (*.xml)|*.xml|ICC压缩包 (*.zip)|*.zip|所有支持的文件 (*.icstk;*.xml;*.zip)|*.icstk;*.xml;*.zip";
             if (openFileDialog.ShowDialog() != true) return;
             LogHelper.WriteLogToFile($"Strokes Insert: Name: {openFileDialog.FileName}",
                 LogHelper.LogType.Event);
@@ -422,12 +907,17 @@ namespace Ink_Canvas
 
                 if (fileExtension == ".zip")
                 {
-                    // 处理ICC压缩包
+                    // 处理ICC压缩包（可能包含XML格式）
                     OpenICCZipFile(openFileDialog.FileName);
                 }
+                else if (fileExtension == ".xml")
+                {
+                    // 处理XML格式墨迹文件
+                    OpenXMLStrokeFile(openFileDialog.FileName);
+                }
                 else
                 {
-                    // 处理单个墨迹文件
+                    // 处理单个墨迹文件（二进制格式）
                     OpenSingleStrokeFile(openFileDialog.FileName);
                 }
 
@@ -454,7 +944,7 @@ namespace Ink_Canvas
                 try
                 {
                     // 解压ZIP文件
-                    ZipFile.ExtractToDirectory(zipFilePath, tempDir);
+                    SafeZipExtractor.ExtractZipSafely(zipFilePath, tempDir, overwrite: true);
 
                     // 读取元数据文件
                     string metadataFile = Path.Combine(tempDir, "metadata.txt");
@@ -566,8 +1056,8 @@ namespace Ink_Canvas
                     if (!string.IsNullOrEmpty(savedPptPath) && !string.IsNullOrEmpty(currentPptPath))
                     {
                         // 使用文件路径哈希值进行比较，避免路径格式差异
-                        string savedHash = GetFileHash(savedPptPath);
-                        string currentHash = GetFileHash(currentPptPath);
+                        string savedHash = HashHelper.GetFileHash(savedPptPath);
+                        string currentHash = HashHelper.GetFileHash(currentPptPath);
 
                         if (savedHash != currentHash)
                         {
@@ -583,21 +1073,39 @@ namespace Ink_Canvas
                 // 重置PPT墨迹存储
                 _singlePPTInkManager?.ClearAllStrokes();
 
-                // 读取所有页面的墨迹文件
-                var files = Directory.GetFiles(tempDir, "page_*.icstk");
-                foreach (var file in files)
+                // 读取所有页面的墨迹文件（支持.icstk和.xml格式）
+                var icstkFiles = Directory.GetFiles(tempDir, "page_*.icstk");
+                var xmlFiles = Directory.GetFiles(tempDir, "page_*.xml");
+                var allFiles = new List<string>();
+                allFiles.AddRange(icstkFiles);
+                allFiles.AddRange(xmlFiles);
+
+                foreach (var file in allFiles)
                 {
                     var fileName = Path.GetFileNameWithoutExtension(file);
                     if (fileName.StartsWith("page_") && int.TryParse(fileName.Substring(5), out int pageNumber))
                     {
-                        using (var fs = new FileStream(file, FileMode.Open, FileAccess.Read))
+                        StrokeCollection strokes = null;
+                        string extension = Path.GetExtension(file).ToLower();
+
+                        if (extension == ".xml")
                         {
-                            var strokes = new StrokeCollection(fs);
-                            if (strokes.Count > 0)
+                            // 从XML文件加载
+                            strokes = LoadStrokesFromXML(file);
+                        }
+                        else
+                        {
+                            // 从二进制文件加载
+                            using (var fs = new FileStream(file, FileMode.Open, FileAccess.Read))
                             {
-                                _singlePPTInkManager?.ForceSaveSlideStrokes(pageNumber, strokes);
+                                strokes = new StrokeCollection(fs);
                             }
                         }
+
+                        if (strokes != null && strokes.Count > 0)
+                        {
+                            _singlePPTInkManager?.ForceSaveSlideStrokes(pageNumber, strokes);
+                        }
                     }
                 }
 
@@ -612,7 +1120,7 @@ namespace Ink_Canvas
                     }
                 }
 
-                LogHelper.WriteLogToFile($"成功恢复PPT墨迹，共{files.Length}页");
+                LogHelper.WriteLogToFile($"成功恢复PPT墨迹，共{allFiles.Count}页");
             }
             catch (Exception ex)
             {
@@ -693,9 +1201,185 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 打开XML格式的墨迹文件
+        /// </summary>
+        public void OpenXMLStrokeFile(string filePath)
+        {
+            try
+            {
+                XDocument doc = XDocument.Load(filePath);
+                var root = doc.Root;
+                if (root == null || root.Name != "InkCanvasStrokes")
+                {
+                    throw new Exception("无效的XML墨迹文件格式");
+                }
+
+                var strokes = new StrokeCollection();
+                foreach (var strokeElement in root.Elements("Stroke"))
+                {
+                    var drawingAttributesStr = strokeElement.Attribute("DrawingAttributes")?.Value ?? "";
+                    var da = ParseDrawingAttributes(drawingAttributesStr);
+
+                    var stylusPoints = new StylusPointCollection();
+                    var stylusPointsElement = strokeElement.Element("StylusPoints");
+                    if (stylusPointsElement != null)
+                    {
+                        foreach (var pointElement in stylusPointsElement.Elements("StylusPoint"))
+                        {
+                            double x = double.Parse(pointElement.Attribute("X")?.Value ?? "0");
+                            double y = double.Parse(pointElement.Attribute("Y")?.Value ?? "0");
+                            float pressure = float.Parse(pointElement.Attribute("PressureFactor")?.Value ?? "0.5");
+                            stylusPoints.Add(new StylusPoint(x, y, pressure));
+                        }
+                    }
+
+                    if (stylusPoints.Count > 0)
+                    {
+                        var stroke = new Stroke(stylusPoints) { DrawingAttributes = da };
+                        strokes.Add(stroke);
+                    }
+                }
+
+                ClearStrokes(true);
+                timeMachine.ClearStrokeHistory();
+                inkCanvas.Strokes.Add(strokes);
+                LogHelper.NewLog($"XML Strokes Insert: Strokes Count: {inkCanvas.Strokes.Count}");
+
+                // 恢复元素信息
+                var elementsFile = Path.ChangeExtension(filePath, ".elements.json");
+                if (File.Exists(elementsFile))
+                {
+                    var elementInfos = JsonConvert.DeserializeObject<List<CanvasElementInfo>>(File.ReadAllText(elementsFile));
+                    foreach (var info in elementInfos)
+                    {
+                        if (info.Type == "Image" && File.Exists(info.SourcePath))
+                        {
+                            var img = new Image
+                            {
+                                Source = new BitmapImage(new Uri(info.SourcePath)),
+                                Width = info.Width,
+                                Height = info.Height,
+                                Stretch = Enum.TryParse<Stretch>(info.Stretch, out var stretch) ? stretch : Stretch.Fill
+                            };
+                            InkCanvas.SetLeft(img, info.Left);
+                            InkCanvas.SetTop(img, info.Top);
+                            inkCanvas.Children.Add(img);
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"打开XML墨迹文件失败: {ex}", LogHelper.LogType.Error);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// 从XML文件加载StrokeCollection（辅助方法，用于ZIP文件恢复）
+        /// </summary>
+        private StrokeCollection LoadStrokesFromXML(string xmlPath)
+        {
+            try
+            {
+                XDocument doc = XDocument.Load(xmlPath);
+                var root = doc.Root;
+                if (root == null || root.Name != "InkCanvasStrokes")
+                {
+                    return new StrokeCollection();
+                }
+
+                var strokes = new StrokeCollection();
+                foreach (var strokeElement in root.Elements("Stroke"))
+                {
+                    var drawingAttributesStr = strokeElement.Attribute("DrawingAttributes")?.Value ?? "";
+                    var da = ParseDrawingAttributes(drawingAttributesStr);
+
+                    var stylusPoints = new StylusPointCollection();
+                    var stylusPointsElement = strokeElement.Element("StylusPoints");
+                    if (stylusPointsElement != null)
+                    {
+                        foreach (var pointElement in stylusPointsElement.Elements("StylusPoint"))
+                        {
+                            double x = double.Parse(pointElement.Attribute("X")?.Value ?? "0");
+                            double y = double.Parse(pointElement.Attribute("Y")?.Value ?? "0");
+                            float pressure = float.Parse(pointElement.Attribute("PressureFactor")?.Value ?? "0.5");
+                            stylusPoints.Add(new StylusPoint(x, y, pressure));
+                        }
+                    }
+
+                    if (stylusPoints.Count > 0)
+                    {
+                        var stroke = new Stroke(stylusPoints) { DrawingAttributes = da };
+                        strokes.Add(stroke);
+                    }
+                }
+
+                return strokes;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"从XML加载墨迹失败: {ex}", LogHelper.LogType.Error);
+                return new StrokeCollection();
+            }
+        }
+
+        /// <summary>
+        /// 从字符串解析DrawingAttributes
+        /// </summary>
+        private DrawingAttributes ParseDrawingAttributes(string attributesStr)
+        {
+            var da = new DrawingAttributes();
+            var parts = attributesStr.Split(';');
+            foreach (var part in parts)
+            {
+                var kv = part.Split('=');
+                if (kv.Length == 2)
+                {
+                    var key = kv[0].Trim();
+                    var value = kv[1].Trim();
+                    switch (key)
+                    {
+                        case "Color":
+                            da.Color = (System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString(value);
+                            break;
+                        case "Width":
+                            da.Width = double.Parse(value);
+                            break;
+                        case "Height":
+                            da.Height = double.Parse(value);
+                            break;
+                        case "FitToCurve":
+                            da.FitToCurve = bool.Parse(value);
+                            break;
+                        case "IsHighlighter":
+                            da.IsHighlighter = bool.Parse(value);
+                            break;
+                        case "IgnorePressure":
+                            da.IgnorePressure = bool.Parse(value);
+                            break;
+                        case "StylusTip":
+                            da.StylusTip = Enum.TryParse<StylusTip>(value, out var tip) ? tip : StylusTip.Ellipse;
+                            break;
+                    }
+                }
+            }
+            return da;
+        }
+
         /// <summary>
         /// 打开单个墨迹文件
         /// </summary>
+        /// <param name="filePath">墨迹文件的路径</param>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 打开墨迹文件并加载墨迹
+        /// 2. 检查文件是否包含墨迹
+        /// 3. 如果包含墨迹，清空当前墨迹并添加新墨迹
+        /// 4. 恢复元素信息
+        /// 5. 如果文件流中没有墨迹，尝试从内存流中加载
+        /// </remarks>
         public void OpenSingleStrokeFile(string filePath)
         {
             var fileStreamHasNoStroke = false;
@@ -748,3 +1432,4 @@ namespace Ink_Canvas
         }
     }
 }
+

Ink Canvas/MainWindow_cs/MW_Screenshot.cs

@@ -1,3 +1,4 @@
+using Ink_Canvas.Helpers;
 using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;
@@ -6,11 +7,123 @@ using System.IO;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Forms;
+using System.Windows.Ink;
+using System.Windows.Media.Imaging;
 
 namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
+        /// <summary>
+        /// 在切页/加页场景下使用：先捕获当前画面到内存并克隆墨迹，然后立即返回；截图与墨迹保存在后台异步执行，不阻塞切页。
+        /// 调用方应在调用本方法后立即执行 SaveStrokes、ClearStrokes、切页、RestoreStrokes 等逻辑。
+        /// </summary>
+        /// <param name="isHideNotification">是否隐藏保存成功通知</param>
+        /// <param name="fileName">截图文件名（可选）</param>
+        private void CaptureAndEnqueueScreenshotSave(bool isHideNotification, string fileName = null)
+        {
+            var savePath = Settings.Automation.IsSaveScreenshotsInDateFolders
+                ? GetDateFolderPath(fileName)
+                : GetDefaultFolderPath();
+
+            System.Drawing.Bitmap bitmap = null;
+            StrokeCollection strokesToSave = null;
+            int pageIndexForStrokes = 0;
+            string strokeSavePath = null;
+
+            try
+            {
+                bitmap = CaptureScreenshotToBitmap();
+                if (bitmap == null) return;
+
+                if (Settings.Automation.IsAutoSaveStrokesAtScreenshot && inkCanvas.Strokes.Count > 0)
+                {
+                    strokesToSave = inkCanvas.Strokes.Clone();
+                    pageIndexForStrokes = CurrentWhiteboardIndex;
+                    var basePath = Settings.Automation.AutoSavedStrokesLocation
+                        + @"\Auto Saved - BlackBoard Strokes";
+                    if (!Directory.Exists(basePath)) Directory.CreateDirectory(basePath);
+                    strokeSavePath = Path.Combine(basePath,
+                        $"{DateTime.Now:yyyy-MM-dd HH-mm-ss-fff} Page-{pageIndexForStrokes} StrokesCount-{strokesToSave.Count}.icstk");
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"CaptureAndEnqueueScreenshotSave 捕获失败: {ex}", LogHelper.LogType.Error);
+                bitmap?.Dispose();
+                return;
+            }
+
+            var bitmapToSave = bitmap;
+            var path = savePath;
+            var hideNotification = isHideNotification;
+
+            _ = Task.Run(async () =>
+            {
+                try
+                {
+                    if (bitmapToSave != null)
+                    {
+                        var directory = Path.GetDirectoryName(path);
+                        if (!Directory.Exists(directory))
+                            Directory.CreateDirectory(directory);
+                        bitmapToSave.Save(path, ImageFormat.Png);
+                        bitmapToSave.Dispose();
+                    }
+
+                    if (strokesToSave != null && !string.IsNullOrEmpty(strokeSavePath))
+                    {
+                        using (var fs = new FileStream(strokeSavePath, FileMode.Create))
+                        {
+                            strokesToSave.Save(fs);
+                        }
+                    }
+
+                    if (!hideNotification && !string.IsNullOrEmpty(path))
+                    {
+                        Dispatcher.Invoke(() => ShowNotification($"截图成功保存至 {path}"));
+                    }
+
+                    // 使用上传帮助类上传到所有启用的服务
+                    await Helpers.UploadHelper.UploadFileAsync(path);
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"后台保存截图/墨迹失败: {ex}", LogHelper.LogType.Error);
+                    bitmapToSave?.Dispose();
+                }
+            });
+        }
+
+        /// <summary>
+        /// 将当前屏幕内容捕获为位图（仅内存，不写文件）。调用方或后台任务负责 Dispose。
+        /// </summary>
+        private System.Drawing.Bitmap CaptureScreenshotToBitmap()
+        {
+            var rc = SystemInformation.VirtualScreen;
+            var bitmap = new System.Drawing.Bitmap(rc.Width, rc.Height, PixelFormat.Format32bppArgb);
+            using (var memoryGraphics = Graphics.FromImage(bitmap))
+            {
+                memoryGraphics.CompositingQuality = CompositingQuality.HighQuality;
+                memoryGraphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                memoryGraphics.SmoothingMode = SmoothingMode.HighQuality;
+                memoryGraphics.CompositingMode = CompositingMode.SourceOver;
+                memoryGraphics.CopyFromScreen(rc.X, rc.Y, 0, 0, rc.Size, CopyPixelOperation.SourceCopy);
+            }
+            return bitmap;
+        }
+
+        /// <summary>
+        /// 保存截图
+        /// </summary>
+        /// <param name="isHideNotification">是否隐藏通知</param>
+        /// <param name="fileName">文件名</param>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 根据设置确定保存路径
+        /// 2. 调用CaptureAndSaveScreenshot方法捕获并保存截图
+        /// 3. 如果设置了自动保存墨迹，调用SaveInkCanvasStrokes方法保存墨迹
+        /// </remarks>
         private void SaveScreenShot(bool isHideNotification, string fileName = null)
         {
             var savePath = Settings.Automation.IsSaveScreenshotsInDateFolders
@@ -23,6 +136,15 @@ namespace Ink_Canvas
                 SaveInkCanvasStrokes(false);
         }
 
+        /// <summary>
+        /// 保存截图到桌面
+        /// </summary>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 生成桌面路径和文件名
+        /// 2. 调用CaptureAndSaveScreenshot方法捕获并保存截图到桌面
+        /// 3. 如果设置了自动保存墨迹，调用SaveInkCanvasStrokes方法保存墨迹
+        /// </remarks>
         internal void SaveScreenShotToDesktop()
         {
             var desktopPath = Path.Combine(
@@ -35,7 +157,177 @@ namespace Ink_Canvas
                 SaveInkCanvasStrokes(false);
         }
 
-        // 提取公共的截图和保存逻辑
+        internal async Task SaveAreaScreenShotToDesktop()
+        {
+            var originalVisibility = Visibility;
+            try
+            {
+                Visibility = Visibility.Hidden;
+                await Task.Delay(200);
+
+                var screenshotResult = await ShowScreenshotSelector();
+
+                if (!screenshotResult.HasValue)
+                {
+                    ShowNotification("截图已取消");
+                    return;
+                }
+
+                if (screenshotResult.Value.AddToWhiteboard)
+                {
+                    await AddScreenshotToNewWhiteboardPage(screenshotResult.Value);
+                    return;
+                }
+
+                if (screenshotResult.Value.Area.Width <= 0 || screenshotResult.Value.Area.Height <= 0)
+                {
+                    ShowNotification("未选择有效截图区域");
+                    return;
+                }
+
+                var desktopPath = Path.Combine(
+                    Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory),
+                    $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.png");
+
+                using (var originalBitmap = CaptureScreenArea(screenshotResult.Value.Area))
+                {
+                    if (originalBitmap == null)
+                    {
+                        ShowNotification("截图失败");
+                        return;
+                    }
+
+                    Bitmap finalBitmap = originalBitmap;
+                    bool needDisposeFinalBitmap = false;
+
+                    try
+                    {
+                        if (screenshotResult.Value.Path != null && screenshotResult.Value.Path.Count > 0)
+                        {
+                            finalBitmap = ApplyShapeMask(originalBitmap, screenshotResult.Value.Path, screenshotResult.Value.Area);
+                            needDisposeFinalBitmap = true;
+                        }
+
+                        var directory = Path.GetDirectoryName(desktopPath);
+                        if (!Directory.Exists(directory))
+                        {
+                            Directory.CreateDirectory(directory);
+                        }
+
+                        finalBitmap.Save(desktopPath, ImageFormat.Png);
+                        ShowNotification($"截图成功保存至 {desktopPath}");
+                    }
+                    finally
+                    {
+                        if (needDisposeFinalBitmap && finalBitmap != originalBitmap)
+                        {
+                            finalBitmap.Dispose();
+                        }
+                    }
+                }
+
+                if (Settings.Automation.IsAutoSaveStrokesAtScreenshot)
+                    SaveInkCanvasStrokes(false);
+            }
+            catch (Exception ex)
+            {
+                ShowNotification($"截图失败: {ex.Message}");
+            }
+            finally
+            {
+                Visibility = originalVisibility;
+            }
+        }
+
+        private async Task AddScreenshotToNewWhiteboardPage(ScreenshotResult screenshotResult)
+        {
+            // 先在当前场景准备截图数据，再进白板，避免误截到白板页面
+            BitmapSource bitmapSourceForClipboard = null;
+
+            // 摄像头截图（BitmapSource）
+            if (screenshotResult.CameraBitmapSource != null)
+            {
+                bitmapSourceForClipboard = screenshotResult.CameraBitmapSource;
+            }
+            // 摄像头截图（Bitmap）
+            else if (screenshotResult.CameraImage != null)
+            {
+                bitmapSourceForClipboard = ConvertBitmapToBitmapSource(screenshotResult.CameraImage);
+            }
+            else
+            {
+                if (screenshotResult.Area.Width <= 0 || screenshotResult.Area.Height <= 0)
+                {
+                    ShowNotification("未选择有效截图区域");
+                    return;
+                }
+
+                using (var originalBitmap = CaptureScreenArea(screenshotResult.Area))
+                {
+                    if (originalBitmap == null)
+                    {
+                        ShowNotification("截图失败");
+                        return;
+                    }
+
+                    Bitmap finalBitmap = originalBitmap;
+                    bool needDisposeFinalBitmap = false;
+
+                    try
+                    {
+                        if (screenshotResult.Path != null && screenshotResult.Path.Count > 0)
+                        {
+                            finalBitmap = ApplyShapeMask(originalBitmap, screenshotResult.Path, screenshotResult.Area);
+                            needDisposeFinalBitmap = true;
+                        }
+
+                        bitmapSourceForClipboard = ConvertBitmapToBitmapSource(finalBitmap);
+                    }
+                    finally
+                    {
+                        if (needDisposeFinalBitmap && finalBitmap != originalBitmap)
+                        {
+                            finalBitmap.Dispose();
+                        }
+                    }
+                }
+            }
+
+            if (bitmapSourceForClipboard == null)
+            {
+                ShowNotification("截图转换失败");
+                return;
+            }
+
+            // 图像已拷贝到内存后再进入白板
+            bitmapSourceForClipboard.Freeze();
+
+            if (currentMode != 1)
+            {
+                SwitchToBoardMode();
+                await Task.Delay(150);
+            }
+
+            BtnWhiteBoardAdd_Click(null, EventArgs.Empty);
+
+            await InsertBitmapSourceToCanvas(bitmapSourceForClipboard);
+        }
+
+        /// <summary>
+        /// 提取公共的截图和保存逻辑
+        /// </summary>
+        /// <param name="savePath">保存路径</param>
+        /// <param name="isHideNotification">是否隐藏通知</param>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 获取虚拟屏幕边界
+        /// 2. 创建位图并设置高质量渲染
+        /// 3. 从屏幕复制内容到位图
+        /// 4. 确保保存目录存在
+        /// 5. 保存为PNG格式
+        /// 6. 如果不隐藏通知，显示保存成功通知
+        /// 7. 异步上传截图到Dlass
+        /// </remarks>
         private void CaptureAndSaveScreenshot(string savePath, bool isHideNotification)
         {
             var rc = SystemInformation.VirtualScreen;
@@ -64,19 +356,20 @@ namespace Ink_Canvas
 
             if (!isHideNotification)
             {
-                ShowNotification($"截图成功保存至 {savePath}");
+                Task.Delay(100).ContinueWith(t =>
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        ShowNotification($"截图成功保存至 {savePath}");
+                    });
+                });
             }
             _ = Task.Run(async () =>
             {
                 try
                 {
-                    var delayMinutes = Settings?.Dlass?.AutoUploadDelayMinutes ?? 0;
-                    if (delayMinutes > 0)
-                    {
-                        await Task.Delay(TimeSpan.FromMinutes(delayMinutes));
-                    }
-
-                    await Helpers.DlassNoteUploader.UploadNoteFileAsync(savePath);
+                    // 使用上传帮助类上传到所有启用的服务
+                    await Helpers.UploadHelper.UploadFileAsync(savePath);
                 }
                 catch (Exception)
                 {
@@ -84,7 +377,17 @@ namespace Ink_Canvas
             });
         }
 
-        // 获取日期文件夹路径
+        /// <summary>
+        /// 获取日期文件夹路径
+        /// </summary>
+        /// <param name="fileName">文件名</param>
+        /// <returns>日期文件夹路径</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 如果文件名为空，使用当前时间作为文件名
+        /// 2. 获取基础路径和日期文件夹名
+        /// 3. 组合路径并返回
+        /// </remarks>
         private string GetDateFolderPath(string fileName)
         {
             if (string.IsNullOrWhiteSpace(fileName))
@@ -102,7 +405,17 @@ namespace Ink_Canvas
                 $"{fileName}.png");
         }
 
-        // 获取默认文件夹路径
+        /// <summary>
+        /// 获取默认文件夹路径
+        /// </summary>
+        /// <returns>默认文件夹路径</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 获取基础路径
+        /// 2. 组合截图文件夹路径
+        /// 3. 确保截图文件夹存在
+        /// 4. 生成文件名并组合完整路径返回
+        /// </remarks>
         private string GetDefaultFolderPath()
         {
             var basePath = Settings.Automation.AutoSavedStrokesLocation;

Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs

@@ -1,5 +1,5 @@
 using Ink_Canvas.Helpers;
-using iNKORE.UI.WPF.Modern.Controls;
+using iNKORE.UI.WPF.Controls;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,8 +17,20 @@ namespace Ink_Canvas
     {
         #region Floating Control
 
+        /// <summary>
+        /// 存储最后一次鼠标按下的边界对象
+        /// </summary>
         private object lastBorderMouseDownObject;
 
+        /// <summary>
+        /// 处理边界鼠标按下事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 如果发送者是 RandomDrawPanel 或 SingleDrawPanel，且它们被隐藏，则不处理事件
+        /// 否则存储当前鼠标按下的对象
+        /// </remarks>
         private void Border_MouseDown(object sender, MouseButtonEventArgs e)
         {
             // 如果发送者是 RandomDrawPanel 或 SingleDrawPanel，且它们被隐藏，则不处理事件
@@ -34,7 +46,15 @@ namespace Ink_Canvas
             lastBorderMouseDownObject = sender;
         }
 
-
+        /// <summary>
+        /// 处理墨迹选择克隆鼠标释放事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 只有当鼠标按下和释放的是同一个对象时才处理
+        /// 执行墨迹克隆操作并记录日志
+        /// </remarks>
         private void BorderStrokeSelectionClone_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (lastBorderMouseDownObject != sender) return;
@@ -55,6 +75,15 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理墨迹选择克隆到新画板鼠标释放事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 只有当鼠标按下和释放的是同一个对象时才处理
+        /// 克隆选中的墨迹到新画板并清除当前选择
+        /// </remarks>
         private void BorderStrokeSelectionCloneToNewBoard_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (lastBorderMouseDownObject != sender) return;
@@ -64,24 +93,60 @@ namespace Ink_Canvas
             CloneStrokesToNewBoard(strokes);
         }
 
+        /// <summary>
+        /// 处理墨迹选择删除鼠标释放事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 只有当鼠标按下和释放的是同一个对象时才处理
+        /// 调用 SymbolIconDelete_MouseUp 方法执行删除操作
+        /// </remarks>
         private void BorderStrokeSelectionDelete_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (lastBorderMouseDownObject != sender) return;
             SymbolIconDelete_MouseUp(sender, e);
         }
 
+        /// <summary>
+        /// 处理笔宽减小鼠标释放事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 只有当鼠标按下和释放的是同一个对象时才处理
+        /// 调用 ChangeStrokeThickness 方法减小笔宽
+        /// </remarks>
         private void GridPenWidthDecrease_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (lastBorderMouseDownObject != sender) return;
             ChangeStrokeThickness(0.8);
         }
 
+        /// <summary>
+        /// 处理笔宽增大鼠标释放事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 只有当鼠标按下和释放的是同一个对象时才处理
+        /// 调用 ChangeStrokeThickness 方法增大笔宽
+        /// </remarks>
         private void GridPenWidthIncrease_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (lastBorderMouseDownObject != sender) return;
             ChangeStrokeThickness(1.25);
         }
 
+        /// <summary>
+        /// 更改选中墨迹的粗细
+        /// </summary>
+        /// <param name="multipler">缩放倍数</param>
+        /// <remarks>
+        /// 对选中的每个墨迹应用缩放倍数
+        /// 确保新的粗细在允许的范围内
+        /// 如果有 DrawingAttributesHistory，则提交历史记录
+        /// </remarks>
         private void ChangeStrokeThickness(double multipler)
         {
             foreach (var stroke in inkCanvas.GetSelectedStrokes())
@@ -107,6 +172,15 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理笔宽恢复默认鼠标释放事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 只有当鼠标按下和释放的是同一个对象时才处理
+        /// 将选中墨迹的粗细恢复为默认值
+        /// </remarks>
         private void GridPenWidthRestore_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (lastBorderMouseDownObject != sender) return;
@@ -118,6 +192,16 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理水平翻转鼠标释放事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 只有当鼠标按下和释放的是同一个对象时才处理
+        /// 对选中的墨迹应用水平翻转变换
+        /// 如果有 DrawingAttributesHistory，则提交历史记录
+        /// </remarks>
         private void ImageFlipHorizontal_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (lastBorderMouseDownObject != sender) return;
@@ -155,6 +239,16 @@ namespace Ink_Canvas
             //updateBorderStrokeSelectionControlLocation();
         }
 
+        /// <summary>
+        /// 处理垂直翻转鼠标释放事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 只有当鼠标按下和释放的是同一个对象时才处理
+        /// 对选中的墨迹应用垂直翻转变换
+        /// 如果有 DrawingAttributesHistory，则提交历史记录
+        /// </remarks>
         private void ImageFlipVertical_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (lastBorderMouseDownObject != sender) return;
@@ -186,6 +280,16 @@ namespace Ink_Canvas
         }
 
         // ... existing code ...
+        /// <summary>
+        /// 处理顺时针旋转45度鼠标释放事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 只有当鼠标按下和释放的是同一个对象时才处理
+        /// 对选中的墨迹应用45度旋转变换
+        /// 如果有 DrawingAttributesHistory，则提交历史记录
+        /// </remarks>
         private void ImageRotate45_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (lastBorderMouseDownObject != sender) return;
@@ -216,6 +320,16 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理顺时针旋转90度鼠标释放事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 只有当鼠标按下和释放的是同一个对象时才处理
+        /// 对选中的墨迹应用90度旋转变换
+        /// 如果有 DrawingAttributesHistory，则提交历史记录
+        /// </remarks>
         private void ImageRotate90_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (lastBorderMouseDownObject != sender) return;
@@ -254,17 +368,51 @@ namespace Ink_Canvas
 
         #endregion
 
+        /// <summary>
+        /// 墨迹选择覆盖层鼠标按下状态
+        /// </summary>
         private bool isGridInkCanvasSelectionCoverMouseDown;
+        /// <summary>
+        /// 墨迹拖动状态
+        /// </summary>
         private bool isStrokeDragging = false;
+        /// <summary>
+        /// 墨迹拖动起始点
+        /// </summary>
         private Point strokeDragStartPoint;
+        /// <summary>
+        /// 墨迹选择克隆集合
+        /// </summary>
         private StrokeCollection StrokesSelectionClone = new StrokeCollection();
 
         // 选择框和选择点相关变量
+        /// <summary>
+        /// 调整大小状态
+        /// </summary>
         private bool isResizing = false;
+        /// <summary>
+        /// 当前调整把手
+        /// </summary>
         private string currentResizeHandle = "";
+        /// <summary>
+        /// 调整起始点
+        /// </summary>
         private Point resizeStartPoint;
+        /// <summary>
+        /// 原始选择边界
+        /// </summary>
         private Rect originalSelectionBounds;
 
+        /// <summary>
+        /// 处理墨迹选择覆盖层鼠标按下事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 如果有选中的墨迹，检查点击位置是否在选择框边界内
+        /// 如果在边界内，开始拖动墨迹
+        /// 如果在边界外，取消选择
+        /// </remarks>
         private void GridInkCanvasSelectionCover_MouseDown(object sender, MouseButtonEventArgs e)
         {
             isGridInkCanvasSelectionCoverMouseDown = true;
@@ -297,6 +445,15 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理墨迹选择覆盖层鼠标移动事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">鼠标事件参数</param>
+        /// <remarks>
+        /// 如果正在拖动墨迹，执行拖动操作
+        /// 如果鼠标在选中区域移动，更新墨迹选中栏位置
+        /// </remarks>
         private void GridInkCanvasSelectionCover_MouseMove(object sender, MouseEventArgs e)
         {
             if (!isGridInkCanvasSelectionCoverMouseDown) return;
@@ -331,6 +488,15 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理墨迹选择覆盖层鼠标释放事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 结束墨迹拖动
+        /// 只有在没有选中墨迹时才隐藏选中栏
+        /// </remarks>
         private void GridInkCanvasSelectionCover_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (!isGridInkCanvasSelectionCoverMouseDown) return;
@@ -352,6 +518,17 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理选择按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">路由事件参数</param>
+        /// <remarks>
+        /// 如果当前是选择模式，检查是否全选
+        /// 如果全选，则切换到墨迹模式再切换回选择模式
+        /// 如果不是全选，则选择所有有效墨迹
+        /// 如果当前不是选择模式，则切换到选择模式
+        /// </remarks>
         private void BtnSelect_Click(object sender, RoutedEventArgs e)
         {
             forceEraser = true;
@@ -381,10 +558,30 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 墨迹选择控件宽度
+        /// </summary>
         private double BorderStrokeSelectionControlWidth = 490.0;
+        /// <summary>
+        /// 墨迹选择控件高度
+        /// </summary>
         private double BorderStrokeSelectionControlHeight = 80.0;
+        /// <summary>
+        /// 程序更改墨迹选择状态
+        /// </summary>
         private bool isProgramChangeStrokeSelection;
 
+        /// <summary>
+        /// 处理墨迹画布选择更改事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// 优先检查墨迹选择状态
+        /// 如果有墨迹被选中，显示墨迹选择栏和选择框
+        /// 如果有图片元素被选中，不显示选择框
+        /// 如果没有选中任何内容，隐藏选择框
+        /// </remarks>
         private void inkCanvas_SelectionChanged(object sender, EventArgs e)
         {
             if (isProgramChangeStrokeSelection) return;
@@ -438,6 +635,14 @@ namespace Ink_Canvas
 
 
 
+        /// <summary>
+        /// 更新墨迹选中栏位置
+        /// </summary>
+        /// <remarks>
+        /// 计算墨迹选中栏的位置，确保在墨迹下方显示
+        /// 如果选中栏会超出屏幕底部，则显示在墨迹上方
+        /// 如果上方也没有空间，则显示在顶部
+        /// </remarks>
         private void updateBorderStrokeSelectionControlLocation()
         {
             var borderLeft = (inkCanvas.GetSelectionBounds().Left + inkCanvas.GetSelectionBounds().Right -
@@ -461,11 +666,28 @@ namespace Ink_Canvas
             BorderStrokeSelectionControl.Margin = new Thickness(borderLeft, borderTop, 0, 0);
         }
 
+        /// <summary>
+        /// 处理墨迹选择覆盖层操作开始事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">操作开始事件参数</param>
+        /// <remarks>
+        /// 设置操作模式为所有模式
+        /// </remarks>
         private void GridInkCanvasSelectionCover_ManipulationStarting(object sender, ManipulationStartingEventArgs e)
         {
             e.Mode = ManipulationModes.All;
         }
 
+        /// <summary>
+        /// 处理墨迹选择覆盖层操作完成事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">操作完成事件参数</param>
+        /// <remarks>
+        /// 如果有 StrokeManipulationHistory，则提交历史记录
+        /// 如果有 DrawingAttributesHistory，则提交历史记录
+        /// </remarks>
         private void GridInkCanvasSelectionCover_ManipulationCompleted(object sender, ManipulationCompletedEventArgs e)
         {
             if (StrokeManipulationHistory?.Count > 0)
@@ -490,12 +712,29 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理选择覆盖层的操作增量事件，将来自触摸或操作的平移、缩放和旋转应用到当前选中的墨迹上并更新选择控件位置。
+        /// </summary>
+        /// <param name="sender">触发事件的元素（通常为选择覆盖层）。</param>
+        /// <param name="e">包含平移、缩放和旋转增量的 ManipulationDeltaEventArgs。</param>
+        /// <remarks>
+        /// - 当只有单指触摸且已有选中墨迹时，不在此处处理拖动（由 TouchMove 处理）。
+        /// - 三指及以上触摸时禁用缩放。 
+        /// - 若 StrokesSelectionClone 非空，则对其内的墨迹应用变换；否则在允许两指旋转时也会应用旋转变换。 
+        /// - 处理完成后会刷新并更新边框/选择控件的位置。
+        /// </remarks>
         private void GridInkCanvasSelectionCover_ManipulationDelta(object sender, ManipulationDeltaEventArgs e)
         {
             try
             {
                 if (dec.Count >= 1)
                 {
+                    // 单指时，让TouchMove处理拖动
+                    if (dec.Count == 1 && inkCanvas.GetSelectedStrokes().Count > 0)
+                    {
+                        return;
+                    }
+
                     bool disableScale = dec.Count >= 3;
                     var md = e.DeltaManipulation;
                     var trans = md.Translation; // 获得位移矢量
@@ -537,89 +776,12 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理选区覆盖层的触摸按下事件：记录触摸设备 ID，并在第一个触点时保存选择中心与用于拖拽的初始触点位置。
+        /// </summary>
+        /// <param name="sender">事件源（触摸事件的发送者）。</param>
+        /// <param name="e">触摸事件参数，包含触点位置与设备 ID。</param>
         private void GridInkCanvasSelectionCover_TouchDown(object sender, TouchEventArgs e)
-        {
-        }
-
-        private void GridInkCanvasSelectionCover_TouchUp(object sender, TouchEventArgs e)
-        {
-        }
-
-        private void GridInkCanvasSelectionCover_TouchMove(object sender, TouchEventArgs e)
-        {
-            // 处理触摸移动事件 - 用于拖动选中的墨迹
-            if (inkCanvas.GetSelectedStrokes().Count > 0 && dec.Count == 1)
-            {
-                var currentTouchPoint = e.GetTouchPoint(inkCanvas).Position;
-
-                // 检查是否有有效的起始触摸点
-                if (lastTouchPointOnGridInkCanvasCover != new Point(0, 0))
-                {
-                    var delta = currentTouchPoint - lastTouchPointOnGridInkCanvasCover;
-
-                    // 只有当移动距离足够大时才进行拖动（避免微小移动造成的抖动）
-                    if (Math.Abs(delta.X) > 1 || Math.Abs(delta.Y) > 1)
-                    {
-                        // 创建变换矩阵
-                        var matrix = new Matrix();
-                        matrix.Translate(delta.X, delta.Y);
-
-                        // 对选中的墨迹应用变换
-                        var selectedStrokes = inkCanvas.GetSelectedStrokes();
-                        foreach (var stroke in selectedStrokes)
-                        {
-                            stroke.Transform(matrix, false);
-                        }
-
-                        // 更新选中栏位置
-                        updateBorderStrokeSelectionControlLocation();
-
-                        // 更新最后触摸点
-                        lastTouchPointOnGridInkCanvasCover = currentTouchPoint;
-                    }
-                }
-            }
-        }
-
-        private void GridInkCanvasSelectionCover_PreviewTouchMove(object sender, TouchEventArgs e)
-        {
-            // 预览触摸移动事件 - 用于更精确的触摸处理
-            if (inkCanvas.GetSelectedStrokes().Count > 0 && dec.Count == 1)
-            {
-                var currentTouchPoint = e.GetTouchPoint(inkCanvas).Position;
-
-                // 检查是否有有效的起始触摸点
-                if (lastTouchPointOnGridInkCanvasCover != new Point(0, 0))
-                {
-                    var delta = currentTouchPoint - lastTouchPointOnGridInkCanvasCover;
-
-                    // 只有当移动距离足够大时才进行拖动（避免微小移动造成的抖动）
-                    if (Math.Abs(delta.X) > 1 || Math.Abs(delta.Y) > 1)
-                    {
-                        // 创建变换矩阵
-                        var matrix = new Matrix();
-                        matrix.Translate(delta.X, delta.Y);
-
-                        // 对选中的墨迹应用变换
-                        var selectedStrokes = inkCanvas.GetSelectedStrokes();
-                        foreach (var stroke in selectedStrokes)
-                        {
-                            stroke.Transform(matrix, false);
-                        }
-
-                        // 更新选中栏位置
-                        updateBorderStrokeSelectionControlLocation();
-
-                        // 更新最后触摸点
-                        lastTouchPointOnGridInkCanvasCover = currentTouchPoint;
-                    }
-                }
-            }
-        }
-
-        private Point lastTouchPointOnGridInkCanvasCover = new Point(0, 0);
-
-        private void GridInkCanvasSelectionCover_PreviewTouchDown(object sender, TouchEventArgs e)
         {
             dec.Add(e.TouchDevice.Id);
             //设备1个的时候，记录中心点
@@ -627,70 +789,43 @@ namespace Ink_Canvas
             {
                 var touchPoint = e.GetTouchPoint(null);
                 centerPoint = touchPoint.Position;
-                lastTouchPointOnGridInkCanvasCover = e.GetTouchPoint(inkCanvas).Position;
+                lastTouchPointOnGridInkCanvasCover = touchPoint.Position;
 
-                // 检查是否有选中的墨迹
-                if (inkCanvas.GetSelectedStrokes().Count > 0)
-                {
-                    // 获取触摸点位置
-                    var touchPosition = e.GetTouchPoint(inkCanvas).Position;
-                    var selectionBounds = inkCanvas.GetSelectionBounds();
-
-                    // 检查触摸位置是否在选择框边界内
-                    if (touchPosition.X >= selectionBounds.Left &&
-                        touchPosition.X <= selectionBounds.Right &&
-                        touchPosition.Y >= selectionBounds.Top &&
-                        touchPosition.Y <= selectionBounds.Bottom)
-                    {
-                        // 只有在选择框边界内才允许拖动
-                        // 触摸拖动状态已通过TouchMove事件处理
-                    }
-                    else
-                    {
-                        // 触摸在选择框外，取消选择
-                        inkCanvas.Select(new StrokeCollection());
-                        GridInkCanvasSelectionCover.Visibility = Visibility.Collapsed;
-                        return;
-                    }
-                }
-
-
-                SetCurrentToolMode(InkCanvasEditingMode.Select);
-                inkCanvas.Select(new StrokeCollection());
+                var touchPointInCanvas = e.GetTouchPoint(inkCanvas);
+                lastDragPointInCanvas = touchPointInCanvas.Position;
             }
         }
 
-        private void GridInkCanvasSelectionCover_PreviewTouchUp(object sender, TouchEventArgs e)
+        /// <summary>
+        /// 处理选区覆盖层的触摸结束事件：更新触摸跟踪状态并根据触摸位置和当前选区状态显示或隐藏选区覆盖层与克隆集合。
+        /// </summary>
+        /// <param name="sender">触发事件的对象（通常为选区覆盖层）。</param>
+        /// <param name="e">触摸事件参数，包含触点信息。</param>
+        private void GridInkCanvasSelectionCover_TouchUp(object sender, TouchEventArgs e)
         {
             dec.Remove(e.TouchDevice.Id);
             if (dec.Count >= 1) return;
-
-            // 重置触摸状态
-            lastTouchPointOnGridInkCanvasCover = new Point(0, 0);
             isProgramChangeStrokeSelection = false;
 
-            // 检查是否有点击（没有移动）
-            var currentTouchPoint = e.GetTouchPoint(null).Position;
-            if (Math.Abs(currentTouchPoint.X - centerPoint.X) < 5 && Math.Abs(currentTouchPoint.Y - centerPoint.Y) < 5)
-            {
-                // 点击在选择框内，保持选择状态
-                if (inkCanvas.GetSelectedStrokes().Count > 0)
-                {
-                    var selectionBounds = inkCanvas.GetSelectionBounds();
-                    if (currentTouchPoint.X >= selectionBounds.Left &&
-                        currentTouchPoint.X <= selectionBounds.Right &&
-                        currentTouchPoint.Y >= selectionBounds.Top &&
-                        currentTouchPoint.Y <= selectionBounds.Bottom)
-                    {
-                        // 点击在选择框内，保持选择
-                        GridInkCanvasSelectionCover.Visibility = Visibility.Visible;
-                        StrokesSelectionClone = new StrokeCollection();
-                        return;
-                    }
-                }
+            lastDragPointInCanvas = new Point(0, 0);
 
-                // 点击在选择框外，取消选择
+            var touchUpPoint = e.GetTouchPoint(null).Position;
+            if (lastTouchPointOnGridInkCanvasCover == touchUpPoint)
+            {
+                var touchPointInCanvas = e.GetTouchPoint(inkCanvas).Position;
+                var selectionBounds = inkCanvas.GetSelectionBounds();
+
+                if (!(touchPointInCanvas.X < selectionBounds.Left) &&
+                    !(touchPointInCanvas.Y < selectionBounds.Top) &&
+                    !(touchPointInCanvas.X > selectionBounds.Right) &&
+                    !(touchPointInCanvas.Y > selectionBounds.Bottom))
+                {
+                    return;
+                }
+                isProgramChangeStrokeSelection = true;
                 inkCanvas.Select(new StrokeCollection());
+                GridInkCanvasSelectionCover.Visibility = Visibility.Collapsed;
+                isProgramChangeStrokeSelection = false;
                 StrokesSelectionClone = new StrokeCollection();
             }
             else if (inkCanvas.GetSelectedStrokes().Count == 0)
@@ -703,9 +838,57 @@ namespace Ink_Canvas
                 GridInkCanvasSelectionCover.Visibility = Visibility.Visible;
                 StrokesSelectionClone = new StrokeCollection();
             }
-
         }
 
+        /// <summary>
+        /// 处理触摸移动事件，按单指拖动并平移当前选中的墨迹，同时更新选择控件的位置。
+        /// </summary>
+        /// <remarks>仅在存在选中墨迹且当前仅有一个触摸点时生效；若起始触摸点未记录（lastDragPointInCanvas 为 (0,0)）则不移动。只有当触摸位移在任一方向超过 1 像素时，才对每条选中墨迹应用平移变换，并更新选择控件位置与最后触摸点。</remarks>
+        private void GridInkCanvasSelectionCover_TouchMove(object sender, TouchEventArgs e)
+        {
+            // 处理触摸移动事件 - 用于拖动选中的墨迹
+            if (inkCanvas.GetSelectedStrokes().Count > 0 && dec.Count == 1)
+            {
+                var currentTouchPoint = e.GetTouchPoint(inkCanvas).Position;
+
+                // 检查是否有有效的起始触摸点
+                if (lastDragPointInCanvas != new Point(0, 0))
+                {
+                    var delta = currentTouchPoint - lastDragPointInCanvas;
+
+                    // 只有当移动距离足够大时才进行拖动（避免微小移动造成的抖动）
+                    if (Math.Abs(delta.X) > 1 || Math.Abs(delta.Y) > 1)
+                    {
+                        // 创建变换矩阵
+                        var matrix = new Matrix();
+                        matrix.Translate(delta.X, delta.Y);
+
+                        // 对选中的墨迹应用变换
+                        var selectedStrokes = inkCanvas.GetSelectedStrokes();
+                        foreach (var stroke in selectedStrokes)
+                        {
+                            stroke.Transform(matrix, false);
+                        }
+
+                        // 更新选中栏位置
+                        updateBorderStrokeSelectionControlLocation();
+
+                        // 更新最后触摸点
+                        lastDragPointInCanvas = currentTouchPoint;
+                    }
+                }
+            }
+        }
+
+        private Point lastTouchPointOnGridInkCanvasCover = new Point(0, 0);
+        private Point lastDragPointInCanvas = new Point(0, 0);
+
+        /// <summary>
+        /// 切换到选择（套索）工具模式并同步光标显示。
+        /// </summary>
+        /// <remarks>
+        /// 同时取消强制橡皮擦和点式橡皮擦状态，并将绘制形状模式重置为默认（0）。
+        /// </remarks>
         private void LassoSelect_Click(object sender, RoutedEventArgs e)
         {
             forceEraser = false;
@@ -716,6 +899,16 @@ namespace Ink_Canvas
             SetCursorBasedOnEditingMode(inkCanvas);
         }
 
+        /// <summary>
+        /// 处理套索选择按钮点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">路由事件参数</param>
+        /// <remarks>
+        /// 设置工具模式为选择模式
+        /// 启用墨迹画布的操作支持
+        /// 设置光标为选择模式光标
+        /// </remarks>
         private void BtnLassoSelect_Click(object sender, RoutedEventArgs e)
         {
             forceEraser = false;
@@ -729,6 +922,17 @@ namespace Ink_Canvas
 
         #region UIElement Selection and Resize
 
+        /// <summary>
+        /// 获取UI元素的边界
+        /// </summary>
+        /// <param name="element">UI元素</param>
+        /// <returns>UI元素的边界矩形</returns>
+        /// <remarks>
+        /// 如果元素是FrameworkElement，获取其位置和大小
+        /// 如果元素有RenderTransform，尝试使用变换后的边界
+        /// 如果变换失败，回退到简单计算
+        /// 如果元素不是FrameworkElement，返回空矩形
+        /// </remarks>
         private Rect GetUIElementBounds(UIElement element)
         {
             if (element is FrameworkElement fe)
@@ -771,6 +975,12 @@ namespace Ink_Canvas
 
         #region Selection Display and Resize Handles
 
+        /// <summary>
+        /// 在画布上显示当前选中墨迹的可视选择框与调整控件（如有选中墨迹则显示，否则隐藏）。
+        /// </summary>
+        /// <remarks>
+        /// 如果没有选中任何墨迹，隐藏选择显示；否则计算选区边界，将选择框在所有方向各扩展 8 像素，设置选择框的位置与尺寸，并更新调整句柄的位置后显示句柄画布。
+        /// </remarks>
         private void UpdateSelectionDisplay()
         {
             if (inkCanvas.GetSelectedStrokes().Count == 0)
@@ -781,38 +991,59 @@ namespace Ink_Canvas
 
             var selectionBounds = inkCanvas.GetSelectionBounds();
 
-            // 更新选择框
+            // 向外扩展8像素
+            double expandOffset = 8;
+
+            // 更新选择框，向外扩展8像素
             SelectionRectangle.Visibility = Visibility.Visible;
-            SelectionRectangle.Margin = new Thickness(selectionBounds.Left, selectionBounds.Top, 0, 0);
-            SelectionRectangle.Width = selectionBounds.Width;
-            SelectionRectangle.Height = selectionBounds.Height;
+            SelectionRectangle.Margin = new Thickness(selectionBounds.Left - expandOffset, selectionBounds.Top - expandOffset, 0, 0);
+            SelectionRectangle.Width = selectionBounds.Width + expandOffset * 2;
+            SelectionRectangle.Height = selectionBounds.Height + expandOffset * 2;
 
             // 更新选择点位置
             UpdateSelectionHandles(selectionBounds);
             SelectionHandlesCanvas.Visibility = Visibility.Visible;
         }
 
+        /// <summary>
+        /// 隐藏选择显示
+        /// </summary>
+        /// <remarks>
+        /// 隐藏选择矩形和选择把手画布
+        /// </remarks>
         private void HideSelectionDisplay()
         {
             SelectionRectangle.Visibility = Visibility.Collapsed;
             SelectionHandlesCanvas.Visibility = Visibility.Collapsed;
         }
 
+        /// <summary>
+        /// 根据给定的选择边界定位并设置八个缩放/移动把手的位置，四个把手在各边外扩展 8 像素，四个角把手完全位于外部。
+        /// </summary>
+        /// <param name="bounds">当前选区在画布坐标系中的边界矩形（未包含用于显示的 8 像素外扩展）。</param>
         private void UpdateSelectionHandles(Rect bounds)
         {
-            // 四个角选择点
-            TopLeftHandle.Margin = new Thickness(bounds.Left - 4, bounds.Top - 4, 0, 0);
-            TopRightHandle.Margin = new Thickness(bounds.Right - 4, bounds.Top - 4, 0, 0);
-            BottomLeftHandle.Margin = new Thickness(bounds.Left - 4, bounds.Bottom - 4, 0, 0);
-            BottomRightHandle.Margin = new Thickness(bounds.Right - 4, bounds.Bottom - 4, 0, 0);
+            // 四个边选择点，向外扩展8像素
+            TopHandle.Margin = new Thickness(bounds.Left + bounds.Width / 2 - 4, bounds.Top - 12, 0, 0);
+            BottomHandle.Margin = new Thickness(bounds.Left + bounds.Width / 2 - 4, bounds.Bottom + 4, 0, 0);
+            LeftHandle.Margin = new Thickness(bounds.Left - 12, bounds.Top + bounds.Height / 2 - 4, 0, 0);
+            RightHandle.Margin = new Thickness(bounds.Right + 4, bounds.Top + bounds.Height / 2 - 4, 0, 0);
 
-            // 四个边选择点
-            TopHandle.Margin = new Thickness(bounds.Left + bounds.Width / 2 - 4, bounds.Top - 4, 0, 0);
-            BottomHandle.Margin = new Thickness(bounds.Left + bounds.Width / 2 - 4, bounds.Bottom - 4, 0, 0);
-            LeftHandle.Margin = new Thickness(bounds.Left - 4, bounds.Top + bounds.Height / 2 - 4, 0, 0);
-            RightHandle.Margin = new Thickness(bounds.Right - 4, bounds.Top + bounds.Height / 2 - 4, 0, 0);
+            // 四个角选择点，完全位于选择框外部
+            TopLeftHandle.Margin = new Thickness(bounds.Left - 12, bounds.Top - 12, 0, 0);
+            TopRightHandle.Margin = new Thickness(bounds.Right + 4, bounds.Top - 12, 0, 0);
+            BottomLeftHandle.Margin = new Thickness(bounds.Left - 12, bounds.Bottom + 4, 0, 0);
+            BottomRightHandle.Margin = new Thickness(bounds.Right + 4, bounds.Bottom + 4, 0, 0);
         }
 
+        /// <summary>
+        /// 在用户按下选择框的缩放把手时开始缩放操作。
+        /// </summary>
+        /// <remarks>
+        /// 记录缩放开始位置和当前选区的初始边界，设置当前活动把手并捕获鼠标以便后续移动/释放事件处理。
+        /// </remarks>
+        /// <param name="sender">触发事件的缩放把手，预期为一个 Rectangle。</param>
+        /// <param name="e">包含鼠标按下事件的位置信息和处理标志的 <see cref="MouseButtonEventArgs"/> 实例。</param>
         private void SelectionHandle_MouseDown(object sender, MouseButtonEventArgs e)
         {
             if (sender is Rectangle handle)
@@ -826,6 +1057,16 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理选择把手鼠标移动事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">鼠标事件参数</param>
+        /// <remarks>
+        /// 如果正在调整大小，计算新的边界
+        /// 应用新的边界到选中的墨迹
+        /// 更新选择框显示
+        /// </remarks>
         private void SelectionHandle_MouseMove(object sender, MouseEventArgs e)
         {
             if (!isResizing || !(sender is Rectangle handle)) return;
@@ -842,6 +1083,11 @@ namespace Ink_Canvas
             UpdateSelectionDisplay();
         }
 
+        /// <summary>
+        /// 在选择框的大小调整句柄上释放鼠标时结束调整操作、释放句柄的鼠标捕获并将事件标记为已处理。
+        /// </summary>
+        /// <param name="sender">触发事件的对象，应为表示调整句柄的 <see cref="System.Windows.Shapes.Rectangle"/>。</param>
+        /// <param name="e">鼠标事件参数；在处理后该事件会被标记为已处理。</param>
         private void SelectionHandle_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (sender is Rectangle handle)
@@ -853,6 +1099,71 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 在触摸按下选择调整句柄时开始调整操作并记录初始状态（活动句柄、起始点和当前选区边界）。
+        /// </summary>
+        /// <param name="sender">触发事件的调整句柄（应为 Rectangle）。</param>
+        /// <param name="e">触摸事件数据；方法会标记事件为已处理并使用其触点相对于 inkCanvas 的位置。</param>
+        private void SelectionHandle_TouchDown(object sender, TouchEventArgs e)
+        {
+            if (sender is Rectangle handle)
+            {
+                isResizing = true;
+                currentResizeHandle = handle.Name;
+                var touchPoint = e.GetTouchPoint(inkCanvas);
+                resizeStartPoint = touchPoint.Position;
+                originalSelectionBounds = inkCanvas.GetSelectionBounds();
+                e.Handled = true;
+            }
+        }
+
+        /// <summary>
+        /// 在触摸移动时根据拖动更新选区的边界并将其应用到当前所选的墨迹。
+        /// </summary>
+        /// <param name="sender">触发事件的调整句柄（应为一个 Rectangle）。</param>
+        /// <param name="e">包含触摸位置和状态的事件参数。</param>
+        /// <remarks>计算新的选择边界、将其应用到所选墨迹并刷新选择显示；将事件标记为已处理。</remarks>
+        private void SelectionHandle_TouchMove(object sender, TouchEventArgs e)
+        {
+            if (!isResizing || !(sender is Rectangle handle)) return;
+
+            var touchPoint = e.GetTouchPoint(inkCanvas);
+            var currentPoint = touchPoint.Position;
+            var delta = new Point(currentPoint.X - resizeStartPoint.X, currentPoint.Y - resizeStartPoint.Y);
+
+            var newBounds = CalculateNewBounds(originalSelectionBounds, delta, currentResizeHandle);
+
+            // 应用新的边界到选中的墨迹
+            ApplyBoundsToStrokes(newBounds);
+
+            // 更新选择框显示
+            UpdateSelectionDisplay();
+
+            e.Handled = true;
+        }
+
+        /// <summary>
+        /// 结束触摸对选择框调整大小的交互，重置调整状态并标记事件已处理。
+        /// </summary>
+        /// <param name="sender">触发事件的调整句柄（Rectangle）。</param>
+        /// <param name="e">触摸事件数据；方法会将其标记为已处理。</param>
+        private void SelectionHandle_TouchUp(object sender, TouchEventArgs e)
+        {
+            if (sender is Rectangle handle)
+            {
+                isResizing = false;
+                currentResizeHandle = "";
+                e.Handled = true;
+            }
+        }
+
+        /// <summary>
+        /// 根据指定的拖动增量和所操作的调整柄，计算并返回调整后的边界矩形。
+        /// </summary>
+        /// <param name="originalBounds">调整前的原始边界矩形。</param>
+        /// <param name="delta">从初始位置到当前拖动位置的偏移量，用于更新对应边或角的位置和尺寸。</param>
+        /// <param name="handleName">被拖动的调整柄的名称，支持的值：`TopLeftHandle`、`TopRightHandle`、`BottomLeftHandle`、`BottomRightHandle`、`TopHandle`、`BottomHandle`、`LeftHandle`、`RightHandle`。</param>
+        /// <returns>应用偏移并强制最小宽高限制（10×10）后的新的边界矩形。</returns>
         private Rect CalculateNewBounds(Rect originalBounds, Point delta, string handleName)
         {
             var newBounds = originalBounds;
@@ -909,6 +1220,15 @@ namespace Ink_Canvas
             return newBounds;
         }
 
+        /// <summary>
+        /// 应用新的边界到选中的墨迹
+        /// </summary>
+        /// <param name="newBounds">新的边界矩形</param>
+        /// <remarks>
+        /// 计算缩放比例和平移量
+        /// 创建变换矩阵
+        /// 应用变换到选中的墨迹
+        /// </remarks>
         private void ApplyBoundsToStrokes(Rect newBounds)
         {
             var selectedStrokes = inkCanvas.GetSelectedStrokes();
@@ -939,4 +1259,3 @@ namespace Ink_Canvas
         #endregion
     }
 }
-

Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs

@@ -1,8 +1,10 @@
 using Hardcodet.Wpf.TaskbarNotification;
 using Ink_Canvas.Helpers;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using OSVersionExtension;
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
@@ -19,7 +21,21 @@ namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
-        private void LoadSettings(bool isStartup = false)
+        /// <summary>
+        /// 从配置文件加载用户设置并将其应用到主窗口和相关控件的状态（包括启动、外观、画布、手势、PPT、自动化等各项配置）。
+        /// </summary>
+        /// <param name="isStartup">指示当前为应用启动阶段；为 true 时按启动流程应用启动相关设置（例如触发启动专用动作和启动时的行为）。</param>
+        /// <summary>
+        /// 从当前配置文件重新加载设置并应用到界面（热重载），不触发启动逻辑与自动更新检查。
+        /// 用于配置文件切换后立即生效。
+        /// </summary>
+        public void ReloadSettingsFromFile()
+        {
+            LoadSettings(false, skipAutoUpdateCheck: true);
+        }
+
+        /// <param name="skipAutoUpdateCheck">指示是否跳过自动更新检查；为 true 时不会在加载设置后执行自动更新检测。</param>
+        private void LoadSettings(bool isStartup = false, bool skipAutoUpdateCheck = false)
         {
             AppVersionTextBlock.Text = Assembly.GetExecutingAssembly().GetName().Version.ToString();
             try
@@ -31,6 +47,11 @@ namespace Ink_Canvas
                         string text = File.ReadAllText(App.RootPath + settingsFileName);
                         Settings = JsonConvert.DeserializeObject<Settings>(text);
 
+                        if (Settings != null)
+                        {
+                            CleanupObsoleteSettings(text);
+                        }
+
                         // 验证设置是否成功加载
                         if (Settings == null)
                         {
@@ -42,6 +63,8 @@ namespace Ink_Canvas
                                 Settings = JsonConvert.DeserializeObject<Settings>(text);
                                 if (Settings != null)
                                 {
+                                    // 清理过期配置项
+                                    CleanupObsoleteSettings(text);
                                 }
                             }
 
@@ -67,6 +90,8 @@ namespace Ink_Canvas
                                 Settings = JsonConvert.DeserializeObject<Settings>(text);
                                 if (Settings != null)
                                 {
+                                    // 清理过期配置项
+                                    CleanupObsoleteSettings(text);
                                 }
                             }
                             catch (Exception restoreEx)
@@ -95,6 +120,8 @@ namespace Ink_Canvas
                             Settings = JsonConvert.DeserializeObject<Settings>(text);
                             if (Settings != null)
                             {
+                                // 清理过期配置项
+                                CleanupObsoleteSettings(text);
                             }
                         }
                         catch (Exception restoreEx)
@@ -123,12 +150,72 @@ namespace Ink_Canvas
                 LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
             }
 
+            try
+            {
+                if (Settings?.Appearance != null)
+                {
+                    var preferredLanguage = Settings.Appearance.Language ?? string.Empty;
+                    if (!string.IsNullOrWhiteSpace(preferredLanguage))
+                    {
+                        LocalizationHelper.TrySetCulture(preferredLanguage);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"从配置应用界面语言失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+
+            try
+            {
+                ProcessProtectionManager.ApplyFromSettings();
+            }
+            catch
+            {
+            }
+
             // Startup
             if (isStartup)
             {
                 CursorIcon_Click(null, null);
             }
 
+            try
+            {
+                if (Settings?.Startup != null)
+                {
+                    if (ComboBoxTelemetryUploadLevel != null)
+                    {
+                        int idx = 0;
+                        switch (Settings.Startup.TelemetryUploadLevel)
+                        {
+                            case TelemetryUploadLevel.None:
+                                idx = 0;
+                                break;
+                            case TelemetryUploadLevel.Basic:
+                                idx = 1;
+                                break;
+                            case TelemetryUploadLevel.Extended:
+                                idx = 2;
+                                break;
+                            default:
+                                idx = 0;
+                                break;
+                        }
+
+                        ComboBoxTelemetryUploadLevel.SelectedIndex = idx;
+                    }
+
+                    if (CheckBoxTelemetryPrivacyAccepted != null)
+                    {
+                        CheckBoxTelemetryPrivacyAccepted.IsChecked = Settings.Startup.HasAcceptedTelemetryPrivacy;
+                    }
+                }
+            }
+            catch
+            {
+            }
+
             try
             {
                 if (File.Exists(Environment.GetFolderPath(Environment.SpecialFolder.Startup) +
@@ -180,7 +267,7 @@ namespace Ink_Canvas
                 ToggleSwitchIsAutoUpdate.IsOn = Settings.Startup.IsAutoUpdate;
 
                 // 只有在启用了自动更新功能时才检查更新
-                if (Settings.Startup.IsAutoUpdate)
+                if (Settings.Startup.IsAutoUpdate && !skipAutoUpdateCheck)
                 {
                     if (isStartup)
                     {
@@ -195,7 +282,7 @@ namespace Ink_Canvas
                     }
                 }
 
-                // ToggleSwitchIsAutoUpdateWithSilence.Visibility = Settings.Startup.IsAutoUpdate ? Visibility.Visible : Visibility.Collapsed;
+                ToggleSwitchIsAutoUpdateWithSilence.Visibility = Settings.Startup.IsAutoUpdate ? Visibility.Visible : Visibility.Collapsed;
                 if (Settings.Startup.IsAutoUpdateWithSilence)
                 {
                     ToggleSwitchIsAutoUpdateWithSilence.IsOn = true;
@@ -214,6 +301,29 @@ namespace Ink_Canvas
                     }
                 }
 
+                // 初始化更新包架构
+                if (UpdatePackageArchitectureSelector != null)
+                {
+                    _isChangingUpdatePackageArchInternally = true;
+                    try
+                    {
+                        string wantTag = Settings.Startup.UpdatePackageArchitecture == UpdatePackageArchitecture.X64 ? "X64" : "X86";
+                        foreach (var item in UpdatePackageArchitectureSelector.Items)
+                        {
+                            if (item is RadioButton rb && rb.Tag != null &&
+                                string.Equals(rb.Tag.ToString(), wantTag, StringComparison.OrdinalIgnoreCase))
+                            {
+                                rb.IsChecked = true;
+                                break;
+                            }
+                        }
+                    }
+                    finally
+                    {
+                        _isChangingUpdatePackageArchInternally = false;
+                    }
+                }
+
                 AutoUpdateTimePeriodBlock.Visibility = Settings.Startup.IsAutoUpdateWithSilence
                     ? Visibility.Visible
                     : Visibility.Collapsed;
@@ -330,7 +440,26 @@ namespace Ink_Canvas
                 // 设置主题下拉框
                 ComboBoxTheme.SelectedIndex = Settings.Appearance.Theme;
 
-                ComboBoxChickenSoupSource.SelectedIndex = Settings.Appearance.ChickenSoupSource;
+                _suppressChickenSoupSourceSelectionChanged = true;
+                try
+                {
+                    ComboBoxChickenSoupSource.SelectedIndex = Settings.Appearance.ChickenSoupSource;
+                }
+                finally
+                {
+                    Dispatcher.BeginInvoke(
+                        (Action)(() => { _suppressChickenSoupSourceSelectionChanged = false; }),
+                        DispatcherPriority.ContextIdle);
+                }
+
+                // 初始化自定义按钮的可见性（仅在选择API时显示）
+                if (BtnHitokotoCustomize != null)
+                {
+                    BtnHitokotoCustomize.Visibility = Settings.Appearance.ChickenSoupSource == 3
+                        ? Visibility.Visible
+                        : Visibility.Collapsed;
+                }
+
 
                 ToggleSwitchEnableQuickPanel.IsOn = Settings.Appearance.IsShowQuickPanel;
 
@@ -456,6 +585,11 @@ namespace Ink_Canvas
 
                 ToggleSwitchShowCanvasAtNewSlideShow.IsOn = Settings.PowerPointSettings.IsShowCanvasAtNewSlideShow;
 
+                if (ToggleSwitchUseRotPptLink != null)
+                {
+                    ToggleSwitchUseRotPptLink.IsOn = Settings.PowerPointSettings.UseRotPptLink;
+                }
+
                 ToggleSwitchEnableTwoFingerGestureInPresentationMode.IsOn =
                     Settings.PowerPointSettings.IsEnableTwoFingerGestureInPresentationMode;
 
@@ -467,6 +601,25 @@ namespace Ink_Canvas
 
                 ToggleSwitchNotifyPreviousPage.IsOn = Settings.PowerPointSettings.IsNotifyPreviousPage;
 
+                // PPT时间显示胶囊设置
+                if (ToggleSwitchEnablePPTTimeCapsule != null)
+                {
+                    ToggleSwitchEnablePPTTimeCapsule.IsOn = Settings.PowerPointSettings.EnablePPTTimeCapsule;
+                }
+                if (ComboBoxPPTTimeCapsulePosition != null)
+                {
+                    int position = Settings.PowerPointSettings.PPTTimeCapsulePosition;
+                    if (position < 0 || position > 2)
+                    {
+                        position = 1; // 默认右上角
+                    }
+                    ComboBoxPPTTimeCapsulePosition.SelectedIndex = position;
+                }
+                if (ToggleSwitchShowPPTSidebarByDefault != null)
+                {
+                    ToggleSwitchShowPPTSidebarByDefault.IsOn = Settings.PowerPointSettings.ShowPPTSidebarByDefault;
+                }
+
                 // -- new --
                 ToggleSwitchShowPPTButton.IsOn = Settings.PowerPointSettings.ShowPPTButton;
 
@@ -540,6 +693,38 @@ namespace Ink_Canvas
 
                 PPTButtonRBPositionValueSlider.Value = Settings.PowerPointSettings.PPTRBButtonPosition;
 
+                // 初始化PPT翻页按钮透明度滑块值，根据半透明选项设置默认值
+                // 重用之前定义的sopsc和bopsc变量
+                bool isSideHalfOpacity = sopsc.Length >= 2 && sopsc[1] == '2';
+                // 如果透明度为0或未设置，根据半透明选项设置默认值
+                if (Settings.PowerPointSettings.PPTLSButtonOpacity == 0.0 ||
+                    (Settings.PowerPointSettings.PPTLSButtonOpacity == 1.0 && isSideHalfOpacity))
+                {
+                    Settings.PowerPointSettings.PPTLSButtonOpacity = isSideHalfOpacity ? 0.5 : 1.0;
+                }
+                if (Settings.PowerPointSettings.PPTRSButtonOpacity == 0.0 ||
+                    (Settings.PowerPointSettings.PPTRSButtonOpacity == 1.0 && isSideHalfOpacity))
+                {
+                    Settings.PowerPointSettings.PPTRSButtonOpacity = isSideHalfOpacity ? 0.5 : 1.0;
+                }
+                PPTLSButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTLSButtonOpacity;
+                PPTRSButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTRSButtonOpacity;
+
+                bool isBottomHalfOpacity = bopsc.Length >= 2 && bopsc[1] == '2';
+                // 如果透明度为0或未设置，根据半透明选项设置默认值
+                if (Settings.PowerPointSettings.PPTLBButtonOpacity == 0.0 ||
+                    (Settings.PowerPointSettings.PPTLBButtonOpacity == 1.0 && isBottomHalfOpacity))
+                {
+                    Settings.PowerPointSettings.PPTLBButtonOpacity = isBottomHalfOpacity ? 0.5 : 1.0;
+                }
+                if (Settings.PowerPointSettings.PPTRBButtonOpacity == 0.0 ||
+                    (Settings.PowerPointSettings.PPTRBButtonOpacity == 1.0 && isBottomHalfOpacity))
+                {
+                    Settings.PowerPointSettings.PPTRBButtonOpacity = isBottomHalfOpacity ? 0.5 : 1.0;
+                }
+                PPTLBButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTLBButtonOpacity;
+                PPTRBButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTRBButtonOpacity;
+
                 UpdatePPTBtnSlidersStatus();
 
                 UpdatePPTBtnPreview();
@@ -552,6 +737,8 @@ namespace Ink_Canvas
 
                 ToggleSwitchSupportWPS.IsOn = Settings.PowerPointSettings.IsSupportWPS;
 
+                ToggleSwitchSkipAnimationsWhenGoNext.IsOn = Settings.PowerPointSettings.SkipAnimationsWhenGoNext;
+
                 ToggleSwitchPowerPointEnhancement.IsOn = Settings.PowerPointSettings.EnablePowerPointEnhancement;
 
                 ToggleSwitchAutoSaveScreenShotInPowerPoint.IsOn =
@@ -619,6 +806,15 @@ namespace Ink_Canvas
                 InkWidthSlider.Value = Settings.Canvas.InkWidth * 2;
                 HighlighterWidthSlider.Value = Settings.Canvas.HighlighterWidth;
 
+                int alpha = (int)Settings.Canvas.InkAlpha;
+                if (alpha < 0) alpha = 0; if (alpha > 255) alpha = 255;
+                var inkColor = drawingAttributes.Color;
+                drawingAttributes.Color = Color.FromArgb((byte)alpha, inkColor.R, inkColor.G, inkColor.B);
+                inkCanvas.DefaultDrawingAttributes.Color = drawingAttributes.Color;
+                if (InkAlphaSlider != null) InkAlphaSlider.Value = alpha;
+                if (BoardInkAlphaSlider != null) BoardInkAlphaSlider.Value = alpha;
+
+
                 ComboBoxHyperbolaAsymptoteOption.SelectedIndex = (int)Settings.Canvas.HyperbolaAsymptoteOption;
 
                 if (Settings.Canvas.UsingWhiteboard)
@@ -656,8 +852,21 @@ namespace Ink_Canvas
                 ToggleSwitchDisablePressure.IsOn = Settings.Canvas.DisablePressure;
                 inkCanvas.DefaultDrawingAttributes.IgnorePressure = Settings.Canvas.DisablePressure;
 
-                ComboBoxPenStyle.SelectedIndex = Settings.Canvas.InkStyle;
-                BoardComboBoxPenStyle.SelectedIndex = Settings.Canvas.InkStyle;
+                ToggleSwitchLaunchSeewoVideoShowcaseForWhiteboardBooth.IsOn =
+                    Settings.Canvas.LaunchSeewoVideoShowcaseForWhiteboardBooth;
+
+                if (Settings.Canvas.EnableVelocityBrushTip)
+                {
+                    Settings.Canvas.InkStyle = 3;
+                    Settings.Canvas.EnableVelocityBrushTip = false;
+                }
+
+                if (Settings.Canvas.InkStyle < 0 || Settings.Canvas.InkStyle > 3)
+                    Settings.Canvas.InkStyle = 0;
+
+                int penStyleUi = PenStyleUiIndexFromInkStyle(Settings.Canvas.InkStyle);
+                ComboBoxPenStyle.SelectedIndex = penStyleUi;
+                BoardComboBoxPenStyle.SelectedIndex = penStyleUi;
 
                 ComboBoxEraserSize.SelectedIndex = Settings.Canvas.EraserSize;
                 ComboBoxEraserSizeFloatingBar.SelectedIndex = Settings.Canvas.EraserSize;
@@ -797,6 +1006,7 @@ namespace Ink_Canvas
                 ToggleSwitchIsSecondConfimeWhenShutdownApp.IsOn = Settings.Advanced.IsSecondConfirmWhenShutdownApp;
                 ToggleSwitchWindowMode.IsOn = Settings.Advanced.WindowMode;
                 ToggleSwitchIsSpecialScreen.IsOn = Settings.Advanced.IsSpecialScreen;
+                ToggleSwitchIsEnableUriScheme.IsOn = Settings.Advanced.IsEnableUriScheme;
                 ToggleSwitchIsQuadIR.IsOn = Settings.Advanced.IsQuadIR;
                 ToggleSwitchEraserBindTouchMultiplier.IsOn = Settings.Advanced.EraserBindTouchMultiplier;
                 ToggleSwitchIsEnableFullScreenHelper.IsOn = Settings.Advanced.IsEnableFullScreenHelper;
@@ -851,6 +1061,17 @@ namespace Ink_Canvas
             {
                 ToggleSwitchEnableInkToShape.IsOn = Settings.InkToShape.IsInkToShapeEnabled;
 
+                if (ComboBoxShapeRecognitionEngine != null)
+                {
+                    int eng = Settings.InkToShape.ShapeRecognitionEngine;
+                    if (eng < 0 || eng > 2) eng = 0;
+                    ComboBoxShapeRecognitionEngine.SelectedIndex = eng;
+                }
+
+                if (ToggleSwitchEnableWinRtHandwritingStrokeBeautify != null)
+                    ToggleSwitchEnableWinRtHandwritingStrokeBeautify.IsOn =
+                        Settings.InkToShape.EnableWinRtHandwritingStrokeBeautify;
+
                 ToggleSwitchEnableInkToShapeNoFakePressureRectangle.IsOn =
                     Settings.InkToShape.IsInkToShapeNoFakePressureRectangle;
 
@@ -887,20 +1108,20 @@ namespace Ink_Canvas
                 ToggleSwitchUseLegacyTimerUI.IsOn = Settings.RandSettings.UseLegacyTimerUI;
                 ToggleSwitchUseNewStyleUI.IsOn = Settings.RandSettings.UseNewStyleUI;
                 ToggleSwitchEnableOvertimeCountUp.IsOn = Settings.RandSettings.EnableOvertimeCountUp;
-                
+
                 // 新点名UI设置
                 ToggleSwitchUseNewRollCallUI.IsOn = Settings.RandSettings.UseNewRollCallUI;
                 ToggleSwitchEnableMLAvoidance.IsOn = Settings.RandSettings.EnableMLAvoidance;
                 MLAvoidanceHistorySlider.Value = Settings.RandSettings.MLAvoidanceHistoryCount;
                 MLAvoidanceWeightSlider.Value = Settings.RandSettings.MLAvoidanceWeight;
-                
+
                 bool canEnableRedText = Settings.RandSettings.EnableOvertimeCountUp && Settings.RandSettings.EnableOvertimeRedText;
                 ToggleSwitchEnableOvertimeRedText.IsOn = canEnableRedText;
                 if (!canEnableRedText)
                 {
                     Settings.RandSettings.EnableOvertimeRedText = false;
                 }
-                
+
                 TimerVolumeSlider.Value = Settings.RandSettings.TimerVolume;
 
                 // 渐进提醒设置
@@ -929,16 +1150,16 @@ namespace Ink_Canvas
                 ToggleSwitchUseLegacyTimerUI.IsOn = Settings.RandSettings.UseLegacyTimerUI;
                 ToggleSwitchUseNewStyleUI.IsOn = Settings.RandSettings.UseNewStyleUI;
                 ToggleSwitchEnableOvertimeCountUp.IsOn = Settings.RandSettings.EnableOvertimeCountUp;
-                
+
                 bool canEnableRedText = Settings.RandSettings.EnableOvertimeCountUp && Settings.RandSettings.EnableOvertimeRedText;
                 ToggleSwitchEnableOvertimeRedText.IsOn = canEnableRedText;
                 if (!canEnableRedText)
                 {
                     Settings.RandSettings.EnableOvertimeRedText = false;
                 }
-                
+
                 TimerVolumeSlider.Value = Settings.RandSettings.TimerVolume;
-                
+
                 // 渐进提醒设置
                 ToggleSwitchEnableProgressiveReminder.IsOn = Settings.RandSettings.EnableProgressiveReminder;
                 ProgressiveReminderVolumeSlider.Value = Settings.RandSettings.ProgressiveReminderVolume;
@@ -1054,6 +1275,8 @@ namespace Ink_Canvas
 
                 ToggleSwitchSaveFullPageStrokes.IsOn = Settings.Automation.IsSaveFullPageStrokes;
 
+                ToggleSwitchSaveStrokesAsXML.IsOn = Settings.Automation.IsSaveStrokesAsXML;
+
                 // 加载定时保存墨迹设置
                 ToggleSwitchEnableAutoSaveStrokes.IsOn = Settings.Automation.IsEnableAutoSaveStrokes;
                 // 初始化保存间隔下拉框
@@ -1101,6 +1324,105 @@ namespace Ink_Canvas
 
             // 加载墨迹渐隐设置
             LoadInkFadeSettings();
+
+            // 加载画笔自动恢复设置
+            LoadBrushAutoRestoreSettings();
+
+            // 刷新配置文件列表
+            try { RefreshConfigProfileList(); } catch (Exception ex) { LogHelper.WriteLogToFile($"刷新配置文件列表失败: {ex.Message}", LogHelper.LogType.Warning); }
+        }
+
+        /// <summary>
+        /// 将画笔自动恢复相关的设置应用到界面控件并在启用时初始化自动恢复定时器。
+        /// </summary>
+        /// <remarks>
+        /// 会将 Settings.Canvas 中的 BrushAutoRestore 配置同步到对应的切换开关、时间文本框、颜色下拉框、宽度和透明度滑块；当颜色缺失时会使用默认值 `#FFFF0000`，当宽度无效时使用默认值 `5`。若功能被启用，会初始化并启动定时器以执行自动恢复任务。方法执行过程中会记录加载结果或错误信息到日志。
+        /// </remarks>
+        private void LoadBrushAutoRestoreSettings()
+        {
+            try
+            {
+                // 同步设置面板中的开关状态
+                if (ToggleSwitchBrushAutoRestore != null)
+                {
+                    ToggleSwitchBrushAutoRestore.IsOn = Settings.Canvas.EnableBrushAutoRestore;
+                }
+
+                // 同步时间点输入框
+                if (BrushAutoRestoreTimesTextBox != null)
+                {
+                    BrushAutoRestoreTimesTextBox.Text = Settings.Canvas.BrushAutoRestoreTimes ?? string.Empty;
+                }
+
+                // 同步颜色下拉框
+                if (ComboBoxBrushAutoRestoreColor != null)
+                {
+                    if (string.IsNullOrWhiteSpace(Settings.Canvas.BrushAutoRestoreColor))
+                    {
+                        Settings.Canvas.BrushAutoRestoreColor = "#FFFF0000";
+                    }
+
+                    bool found = false;
+                    foreach (ComboBoxItem item in ComboBoxBrushAutoRestoreColor.Items)
+                    {
+                        if (item.Tag != null && item.Tag.ToString() == Settings.Canvas.BrushAutoRestoreColor)
+                        {
+                            ComboBoxBrushAutoRestoreColor.SelectionChanged -= ComboBoxBrushAutoRestoreColor_SelectionChanged;
+                            try
+                            {
+                                ComboBoxBrushAutoRestoreColor.SelectedItem = item;
+                            }
+                            finally
+                            {
+                                ComboBoxBrushAutoRestoreColor.SelectionChanged += ComboBoxBrushAutoRestoreColor_SelectionChanged;
+                            }
+                            found = true;
+                            break;
+                        }
+                    }
+
+                    if (!found && ComboBoxBrushAutoRestoreColor.Items.Count > 0)
+                    {
+                        ComboBoxBrushAutoRestoreColor.SelectionChanged -= ComboBoxBrushAutoRestoreColor_SelectionChanged;
+                        try
+                        {
+                            ComboBoxBrushAutoRestoreColor.SelectedIndex = 0;
+                            Settings.Canvas.BrushAutoRestoreColor = "#FFFF0000";
+                        }
+                        finally
+                        {
+                            ComboBoxBrushAutoRestoreColor.SelectionChanged += ComboBoxBrushAutoRestoreColor_SelectionChanged;
+                        }
+                    }
+                }
+
+                // 同步粗细滑块
+                if (BrushAutoRestoreWidthSlider != null)
+                {
+                    BrushAutoRestoreWidthSlider.Value = Settings.Canvas.BrushAutoRestoreWidth > 0
+                        ? Settings.Canvas.BrushAutoRestoreWidth
+                        : 5;
+                }
+
+                // 同步透明度滑块
+                if (BrushAutoRestoreAlphaSlider != null)
+                {
+                    BrushAutoRestoreAlphaSlider.Value = Settings.Canvas.BrushAutoRestoreAlpha;
+                }
+
+                // 如果功能已启用，初始化并启动定时器
+                if (Settings.Canvas.EnableBrushAutoRestore)
+                {
+                    InitBrushAutoRestoreTimer();
+                    ScheduleBrushAutoRestore();
+                }
+
+                LogHelper.WriteLogToFile("画笔自动恢复设置已加载", LogHelper.LogType.Event);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"加载画笔自动恢复设置时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
         }
 
         /// <summary>
@@ -1143,6 +1465,15 @@ namespace Ink_Canvas
                     _inkFadeManager.UpdateFadeTime(Settings.Canvas.InkFadeTime);
                 }
 
+                // 同步在笔工具菜单中隐藏墨迹渐隐控制开关的设置
+                if (ToggleSwitchHideInkFadeControlInPenMenu != null)
+                {
+                    ToggleSwitchHideInkFadeControlInPenMenu.IsOn = Settings.Canvas.HideInkFadeControlInPenMenu;
+                }
+
+                // 根据设置更新墨迹渐隐控制开关的可见性
+                UpdateInkFadeControlVisibility();
+
                 LogHelper.WriteLogToFile("墨迹渐隐设置已加载", LogHelper.LogType.Event);
             }
             catch (Exception ex)
@@ -1150,5 +1481,134 @@ namespace Ink_Canvas
                 LogHelper.WriteLogToFile($"加载墨迹渐隐设置时出错: {ex.Message}", LogHelper.LogType.Error);
             }
         }
+
+        /// <summary>
+        /// 清理配置文件中的过期设置
+        /// </summary>
+        /// <param name="userConfigJson">用户配置的JSON字符串</param>
+        /// <remarks>
+        /// 清理过期设置时：
+        /// 1. 创建默认配置对象
+        /// 2. 将默认配置和用户配置都序列化为JObject
+        /// 3. 递归比较并删除用户配置中多余的键
+        /// 4. 如果有清理操作，重新反序列化并保存
+        /// 5. 记录清理结果到日志
+        /// </remarks>
+        private void CleanupObsoleteSettings(string userConfigJson)
+        {
+            try
+            {
+                // 创建默认配置对象
+                Settings defaultSettings = new Settings();
+
+                // 将默认配置和用户配置都序列化为JObject
+                JObject defaultConfigObj = JObject.FromObject(defaultSettings);               EnsureDefaultConfigSchemaIncludesIgnoredNullKeys(defaultConfigObj);
+                JObject userConfigObj = JObject.Parse(userConfigJson);
+
+                // 记录是否有清理操作
+                bool hasChanges = false;
+
+                // 递归比较并删除用户配置中多余的键
+                RemoveObsoleteProperties(userConfigObj, defaultConfigObj, ref hasChanges);
+
+                // 如果有清理操作，重新反序列化并保存
+                if (hasChanges)
+                {
+                    string cleanedJson = userConfigObj.ToString(Formatting.Indented);
+                    Settings = JsonConvert.DeserializeObject<Settings>(cleanedJson);
+                    SaveSettingsToFile();
+                    LogHelper.WriteLogToFile("已清理过期配置项", LogHelper.LogType.Event);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"清理过期配置时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 递归删除用户配置中多余的属性
+        /// </summary>
+        /// <param name="userObj">用户配置的JObject</param>
+        /// <param name="defaultObj">默认配置的JObject</param>
+        /// <param name="hasChanges">是否有变更的引用标志</param>
+        /// <remarks>
+        /// 递归删除多余属性时：
+        /// 1. 检查用户配置和默认配置是否为空
+        /// 2. 获取需要删除的键列表
+        /// 3. 遍历用户配置的所有属性
+        /// 4. 如果默认配置中不存在该属性，标记为删除
+        /// 5. 如果两个属性都是对象类型，递归比较
+        /// 6. 处理数组中的对象（如自定义图标列表等）
+        /// 7. 删除标记的键
+        /// 8. 设置变更标志
+        /// </remarks>
+        private static void EnsureDefaultConfigSchemaIncludesIgnoredNullKeys(JObject defaultConfigObj)
+        {
+            if (defaultConfigObj == null) return;
+            if (defaultConfigObj["appearance"] is JObject appearance && !appearance.ContainsKey("hitokotoCategories"))
+                appearance["hitokotoCategories"] = JValue.CreateNull();
+        }
+
+        private void RemoveObsoleteProperties(JObject userObj, JObject defaultObj, ref bool hasChanges)
+        {
+            if (userObj == null || defaultObj == null)
+                return;
+
+            // 获取需要删除的键列表（避免在遍历时修改集合）
+            List<string> keysToRemove = new List<string>();
+
+            foreach (var property in userObj.Properties())
+            {
+                string propertyName = property.Name;
+
+                // 如果默认配置中不存在该属性，标记为删除
+                if (!defaultObj.ContainsKey(propertyName))
+                {
+                    keysToRemove.Add(propertyName);
+                    continue;
+                }
+
+                // 如果两个属性都是对象类型，递归比较
+                JToken userValue = property.Value;
+                JToken defaultValue = defaultObj[propertyName];
+
+                if (userValue != null && defaultValue != null)
+                {
+                    if (userValue.Type == JTokenType.Object && defaultValue.Type == JTokenType.Object)
+                    {
+                        RemoveObsoleteProperties(userValue as JObject, defaultValue as JObject, ref hasChanges);
+                    }
+                    // 处理数组中的对象（如自定义图标列表等）
+                    else if (userValue.Type == JTokenType.Array && defaultValue.Type == JTokenType.Array)
+                    {
+                        JArray userArray = userValue as JArray;
+                        JArray defaultArray = defaultValue as JArray;
+
+                        if (userArray != null && defaultArray != null && userArray.Count > 0 && defaultArray.Count > 0)
+                        {
+                            // 如果数组元素是对象，比较第一个元素的属性结构
+                            if (userArray[0].Type == JTokenType.Object && defaultArray[0].Type == JTokenType.Object)
+                            {
+                                for (int i = 0; i < userArray.Count; i++)
+                                {
+                                    if (userArray[i] is JObject userItemObj && defaultArray[0] is JObject defaultItemObj)
+                                    {
+                                        RemoveObsoleteProperties(userItemObj, defaultItemObj, ref hasChanges);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            // 删除标记的键
+            foreach (string key in keysToRemove)
+            {
+                userObj.Remove(key);
+                hasChanges = true;
+            }
+        }
     }
-}
+}

Ink Canvas/MainWindow_cs/MW_TimeMachine.cs

@@ -1,4 +1,4 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -12,29 +12,70 @@ namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
+        /// <summary>
+        /// 提交原因枚举，用于标识不同类型的操作
+        /// </summary>
         private enum CommitReason
         {
+            /// <summary>用户输入操作</summary>
             UserInput,
+            /// <summary>代码输入操作</summary>
             CodeInput,
+            /// <summary>形状绘制操作</summary>
             ShapeDrawing,
+            /// <summary>形状识别操作</summary>
             ShapeRecognition,
+            /// <summary>清除画布操作</summary>
             ClearingCanvas,
+            /// <summary>笔画操作操作</summary>
             Manipulation
         }
 
+        /// <summary>
+        /// 当前提交类型
+        /// </summary>
         private CommitReason _currentCommitType = CommitReason.UserInput;
+
+        /// <summary>
+        /// 是否为点橡皮擦模式
+        /// </summary>
         private bool IsEraseByPoint => inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint;
+
+        /// <summary>
+        /// 替换的笔画集合
+        /// </summary>
         private StrokeCollection ReplacedStroke;
+
+        /// <summary>
+        /// 添加的笔画集合
+        /// </summary>
         private StrokeCollection AddedStroke;
+
+        /// <summary>
+        /// 长方体笔画集合
+        /// </summary>
         private StrokeCollection CuboidStrokeCollection;
+
+        /// <summary>
+        /// 笔画操作历史记录
+        /// </summary>
         private Dictionary<Stroke, Tuple<StylusPointCollection, StylusPointCollection>> StrokeManipulationHistory;
 
+        /// <summary>
+        /// 笔画初始状态历史记录
+        /// </summary>
         private Dictionary<Stroke, StylusPointCollection> StrokeInitialHistory =
             new Dictionary<Stroke, StylusPointCollection>();
 
+        /// <summary>
+        /// 绘制属性历史记录
+        /// </summary>
         private Dictionary<Stroke, Tuple<DrawingAttributes, DrawingAttributes>> DrawingAttributesHistory =
             new Dictionary<Stroke, Tuple<DrawingAttributes, DrawingAttributes>>();
 
+        /// <summary>
+        /// 绘制属性历史记录标志
+        /// </summary>
         private Dictionary<Guid, List<Stroke>> DrawingAttributesHistoryFlag = new Dictionary<Guid, List<Stroke>> {
             { DrawingAttributeIds.Color, new List<Stroke>() },
             { DrawingAttributeIds.DrawingFlags, new List<Stroke>() },
@@ -45,9 +86,27 @@ namespace Ink_Canvas
             { DrawingAttributeIds.StylusWidth, new List<Stroke>() }
         };
 
+        /// <summary>
+        /// 时间机器实例，用于撤销/重做操作
+        /// </summary>
         private TimeMachine timeMachine = new TimeMachine();
 
-        private void ApplyHistoryToCanvas(TimeMachineHistory item, InkCanvas applyCanvas = null)
+        /// <summary>
+        /// 将历史记录应用到画布
+        /// </summary>
+        /// <param name="item">时间机器历史记录项</param>
+        /// <param name="applyCanvas">要应用的画布，默认为null（使用主画布）</param>
+        /// <remarks>
+        /// 根据历史记录类型执行不同的操作：
+        /// 1. UserInput: 处理用户输入的笔画
+        /// 2. ShapeRecognition: 处理形状识别的笔画
+        /// 3. Manipulation: 处理笔画操作
+        /// 4. DrawingAttributes: 处理绘制属性变化
+        /// 5. Clear: 处理清除画布操作
+        /// 6. ElementInsert: 处理元素插入操作
+        /// </remarks>
+        /// <param name="elementsRemovedInThisPage"></param>
+        private void ApplyHistoryToCanvas(TimeMachineHistory item, InkCanvas applyCanvas = null, HashSet<UIElement> elementsRemovedInThisPage = null)
         {
             _currentCommitType = CommitReason.CodeInput;
             var canvas = inkCanvas;
@@ -169,54 +228,42 @@ namespace Ink_Canvas
             }
             else if (item.CommitType == TimeMachineHistoryType.ElementInsert)
             {
-                // 使用传入的canvas参数，而不是总是使用inkCanvas
                 var targetCanvas = canvas ?? inkCanvas;
 
                 if (item.StrokeHasBeenCleared)
                 {
-                    // Undo: 移除元素
+                    if (elementsRemovedInThisPage != null)
+                        return;
                     if (item.InsertedElement != null && targetCanvas.Children.Contains(item.InsertedElement))
                         targetCanvas.Children.Remove(item.InsertedElement);
                 }
                 else
                 {
-                    // Redo: 添加元素
+                    if (elementsRemovedInThisPage != null && item.InsertedElement != null && elementsRemovedInThisPage.Contains(item.InsertedElement))
+                        return;
                     if (item.InsertedElement != null && !targetCanvas.Children.Contains(item.InsertedElement))
                     {
                         targetCanvas.Children.Add(item.InsertedElement);
 
-                        // 重新绑定事件处理器（仅对主画布）
-                        if (targetCanvas == inkCanvas)
+                        if (targetCanvas != inkCanvas)
                         {
                             if (item.InsertedElement is Image img)
                             {
-                                // 检查图片是否有位置信息，如果没有则应用居中
                                 double left = InkCanvas.GetLeft(img);
                                 double top = InkCanvas.GetTop(img);
-
                                 if (double.IsNaN(left) || double.IsNaN(top))
                                 {
-                                    // 图片没有位置信息，应用居中
                                     CenterAndScaleElement(img);
                                 }
-
-                                // 重新绑定事件处理器
-                                BindElementEvents(img);
                             }
                             else if (item.InsertedElement is MediaElement media)
                             {
-                                // 检查媒体元素是否有位置信息，如果没有则应用居中
                                 double left = InkCanvas.GetLeft(media);
                                 double top = InkCanvas.GetTop(media);
-
                                 if (double.IsNaN(left) || double.IsNaN(top))
                                 {
-                                    // 媒体元素没有位置信息，应用居中
                                     CenterAndScaleElement(media);
                                 }
-
-                                // 重新绑定事件处理器
-                                BindElementEvents(media);
                             }
                         }
                     }
@@ -226,6 +273,15 @@ namespace Ink_Canvas
             _currentCommitType = CommitReason.UserInput;
         }
 
+        /// <summary>
+        /// 将历史记录应用到新的笔画集合
+        /// </summary>
+        /// <param name="items">时间机器历史记录数组</param>
+        /// <returns>返回应用历史记录后的笔画集合</returns>
+        /// <remarks>
+        /// 创建一个临时画布，应用历史记录，然后返回画布中的笔画集合
+        /// 只处理笔画历史，不处理图片元素历史
+        /// </remarks>
         private StrokeCollection ApplyHistoriesToNewStrokeCollection(TimeMachineHistory[] items)
         {
             InkCanvas fakeInkCanv = new InkCanvas
@@ -251,7 +307,52 @@ namespace Ink_Canvas
             return fakeInkCanv.Strokes;
         }
 
-        // 新增：获取页面的所有图片元素
+        /// <summary>
+        /// 将一页的完整历史扁平化为“仅最终状态”：在临时画布上重放该页历史，再导出为最少条目的新历史（一笔画集合 + 若干元素插入）。
+        /// 用于删除页面前移后，避免移入槽位保留冗长历史导致翻到该页码时卡顿。
+        /// </summary>
+        /// <param name="history">该页的 TimeMachineHistory 数组，可为 null 或空</param>
+        /// <returns>扁平化后的新历史数组；若输入为 null 或空则返回 null</returns>
+        private TimeMachineHistory[] FlattenPageHistory(TimeMachineHistory[] history)
+        {
+            if (history == null || history.Length == 0) return null;
+
+            var removed = CollectRemovedElementsFromHistory(history);
+            var fakeInkCanv = new InkCanvas
+            {
+                Width = inkCanvas.ActualWidth > 0 ? inkCanvas.ActualWidth : 1920,
+                Height = inkCanvas.ActualHeight > 0 ? inkCanvas.ActualHeight : 1080,
+                EditingMode = InkCanvasEditingMode.None,
+            };
+
+            foreach (var item in history)
+                ApplyHistoryToCanvas(item, fakeInkCanv, removed);
+
+            var list = new List<TimeMachineHistory>();
+            if (fakeInkCanv.Strokes.Count > 0)
+                list.Add(new TimeMachineHistory(fakeInkCanv.Strokes.Clone(), TimeMachineHistoryType.UserInput, false));
+            var childrenSnapshot = new List<UIElement>();
+            foreach (UIElement c in fakeInkCanv.Children)
+                childrenSnapshot.Add(c);
+            foreach (UIElement child in childrenSnapshot)
+            {
+                if (child is Image || child is MediaElement)
+                {
+                    list.Add(new TimeMachineHistory(child, TimeMachineHistoryType.ElementInsert));
+                    fakeInkCanv.Children.Remove(child);
+                }
+            }
+            return list.Count == 0 ? null : list.ToArray();
+        }
+
+        /// <summary>
+        /// 获取页面的所有图片元素
+        /// </summary>
+        /// <param name="items">时间机器历史记录数组</param>
+        /// <returns>返回页面的图片元素列表</returns>
+        /// <remarks>
+        /// 遍历历史记录，收集所有插入的图片元素
+        /// </remarks>
         private List<UIElement> GetPageImageElements(TimeMachineHistory[] items)
         {
             var imageElements = new List<UIElement>();
@@ -272,6 +373,13 @@ namespace Ink_Canvas
             return imageElements;
         }
 
+        /// <summary>
+        /// 处理撤销状态变化事件
+        /// </summary>
+        /// <param name="status">撤销状态</param>
+        /// <remarks>
+        /// 根据撤销状态更新撤销按钮的可见性和启用状态
+        /// </remarks>
         private void TimeMachine_OnUndoStateChanged(bool status)
         {
             var result = status ? Visibility.Visible : Visibility.Collapsed;
@@ -279,6 +387,13 @@ namespace Ink_Canvas
             BtnUndo.IsEnabled = status;
         }
 
+        /// <summary>
+        /// 处理重做状态变化事件
+        /// </summary>
+        /// <param name="status">重做状态</param>
+        /// <remarks>
+        /// 根据重做状态更新重做按钮的可见性和启用状态
+        /// </remarks>
         private void TimeMachine_OnRedoStateChanged(bool status)
         {
             var result = status ? Visibility.Visible : Visibility.Collapsed;
@@ -286,6 +401,18 @@ namespace Ink_Canvas
             BtnRedo.IsEnabled = status;
         }
 
+        /// <summary>
+        /// 处理笔画集合变化事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">笔画集合变化事件参数</param>
+        /// <remarks>
+        /// 当笔画集合发生变化时：
+        /// 1. 书写时自动隐藏二级菜单
+        /// 2. 处理移除的笔画：移除事件处理器，从历史记录中移除
+        /// 3. 处理添加的笔画：添加事件处理器，记录初始状态
+        /// 4. 根据不同的提交类型处理历史记录
+        /// </remarks>
         private void StrokesOnStrokesChanged(object sender, StrokeCollectionChangedEventArgs e)
         {
             if (!isHidingSubPanelsWhenInking)
@@ -347,6 +474,14 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理笔画绘制属性变化事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">属性数据变化事件参数</param>
+        /// <remarks>
+        /// 当笔画的绘制属性发生变化时，记录变化历史
+        /// </remarks>
         private void Stroke_DrawingAttributesChanged(object sender, PropertyDataChangedEventArgs e)
         {
             var key = sender as Stroke;
@@ -399,11 +534,31 @@ namespace Ink_Canvas
                 new Tuple<DrawingAttributes, DrawingAttributes>(previousValue, currentValue);
         }
 
+        /// <summary>
+        /// 处理笔画触笔点替换事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">触笔点替换事件参数</param>
+        /// <remarks>
+        /// 当笔画的触笔点被替换时，更新初始状态历史
+        /// </remarks>
         private void Stroke_StylusPointsReplaced(object sender, StylusPointsReplacedEventArgs e)
         {
             StrokeInitialHistory[sender as Stroke] = e.NewStylusPoints.Clone();
         }
 
+        /// <summary>
+        /// 处理笔画触笔点变化事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// 当笔画的触笔点发生变化时：
+        /// 1. 获取选中的笔画数量
+        /// 2. 初始化笔画操作历史记录
+        /// 3. 记录笔画的初始状态和当前状态
+        /// 4. 当所有选中的笔画都已处理时，提交操作历史
+        /// </remarks>
         private void Stroke_StylusPointsChanged(object sender, EventArgs e)
         {
             var selectedStrokes = inkCanvas.GetSelectedStrokes();

Ink Canvas/MainWindow_cs/MW_TouchEvents.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
@@ -17,18 +16,39 @@ namespace Ink_Canvas
     {
         #region Multi-Touch
 
+        /// <summary>
+        /// 是否处于多点触控模式
+        /// </summary>
         private bool isInMultiTouchMode;
+        /// <summary>
+        /// 存储触摸设备ID的列表
+        /// </summary>
         private List<int> dec = new List<int>();
+        /// <summary>
+        /// 是否处于单指拖动模式
+        /// </summary>
         private bool isSingleFingerDragMode;
+        /// <summary>
+        /// 中心点坐标
+        /// </summary>
         private Point centerPoint = new Point(0, 0);
+        /// <summary>
+        /// 上次的InkCanvas编辑模式
+        /// </summary>
         private InkCanvasEditingMode lastInkCanvasEditingMode = InkCanvasEditingMode.Ink;
+        /// <summary>
+        /// 上次触摸按下的时间
+        /// </summary>
         private DateTime lastTouchDownTime = DateTime.MinValue;
+        /// <summary>
+        /// 多点触控延迟时间（毫秒）
+        /// </summary>
         private const double MULTI_TOUCH_DELAY_MS = 100;
-        private bool isMultiTouchTimerActive = false;
 
-        /// </summary> 
+        /// <summary>
         /// 保存画布上的非笔画元素（如图片、媒体元素等）
         /// </summary>
+        /// <returns>返回保存的非笔画元素列表</returns>
         private List<UIElement> PreserveNonStrokeElements()
         {
             var preservedElements = new List<UIElement>();
@@ -96,53 +116,43 @@ namespace Ink_Canvas
                 }
                 else if (originalElement is MediaElement originalMedia)
                 {
-                    var clonedMedia = new MediaElement();
-
-                    // 复制媒体属性
-                    clonedMedia.Source = originalMedia.Source;
-                    clonedMedia.Width = originalMedia.Width;
-                    clonedMedia.Height = originalMedia.Height;
-                    clonedMedia.Name = originalMedia.Name;
-                    clonedMedia.IsHitTestVisible = originalMedia.IsHitTestVisible;
-                    clonedMedia.Focusable = originalMedia.Focusable;
+                    var clonedMedia = new MediaElement
+                    {
+                        Source = originalMedia.Source,
+                        Width = originalMedia.Width,
+                        Height = originalMedia.Height,
+                        Name = originalMedia.Name,
+                        IsHitTestVisible = originalMedia.IsHitTestVisible,
+                        Focusable = originalMedia.Focusable,
+                        RenderTransform = originalMedia.RenderTransform?.Clone()
+                    };
 
                     // 复制位置
                     InkCanvas.SetLeft(clonedMedia, InkCanvas.GetLeft(originalMedia));
                     InkCanvas.SetTop(clonedMedia, InkCanvas.GetTop(originalMedia));
 
-                    // 复制变换
-                    if (originalMedia.RenderTransform != null)
-                    {
-                        clonedMedia.RenderTransform = originalMedia.RenderTransform.Clone();
-                    }
-
                     return clonedMedia;
                 }
                 else if (originalElement is Border originalBorder)
                 {
-                    var clonedBorder = new Border();
-
-                    // 复制边框属性
-                    clonedBorder.Width = originalBorder.Width;
-                    clonedBorder.Height = originalBorder.Height;
-                    clonedBorder.Name = originalBorder.Name;
-                    clonedBorder.IsHitTestVisible = originalBorder.IsHitTestVisible;
-                    clonedBorder.Focusable = originalBorder.Focusable;
-                    clonedBorder.Background = originalBorder.Background;
-                    clonedBorder.BorderBrush = originalBorder.BorderBrush;
-                    clonedBorder.BorderThickness = originalBorder.BorderThickness;
-                    clonedBorder.CornerRadius = originalBorder.CornerRadius;
+                    var clonedBorder = new Border
+                    {
+                        Width = originalBorder.Width,
+                        Height = originalBorder.Height,
+                        Name = originalBorder.Name,
+                        IsHitTestVisible = originalBorder.IsHitTestVisible,
+                        Focusable = originalBorder.Focusable,
+                        Background = originalBorder.Background,
+                        BorderBrush = originalBorder.BorderBrush,
+                        BorderThickness = originalBorder.BorderThickness,
+                        CornerRadius = originalBorder.CornerRadius,
+                        RenderTransform = originalBorder.RenderTransform?.Clone()
+                    };
 
                     // 复制位置
                     InkCanvas.SetLeft(clonedBorder, InkCanvas.GetLeft(originalBorder));
                     InkCanvas.SetTop(clonedBorder, InkCanvas.GetTop(originalBorder));
 
-                    // 复制变换
-                    if (originalBorder.RenderTransform != null)
-                    {
-                        clonedBorder.RenderTransform = originalBorder.RenderTransform.Clone();
-                    }
-
                     return clonedBorder;
                 }
             }
@@ -175,6 +185,27 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 多点触控模式切换按钮的鼠标抬起事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">鼠标按钮事件参数</param>
+        /// <remarks>
+        /// 切换多点触控模式和单点触控模式，包括以下步骤：
+        /// 1. 如果当前处于多点触控模式，则切换到单点触控模式
+        ///    - 移除手写笔和触摸事件处理程序
+        ///    - 添加触摸事件处理程序
+        ///    - 设置InkCanvas编辑模式为Ink（如果当前不是橡皮擦模式）
+        ///    - 保存并恢复非笔画元素
+        ///    - 设置isInMultiTouchMode为false
+        /// 2. 如果当前处于单点触控模式，则切换到多点触控模式
+        ///    - 添加手写笔事件处理程序
+        ///    - 添加触摸事件处理程序
+        ///    - 移除触摸事件处理程序
+        ///    - 设置InkCanvas编辑模式为None（如果当前不是橡皮擦模式）
+        ///    - 保存并恢复非笔画元素
+        ///    - 设置isInMultiTouchMode为true
+        /// </remarks>
         private void BorderMultiTouchMode_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (isInMultiTouchMode)
@@ -219,19 +250,26 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 主窗口的触摸按下事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">触摸事件参数</param>
+        /// <remarks>
+        /// 处理触摸按下事件，包括以下逻辑：
+        /// 1. 如果当前处于橡皮擦模式或选择模式，则直接返回
+        /// 2. 如果当前没有隐藏子面板，则隐藏子面板
+        /// 3. 如果当前处于图形绘制模式，则：
+        ///    - 设置InkCanvas编辑模式为None
+        ///    - 设置触摸状态为按下
+        ///    - 禁用浮动栏和黑板UI网格的命中测试
+        ///    - 设置起始点坐标
+        ///    - 直接返回
+        /// 4. 否则，设置触摸按下点的编辑模式为None
+        /// 5. 如果当前不是橡皮擦模式，则设置InkCanvas编辑模式为None
+        /// </remarks>
         private void MainWindow_TouchDown(object sender, TouchEventArgs e)
         {
-            // 检查触摸是否发生在浮动栏区域，如果是则允许事件传播到浮动栏按钮
-            var touchPoint = e.GetTouchPoint(this);
-            var floatingBarBounds = ViewboxFloatingBar.TransformToAncestor(this).TransformBounds(
-                new Rect(0, 0, ViewboxFloatingBar.ActualWidth, ViewboxFloatingBar.ActualHeight));
-
-            // 如果触摸发生在浮动栏区域，不阻止事件传播，让浮动栏按钮能够接收触摸事件
-            if (floatingBarBounds.Contains(touchPoint.Position))
-            {
-                // 不设置 ViewboxFloatingBar.IsHitTestVisible = false，让浮动栏按钮能够接收触摸事件
-                return;
-            }
 
             if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint
                 || inkCanvas.EditingMode == InkCanvasEditingMode.EraseByStroke
@@ -266,6 +304,26 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 主窗口的手写笔按下事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">手写笔按下事件参数</param>
+        /// <remarks>
+        /// 处理手写笔按下事件，包括以下逻辑：
+        /// 1. 检查手写笔点击是否发生在浮动栏区域，如果是则允许事件传播到浮动栏按钮并返回
+        /// 2. 根据手写笔是否倒置自动切换橡皮擦/画笔模式：
+        ///    - 如果手写笔倒置，设置编辑模式为EraseByPoint
+        ///    - 如果手写笔正常：
+        ///       - 如果当前处于图形绘制模式，设置编辑模式为None，设置触摸状态为按下，禁用浮动栏和黑板UI网格的命中测试，设置起始点坐标并返回
+        ///       - 如果当前不是线擦模式，设置编辑模式为Ink
+        ///       - 否则，保持当前线擦模式
+        /// 3. 捕获手写笔输入
+        /// 4. 禁用浮动栏和黑板UI网格的命中测试
+        /// 5. 根据编辑模式设置光标
+        /// 6. 如果当前处于橡皮擦模式或选择模式，则直接返回
+        /// 7. 设置触摸按下点的编辑模式为None
+        /// </remarks>
         private void MainWindow_StylusDown(object sender, StylusDownEventArgs e)
         {
             // 检查手写笔点击是否发生在浮动栏区域，如果是则允许事件传播到浮动栏按钮
@@ -310,33 +368,11 @@ namespace Ink_Canvas
                     LogHelper.WriteLogToFile("保持当前线擦模式");
                 }
             }
-            SetCursorBasedOnEditingMode(inkCanvas);
-
             inkCanvas.CaptureStylus();
             ViewboxFloatingBar.IsHitTestVisible = false;
             BlackboardUIGridForInkReplay.IsHitTestVisible = false;
 
-            // 确保手写笔模式下显示光标
-            if (Settings.Canvas.IsShowCursor)
-            {
-                inkCanvas.ForceCursor = true;
-                inkCanvas.UseCustomCursor = true;
-
-                // 根据当前编辑模式设置不同的光标
-                if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint)
-                {
-                    inkCanvas.Cursor = Cursors.Arrow;
-                }
-                else if (inkCanvas.EditingMode == InkCanvasEditingMode.Ink)
-                {
-                    var sri = Application.GetResourceStream(new Uri("Resources/Cursors/Pen.cur", UriKind.Relative));
-                    if (sri != null)
-                        inkCanvas.Cursor = new Cursor(sri.Stream);
-                }
-
-                // 强制显示光标
-                System.Windows.Forms.Cursor.Show();
-            }
+            SetCursorBasedOnEditingMode(inkCanvas);
 
             if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint
                 || inkCanvas.EditingMode == InkCanvasEditingMode.EraseByStroke
@@ -345,6 +381,30 @@ namespace Ink_Canvas
             TouchDownPointsList[e.StylusDevice.Id] = InkCanvasEditingMode.None;
         }
 
+        /// <summary>
+        /// 主窗口的手写笔抬起事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">手写笔事件参数</param>
+        /// <remarks>
+        /// 处理手写笔抬起事件，包括以下逻辑：
+        /// 1. 如果当前处于图形绘制模式：
+        ///    - 重置触摸状态
+        ///    - 启用浮动栏和黑板UI网格的命中测试
+        ///    - 对于双曲线等需要多步绘制的图形，根据当前步骤决定是进入下一步还是完成绘制
+        ///    - 对于其他单步绘制的图形，直接完成绘制
+        ///    - 直接返回
+        /// 2. 否则，尝试获取并处理笔画：
+        ///    - 获取笔画视觉对象的笔画
+        ///    - 如果笔画不为空，将其添加到InkCanvas，移除视觉画布，并触发笔画收集事件
+        ///    - 如果笔画为空，仅移除视觉画布
+        /// 3. 清理相关资源：
+        ///    - 从StrokeVisualList、VisualCanvasList和TouchDownPointsList中移除当前手写笔设备ID
+        ///    - 如果列表为空，清除所有手写笔预览相关的Canvas并清空列表
+        /// 4. 释放手写笔捕获
+        /// 5. 启用浮动栏和黑板UI网格的命中测试
+        /// 6. 根据编辑模式设置光标
+        /// </remarks>
         private async void MainWindow_StylusUp(object sender, StylusEventArgs e)
         {
             if (drawingShapeMode != 0)
@@ -432,13 +492,30 @@ namespace Ink_Canvas
                     TouchDownPointsList.Clear();
                 }
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
 
             inkCanvas.ReleaseStylusCapture();
             ViewboxFloatingBar.IsHitTestVisible = true;
             BlackboardUIGridForInkReplay.IsHitTestVisible = true;
+            SetCursorBasedOnEditingMode(inkCanvas);
         }
 
+        /// <summary>
+        /// 主窗口的手写笔移动事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">手写笔事件参数</param>
+        /// <remarks>
+        /// 处理手写笔移动事件，包括以下逻辑：
+        /// 1. 如果当前处于图形绘制模式且触摸状态为按下：
+        ///    - 获取手写笔在InkCanvas上的位置
+        ///    - 调用MouseTouchMove方法处理移动
+        ///    - 直接返回
+        /// 2. 如果触摸按下点的编辑模式不是None，则直接返回
+        /// 3. 尝试检查手写笔按钮状态，如果第二个按钮被按下，则直接返回
+        /// 4. 否则，获取笔画视觉对象，添加手写笔点，并重新绘制
+        /// 5. 捕获并忽略所有异常
+        /// </remarks>
         private void MainWindow_StylusMove(object sender, StylusEventArgs e)
         {
             try
@@ -458,53 +535,101 @@ namespace Ink_Canvas
                 {
                     if (e.StylusDevice.StylusButtons[1].StylusButtonState == StylusButtonState.Down) return;
                 }
-                catch { }
+                catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
 
-                // 确保手写笔移动时光标保持可见
-                if (Settings.Canvas.IsShowCursor)
-                {
-                    inkCanvas.ForceCursor = true;
-                    inkCanvas.UseCustomCursor = true;
-                    System.Windows.Forms.Cursor.Show();
-                }
 
                 var strokeVisual = GetStrokeVisual(e.StylusDevice.Id);
                 var stylusPointCollection = e.GetStylusPoints(this);
                 foreach (var stylusPoint in stylusPointCollection)
                     strokeVisual.Add(new StylusPoint(stylusPoint.X, stylusPoint.Y, stylusPoint.PressureFactor));
-                strokeVisual.Redraw();
+
+                // 实时笔锋：在绘制过程中更新压感并整笔重绘预览；否则预览层固定线宽，收笔后改点集也看不到笔锋变化。
+                var committedStroke = strokeVisual.Stroke;
+                if (committedStroke != null
+                    && Settings.Canvas.InkStyle == 3
+                    && penType == 0
+                    && committedStroke.DrawingAttributes != null
+                    && !committedStroke.DrawingAttributes.IsHighlighter
+                    && committedStroke.StylusPoints.Count >= 3)
+                {
+                    ApplyVelocityBrushTipFromSpeed(committedStroke);
+                    strokeVisual.ForceRedraw();
+                }
+                else
+                {
+                    strokeVisual.Redraw();
+                }
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
 
+        /// <summary>
+        /// 获取笔画视觉对象方法
+        /// </summary>
+        /// <param name="id">设备ID</param>
+        /// <returns>返回笔画视觉对象</returns>
+        /// <remarks>
+        /// 根据设备ID获取笔画视觉对象，如果不存在则创建新的：
+        /// 1. 尝试从StrokeVisualList中获取笔画视觉对象
+        /// 2. 如果不存在，创建新的StrokeVisual实例，使用InkCanvas的默认绘制属性的克隆
+        /// 3. 将新的笔画视觉对象添加到StrokeVisualList
+        /// 4. 创建新的VisualCanvas实例，将其设置为笔画视觉对象的视觉画布
+        /// 5. 将新的视觉画布添加到VisualCanvasList和InkCanvas的子元素中
+        /// 6. 返回笔画视觉对象
+        /// </remarks>
         private StrokeVisual GetStrokeVisual(int id)
         {
             if (StrokeVisualList.TryGetValue(id, out var visual)) return visual;
 
             var strokeVisual = new StrokeVisual(inkCanvas.DefaultDrawingAttributes.Clone());
             StrokeVisualList[id] = strokeVisual;
-            StrokeVisualList[id] = strokeVisual;
-            var visualCanvas = new VisualCanvas(strokeVisual);
+            var visualCanvas = new VisualCanvas();
+            strokeVisual.SetVisualCanvas(visualCanvas);
             VisualCanvasList[id] = visualCanvas;
             inkCanvas.Children.Add(visualCanvas);
 
             return strokeVisual;
         }
 
+        /// <summary>
+        /// 获取视觉画布方法
+        /// </summary>
+        /// <param name="id">设备ID</param>
+        /// <returns>返回视觉画布对象，如果不存在则返回null</returns>
+        /// <remarks>
+        /// 根据设备ID从VisualCanvasList中获取视觉画布对象
+        /// </remarks>
         private VisualCanvas GetVisualCanvas(int id)
         {
             return VisualCanvasList.TryGetValue(id, out var visualCanvas) ? visualCanvas : null;
         }
 
+        /// <summary>
+        /// 获取触摸按下点的编辑模式方法
+        /// </summary>
+        /// <param name="id">设备ID</param>
+        /// <returns>返回触摸按下点的编辑模式，如果不存在则返回InkCanvas的当前编辑模式</returns>
+        /// <remarks>
+        /// 根据设备ID从TouchDownPointsList中获取触摸按下点的编辑模式
+        /// </remarks>
         private InkCanvasEditingMode GetTouchDownPointsList(int id)
         {
             return TouchDownPointsList.TryGetValue(id, out var inkCanvasEditingMode) ? inkCanvasEditingMode : inkCanvas.EditingMode;
         }
 
+        /// <summary>
+        /// 触摸按下点的编辑模式字典，键为设备ID，值为编辑模式
+        /// </summary>
         private Dictionary<int, InkCanvasEditingMode> TouchDownPointsList { get; } =
             new Dictionary<int, InkCanvasEditingMode>();
 
+        /// <summary>
+        /// 笔画视觉对象字典，键为设备ID，值为笔画视觉对象
+        /// </summary>
         private Dictionary<int, StrokeVisual> StrokeVisualList { get; } = new Dictionary<int, StrokeVisual>();
+        /// <summary>
+        /// 视觉画布字典，键为设备ID，值为视觉画布对象
+        /// </summary>
         private Dictionary<int, VisualCanvas> VisualCanvasList { get; } = new Dictionary<int, VisualCanvas>();
 
         #endregion
@@ -514,6 +639,26 @@ namespace Ink_Canvas
 
         private Point iniP = new Point(0, 0);
 
+        /// <summary>
+        /// 主网格的触摸按下事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">触摸事件参数</param>
+        /// <remarks>
+        /// 处理主网格的触摸按下事件，包括以下逻辑：
+        /// 1. 检查触摸是否发生在浮动栏区域，如果是则允许事件传播到浮动栏按钮并返回
+        /// 2. 根据编辑模式设置光标
+        /// 3. 捕获触摸输入
+        /// 4. 如果当前处于点擦模式，则直接返回
+        /// 5. 如果当前处于图形绘制模式：
+        ///    - 设置编辑模式为None
+        ///    - 设置触摸状态为按下
+        ///    - 禁用浮动栏和黑板UI网格的命中测试
+        ///    - 设置起始点坐标
+        ///    - 直接返回
+        /// 6. 如果当前处于选择模式、墨水模式或线擦模式，则直接返回
+        /// 7. 如果当前不是橡皮擦模式，则设置编辑模式为Ink
+        /// </remarks>
         private void Main_Grid_TouchDown(object sender, TouchEventArgs e)
         {
             // 检查触摸是否发生在浮动栏区域，如果是则允许事件传播到浮动栏按钮
@@ -551,7 +696,6 @@ namespace Ink_Canvas
             }
             if (inkCanvas.EditingMode == InkCanvasEditingMode.Select)
             {
-                dec.Add(e.TouchDevice.Id);
                 return;
             }
             if (inkCanvas.EditingMode == InkCanvasEditingMode.Ink)
@@ -569,6 +713,19 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 获取触摸边界宽度方法
+        /// </summary>
+        /// <param name="e">触摸事件参数</param>
+        /// <returns>返回触摸边界宽度</returns>
+        /// <remarks>
+        /// 根据触摸事件参数计算触摸边界宽度，包括以下逻辑：
+        /// 1. 获取触摸点的边界
+        /// 2. 如果不是四边红外屏幕，使用边界宽度
+        /// 3. 如果是四边红外屏幕，使用边界宽度和高度的平方根
+        /// 4. 如果是特殊屏幕，乘以触摸倍数
+        /// 5. 返回计算得到的触摸边界宽度
+        /// </remarks>
         public double GetTouchBoundWidth(TouchEventArgs e)
         {
             var args = e.GetTouchPoint(null).Bounds;
@@ -579,7 +736,26 @@ namespace Ink_Canvas
             return value;
         }
 
-        private void inkCanvas_PreviewTouchDown(object sender, TouchEventArgs e)
+        /// <summary>
+        /// InkCanvas的预览触摸按下事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">触摸事件参数</param>
+        /// <remarks>
+        /// 处理InkCanvas的预览触摸按下事件，包括以下逻辑：
+        /// 1. 捕获触摸输入
+        /// 2. 禁用浮动栏和黑板UI网格的命中测试
+        /// 3. 将触摸设备ID添加到dec列表中
+        /// 4. 当只有一个触摸设备时：
+        ///    - 记录中心点坐标
+        ///    - 记录第一根手指点击时的StrokeCollection
+        /// 5. 当有两个或以上触摸设备，或者处于单指拖动模式，或者禁用了双指手势时：
+        ///    - 如果处于多点触控模式或禁用了双指手势，则直接返回
+        ///    - 如果当前编辑模式为None或Select，则直接返回
+        ///    - 记录当前的编辑模式
+        ///    - 设置编辑模式为None，关闭画笔功能
+        /// </remarks>
+        private void InkCanvas_PreviewTouchDown(object sender, TouchEventArgs e)
         {
             inkCanvas.CaptureTouch(e.TouchDevice);
             ViewboxFloatingBar.IsHitTestVisible = false;
@@ -606,11 +782,41 @@ namespace Ink_Canvas
             }
         }
 
-        private void inkCanvas_PreviewTouchMove(object sender, TouchEventArgs e)
+        /// <summary>
+        /// InkCanvas的预览触摸移动事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">触摸事件参数</param>
+        /// <remarks>
+        /// 空方法，预留用于处理InkCanvas的预览触摸移动事件
+        /// </remarks>
+        private void InkCanvas_PreviewTouchMove(object sender, TouchEventArgs e)
         {
         }
 
-        private void inkCanvas_PreviewTouchUp(object sender, TouchEventArgs e)
+        /// <summary>
+        /// InkCanvas的预览触摸抬起事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">触摸事件参数</param>
+        /// <remarks>
+        /// 处理InkCanvas的预览触摸抬起事件，包括以下逻辑：
+        /// 1. 释放所有触摸捕获
+        /// 2. 启用浮动栏和黑板UI网格的命中测试
+        /// 3. 如果有多个触摸设备且当前编辑模式为None，则切回之前的编辑模式
+        /// 4. 从dec列表中移除当前触摸设备ID
+        /// 5. 当没有触摸设备时：
+        ///    - 重置单指拖动模式和等待下一次触摸按下的标志
+        ///    - 如果当前不是图形绘制模式且编辑模式不是橡皮擦或选择模式，则切回之前的编辑模式
+        /// 6. 如果当前处于图形绘制模式：
+        ///    - 重置触摸状态
+        ///    - 启用浮动栏和黑板UI网格的命中测试
+        ///    - 对于双曲线等需要多步绘制的图形，根据当前步骤决定是进入下一步还是完成绘制
+        ///    - 对于其他单步绘制的图形，直接完成绘制
+        /// 7. 设置InkCanvas的透明度为1
+        /// 8. 当没有触摸设备且笔画数量发生变化，且不是绘制长方体的第一次触摸时，保存笔画集合
+        /// </remarks>
+        private void InkCanvas_PreviewTouchUp(object sender, TouchEventArgs e)
         {
             inkCanvas.ReleaseAllTouchCaptures();
             ViewboxFloatingBar.IsHitTestVisible = true;
@@ -622,15 +828,10 @@ namespace Ink_Canvas
                     inkCanvas.EditingMode = lastInkCanvasEditingMode;
             dec.Remove(e.TouchDevice.Id);
 
-            // 重置多触控点定时器状态
-            if (dec.Count <= 1)
-            {
-                isMultiTouchTimerActive = false;
-            }
-
             if (dec.Count == 0)
             {
                 isSingleFingerDragMode = false;
+                isWaitUntilNextTouchDown = false;
                 if (drawingShapeMode == 0
                     && inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint
                     && inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke
@@ -691,13 +892,41 @@ namespace Ink_Canvas
                 }
         }
 
-        private void inkCanvas_ManipulationStarting(object sender, ManipulationStartingEventArgs e)
+        /// <summary>
+        /// InkCanvas的操作开始事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">操作开始事件参数</param>
+        /// <remarks>
+        /// 设置操作模式为所有模式
+        /// </remarks>
+        private void InkCanvas_ManipulationStarting(object sender, ManipulationStartingEventArgs e)
         {
             e.Mode = ManipulationModes.All;
         }
 
-        private void inkCanvas_ManipulationInertiaStarting(object sender, ManipulationInertiaStartingEventArgs e) { }
+        /// <summary>
+        /// InkCanvas的操作惯性开始事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">操作惯性开始事件参数</param>
+        /// <remarks>
+        /// 空方法，预留用于处理InkCanvas的操作惯性开始事件
+        /// </remarks>
+        private void InkCanvas_ManipulationInertiaStarting(object sender, ManipulationInertiaStartingEventArgs e) { }
 
+        /// <summary>
+        /// 主网格的操作完成事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">操作完成事件参数</param>
+        /// <remarks>
+        /// 处理主网格的操作完成事件，包括以下逻辑：
+        /// 1. 当没有操作器时：
+        ///    - 清除dec列表
+        ///    - 重置单指拖动模式标志
+        ///    - 如果当前不是图形绘制模式且编辑模式不是橡皮擦或选择模式，则设置编辑模式为Ink
+        /// </remarks>
         private void Main_Grid_ManipulationCompleted(object sender, ManipulationCompletedEventArgs e)
         {
             if (e.Manipulators.Count() == 0)
@@ -707,7 +936,7 @@ namespace Ink_Canvas
                     dec.Clear();
                 }
                 isSingleFingerDragMode = false;
-                
+
                 if (drawingShapeMode == 0
                     && inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint
                     && inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke
@@ -719,17 +948,44 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 主网格的操作增量事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">操作增量事件参数</param>
+        /// <remarks>
+        /// 处理主网格的操作增量事件，包括以下逻辑：
+        /// 1. 如果当前处于多点触控模式或禁用了双指手势，则直接返回
+        /// 2. 检查是否有多个操作器
+        /// 3. 检查是否应该使用双指手势
+        /// 4. 如果应该使用双指手势：
+        ///    - 获取位移矢量
+        ///    - 创建矩阵变换
+        ///    - 如果启用了双指平移，则应用平移变换
+        ///    - 计算中心点（用于缩放和旋转）
+        ///    - 如果启用了双指平移或旋转，则应用旋转变换
+        ///    - 如果启用了双指缩放，则应用缩放变换
+        ///    - 处理选中的笔画：
+        ///       - 对每个选中的笔画应用变换
+        ///       - 对圆形笔画更新半径和中心点
+        ///       - 如果启用了双指缩放，更新笔画的宽度和高度
+        ///    - 处理未选中的笔画：
+        ///       - 对所有笔画应用变换
+        ///       - 如果启用了双指缩放，更新笔画的宽度和高度
+        ///       - 同时变换画布上的图片元素
+        ///       - 对所有圆形笔画更新半径和中心点
+        /// </remarks>
         private void Main_Grid_ManipulationDelta(object sender, ManipulationDeltaEventArgs e)
         {
             if (isInMultiTouchMode || !Settings.Gesture.IsEnableTwoFingerGesture) return;
-            
+
             bool hasMultipleManipulators = e.Manipulators.Count() >= 2;
-            bool shouldUseTwoFingerGesture = (dec.Count >= 2 && hasMultipleManipulators && 
+            bool shouldUseTwoFingerGesture = (dec.Count >= 2 && hasMultipleManipulators &&
                                              (Settings.PowerPointSettings.IsEnableTwoFingerGestureInPresentationMode ||
                                               StackPanelPPTControls.Visibility != Visibility.Visible ||
                                               StackPanelPPTButtons.Visibility == Visibility.Collapsed)) ||
                                             isSingleFingerDragMode;
-            
+
             if (shouldUseTwoFingerGesture)
             {
                 var md = e.DeltaManipulation;
@@ -785,7 +1041,7 @@ namespace Ink_Canvas
                             stroke.DrawingAttributes.Width *= md.Scale.X;
                             stroke.DrawingAttributes.Height *= md.Scale.Y;
                         }
-                        catch { }
+                        catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
                     }
                 }
                 else
@@ -800,7 +1056,7 @@ namespace Ink_Canvas
                                 stroke.DrawingAttributes.Width *= md.Scale.X;
                                 stroke.DrawingAttributes.Height *= md.Scale.Y;
                             }
-                            catch { }
+                            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
                         }
 
                         // 同时变换画布上的图片元素
@@ -867,8 +1123,7 @@ namespace Ink_Canvas
             try
             {
                 // 获取图片的RenderTransform，如果不存在则创建新的TransformGroup
-                TransformGroup transformGroup = image.RenderTransform as TransformGroup;
-                if (transformGroup == null)
+                if (!(image.RenderTransform is TransformGroup transformGroup))
                 {
                     transformGroup = new TransformGroup();
                     image.RenderTransform = transformGroup;
@@ -892,8 +1147,7 @@ namespace Ink_Canvas
             try
             {
                 // 获取媒体元素的RenderTransform，如果不存在则创建新的TransformGroup
-                TransformGroup transformGroup = mediaElement.RenderTransform as TransformGroup;
-                if (transformGroup == null)
+                if (!(mediaElement.RenderTransform is TransformGroup transformGroup))
                 {
                     transformGroup = new TransformGroup();
                     mediaElement.RenderTransform = transformGroup;

Ink Canvas/MainWindow_cs/MW_TrayIcon.cs

@@ -1,8 +1,10 @@
-using Hardcodet.Wpf.TaskbarNotification;
+using Hardcodet.Wpf.TaskbarNotification;
 using Ink_Canvas.Helpers;
-using iNKORE.UI.WPF.Modern.Controls;
+using iNKORE.UI.WPF.Controls;
 using System;
 using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Forms;
@@ -16,17 +18,30 @@ namespace Ink_Canvas
     public partial class App : Application
     {
 
+        /// <summary>
+        /// 系统托盘菜单打开时的事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">路由事件参数</param>
+        /// <remarks>
+        /// 处理系统托盘菜单打开时的逻辑，包括以下步骤：
+        /// 1. 获取系统托盘菜单及其相关菜单项和图标
+        /// 2. 获取主窗口实例
+        /// 3. 如果主窗口已加载：
+        ///    - 在无焦点模式下，暂时取消主窗口置顶，让系统菜单能够正常显示
+        ///    - 根据浮动栏是否处于收纳模式，更新菜单项图标和文本
+        ///    - 根据浮动栏状态和主窗口是否隐藏，更新重置浮动栏位置菜单项的启用状态
+        /// </remarks>
         private void SysTrayMenu_Opened(object sender, RoutedEventArgs e)
         {
             var s = (ContextMenu)sender;
-            var FoldFloatingBarTrayIconMenuItemIconEyeOff =
-                (Image)((Grid)((MenuItem)s.Items[s.Items.Count - 5]).Icon).Children[0];
-            var FoldFloatingBarTrayIconMenuItemIconEyeOn =
-                (Image)((Grid)((MenuItem)s.Items[s.Items.Count - 5]).Icon).Children[1];
-            var FoldFloatingBarTrayIconMenuItemHeaderText =
-                (TextBlock)((SimpleStackPanel)((MenuItem)s.Items[s.Items.Count - 5]).Header).Children[0];
+            var FoldFloatingBarTrayIconMenuItemIconEyeOff = (Image)((Grid)((MenuItem)s.Items[s.Items.Count - 5]).Icon).Children[0];
+            var FoldFloatingBarTrayIconMenuItemIconEyeOn = (Image)((Grid)((MenuItem)s.Items[s.Items.Count - 5]).Icon).Children[1];
+            var FoldFloatingBarTrayIconMenuItemHeaderText = (TextBlock)((SimpleStackPanel)((MenuItem)s.Items[s.Items.Count - 5]).Header).Children[0];
             var ResetFloatingBarPositionTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 4];
-            var HideICCMainWindowTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 9];
+            var HideICCMainWindowTrayIconMenuItem = s.Items.OfType<MenuItem>()
+                .FirstOrDefault(mi => mi.Name == "HideICCMainWindowTrayIconMenuItem");
+            if (HideICCMainWindowTrayIconMenuItem == null) return;
             var mainWin = (MainWindow)Current.MainWindow;
             if (mainWin.IsLoaded)
             {
@@ -63,10 +78,87 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 系统托盘菜单关闭时的事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">路由事件参数</param>
+        /// <remarks>
+        /// 处理系统托盘菜单关闭时的逻辑，包括以下步骤：
+        /// 1. 获取主窗口实例
+        /// 2. 如果主窗口已加载，且在无焦点模式下启用了始终置顶，则恢复主窗口的置顶状态
+        /// </remarks>
+        private bool EnsureMainWindowReadyForSettings(MainWindow mainWin)
+        {
+            if (mainWin?.IsLoaded != true)
+            {
+                return false;
+            }
+
+            var trayMenu = ((TaskbarIcon)Current.Resources["TaskbarTrayIcon"]).ContextMenu;
+            var hideMainWindowMenuItem = trayMenu?.Items.OfType<MenuItem>()
+                .FirstOrDefault(mi => mi.Name == "HideICCMainWindowTrayIconMenuItem");
+
+            if (hideMainWindowMenuItem != null && hideMainWindowMenuItem.IsChecked)
+            {
+                hideMainWindowMenuItem.IsChecked = false;
+            }
+            else if (!mainWin.IsVisible)
+            {
+                mainWin.Show();
+            }
+
+            if (mainWin.WindowState == WindowState.Minimized)
+            {
+                mainWin.WindowState = WindowState.Normal;
+            }
+
+            mainWin.Activate();
+            return true;
+        }
+
+        private bool IsLegacySettingsVisible(MainWindow mainWin)
+        {
+            try
+            {
+                var borderSettingsField = typeof(MainWindow).GetField("BorderSettings", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+                var borderSettings = borderSettingsField?.GetValue(mainWin) as FrameworkElement;
+                return borderSettings?.Visibility == Visibility.Visible;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        private void OpenSettingsTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e)
+        {
+            var mainWin = Current.MainWindow as MainWindow;
+            if (!EnsureMainWindowReadyForSettings(mainWin))
+            {
+                return;
+            }
+
+            if (IsLegacySettingsVisible(mainWin))
+            {
+                return;
+            }
+
+            try
+            {
+                var method = typeof(MainWindow).GetMethod("BtnSettings_Click", BindingFlags.NonPublic | BindingFlags.Instance);
+                method?.Invoke(mainWin, new object[] { null, null });
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"Open settings from tray failed: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
         private void SysTrayMenu_Closed(object sender, RoutedEventArgs e)
         {
             var mainWin = (MainWindow)Current.MainWindow;
-            if (mainWin.IsLoaded)
+            if (mainWin != null && mainWin.IsLoaded)
             {
                 // 菜单关闭后，恢复主窗口的置顶状态
                 if (Ink_Canvas.MainWindow.Settings.Advanced.IsAlwaysOnTop && Ink_Canvas.MainWindow.Settings.Advanced.IsNoFocusMode)
@@ -76,21 +168,46 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 关闭应用程序托盘菜单项点击事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">路由事件参数</param>
+        /// <remarks>
+        /// 处理关闭应用程序托盘菜单项的点击事件，包括以下步骤：
+        /// 1. 获取主窗口实例
+        /// 2. 如果主窗口已加载：
+        ///    - 设置IsAppExitByUser为true，表示用户主动退出
+        ///    - 关闭应用程序
+        /// </remarks>
         private void CloseAppTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e)
         {
             var mainWin = (MainWindow)Current.MainWindow;
-            if (mainWin.IsLoaded)
+            if (mainWin != null && mainWin.IsLoaded)
             {
                 IsAppExitByUser = true;
-                Current.Shutdown();
-                // mainWin.BtnExit_Click(null,null);
+                mainWin.BtnExit_Click(null, null);
             }
         }
 
+        /// <summary>
+        /// 重启应用程序托盘菜单项点击事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">路由事件参数</param>
+        /// <remarks>
+        /// 处理重启应用程序托盘菜单项的点击事件，包括以下步骤：
+        /// 1. 获取主窗口实例
+        /// 2. 如果主窗口已加载：
+        ///    - 设置IsAppExitByUser为true，表示用户主动退出
+        ///    - 尝试启动应用程序的新实例，带延迟参数
+        ///    - 捕获并记录启动新实例时可能出现的异常
+        ///    - 关闭当前应用程序实例
+        /// </remarks>
         private void RestartAppTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e)
         {
             var mainWin = (MainWindow)Current.MainWindow;
-            if (mainWin.IsLoaded)
+            if (mainWin != null && mainWin.IsLoaded)
             {
                 IsAppExitByUser = true;
 
@@ -115,10 +232,22 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 强制全屏化托盘菜单项点击事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">路由事件参数</param>
+        /// <remarks>
+        /// 处理强制全屏化托盘菜单项的点击事件，包括以下步骤：
+        /// 1. 获取主窗口实例
+        /// 2. 如果主窗口已加载：
+        ///    - 调用MoveWindow方法将主窗口移动到屏幕左上角并设置为全屏大小
+        ///    - 显示强制全屏化的消息，包含屏幕分辨率和缩放比例信息
+        /// </remarks>
         private void ForceFullScreenTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e)
         {
             var mainWin = (MainWindow)Current.MainWindow;
-            if (mainWin.IsLoaded)
+            if (mainWin != null && mainWin.IsLoaded)
             {
                 Ink_Canvas.MainWindow.MoveWindow(new WindowInteropHelper(mainWin).Handle, 0, 0,
                     Screen.PrimaryScreen.Bounds.Width, Screen.PrimaryScreen.Bounds.Height, true);
@@ -126,18 +255,44 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 切换浮动栏收纳模式托盘菜单项点击事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">路由事件参数</param>
+        /// <remarks>
+        /// 处理切换浮动栏收纳模式托盘菜单项的点击事件，包括以下步骤：
+        /// 1. 获取主窗口实例
+        /// 2. 如果主窗口已加载：
+        ///    - 如果浮动栏当前处于收纳模式，则调用UnFoldFloatingBar_MouseUp方法退出收纳模式
+        ///    - 否则，调用FoldFloatingBar_MouseUp方法进入收纳模式
+        /// </remarks>
         private void FoldFloatingBarTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e)
         {
             var mainWin = (MainWindow)Current.MainWindow;
-            if (mainWin.IsLoaded)
+            if (mainWin != null && mainWin.IsLoaded)
                 if (mainWin.isFloatingBarFolded) mainWin.UnFoldFloatingBar_MouseUp(new object(), null);
                 else mainWin.FoldFloatingBar_MouseUp(new object(), null);
         }
 
+        /// <summary>
+        /// 重置浮动栏位置托盘菜单项点击事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">路由事件参数</param>
+        /// <remarks>
+        /// 处理重置浮动栏位置托盘菜单项的点击事件，包括以下步骤：
+        /// 1. 获取主窗口实例
+        /// 2. 如果主窗口已加载：
+        ///    - 检查是否处于PPT演示模式
+        ///    - 如果浮动栏当前未处于收纳模式：
+        ///       - 如果不处于PPT演示模式，调用PureViewboxFloatingBarMarginAnimationInDesktopMode方法重置浮动栏位置
+        ///       - 否则，调用PureViewboxFloatingBarMarginAnimationInPPTMode方法重置浮动栏位置
+        /// </remarks>
         private void ResetFloatingBarPositionTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e)
         {
             var mainWin = (MainWindow)Current.MainWindow;
-            if (mainWin.IsLoaded)
+            if (mainWin != null && mainWin.IsLoaded)
             {
                 var isInPPTPresentationMode = false;
                 Dispatcher.Invoke(() =>
@@ -152,23 +307,43 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 隐藏主窗口托盘菜单项选中事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">路由事件参数</param>
+        /// <remarks>
+        /// 处理隐藏主窗口托盘菜单项的选中事件，包括以下步骤：
+        /// 1. 获取菜单项和主窗口实例
+        /// 2. 如果主窗口已加载：
+        ///    - 隐藏主窗口
+        ///    - 获取系统托盘菜单
+        ///    - 禁用并设置半透明效果给以下菜单项：
+        ///       - 重置浮动栏位置
+        ///       - 切换浮动栏收纳模式
+        ///       - 强制全屏化
+        /// 3. 否则，取消菜单项的选中状态
+        /// </remarks>
         private void HideICCMainWindowTrayIconMenuItem_Checked(object sender, RoutedEventArgs e)
         {
             var mi = (MenuItem)sender;
             var mainWin = (MainWindow)Current.MainWindow;
-            if (mainWin.IsLoaded)
+            if (mainWin != null && mainWin.IsLoaded)
             {
                 mainWin.Hide();
                 var s = ((TaskbarIcon)Current.Resources["TaskbarTrayIcon"]).ContextMenu;
-                var ResetFloatingBarPositionTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 4];
-                var FoldFloatingBarTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 5];
-                var ForceFullScreenTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 6];
-                ResetFloatingBarPositionTrayIconMenuItem.IsEnabled = false;
-                FoldFloatingBarTrayIconMenuItem.IsEnabled = false;
-                ForceFullScreenTrayIconMenuItem.IsEnabled = false;
-                ResetFloatingBarPositionTrayIconMenuItem.Opacity = 0.5;
-                FoldFloatingBarTrayIconMenuItem.Opacity = 0.5;
-                ForceFullScreenTrayIconMenuItem.Opacity = 0.5;
+                if (s != null)
+                {
+                    var ResetFloatingBarPositionTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 4];
+                    var FoldFloatingBarTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 5];
+                    var ForceFullScreenTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 6];
+                    ResetFloatingBarPositionTrayIconMenuItem.IsEnabled = false;
+                    FoldFloatingBarTrayIconMenuItem.IsEnabled = false;
+                    ForceFullScreenTrayIconMenuItem.IsEnabled = false;
+                    ResetFloatingBarPositionTrayIconMenuItem.Opacity = 0.5;
+                    FoldFloatingBarTrayIconMenuItem.Opacity = 0.5;
+                    ForceFullScreenTrayIconMenuItem.Opacity = 0.5;
+                }
             }
             else
             {
@@ -177,23 +352,43 @@ namespace Ink_Canvas
 
         }
 
+        /// <summary>
+        /// 显示主窗口托盘菜单项取消选中事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">路由事件参数</param>
+        /// <remarks>
+        /// 处理显示主窗口托盘菜单项的取消选中事件，包括以下步骤：
+        /// 1. 获取菜单项和主窗口实例
+        /// 2. 如果主窗口已加载：
+        ///    - 显示主窗口
+        ///    - 获取系统托盘菜单
+        ///    - 启用并设置正常透明度给以下菜单项：
+        ///       - 重置浮动栏位置
+        ///       - 切换浮动栏收纳模式
+        ///       - 强制全屏化
+        /// 3. 否则，取消菜单项的选中状态
+        /// </remarks>
         private void HideICCMainWindowTrayIconMenuItem_UnChecked(object sender, RoutedEventArgs e)
         {
             var mi = (MenuItem)sender;
             var mainWin = (MainWindow)Current.MainWindow;
-            if (mainWin.IsLoaded)
+            if (mainWin != null && mainWin.IsLoaded)
             {
                 mainWin.Show();
                 var s = ((TaskbarIcon)Current.Resources["TaskbarTrayIcon"]).ContextMenu;
-                var ResetFloatingBarPositionTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 4];
-                var FoldFloatingBarTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 5];
-                var ForceFullScreenTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 6];
-                ResetFloatingBarPositionTrayIconMenuItem.IsEnabled = true;
-                FoldFloatingBarTrayIconMenuItem.IsEnabled = true;
-                ForceFullScreenTrayIconMenuItem.IsEnabled = true;
-                ResetFloatingBarPositionTrayIconMenuItem.Opacity = 1;
-                FoldFloatingBarTrayIconMenuItem.Opacity = 1;
-                ForceFullScreenTrayIconMenuItem.Opacity = 1;
+                if (s != null)
+                {
+                    var ResetFloatingBarPositionTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 4];
+                    var FoldFloatingBarTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 5];
+                    var ForceFullScreenTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 6];
+                    ResetFloatingBarPositionTrayIconMenuItem.IsEnabled = true;
+                    FoldFloatingBarTrayIconMenuItem.IsEnabled = true;
+                    ForceFullScreenTrayIconMenuItem.IsEnabled = true;
+                    ResetFloatingBarPositionTrayIconMenuItem.Opacity = 1;
+                    FoldFloatingBarTrayIconMenuItem.Opacity = 1;
+                    ForceFullScreenTrayIconMenuItem.Opacity = 1;
+                }
             }
             else
             {
@@ -201,16 +396,33 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 禁用/启用所有快捷键托盘菜单项点击事件处理方法
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">路由事件参数</param>
+        /// <remarks>
+        /// 处理禁用/启用所有快捷键托盘菜单项的点击事件，包括以下步骤：
+        /// 1. 获取主窗口实例
+        /// 2. 如果主窗口已加载，尝试：
+        ///    - 通过反射获取全局快捷键管理器
+        ///    - 如果获取成功：
+        ///       - 禁用快捷键注册
+        ///       - 更新菜单项文本和状态：
+        ///          - 如果当前文本是"禁用所有快捷键"，则更改为"启用所有快捷键"并记录日志
+        ///          - 否则，更改为"禁用所有快捷键"，重新启用快捷键注册并记录日志
+        ///    - 如果获取失败，记录错误日志
+        /// 3. 捕获并记录可能出现的异常
+        /// </remarks>
         private void DisableAllHotkeysMenuItem_Clicked(object sender, RoutedEventArgs e)
         {
             var mainWin = (MainWindow)Current.MainWindow;
-            if (mainWin.IsLoaded)
+            if (mainWin != null && mainWin.IsLoaded)
             {
                 try
                 {
                     // 获取全局快捷键管理器
-                    var hotkeyManagerField = typeof(MainWindow).GetField("_globalHotkeyManager",
-                        System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+                    var hotkeyManagerField = typeof(MainWindow).GetField("_globalHotkeyManager", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
                     var hotkeyManager = hotkeyManagerField?.GetValue(mainWin) as GlobalHotkeyManager;
 
                     if (hotkeyManager != null)

Ink Canvas/MainWindow_cs/MW_UriHandler.cs

@@ -0,0 +1,247 @@
+using Ink_Canvas.Helpers;
+using Newtonsoft.Json;
+using System;
+using System.IO;
+using System.Windows;
+
+namespace Ink_Canvas
+{
+    /// <summary>
+    /// 处理 icc: URL 协议命令
+    /// 支持：收纳/展开/切换、彻底隐藏、点名/计时器/白板、工具状态切换与查询、配置方案列表与切换。
+    /// 配置方案：icc://config-profile/list 输出列表到 %TEMP%\InkCanvasConfigProfileList.json；
+    ///          icc://config-profile/switch?name=方案名 切换方案，结果写入 %TEMP%\InkCanvasConfigProfileSwitchResult.txt。
+    /// </summary>
+    public partial class MainWindow
+    {
+        public void HandleUriCommand(string uri)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(uri)) return;
+
+                if (!Settings.Advanced.IsEnableUriScheme)
+                {
+                    LogHelper.WriteLogToFile($"URI 协议已禁用，忽略请求: {uri}", LogHelper.LogType.Warning);
+                    return;
+                }
+
+                LogHelper.WriteLogToFile($"正在处理 URI 命令: {uri}", LogHelper.LogType.Event);
+
+                string command = ParseUriCommand(uri);
+                if (string.IsNullOrEmpty(command)) return;
+
+                string path = command;
+                string pathLower = path.ToLowerInvariant();
+
+                switch (pathLower)
+                {
+                    case "fold":
+                        if (!isFloatingBarFolded)
+                        {
+                            FoldFloatingBar_MouseUp(new object(), null);
+                            ShowNotification("已进入收纳模式");
+                        }
+                        return;
+                    case "unfold":
+                    case "show":
+                        if (isFloatingBarFolded)
+                        {
+                            UnFoldFloatingBar_MouseUp(new object(), null);
+                            ShowNotification("已退出收纳模式");
+                        }
+                        return;
+                    case "toggle":
+                        if (isFloatingBarFolded)
+                        {
+                            UnFoldFloatingBar_MouseUp(new object(), null);
+                            ShowNotification("已退出收纳模式");
+                        }
+                        else
+                        {
+                            FoldFloatingBar_MouseUp(new object(), null);
+                            ShowNotification("已进入收纳模式");
+                        }
+                        return;
+                    case "thoroughhideon":
+                        Settings.Automation.ThoroughlyHideWhenFolded = true;
+                        SaveSettingsToFile();
+                        ShowNotification("已开启：收起时彻底隐藏");
+                        if (isFloatingBarFolded)
+                            this.Visibility = Visibility.Hidden;
+                        return;
+                    case "thoroughhideoff":
+                        Settings.Automation.ThoroughlyHideWhenFolded = false;
+                        SaveSettingsToFile();
+                        ShowNotification("已关闭：收起时彻底隐藏");
+                        this.Visibility = Visibility.Visible;
+                        return;
+                    case "thoroughhidetoggle":
+                        Settings.Automation.ThoroughlyHideWhenFolded = !Settings.Automation.ThoroughlyHideWhenFolded;
+                        SaveSettingsToFile();
+                        ShowNotification(Settings.Automation.ThoroughlyHideWhenFolded ? "已开启：收起时彻底隐藏" : "已关闭：收起时彻底隐藏");
+                        if (isFloatingBarFolded)
+                            this.Visibility = Settings.Automation.ThoroughlyHideWhenFolded ? Visibility.Hidden : Visibility.Visible;
+                        return;
+                    case "randone":
+                        SymbolIconRandOne_MouseUp(null, null);
+                        return;
+                    case "rand":
+                        SymbolIconRand_MouseUp(null, null);
+                        return;
+                    case "timer":
+                        ImageCountdownTimer_MouseUp(null, null);
+                        return;
+                    case "whiteboard":
+                    case "board":
+                        ImageBlackboard_MouseUp(null, null);
+                        return;
+                }
+
+                if (pathLower == "tool/state")
+                {
+                    string state = GetCurrentSelectedMode() ?? "cursor";
+                    string stateFile = Path.Combine(Path.GetTempPath(), "InkCanvasToolState.txt");
+                    File.WriteAllText(stateFile, state, System.Text.Encoding.UTF8);
+                    return;
+                }
+
+                if (pathLower.StartsWith("tool/"))
+                {
+                    string tool = pathLower.Length > 5 ? pathLower.Substring(5).TrimEnd('/') : "";
+                    switch (tool)
+                    {
+                        case "pen":
+                        case "color":
+                            PenIcon_Click(null, null);
+                            break;
+                        case "cursor":
+                            CursorIcon_Click(null, null);
+                            break;
+                        case "eraser":
+                            PenIcon_Click(null, null);
+                            EraserIcon_Click(null, null);
+                            break;
+                        case "eraserbystrokes":
+                        case "eraserstroke":
+                            PenIcon_Click(null, null);
+                            EraserIconByStrokes_Click(EraserByStrokes_Icon, null);
+                            break;
+                        default:
+                            LogHelper.WriteLogToFile($"未知的 URI 工具: {tool}", LogHelper.LogType.Warning);
+                            break;
+                    }
+                    return;
+                }
+
+                if (pathLower == "config-profile/list")
+                {
+                    WriteConfigProfileListToTemp();
+                    return;
+                }
+
+                if (pathLower.StartsWith("config-profile/switch"))
+                {
+                    string profileName = GetUriQueryValue(uri, "name");
+                    HandleUriConfigProfileSwitch(profileName);
+                    return;
+                }
+
+                LogHelper.WriteLogToFile($"未知的 URI 命令: {command}", LogHelper.LogType.Warning);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"处理 URI 命令时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        private static string ParseUriCommand(string uri)
+        {
+            if (string.IsNullOrWhiteSpace(uri) || !uri.Trim().StartsWith("icc:", StringComparison.OrdinalIgnoreCase))
+                return "";
+
+            if (Uri.TryCreate(uri, UriKind.Absolute, out Uri uriObj))
+            {
+                string host = (uriObj.Host ?? "").Trim().ToLowerInvariant();
+                string path = (uriObj.AbsolutePath ?? "").Trim('/').ToLowerInvariant();
+                if (!string.IsNullOrEmpty(host))
+                    return string.IsNullOrEmpty(path) ? host : host + "/" + path;
+                if (!string.IsNullOrEmpty(path))
+                    return path;
+            }
+
+            string raw = uri.Trim().Substring(4).TrimStart('/').ToLowerInvariant();
+            return raw;
+        }
+
+        private static string GetUriQueryValue(string uri, string key)
+        {
+            if (string.IsNullOrEmpty(uri) || string.IsNullOrEmpty(key)) return "";
+            try
+            {
+                if (!Uri.TryCreate(uri, UriKind.Absolute, out Uri u) || string.IsNullOrEmpty(u.Query))
+                    return "";
+                string q = u.Query.TrimStart('?');
+                foreach (var pair in q.Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries))
+                {
+                    var kv = pair.Split(new[] { '=' }, 2, StringSplitOptions.None);
+                    if (kv.Length == 2 && kv[0].Trim().Equals(key, StringComparison.OrdinalIgnoreCase))
+                        return Uri.UnescapeDataString(kv[1].Trim());
+                }
+            }
+            catch (Exception ex) { LogHelper.WriteLogToFile($"解析 URI 参数失败: {ex.Message}", LogHelper.LogType.Warning); }
+            return "";
+        }
+
+        private const string ConfigProfileListTempFile = "InkCanvasConfigProfileList.json";
+        private const string ConfigProfileSwitchResultTempFile = "InkCanvasConfigProfileSwitchResult.txt";
+
+        private void WriteConfigProfileListToTemp()
+        {
+            try
+            {
+                var names = ConfigProfileManager.ListProfileNames();
+                var current = _lastAppliedProfileName ?? "";
+                var payload = new { list = names, current = current };
+                string path = Path.Combine(Path.GetTempPath(), ConfigProfileListTempFile);
+                File.WriteAllText(path, JsonConvert.SerializeObject(payload, Formatting.Indented), System.Text.Encoding.UTF8);
+                LogHelper.WriteLogToFile($"URI 已输出配置方案列表到: {path}", LogHelper.LogType.Event);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"URI 输出配置方案列表失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        private void HandleUriConfigProfileSwitch(string profileName)
+        {
+            string resultPath = Path.Combine(Path.GetTempPath(), ConfigProfileSwitchResultTempFile);
+            try
+            {
+                if (string.IsNullOrWhiteSpace(profileName))
+                {
+                    File.WriteAllText(resultPath, "error: 缺少参数 name", System.Text.Encoding.UTF8);
+                    LogHelper.WriteLogToFile("URI 切换配置方案: 未指定方案名", LogHelper.LogType.Warning);
+                    return;
+                }
+                if (!ConfigProfileManager.ApplyProfile(profileName.Trim()))
+                {
+                    File.WriteAllText(resultPath, "error: 方案不存在或应用失败", System.Text.Encoding.UTF8);
+                    ShowNotification($"切换失败：方案「{profileName}」不存在");
+                    return;
+                }
+                _lastAppliedProfileName = profileName.Trim();
+                ReloadSettingsFromFile();
+                RefreshConfigProfileList();
+                File.WriteAllText(resultPath, "ok", System.Text.Encoding.UTF8);
+                ShowNotification($"已通过 URI 切换至方案「{profileName}」");
+                LogHelper.WriteLogToFile($"URI 已切换配置方案: {profileName}", LogHelper.LogType.Event);
+            }
+            catch (Exception ex)
+            {
+                try { File.WriteAllText(resultPath, "error: " + ex.Message, System.Text.Encoding.UTF8); } catch { }
+                LogHelper.WriteLogToFile($"URI 切换配置方案失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+    }
+}