improve:自动更新

重构动画帮助类以支持自定义动画目标
简化颜色滑块更新逻辑
调整浮动工具栏显示逻辑
新增BoardMenuFrame自定义控件

.all-contributorsrc

@@ -1,4 +1,5 @@
 {
+  "$schema": "https://www.schemastore.org/all-contributors.json",
   "projectName": "community",
   "projectOwner": "InkCanvasForClass",
   "files": [
@@ -6,7 +7,7 @@
   ],
   "commitType": "docs",
   "commitConvention": "angular",
-  "contributorsPerLine": 7,
+  "contributorsPerLine": 5,
   "contributors": [
     {
       "login": "CJKmkp",
@@ -100,7 +101,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/156585442?v=4",
       "profile": "https://github.com/Tayasui-rainnya",
       "contributions": [
-        "design"
+        "design",
+        "code"
       ]
     },
     {
@@ -108,9 +110,49 @@
       "name": "doudou0720",
       "avatar_url": "https://avatars.githubusercontent.com/u/98651603?v=4",
       "profile": "https://github.com/doudou0720",
+      "contributions": [
+        "code",
+        "blog",
+        "infra"
+      ]
+    },
+    {
+      "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"
+      ]
+    },
+    {
+      "login": "Hao3288",
+      "name": "NoobHao",
+      "avatar_url": "https://avatars.githubusercontent.com/u/119276078?v=4",
+      "profile": "https://github.com/Hao3288",
       "contributions": [
         "code"
       ]
     }
-  ]
+  ],
+  "repoType": "github"
 }

.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

@@ -57,3 +57,10 @@ body:
       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

@@ -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/workflows/dotnet-desktop.yml

@@ -2,12 +2,7 @@ name: .NET Build & Package
 
 on:
   push:
-    branches: [ main, beta ]
-  pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
-    branches: [ main, beta ]
-    paths-ignore:
-      - '**/*.md'
+    branches: [ net6 ]
   workflow_dispatch:
 
 concurrency:
@@ -21,6 +16,10 @@ 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
@@ -28,12 +27,11 @@ jobs:
           fetch-depth: 1
       
       - name: Setup MSBuild
-        uses: microsoft/setup-msbuild@v2
+        uses: microsoft/setup-msbuild@v3
       
       - name: Setup dotnet
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '10.x'
           cache: true
           cache-dependency-path: '**/packages.lock.json'
       
@@ -41,12 +39,14 @@ jobs:
         run: dotnet restore "Ink Canvas.sln" --locked-mode
       
       - name: Build the Solution
-        run: msbuild /p:platform="AnyCPU" /p:configuration="Debug" /p:GitFlow="$GITFLOW" "Ink Canvas/InkCanvasForClass.csproj" /m /p:UseMultiToolTask=true /p:EnforceProcessCountAcrossBuilds=true /verbosity:minimal
+        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: Check if exe file is generated
         id: check-exe
         run: |
-          $exePath = "Ink Canvas\bin\Debug\net472\InkCanvasForClass.exe"
+          $exePath = "Ink Canvas\bin\Debug\${{ matrix.architecture }}\net6.0-windows10.0.19041.0\InkCanvasForClass.exe"
           
           if (Test-Path $exePath) {
             echo "build_success=true" >> $env:GITHUB_OUTPUT
@@ -71,10 +71,10 @@ jobs:
       
       - name: Upload Artifact (if build succeeded)
         if: steps.check-exe.outputs.build_success == 'true'
-        uses: actions/upload-artifact@v4.5.0
+        uses: actions/upload-artifact@v7
         with:
-          name: InkCanvasForClass.CE.debug
-          path: "Ink Canvas/bin/Debug/net472/*"
+          name: InkCanvasForClass.CE.debug.${{ matrix.architecture }}
+          path: "Ink Canvas/bin/Debug/${{ matrix.architecture }}/net6.0-windows10.0.19041.0/*"
 
       - name: Create Summary
         if: always()
@@ -89,15 +89,17 @@ jobs:
             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.zip) \([GhProxy Fastly Mirror](https://cdn.gh-proxy.com/nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }}/InkCanvasForClass.CE.debug.zip) / [GhProxy Mirror](https://gh-proxy.com/nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }}/InkCanvasForClass.CE.debug.zip)\)" >> $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

.github/workflows/prcheck.yml

@@ -0,0 +1,104 @@
+name: PR Check
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+    branches: [ main, net6 ]
+    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 }}\net6.0-windows10.0.19041.0\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 }}/net6.0-windows10.0.19041.0/*"
+        
+
+      - 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/prerelease.yml

@@ -21,6 +21,11 @@ on:
         required: true
         default: true
         type: boolean
+      draft:
+        description: 'Create as draft release'
+        required: true
+        default: false
+        type: boolean
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-${{ github.sha }}
@@ -195,6 +200,10 @@ jobs:
     needs: prepare
     if: success()
     runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        architecture: [AnyCPU, x86]
     outputs:
       archive_name: ${{ steps.create_archive.outputs.archive_name }}
       zip_size: ${{ steps.calculate_size.outputs.zip_size }}
@@ -207,12 +216,11 @@ jobs:
           fetch-depth: 1
       
       - name: Setup MSBuild
-        uses: microsoft/setup-msbuild@v2
+        uses: microsoft/setup-msbuild@v3
       
       - name: Setup dotnet
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '10.x'
           cache: true
           cache-dependency-path: '**/packages.lock.json'
       
@@ -220,13 +228,15 @@ jobs:
         run: dotnet restore "Ink Canvas.sln" --locked-mode
       
       - name: Build the Solution (Release)
+        env:
+          DLASS_SENTRY_DSN: ${{ secrets.DLASS_SENTRY_DSN }}
         run: |
-          msbuild /p:platform="AnyCPU" /p:configuration="Release" /p:GitFlow="Github Action" "Ink Canvas/InkCanvasForClass.csproj" /m /p:UseMultiToolTask=true /p:EnforceProcessCountAcrossBuilds=true /verbosity:minimal
+          msbuild /p:platform="${{ matrix.architecture }}" /p:configuration="Release" /p:GitFlow="Github Action" "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/Release/net472/InkCanvasForClass.exe"
+          $exePath = "Ink Canvas\bin\Release\${{ matrix.architecture }}\net6.0-windows10.0.19041.0\InkCanvasForClass.exe"
           
           if (Test-Path $exePath) {
             echo "build_success=true" >> $env:GITHUB_OUTPUT
@@ -259,13 +269,22 @@ jobs:
         if: steps.check-exe.outputs.build_success == 'true'
         run: |
           $version = "${{ needs.prepare.outputs.version }}"
-          $archiveName = "InkCanvasForClass.CE.$version.zip"
+          $architecture = "${{ matrix.architecture }}"
+          
+          # 根据架构生成文件名后缀
+          if ($architecture -eq "AnyCPU") {
+            $suffix = "-x64"
+          } else {
+            $suffix = ""
+          }
+          
+          $archiveName = "InkCanvasForClass.CE.$version$suffix.zip"
           
           # 创建发布目录
           New-Item -ItemType Directory -Path "release" -Force
           
-          # 复制发布文件
-          Copy-Item "Ink Canvas/bin/Release/net472/*" "release/" -Recurse -Force
+          # 复制发布文件（使用架构特定的路径）
+          Copy-Item "Ink Canvas\bin\Release\$architecture\net6.0-windows10.0.19041.0\*" "release/" -Recurse -Force
           
           # 创建压缩包
           Compress-Archive -Path "release/*" -DestinationPath $archiveName -Force
@@ -276,6 +295,7 @@ jobs:
         if: steps.check-exe.outputs.build_success == 'true'
         run: |
           $version = "${{ needs.prepare.outputs.version }}"
+          $architecture = "${{ matrix.architecture }}"
           
           # 更新 ISS 文件中的版本信息
           $issPath = "build/InkCanvasForClass CE.iss"
@@ -302,7 +322,7 @@ jobs:
           
       - name: Build MSI installer with Inno Setup
         if: steps.check-exe.outputs.build_success == 'true'
-        uses: Minionguyjpro/Inno-Setup-Action@v1.2.2
+        uses: Minionguyjpro/Inno-Setup-Action@v1.2.7
         with:
           path: build/InkCanvasForClass CE.iss
           options: /O.
@@ -311,8 +331,17 @@ jobs:
         if: steps.check-exe.outputs.build_success == 'true'
         run: |
           $version = "${{ needs.prepare.outputs.version }}"
+          $architecture = "${{ matrix.architecture }}"
+          
+          # 根据架构生成文件名后缀
+          if ($architecture -eq "AnyCPU") {
+            $suffix = "-x64"
+          } else {
+            $suffix = ""
+          }
+          
           $setupFile = "InkCanvasForClass CE Setup.exe"
-          $newSetupName = "InkCanvasForClass.CE.$version.Setup.exe"
+          $newSetupName = "InkCanvasForClass.CE.$version$suffix.Setup.exe"
           
           if (Test-Path $setupFile) {
             Rename-Item -Path $setupFile -NewName $newSetupName
@@ -325,7 +354,16 @@ jobs:
         if: steps.check-exe.outputs.build_success == 'true'
         run: |
           $version = "${{ needs.prepare.outputs.version }}"
-          $archiveName = "InkCanvasForClass.CE.$version.zip"
+          $architecture = "${{ matrix.architecture }}"
+          
+          # 根据架构生成文件名后缀
+          if ($architecture -eq "AnyCPU") {
+            $suffix = "-x64"
+          } else {
+            $suffix = ""
+          }
+          
+          $archiveName = "InkCanvasForClass.CE.$version$suffix.zip"
           
           # 获取文件大小（字节）
           $fileSize = (Get-Item $archiveName).Length
@@ -337,7 +375,16 @@ jobs:
         if: steps.check-exe.outputs.build_success == 'true'
         run: |
           $version = "${{ needs.prepare.outputs.version }}"
-          $installerName = "InkCanvasForClass.CE.$version.Setup.exe"
+          $architecture = "${{ matrix.architecture }}"
+          
+          # 根据架构生成文件名后缀
+          if ($architecture -eq "AnyCPU") {
+            $suffix = "-x64"
+          } else {
+            $suffix = ""
+          }
+          
+          $installerName = "InkCanvasForClass.CE.$version$suffix.Setup.exe"
           
           if (Test-Path $installerName) {
             # 获取文件大小（字节）
@@ -350,12 +397,32 @@ jobs:
           
       - name: Upload Build Artifacts
         if: steps.check-exe.outputs.build_success == 'true'
-        uses: actions/upload-artifact@v4
+        run: |
+          $version = "${{ needs.prepare.outputs.version }}"
+          $architecture = "${{ matrix.architecture }}"
+          
+          # 根据架构生成文件名后缀
+          if ($architecture -eq "AnyCPU") {
+            $suffix = "-x64"
+          } else {
+            $suffix = ""
+          }
+          
+          $zipFile = "InkCanvasForClass.CE.$version$suffix.zip"
+          $setupFile = "InkCanvasForClass.CE.$version$suffix.Setup.exe"
+          
+          echo "zip_file=$zipFile" >> $env:GITHUB_OUTPUT
+          echo "setup_file=$setupFile" >> $env:GITHUB_OUTPUT
+        id: get_file_names
+
+      - name: Upload Build Artifacts
+        if: steps.check-exe.outputs.build_success == 'true'
+        uses: actions/upload-artifact@v7
         with:
-          name: build-files-${{ needs.prepare.outputs.version }}
+          name: build-files-${{ needs.prepare.outputs.version }}-${{ matrix.architecture }}
           path: |
-            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}.zip
-            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}.Setup.exe
+            ${{ steps.get_file_names.outputs.zip_file }}
+            ${{ steps.get_file_names.outputs.setup_file }}
 
       - name: Create Build Summary
         if: always()
@@ -370,6 +437,7 @@ jobs:
             echo "**Version:** ${{ needs.prepare.outputs.version }}" >> $GITHUB_STEP_SUMMARY
             echo "**Tag:** \`${{ needs.prepare.outputs.tag_name }}\`" >> $GITHUB_STEP_SUMMARY
             echo "**Release Type:** ${{ needs.prepare.outputs.is_prerelease == 'true' && 'Pre-release' || 'Release' }}" >> $GITHUB_STEP_SUMMARY
+            echo "**Architecture:** ${{ matrix.architecture }}" >> $GITHUB_STEP_SUMMARY
             echo "**Commit:** \`${{ github.sha }}\`" >> $GITHUB_STEP_SUMMARY
             echo "**Run:** #${{ github.run_number }}" >> $GITHUB_STEP_SUMMARY
             echo "" >> $GITHUB_STEP_SUMMARY
@@ -387,6 +455,7 @@ jobs:
             echo "" >> $GITHUB_STEP_SUMMARY
             echo "**Version:** ${{ needs.prepare.outputs.version }}" >> $GITHUB_STEP_SUMMARY
             echo "**Tag:** \`${{ needs.prepare.outputs.tag_name }}\`" >> $GITHUB_STEP_SUMMARY
+            echo "**Architecture:** ${{ matrix.architecture }}" >> $GITHUB_STEP_SUMMARY
             echo "**Event:** ${{ github.event_name }} (${{ github.event.action || 'N/A' }})" >> $GITHUB_STEP_SUMMARY
             echo "**Commit:** \`${{ github.sha }}\`" >> $GITHUB_STEP_SUMMARY
             echo "**Run:** #${{ github.run_number }}" >> $GITHUB_STEP_SUMMARY
@@ -403,49 +472,55 @@ jobs:
       id-token: write
     steps:
       - name: Download Build Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
-          name: build-files-${{ needs.prepare.outputs.version }}
+          pattern: build-files-${{ needs.prepare.outputs.version }}-*
+          merge-multiple: false
           
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
-          python-version: '3.10'
+          python-version: '3.14'
           
       - name: Sign release artifacts with sigstore-python
-        uses: sigstore/gh-action-sigstore-python@v3.2.0
+        uses: sigstore/gh-action-sigstore-python@v3.3.0
         with:
           inputs: |
-            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}.zip
-            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}.Setup.exe
+            build-files-${{ needs.prepare.outputs.version }}-AnyCPU/*.zip
+            build-files-${{ needs.prepare.outputs.version }}-AnyCPU/*.exe
+            build-files-${{ needs.prepare.outputs.version }}-x86/*.zip
+            build-files-${{ needs.prepare.outputs.version }}-x86/*.exe
           release-signing-artifacts: true
           upload-signing-artifacts: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           
       - name: Upload Signed Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: signed-files-${{ needs.prepare.outputs.version }}
           path: |
-            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}.zip.sigstore.json
-            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}.Setup.exe.sigstore.json
+            build-files-${{ needs.prepare.outputs.version }}-AnyCPU/*.sigstore.json
+            build-files-${{ needs.prepare.outputs.version }}-x86/*.sigstore.json
 
   release:
     needs: [prepare, build, sign]
     if: success()
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     permissions:
       contents: write
-    
+    outputs:
+      enhanced_changelog: ${{steps.enhanced_changelog.outputs.enhanced_changelog}}
+
     steps:
       - name: Download Build Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
-          name: build-files-${{ needs.prepare.outputs.version }}
+          pattern: build-files-${{ needs.prepare.outputs.version }}-*
+          merge-multiple: true
           
       - name: Download Signed Artifacts (if exists)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: signed-files-${{ needs.prepare.outputs.version }}
         continue-on-error: true
@@ -453,35 +528,64 @@ jobs:
       - name: Create enhanced changelog with file table
         id: enhanced_changelog
         run: |
-          version="${{ needs.prepare.outputs.version }}"
+          version='${{ needs.prepare.outputs.version }}'
           
           # 读取git-cliff生成的changelog内容
-          originalChangelog="${{ needs.prepare.outputs.changelog }}"
+          originalChangelog='${{ needs.prepare.outputs.changelog }}'
+          
+          # 检查是否为预发布版本，如果是则添加警告提示
+          if [ '${{ needs.prepare.outputs.is_prerelease }}' = "true" ]; then
+            warningText=$'\n> [!CAUTION]\n'
+            warningText+=$'> **注意：此版本为预览或测试版**\n'
+            warningText+=$'> \n'
+            warningText+=$'> 请注意，这是一个预览/测试版本，使用时可能出现BUG，常规用户建议使用预览版或正式版\n\n'
+            originalChangelog="${warningText}${originalChangelog}"
+          fi
           
           # 构建文件信息表格
           fileTable=$'\n## 文件信息 (File Information)\n'
           fileTable+=$'| 文件名 | 大小 |\n'
           fileTable+=$'|--------|------|\n'
           
-          # ZIP 文件信息
-          fileTable+=$'| InkCanvasForClass.CE.'"$version"
-          fileTable+=$'.zip | ${{ needs.build.outputs.zip_size }} bytes |\n'
+          # AnyCPU (x64) 架构文件
+          if [ -f "InkCanvasForClass.CE.$version-x64.zip" ]; then
+            zipSize=$(wc -c < "InkCanvasForClass.CE.$version-x64.zip")
+            fileTable+=$'| InkCanvasForClass.CE.'"$version"'-x64.zip | '"$zipSize"' bytes |\n'
+          fi
           
-          # 安装包文件信息
-          installerSize="${{ needs.build.outputs.installer_size }}"
-          if [ -n "$installerSize" ]; then
+          if [ -f "InkCanvasForClass.CE.$version-x64.Setup.exe" ]; then
+            installerSize=$(wc -c < "InkCanvasForClass.CE.$version-x64.Setup.exe")
+            fileTable+=$'| InkCanvasForClass.CE.'"$version"'-x64.Setup.exe | '"$installerSize"' bytes |\n'
+          fi
+          
+          if [ -f "InkCanvasForClass.CE.$version-x64.zip.sigstore.json" ]; then
+            sigstoreSize=$(wc -c < "InkCanvasForClass.CE.$version-x64.zip.sigstore.json")
+            fileTable+=$'| InkCanvasForClass.CE.'"$version"'-x64.zip.sigstore.json | '"$sigstoreSize"' bytes |\n'
+          fi
+          
+          if [ -f "InkCanvasForClass.CE.$version-x64.Setup.exe.sigstore.json" ]; then
+            sigstoreSize=$(wc -c < "InkCanvasForClass.CE.$version-x64.Setup.exe.sigstore.json")
+            fileTable+=$'| InkCanvasForClass.CE.'"$version"'-x64.Setup.exe.sigstore.json | '"$sigstoreSize"' bytes |\n'
+          fi
+          
+          # x86 架构文件
+          if [ -f "InkCanvasForClass.CE.$version.zip" ]; then
+            zipSize=$(wc -c < "InkCanvasForClass.CE.$version.zip")
+            fileTable+=$'| InkCanvasForClass.CE.'"$version"'.zip | '"$zipSize"' bytes |\n'
+          fi
+          
+          if [ -f "InkCanvasForClass.CE.$version.Setup.exe" ]; then
+            installerSize=$(wc -c < "InkCanvasForClass.CE.$version.Setup.exe")
             fileTable+=$'| InkCanvasForClass.CE.'"$version"'.Setup.exe | '"$installerSize"' bytes |\n'
           fi
           
-          # 检查是否有签名文件
           if [ -f "InkCanvasForClass.CE.$version.zip.sigstore.json" ]; then
-            sigstoreSize=$(stat -c%s "InkCanvasForClass.CE.$version.zip.sigstore.json")
+            sigstoreSize=$(wc -c < "InkCanvasForClass.CE.$version.zip.sigstore.json")
             fileTable+=$'| InkCanvasForClass.CE.'"$version"'.zip.sigstore.json | '"$sigstoreSize"' bytes |\n'
           fi
           
-          # 检查安装程序签名文件
           if [ -f "InkCanvasForClass.CE.$version.Setup.exe.sigstore.json" ]; then
-            sigstoreSize=$(stat -c%s "InkCanvasForClass.CE.$version.Setup.exe.sigstore.json")
+            sigstoreSize=$(wc -c < "InkCanvasForClass.CE.$version.Setup.exe.sigstore.json")
             fileTable+=$'| InkCanvasForClass.CE.'"$version"'.Setup.exe.sigstore.json | '"$sigstoreSize"' bytes |\n'
           fi
           
@@ -511,13 +615,140 @@ jobs:
           name: ICC CE ${{ needs.prepare.outputs.version }}
           body: |
             ${{ steps.enhanced_changelog.outputs.enhanced_changelog }}
-          draft: false
+          draft: ${{ github.event.inputs.draft || false }}
           prerelease: ${{ needs.prepare.outputs.is_prerelease == 'true' }}
           files: |
+            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}-x64.zip
+            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}-x64.Setup.exe
+            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}-x64.zip.sigstore.json
+            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}-x64.Setup.exe.sigstore.json
             InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}.zip
             InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}.Setup.exe
             InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}.zip.sigstore.json
             InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}.Setup.exe.sigstore.json
           fail_on_unmatched_files: false
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  
+  post_release:
+    needs: [prepare, release]
+    if: success() && github.event.inputs.draft != 'true'
+    runs-on: ubuntu-slim
+    permissions:
+      id-token: write
+      contents: write
+    steps:
+      - name: Download Build Artifacts
+        uses: actions/download-artifact@v8
+        with:
+          pattern: build-files-${{ needs.prepare.outputs.version }}-*
+          merge-multiple: true
+
+      - name: Get beta token
+        uses: octo-sts/action@main
+        id: octo-sts-beta
+        with:
+          scope: InkCanvasForClass/community-beta
+          identity: repo-sync
+
+      - name: Get download token
+        uses: octo-sts/action@main
+        id: octo-sts-downloads
+        with:
+          scope: InkCanvasForClass/downloads
+          identity: repo-sync
+      
+      - name: Sync downloads repos(Universal)
+        env:
+          GITHUB_TOKEN: ${{ steps.octo-sts-downloads.outputs.token }}
+        run: |
+          set -e
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          
+          REPO_DIR=$(mktemp -d)
+          git clone --depth 1 --filter=blob:none --branch main https://x-access-token:${{ steps.octo-sts-downloads.outputs.token }}@github.com/InkCanvasForClass/downloads.git $REPO_DIR
+          
+          cd $REPO_DIR
+          IS_PRERELEASE="${{ needs.prepare.outputs.is_prerelease }}"
+          VERSION="${{ needs.prepare.outputs.version }}"
+          X64_ZIP_FILE="$GITHUB_WORKSPACE/InkCanvasForClass.CE.$VERSION-x64.zip"
+          X86_ZIP_FILE="$GITHUB_WORKSPACE/InkCanvasForClass.CE.$VERSION.zip"
+          
+          if [ "$IS_PRERELEASE" == "true" ]; then
+            mkdir -p Beta
+            if [ -f "$X64_ZIP_FILE" ]; then
+              cp "$X64_ZIP_FILE" Beta/
+              git add Beta/InkCanvasForClass.CE.$VERSION-x64.zip
+            fi
+            if [ -f "$X86_ZIP_FILE" ]; then
+              cp "$X86_ZIP_FILE" Beta/
+              git add Beta/InkCanvasForClass.CE.$VERSION.zip
+            fi
+            git commit -m "Add $VERSION PreRelease"
+          else
+            mkdir -p Release Beta
+            if [ -f "$X64_ZIP_FILE" ]; then
+              cp "$X64_ZIP_FILE" Release/
+              cp "$X64_ZIP_FILE" Beta/
+              git add Release/InkCanvasForClass.CE.$VERSION-x64.zip Beta/InkCanvasForClass.CE.$VERSION-x64.zip
+            fi
+            if [ -f "$X86_ZIP_FILE" ]; then
+              cp "$X86_ZIP_FILE" Release/
+              cp "$X86_ZIP_FILE" Beta/
+              git add Release/InkCanvasForClass.CE.$VERSION.zip Beta/InkCanvasForClass.CE.$VERSION.zip
+            fi
+            git commit -m "Add $VERSION Release"
+          fi
+          git push origin main
+            
+      - name: Update AutomaticUpdateVersionControl in beta repo
+        env:
+          GITHUB_TOKEN: ${{ steps.octo-sts-beta.outputs.token }}
+        run: |
+          CONTENT=$(echo -n "${{ needs.prepare.outputs.version }}" | base64 -w0)
+
+          SHA=$(gh api /repos/InkCanvasForClass/community-beta/contents/AutomaticUpdateVersionControl.txt --jq '.sha' 2>/dev/null || echo "")
+
+          gh api \
+            --method PUT \
+            /repos/InkCanvasForClass/community-beta/contents/AutomaticUpdateVersionControl.txt \
+            -f message="Update AutomaticUpdateVersionControl.txt" \
+            -f content="$CONTENT" \
+            -f branch="main" \
+            ${SHA:+-f sha="$SHA"}
+      
+      - name: Create GitHub Release on beta repo
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ needs.prepare.outputs.tag_name }}
+          name: ICC CE ${{ needs.prepare.outputs.version }}
+          body: |
+            ${{ needs.release.outputs.enhanced_changelog }}
+          draft: false
+          prerelease: ${{ needs.prepare.outputs.is_prerelease == 'true' }}
+          files: |
+            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}-x64.zip
+            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}.zip
+          fail_on_unmatched_files: false
+          repository: "InkCanvasForClass/community-beta"
+          token: ${{ steps.octo-sts-beta.outputs.token }}
+        env:
+          GITHUB_TOKEN: ${{ steps.octo-sts-beta.outputs.token }}
+
+      - name: Update community repo AutomaticUpdateVersionControl
+        if: ${{needs.prepare.outputs.is_prerelease == 'false'}}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          CONTENT=$(echo -n "${{ needs.prepare.outputs.version }}" | base64 -w0)
+
+          SHA=$(gh api /repos/InkCanvasForClass/community/contents/AutomaticUpdateVersionControl.txt --jq '.sha' 2>/dev/null || echo "")
+
+          gh api \
+            --method PUT \
+            /repos/InkCanvasForClass/community/contents/AutomaticUpdateVersionControl.txt \
+            -f message="Update AutomaticUpdateVersionControl.txt" \
+            -f content="$CONTENT" \
+            -f branch="net6" \
+            ${SHA:+-f sha="$SHA"}

.gitignore

@@ -429,4 +429,5 @@ FodyWeavers.xsd
 
 # Telemetry DSN configuration file (contains sensitive information)
 telemetry_dsn.txt
-**/telemetry_dsn.txt
+**/telemetry_dsn.txt
+.trae/skills/migrate-toggle-switch/SKILL.md

Ink Canvas.sln

@@ -1,10 +1,14 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.5.33530.505
+# Visual Studio Version 18
+VisualStudioVersion = 18.4.11626.88 stable
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InkCanvasForClass", "Ink Canvas\InkCanvasForClass.csproj", "{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InkCanvas.PluginSdk", "InkCanvas.PluginSdk\InkCanvas.PluginSdk.csproj", "{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InkCanvas.Controls", "InkCanvas.Controls\InkCanvas.Controls.csproj", "{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,22 +27,62 @@ 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
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|ARM.Build.0 = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|x64.Build.0 = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|x86.Build.0 = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|ARM.Build.0 = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|ARM64.Build.0 = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|x64.ActiveCfg = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|x64.Build.0 = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|x86.ActiveCfg = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|x86.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|ARM.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x64.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x86.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM64.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x64.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x64.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x86.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Ink Canvas/App.xaml

@@ -1,9 +1,11 @@
-<Application x:Class="Ink_Canvas.App"
+<Application x:Class="Ink_Canvas.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Ink_Canvas"
-             xmlns:tb="http://www.hardcodet.net/taskbar"
+             xmlns:props="clr-namespace:Ink_Canvas.Properties"
+             xmlns:tb="clr-namespace:H.NotifyIcon;assembly=H.NotifyIcon.Wpf"
              xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+             xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
 >
     <Application.Resources>
         <ResourceDictionary>
@@ -13,9 +15,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 +33,42 @@
                         </Image>
                     </MenuItem.Icon>
                 </MenuItem>
+                <MenuItem Name="TempShowMainWindowTrayIconMenuItem" Click="TempShowMainWindowTrayIconMenuItem_Clicked">
+                    <MenuItem.Header>
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                            <TextBlock FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="{x:Static props:Strings.Tray_TempShowMainWindow}" />
+                        </ikw:SimpleStackPanel>
+                    </MenuItem.Header>
+                    <MenuItem.Icon>
+                        <Image Width="28" Height="28" Margin="-2">
+                            <Image.Source>
+                                <DrawingImage>
+                                    <DrawingImage.Drawing>
+                                        <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                            <GeometryDrawing Brush="#27272a" Geometry="F0 M24,24z M0,0z M5,6C4.73478,6 4.48043,6.10536 4.29289,6.29289 4.10536,6.48043 4,6.73478 4,7L4,17C4,17.2652 4.10536,17.5196 4.29289,17.7071 4.48043,17.8946 4.73478,18 5,18L19,18C19.2652,18 19.5196,17.8946 19.7071,17.7071 19.8946,17.5196 20,17.2652 20,17L20,7C20,6.73478 19.8946,6.48043 19.7071,6.29289 19.5196,6.10536 19.2652,6 19,6L5,6z M2.87868,4.87868C3.44129,4.31607,4.20435,4,5,4L19,4C19.7957,4 20.5587,4.31607 21.1213,4.87868 21.6839,5.44129 22,6.20435 22,7L22,17C22,17.7957 21.6839,18.5587 21.1213,19.1213 20.5587,19.6839 19.7957,20 19,20L5,20C4.20435,20 3.44129,19.6839 2.87868,19.1213 2.31607,18.5587 2,17.7956 2,17L2,7C2,6.20435,2.31607,5.44129,2.87868,4.87868z M5,8C5,7.44772,5.44772,7,6,7L6.01,7C6.56228,7 7.01,7.44772 7.01,8 7.01,8.55228 6.56228,9 6.01,9L6,9C5.44772,9,5,8.55228,5,8z M9,7C8.44772,7 8,7.44772 8,8 8,8.55228 8.44772,9 9,9L9.01,9C9.56228,9 10.01,8.55228 10.01,8 10.01,7.44772 9.56228,7 9.01,7L9,7z" />
+                                        </DrawingGroup>
+                                    </DrawingImage.Drawing>
+                                </DrawingImage>
+                            </Image.Source>
+                        </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="{x:Static props:Strings.Tray_OpenSettings}" />
+                        </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 +86,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 +96,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 +119,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 +129,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 +164,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 +174,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 +195,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 +205,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 +227,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 +237,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">
@@ -231,7 +263,7 @@
                             ToolTipText="InkCanvasForClass"
                             ContextMenu="{StaticResource SysTrayMenu}"
                             IconSource="/Resources/icc.ico"/>
-                <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary.MergedDictionaries>
                 <ui:ThemeResources/>
                 <ui:XamlControlsResources />
                 <ResourceDictionary Source="Resources/SeewoImageDictionary.xaml"/>

Ink Canvas/App.xaml.cs

@@ -1,10 +1,14 @@
-using Hardcodet.Wpf.TaskbarNotification;
+using H.NotifyIcon;
 using Ink_Canvas.Helpers;
+using Ink_Canvas.Plugins;
+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.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -15,12 +19,12 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Forms;
 using System.Windows.Input;
+using System.Windows.Interop;
 using System.Windows.Threading;
 using Application = System.Windows.Application;
 using MessageBox = System.Windows.MessageBox;
 using SplashScreen = Ink_Canvas.Windows.SplashScreen;
 using Timer = System.Threading.Timer;
-using Sentry;
 
 namespace Ink_Canvas
 {
@@ -31,6 +35,20 @@ namespace Ink_Canvas
     {
         Mutex mutex;
 
+        public void ReleaseMutexForRestart()
+        {
+            try
+            {
+                if (mutex != null)
+                {
+                    mutex.ReleaseMutex();
+                    mutex.Dispose();
+                    mutex = null;
+                }
+            }
+            catch { }
+        }
+
         public static string[] StartArgs;
         public static string RootPath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
 
@@ -42,8 +60,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");
         // 新增：崩溃日志文件路径
@@ -56,9 +78,16 @@ namespace Ink_Canvas
         private static string lastErrorMessage = string.Empty;
         // 新增：是否已初始化崩溃监听器
         private static bool crashListenersInitialized;
+        private IntPtr processDestroyHook = IntPtr.Zero;
+        private IntPtr monitoredMainWindowHandle = IntPtr.Zero;
+        private bool mainWindowDestroyedLogged;
+        private WinEventDelegate processDestroyHookCallback;
         // 新增：启动画面相关
         private static SplashScreen _splashScreen;
         private static bool _isSplashScreenShown = false;
+        private static System.Resources.ResourceSet _pendingLocalizedResourceSet;
+        private static readonly Stopwatch startupStopwatch = new Stopwatch();
+        private static readonly Stopwatch splashStopwatch = new Stopwatch();
 
         [DllImport("shell32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
         private static extern int SetCurrentProcessExplicitAppUserModelID(string appId);
@@ -187,15 +216,13 @@ namespace Ink_Canvas
                 // 尝试注册Windows关闭消息监听
                 SetConsoleCtrlHandler(ConsoleCtrlHandler, true);
 
-                // 如果系统支持，添加Windows Management Instrumentation监听器
                 try
                 {
-                    // 使用反射动态加载和调用WMI
-                    TrySetupWmiMonitoring();
+                    TrySetupTerminationMonitoring();
                 }
-                catch (Exception wmiEx)
+                catch (Exception monitorEx)
                 {
-                    LogHelper.WriteLogToFile($"设置WMI进程监控失败: {wmiEx.Message}", LogHelper.LogType.Warning);
+                    LogHelper.WriteLogToFile($"设置终止监控失败: {monitorEx.Message}", LogHelper.LogType.Warning);
                 }
 
                 crashListenersInitialized = true;
@@ -207,80 +234,114 @@ namespace Ink_Canvas
             }
         }
 
-        // 动态加载WMI监控
-        private void TrySetupWmiMonitoring()
+        private void TrySetupTerminationMonitoring()
         {
             try
             {
-                // 检查System.Management程序集是否可用
-                var assemblyName = "System.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
-                var assembly = Assembly.Load(assemblyName);
-                if (assembly == null)
-                {
-                    LogHelper.WriteLogToFile("未找到System.Management程序集，跳过WMI监控", LogHelper.LogType.Warning);
-                    return;
-                }
+                processDestroyHookCallback = OnWinEventMainWindowDestroyed;
 
-                // 使用反射创建WMI查询
-                var watcherType = assembly.GetType("System.Management.ManagementEventWatcher");
-                if (watcherType == null)
-                {
-                    LogHelper.WriteLogToFile("未找到ManagementEventWatcher类型，跳过WMI监控", LogHelper.LogType.Warning);
-                    return;
-                }
-
-                // 构建WMI查询字符串
-                string queryString = $"SELECT * FROM __InstanceDeletionEvent WITHIN 1 WHERE TargetInstance ISA 'Win32_Process' AND TargetInstance.ProcessId = {currentProcessId}";
-
-                // 创建ManagementEventWatcher实例
-                object watcher = Activator.CreateInstance(watcherType, queryString);
-
-                // 获取EventArrived事件信息
-                var eventInfo = watcherType.GetEvent("EventArrived");
-                if (eventInfo == null)
-                {
-                    LogHelper.WriteLogToFile("未找到EventArrived事件，跳过WMI监控", LogHelper.LogType.Warning);
-                    return;
-                }
-
-                // 创建委托并订阅事件
-                Type delegateType = eventInfo.EventHandlerType;
-                var handler = Delegate.CreateDelegate(delegateType, this, GetType().GetMethod("WmiEventHandler", BindingFlags.NonPublic | BindingFlags.Instance));
-                eventInfo.AddEventHandler(watcher, handler);
-
-                // 启动监听
-                var startMethod = watcherType.GetMethod("Start");
-                startMethod.Invoke(watcher, null);
-
-                LogHelper.WriteLogToFile("已成功启动WMI进程监控");
+                // 等主窗口句柄可用后再开始监听
+                Dispatcher.BeginInvoke(new Action(BindMainWindowLifecycle), DispatcherPriority.ApplicationIdle);
             }
             catch (Exception ex)
             {
-                LogHelper.WriteLogToFile($"动态加载WMI监控失败: {ex.Message}", LogHelper.LogType.Warning);
+                LogHelper.WriteLogToFile($"初始化终止监控失败: {ex.GetType().FullName}: {ex.Message}", LogHelper.LogType.Warning);
             }
         }
 
-        // WMI事件处理方法
-        private void WmiEventHandler(object sender, EventArgs e)
+        private void BindMainWindowLifecycle()
         {
             try
             {
-                // 尝试从事件参数中提取信息
-                dynamic eventArgs = e;
-                dynamic newEvent = eventArgs.NewEvent;
-                if (newEvent != null)
+                if (Current?.MainWindow == null)
                 {
-                    dynamic targetInstance = newEvent["TargetInstance"];
-                    if (targetInstance != null)
-                    {
-                        string processName = targetInstance["Name"]?.ToString() ?? "未知进程";
-                        WriteCrashLog($"WMI检测到进程{processName}(ID:{currentProcessId})已终止");
-                    }
+                    return;
+                }
+
+                Current.MainWindow.SourceInitialized -= MainWindow_SourceInitialized;
+                Current.MainWindow.SourceInitialized += MainWindow_SourceInitialized;
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        private void MainWindow_SourceInitialized(object sender, EventArgs e)
+        {
+            try
+            {
+                if (!(sender is Window window))
+                {
+                    return;
+                }
+
+                monitoredMainWindowHandle = new WindowInteropHelper(window).Handle;
+                if (monitoredMainWindowHandle == IntPtr.Zero)
+                {
+                    return;
+                }
+
+                RegisterMainWindowDestroyHook();
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        private void RegisterMainWindowDestroyHook()
+        {
+            if (processDestroyHook != IntPtr.Zero || monitoredMainWindowHandle == IntPtr.Zero)
+            {
+                return;
+            }
+
+            processDestroyHook = SetWinEventHook(
+                EVENT_OBJECT_DESTROY,
+                EVENT_OBJECT_DESTROY,
+                IntPtr.Zero,
+                processDestroyHookCallback,
+                (uint)currentProcessId,
+                0,
+                WINEVENT_OUTOFCONTEXT);
+
+            if (processDestroyHook == IntPtr.Zero)
+            {
+                return;
+            }
+        }
+
+        private void OnWinEventMainWindowDestroyed(IntPtr hWinEventHook, uint eventType, IntPtr hwnd, int idObject, int idChild, uint dwEventThread, uint dwmsEventTime)
+        {
+            if (eventType != EVENT_OBJECT_DESTROY || mainWindowDestroyedLogged)
+            {
+                return;
+            }
+
+            if (idObject != OBJID_WINDOW || idChild != CHILDID_SELF)
+            {
+                return;
+            }
+
+            if (hwnd != monitoredMainWindowHandle || hwnd == IntPtr.Zero)
+            {
+                return;
+            }
+
+            mainWindowDestroyedLogged = true;
+        }
+
+        private void CleanupTerminationMonitoring()
+        {
+            try
+            {
+                if (processDestroyHook != IntPtr.Zero)
+                {
+                    UnhookWinEvent(processDestroyHook);
+                    processDestroyHook = IntPtr.Zero;
                 }
             }
-            catch (Exception ex)
+            catch
             {
-                LogHelper.WriteLogToFile($"处理WMI事件时出错: {ex.Message}", LogHelper.LogType.Warning);
             }
         }
 
@@ -289,6 +350,19 @@ namespace Ink_Canvas
         private static extern bool SetConsoleCtrlHandler(ConsoleCtrlDelegate handler, bool add);
 
         private delegate bool ConsoleCtrlDelegate(int ctrlType);
+        private delegate void WinEventDelegate(IntPtr hWinEventHook, uint eventType, IntPtr hwnd, int idObject, int idChild, uint dwEventThread, uint dwmsEventTime);
+
+        private const uint EVENT_OBJECT_DESTROY = 0x8001;
+        private const uint WINEVENT_OUTOFCONTEXT = 0x0000;
+        private const int OBJID_WINDOW = 0;
+        private const int CHILDID_SELF = 0;
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr SetWinEventHook(uint eventMin, uint eventMax, IntPtr hmodWinEventProc, WinEventDelegate lpfnWinEventProc, uint idProcess, uint idThread, uint dwFlags);
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool UnhookWinEvent(IntPtr hWinEventHook);
 
         private static bool ConsoleCtrlHandler(int ctrlType)
         {
@@ -416,13 +490,14 @@ namespace Ink_Canvas
                         $"[{DateTime.Now:yyyy-MM-dd HH:mm:ss}] 记录未处理异常时发生错误: {ex.Message}\r\n"
                     );
                 }
-                catch { }
+                catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
             }
         }
 
         // 处理进程退出事件
         private void CurrentDomain_ProcessExit(object sender, EventArgs e)
         {
+            CleanupTerminationMonitoring();
             TimeSpan runDuration = DateTime.Now - appStartTime;
             string durationText = FormatTimeSpan(runDuration);
             WriteCrashLog($"应用程序退出，运行时长: {durationText}");
@@ -471,6 +546,7 @@ namespace Ink_Canvas
                 _splashScreen.Show();
                 _isSplashScreenShown = true;
                 splashScreenStartTime = DateTime.Now;
+                splashStopwatch.Restart();
                 LogHelper.WriteLogToFile("启动画面已显示");
             }
             catch (Exception ex)
@@ -540,6 +616,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)
         {
@@ -572,7 +661,7 @@ namespace Ink_Canvas
                 // 同时记录到主日志
                 LogHelper.WriteLogToFile(message, LogHelper.LogType.Error);
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
 
         // 增加字段保存崩溃后操作设置
@@ -589,7 +678,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;
                 }
                 // 从主窗口同步
@@ -598,7 +687,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)
@@ -628,7 +717,7 @@ namespace Ink_Canvas
                 }
             }
 
-            Ink_Canvas.MainWindow.ShowNewMessage("抱歉，出现未预期的异常，可能导致 InkCanvasForClass 运行不稳定。\n建议保存墨迹后重启应用。");
+            Ink_Canvas.MainWindow.ShowNewMessage(Strings.GetString("Msg_UnexpectedError"));
             LogHelper.NewLog(e.Exception.ToString());
 
             // 记录到崩溃日志
@@ -644,7 +733,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);
                 }
@@ -653,7 +742,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 时不做处理
@@ -661,24 +750,41 @@ 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;
+            startupStopwatch.Restart();
+
+            TryApplyPreferredLanguageFromSettings();
+
+            _pendingLocalizedResourceSet = Strings.ResourceManager.GetResourceSet(CultureInfo.CurrentUICulture, true, true);
 
             // 根据设置决定是否显示启动画面
-            if (ShouldShowSplashScreen())
+            if (ShouldShowSplashScreen() && !IsLaunchByFileOrUri(e.Args))
             {
+                await Task.Delay(100);
                 ShowSplashScreen();
-                SetSplashMessage("正在启动 Ink Canvas...");
+                SetSplashMessage(Strings.GetString("Splash_Starting"));
                 SetSplashProgress(20);
-                await Task.Delay(500);
 
                 // 强制刷新UI，确保启动画面显示
                 Application.Current.Dispatcher.Invoke(() => { }, DispatcherPriority.Render);
             }
 
-            System.Threading.Thread.Sleep(500);
+            await Task.Delay(100);
             RootPath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
 
             LogHelper.NewLog(string.Format("Ink Canvas Starting (Version: {0})", Assembly.GetExecutingAssembly().GetName().Version));
@@ -714,15 +820,6 @@ namespace Ink_Canvas
             {
                 SetSplashMessage("正在初始化组件...");
                 SetSplashProgress(40);
-                await Task.Delay(500);
-            }
-            try
-            {
-                IACoreDllExtractor.ExtractIACoreDlls();
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"释放IACore DLL时出错: {ex.Message}", LogHelper.LogType.Error);
             }
 
             // 释放UIAccess DLL
@@ -730,28 +827,13 @@ namespace Ink_Canvas
             {
                 SetSplashMessage("正在初始化组件...");
                 SetSplashProgress(50);
-                await Task.Delay(300);
-            }
-            try
-            {
-                UIAccessDllExtractor.ExtractUIAccessDlls();
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"释放UIAccess DLL时出错: {ex.Message}", LogHelper.LogType.Error);
             }
 
-            // 记录应用启动（设备标识符）
             if (_isSplashScreenShown)
             {
                 SetSplashMessage("正在加载配置...");
                 SetSplashProgress(60);
-                await Task.Delay(500);
             }
-            DeviceIdentifier.RecordAppLaunch();
-            LogHelper.WriteLogToFile($"App | 设备ID: {DeviceIdentifier.GetDeviceId()}");
-            LogHelper.WriteLogToFile($"App | 使用频率: {DeviceIdentifier.GetUsageFrequency()}");
-            LogHelper.WriteLogToFile($"App | 更新优先级: {DeviceIdentifier.GetUpdatePriority()}");
 
             // 处理更新模式启动
             bool isUpdateMode = AutoUpdateHelper.HandleUpdateModeStartup(e.Args);
@@ -890,7 +972,7 @@ namespace Ink_Canvas
                             LogHelper.WriteLogToFile("App | 清理损坏的更新标记文件");
                         }
                     }
-                    catch { }
+                    catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
                 }
             }
 
@@ -983,7 +1065,7 @@ namespace Ink_Canvas
                             watchdogProcess.Kill();
                         }
                     }
-                    catch { }
+                    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
                     Environment.Exit(0);
                 }
             }
@@ -1011,7 +1093,7 @@ namespace Ink_Canvas
                 mutex = new Mutex(true, mutexName, out bool tempRet);
 
                 // 额外等待一小段时间确保更新进程完全退出
-                Thread.Sleep(1000);
+                await Task.Delay(1000);
                 LogHelper.WriteLogToFile("App | 特殊模式等待完成，继续启动");
             }
 
@@ -1024,18 +1106,48 @@ namespace Ink_Canvas
             {
                 SetSplashMessage("正在初始化主界面...");
                 SetSplashProgress(80);
-                await Task.Delay(500);
             }
             var mainWindow = new MainWindow();
             MainWindow = mainWindow;
 
+            // 注册 InkCanvas 服务供插件使用
+            try
+            {
+                var inkCanvasService = new Plugins.InkCanvasService(mainWindow);
+                Plugins.PluginManager.Instance.RegisterService<Plugins.IInkCanvasService>(inkCanvasService);
+                LogHelper.WriteLogToFile("InkCanvasService registered for plugins");
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"Failed to register InkCanvasService: {ex.Message}", LogHelper.LogType.Error);
+            }
+
+            try
+            {
+                var appRestartService = new Plugins.AppRestartService();
+                Plugins.PluginManager.Instance.RegisterService<Plugins.IAppRestartService>(appRestartService);
+                LogHelper.WriteLogToFile("AppRestartService registered for plugins");
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"Failed to register AppRestartService: {ex.Message}", LogHelper.LogType.Error);
+            }
+
             // 主窗口加载完成后关闭启动画面
             mainWindow.Loaded += (s, args) =>
             {
                 isStartupComplete = true;
                 startupCompleteHeartbeat = DateTime.Now;
-                LogHelper.WriteLogToFile($"启动完成心跳已记录，启动画面显示时长: {(startupCompleteHeartbeat - splashScreenStartTime).TotalSeconds:F2}秒");
-                
+                if (_isSplashScreenShown && splashStopwatch.IsRunning)
+                {
+                    LogHelper.WriteLogToFile($"启动完成心跳已记录，启动画面显示时长: {splashStopwatch.Elapsed.TotalSeconds:F2}秒");
+                }
+                else
+                {
+                    LogHelper.WriteLogToFile($"启动完成心跳已记录");
+                }
+                LogHelper.WriteLogToFile($"启动时长: {startupStopwatch.Elapsed.TotalSeconds:F2}秒");
+
                 if (_isSplashScreenShown)
                 {
                     SetSplashMessage("完成初始化...");
@@ -1057,6 +1169,19 @@ namespace Ink_Canvas
             };
 
             mainWindow.Show();
+            _ = Task.Run(async () =>
+            {
+                await Task.Delay(600);
+                Dispatcher.Invoke(() => _taskbar?.ForceCreate());
+            });
+            Dispatcher.BeginInvoke(new Action(() =>
+            {
+                if (_pendingLocalizedResourceSet != null)
+                {
+                    LoadLocalizedResources(_pendingLocalizedResourceSet);
+                    _pendingLocalizedResourceSet = null;
+                }
+            }), DispatcherPriority.ApplicationIdle);
 
             // 处理启动时的URI参数
             string startupUriArg = e.Args.FirstOrDefault(a => a.StartsWith("icc:", StringComparison.OrdinalIgnoreCase));
@@ -1073,29 +1198,123 @@ namespace Ink_Canvas
                 });
             }
 
-            // 注册.icstk文件关联
+            _ = RunDeferredStartupTasksAsync();
+
+        }
+
+        private async Task RunDeferredStartupTasksAsync()
+        {
             try
             {
-                LogHelper.WriteLogToFile("开始注册.icstk文件关联");
-                FileAssociationManager.RegisterFileAssociation();
-                FileAssociationManager.ShowFileAssociationStatus();
+                await Task.Delay(1200);
+
+                try
+                {
+                    IACoreDllExtractor.ExtractIACoreDlls();
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"释放IACore DLL时出错: {ex.Message}", LogHelper.LogType.Error);
+                }
+
+                try
+                {
+                    LogHelper.WriteLogToFile("开始注册.icstk文件关联");
+                    FileAssociationManager.RegisterFileAssociation();
+                    FileAssociationManager.ShowFileAssociationStatus();
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"注册文件关联时出错: {ex.Message}", LogHelper.LogType.Error);
+                }
+
+                try
+                {
+                    LogHelper.WriteLogToFile("启动IPC监听器");
+                    FileAssociationManager.StartIpcListener();
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"启动IPC监听器时出错: {ex.Message}", LogHelper.LogType.Error);
+                }
+
+                try
+                {
+                    LogHelper.WriteLogToFile("初始化上传帮助类");
+                    Helpers.UploadHelper.Initialize();
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"初始化上传帮助类时出错: {ex.Message}", LogHelper.LogType.Error);
+                }
+
+                try
+                {
+                    LogHelper.WriteLogToFile("开始加载插件");
+                    await PluginManager.Instance.LoadAllAsync();
+                    LogHelper.WriteLogToFile(string.Format("插件加载完成，共加载 {0} 个插件", PluginManager.Instance.Plugins.Count));
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile(string.Format("加载插件时出错: {0}", ex.Message), LogHelper.LogType.Error);
+                }
+
+                try
+                {
+                    await Task.Delay(1500);
+                    DeviceIdentifier.RecordAppLaunch();
+                    var systemVersion = DeviceIdentifier.GetSystemVersion();
+                    if (!string.IsNullOrWhiteSpace(systemVersion))
+                    {
+                        SentrySdk.ConfigureScope(scope =>
+                        {
+                            scope.SetTag("system_version", systemVersion);
+                        });
+                    }
+
+                    LogHelper.WriteLogToFile($"App | 设备ID: {DeviceIdentifier.GetDeviceId()}");
+                    LogHelper.WriteLogToFile($"App | 使用频率: {DeviceIdentifier.GetUsageFrequency()}");
+                    LogHelper.WriteLogToFile($"App | 更新优先级: {DeviceIdentifier.GetUpdatePriority()}");
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"App | 初始化设备统计与遥测标签失败: {ex.Message}", LogHelper.LogType.Warning);
+                }
             }
             catch (Exception ex)
             {
-                LogHelper.WriteLogToFile($"注册文件关联时出错: {ex.Message}", LogHelper.LogType.Error);
+                LogHelper.WriteLogToFile($"启动阶段任务执行失败: {ex.Message}", LogHelper.LogType.Error);
             }
+        }
 
-            // 启动IPC监听器
+        private void TryApplyPreferredLanguageFromSettings()
+        {
             try
             {
-                LogHelper.WriteLogToFile("启动IPC监听器");
-                FileAssociationManager.StartIpcListener();
+                var settingsPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Configs", "Settings.json");
+                if (!File.Exists(settingsPath)) return;
+
+                var json = File.ReadAllText(settingsPath);
+                dynamic obj = JsonConvert.DeserializeObject(json);
+                string preferredLanguage = obj?["appearance"]?["language"]?.ToString();
+                if (!string.IsNullOrWhiteSpace(preferredLanguage))
+                {
+                    LocalizationHelper.TrySetCulture(preferredLanguage);
+                }
             }
             catch (Exception ex)
             {
-                LogHelper.WriteLogToFile($"启动IPC监听器时出错: {ex.Message}", LogHelper.LogType.Error);
+                LogHelper.WriteLogToFile($"启动时预加载语言失败: {ex.Message}", LogHelper.LogType.Error);
             }
+        }
 
+        private void LoadLocalizedResources(System.Resources.ResourceSet resourceSet)
+        {
+            foreach (System.Collections.DictionaryEntry entry in resourceSet)
+            {
+                if (entry.Key is string key && entry.Value is string value)
+                    Current.Resources[key] = value;
+            }
         }
 
         private void ScrollViewer_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
@@ -1111,9 +1330,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); }
         }
 
         // 用于设置崩溃后操作类型
@@ -1124,7 +1343,7 @@ 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;
@@ -1132,15 +1351,35 @@ namespace Ink_Canvas
         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 (IsOobeShowing)
+                    return;
+
                 if (!isStartupComplete && appStartupStartTime != DateTime.MinValue)
                 {
-                    DateTime startTime = _isSplashScreenShown && splashScreenStartTime != DateTime.MinValue 
-                        ? splashScreenStartTime 
+                    DateTime startTime = _isSplashScreenShown && splashScreenStartTime != DateTime.MinValue
+                        ? splashScreenStartTime
                         : appStartupStartTime;
                     TimeSpan elapsedSinceStart = DateTime.Now - startTime;
                     if (elapsedSinceStart.TotalMinutes >= 2)
@@ -1153,7 +1392,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);
                             }
@@ -1162,33 +1401,47 @@ namespace Ink_Canvas
                                 string exePath = Process.GetCurrentProcess().MainModule.FileName;
                                 Process.Start(exePath);
                             }
-                            catch { }
+                            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
                             Environment.Exit(1);
                         }
                         return;
                     }
                 }
-                
-                if (isStartupComplete && (DateTime.Now - lastHeartbeat).TotalSeconds > 10)
+
+                if (isStartupComplete)
                 {
-                    LogHelper.NewLog("检测到主线程无响应，自动重启。");
-                    SyncCrashActionFromSettings();
-                    if (CrashAction == CrashActionType.SilentRestart)
+                    var now = DateTime.Now;
+                    var sinceHeartbeat = now - lastHeartbeat;
+                    var sinceStartupComplete = startupCompleteHeartbeat == DateTime.MinValue
+                        ? TimeSpan.Zero
+                        : now - startupCompleteHeartbeat;
+
+                    if (sinceStartupComplete.TotalSeconds < 30)
                     {
-                        StartupCount.Increment();
-                        if (StartupCount.GetCount() >= 5)
+                        return;
+                    }
+
+                    if (sinceHeartbeat.TotalSeconds > 10)
+                    {
+                        LogHelper.NewLog("检测到主线程无响应，自动重启。");
+                        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
-                        {
-                            string exePath = Process.GetCurrentProcess().MainModule.FileName;
-                            Process.Start(exePath);
-                        }
-                        catch { }
-                        Environment.Exit(1);
                     }
                 }
             }, null, 0, 3000);
@@ -1212,7 +1465,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();
@@ -1228,7 +1490,7 @@ 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);
@@ -1246,15 +1508,18 @@ 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);
                         }
-                        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);
             }
         }
@@ -1295,7 +1560,7 @@ namespace Ink_Canvas
 
                 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");
@@ -1307,7 +1572,7 @@ namespace Ink_Canvas
                             return dsn;
                         }
                     }
-                    
+
                     DirectoryInfo parentDir = Directory.GetParent(currentDir);
                     if (parentDir == null)
                     {
@@ -1326,6 +1591,19 @@ namespace Ink_Canvas
 
         private void App_Exit(object sender, ExitEventArgs e)
         {
+            CleanupTerminationMonitoring();
+            // 卸载所有插件
+            try
+            {
+                LogHelper.WriteLogToFile("正在卸载插件...");
+                PluginManager.Instance.UnloadAll();
+                LogHelper.WriteLogToFile("插件卸载完成");
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"卸载插件时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+
             // 仅在软件内主动退出时关闭看门狗，并写入退出信号
             try
             {
@@ -1362,7 +1640,7 @@ namespace Ink_Canvas
                 {
                     LogHelper.WriteLogToFile($"退出处理时发生错误: {ex.Message}", LogHelper.LogType.Error);
                 }
-                catch { }
+                catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
             }
         }
     }

Ink Canvas/AssemblyInfo.cs

@@ -2,6 +2,7 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
+[assembly: System.Runtime.Versioning.SupportedOSPlatform("windows")]
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
@@ -19,14 +20,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 +44,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.6")]
-[assembly: AssemblyFileVersion("1.7.18.6")]
+[assembly: AssemblyVersion("1.7.18.10")]
+[assembly: AssemblyFileVersion("1.7.18.10")]

Ink Canvas/Controls/BoardMenuFrame.cs

@@ -0,0 +1,141 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace Ink_Canvas.Controls
+{
+    [TemplatePart(Name = PartCloseImage, Type = typeof(UIElement))]
+    [TemplatePart(Name = PartAnimationRoot, Type = typeof(UIElement))]
+    public class BoardMenuFrame : ContentControl
+    {
+        private const string PartCloseImage = "PART_CloseImage";
+        private const string PartAnimationRoot = "PART_AnimationRoot";
+
+        public static readonly DependencyProperty TitleProperty =
+            DependencyProperty.Register(nameof(Title), typeof(object), typeof(BoardMenuFrame), new PropertyMetadata(null));
+
+        public static readonly DependencyProperty TitleFontSizeProperty =
+            DependencyProperty.Register(nameof(TitleFontSize), typeof(double), typeof(BoardMenuFrame), new PropertyMetadata(11d));
+
+        public static readonly DependencyProperty HeaderHeightProperty =
+            DependencyProperty.Register(nameof(HeaderHeight), typeof(double), typeof(BoardMenuFrame), new PropertyMetadata(48d));
+
+        public static readonly DependencyProperty PanelCornerRadiusProperty =
+            DependencyProperty.Register(nameof(PanelCornerRadius), typeof(CornerRadius), typeof(BoardMenuFrame), new PropertyMetadata(new CornerRadius(5)));
+
+        public static readonly DependencyProperty HeaderCornerRadiusProperty =
+            DependencyProperty.Register(nameof(HeaderCornerRadius), typeof(CornerRadius), typeof(BoardMenuFrame), new PropertyMetadata(new CornerRadius(6, 6, 0, 0)));
+
+        public static readonly DependencyProperty PanelBackgroundProperty =
+            DependencyProperty.Register(nameof(PanelBackground), typeof(Brush), typeof(BoardMenuFrame), new PropertyMetadata(null));
+
+        public static readonly DependencyProperty HeaderBackgroundProperty =
+            DependencyProperty.Register(nameof(HeaderBackground), typeof(Brush), typeof(BoardMenuFrame),
+                new PropertyMetadata(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#2563eb"))));
+
+        public static readonly DependencyProperty HeaderBorderBrushProperty =
+            DependencyProperty.Register(nameof(HeaderBorderBrush), typeof(Brush), typeof(BoardMenuFrame),
+                new PropertyMetadata(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#1e3a8a"))));
+
+        public static readonly DependencyProperty IsOpenProperty =
+            DependencyProperty.Register(nameof(IsOpen), typeof(bool), typeof(BoardMenuFrame), new PropertyMetadata(false));
+
+        public static readonly DependencyProperty PlacementTargetProperty =
+            DependencyProperty.Register(nameof(PlacementTarget), typeof(UIElement), typeof(BoardMenuFrame), new PropertyMetadata(null));
+
+        public static readonly DependencyProperty PlacementProperty =
+            DependencyProperty.Register(nameof(Placement), typeof(PlacementMode), typeof(BoardMenuFrame), new PropertyMetadata(PlacementMode.Custom));
+
+        public static readonly DependencyProperty CustomPopupPlacementCallbackProperty =
+            DependencyProperty.Register(nameof(CustomPopupPlacementCallback), typeof(CustomPopupPlacementCallback), typeof(BoardMenuFrame),
+                new PropertyMetadata((CustomPopupPlacementCallback)PlaceCenteredAbove));
+
+        private static CustomPopupPlacement[] PlaceCenteredAbove(Size popupSize, Size targetSize, Point offset)
+        {
+            return new[]
+            {
+                new CustomPopupPlacement(
+                    new Point((targetSize.Width - popupSize.Width) / 2 + offset.X,
+                              -popupSize.Height + offset.Y),
+                    PopupPrimaryAxis.Horizontal),
+                new CustomPopupPlacement(
+                    new Point((targetSize.Width - popupSize.Width) / 2 + offset.X,
+                              targetSize.Height - offset.Y),
+                    PopupPrimaryAxis.Horizontal)
+            };
+        }
+
+        public static readonly DependencyProperty PopupHorizontalOffsetProperty =
+            DependencyProperty.Register(nameof(PopupHorizontalOffset), typeof(double), typeof(BoardMenuFrame), new PropertyMetadata(0d));
+
+        public static readonly DependencyProperty PopupVerticalOffsetProperty =
+            DependencyProperty.Register(nameof(PopupVerticalOffset), typeof(double), typeof(BoardMenuFrame), new PropertyMetadata(-4d));
+
+        public object Title { get => GetValue(TitleProperty); set => SetValue(TitleProperty, value); }
+        public double TitleFontSize { get => (double)GetValue(TitleFontSizeProperty); set => SetValue(TitleFontSizeProperty, value); }
+        public double HeaderHeight { get => (double)GetValue(HeaderHeightProperty); set => SetValue(HeaderHeightProperty, value); }
+        public CornerRadius PanelCornerRadius { get => (CornerRadius)GetValue(PanelCornerRadiusProperty); set => SetValue(PanelCornerRadiusProperty, value); }
+        public CornerRadius HeaderCornerRadius { get => (CornerRadius)GetValue(HeaderCornerRadiusProperty); set => SetValue(HeaderCornerRadiusProperty, value); }
+        public Brush PanelBackground { get => (Brush)GetValue(PanelBackgroundProperty); set => SetValue(PanelBackgroundProperty, value); }
+        public Brush HeaderBackground { get => (Brush)GetValue(HeaderBackgroundProperty); set => SetValue(HeaderBackgroundProperty, value); }
+        public Brush HeaderBorderBrush { get => (Brush)GetValue(HeaderBorderBrushProperty); set => SetValue(HeaderBorderBrushProperty, value); }
+        public bool IsOpen { get => (bool)GetValue(IsOpenProperty); set => SetValue(IsOpenProperty, value); }
+        public UIElement PlacementTarget { get => (UIElement)GetValue(PlacementTargetProperty); set => SetValue(PlacementTargetProperty, value); }
+        public PlacementMode Placement { get => (PlacementMode)GetValue(PlacementProperty); set => SetValue(PlacementProperty, value); }
+        public CustomPopupPlacementCallback CustomPopupPlacementCallback
+        {
+            get => (CustomPopupPlacementCallback)GetValue(CustomPopupPlacementCallbackProperty);
+            set => SetValue(CustomPopupPlacementCallbackProperty, value);
+        }
+        public double PopupHorizontalOffset { get => (double)GetValue(PopupHorizontalOffsetProperty); set => SetValue(PopupHorizontalOffsetProperty, value); }
+        public double PopupVerticalOffset { get => (double)GetValue(PopupVerticalOffsetProperty); set => SetValue(PopupVerticalOffsetProperty, value); }
+
+        public event MouseButtonEventHandler CloseMouseDown;
+        public event MouseButtonEventHandler CloseMouseUp;
+
+        public UIElement AnimationTarget { get; private set; }
+
+        private UIElement _closeImage;
+
+        static BoardMenuFrame()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(BoardMenuFrame), new FrameworkPropertyMetadata(typeof(BoardMenuFrame)));
+            VisibilityProperty.OverrideMetadata(typeof(BoardMenuFrame),
+                new FrameworkPropertyMetadata(Visibility.Collapsed, OnVisibilityChanged));
+        }
+
+        private static void OnVisibilityChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((BoardMenuFrame)d).IsOpen = (Visibility)e.NewValue == Visibility.Visible;
+        }
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            if (_closeImage != null)
+            {
+                _closeImage.MouseDown -= CloseImage_MouseDown;
+                _closeImage.MouseUp -= CloseImage_MouseUp;
+            }
+            _closeImage = GetTemplateChild(PartCloseImage) as UIElement;
+            if (_closeImage != null)
+            {
+                _closeImage.MouseDown += CloseImage_MouseDown;
+                _closeImage.MouseUp += CloseImage_MouseUp;
+            }
+            AnimationTarget = GetTemplateChild(PartAnimationRoot) as UIElement;
+        }
+
+        private void CloseImage_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            CloseMouseDown?.Invoke(sender, e);
+        }
+
+        private void CloseImage_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            CloseMouseUp?.Invoke(sender, e);
+        }
+    }
+}

Ink Canvas/Controls/PdfEmbeddedView.cs

@@ -0,0 +1,145 @@
+using Ink_Canvas.Helpers;
+using System;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace Ink_Canvas.Controls
+{
+    /// <summary>
+    /// 画布上的多页 PDF：仅显示当前页；翻页与页码由主窗口 PDF 侧栏控制（无 XAML 文件）。
+    /// </summary>
+    public class PdfEmbeddedView : UserControl
+    {
+        private readonly Image _pageImage;
+
+        private string _pdfPath;
+        private uint _pageCount;
+        private uint _currentIndex;
+        private bool _compressLargePictures;
+        private bool _isPagingBusy;
+        private bool _layoutSizeCommitted;
+
+        /// <summary>页码或可翻页状态变化（用于更新侧栏）。</summary>
+        public event EventHandler PageNavigationStateChanged;
+
+        public PdfEmbeddedView()
+        {
+            MinWidth = 80;
+            MinHeight = 60;
+
+            var grid = new Grid { ClipToBounds = true };
+            _pageImage = new Image
+            {
+                Stretch = Stretch.Uniform,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center
+            };
+            grid.Children.Add(_pageImage);
+            Content = grid;
+        }
+
+        /// <summary>
+        /// 初始化并显示指定页；由 MainWindow 在 UI 线程创建后调用。
+        /// </summary>
+        /// <param name="initialPageIndex">从 0 开始的页码，超出范围时夹紧到合法区间。</param>
+        public async Task InitializeAsync(string pdfFilePath, uint pageCount, bool compressLargePictures, uint initialPageIndex = 0)
+        {
+            _pdfPath = pdfFilePath ?? throw new ArgumentNullException(nameof(pdfFilePath));
+            _pageCount = pageCount;
+            _compressLargePictures = compressLargePictures;
+            if (_pageCount == 0)
+                _currentIndex = 0;
+            else
+                _currentIndex = initialPageIndex >= _pageCount ? _pageCount - 1 : initialPageIndex;
+
+            await ShowPageAsync(_currentIndex);
+        }
+
+        public string PdfPath => _pdfPath;
+
+        public uint PageCount => _pageCount;
+
+        public uint CurrentPageIndex => _currentIndex;
+
+        public string PageLabelText => _pageCount == 0 ? "" : $"{_currentIndex + 1} / {_pageCount}";
+
+        public bool CanGoPrevious => !_isPagingBusy && _pageCount > 1 && _currentIndex > 0;
+
+        public bool CanGoNext => !_isPagingBusy && _pageCount > 1 && _currentIndex < _pageCount - 1;
+
+        public async Task GoToPreviousPageAsync()
+        {
+            await GoRelativeAsync(-1);
+        }
+
+        public async Task GoToNextPageAsync()
+        {
+            await GoRelativeAsync(1);
+        }
+
+        private void NotifyPageNavigationStateChanged()
+        {
+            PageNavigationStateChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        private async Task GoRelativeAsync(int delta)
+        {
+            if (_isPagingBusy || _pageCount <= 1)
+                return;
+            int next = (int)_currentIndex + delta;
+            if (next < 0 || next >= _pageCount)
+                return;
+            _currentIndex = (uint)next;
+            await ShowPageAsync(_currentIndex);
+        }
+
+        private async Task ShowPageAsync(uint pageIndex)
+        {
+            _isPagingBusy = true;
+            NotifyPageNavigationStateChanged();
+            try
+            {
+                BitmapSource raw = await PdfWinRtHelper.RenderPageToBitmapSourceAsync(_pdfPath, pageIndex);
+                if (raw == null)
+                    return;
+
+                BitmapSource display = ApplyCompressionIfNeeded(raw);
+                _pageImage.Source = display;
+                if (!_layoutSizeCommitted)
+                {
+                    bool callerSized = !double.IsNaN(Width) && Width > 0 && !double.IsNaN(Height) && Height > 0;
+                    if (!callerSized)
+                    {
+                        Width = display.PixelWidth;
+                        Height = display.PixelHeight;
+                    }
+
+                    _layoutSizeCommitted = true;
+                }
+            }
+            finally
+            {
+                _isPagingBusy = false;
+                NotifyPageNavigationStateChanged();
+            }
+        }
+
+        private BitmapSource ApplyCompressionIfNeeded(BitmapSource rendered)
+        {
+            int width = rendered.PixelWidth;
+            int height = rendered.PixelHeight;
+            if (_compressLargePictures && (width > 1920 || height > 1080))
+            {
+                double scaleX = 1920.0 / width;
+                double scaleY = 1080.0 / height;
+                double scale = Math.Min(scaleX, scaleY);
+                return new TransformedBitmap(rendered, new ScaleTransform(scale, scale));
+            }
+
+            return rendered;
+        }
+    }
+}

Ink Canvas/Controls/PptNavBar.xaml

@@ -0,0 +1,136 @@
+<UserControl x:Class="Ink_Canvas.Controls.PptNavBar"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+             xmlns:local="clr-namespace:Ink_Canvas.Controls"
+             mc:Ignorable="d"
+             d:DesignHeight="50" d:DesignWidth="200">
+    <UserControl.Resources>
+        <SolidColorBrush x:Key="PptNavBarItemForeground" Color="#71717a"/>
+        <DataTemplate x:Key="PptPreviewItemTemplate">
+            <Grid Margin="2,4">
+                <Border CornerRadius="8" Background="Transparent" Padding="6">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="28"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center"
+                                   FontSize="12" FontWeight="SemiBold"
+                                   Foreground="{DynamicResource PptNavBarItemForeground}"
+                                   Text="{Binding SlideNumber}"/>
+                        <Image Grid.Column="1" Source="{Binding Thumbnail}" Stretch="Uniform"/>
+                    </Grid>
+                </Border>
+            </Grid>
+        </DataTemplate>
+        <Style x:Key="PptPreviewItemContainerStyle" TargetType="ListBoxItem">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Padding" Value="0"/>
+            <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ListBoxItem">
+                        <Border x:Name="Bd" CornerRadius="8" Background="Transparent"
+                                BorderBrush="Transparent" BorderThickness="2">
+                            <ContentPresenter/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="Bd" Property="Background" Value="#1affffff"/>
+                            </Trigger>
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="#66CCFF"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </UserControl.Resources>
+
+    <Border x:Name="RootBorder" BorderThickness="1" BorderBrush="#a1a1aa"
+            Background="#f4f4f5" Opacity="1" CornerRadius="6">
+        <Border.Effect>
+            <DropShadowEffect Color="#000000" BlurRadius="14" ShadowDepth="2" Opacity="0.16"/>
+        </Border.Effect>
+        <DockPanel x:Name="LayoutRoot" LastChildFill="True">
+            <ListBox x:Name="PreviewList"
+                     Visibility="Collapsed"
+                     Background="Transparent" BorderThickness="0"
+                     Padding="6,8,6,4"
+                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                     ScrollViewer.VerticalScrollBarVisibility="Auto"
+                     ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                     ItemTemplate="{StaticResource PptPreviewItemTemplate}"
+                     ItemContainerStyle="{StaticResource PptPreviewItemContainerStyle}"
+                     MouseUp="PreviewList_MouseUp"/>
+            <ikw:SimpleStackPanel x:Name="ButtonRow" Orientation="Horizontal"
+                                  HorizontalAlignment="Center" VerticalAlignment="Center">
+                <Border x:Name="PreviousButtonBorder" Width="50" Height="50"
+                        MouseDown="PreviousButton_MouseDown"
+                        MouseUp="PreviousButton_MouseUp"
+                        MouseLeave="PreviousButton_MouseLeave"
+                        CornerRadius="5 5 0 0" Background="Transparent">
+                    <Grid>
+                        <Border x:Name="PreviousButtonFeedbackBorder" Margin="3" CornerRadius="5"
+                                Background="#18181b" Opacity="0"/>
+                        <Image Height="28" Width="28">
+                            <Image.Source>
+                                <DrawingImage>
+                                    <DrawingImage.Drawing>
+                                        <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                            <GeometryDrawing x:Name="PreviousButtonGeometry" Brush="#27272a"/>
+                                        </DrawingGroup>
+                                    </DrawingImage.Drawing>
+                                </DrawingImage>
+                            </Image.Source>
+                        </Image>
+                    </Grid>
+                </Border>
+                <Border x:Name="PageButtonBorder" Visibility="Visible" TextBlock.Foreground="#171717"
+                        MouseDown="PageButton_MouseDown"
+                        MouseUp="PageButton_MouseUp"
+                        MouseLeave="PageButton_MouseLeave"
+                        MinWidth="50" MinHeight="50" Background="Transparent">
+                    <Grid>
+                        <Border x:Name="PageButtonFeedbackBorder" Margin="0,3" CornerRadius="5"
+                                Background="#18181b" Opacity="0"/>
+                        <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical"
+                                             Spacing="0.5" Margin="12,0">
+                            <TextBlock x:Name="PageNowText" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                       FontSize="17" FontWeight="Bold" Text="?"/>
+                            <TextBlock x:Name="PageTotalText" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                       FontSize="10" Text="/ ?"/>
+                        </ikw:SimpleStackPanel>
+                    </Grid>
+                </Border>
+                <Border x:Name="NextButtonBorder" Width="50" Height="50"
+                        MouseDown="NextButton_MouseDown"
+                        MouseUp="NextButton_MouseUp"
+                        MouseLeave="NextButton_MouseLeave"
+                        CornerRadius="0 0 5 5" Background="Transparent">
+                    <Grid>
+                        <Border x:Name="NextButtonFeedbackBorder" Margin="3" CornerRadius="5"
+                                Background="#18181b" Opacity="0"/>
+                        <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28" Width="28">
+                            <Image.Source>
+                                <DrawingImage>
+                                    <DrawingImage.Drawing>
+                                        <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                            <GeometryDrawing x:Name="NextButtonGeometry" Brush="#27272a"/>
+                                        </DrawingGroup>
+                                    </DrawingImage.Drawing>
+                                </DrawingImage>
+                            </Image.Source>
+                        </Image>
+                    </Grid>
+                </Border>
+            </ikw:SimpleStackPanel>
+        </DockPanel>
+    </Border>
+</UserControl>

Ink Canvas/Controls/PptNavBar.xaml.cs

@@ -0,0 +1,393 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Threading;
+
+namespace Ink_Canvas.Controls
+{
+    /// <summary>
+    /// PPT 翻页 + 增强预览一体化控件。
+    /// 通过 <see cref="Direction"/> 切换底部条 (LB/RB) 与侧边条 (LS/RS) 布局,
+    /// 预览列表内嵌于同一个 Border,展开时占据按钮组之外的剩余空间。
+    /// </summary>
+    public partial class PptNavBar : UserControl
+    {
+        public sealed class PreviewItem
+        {
+            public int SlideNumber { get; set; }
+            public BitmapImage Thumbnail { get; set; }
+        }
+
+        public enum NavDirection
+        {
+            LeftBottom,
+            RightBottom,
+            LeftSide,
+            RightSide
+        }
+
+        public static readonly DependencyProperty DirectionProperty = DependencyProperty.Register(
+            nameof(Direction), typeof(NavDirection), typeof(PptNavBar),
+            new PropertyMetadata(NavDirection.LeftBottom, OnDirectionChanged));
+
+        public static readonly DependencyProperty CurrentSlideProperty = DependencyProperty.Register(
+            nameof(CurrentSlide), typeof(int), typeof(PptNavBar),
+            new PropertyMetadata(0, OnPageChanged));
+
+        public static readonly DependencyProperty TotalSlidesProperty = DependencyProperty.Register(
+            nameof(TotalSlides), typeof(int), typeof(PptNavBar),
+            new PropertyMetadata(0, OnPageChanged));
+
+        public static readonly DependencyProperty PreviewItemsProperty = DependencyProperty.Register(
+            nameof(PreviewItems), typeof(IList<PreviewItem>), typeof(PptNavBar),
+            new PropertyMetadata(null, OnPreviewItemsChanged));
+
+        public static readonly DependencyProperty IsPreviewExpandedProperty = DependencyProperty.Register(
+            nameof(IsPreviewExpanded), typeof(bool), typeof(PptNavBar),
+            new PropertyMetadata(false, OnIsPreviewExpandedChanged));
+
+        public NavDirection Direction
+        {
+            get => (NavDirection)GetValue(DirectionProperty);
+            set => SetValue(DirectionProperty, value);
+        }
+
+        public int CurrentSlide
+        {
+            get => (int)GetValue(CurrentSlideProperty);
+            set => SetValue(CurrentSlideProperty, value);
+        }
+
+        public int TotalSlides
+        {
+            get => (int)GetValue(TotalSlidesProperty);
+            set => SetValue(TotalSlidesProperty, value);
+        }
+
+        public IList<PreviewItem> PreviewItems
+        {
+            get => (IList<PreviewItem>)GetValue(PreviewItemsProperty);
+            set => SetValue(PreviewItemsProperty, value);
+        }
+
+        public bool IsPreviewExpanded
+        {
+            get => (bool)GetValue(IsPreviewExpandedProperty);
+            set => SetValue(IsPreviewExpandedProperty, value);
+        }
+
+        public event EventHandler PreviousClick;
+        public event EventHandler NextClick;
+        public event EventHandler PageClick;
+        public event EventHandler<int> SlideSelected;
+        public event EventHandler PreviousPressedDown;
+        public event EventHandler NextPressedDown;
+        public event EventHandler PressEnded;
+        public event EventHandler<bool> PreviewExpandedChanged;
+
+        // 静态几何（左下/右下：水平箭头；左侧/右侧：垂直箭头）
+        private static readonly Geometry HArrowLeft = Geometry.Parse("F0 M24,24z M0,0z M3.3994,12.9642C2.86687,12.4317,2.86687,11.5683,3.3994,11.0358L9.94485,4.49031C10.4774,3.95777 11.3408,3.95777 11.8733,4.49031 12.4059,5.02284 12.4059,5.88625 11.8733,6.41878L7.65575,10.6364 19.6364,10.6364C20.3895,10.6364 21,11.2469 21,12 21,12.7531 20.3895,13.3636 19.6364,13.3636L7.65575,13.3636 11.8733,17.5812C12.4059,18.1137 12.4059,18.9772 11.8733,19.5097 11.3408,20.0422 10.4774,20.0422 9.94485,19.5097L3.3994,12.9642z");
+        private static readonly Geometry HArrowRight = Geometry.Parse("F0 M24,24z M0,0z M20.6006,12.9642C21.1331,12.4317,21.1331,11.5683,20.6006,11.0358L14.0551,4.49031C13.5226,3.95777 12.6592,3.95777 12.1267,4.49031 11.5941,5.02284 11.5941,5.88625 12.1267,6.41878L16.3443,10.6364 4.36364,10.6364C3.61052,10.6364 3,11.2469 3,12 3,12.7531 3.61052,13.3636 4.36364,13.3636L16.3443,13.3636 12.1267,17.5812C11.5941,18.1137 11.5941,18.9772 12.1267,19.5097 12.6592,20.0422 13.5226,20.0422 14.0551,19.5097L20.6006,12.9642z");
+        private static readonly Geometry VArrowUp = Geometry.Parse("F0 M24,24z M0,0z M11.0357,3.3994C11.5682,2.86687,12.4316,2.86687,12.9641,3.3994L19.5096,9.94485C20.0421,10.4774 20.0421,11.3408 19.5096,11.8733 18.9771,12.4059 18.1137,12.4059 17.5811,11.8733L13.3635,7.65575 13.3635,19.6364C13.3635,20.3895 12.753,21 11.9999,21 11.2468,21 10.6363,20.3895 10.6363,19.6364L10.6363,7.65575 6.41869,11.8733C5.88616,12.4059 5.02275,12.4059 4.49022,11.8733 3.95769,11.3408 3.95769,10.4774 4.49022,9.94485L11.0357,3.3994z");
+        private static readonly Geometry VArrowDown = Geometry.Parse("F0 M24,24z M0,0z M11.0357,20.6006C11.5682,21.1331,12.4316,21.1331,12.9641,20.6006L19.5096,14.0551C20.0421,13.5226 20.0421,12.6592 19.5096,12.1267 18.9771,11.5941 18.1137,11.5941 17.5811,12.1267L13.3635,16.3443 13.3635,4.36364C13.3635,3.61052 12.753,3 11.9999,3 11.2468,3 10.6363,3.61052 10.6363,4.36364L10.6363,16.3443 6.41869,12.1267C5.88616,11.5941 5.02275,11.5941 4.49022,12.1267 3.95769,12.6592 3.95769,13.5226 4.49022,14.0551L11.0357,20.6006z");
+
+        public PptNavBar()
+        {
+            InitializeComponent();
+            ApplyDirection(Direction);
+        }
+
+        private static void OnDirectionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is PptNavBar bar) bar.ApplyDirection((NavDirection)e.NewValue);
+        }
+
+        private static void OnPageChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is PptNavBar bar) bar.RefreshPageText();
+        }
+
+        private static void OnPreviewItemsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is PptNavBar bar)
+            {
+                bar.PreviewList.ItemsSource = e.NewValue as IList<PreviewItem>;
+                bar.SyncPreviewSelection();
+            }
+        }
+
+        private static void OnIsPreviewExpandedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is PptNavBar bar)
+            {
+                bool expanded = (bool)e.NewValue;
+                bar.PreviewList.Visibility = expanded ? Visibility.Visible : Visibility.Collapsed;
+                bar.ApplyLayout();
+                if (expanded)
+                {
+                    bar.SyncPreviewSelection();
+                    bar.HookOutsideClick();
+                }
+                else
+                {
+                    bar.UnhookOutsideClick();
+                }
+                bar.PreviewExpandedChanged?.Invoke(bar, expanded);
+            }
+        }
+
+        private Window _hookedWindow;
+        private void HookOutsideClick()
+        {
+            if (_hookedWindow != null) return;
+            _hookedWindow = Window.GetWindow(this);
+            if (_hookedWindow != null)
+            {
+                _hookedWindow.PreviewMouseDown += OnWindowPreviewMouseDown;
+            }
+        }
+        private void UnhookOutsideClick()
+        {
+            if (_hookedWindow != null)
+            {
+                _hookedWindow.PreviewMouseDown -= OnWindowPreviewMouseDown;
+                _hookedWindow = null;
+            }
+        }
+        private void OnWindowPreviewMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (e.OriginalSource is DependencyObject d && !IsDescendantOf(d, this))
+            {
+                IsPreviewExpanded = false;
+            }
+        }
+        private static bool IsDescendantOf(DependencyObject child, DependencyObject ancestor)
+        {
+            while (child != null)
+            {
+                if (ReferenceEquals(child, ancestor)) return true;
+                child = System.Windows.Media.VisualTreeHelper.GetParent(child)
+                        ?? System.Windows.LogicalTreeHelper.GetParent(child);
+            }
+            return false;
+        }
+
+        private void ApplyDirection(NavDirection dir) => ApplyLayout();
+
+        private void ApplyLayout()
+        {
+            var dir = Direction;
+            bool expanded = IsPreviewExpanded;
+
+            // 重置可能在不同状态下被设置的属性
+            ButtonRow.ClearValue(WidthProperty);
+            ButtonRow.ClearValue(HeightProperty);
+            ButtonRow.ClearValue(HorizontalAlignmentProperty);
+            PreviewList.ClearValue(WidthProperty);
+            PreviewList.ClearValue(HeightProperty);
+            PreviewList.ClearValue(MaxHeightProperty);
+            PreviewList.ClearValue(MaxWidthProperty);
+            PreviewList.ClearValue(HorizontalAlignmentProperty);
+            ClearValue(HeightProperty);
+            ClearValue(MaxHeightProperty);
+
+            double availableHeight = ComputeAvailableHeight();
+
+            switch (dir)
+            {
+                case NavDirection.LeftBottom:
+                case NavDirection.RightBottom:
+                    DockPanel.SetDock(PreviewList, Dock.Top);
+                    DockPanel.SetDock(ButtonRow, Dock.Bottom);
+                    ButtonRow.Orientation = Orientation.Horizontal;
+                    ButtonRow.Height = 50;
+                    if (expanded)
+                    {
+                        // 预览面板拉宽到 280,贴向同侧角落
+                        PreviewList.Width = 280;
+                        PreviewList.MaxHeight = Math.Max(200, availableHeight - 50);
+                        PreviewList.HorizontalAlignment = dir == NavDirection.LeftBottom
+                            ? HorizontalAlignment.Left
+                            : HorizontalAlignment.Right;
+                        // 按钮组宽度限制为原始内容宽度,并贴向同侧,保持按钮位置不变
+                        ButtonRow.HorizontalAlignment = dir == NavDirection.LeftBottom
+                            ? HorizontalAlignment.Left
+                            : HorizontalAlignment.Right;
+                    }
+                    else
+                    {
+                        PreviewList.SetBinding(WidthProperty, new System.Windows.Data.Binding(nameof(ButtonRow.ActualWidth)) { Source = ButtonRow });
+                        PreviewList.MaxHeight = 380;
+                    }
+                    PreviousButtonGeometry.Geometry = HArrowLeft;
+                    NextButtonGeometry.Geometry = HArrowRight;
+                    break;
+
+                case NavDirection.LeftSide:
+                    DockPanel.SetDock(PreviewList, Dock.Right);
+                    DockPanel.SetDock(ButtonRow, Dock.Left);
+                    ButtonRow.Orientation = Orientation.Vertical;
+                    ButtonRow.Width = 50;
+                    PreviewList.Width = 240;
+                    PreviewList.MaxHeight = 480;
+                    PreviousButtonGeometry.Geometry = VArrowUp;
+                    NextButtonGeometry.Geometry = VArrowDown;
+                    break;
+                case NavDirection.RightSide:
+                    DockPanel.SetDock(PreviewList, Dock.Left);
+                    DockPanel.SetDock(ButtonRow, Dock.Right);
+                    ButtonRow.Orientation = Orientation.Vertical;
+                    ButtonRow.Width = 50;
+                    PreviewList.Width = 240;
+                    PreviewList.MaxHeight = 480;
+                    PreviousButtonGeometry.Geometry = VArrowUp;
+                    NextButtonGeometry.Geometry = VArrowDown;
+                    break;
+            }
+        }
+
+        private double ComputeAvailableHeight()
+        {
+            var window = Window.GetWindow(this);
+            double h = window != null ? window.ActualHeight : SystemParameters.PrimaryScreenHeight;
+            return Math.Max(240, h - 12);
+        }
+
+        private void RefreshPageText()
+        {
+            if (CurrentSlide > 0 && TotalSlides > 0)
+            {
+                PageNowText.Text = CurrentSlide.ToString();
+                PageTotalText.Text = $"/ {TotalSlides}";
+            }
+            else
+            {
+                PageNowText.Text = "?";
+                PageTotalText.Text = "/ ?";
+            }
+            SyncPreviewSelection();
+        }
+
+        private void SyncPreviewSelection()
+        {
+            if (PreviewItems == null || CurrentSlide <= 0) return;
+            foreach (var item in PreviewItems)
+            {
+                if (item.SlideNumber == CurrentSlide)
+                {
+                    PreviewList.SelectedItem = item;
+                    PreviewList.ScrollIntoView(item);
+                    return;
+                }
+            }
+        }
+
+        private void SetFeedback(Border feedback, double opacity) => feedback.Opacity = opacity;
+
+        private object _lastDown;
+
+        private void PreviousButton_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            _lastDown = sender;
+            SetFeedback(PreviousButtonFeedbackBorder, 0.15);
+            PreviousPressedDown?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void PreviousButton_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            SetFeedback(PreviousButtonFeedbackBorder, 0);
+            PressEnded?.Invoke(this, EventArgs.Empty);
+            if (_lastDown != sender) return;
+            _lastDown = null;
+            PreviousClick?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void PreviousButton_MouseLeave(object sender, MouseEventArgs e)
+        {
+            SetFeedback(PreviousButtonFeedbackBorder, 0);
+            _lastDown = null;
+            PressEnded?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void NextButton_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            _lastDown = sender;
+            SetFeedback(NextButtonFeedbackBorder, 0.15);
+            NextPressedDown?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void NextButton_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            SetFeedback(NextButtonFeedbackBorder, 0);
+            PressEnded?.Invoke(this, EventArgs.Empty);
+            if (_lastDown != sender) return;
+            _lastDown = null;
+            NextClick?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void NextButton_MouseLeave(object sender, MouseEventArgs e)
+        {
+            SetFeedback(NextButtonFeedbackBorder, 0);
+            _lastDown = null;
+            PressEnded?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void PageButton_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            _lastDown = sender;
+            SetFeedback(PageButtonFeedbackBorder, 0.15);
+        }
+
+        private void PageButton_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            SetFeedback(PageButtonFeedbackBorder, 0);
+            if (_lastDown != sender) return;
+            _lastDown = null;
+            PageClick?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void PageButton_MouseLeave(object sender, MouseEventArgs e)
+        {
+            SetFeedback(PageButtonFeedbackBorder, 0);
+            _lastDown = null;
+        }
+
+        private void PreviewList_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            if (PreviewList.SelectedItem is PreviewItem item)
+            {
+                SlideSelected?.Invoke(this, item.SlideNumber);
+            }
+        }
+
+        public void ApplyTheme(bool isDark)
+        {
+            var fgBrush = isDark ? Brushes.White : new SolidColorBrush(Color.FromRgb(39, 39, 42));
+            var feedbackBrush = isDark ? Brushes.White : new SolidColorBrush(Color.FromRgb(24, 24, 27));
+            var bgBrush = isDark
+                ? new SolidColorBrush(Color.FromRgb(39, 39, 42))
+                : new SolidColorBrush(Color.FromRgb(244, 244, 245));
+            var borderBrush = isDark
+                ? new SolidColorBrush(Color.FromRgb(82, 82, 91))
+                : new SolidColorBrush(Color.FromRgb(161, 161, 170));
+
+            PreviousButtonGeometry.Brush = fgBrush;
+            NextButtonGeometry.Brush = fgBrush;
+            PreviousButtonFeedbackBorder.Background = feedbackBrush;
+            NextButtonFeedbackBorder.Background = feedbackBrush;
+            PageButtonFeedbackBorder.Background = feedbackBrush;
+            PageNowText.Foreground = fgBrush;
+            PageTotalText.Foreground = fgBrush;
+            RootBorder.Background = bgBrush;
+            RootBorder.BorderBrush = borderBrush;
+            Resources["PptNavBarItemForeground"] = fgBrush;
+        }
+
+        public void SetPageButtonVisibility(Visibility v) => PageButtonBorder.Visibility = v;
+        public void SetBarOpacity(double opacity) => RootBorder.Opacity = opacity;
+    }
+}

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/Toolbar/IToolbarHost.cs

@@ -0,0 +1,18 @@
+using System.Windows;
+
+namespace Ink_Canvas.Controls.Toolbar
+{
+    /// <summary>
+    /// 工具栏按钮插件与宿主之间的桥梁。Phase 1 粗粒度暴露 MainWindow，后续收窄。
+    /// </summary>
+    public interface IToolbarHost
+    {
+        MainWindow Window { get; }
+
+        /// <summary>按 id 登记按钮的 view 实例（供 MainWindow 字段回填和互相查找）。</summary>
+        void RegisterView(string id, FrameworkElement view);
+
+        /// <summary>按 id 获取之前注册的 view。不存在返回 null。</summary>
+        FrameworkElement FindView(string id);
+    }
+}

Ink Canvas/Controls/Toolbar/IToolbarItem.cs

@@ -0,0 +1,29 @@
+using System.Windows;
+
+namespace Ink_Canvas.Controls.Toolbar
+{
+    /// <summary>
+    /// 一个工具栏按钮（或任意浮动栏/白板栏条目）的插件化契约。
+    /// 实现类必须有无参构造函数，启动时会被 ToolbarRegistry 反射实例化。
+    /// </summary>
+    public interface IToolbarItem
+    {
+        /// <summary>稳定、唯一的 id，用于持久化用户配置。不要随便改。</summary>
+        string Id { get; }
+
+        ToolbarSlot DefaultSlot { get; }
+
+        /// <summary>同一 slot 内的默认顺序，小的在前。</summary>
+        int DefaultOrder { get; }
+
+        bool DefaultVisible { get; }
+
+        ToolbarInsertPosition DefaultPosition { get; }
+
+        /// <summary>仅当 Position 为 BeforeAnchor/AfterAnchor 时有意义，对应 XAML 里 x:Name。</summary>
+        string DefaultAnchorName { get; }
+
+        /// <summary>构造 UI 元素并接线所有行为。</summary>
+        FrameworkElement BuildView(IToolbarHost host);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/ClearToolItem.cs

@@ -0,0 +1,26 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    /// <summary>
+    /// 清空按钮。位置：夹在颜色面板与 StackPanelCanvasControls 之间，
+    /// 所以用 BeforeAnchor 锚到 StackPanelCanvasControls。
+    /// </summary>
+    internal sealed class ClearToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.clear";
+        public override string LocalizationKey => "FloatingBar_Clear";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarMain;
+        public override int DefaultOrder => 0;
+        public override ToolbarInsertPosition DefaultPosition => ToolbarInsertPosition.BeforeAnchor;
+        public override string DefaultAnchorName => "StackPanelCanvasControls";
+
+        protected override string IconBrushResourceKey => "RedBrush";
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.SymbolIconDelete_MouseUp(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachSymbolIconDelete(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/CursorToolItem.cs

@@ -0,0 +1,18 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class CursorToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.cursor";
+        public override string LocalizationKey => "FloatingBar_Mouse";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarMain;
+        public override int DefaultOrder => 100;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.CursorIcon_Click(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachCursorIconView(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/CursorWithDelToolItem.cs

@@ -0,0 +1,19 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class CursorWithDelToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.cursorWithDel";
+        public override string LocalizationKey => "FloatingBar_ClearAndMouse";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarCanvasControls;
+        public override int DefaultOrder => 320;
+        public override ToolbarInsertPosition DefaultPosition => ToolbarInsertPosition.Append;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.CursorWithDelIcon_Click(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachCursorWithDelBtn(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/EraserByStrokesToolItem.cs

@@ -0,0 +1,18 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class EraserByStrokesToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.eraserByStrokes";
+        public override string LocalizationKey => "FloatingBar_StrokeEraser";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarCanvasControls;
+        public override int DefaultOrder => 110;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.EraserIconByStrokes_Click(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachEraserByStrokesIcon(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/EraserToolItem.cs

@@ -0,0 +1,18 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class EraserToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.eraser";
+        public override string LocalizationKey => "FloatingBar_AreaEraser";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarCanvasControls;
+        public override int DefaultOrder => 100;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.EraserIcon_Click(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachEraserIcon(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/FoldToolItem.cs

@@ -0,0 +1,20 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class FoldToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.fold";
+        public override string LocalizationKey => "FloatingBar_Hide";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarEnd;
+        public override int DefaultOrder => 120;
+        public override ToolbarInsertPosition DefaultPosition => ToolbarInsertPosition.AfterAnchor;
+        public override string DefaultAnchorName => "FloatingBarEndSeparator";
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.FoldFloatingBar_MouseUp(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachFoldIcon(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/PenToolItem.cs

@@ -0,0 +1,18 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class PenToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.pen";
+        public override string LocalizationKey => "FloatingBar_Annotate";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarMain;
+        public override int DefaultOrder => 110;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.PenIcon_Click(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachPenIconView(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/RedoToolItem.cs

@@ -0,0 +1,23 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class RedoToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.redo";
+        public override string LocalizationKey => "Board_Redo";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarCanvasControls;
+        public override int DefaultOrder => 310;
+        public override ToolbarInsertPosition DefaultPosition => ToolbarInsertPosition.Append;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.SymbolIconRedo_MouseUp(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+        {
+            host.Window.AttachSymbolIconRedo(view);
+            view.SetBinding(System.Windows.UIElement.IsEnabledProperty,
+                new System.Windows.Data.Binding("IsEnabled") { ElementName = "BtnRedo" });
+        }
+    }
+}

Ink Canvas/Controls/Toolbar/Items/SelectToolItem.cs

@@ -0,0 +1,18 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class SelectToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.select";
+        public override string LocalizationKey => "FloatingBar_LassoSelect";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarCanvasControls;
+        public override int DefaultOrder => 120;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.SymbolIconSelect_MouseUp(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachSymbolIconSelect(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/ShapeDrawToolItem.cs

@@ -0,0 +1,18 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class ShapeDrawToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.shapeDraw";
+        public override string LocalizationKey => "FloatingBar_Geometry";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarCanvasControls;
+        public override int DefaultOrder => 130;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.ImageDrawShape_MouseUp(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachShapeDrawBtn(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/ToolbarImageButtonItemBase.cs

@@ -0,0 +1,47 @@
+using Ink_Canvas.Properties;
+using System;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    /// <summary>
+    /// 通用 ToolbarImageButton 工具栏条目基类——大幅减少每个按钮的样板代码。
+    /// 派生类通常只需给 Id / 本地化键 / Slot / Order / 点击处理 / Attach 回填。
+    /// </summary>
+    internal abstract class ToolbarImageButtonItemBase : IToolbarItem
+    {
+        public abstract string Id { get; }
+        public abstract string LocalizationKey { get; }
+        public abstract ToolbarSlot DefaultSlot { get; }
+        public abstract int DefaultOrder { get; }
+        public virtual bool DefaultVisible => true;
+        public virtual ToolbarInsertPosition DefaultPosition => ToolbarInsertPosition.Prepend;
+        public virtual string DefaultAnchorName => null;
+
+        /// <summary>DynamicResource 名称，用于 IconBrush。默认为 null（使用控件自带前景色）。</summary>
+        protected virtual string IconBrushResourceKey => null;
+
+        protected abstract void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e);
+
+        /// <summary>构建后调用，用于回填 MainWindow 的原命名属性（partial 扩展里的 Attach*）。可选。</summary>
+        protected virtual void AfterBuild(IToolbarHost host, ToolbarImageButton view) { }
+
+        public FrameworkElement BuildView(IToolbarHost host)
+        {
+            var btn = new ToolbarImageButton
+            {
+                Label = Strings.GetString(LocalizationKey) ?? LocalizationKey
+            };
+            if (!string.IsNullOrEmpty(IconBrushResourceKey))
+            {
+                if (btn.TryFindResource(IconBrushResourceKey) is Brush brush) btn.IconBrush = brush;
+                else btn.SetResourceReference(ToolbarImageButton.IconBrushProperty, IconBrushResourceKey);
+            }
+            btn.ButtonMouseUp += (s, e) => OnClick(host, s, e);
+            AfterBuild(host, btn);
+            return btn;
+        }
+    }
+}

Ink Canvas/Controls/Toolbar/Items/ToolsToolItem.cs

@@ -0,0 +1,20 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class ToolsToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.tools";
+        public override string LocalizationKey => "Board_Tools";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarEnd;
+        public override int DefaultOrder => 110;
+        public override ToolbarInsertPosition DefaultPosition => ToolbarInsertPosition.AfterAnchor;
+        public override string DefaultAnchorName => "FloatingBarEndSeparator";
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.SymbolIconTools_MouseUp(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachToolsBtn(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/UndoToolItem.cs

@@ -0,0 +1,23 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class UndoToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.undo";
+        public override string LocalizationKey => "Board_Undo";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarCanvasControls;
+        public override int DefaultOrder => 300;
+        public override ToolbarInsertPosition DefaultPosition => ToolbarInsertPosition.Append;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.SymbolIconUndo_MouseUp(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+        {
+            host.Window.AttachSymbolIconUndo(view);
+            view.SetBinding(System.Windows.UIElement.IsEnabledProperty,
+                new System.Windows.Data.Binding("IsEnabled") { ElementName = "BtnUndo" });
+        }
+    }
+}

Ink Canvas/Controls/Toolbar/Items/WhiteboardToolItem.cs

@@ -0,0 +1,20 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class WhiteboardToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.whiteboard";
+        public override string LocalizationKey => "FloatingBar_Whiteboard";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarEnd;
+        public override int DefaultOrder => 100;
+        public override ToolbarInsertPosition DefaultPosition => ToolbarInsertPosition.AfterAnchor;
+        public override string DefaultAnchorName => "FloatingBarEndSeparator";
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.ImageBlackboard_MouseUp(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachWhiteboardBtn(view);
+    }
+}

Ink Canvas/Controls/Toolbar/ToolbarHost.cs

@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Windows;
+
+namespace Ink_Canvas.Controls.Toolbar
+{
+    /// <summary>
+    /// MainWindow 版的 IToolbarHost 实现。Phase 1 直接把 MainWindow 引用暴露给插件，
+    /// 插件可通过 host.Window 访问私有/内部成员（partial class 扩展或 internal 字段）。
+    /// 后续阶段逐步把具体行为抽成 Host 上的方法/事件，收窄这个接口。
+    /// </summary>
+    public sealed class ToolbarHost : IToolbarHost
+    {
+        private readonly Dictionary<string, FrameworkElement> _views = new Dictionary<string, FrameworkElement>();
+
+        public ToolbarHost(MainWindow window)
+        {
+            Window = window;
+        }
+
+        public MainWindow Window { get; }
+
+        public void RegisterView(string id, FrameworkElement view)
+        {
+            if (string.IsNullOrEmpty(id) || view == null) return;
+            _views[id] = view;
+        }
+
+        public FrameworkElement FindView(string id)
+        {
+            if (string.IsNullOrEmpty(id)) return null;
+            return _views.TryGetValue(id, out var v) ? v : null;
+        }
+    }
+}

Ink Canvas/Controls/Toolbar/ToolbarInsertPosition.cs

@@ -0,0 +1,14 @@
+namespace Ink_Canvas.Controls.Toolbar
+{
+    public enum ToolbarInsertPosition
+    {
+        /// <summary>从容器头部依次插入；Order 小的在前。</summary>
+        Prepend,
+        /// <summary>追加到容器末尾。</summary>
+        Append,
+        /// <summary>插入到由 AnchorName 指定的已有元素之前。</summary>
+        BeforeAnchor,
+        /// <summary>插入到由 AnchorName 指定的已有元素之后（同一锚点多项按 Order 依次排列）。</summary>
+        AfterAnchor
+    }
+}

Ink Canvas/Controls/Toolbar/ToolbarItemConfig.cs

@@ -0,0 +1,33 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Ink_Canvas.Controls.Toolbar
+{
+    /// <summary>
+    /// 单个工具栏按钮的用户配置（可见性、顺序、所属 slot、插入位置）。
+    /// 由 Settings.Toolbar 持久化。
+    /// </summary>
+    public class ToolbarItemConfig
+    {
+        [JsonProperty("visible")]
+        public bool Visible { get; set; } = true;
+
+        [JsonProperty("order")]
+        public int Order { get; set; }
+
+        [JsonProperty("slot")]
+        public ToolbarSlot Slot { get; set; } = ToolbarSlot.FloatingBarMain;
+
+        [JsonProperty("position")]
+        public ToolbarInsertPosition Position { get; set; } = ToolbarInsertPosition.Prepend;
+
+        [JsonProperty("anchorName")]
+        public string AnchorName { get; set; }
+    }
+
+    public class ToolbarLayoutSettings
+    {
+        [JsonProperty("items")]
+        public Dictionary<string, ToolbarItemConfig> Items { get; set; } = new Dictionary<string, ToolbarItemConfig>();
+    }
+}

Ink Canvas/Controls/Toolbar/ToolbarRegistry.cs

@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Windows;
+using System.Windows.Controls;
+using Ink_Canvas.Helpers;
+
+namespace Ink_Canvas.Controls.Toolbar
+{
+    /// <summary>
+    /// 扫描当前程序集里的 IToolbarItem 实现，按用户配置（Settings.Toolbar）排序/过滤后注入到目标容器。
+    /// </summary>
+    public static class ToolbarRegistry
+    {
+        private static List<IToolbarItem> _items;
+
+        public static IReadOnlyList<IToolbarItem> Discover()
+        {
+            if (_items != null) return _items;
+
+            var itemType = typeof(IToolbarItem);
+            _items = Assembly.GetExecutingAssembly()
+                .GetTypes()
+                .Where(t => !t.IsAbstract && !t.IsInterface && itemType.IsAssignableFrom(t))
+                .Select(t =>
+                {
+                    try { return (IToolbarItem)Activator.CreateInstance(t); }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"ToolbarRegistry: 实例化 {t.FullName} 失败: {ex.Message}", LogHelper.LogType.Warning);
+                        return null;
+                    }
+                })
+                .Where(i => i != null)
+                .ToList();
+            return _items;
+        }
+
+        /// <summary>按 slot 分配工具栏条目到对应容器。调用者负责清空目标容器里要被接管的旧内容。</summary>
+        public static void Populate(IToolbarHost host, IDictionary<ToolbarSlot, Panel> slots, ToolbarLayoutSettings layout)
+        {
+            if (host == null || slots == null) return;
+            layout = layout ?? new ToolbarLayoutSettings();
+
+            var grouped = new Dictionary<ToolbarSlot, List<(IToolbarItem item, ToolbarItemConfig cfg)>>();
+            foreach (var item in Discover())
+            {
+                if (!layout.Items.TryGetValue(item.Id, out var cfg))
+                {
+                    cfg = new ToolbarItemConfig
+                    {
+                        Visible = item.DefaultVisible,
+                        Order = item.DefaultOrder,
+                        Slot = item.DefaultSlot,
+                        Position = item.DefaultPosition,
+                        AnchorName = item.DefaultAnchorName
+                    };
+                }
+                if (!cfg.Visible) continue;
+                if (!grouped.TryGetValue(cfg.Slot, out var list))
+                {
+                    list = new List<(IToolbarItem, ToolbarItemConfig)>();
+                    grouped[cfg.Slot] = list;
+                }
+                list.Add((item, cfg));
+            }
+
+            foreach (var kv in grouped)
+            {
+                if (!slots.TryGetValue(kv.Key, out var container) || container == null) continue;
+                InjectIntoContainer(host, container, kv.Value);
+            }
+        }
+
+        private static void InjectIntoContainer(IToolbarHost host, Panel container,
+            List<(IToolbarItem item, ToolbarItemConfig cfg)> entries)
+        {
+            // 按 Position 分桶，每桶内按 Order 升序。
+            var prepend = entries.Where(e => e.cfg.Position == ToolbarInsertPosition.Prepend).OrderBy(e => e.cfg.Order).ToList();
+            var append = entries.Where(e => e.cfg.Position == ToolbarInsertPosition.Append).OrderBy(e => e.cfg.Order).ToList();
+            var before = entries.Where(e => e.cfg.Position == ToolbarInsertPosition.BeforeAnchor).ToList();
+            var after = entries.Where(e => e.cfg.Position == ToolbarInsertPosition.AfterAnchor).ToList();
+
+            var prependIndex = 0;
+            foreach (var entry in prepend)
+            {
+                var view = BuildAndRegister(host, entry.item);
+                if (view == null) continue;
+                container.Children.Insert(prependIndex++, view);
+            }
+
+            foreach (var entry in append)
+            {
+                var view = BuildAndRegister(host, entry.item);
+                if (view == null) continue;
+                container.Children.Add(view);
+            }
+
+            foreach (var group in before.GroupBy(e => e.cfg.AnchorName))
+            {
+                var anchor = FindNamedChild(container, group.Key);
+                if (anchor == null)
+                {
+                    LogHelper.WriteLogToFile($"ToolbarRegistry: 未找到锚点 '{group.Key}' (BeforeAnchor)", LogHelper.LogType.Warning);
+                    continue;
+                }
+                var idx = container.Children.IndexOf(anchor);
+                foreach (var entry in group.OrderBy(e => e.cfg.Order))
+                {
+                    var view = BuildAndRegister(host, entry.item);
+                    if (view == null) continue;
+                    container.Children.Insert(idx++, view);
+                }
+            }
+
+            foreach (var group in after.GroupBy(e => e.cfg.AnchorName))
+            {
+                var anchor = FindNamedChild(container, group.Key);
+                if (anchor == null)
+                {
+                    LogHelper.WriteLogToFile($"ToolbarRegistry: 未找到锚点 '{group.Key}' (AfterAnchor)", LogHelper.LogType.Warning);
+                    continue;
+                }
+                var idx = container.Children.IndexOf(anchor) + 1;
+                foreach (var entry in group.OrderBy(e => e.cfg.Order))
+                {
+                    var view = BuildAndRegister(host, entry.item);
+                    if (view == null) continue;
+                    container.Children.Insert(idx++, view);
+                }
+            }
+        }
+
+        private static UIElement FindNamedChild(Panel container, string name)
+        {
+            if (string.IsNullOrEmpty(name)) return null;
+            foreach (UIElement child in container.Children)
+            {
+                if (child is FrameworkElement fe && fe.Name == name) return child;
+            }
+            return null;
+        }
+
+        private static FrameworkElement BuildAndRegister(IToolbarHost host, IToolbarItem item)
+        {
+            try
+            {
+                var view = item.BuildView(host);
+                if (view == null) return null;
+                host.RegisterView(item.Id, view);
+                return view;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"ToolbarRegistry: 构建 {item.Id} 失败: {ex.Message}", LogHelper.LogType.Warning);
+                return null;
+            }
+        }
+    }
+}

Ink Canvas/Controls/Toolbar/ToolbarSlot.cs

@@ -0,0 +1,11 @@
+namespace Ink_Canvas.Controls.Toolbar
+{
+    public enum ToolbarSlot
+    {
+        FloatingBarMain,
+        FloatingBarCanvasControls,
+        FloatingBarEnd,
+        BlackboardLeft,
+        BlackboardRight
+    }
+}

Ink Canvas/Helpers/AnimationsHelper.cs

@@ -1,12 +1,23 @@
-using System;
+using System;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
+using Ink_Canvas.Controls;
 
 namespace Ink_Canvas.Helpers
 {
     internal class AnimationsHelper
     {
+        private static UIElement ResolveAnimationTarget(UIElement element)
+        {
+            if (element is BoardMenuFrame frame)
+            {
+                frame.ApplyTemplate();
+                return frame.AnimationTarget ?? element;
+            }
+            return element;
+        }
+
         public static void ShowWithFadeIn(UIElement element, double duration = 0.15)
         {
             if (element.Visibility == Visibility.Visible) return;
@@ -36,14 +47,17 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                if (element.Visibility == Visibility.Visible) return;
-
                 if (element == null)
                     throw new ArgumentNullException(nameof(element));
 
+                if (element.Visibility == Visibility.Visible) return;
+
+                element.Visibility = Visibility.Visible;
+
+                var target = ResolveAnimationTarget(element);
+
                 var sb = new Storyboard();
 
-                // 渐变动画
                 var fadeInAnimation = new DoubleAnimation
                 {
                     From = 0.5,
@@ -54,10 +68,9 @@ namespace Ink_Canvas.Helpers
 
                 Storyboard.SetTargetProperty(fadeInAnimation, new PropertyPath(UIElement.OpacityProperty));
 
-                // 滑动动画
                 var slideAnimation = new DoubleAnimation
                 {
-                    From = element.RenderTransform.Value.OffsetY + 10, // 滑动距离
+                    From = 10,
                     To = 0,
                     Duration = TimeSpan.FromSeconds(duration)
                 };
@@ -68,12 +81,11 @@ namespace Ink_Canvas.Helpers
                 sb.Children.Add(fadeInAnimation);
                 sb.Children.Add(slideAnimation);
 
-                element.Visibility = Visibility.Visible;
-                element.RenderTransform = new TranslateTransform();
+                target.RenderTransform = new TranslateTransform();
 
-                sb.Begin((FrameworkElement)element);
+                sb.Begin((FrameworkElement)target);
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
 
         public static void ShowWithSlideFromLeftAndFade(UIElement element, double duration = 0.25)
@@ -113,7 +125,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 +168,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,21 +212,22 @@ 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)
         {
             try
             {
-                if (element.Visibility == Visibility.Collapsed) return;
-
                 if (element == null)
                     throw new ArgumentNullException(nameof(element));
 
+                if (element.Visibility == Visibility.Collapsed) return;
+
+                var target = ResolveAnimationTarget(element);
+
                 var sb = new Storyboard();
 
-                // 渐变动画
                 var fadeOutAnimation = new DoubleAnimation
                 {
                     From = 1,
@@ -224,11 +237,10 @@ namespace Ink_Canvas.Helpers
                 fadeOutAnimation.EasingFunction = new CubicEase();
                 Storyboard.SetTargetProperty(fadeOutAnimation, new PropertyPath(UIElement.OpacityProperty));
 
-                // 滑动动画
                 var slideAnimation = new DoubleAnimation
                 {
                     From = 0,
-                    To = element.RenderTransform.Value.OffsetY + 10, // 滑动距离
+                    To = 10,
                     Duration = TimeSpan.FromSeconds(duration)
                 };
                 slideAnimation.EasingFunction = new CubicEase();
@@ -243,10 +255,10 @@ namespace Ink_Canvas.Helpers
                     element.Visibility = Visibility.Collapsed;
                 };
 
-                element.RenderTransform = new TranslateTransform();
-                sb.Begin((FrameworkElement)element);
+                target.RenderTransform = new TranslateTransform();
+                sb.Begin((FrameworkElement)target);
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
 
         public static void HideWithFadeOut(UIElement element, double duration = 0.15)

Ink Canvas/Helpers/AppRestartHelper.cs

@@ -0,0 +1,113 @@
+using Ink_Canvas.Windows.SettingsViews.Helpers;
+using System;
+using System.Diagnostics;
+using System.Security.Principal;
+using System.Windows;
+
+namespace Ink_Canvas.Helpers
+{
+    public static class AppRestartHelper
+    {
+        public static bool IsRunningAsAdmin()
+        {
+            try
+            {
+                var identity = WindowsIdentity.GetCurrent();
+                var principal = new WindowsPrincipal(identity);
+                return principal.IsInRole(WindowsBuiltInRole.Administrator);
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        public static void RestartApp(bool asAdmin)
+        {
+            try
+            {
+                App.IsAppExitByUser = true;
+
+                (Application.Current as App)?.ReleaseMutexForRestart();
+
+                string exePath = Process.GetCurrentProcess().MainModule.FileName;
+
+                if (asAdmin)
+                {
+                    var psi = new ProcessStartInfo(exePath) { UseShellExecute = true, Verb = "runas" };
+                    Process.Start(psi);
+                }
+                else
+                {
+                    // 当前已是管理员时，直接通过用户令牌降权启动，避免经由 explorer 中转的延迟
+                    if (IsRunningAsAdmin() && UIAccessHelper.RestartAsNormalUser())
+                    {
+                        Application.Current.Shutdown();
+                        return;
+                    }
+
+                    Process.Start("explorer.exe", "\"" + exePath + "\"");
+                }
+
+                Application.Current.Shutdown();
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"重启应用时出错: {ex.Message}");
+            }
+        }
+
+        public static void RestartWithCurrentPrivileges()
+        {
+            RestartApp(IsRunningAsAdmin());
+        }
+
+        public static void RestartAsAdmin()
+        {
+            RestartApp(true);
+        }
+
+        public static void RestartAsNormal()
+        {
+            RestartApp(false);
+        }
+
+        public static void SwitchToUIATopMostAndRestart()
+        {
+            try
+            {
+                SettingsManager.Settings.Advanced.EnableUIAccessTopMost = true;
+
+                if (!SettingsManager.Settings.Advanced.IsAlwaysOnTop)
+                {
+                    SettingsManager.Settings.Advanced.IsAlwaysOnTop = true;
+                }
+
+                SettingsManager.SaveSettingsToFile();
+
+                App.IsUIAccessTopMostEnabled = true;
+                RestartApp(true);
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"切换到UIA置顶模式时出错: {ex.Message}");
+            }
+        }
+
+        public static void SwitchToNormalTopMostAndRestart()
+        {
+            try
+            {
+                SettingsManager.Settings.Advanced.EnableUIAccessTopMost = false;
+                SettingsManager.SaveSettingsToFile();
+
+                App.IsUIAccessTopMostEnabled = false;
+                RestartApp(IsRunningAsAdmin());
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"切换到普通置顶模式时出错: {ex.Message}");
+            }
+        }
+    }
+}

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,118 @@ namespace Ink_Canvas.Helpers
         private static readonly string updatesFolderPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "AutoUpdate");
         private static string statusFilePath;
 
+        // 全局下载取消令牌；UI 通过 RequestCancelDownload 取消当前下载
+        private static CancellationTokenSource _activeDownloadCts;
+        private static readonly object _activeDownloadLock = new object();
+
+        public static void RequestCancelDownload()
+        {
+            lock (_activeDownloadLock)
+            {
+                try { _activeDownloadCts?.Cancel(); } catch { }
+            }
+        }
+
+        private static CancellationTokenSource BeginDownloadSession()
+        {
+            lock (_activeDownloadLock)
+            {
+                try { _activeDownloadCts?.Cancel(); } catch { }
+                _activeDownloadCts = new CancellationTokenSource();
+                return _activeDownloadCts;
+            }
+        }
+
+        private static void EndDownloadSession(CancellationTokenSource cts)
+        {
+            lock (_activeDownloadLock)
+            {
+                if (ReferenceEquals(_activeDownloadCts, cts)) _activeDownloadCts = null;
+            }
+            try { cts?.Dispose(); } catch { }
+        }
+
+        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
@@ -288,7 +400,7 @@ namespace Ink_Canvas.Helpers
                     }
                 }
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
             return -1;
         }
 
@@ -302,6 +414,8 @@ namespace Ink_Canvas.Helpers
         // 获取所有可用线路组，按延迟排序
         public static async Task<List<UpdateLineGroup>> GetAvailableLineGroupsOrdered(UpdateChannel channel)
         {
+            var cached = TryGetCachedOrderedGroups(channel);
+            if (cached != null) return cached;
             var groups = ChannelLineGroups[channel];
             var availableGroups = new List<(UpdateLineGroup group, long delay)>();
 
@@ -317,6 +431,7 @@ namespace Ink_Canvas.Helpers
                         if (!string.IsNullOrEmpty(group.DownloadUrlFormat))
                         {
                             testUrl = group.DownloadUrlFormat.Replace("{0}", "test");
+                            testUrl = AppendX64SuffixBeforeZipExtension(testUrl);
                         }
                     }
                     catch
@@ -386,9 +501,46 @@ namespace Ink_Canvas.Helpers
                 LogHelper.WriteLogToFile("AutoUpdate | 所有线路组均不可用", LogHelper.LogType.Error);
             }
 
+            CacheOrderedGroups(channel, orderedGroups);
             return orderedGroups;
         }
 
+        // 缓存按延迟排序后的线路组，避免短时间内重复测速
+        private static readonly Dictionary<UpdateChannel, (List<UpdateLineGroup> groups, DateTime cachedAt)> _orderedGroupsCache
+            = new Dictionary<UpdateChannel, (List<UpdateLineGroup>, DateTime)>();
+        private static readonly TimeSpan _orderedGroupsCacheTtl = TimeSpan.FromMinutes(15);
+
+        private static List<UpdateLineGroup> TryGetCachedOrderedGroups(UpdateChannel channel)
+        {
+            lock (_orderedGroupsCache)
+            {
+                if (_orderedGroupsCache.TryGetValue(channel, out var entry) &&
+                    entry.groups != null && entry.groups.Count > 0 &&
+                    DateTime.UtcNow - entry.cachedAt < _orderedGroupsCacheTtl)
+                {
+                    LogHelper.WriteLogToFile($"AutoUpdate | 复用线路组延迟检测缓存（{entry.groups.Count} 个）");
+                    return new List<UpdateLineGroup>(entry.groups);
+                }
+                return null;
+            }
+        }
+
+        private static void CacheOrderedGroups(UpdateChannel channel, List<UpdateLineGroup> groups)
+        {
+            lock (_orderedGroupsCache)
+            {
+                _orderedGroupsCache[channel] = (new List<UpdateLineGroup>(groups), DateTime.UtcNow);
+            }
+        }
+
+        public static void InvalidateOrderedGroupsCache()
+        {
+            lock (_orderedGroupsCache)
+            {
+                _orderedGroupsCache.Clear();
+            }
+        }
+
         private static async Task<long> GetDownloadUrlDelay(string url)
         {
             try
@@ -608,7 +760,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;
@@ -643,20 +795,20 @@ namespace Ink_Canvas.Helpers
                         LogHelper.WriteLogToFile("AutoUpdate | 使用GitHub API调用");
                         var response = await client.GetStringAsync(apiUrl);
                         var releases = JArray.Parse(response);
-                        
+
                         if (releases.Count > 0)
                         {
                             var latestRelease = releases[0];
                             string version = latestRelease["tag_name"]?.ToString();
                             string releaseNotes = latestRelease["body"]?.ToString();
-                            string downloadUrl = latestRelease["assets"]?.First?["browser_download_url"]?.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);
                         }
@@ -675,7 +827,7 @@ namespace Ink_Canvas.Helpers
                         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();
+                        string downloadUrl = PickBrowserDownloadUrlFromAssets(json["assets"]);
 
                         DateTime? releaseTime = null;
                         if (json["published_at"] != null && DateTime.TryParse(json["published_at"].ToString(), out DateTime parsedTime))
@@ -863,9 +1015,11 @@ namespace Ink_Canvas.Helpers
         // 使用多线路组下载新版（支持自动切换）
         public static async Task<bool> DownloadSetupFileWithFallback(string version, List<UpdateLineGroup> groups, Action<double, string> progressCallback = null)
         {
+            var session = BeginDownloadSession();
             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")
                 {
@@ -881,7 +1035,7 @@ 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);
@@ -896,9 +1050,21 @@ namespace Ink_Canvas.Helpers
                 }
 
                 // 依次尝试每个线路组
+                CancellationToken groupLoopToken;
+                lock (_activeDownloadLock)
+                {
+                    groupLoopToken = _activeDownloadCts?.Token ?? CancellationToken.None;
+                }
                 foreach (var group in groups)
                 {
+                    if (groupLoopToken.IsCancellationRequested)
+                    {
+                        LogHelper.WriteLogToFile("AutoUpdate | 用户已取消，停止尝试后续线路组");
+                        break;
+                    }
+
                     string url = string.Format(group.DownloadUrlFormat, version);
+                    url = AppendX64SuffixBeforeZipExtension(url);
                     // 智教联盟需要先获取真实下载地址
                     if (group.GroupName == "智教联盟")
                     {
@@ -922,6 +1088,12 @@ namespace Ink_Canvas.Helpers
 
                     bool downloadSuccess = await DownloadFile(url, zipFilePath, progressCallback);
 
+                    if (groupLoopToken.IsCancellationRequested)
+                    {
+                        LogHelper.WriteLogToFile("AutoUpdate | 用户已取消，停止尝试后续线路组");
+                        break;
+                    }
+
                     if (downloadSuccess)
                     {
                         SaveDownloadStatus(true);
@@ -937,6 +1109,13 @@ namespace Ink_Canvas.Helpers
                 progressCallback?.Invoke(0, "所有线路组下载均失败");
                 return false;
             }
+            catch (OperationCanceledException)
+            {
+                LogHelper.WriteLogToFile("AutoUpdate | 下载已被用户取消", LogHelper.LogType.Warning);
+                SaveDownloadStatus(false);
+                progressCallback?.Invoke(0, "下载已取消");
+                return false;
+            }
             catch (Exception ex)
             {
                 LogHelper.WriteLogToFile($"AutoUpdate | 下载更新时出错: {ex.Message}", LogHelper.LogType.Error);
@@ -949,6 +1128,10 @@ namespace Ink_Canvas.Helpers
                 progressCallback?.Invoke(0, $"下载异常: {ex.Message}");
                 return false;
             }
+            finally
+            {
+                EndDownloadSession(session);
+            }
         }
 
         // 下载文件的具体实现
@@ -959,6 +1142,12 @@ namespace Ink_Canvas.Helpers
             // 降低并发数，减少网络压力
             int[] threadOptions = { 32, 16, 8, 4, 1 };
 
+            CancellationToken externalToken;
+            lock (_activeDownloadLock)
+            {
+                externalToken = _activeDownloadCts?.Token ?? CancellationToken.None;
+            }
+
             // 检查服务器是否支持Range分块下载
             bool supportRange = false;
             long totalSize = -1;
@@ -1062,7 +1251,7 @@ namespace Ink_Canvas.Helpers
                                         // 增加连接超时设置
                                         client.Timeout = TimeSpan.FromSeconds(30);
 
-                                        var downloadCts = CancellationTokenSource.CreateLinkedTokenSource(cts.Token);
+                                        var downloadCts = CancellationTokenSource.CreateLinkedTokenSource(cts.Token, externalToken);
                                         var lastReadTime = DateTime.UtcNow;
                                         bool dataReceived = false;
 
@@ -1122,19 +1311,32 @@ namespace Ink_Canvas.Helpers
                                     success = true;
                                     LogHelper.WriteLogToFile($"AutoUpdate | 分块{block.Index}下载成功");
                                 }
-                                catch (Exception ex) when (ex is HttpRequestException || ex is IOException || ex is TaskCanceledException)
+                                catch (Exception ex) when (ex is HttpRequestException || ex is IOException || ex is TaskCanceledException || ex is OperationCanceledException)
                                 {
+                                    // 用户主动取消：不再重试
+                                    if (externalToken.IsCancellationRequested)
+                                    {
+                                        LogHelper.WriteLogToFile($"AutoUpdate | 分块{block.Index}下载已被用户取消", LogHelper.LogType.Warning);
+                                        if (File.Exists(tempPath))
+                                        {
+                                            try { File.Delete(tempPath); } catch { }
+                                        }
+                                        cts.Cancel();
+                                        return;
+                                    }
+
                                     LogHelper.WriteLogToFile($"AutoUpdate | 分块{block.Index}下载失败，第{retry + 1}次: {ex.Message}", LogHelper.LogType.Warning);
                                     progressCallback?.Invoke(0, $"分块{block.Index}下载失败，第{retry + 1}次: {ex.Message}");
 
                                     // 清理可能损坏的分块文件
                                     if (File.Exists(tempPath))
                                     {
-                                        try { File.Delete(tempPath); } catch { }
+                                        try { File.Delete(tempPath); } catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
                                     }
 
                                     // 增加重试间隔，避免频繁重试
-                                    await Task.Delay(2000 * (retry + 1));
+                                    try { await Task.Delay(2000 * (retry + 1), externalToken); }
+                                    catch (OperationCanceledException) { cts.Cancel(); return; }
                                 }
                             }
                             if (success)
@@ -1255,12 +1457,18 @@ namespace Ink_Canvas.Helpers
                 LogHelper.WriteLogToFile($"AutoUpdate | 开始单线程下载: {fileUrl}");
                 progressCallback?.Invoke(0, "开始单线程下载");
 
+                CancellationToken token;
+                lock (_activeDownloadLock)
+                {
+                    token = _activeDownloadCts?.Token ?? CancellationToken.None;
+                }
+
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.UserAgent.ParseAdd("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36");
                     client.Timeout = TimeSpan.FromMinutes(10); // 单线程下载设置更长的超时时间
 
-                    using (var resp = await client.GetAsync(fileUrl, HttpCompletionOption.ResponseHeadersRead))
+                    using (var resp = await client.GetAsync(fileUrl, HttpCompletionOption.ResponseHeadersRead, token))
                     {
                         resp.EnsureSuccessStatusCode();
                         using (var fs = new FileStream(destinationPath, FileMode.Create, FileAccess.Write, FileShare.None))
@@ -1271,9 +1479,9 @@ namespace Ink_Canvas.Helpers
                             long downloaded = 0;
                             var lastProgressUpdate = DateTime.UtcNow;
 
-                            while ((read = await stream.ReadAsync(buffer, 0, buffer.Length)) > 0)
+                            while ((read = await stream.ReadAsync(buffer, 0, buffer.Length, token)) > 0)
                             {
-                                await fs.WriteAsync(buffer, 0, read);
+                                await fs.WriteAsync(buffer, 0, read, token);
                                 downloaded += read;
 
                                 // 限制进度更新频率，避免UI卡顿
@@ -1295,6 +1503,13 @@ namespace Ink_Canvas.Helpers
                 LogHelper.WriteLogToFile("AutoUpdate | 单线程下载完成");
                 return true;
             }
+            catch (OperationCanceledException)
+            {
+                LogHelper.WriteLogToFile("AutoUpdate | 单线程下载已被取消", LogHelper.LogType.Warning);
+                progressCallback?.Invoke(0, "下载已取消");
+                try { if (File.Exists(destinationPath)) File.Delete(destinationPath); } catch { }
+                return false;
+            }
             catch (Exception ex)
             {
                 LogHelper.WriteLogToFile($"AutoUpdate | 单线程下载失败: {ex.Message}", LogHelper.LogType.Error);
@@ -1316,11 +1531,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
@@ -1341,11 +1562,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
                 {
@@ -1376,7 +1618,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))
@@ -1431,7 +1673,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)
@@ -1506,6 +1748,18 @@ namespace Ink_Canvas.Helpers
                     LogHelper.WriteLogToFile($"AutoUpdate | 内部异常: {ex.InnerException.Message}", LogHelper.LogType.Error);
                 }
             }
+            finally
+            {
+                // 确保无论更新成功还是失败，都恢复标志位和进程保护状态
+                App.IsUpdateInstalling = false;
+                try
+                {
+                    ProcessProtectionManager.SetEnabled(wasProcessProtectionEnabled);
+                }
+                catch
+                {
+                }
+            }
         }
 
         // 处理更新模式的启动参数
@@ -2059,16 +2313,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); }
         }
 
         // 版本修复方法，强制下载并安装指定通道的最新版本
@@ -2078,9 +2332,9 @@ namespace Ink_Canvas.Helpers
             {
                 LogHelper.WriteLogToFile($"AutoUpdate | 开始修复版本，通道: {channel}");
 
-                // 获取远程版本号（自动选择最快线路组，始终下载远程版本，版本修复模式）
-                var (remoteVersion, group, _) = await CheckForUpdates(channel, true, true);
-                if (string.IsNullOrEmpty(remoteVersion) || group == null)
+                // 获取远程版本号（始终下载远程版本，版本修复模式）
+                var (remoteVersion, preferredGroup, _) = await CheckForUpdates(channel, true, true);
+                if (string.IsNullOrEmpty(remoteVersion))
                 {
                     LogHelper.WriteLogToFile("AutoUpdate | 修复版本时获取远程版本失败", LogHelper.LogType.Error);
                     return false;
@@ -2088,8 +2342,22 @@ namespace Ink_Canvas.Helpers
 
                 LogHelper.WriteLogToFile($"AutoUpdate | 修复版本远程版本: {remoteVersion}");
 
+                var availableGroups = await GetAvailableLineGroupsOrdered(channel);
+                if (availableGroups.Count == 0)
+                {
+                    LogHelper.WriteLogToFile("AutoUpdate | 修复版本时无可用线路组", LogHelper.LogType.Error);
+                    return false;
+                }
+
+                if (preferredGroup != null)
+                {
+                    availableGroups.RemoveAll(g => g.GroupName == preferredGroup.GroupName);
+                    availableGroups.Insert(0, preferredGroup);
+                    LogHelper.WriteLogToFile($"AutoUpdate | 修复版本下载优先使用线路组: {preferredGroup.GroupName}");
+                }
+
                 // 无论版本是否为最新，都下载远程版本
-                bool downloadResult = await DownloadSetupFile(remoteVersion, group);
+                bool downloadResult = await DownloadSetupFileWithFallback(remoteVersion, availableGroups);
                 if (!downloadResult)
                 {
                     LogHelper.WriteLogToFile("AutoUpdate | 修复版本时下载更新失败", LogHelper.LogType.Error);
@@ -2131,7 +2399,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));
                     }
@@ -2277,4 +2545,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()

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

@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
+using System.Windows.Media;
 
 namespace Ink_Canvas.Converter
 {
@@ -152,4 +153,27 @@ namespace Ink_Canvas.Converter
             return null;
         }
     }
+
+    public class StringToGeometryConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            try
+            {
+                if (value is string geometryString && !string.IsNullOrEmpty(geometryString))
+                {
+                    return Geometry.Parse(geometryString);
+                }
+            }
+            catch (Exception)
+            {
+            }
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
 }

Ink Canvas/Helpers/DebugConsoleManager.cs

@@ -0,0 +1,96 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Ink_Canvas.Helpers
+{
+    public static class DebugConsoleManager
+    {
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern bool AllocConsole();
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern bool FreeConsole();
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern IntPtr GetConsoleWindow();
+
+        [DllImport("user32.dll")]
+        private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr GetSystemMenu(IntPtr hWnd, bool bRevert);
+
+        [DllImport("user32.dll")]
+        private static extern bool DeleteMenu(IntPtr hMenu, uint uPosition, uint uFlags);
+
+        [DllImport("kernel32.dll")]
+        private static extern bool SetConsoleTitle(string lpConsoleTitle);
+
+        private const int SW_HIDE = 0;
+        private const int SW_SHOW = 5;
+        private const uint SC_CLOSE = 0xF060;
+        private const uint MF_BYCOMMAND = 0x00000000;
+
+        private static bool _allocated;
+
+        public static bool IsVisible { get; private set; }
+
+        public static void Show()
+        {
+            try
+            {
+                if (!_allocated)
+                {
+                    if (GetConsoleWindow() == IntPtr.Zero)
+                    {
+                        if (!AllocConsole()) return;
+                    }
+                    _allocated = true;
+
+                    Console.OutputEncoding = Encoding.UTF8;
+                    SetConsoleTitle("InkCanvasForClass - Debug Console");
+
+                    // 移除关闭菜单，避免用户点 X 时直接结束进程
+                    var hWnd = GetConsoleWindow();
+                    if (hWnd != IntPtr.Zero)
+                    {
+                        var hMenu = GetSystemMenu(hWnd, false);
+                        if (hMenu != IntPtr.Zero) DeleteMenu(hMenu, SC_CLOSE, MF_BYCOMMAND);
+                    }
+                }
+                else
+                {
+                    var hWnd = GetConsoleWindow();
+                    if (hWnd != IntPtr.Zero) ShowWindow(hWnd, SW_SHOW);
+                }
+                IsVisible = true;
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[DebugConsoleManager] Show failed: {ex.Message}");
+            }
+        }
+
+        public static void Hide()
+        {
+            try
+            {
+                var hWnd = GetConsoleWindow();
+                if (hWnd != IntPtr.Zero) ShowWindow(hWnd, SW_HIDE);
+                IsVisible = false;
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[DebugConsoleManager] Hide failed: {ex.Message}");
+            }
+        }
+
+        public static void WriteLine(string line)
+        {
+            if (!IsVisible) return;
+            try { Console.WriteLine(line); }
+            catch { }
+        }
+    }
+}

Ink Canvas/Helpers/DeviceIdentifier.cs

@@ -1,9 +1,11 @@
 using Newtonsoft.Json;
+using OSVersionExtension;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
 
@@ -21,6 +23,9 @@ namespace Ink_Canvas.Helpers
 
         private static readonly string DeviceId;
         private static readonly object fileLock = new object();
+        private static UsageStats usageStatsCache;
+        private static DateTime usageStatsCacheTime;
+        private static readonly TimeSpan UsageStatsCacheDuration = TimeSpan.FromMinutes(2);
 
         static DeviceIdentifier()
         {
@@ -115,114 +120,26 @@ namespace Ink_Canvas.Helpers
         /// </summary>
         private static string GenerateHardwareFingerprint()
         {
-            // 收集硬件信息
             var hardwareInfo = new StringBuilder();
+            AppendFingerprintPart(hardwareInfo, "CPU",
+                GetWmiProperty("SELECT ProcessorId FROM Win32_Processor", "ProcessorId"),
+                GetRegistryValue(@"HARDWARE\DESCRIPTION\System\CentralProcessor\0", "ProcessorNameString"),
+                GetRegistryValue(@"HARDWARE\DESCRIPTION\System\CentralProcessor\0", "Identifier"));
 
-            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);
+            AppendFingerprintPart(hardwareInfo, "BOARD",
+                GetWmiProperty("SELECT SerialNumber FROM Win32_BaseBoard", "SerialNumber"),
+                GetRegistryValue(@"HARDWARE\DESCRIPTION\System\BIOS", "BaseBoardSerialNumber"),
+                GetRegistryValue(@"HARDWARE\DESCRIPTION\System\BIOS", "BaseBoardProduct"));
 
-                        var moveNextMethod = enumerator.GetType().GetMethod("MoveNext");
-                        var currentProperty = enumerator.GetType().GetProperty("Current");
+            AppendFingerprintPart(hardwareInfo, "BIOS",
+                GetWmiProperty("SELECT SerialNumber FROM Win32_BIOS", "SerialNumber"),
+                GetRegistryValue(@"HARDWARE\DESCRIPTION\System\BIOS", "BIOSVersion"),
+                GetRegistryValue(@"HARDWARE\DESCRIPTION\System\BIOS", "BIOSVendor"));
 
-                        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
-            {
-            }
+            AppendFingerprintPart(hardwareInfo, "DISK",
+                GetWmiProperty("SELECT SerialNumber FROM Win32_DiskDrive WHERE MediaType='Fixed hard disk media'", "SerialNumber"),
+                GetSystemDriveVolumeSerial(),
+                GetRegistryValue(@"SOFTWARE\Microsoft\Cryptography", "MachineGuid"));
 
             if (hardwareInfo.Length < 10)
             {
@@ -234,6 +151,108 @@ namespace Ink_Canvas.Helpers
             return hardwareInfo.ToString();
         }
 
+        private static void AppendFingerprintPart(StringBuilder hardwareInfo, string key, params string[] candidates)
+        {
+            foreach (var candidate in candidates)
+            {
+                if (!string.IsNullOrWhiteSpace(candidate))
+                {
+                    hardwareInfo.Append(key).Append(':').Append(candidate.Trim()).Append(';');
+                    return;
+                }
+            }
+        }
+
+        private static string GetWmiProperty(string query, string propertyName)
+        {
+            try
+            {
+                var assembly = Assembly.Load("System.Management");
+                var searcherType = assembly?.GetType("System.Management.ManagementObjectSearcher");
+                if (searcherType == null)
+                {
+                    return null;
+                }
+
+                var searcher = Activator.CreateInstance(searcherType, query);
+                var getMethod = searcherType.GetMethod("Get");
+                var resultCollection = getMethod?.Invoke(searcher, null);
+                if (resultCollection == null)
+                {
+                    return null;
+                }
+
+                var enumerator = resultCollection.GetType().GetMethod("GetEnumerator")?.Invoke(resultCollection, null);
+                var moveNextMethod = enumerator?.GetType().GetMethod("MoveNext");
+                var currentProperty = enumerator?.GetType().GetProperty("Current");
+                if (enumerator == null || moveNextMethod == null || currentProperty == null)
+                {
+                    return null;
+                }
+
+                if (!(bool)moveNextMethod.Invoke(enumerator, null))
+                {
+                    return null;
+                }
+
+                var currentObject = currentProperty.GetValue(enumerator);
+                var indexer = currentObject?.GetType().GetProperty("Item", new[] { typeof(string) });
+                var result = indexer?.GetValue(currentObject, new object[] { propertyName })?.ToString();
+
+                searcher?.GetType().GetMethod("Dispose")?.Invoke(searcher, null);
+                return result;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        private static string GetRegistryValue(string subKey, string valueName)
+        {
+            try
+            {
+                return Microsoft.Win32.Registry.GetValue($@"HKEY_LOCAL_MACHINE\{subKey}", valueName, null)?.ToString();
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        private static string GetSystemDriveVolumeSerial()
+        {
+            try
+            {
+                var rootPath = Path.GetPathRoot(Environment.SystemDirectory);
+                if (string.IsNullOrWhiteSpace(rootPath))
+                {
+                    return null;
+                }
+
+                if (GetVolumeInformation(rootPath, null, 0, out uint serialNumber, out _, out _, null, 0))
+                {
+                    return serialNumber.ToString("X8");
+                }
+            }
+            catch
+            {
+            }
+
+            return null;
+        }
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        private static extern bool GetVolumeInformation(
+            string rootPathName,
+            StringBuilder volumeNameBuffer,
+            uint volumeNameSize,
+            out uint volumeSerialNumber,
+            out uint maximumComponentLength,
+            out uint fileSystemFlags,
+            StringBuilder fileSystemNameBuffer,
+            uint nFileSystemNameSize);
+
         /// <summary>
         /// 基于硬件指纹生成25字符的设备ID
         /// </summary>
@@ -359,6 +378,11 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 保存设备ID到文件
         /// </summary>
+        /// <remarks>
+        /// 将设备标识信息以格式化的 JSON 写入指定文件，并确保目标目录存在；在失败时记录错误但不抛出异常。
+        /// </remarks>
+        /// <param name="filePath">目标文件的完整路径，用于保存设备标识信息。</param>
+        /// <param name="info">要保存的设备标识信息对象（包含 DeviceId 和 可选的硬件指纹）。</param>
         private static void SaveDeviceIdToFile(string filePath, DeviceIdInfo info)
         {
             try
@@ -367,11 +391,11 @@ 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(info, Formatting.Indented);
-                File.WriteAllText(filePath, json);
+                ProcessProtectionManager.WithWriteAccess(filePath, () => File.WriteAllText(filePath, json));
 
                 LogHelper.WriteLogToFile($"DeviceIdentifier | 设备ID已保存到: {filePath}");
             }
@@ -405,7 +429,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; }
 
@@ -567,6 +593,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);
 
@@ -602,8 +642,6 @@ namespace Ink_Canvas.Helpers
                         // 更新秒级精度数据
                         stats.TotalUsageSeconds += sessionSeconds;
 
-
-
                         // 记录每周使用时长（秒级精度）
                         stats.RecordWeeklyUsage(sessionSeconds);
 
@@ -611,7 +649,6 @@ namespace Ink_Canvas.Helpers
                         if (stats.LaunchCount > 0)
                         {
                             stats.AverageSessionSeconds = (double)stats.TotalUsageSeconds / stats.LaunchCount;
-
                         }
                     }
 
@@ -631,6 +668,20 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        public static string GetSystemVersion()
+        {
+            try
+            {
+                var stats = GetUsageStatsCached();
+                return stats.SystemVersion;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"DeviceIdentifier | 获取系统版本失败: {ex.Message}", LogHelper.LogType.Error);
+                return null;
+            }
+        }
+
         /// <summary>
         /// 计算使用频率和更新优先级（基于真实的每周统计数据）
         /// 通过多维度评分系统确定用户类型：高频(≥80分)、中频(40-79分)、低频(<40分)
@@ -740,7 +791,7 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                var stats = LoadUsageStats();
+                var stats = GetUsageStatsCached();
                 return stats.UpdatePriority;
             }
             catch (Exception ex)
@@ -757,7 +808,7 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                var stats = LoadUsageStats();
+                var stats = GetUsageStatsCached();
                 return stats.UsageFrequency;
             }
             catch (Exception ex)
@@ -859,6 +910,23 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        private static UsageStats GetUsageStatsCached(bool forceRefresh = false)
+        {
+            lock (fileLock)
+            {
+                if (!forceRefresh
+                    && usageStatsCache != null
+                    && (DateTime.Now - usageStatsCacheTime) < UsageStatsCacheDuration)
+                {
+                    return usageStatsCache;
+                }
+
+                usageStatsCache = LoadUsageStats();
+                usageStatsCacheTime = DateTime.Now;
+                return usageStatsCache;
+            }
+        }
+
         /// <summary>
         /// 保存使用统计
         /// </summary>
@@ -869,6 +937,9 @@ namespace Ink_Canvas.Helpers
 
             // 保存到备份文件
             SaveUsageStatsToFile(UsageStatsBackupPath, stats);
+
+            usageStatsCache = stats;
+            usageStatsCacheTime = DateTime.Now;
         }
 
 
@@ -971,7 +1042,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);
@@ -995,7 +1066,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}");
                 }
@@ -1209,15 +1280,20 @@ namespace Ink_Canvas.Helpers
                     int versionDiff = CalculateVersionGenerationDifference(localVersion, updateVersion);
                     LogHelper.WriteLogToFile($"DeviceIdentifier | 无法获取版本发布时间，使用版本号差异判断 - 本地版本: {localVersion}, 远程版本: {updateVersion}, 代数差异: {versionDiff}");
 
-                    if (versionDiff >= 1)
+                    if (versionDiff <= 0)
                     {
-                        LogHelper.WriteLogToFile($"DeviceIdentifier | 版本号代数差异({versionDiff})>=1，允许更新");
-                    }
-                    else
-                    {
-                        LogHelper.WriteLogToFile($"DeviceIdentifier | 版本号代数差异({versionDiff})<1，可能是相同版本或降级，暂不更新");
+                        LogHelper.WriteLogToFile($"DeviceIdentifier | 版本号代数差异({versionDiff})<=0，可能是相同版本或降级，暂不更新");
                         return false;
                     }
+
+                    // 当代数差异较大（>=3）时直接放行，避免被分级策略卡住
+                    if (versionDiff >= 3)
+                    {
+                        LogHelper.WriteLogToFile($"DeviceIdentifier | 版本号代数差异({versionDiff})>=3，跳过分级策略直接推送");
+                        return true;
+                    }
+
+                    LogHelper.WriteLogToFile($"DeviceIdentifier | 版本号代数差异({versionDiff})>=1，进入分级策略判断");
                 }
 
                 // 计算最近活跃度（最后一次使用距今的天数）
@@ -1591,4 +1667,3 @@ namespace Ink_Canvas.Helpers
         }
     }
 }
-

Ink Canvas/Helpers/DlassApiClient.cs

@@ -4,6 +4,7 @@ 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
@@ -54,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))
             {
@@ -68,6 +70,8 @@ namespace Ink_Canvas.Helpers
 
             try
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 var requestData = new
                 {
                     app_id = _appId,
@@ -78,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)
@@ -93,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);
@@ -110,14 +114,19 @@ 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);
@@ -134,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)
@@ -150,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);
@@ -167,14 +176,20 @@ 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);
@@ -197,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)
@@ -213,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);
@@ -230,14 +245,20 @@ 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);
@@ -261,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)
@@ -277,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);
@@ -294,14 +315,19 @@ 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);
@@ -319,7 +345,7 @@ namespace Ink_Canvas.Helpers
                     }
                 }
 
-                var response = await _httpClient.SendAsync(request);
+                var response = await _httpClient.SendAsync(request, cancellationToken);
 
                 if (response.IsSuccessStatusCode)
                 {
@@ -330,11 +356,11 @@ namespace Ink_Canvas.Helpers
                     return false;
                 }
             }
-            catch (HttpRequestException)
+            catch (OperationCanceledException)
             {
-                return false;
+                throw;
             }
-            catch (TaskCanceledException)
+            catch (HttpRequestException)
             {
                 return false;
             }
@@ -354,10 +380,13 @@ 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}");
@@ -394,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)
@@ -410,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,762 +0,0 @@
-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 != ".xml" && 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、XML和ZIP格式）
-        /// </summary>
-        /// <param name="filePath">文件路径（支持PNG、ICSTK、XML和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 != ".xml" && 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 != ".xml" && 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 if (fileExtension == ".xml")
-                {
-                    fileType = "XML文件";
-                    tags = "自动上传,xml";
-                }
-                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 != ".xml" && 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

@@ -519,7 +519,7 @@ namespace Ink_Canvas.Helpers
                                 File.Delete(ipcFile);
                             }
                         }
-                        catch { }
+                        catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
                     }
                 }
 
@@ -570,7 +570,7 @@ namespace Ink_Canvas.Helpers
                                 File.Delete(ipcFile);
                             }
                         }
-                        catch { }
+                        catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
                     }
                 }
 
@@ -625,7 +625,7 @@ namespace Ink_Canvas.Helpers
                                 File.Delete(ipcFile);
                             }
                         }
-                        catch { }
+                        catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
                     }
                 }
 
@@ -675,7 +675,7 @@ namespace Ink_Canvas.Helpers
                                 File.Delete(ipcFile);
                             }
                         }
-                        catch { }
+                        catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
                     }
                 }
             }

Ink Canvas/Helpers/ForegroundWindowInfo.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -54,6 +54,11 @@ namespace Ink_Canvas.Helpers
         [DllImport("user32.dll")]
         private static extern IntPtr MonitorFromRect(ref RECT lprc, uint dwFlags);
 
+        public static IntPtr GetForegroundWindowHandle()
+        {
+            return GetForegroundWindow();
+        }
+
         public static string WindowTitle()
         {
             IntPtr foregroundWindowHandle = GetForegroundWindow();

Ink Canvas/Helpers/FullScreenHelper.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.ExceptionServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Interop;
@@ -189,9 +188,7 @@ namespace Ink_Canvas.Helpers
 
         /// <summary>
         /// 确保窗口全屏的Hook
-        /// 使用HandleProcessCorruptedStateExceptions，防止访问内存过程中因为一些致命异常导致程序崩溃
         /// </summary>
-        [HandleProcessCorruptedStateExceptions]
         private static IntPtr KeepFullScreenHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
         {
             //处理WM_WINDOWPOSCHANGING消息

Ink Canvas/Helpers/GlobalHotkeyManager.cs

@@ -285,6 +285,7 @@ namespace Ink_Canvas.Helpers
                 // 功能快捷键
                 RegisterHotkey("DrawLine", Key.L, ModifierKeys.Alt, () => _mainWindow.BtnDrawLine_Click(null, null));
                 RegisterHotkey("Screenshot", Key.C, ModifierKeys.Alt, () => _mainWindow.SaveScreenShotToDesktop());
+                RegisterHotkey("QuickDraw", Key.K, ModifierKeys.Alt, () => _mainWindow.OpenQuickDrawFromHotkey());
                 RegisterHotkey("Hide", Key.V, ModifierKeys.Alt, () => _mainWindow.SymbolIconEmoji_MouseUp(null, null));
 
                 // 退出快捷键
@@ -566,6 +567,36 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        /// <summary>
+        /// 刷新多屏相关设置（开关和跟随鼠标策略）。
+        /// </summary>
+        public void RefreshMultiScreenSettings()
+        {
+            try
+            {
+                var advanced = MainWindow.Settings.Advanced;
+                _isMultiScreenMode = advanced.EnableMultiScreenSupport && ScreenDetectionHelper.HasMultipleScreens();
+                _enableScreenSpecificHotkeys = _isMultiScreenMode;
+
+                if (_isMultiScreenMode)
+                {
+                    _currentScreen = advanced.FollowMouseForScreenSelection
+                        ? Screen.FromPoint(Control.MousePosition)
+                        : ScreenDetectionHelper.GetWindowScreen(_mainWindow);
+                }
+                else
+                {
+                    _currentScreen = ScreenDetectionHelper.GetPrimaryScreen();
+                }
+
+                RefreshHotkeysForCurrentScreen();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"刷新多屏设置时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
         /// <summary>
         /// 获取当前屏幕信息
         /// </summary>
@@ -623,13 +654,15 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                // 检测是否有多个屏幕
-                _isMultiScreenMode = ScreenDetectionHelper.HasMultipleScreens();
+                var advanced = MainWindow.Settings.Advanced;
+                _isMultiScreenMode = advanced.EnableMultiScreenSupport && ScreenDetectionHelper.HasMultipleScreens();
+                _enableScreenSpecificHotkeys = _isMultiScreenMode;
 
                 if (_isMultiScreenMode)
                 {
-                    // 获取当前窗口所在的屏幕
-                    _currentScreen = ScreenDetectionHelper.GetWindowScreen(_mainWindow);
+                    _currentScreen = advanced.FollowMouseForScreenSelection
+                        ? Screen.FromPoint(Control.MousePosition)
+                        : ScreenDetectionHelper.GetWindowScreen(_mainWindow);
 
                     // 监听窗口位置变化事件
                     _mainWindow.LocationChanged += OnWindowLocationChanged;
@@ -687,6 +720,9 @@ namespace Ink_Canvas.Helpers
                 if (!_isMultiScreenMode || !_enableScreenSpecificHotkeys)
                     return;
 
+                if (MainWindow.Settings.Advanced.FollowMouseForScreenSelection)
+                    return;
+
                 var newScreen = ScreenDetectionHelper.GetWindowScreen(_mainWindow);
                 if (newScreen != null && newScreen != _currentScreen)
                 {
@@ -799,9 +835,16 @@ namespace Ink_Canvas.Helpers
                 if (!_isMultiScreenMode || !_enableScreenSpecificHotkeys)
                     return;
 
-                // 检查鼠标是否在当前窗口所在的屏幕上
                 var mousePosition = Control.MousePosition;
-                var currentScreen = Screen.FromPoint(mousePosition);
+                var mouseScreen = Screen.FromPoint(mousePosition);
+
+                if (MainWindow.Settings.Advanced.FollowMouseForScreenSelection &&
+                    mouseScreen != null &&
+                    mouseScreen != _currentScreen)
+                {
+                    _currentScreen = mouseScreen;
+                    RefreshHotkeysForCurrentScreen();
+                }
 
                 // 无论屏幕是否变化，都检查热键状态
                 // 这样可以确保热键状态始终与当前上下文保持一致
@@ -1033,6 +1076,7 @@ namespace Ink_Canvas.Helpers
                     new HotkeyConfigItem { Name = "Pen5", Key = Key.D5, Modifiers = ModifierKeys.Alt },
                     new HotkeyConfigItem { Name = "DrawLine", Key = Key.L, Modifiers = ModifierKeys.Alt },
                     new HotkeyConfigItem { Name = "Screenshot", Key = Key.C, Modifiers = ModifierKeys.Alt },
+                    new HotkeyConfigItem { Name = "QuickDraw", Key = Key.K, Modifiers = ModifierKeys.Alt },
                     new HotkeyConfigItem { Name = "Hide", Key = Key.V, Modifiers = ModifierKeys.Alt },
                     new HotkeyConfigItem { Name = "Exit", Key = Key.Escape, Modifiers = ModifierKeys.None }
                 });
@@ -1111,6 +1155,14 @@ namespace Ink_Canvas.Helpers
                     }
                 }
 
+                // 旧版 HotkeyConfig.json 无「快抽」项时补注册默认组合，避免升级后无快捷键
+                if (successCount > 0 && !IsHotkeyRegistered("QuickDraw"))
+                {
+                    var quickDrawAction = GetActionByName("QuickDraw");
+                    if (quickDrawAction != null && RegisterHotkey("QuickDraw", Key.K, ModifierKeys.Alt, quickDrawAction))
+                        successCount++;
+                }
+
                 if (successCount > 0)
                 {
                     _hotkeysShouldBeRegistered = true;
@@ -1221,6 +1273,8 @@ namespace Ink_Canvas.Helpers
                         return () => _mainWindow.BtnDrawLine_Click(null, null);
                     case "Screenshot":
                         return () => _mainWindow.SaveScreenShotToDesktop();
+                    case "QuickDraw":
+                        return () => _mainWindow.OpenQuickDrawFromHotkey();
                     case "Hide":
                         return () => _mainWindow.SymbolIconEmoji_MouseUp(null, null);
                     case "Exit":

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

@@ -1,5 +1,4 @@
 using System;
-using Microsoft.Office.Interop.PowerPoint;
 
 namespace Ink_Canvas.Helpers
 {
@@ -16,16 +15,37 @@ namespace Ink_Canvas.Helpers
         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();
 
         // 导航控制
@@ -41,4 +61,3 @@ namespace Ink_Canvas.Helpers
     }
 }
 
-

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,246 @@
+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 readonly object _initSync = new object();
+
+        private ModernInkProcessor _modernProcessor;
+        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() { }
+
+        private void Initialize()
+        {
+            if (_isInitialized) return;
+
+            try
+            {
+                // 启动阶段只做能力探测，不做 WinRT 组件实例化（避免冷启动延迟）
+                _isModernSystemAvailable = WinRtInkShapeRecognizer.IsApiAvailable;
+                _isInitialized = true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile("墨迹识别管理器初始化失败: " + ex.Message, LogHelper.LogType.Error);
+                _isInitialized = false;
+            }
+        }
+
+        private void EnsureInitialized()
+        {
+            if (_isInitialized) return;
+            lock (_initSync)
+            {
+                if (_isInitialized) return;
+                Initialize();
+            }
+        }
+
+        private void EnsureModernAnalyzerInitialized()
+        {
+            if (_modernProcessor != null || !_isModernSystemAvailable) return;
+
+            lock (_initSync)
+            {
+                if (_modernProcessor != null || !_isModernSystemAvailable) return;
+                try
+                {
+                    _modernProcessor ??= new ModernInkProcessor();
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile("WinRT 墨迹模块懒加载失败: " + ex.Message, LogHelper.LogType.Warning);
+                    _isModernSystemAvailable = false;
+                    _modernProcessor = null;
+                }
+            }
+        }
+
+        public Task<InkShapeRecognitionResult> RecognizeShapeAsync(
+            StrokeCollection strokes,
+            ShapeRecognitionEngineMode mode)
+        {
+            EnsureInitialized();
+            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)
+        {
+            EnsureInitialized();
+            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);
+                }
+
+                EnsureModernAnalyzerInitialized();
+                if (_modernProcessor == null)
+                {
+                    LogHelper.WriteLogToFile(
+                        "[手写体] CorrectInkAsync 跳过：ModernInkProcessor 未就绪（WinRT 初始化失败？）。笔画数=" +
+                        strokes.Count,
+                        LogHelper.LogType.Warning);
+                    return Task.FromResult(strokes);
+                }
+
+                LogHelper.WriteLogToFile(
+                    "[手写体] CorrectInkAsync 开始：笔画数=" + strokes.Count +
+                    "，字体=" + (string.IsNullOrWhiteSpace(handwritingFontFamilyList) ? "(默认)" : handwritingFontFamilyList.Trim()),
+                    LogHelper.LogType.Info);
+                return WinRtHandwritingRecognizer.ConvertRecognizedTextToHandwritingInkAsync(strokes, handwritingFontFamilyList);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile("墨迹纠正失败: " + ex.Message, LogHelper.LogType.Error);
+                return Task.FromResult(strokes);
+            }
+        }
+
+        /// <summary>
+        /// WinRT 手写体识别（需 Windows 10+ 及系统手写识别组件）。返回分词候选与包围框，供剪贴板或插件使用。
+        /// </summary>
+        public Task<HandwritingRecognitionResult> RecognizeHandwritingAsync(
+            StrokeCollection strokes,
+            ShapeRecognitionEngineMode mode)
+        {
+            EnsureInitialized();
+            if (!_isInitialized || strokes == null || strokes.Count == 0)
+                return Task.FromResult(HandwritingRecognitionResult.Empty);
+
+            try
+            {
+                if (!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
+                ? $"现代化墨迹识别系统 (Windows Runtime API) - 进程架构: {Environment.Is64BitProcess}"
+                : $"传统墨迹识别系统 (IACore) - 进程架构: {Environment.Is64BitProcess}";
+        }
+
+        public void Dispose()
+        {
+            _modernProcessor?.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()
+        {
+        }
+    }
+}

Ink Canvas/Helpers/InkRecognizeHelper.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Linq;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Ink;
 using System.Windows.Media;
@@ -7,8 +8,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,35 +26,158 @@ 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;
+                    }
+                    if (alternates.Count > 0)
+                    {
+                        var altFinal = alternates[0];
+                        if (altFinal?.AlternateNodes != null && altFinal.AlternateNodes.Count > 0)
+                            analysisAlternate = altFinal;
                     }
-                    analysisAlternate = alternates[0];
                 }
             }
 
             analyzer.Dispose();
 
-            if (analysisAlternate != null && analysisAlternate.AlternateNodes.Count > 0)
+            if (analysisAlternate != null && analysisAlternate.AlternateNodes != 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
+            {
+                if (ShapeRecognitionRouter.ResolveUseWinRt(mode))
+                {
+                    WinRtInkShapeRecognizer.Warmup();
+                    WinRtHandwritingRecognizer.Warmup();
+                }
+                else
+                    RecognizeShapeIACore(new StrokeCollection());
+            }
+            catch
+            {
+                // 预热失败不影响启动
+            }
+        }
+
+        /// <summary>WinRT 手写识别（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();
+            if (shape == null)
+                return InkShapeRecognitionResult.Empty;
+
+            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 (string.IsNullOrEmpty(name))
+                return false;
+
             if (name.Contains("Triangle") || name.Contains("Circle") ||
                 name.Contains("Rectangle") || name.Contains("Diamond") ||
                 name.Contains("Parallelogram") || name.Contains("Square")

Ink Canvas/Helpers/InkShapeRecognition.cs

@@ -0,0 +1,85 @@
+using OSVersionExtension;
+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>
+        /// 自动模式：在 Windows 10 及以上系统默认使用 WinRT，否则使用 IACore。
+        /// </summary>
+        public static bool ResolveUseWinRt(ShapeRecognitionEngineMode mode)
+        {
+            if (mode == ShapeRecognitionEngineMode.WinRT) return true;
+            if (mode == ShapeRecognitionEngineMode.IACore) return false;
+            return OSVersion.GetOperatingSystem() >= OSVersionExtension.OperatingSystem.Windows10;
+        }
+
+        public static bool ShouldRunShapeRecognition(bool inkToShapeEnabled, ShapeRecognitionEngineMode mode)
+        {
+            if (!inkToShapeEnabled) return false;
+            if (ResolveUseWinRt(mode))
+                return OSVersion.GetOperatingSystem() >= OSVersionExtension.OperatingSystem.Windows10;
+            return true;
+        }
+
+        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,31 @@ 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))
+                DebugConsoleManager.WriteLine(logLine);
+                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 +133,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 +171,4 @@ namespace Ink_Canvas.Helpers
             Warning
         }
     }
-}
+}

Ink Canvas/Helpers/MultiTouchInput.cs

@@ -111,6 +111,14 @@ namespace Ink_Canvas.Helpers
         /// <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;
@@ -118,6 +126,7 @@ namespace Ink_Canvas.Helpers
 
             var points = Stroke.StylusPoints;
             var drawingAttributes = Stroke.DrawingAttributes;
+            var ignorePressure = drawingAttributes.IgnorePressure;
 
             // 创建新的DrawingVisual用于绘制这个点段
             var segmentVisual = new DrawingVisual();
@@ -128,11 +137,6 @@ namespace Ink_Canvas.Helpers
 
             using (var dc = segmentVisual.RenderOpen())
             {
-                var pen = new Pen(new SolidColorBrush(drawingAttributes.Color), drawingAttributes.Width);
-                pen.StartLineCap = PenLineCap.Round;
-                pen.EndLineCap = PenLineCap.Round;
-                pen.LineJoin = PenLineJoin.Round;
-
                 // 绘制指定范围内的点段
                 if (endIndex - startIndex >= 2)
                 {
@@ -141,6 +145,15 @@ namespace Ink_Canvas.Helpers
                     {
                         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);
                     }
                 }
@@ -149,8 +162,9 @@ namespace Ink_Canvas.Helpers
                     // 只有一个点，绘制圆点
                     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 / 2, drawingAttributes.Height / 2);
+                        drawingAttributes.Width * s / 2, drawingAttributes.Height * s / 2);
                 }
             }
 
@@ -190,7 +204,7 @@ namespace Ink_Canvas.Helpers
                         _lastDrawnPointCount = currentPointCount;
                     }
                 }
-                catch { }
+                catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
             }
         }
 
@@ -209,9 +223,5 @@ namespace Ink_Canvas.Helpers
 
         private readonly DrawingAttributes _drawingAttributes;
 
-        public static implicit operator Stroke(StrokeVisual v)
-        {
-            throw new NotImplementedException();
-        }
     }
 }

Ink Canvas/Helpers/OleActiveObject.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// .NET Core / 5+ 未提供 <see cref="Marshal.GetActiveObject"/>，通过 OLE 实现等效行为。
+    /// </summary>
+    internal static class OleActiveObject
+    {
+        [DllImport("ole32.dll", CharSet = CharSet.Unicode, ExactSpelling = true)]
+        private static extern int CLSIDFromProgID(string lpszProgId, out Guid lpclsid);
+
+        [DllImport("oleaut32.dll", PreserveSig = true)]
+        private static extern int GetActiveObject(ref Guid rclsid, IntPtr pvReserved, [MarshalAs(UnmanagedType.IUnknown)] out object ppunk);
+
+        public static object GetActiveObject(string progId)
+        {
+            int hr = CLSIDFromProgID(progId, out Guid clsid);
+            Marshal.ThrowExceptionForHR(hr);
+            hr = GetActiveObject(ref clsid, IntPtr.Zero, out object obj);
+            Marshal.ThrowExceptionForHR(hr);
+            return obj;
+        }
+    }
+}

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);
-                    }
 
-                    // 保存位置信息
-                    try
+                    int positionToSave = currentSlideIndex > 0 ? currentSlideIndex : (_lockedSlideIndex > 0 ? _lockedSlideIndex : _lastSwitchSlideIndex);
+                    if (positionToSave > 0)
                     {
-                        // 优先使用传入的当前页码，否则使用锁定的页码
-                        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);
+                        try { File.WriteAllText(Path.Combine(folderPath, "Position"), positionToSave.ToString()); }
+                        catch (Exception ex) { LogHelper.WriteLogToFile($"保存 Position 失败: {ex}", LogHelper.LogType.Warning); }
                     }
 
-                    // 保存所有页面的墨迹
-                    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,89 @@ 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();
+        }
+
+        /// <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 +526,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

@@ -1,13 +1,10 @@
-using Microsoft.Office.Interop.PowerPoint;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 using System.Text;
-using System.Threading;
 
 namespace Ink_Canvas.Helpers
 {
@@ -71,12 +68,10 @@ namespace Ink_Canvas.Helpers
                     {
                         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
@@ -87,9 +82,8 @@ namespace Ink_Canvas.Helpers
                             }
                             catch (Exception ex)
                             {
-                                LogHelper.WriteLogToFile($"ROT 连接验证失败: {ex.Message}", LogHelper.LogType.Warning);
-                                SafeReleaseComObject(bestApp);
-                                return null;
+                                LogHelper.WriteLogToFile($"ROT 连接验证 Name 不可用（将依赖 SlideShowWindows）: {ex.Message}", LogHelper.LogType.Warning);
+                                return pptApp;
                             }
                         }
                         else
@@ -108,6 +102,45 @@ namespace Ink_Canvas.Helpers
                     SafeReleaseComObject(bestApp);
                 }
 
+                try
+                {
+                    var pptApp = (Microsoft.Office.Interop.PowerPoint.Application)OleActiveObject.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)OleActiveObject.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)
@@ -119,6 +152,13 @@ namespace Ink_Canvas.Helpers
         #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;
@@ -175,7 +215,7 @@ namespace Ink_Canvas.Helpers
                                     object appObj = comObject.GetType().InvokeMember("Application", BindingFlags.GetProperty, null, comObject, null);
                                     candidateApp = appObj;
                                 }
-                                catch { }
+                                catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
                             }
                         }
                         bool isDuplicate = false;
@@ -213,7 +253,7 @@ namespace Ink_Canvas.Helpers
                                 {
                                     activePres = candidateApp.ActivePresentation;
                                 }
-                                catch { }
+                                catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
 
                                 if (activePres != null)
                                 {
@@ -223,7 +263,7 @@ namespace Ink_Canvas.Helpers
                                     {
                                         ssWindow = activePres.SlideShowWindow;
                                     }
-                                    catch { }
+                                    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
 
                                     if (ssWindow != null)
                                     {
@@ -238,7 +278,7 @@ namespace Ink_Canvas.Helpers
                                                 if (val is int && (int)val == -1) isActive = true;
                                                 else if (val is bool && (bool)val == true) isActive = true;
                                             }
-                                            catch { }
+                                            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
 
                                             if (isActive)
                                             {
@@ -252,7 +292,7 @@ namespace Ink_Canvas.Helpers
                                                 }
                                             }
                                         }
-                                        catch { }
+                                        catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
                                     }
                                 }
                             }
@@ -268,8 +308,6 @@ namespace Ink_Canvas.Helpers
 
                             if (currentPriority > 0)
                             {
-                                LogHelper.WriteLogToFile($"ROT扫描: {displayName}: priority={currentPriority}", LogHelper.LogType.Trace);
-                                
                                 if (currentPriority > highestPriority)
                                 {
                                     highestPriority = currentPriority;
@@ -299,15 +337,6 @@ namespace Ink_Canvas.Helpers
                 }
 
                 bestPriority = highestPriority;
-                
-                if (bestApp != null)
-                {
-                    LogHelper.WriteLogToFile($"ROT扫描完成: 找到最佳应用, priority={bestPriority}", LogHelper.LogType.Trace);
-                }
-                else
-                {
-                    LogHelper.WriteLogToFile($"ROT扫描完成: 未找到可用应用", LogHelper.LogType.Trace);
-                }
             }
             catch (Exception ex)
             {
@@ -394,21 +423,21 @@ namespace Ink_Canvas.Helpers
 
                 if (fgPid == sswPid) return true;
 
-                    try
+                try
+                {
+                    using (Process fgProc = Process.GetProcessById((int)fgPid))
+                    using (Process appProc = Process.GetProcessById((int)sswPid))
                     {
-                        using (Process fgProc = Process.GetProcessById((int)fgPid))
-                        using (Process appProc = Process.GetProcessById((int)sswPid))
-                        {
-                            string fgName = fgProc.ProcessName.ToLower();
-                            string appName = appProc.ProcessName.ToLower();
+                        string fgName = fgProc.ProcessName.ToLower();
+                        string appName = appProc.ProcessName.ToLower();
 
-                            if (fgName.StartsWith("wps") && appName.StartsWith("wpp"))
-                            {
-                                return true;
-                            }
+                        if (fgName.StartsWith("wps") && appName.StartsWith("wpp"))
+                        {
+                            return true;
                         }
                     }
-                    catch { }
+                }
+                catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
 
                 return false;
             }
@@ -431,7 +460,7 @@ namespace Ink_Canvas.Helpers
 
                 hwnd = new IntPtr(hwndVal);
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
 
             return hwnd;
         }
@@ -446,7 +475,7 @@ namespace Ink_Canvas.Helpers
                 {
                     Marshal.ReleaseComObject(comObj);
                 }
-                catch { }
+                catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
             }
         }
 
@@ -491,4 +520,3 @@ namespace Ink_Canvas.Helpers
         #endregion
     }
 }
-

Ink Canvas/Helpers/PPTUIManager.cs

@@ -86,18 +86,8 @@ namespace Ink_Canvas.Helpers
                         _mainWindow.BtnPPTSlideShow.Visibility = Visibility.Collapsed;
                         _mainWindow.BtnPPTSlideShowEnd.Visibility = Visibility.Visible;
 
-                        // 只有在页数有效时才更新页码显示
-                        if (currentSlide > 0 && totalSlides > 0)
-                        {
-                            _mainWindow.PPTBtnPageNow.Text = currentSlide.ToString();
-                            _mainWindow.PPTBtnPageTotal.Text = $"/ {totalSlides}";
-                        }
-                        else
-                        {
-                            // 页数无效时清空页码显示
-                            _mainWindow.PPTBtnPageNow.Text = "?";
-                            _mainWindow.PPTBtnPageTotal.Text = "/ ?";
-                        }
+                        // 同步页码到所有翻页条 + 兼容旧绑定的隐藏 placeholder
+                        SetPageNumberOnAllBars(currentSlide, totalSlides);
 
                         UpdateNavigationPanelsVisibility();
                         UpdateNavigationButtonStyles();
@@ -112,6 +102,11 @@ namespace Ink_Canvas.Helpers
                                 MainWindow.MoveWindow(new WindowInteropHelper(_mainWindow).Handle, 0, 0,
                                     System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width,
                                     System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height, true);
+
+                                // MoveWindow 触发的 WM_WINDOWPOSCHANGING + 重绘会打断面板的 ShowWithFadeIn 动画，
+                                // 在窗口尺寸最终确定后重新评估一次翻页面板的可见性。
+                                UpdateNavigationPanelsVisibility();
+                                UpdateNavigationButtonStyles();
                             }), DispatcherPriority.ApplicationIdle);
 
                             _mainWindow.isFullScreenApplied = true; // 标记已应用全屏处理
@@ -158,18 +153,7 @@ namespace Ink_Canvas.Helpers
             {
                 try
                 {
-                    // 只有在页数有效时才更新页码显示
-                    if (currentSlide > 0 && totalSlides > 0)
-                    {
-                        _mainWindow.PPTBtnPageNow.Text = currentSlide.ToString();
-                        _mainWindow.PPTBtnPageTotal.Text = $"/ {totalSlides}";
-                    }
-                    else
-                    {
-                        // 页数无效时清空页码显示
-                        _mainWindow.PPTBtnPageNow.Text = "?";
-                        _mainWindow.PPTBtnPageTotal.Text = "/ ?";
-                    }
+                    SetPageNumberOnAllBars(currentSlide, totalSlides);
                 }
                 catch (Exception ex)
                 {
@@ -178,6 +162,34 @@ namespace Ink_Canvas.Helpers
             });
         }
 
+        private void SetPageNumberOnAllBars(int currentSlide, int totalSlides)
+        {
+            var bars = new[]
+            {
+                _mainWindow.LeftBottomPanelForPPTNavigation,
+                _mainWindow.RightBottomPanelForPPTNavigation,
+                _mainWindow.LeftSidePanelForPPTNavigation,
+                _mainWindow.RightSidePanelForPPTNavigation,
+            };
+            foreach (var bar in bars)
+            {
+                if (bar == null) continue;
+                bar.CurrentSlide = currentSlide;
+                bar.TotalSlides = totalSlides;
+            }
+            // 兼容旧绑定（其它界面通过 ElementName 引用 PPTBtnPageNow / PPTBtnPageTotal）
+            if (currentSlide > 0 && totalSlides > 0)
+            {
+                _mainWindow.PPTBtnPageNow.Text = currentSlide.ToString();
+                _mainWindow.PPTBtnPageTotal.Text = $"/ {totalSlides}";
+            }
+            else
+            {
+                _mainWindow.PPTBtnPageNow.Text = "?";
+                _mainWindow.PPTBtnPageTotal.Text = "/ ?";
+            }
+        }
+
         /// <summary>
         /// 处理PPT放映状态变化
         /// </summary>
@@ -386,16 +398,17 @@ namespace Ink_Canvas.Helpers
 
                 // 页码按钮显示
                 var pageButtonVisibility = options[0] == '2' ? Visibility.Visible : Visibility.Collapsed;
-                _mainWindow.PPTLSPageButton.Visibility = pageButtonVisibility;
-                _mainWindow.PPTRSPageButton.Visibility = pageButtonVisibility;
+                _mainWindow.LeftSidePanelForPPTNavigation.SetPageButtonVisibility(pageButtonVisibility);
+                _mainWindow.RightSidePanelForPPTNavigation.SetPageButtonVisibility(pageButtonVisibility);
 
-                // 透明度设置 - 直接使用用户设置的透明度值
-                _mainWindow.PPTBtnLSBorder.Opacity = PPTLSButtonOpacity;
-                _mainWindow.PPTBtnRSBorder.Opacity = PPTRSButtonOpacity;
+                // 透明度
+                _mainWindow.LeftSidePanelForPPTNavigation.SetBarOpacity(PPTLSButtonOpacity);
+                _mainWindow.RightSidePanelForPPTNavigation.SetBarOpacity(PPTRSButtonOpacity);
 
                 // 颜色主题
                 bool isDarkTheme = options[2] == '2';
-                ApplyButtonTheme(_mainWindow.PPTBtnLSBorder, _mainWindow.PPTBtnRSBorder, isDarkTheme, true);
+                _mainWindow.LeftSidePanelForPPTNavigation.ApplyTheme(isDarkTheme);
+                _mainWindow.RightSidePanelForPPTNavigation.ApplyTheme(isDarkTheme);
             }
             catch (Exception ex)
             {
@@ -414,113 +427,23 @@ namespace Ink_Canvas.Helpers
 
                 // 页码按钮显示
                 var pageButtonVisibility = options[0] == '2' ? Visibility.Visible : Visibility.Collapsed;
-                _mainWindow.PPTLBPageButton.Visibility = pageButtonVisibility;
-                _mainWindow.PPTRBPageButton.Visibility = pageButtonVisibility;
+                _mainWindow.LeftBottomPanelForPPTNavigation.SetPageButtonVisibility(pageButtonVisibility);
+                _mainWindow.RightBottomPanelForPPTNavigation.SetPageButtonVisibility(pageButtonVisibility);
 
-                // 透明度设置 - 直接使用用户设置的透明度值
-                _mainWindow.PPTBtnLBBorder.Opacity = PPTLBButtonOpacity;
-                _mainWindow.PPTBtnRBBorder.Opacity = PPTRBButtonOpacity;
+                // 透明度
+                _mainWindow.LeftBottomPanelForPPTNavigation.SetBarOpacity(PPTLBButtonOpacity);
+                _mainWindow.RightBottomPanelForPPTNavigation.SetBarOpacity(PPTRBButtonOpacity);
 
                 // 颜色主题
                 bool isDarkTheme = options[2] == '2';
-                ApplyButtonTheme(_mainWindow.PPTBtnLBBorder, _mainWindow.PPTBtnRBBorder, isDarkTheme, false);
+                _mainWindow.LeftBottomPanelForPPTNavigation.ApplyTheme(isDarkTheme);
+                _mainWindow.RightBottomPanelForPPTNavigation.ApplyTheme(isDarkTheme);
             }
             catch (Exception ex)
             {
                 LogHelper.WriteLogToFile($"更新底部按钮样式失败: {ex}", LogHelper.LogType.Error);
             }
         }
-
-        private void ApplyButtonTheme(Border leftBorder, Border rightBorder, bool isDarkTheme, bool isSideButton)
-        {
-            try
-            {
-                Color backgroundColor, borderColor, foregroundColor, feedbackColor;
-
-                if (isDarkTheme)
-                {
-                    backgroundColor = Color.FromRgb(39, 39, 42);
-                    borderColor = Color.FromRgb(82, 82, 91);
-                    foregroundColor = Colors.White;
-                    feedbackColor = Colors.White;
-                }
-                else
-                {
-                    backgroundColor = Color.FromRgb(244, 244, 245);
-                    borderColor = Color.FromRgb(161, 161, 170);
-                    foregroundColor = Color.FromRgb(39, 39, 42);
-                    feedbackColor = Color.FromRgb(24, 24, 27);
-                }
-
-                // 应用背景和边框颜色
-                var backgroundBrush = new SolidColorBrush(backgroundColor);
-                var borderBrush = new SolidColorBrush(borderColor);
-
-                leftBorder.Background = backgroundBrush;
-                leftBorder.BorderBrush = borderBrush;
-                rightBorder.Background = backgroundBrush;
-                rightBorder.BorderBrush = borderBrush;
-
-                // 应用图标和文字颜色
-                var foregroundBrush = new SolidColorBrush(foregroundColor);
-                var feedbackBrush = new SolidColorBrush(feedbackColor);
-
-                if (isSideButton)
-                {
-                    ApplySideButtonColors(foregroundBrush, feedbackBrush);
-                }
-                else
-                {
-                    ApplyBottomButtonColors(foregroundBrush, feedbackBrush);
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"应用按钮主题失败: {ex}", LogHelper.LogType.Error);
-            }
-        }
-
-        private void ApplySideButtonColors(SolidColorBrush foregroundBrush, SolidColorBrush feedbackBrush)
-        {
-            // 图标颜色
-            _mainWindow.PPTLSPreviousButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTRSPreviousButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTLSNextButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTRSNextButtonGeometry.Brush = foregroundBrush;
-
-            // 反馈背景颜色
-            _mainWindow.PPTLSPreviousButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRSPreviousButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTLSPageButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRSPageButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTLSNextButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRSNextButtonFeedbackBorder.Background = feedbackBrush;
-
-            // 文字颜色
-            TextBlock.SetForeground(_mainWindow.PPTLSPageButton, foregroundBrush);
-            TextBlock.SetForeground(_mainWindow.PPTRSPageButton, foregroundBrush);
-        }
-
-        private void ApplyBottomButtonColors(SolidColorBrush foregroundBrush, SolidColorBrush feedbackBrush)
-        {
-            // 图标颜色
-            _mainWindow.PPTLBPreviousButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTRBPreviousButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTLBNextButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTRBNextButtonGeometry.Brush = foregroundBrush;
-
-            // 反馈背景颜色
-            _mainWindow.PPTLBPreviousButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRBPreviousButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTLBPageButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRBPageButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTLBNextButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRBNextButtonFeedbackBorder.Background = feedbackBrush;
-
-            // 文字颜色
-            TextBlock.SetForeground(_mainWindow.PPTLBPageButton, foregroundBrush);
-            TextBlock.SetForeground(_mainWindow.PPTRBPageButton, foregroundBrush);
-        }
         #endregion
     }
 }

Ink Canvas/Helpers/PdfWinRtHelper.cs

@@ -0,0 +1,79 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Media.Imaging;
+using Windows.Data.Pdf;
+using Windows.Storage;
+using Windows.Storage.Streams;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 使用 Windows.Data.Pdf（WinRT）将 PDF 页渲染为 WPF 可用的位图。
+    /// </summary>
+    internal static class PdfWinRtHelper
+    {
+        public static async Task<uint> GetPageCountAsync(string pdfPath)
+        {
+            if (string.IsNullOrWhiteSpace(pdfPath) || !File.Exists(pdfPath))
+                return 0;
+
+            var file = await StorageFile.GetFileFromPathAsync(pdfPath).AsTask();
+            var doc = await PdfDocument.LoadFromFileAsync(file).AsTask();
+            if (doc.IsPasswordProtected)
+                return 0;
+            return doc.PageCount;
+        }
+
+        public static async Task<BitmapSource> RenderPageToBitmapSourceAsync(string pdfPath, uint pageIndex)
+        {
+            if (string.IsNullOrWhiteSpace(pdfPath) || !File.Exists(pdfPath))
+                return null;
+
+            var file = await StorageFile.GetFileFromPathAsync(pdfPath).AsTask();
+            var doc = await PdfDocument.LoadFromFileAsync(file).AsTask();
+            if (doc.IsPasswordProtected)
+                return null;
+            if (pageIndex >= doc.PageCount)
+                return null;
+
+            var page = doc.GetPage(pageIndex);
+            try
+            {
+                using (var ras = new InMemoryRandomAccessStream())
+                {
+                    await page.RenderToStreamAsync(ras).AsTask();
+                    ras.Seek(0);
+
+                    var ms = new MemoryStream();
+                    using (var netStream = ras.AsStreamForRead())
+                        netStream.CopyTo(ms);
+                    ms.Position = 0;
+
+                    try
+                    {
+                        return await Application.Current.Dispatcher.InvokeAsync(() =>
+                        {
+                            var bi = new BitmapImage();
+                            bi.BeginInit();
+                            bi.StreamSource = ms;
+                            bi.CacheOption = BitmapCacheOption.OnLoad;
+                            bi.EndInit();
+                            bi.Freeze();
+                            return (BitmapSource)bi;
+                        });
+                    }
+                    finally
+                    {
+                        ms.Dispose();
+                    }
+                }
+            }
+            finally
+            {
+                (page as IDisposable)?.Dispose();
+            }
+        }
+    }
+}

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

@@ -1,274 +0,0 @@
-using iNKORE.UI.WPF.Modern.Controls;
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-
-namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
-{
-    /// <summary>
-    /// 启动台按钮控件
-    /// </summary>
-    public class LauncherButton
-    {
-        /// <summary>
-        /// 父插件
-        /// </summary>
-        private readonly SuperLauncherPlugin _plugin;
-
-        /// <summary>
-        /// 实际按钮控件
-        /// </summary>
-        private readonly SimpleStackPanel _panel;
-
-        /// <summary>
-        /// 获取按钮UI元素
-        /// </summary>
-        public UIElement Element => _panel;
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        /// <param name="plugin">父插件</param>
-        public LauncherButton(SuperLauncherPlugin plugin)
-        {
-            try
-            {
-                _plugin = plugin;
-                LogHelper.WriteLogToFile("开始创建启动台按钮");
-
-                // 创建SimpleStackPanel
-                _panel = new SimpleStackPanel
-                {
-                    Name = "Launcher_Icon",
-                    Orientation = Orientation.Vertical,
-                    HorizontalAlignment = HorizontalAlignment.Center,
-                    Width = 28,
-                    Margin = new Thickness(0, -2, 0, 0),
-                    Background = Brushes.Transparent
-                };
-
-                LogHelper.WriteLogToFile("创建SimpleStackPanel完成");
-
-                // 添加图标
-                var image = CreateIconImage();
-                _panel.Children.Add(image);
-
-                // 添加文本
-                TextBlock textBlock = new TextBlock
-                {
-                    Text = "启动台",
-                    Foreground = Brushes.Black,
-                    FontSize = 8,
-                    Margin = new Thickness(0, 1, 0, 0),
-                    TextAlignment = TextAlignment.Center
-                };
-                _panel.Children.Add(textBlock);
-
-                // 设置鼠标事件
-                _panel.MouseDown += Panel_MouseDown;
-                _panel.MouseUp += Panel_MouseUp;
-                _panel.MouseLeave += Panel_MouseLeave;
-
-                // 右键菜单支持
-                _panel.ContextMenu = CreateContextMenu();
-
-                // 设置工具提示
-                _panel.ToolTip = "启动台";
-
-                LogHelper.WriteLogToFile("启动台按钮创建完成");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"创建启动台按钮时出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-            }
-        }
-
-        /// <summary>
-        /// 创建右键菜单
-        /// </summary>
-        private ContextMenu CreateContextMenu()
-        {
-            try
-            {
-                // 创建菜单
-                ContextMenu menu = new ContextMenu();
-
-                // 创建位置切换菜单项
-                MenuItem positionMenuItem = new MenuItem();
-                positionMenuItem.Header = _plugin.Config.ButtonPosition == LauncherButtonPosition.Left ?
-                    "移至右侧" : "移至左侧";
-                positionMenuItem.Click += (s, e) =>
-                {
-                    // 切换位置
-                    _plugin.Config.ButtonPosition = _plugin.Config.ButtonPosition == LauncherButtonPosition.Left ?
-                        LauncherButtonPosition.Right : LauncherButtonPosition.Left;
-
-                    // 更新按钮位置
-                    _plugin.UpdateButtonPosition();
-
-                    // 保存配置
-                    _plugin.SaveConfig();
-
-                    LogHelper.WriteLogToFile($"通过右键菜单切换启动台按钮位置为: {_plugin.Config.ButtonPosition}");
-                };
-                menu.Items.Add(positionMenuItem);
-
-                // 添加设置菜单项
-                MenuItem settingsMenuItem = new MenuItem();
-                settingsMenuItem.Header = "打开设置";
-                settingsMenuItem.Click += (s, e) =>
-                {
-                    // 打开插件设置窗口
-                    var mainWindow = Application.Current.MainWindow;
-                    if (mainWindow != null)
-                    {
-                        try
-                        {
-                            // 使用反射调用主窗口的ShowPluginSettings方法
-                            var method = mainWindow.GetType().GetMethod("ShowPluginSettings");
-                            if (method != null)
-                            {
-                                method.Invoke(mainWindow, null);
-                                LogHelper.WriteLogToFile("已打开插件设置窗口");
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.WriteLogToFile($"打开插件设置窗口失败: {ex.Message}", LogHelper.LogType.Error);
-                        }
-                    }
-                };
-                menu.Items.Add(settingsMenuItem);
-
-                return menu;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"创建右键菜单时出错: {ex.Message}", LogHelper.LogType.Error);
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// 获取实际的UI元素
-        /// </summary>
-        [Obsolete("使用Element属性代替")]
-        public UIElement GetUIElement()
-        {
-            return _panel;
-        }
-
-        /// <summary>
-        /// 创建图标图像
-        /// </summary>
-        private Image CreateIconImage()
-        {
-            try
-            {
-                // 创建图像
-                Image image = new Image
-                {
-                    Height = 17,
-                    Margin = new Thickness(0, 3, 0, 0)
-                };
-
-                // 设置位图缩放模式
-                RenderOptions.SetBitmapScalingMode(image, BitmapScalingMode.HighQuality);
-
-                // 创建绘图图像
-                DrawingImage drawingImage = new DrawingImage();
-                DrawingGroup drawingGroup = new DrawingGroup();
-                drawingGroup.ClipGeometry = Geometry.Parse("M0,0 V24 H24 V0 H0 Z");
-
-                // 使用提供的应用网格图标
-                GeometryDrawing geometryDrawing = new GeometryDrawing
-                {
-                    Brush = new SolidColorBrush(Color.FromRgb(0x1B, 0x1B, 0x1B)),
-                    Geometry = Geometry.Parse("F0 M24,24z M0,0z M4.41721,4.29873C4.35178,4.29873,4.29873,4.35178,4.29873,4.41721L4.29873,9.15646C4.29873,9.22189,4.35178,9.27494,4.41721,9.27494L9.15646,9.27494C9.22189,9.27494,9.27494,9.22189,9.27494,9.15646L9.27494,4.41721C9.27494,4.35178,9.22189,4.29873,9.15646,4.29873L4.41721,4.29873z M2.64,4.41721C2.64,3.43569,3.43569,2.64,4.41721,2.64L9.15646,2.64C10.138,2.64,10.9337,3.43569,10.9337,4.41721L10.9337,9.15646C10.9337,10.138,10.138,10.9337,9.15646,10.9337L4.41721,10.9337C3.43569,10.9337,2.64,10.138,2.64,9.15646L2.64,4.41721z M14.8435,4.29873C14.7781,4.29873,14.7251,4.35178,14.7251,4.41721L14.7251,9.15646C14.7251,9.22189,14.7781,9.27494,14.8435,9.27494L19.5828,9.27494C19.6482,9.27494,19.7013,9.22189,19.7013,9.15646L19.7013,4.41721C19.7013,4.35178,19.6482,4.29873,19.5828,4.29873L14.8435,4.29873z M13.0663,4.41721C13.0663,3.43569,13.862,2.64,14.8435,2.64L19.5828,2.64C20.5643,2.64,21.36,3.43569,21.36,4.41721L21.36,9.15646C21.36,10.138,20.5643,10.9337,19.5828,10.9337L14.8435,10.9337C13.862,10.9337,13.0663,10.138,13.0663,9.15646L13.0663,4.41721z M14.8435,14.7251C14.7781,14.7251,14.7251,14.7781,14.7251,14.8435L14.7251,19.5828C14.7251,19.6482,14.7781,19.7013,14.8435,19.7013L19.5828,19.7013C19.6482,19.7013,19.7013,19.6482,19.7013,19.5828L19.7013,14.8435C19.7013,14.7781,19.6482,14.7251,19.5828,14.7251L14.8435,14.7251z M13.0663,14.8435C13.0663,13.862,13.862,13.0663,14.8435,13.0663L19.5828,13.0663C20.5643,13.0663,21.36,13.862,21.36,14.8435L21.36,19.5828C21.36,20.5643,20.5643,21.36,19.5828,21.36L14.8435,21.36C13.862,21.36,13.0663,20.5643,13.0663,19.5828L13.0663,14.8435z M4.41721,14.7251C4.35178,14.7251,4.29873,14.7781,4.29873,14.8435L4.29873,19.5828C4.29873,19.6482,4.35178,19.7013,4.41721,19.7013L9.15646,19.7013C9.22189,19.7013,9.27494,19.6482,9.27494,19.5828L9.27494,14.8435C9.27494,14.7781,9.22189,14.7251,9.15646,14.7251L4.41721,14.7251z M2.64,14.8435C2.64,13.862,3.43569,13.0663,4.41721,13.0663L9.15646,13.0663C10.138,13.0663,10.9337,13.862,10.9337,14.8435L10.9337,19.5828C10.9337,20.5643,10.138,21.36,9.15646,21.36L4.41721,21.36C3.43569,21.36,2.64,20.5643,2.64,19.5828L2.64,14.8435z")
-                };
-
-                drawingGroup.Children.Add(geometryDrawing);
-
-                // 设置图像源
-                drawingImage.Drawing = drawingGroup;
-                image.Source = drawingImage;
-
-                return image;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"创建图标图像时出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-
-                // 返回一个空图像
-                return new Image();
-            }
-        }
-
-        /// <summary>
-        /// 鼠标按下事件
-        /// </summary>
-        private void Panel_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            try
-            {
-                // 提供反馈
-                _panel.Background = new SolidColorBrush(Color.FromArgb(40, 0, 0, 0));
-                LogHelper.WriteLogToFile("启动台按钮鼠标按下");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"启动台按钮鼠标按下事件出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 鼠标抬起事件
-        /// </summary>
-        private void Panel_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            try
-            {
-                // 只有左键点击才显示启动台窗口
-                if (e.ChangedButton != MouseButton.Left)
-                {
-                    return;
-                }
-
-                // 恢复背景
-                _panel.Background = Brushes.Transparent;
-                LogHelper.WriteLogToFile("启动台按钮鼠标抬起，准备显示启动台窗口");
-
-                // 获取按钮在屏幕上的位置
-                Point buttonPosition = _panel.PointToScreen(new Point(_panel.ActualWidth / 2, 0));
-
-                // 显示启动台窗口
-                _plugin.ShowLauncherWindow(buttonPosition);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"启动台按钮鼠标抬起事件出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-            }
-        }
-
-        /// <summary>
-        /// 鼠标离开事件
-        /// </summary>
-        private void Panel_MouseLeave(object sender, MouseEventArgs e)
-        {
-            try
-            {
-                // 恢复背景
-                _panel.Background = Brushes.Transparent;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"启动台按钮鼠标离开事件出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-    }
-}

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

@@ -1,332 +0,0 @@
-using Microsoft.Win32;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Drawing;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Windows;
-using System.Windows.Interop;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-
-namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
-{
-    /// <summary>
-    /// 启动台按钮位置
-    /// </summary>
-    public enum LauncherButtonPosition
-    {
-        /// <summary>
-        /// 左侧
-        /// </summary>
-        Left,
-
-        /// <summary>
-        /// 右侧
-        /// </summary>
-        Right
-    }
-
-    /// <summary>
-    /// 启动台配置
-    /// </summary>
-    public class LauncherConfig
-    {
-        /// <summary>
-        /// 启动台按钮位置
-        /// </summary>
-        public LauncherButtonPosition ButtonPosition { get; set; } = LauncherButtonPosition.Right;
-
-        /// <summary>
-        /// 启动台应用程序列表
-        /// </summary>
-        public List<LauncherItem> Items { get; set; } = new List<LauncherItem>();
-    }
-
-    /// <summary>
-    /// 启动台应用项
-    /// </summary>
-    public class LauncherItem
-    {
-        /// <summary>
-        /// 应用程序名称
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// 应用程序路径
-        /// </summary>
-        public string Path { get; set; }
-
-        /// <summary>
-        /// 是否可见
-        /// </summary>
-        public bool IsVisible { get; set; } = true;
-
-        /// <summary>
-        /// 在启动台中的位置（0-39）
-        /// </summary>
-        public int Position { get; set; } = -1;
-
-        /// <summary>
-        /// 是否已固定位置
-        /// </summary>
-        public bool IsPositionFixed { get; set; } = false;
-
-        /// <summary>
-        /// 图标缓存
-        /// </summary>
-        [JsonIgnore]
-        private ImageSource _iconCache;
-
-        /// <summary>
-        /// 获取应用程序图标
-        /// </summary>
-        [JsonIgnore]
-        public ImageSource Icon
-        {
-            get
-            {
-                if (_iconCache != null)
-                {
-                    return _iconCache;
-                }
-
-                try
-                {
-                    if (File.Exists(Path))
-                    {
-                        // 从文件中获取图标
-                        Icon icon = System.Drawing.Icon.ExtractAssociatedIcon(Path);
-                        if (icon != null)
-                        {
-                            _iconCache = Imaging.CreateBitmapSourceFromHIcon(
-                                icon.Handle,
-                                Int32Rect.Empty,
-                                BitmapSizeOptions.FromEmptyOptions());
-
-                            icon.Dispose();
-                            return _iconCache;
-                        }
-                    }
-                    else
-                    {
-                        // 从注册表中获取文件类型关联图标
-                        string extension = System.IO.Path.GetExtension(Path);
-                        if (!string.IsNullOrEmpty(extension))
-                        {
-                            string fileType = Registry.ClassesRoot.OpenSubKey(extension)?.GetValue(string.Empty) as string;
-                            if (!string.IsNullOrEmpty(fileType))
-                            {
-                                string iconPath = Registry.ClassesRoot.OpenSubKey(fileType + "\\DefaultIcon")?.GetValue(string.Empty) as string;
-                                if (!string.IsNullOrEmpty(iconPath))
-                                {
-                                    string[] parts = iconPath.Split(',');
-                                    string iconFile = parts[0].Trim('"');
-                                    int iconIndex = parts.Length > 1 ? Convert.ToInt32(parts[1]) : 0;
-
-                                    if (File.Exists(iconFile))
-                                    {
-                                        Icon icon = IconExtractor.Extract(iconFile, iconIndex, true);
-                                        if (icon != null)
-                                        {
-                                            _iconCache = Imaging.CreateBitmapSourceFromHIcon(
-                                                icon.Handle,
-                                                Int32Rect.Empty,
-                                                BitmapSizeOptions.FromEmptyOptions());
-
-                                            icon.Dispose();
-                                            return _iconCache;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteLogToFile($"获取应用图标时出错: {ex.Message}", LogHelper.LogType.Error);
-                }
-
-                // 返回默认图标
-                return GetDefaultIcon();
-            }
-        }
-
-        /// <summary>
-        /// 获取默认图标
-        /// </summary>
-        private ImageSource GetDefaultIcon()
-        {
-            try
-            {
-                // 对于资源管理器，使用特定图标
-                if (Path.EndsWith("explorer.exe", StringComparison.OrdinalIgnoreCase))
-                {
-                    try
-                    {
-                        // 直接从C:\Windows\explorer.exe获取图标
-                        string explorerPath = @"C:\Windows\explorer.exe";
-                        if (File.Exists(explorerPath))
-                        {
-                            Icon icon = System.Drawing.Icon.ExtractAssociatedIcon(explorerPath);
-                            if (icon != null)
-                            {
-                                _iconCache = Imaging.CreateBitmapSourceFromHIcon(
-                                    icon.Handle,
-                                    Int32Rect.Empty,
-                                    BitmapSizeOptions.FromEmptyOptions());
-
-                                icon.Dispose();
-                                return _iconCache;
-                            }
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.WriteLogToFile($"获取资源管理器图标时出错: {ex.Message}", LogHelper.LogType.Warning);
-                        // 如果获取Windows图标失败，回退到默认图标
-                    }
-
-                    // 回退到备用图标
-                    string explorerIconPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources", "Icons-Fluent", "ic_fluent_folder_24_regular.png");
-                    if (File.Exists(explorerIconPath))
-                    {
-                        Uri uri = new Uri(explorerIconPath);
-                        BitmapImage image = new BitmapImage(uri);
-                        _iconCache = image;
-                        return _iconCache;
-                    }
-                }
-
-                // 返回一个简单的默认图标
-                string iconPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources", "Icons-png", "icc.png");
-                if (File.Exists(iconPath))
-                {
-                    Uri uri = new Uri(iconPath);
-                    BitmapImage image = new BitmapImage(uri);
-                    _iconCache = image;
-                    return _iconCache;
-                }
-
-                // 如果还是没有找到，尝试使用应用程序图标
-                string appIconPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources", "Icons-Fluent", "ic_fluent_apps_24_regular.png");
-                if (File.Exists(appIconPath))
-                {
-                    Uri uri = new Uri(appIconPath);
-                    BitmapImage image = new BitmapImage(uri);
-                    _iconCache = image;
-                    return _iconCache;
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"获取默认图标时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// 启动应用程序
-        /// </summary>
-        public void Launch()
-        {
-            try
-            {
-                if (string.IsNullOrEmpty(Path))
-                {
-                    LogHelper.WriteLogToFile("无法启动应用程序：路径为空", LogHelper.LogType.Error);
-                    return;
-                }
-
-                // 检查文件是否存在
-                if (!File.Exists(Path) && !Path.Contains(":\\"))
-                {
-                    // 可能是系统命令，如explorer.exe
-                    ProcessStartInfo psi = new ProcessStartInfo
-                    {
-                        FileName = Path,
-                        UseShellExecute = true
-                    };
-                    Process.Start(psi);
-                }
-                else
-                {
-                    // 使用Process.Start启动应用程序
-                    ProcessStartInfo psi = new ProcessStartInfo
-                    {
-                        FileName = Path,
-                        UseShellExecute = true
-                    };
-                    Process.Start(psi);
-                }
-
-                LogHelper.WriteLogToFile($"已启动应用程序: {Path}");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"启动应用程序时出错: {ex.Message}", LogHelper.LogType.Error);
-                MessageBox.Show($"启动应用程序时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-        }
-    }
-
-    /// <summary>
-    /// 图标提取工具类
-    /// </summary>
-    public static class IconExtractor
-    {
-        /// <summary>
-        /// 从文件中提取图标
-        /// </summary>
-        /// <param name="file">文件路径</param>
-        /// <param name="index">图标索引</param>
-        /// <param name="largeIcon">是否提取大图标</param>
-        /// <returns>提取的图标</returns>
-        public static Icon Extract(string file, int index, bool largeIcon)
-        {
-            try
-            {
-                IntPtr large;
-                IntPtr small;
-                ExtractIconEx(file, index, out large, out small, 1);
-
-                try
-                {
-                    return Icon.FromHandle(largeIcon ? large : small);
-                }
-                catch
-                {
-                    return null;
-                }
-                finally
-                {
-                    if (large != IntPtr.Zero)
-                        DestroyIcon(large);
-
-                    if (small != IntPtr.Zero)
-                        DestroyIcon(small);
-                }
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        [DllImport("Shell32.dll", EntryPoint = "ExtractIconEx")]
-        private static extern int ExtractIconEx(
-            [MarshalAs(UnmanagedType.LPStr)] string lpszFile,
-            int nIconIndex,
-            out IntPtr phiconLarge,
-            out IntPtr phiconSmall,
-            int nIcons);
-
-        [DllImport("User32.dll")]
-        private static extern int DestroyIcon(IntPtr hIcon);
-    }
-}

Ink Canvas/Helpers/Plugins/BuiltIn/SuperLauncher/LauncherSettingsControl.xaml

@@ -1,143 +0,0 @@
-<UserControl x:Class="Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher.LauncherSettingsControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher"
-             mc:Ignorable="d"
-             d:DesignHeight="500" d:DesignWidth="600">
-
-    <UserControl.Resources>
-        <!-- 自定义按钮样式 -->
-        <Style x:Key="DefaultButtonStyle" TargetType="Button">
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="FontSize" Value="12"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="border"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            TextElement.Foreground="{TemplateBinding Foreground}"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="border" Property="Opacity" Value="0.8"/>
-                                <Setter Property="Effect">
-                                    <Setter.Value>
-                                        <DropShadowEffect Color="Black" Direction="270" ShadowDepth="2" Opacity="0.3" BlurRadius="4"/>
-                                    </Setter.Value>
-                                </Setter>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="border" Property="Opacity" Value="0.6"/>
-                                <Setter Property="RenderTransform">
-                                    <Setter.Value>
-                                        <ScaleTransform ScaleX="0.95" ScaleY="0.95"/>
-                                    </Setter.Value>
-                                </Setter>
-                                <Setter Property="RenderTransformOrigin" Value="0.5,0.5"/>
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="border" Property="Opacity" Value="0.4"/>
-                                <Setter Property="Cursor" Value="Arrow"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-    </UserControl.Resources>
-
-    <Grid Margin="10">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
-        </Grid.RowDefinitions>
-        
-        <!-- 标题 -->
-        <TextBlock Grid.Row="0" Text="超级启动台设置" FontSize="16" FontWeight="Bold" Margin="0,0,0,15" Foreground="Black"/>
-
-        <!-- 基本设置 -->
-        <StackPanel Grid.Row="1" Margin="0,0,0,15">
-            <TextBlock Text="基本设置" FontSize="14" FontWeight="SemiBold" Margin="0,0,0,10" Foreground="Black"/>
-
-            <Grid Margin="10,0,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="120"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                </Grid.RowDefinitions>
-
-                <!-- 按钮位置 -->
-                <TextBlock Grid.Row="0" Grid.Column="0" Text="按钮位置:" VerticalAlignment="Center" Foreground="Black"/>
-                <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Margin="0,5">
-                    <RadioButton x:Name="RbtnLeft" Content="浮动栏左侧" Margin="0,0,20,0" Checked="RbtnPosition_Checked" Foreground="Black"/>
-                    <RadioButton x:Name="RbtnRight" Content="浮动栏右侧" IsChecked="True" Checked="RbtnPosition_Checked" Foreground="Black"/>
-                </StackPanel>
-            </Grid>
-        </StackPanel>
-        
-        <!-- 应用管理 -->
-        <Grid Grid.Row="2">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
-            
-            <TextBlock Grid.Row="0" Text="应用管理" FontSize="14" FontWeight="SemiBold" Margin="0,0,0,10" Foreground="Black"/>
-            
-            <Border Grid.Row="1" BorderThickness="1" BorderBrush="#CCCCCC" CornerRadius="5">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="Auto"/>
-                    </Grid.RowDefinitions>
-                    
-                    <!-- 应用列表 -->
-                    <DataGrid Grid.Row="0" x:Name="DgApps" AutoGenerateColumns="False" Margin="5"
-                              CanUserAddRows="False" CanUserDeleteRows="False" 
-                              HeadersVisibility="Column" SelectionMode="Single"
-                              SelectionChanged="DgApps_SelectionChanged">
-                        <DataGrid.Columns>
-                            <DataGridCheckBoxColumn Header="显示" Binding="{Binding IsVisible}" Width="50"/>
-                            <DataGridTextColumn Header="名称" Binding="{Binding Name}" Width="150"/>
-                            <DataGridTextColumn Header="路径" Binding="{Binding Path}" Width="*"/>
-                            <DataGridTextColumn Header="位置" Binding="{Binding Position}" Width="50"/>
-                        </DataGrid.Columns>
-                    </DataGrid>
-                    
-                    <!-- 操作按钮 -->
-                    <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="5">
-                        <Button x:Name="BtnAdd" Content="添加" Padding="10,5" Margin="0,5,5,5" Click="BtnAdd_Click"
-                                Background="#FF007ACC" Foreground="White" BorderBrush="#FF005A9B" BorderThickness="1"
-                                Style="{StaticResource DefaultButtonStyle}"/>
-                        <Button x:Name="BtnEdit" Content="编辑" Padding="10,5" Margin="5" Click="BtnEdit_Click"
-                                Background="#FF6C757D" Foreground="White" BorderBrush="#FF5A6268" BorderThickness="1"
-                                Style="{StaticResource DefaultButtonStyle}"/>
-                        <Button x:Name="BtnDelete" Content="删除" Padding="10,5" Margin="5" Click="BtnDelete_Click"
-                                Background="#FFDC3545" Foreground="White" BorderBrush="#FFBD2130" BorderThickness="1"
-                                Style="{StaticResource DefaultButtonStyle}"/>
-                    </StackPanel>
-                </Grid>
-            </Border>
-        </Grid>
-        
-        <!-- 底部按钮 -->
-        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,15,0,0">
-            <Button x:Name="BtnSave" Content="保存设置" Padding="15,5" Click="BtnSave_Click"
-                    Background="#FF28A745" Foreground="White" BorderBrush="#FF1E7E34" BorderThickness="1"
-                    Style="{StaticResource DefaultButtonStyle}"/>
-        </StackPanel>
-    </Grid>
-</UserControl> 

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

@@ -1,396 +0,0 @@
-using Ink_Canvas.Windows;
-using Microsoft.Win32;
-using System;
-using System.ComponentModel;
-using System.IO;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
-{
-    /// <summary>
-    /// LauncherSettingsControl.xaml 的交互逻辑
-    /// </summary>
-    public partial class LauncherSettingsControl : UserControl
-    {
-        /// <summary>
-        /// 父插件
-        /// </summary>
-        private readonly SuperLauncherPlugin _plugin;
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        /// <param name="plugin">父插件</param>
-        public LauncherSettingsControl(SuperLauncherPlugin plugin)
-        {
-            InitializeComponent();
-
-            _plugin = plugin;
-
-            // 设置按钮位置
-            RbtnLeft.IsChecked = _plugin.Config.ButtonPosition == LauncherButtonPosition.Left;
-            RbtnRight.IsChecked = _plugin.Config.ButtonPosition == LauncherButtonPosition.Right;
-
-            // 绑定应用列表
-            DgApps.ItemsSource = _plugin.LauncherItems;
-
-            // 初始化按钮状态
-            UpdateButtonStates();
-        }
-
-        /// <summary>
-        /// 更新按钮状态
-        /// </summary>
-        private void UpdateButtonStates()
-        {
-            bool hasSelection = DgApps.SelectedItem != null;
-            BtnEdit.IsEnabled = hasSelection;
-            BtnDelete.IsEnabled = hasSelection;
-        }
-
-        /// <summary>
-        /// 位置单选按钮选择事件
-        /// </summary>
-        private void RbtnPosition_Checked(object sender, RoutedEventArgs e)
-        {
-            if (!IsLoaded) return;
-
-            LauncherButtonPosition oldPosition = _plugin.Config.ButtonPosition;
-
-            if (sender == RbtnLeft)
-            {
-                _plugin.Config.ButtonPosition = LauncherButtonPosition.Left;
-            }
-            else if (sender == RbtnRight)
-            {
-                _plugin.Config.ButtonPosition = LauncherButtonPosition.Right;
-            }
-
-            // 如果位置发生变化，更新按钮位置
-            if (oldPosition != _plugin.Config.ButtonPosition)
-            {
-                try
-                {
-                    // 更新按钮位置
-                    _plugin.UpdateButtonPosition();
-
-                    // 保存配置
-                    _plugin.SaveConfig();
-
-                    LogHelper.WriteLogToFile($"启动台按钮位置已更改为: {_plugin.Config.ButtonPosition}");
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteLogToFile($"更新启动台按钮位置时出错: {ex.Message}", LogHelper.LogType.Error);
-                    MessageBox.Show($"更新启动台按钮位置时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 添加按钮点击事件
-        /// </summary>
-        private void BtnAdd_Click(object sender, RoutedEventArgs e)
-        {
-            try
-            {
-                // 创建新的启动项
-                LauncherItem item = new LauncherItem
-                {
-                    Name = "",
-                    Path = "",
-                    IsVisible = true,
-                    Position = -1 // 让插件管理器分配位置
-                };
-
-                // 直接显示编辑对话框
-                EditLauncherItem(item, true);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"添加启动项时出错: {ex.Message}", LogHelper.LogType.Error);
-                MessageBox.Show($"添加启动项时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-        }
-
-        /// <summary>
-        /// 编辑应用按钮点击事件
-        /// </summary>
-        private void BtnEdit_Click(object sender, RoutedEventArgs e)
-        {
-            if (DgApps.SelectedItem is LauncherItem item)
-            {
-                EditLauncherItem(item, false);
-            }
-        }
-
-        /// <summary>
-        /// 删除应用按钮点击事件
-        /// </summary>
-        private void BtnDelete_Click(object sender, RoutedEventArgs e)
-        {
-            if (DgApps.SelectedItem is LauncherItem item)
-            {
-                // 确认删除
-                MessageBoxResult result = MessageBox.Show(
-                    $"确定要删除 {item.Name} 吗？",
-                    "删除确认",
-                    MessageBoxButton.YesNo,
-                    MessageBoxImage.Question);
-
-                if (result == MessageBoxResult.Yes)
-                {
-                    // 从集合中移除
-                    _plugin.LauncherItems.Remove(item);
-
-                    // 保存配置
-                    _plugin.SaveConfig();
-                }
-            }
-        }
-
-        /// <summary>
-        /// 保存设置按钮点击事件
-        /// </summary>
-        private void BtnSave_Click(object sender, RoutedEventArgs e)
-        {
-            try
-            {
-                // 保存配置
-                _plugin.SaveConfig();
-
-                // 如果插件已启用，重新加载启动台按钮
-                if (_plugin.IsEnabled)
-                {
-                    _plugin.Disable();
-                    _plugin.Enable();
-                }
-                else
-                {
-                    // 如果插件未启用，则启用它
-                    _plugin.Enable();
-
-                    // 通知PluginSettingsWindow刷新插件列表
-                    var window = Window.GetWindow(this);
-                    if (window is PluginSettingsWindow pluginSettingsWindow)
-                    {
-                        // 触发刷新
-                        pluginSettingsWindow.RefreshPluginList();
-                    }
-                }
-
-                MessageBox.Show("设置已保存并应用！", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"保存设置时出错: {ex.Message}", LogHelper.LogType.Error);
-                MessageBox.Show($"保存设置时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-        }
-
-        /// <summary>
-        /// 应用项选择变更事件
-        /// </summary>
-        private void DgApps_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            UpdateButtonStates();
-        }
-
-        /// <summary>
-        /// 编辑启动项
-        /// </summary>
-        /// <param name="item">启动项</param>
-        /// <param name="isNew">是否为新建</param>
-        private void EditLauncherItem(LauncherItem item, bool isNew)
-        {
-            // 创建简单的编辑窗口
-            Window editWindow = new Window
-            {
-                Title = isNew ? "添加" : "编辑应用",
-                Width = 400,
-                Height = 200,
-                WindowStartupLocation = WindowStartupLocation.CenterScreen,
-                ResizeMode = ResizeMode.NoResize
-            };
-
-            // 创建编辑表单
-            Grid grid = new Grid
-            {
-                Margin = new Thickness(20)
-            };
-
-            grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
-            grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
-            grid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
-
-            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(80) });
-            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
-
-            // 名称输入框
-            TextBlock nameLabel = new TextBlock
-            {
-                Text = "名称:",
-                VerticalAlignment = VerticalAlignment.Center
-            };
-            TextBox nameTextBox = new TextBox
-            {
-                Text = item.Name,
-                Margin = new Thickness(0, 5, 0, 5)
-            };
-
-            Grid.SetRow(nameLabel, 0);
-            Grid.SetColumn(nameLabel, 0);
-            Grid.SetRow(nameTextBox, 0);
-            Grid.SetColumn(nameTextBox, 1);
-
-            grid.Children.Add(nameLabel);
-            grid.Children.Add(nameTextBox);
-
-            // 路径输入框
-            TextBlock pathLabel = new TextBlock
-            {
-                Text = "路径:",
-                VerticalAlignment = VerticalAlignment.Center
-            };
-            Grid pathGrid = new Grid();
-            pathGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
-            pathGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength() });
-
-            TextBox pathTextBox = new TextBox
-            {
-                Text = item.Path,
-                Margin = new Thickness(0, 5, 5, 5)
-            };
-            Button browseButton = new Button
-            {
-                Content = "浏览",
-                Padding = new Thickness(5, 0, 5, 0),
-                Margin = new Thickness(0, 5, 0, 5)
-            };
-
-            browseButton.Click += (s, e) =>
-            {
-                OpenFileDialog dialog = new OpenFileDialog
-                {
-                    Title = "选择应用程序",
-                    Filter = "应用程序 (*.exe)|*.exe|所有文件 (*.*)|*.*",
-                    Multiselect = false,
-                    FileName = pathTextBox.Text
-                };
-
-                if (dialog.ShowDialog() == true)
-                {
-                    pathTextBox.Text = dialog.FileName;
-
-                    // 如果选择的是.exe文件，自动获取文件名填入名称字段
-                    if (Path.GetExtension(dialog.FileName).ToLower() == ".exe")
-                    {
-                        string fileName = Path.GetFileNameWithoutExtension(dialog.FileName);
-                        // 只有在名称字段为空或者是新建项目时才自动填入
-                        if (string.IsNullOrWhiteSpace(nameTextBox.Text) || isNew)
-                        {
-                            nameTextBox.Text = fileName;
-                        }
-                    }
-                }
-            };
-
-            Grid.SetColumn(pathTextBox, 0);
-            Grid.SetColumn(browseButton, 1);
-            pathGrid.Children.Add(pathTextBox);
-            pathGrid.Children.Add(browseButton);
-
-            Grid.SetRow(pathLabel, 1);
-            Grid.SetColumn(pathLabel, 0);
-            Grid.SetRow(pathGrid, 1);
-            Grid.SetColumn(pathGrid, 1);
-
-            grid.Children.Add(pathLabel);
-            grid.Children.Add(pathGrid);
-
-            // 确认和取消按钮
-            StackPanel buttonPanel = new StackPanel
-            {
-                Orientation = Orientation.Horizontal,
-                HorizontalAlignment = HorizontalAlignment.Right,
-                Margin = new Thickness(0, 10, 0, 0)
-            };
-
-            Button okButton = new Button
-            {
-                Content = "确定",
-                Padding = new Thickness(15, 5, 15, 5),
-                Margin = new Thickness(0, 0, 10, 0),
-                IsDefault = true
-            };
-
-            Button cancelButton = new Button
-            {
-                Content = "取消",
-                Padding = new Thickness(15, 5, 15, 5),
-                IsCancel = true
-            };
-
-            okButton.Click += (s, e) =>
-            {
-                // 验证输入
-                if (string.IsNullOrWhiteSpace(nameTextBox.Text))
-                {
-                    MessageBox.Show("请输入应用名称！", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
-                    return;
-                }
-
-                if (string.IsNullOrWhiteSpace(pathTextBox.Text))
-                {
-                    MessageBox.Show("请输入应用路径！", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
-                    return;
-                }
-
-                // 更新项目
-                item.Name = nameTextBox.Text;
-                item.Path = pathTextBox.Text;
-
-                // 如果是新建，添加到集合
-                if (isNew)
-                {
-                    _plugin.AddLauncherItem(item);
-                }
-                else
-                {
-                    // 触发属性变更通知，刷新DataGrid
-                    if (DgApps.ItemsSource is ICollectionView view)
-                    {
-                        view.Refresh();
-                    }
-
-                    // 保存配置
-                    _plugin.SaveConfig();
-                }
-
-                editWindow.DialogResult = true;
-                editWindow.Close();
-            };
-
-            cancelButton.Click += (s, e) =>
-            {
-                editWindow.DialogResult = false;
-                editWindow.Close();
-            };
-
-            buttonPanel.Children.Add(okButton);
-            buttonPanel.Children.Add(cancelButton);
-
-            Grid.SetRow(buttonPanel, 2);
-            Grid.SetColumnSpan(buttonPanel, 2);
-
-            grid.Children.Add(buttonPanel);
-
-            // 设置窗口内容
-            editWindow.Content = grid;
-
-            // 显示窗口
-            editWindow.ShowDialog();
-        }
-    }
-}

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

@@ -1,91 +0,0 @@
-<Window x:Class="Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher.LauncherWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher"
-        mc:Ignorable="d"
-        Title="启动台" 
-        Width="400" 
-        Height="300" 
-        WindowStyle="None" 
-        AllowsTransparency="True" 
-        Background="#80000000"
-        ResizeMode="NoResize"
-        Topmost="True"
-        Deactivated="Window_Deactivated"
-        ShowInTaskbar="False">
-    
-    <Window.Resources>
-        <!-- 应用项样式 -->
-        <Style x:Key="LauncherItemStyle" TargetType="Button">
-            <Setter Property="Width" Value="80"/>
-            <Setter Property="Height" Value="80"/>
-            <Setter Property="Margin" Value="5"/>
-            <Setter Property="Background" Value="#40FFFFFF"/>
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="border" Background="{TemplateBinding Background}" 
-                                BorderBrush="{TemplateBinding BorderBrush}" 
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="8">
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="*"/>
-                                    <RowDefinition Height="Auto"/>
-                                </Grid.RowDefinitions>
-                                <Image Grid.Row="0" Source="{Binding Icon}" Width="32" Height="32" Margin="0,10,0,5"/>
-                                <TextBlock Grid.Row="1" Text="{Binding Name}" TextWrapping="Wrap" TextAlignment="Center" 
-                                           Margin="2,0,2,8" FontSize="11" Foreground="White"/>
-                            </Grid>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="#80FFFFFF"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter Property="Background" Value="#C0FFFFFF"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-    </Window.Resources>
-    
-    <Border CornerRadius="15" Background="#80000000" BorderThickness="1" BorderBrush="#40FFFFFF">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
-            
-            <!-- 标题栏 -->
-            <Grid Grid.Row="0" Height="40">
-                <TextBlock Text="启动台" Foreground="White" FontSize="18" FontWeight="Bold" 
-                           VerticalAlignment="Center" Margin="15,0,0,0"/>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,10,0">
-                    <Button x:Name="BtnFixMode" Click="BtnFixMode_Click" Width="30" Height="30" 
-                            Margin="5,0" Background="Transparent" BorderThickness="0" 
-                            ToolTip="切换固定模式">
-                        <Path x:Name="FixModeIcon" Data="M7,2V13H10V22L17,10H13L17,2H7Z" Fill="White" Stretch="Uniform" Width="16" Height="16"/>
-                    </Button>
-                    <Button x:Name="BtnClose" Click="BtnClose_Click" Width="30" Height="30" 
-                            Background="Transparent" BorderThickness="0" 
-                            ToolTip="关闭">
-                        <Path Data="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" 
-                              Fill="White" Stretch="Uniform" Width="16" Height="16"/>
-                    </Button>
-                </StackPanel>
-            </Grid>
-            
-            <!-- 应用网格 -->
-            <ScrollViewer Grid.Row="1" Margin="10" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
-                <WrapPanel x:Name="AppPanel" Orientation="Horizontal" HorizontalAlignment="Center"/>
-            </ScrollViewer>
-        </Grid>
-    </Border>
-</Window> 

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

@@ -1,466 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Threading;
-
-namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
-{
-    /// <summary>
-    /// LauncherWindow.xaml 的交互逻辑
-    /// </summary>
-    public partial class LauncherWindow : Window
-    {
-        /// <summary>
-        /// 父插件
-        /// </summary>
-        private readonly SuperLauncherPlugin _plugin;
-
-        /// <summary>
-        /// 是否处于固定模式
-        /// </summary>
-        private bool _isFixMode;
-
-        /// <summary>
-        /// 应用项按钮列表
-        /// </summary>
-        private readonly Dictionary<Button, LauncherItem> _appButtons = new Dictionary<Button, LauncherItem>();
-
-        /// <summary>
-        /// 拖拽中的按钮
-        /// </summary>
-        private Button _draggingButton;
-
-        /// <summary>
-        /// 拖拽开始位置
-        /// </summary>
-        private Point _dragStartPoint;
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        public LauncherWindow(SuperLauncherPlugin plugin)
-        {
-            InitializeComponent();
-
-            _plugin = plugin;
-
-            // 加载应用项
-            LoadLauncherItems();
-
-            // 添加鼠标按下事件（用于拖动窗口）
-            MouseDown += (s, e) =>
-            {
-                if (e.ChangedButton == MouseButton.Left && e.ButtonState == MouseButtonState.Pressed)
-                {
-                    DragMove();
-                }
-            };
-
-            // 根据应用数量调整窗口大小
-            AdjustWindowSize();
-        }
-
-        /// <summary>
-        /// 加载启动台应用项
-        /// </summary>
-        private void LoadLauncherItems()
-        {
-            // 清空现有应用项
-            AppPanel.Children.Clear();
-            _appButtons.Clear();
-
-            // 获取显示的应用项
-            var visibleItems = _plugin.LauncherItems
-                .Where(item => item.IsVisible)
-                .OrderBy(item => item.Position)
-                .ToList();
-
-            foreach (var item in visibleItems)
-            {
-                // 创建应用按钮
-                Button appButton = new Button
-                {
-                    Style = (Style)FindResource("LauncherItemStyle"),
-                    DataContext = item,
-                    Tag = item.Position
-                };
-
-                // 添加点击事件
-                appButton.Click += AppButton_Click;
-
-                // 在固定模式下，添加拖拽事件
-                appButton.PreviewMouseDown += AppButton_PreviewMouseDown;
-                appButton.PreviewMouseMove += AppButton_PreviewMouseMove;
-                appButton.PreviewMouseUp += AppButton_PreviewMouseUp;
-
-                // 记录按钮和项目的对应关系
-                _appButtons.Add(appButton, item);
-
-                // 添加到面板
-                AppPanel.Children.Add(appButton);
-            }
-        }
-
-        /// <summary>
-        /// 根据应用数量调整窗口大小
-        /// </summary>
-        private void AdjustWindowSize()
-        {
-            try
-            {
-                // 每行最多显示4个应用
-                const int appsPerRow = 4;
-
-                // 计算行数
-                int visibleCount = _appButtons.Count;
-                int rowCount = (int)Math.Ceiling(visibleCount / (double)appsPerRow);
-
-                // 设置窗口宽度（每个应用90像素宽 = 80 + 5*2）
-                Width = Math.Min(appsPerRow * 90 + 40, 400); // 最大宽度400
-
-                // 设置窗口高度（每个应用90像素高 = 80 + 5*2）
-                Height = Math.Min(rowCount * 90 + 60, 600); // 最大高度600，标题栏40 + 边距20
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"调整启动台窗口大小时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 应用按钮点击事件
-        /// </summary>
-        private void AppButton_Click(object sender, RoutedEventArgs e)
-        {
-            try
-            {
-                if (_isFixMode) return; // 在固定模式下，不响应点击事件
-
-                if (sender is Button button && _appButtons.TryGetValue(button, out LauncherItem item))
-                {
-                    // 获取应用路径和名称，用于后续启动
-                    string appPath = item.Path;
-                    string appName = item.Name;
-
-                    LogHelper.WriteLogToFile($"点击启动应用: {appName}, 路径: {appPath}");
-
-                    // 首先标记窗口正在关闭
-                    IsClosing = true;
-
-                    // 创建一个应用启动任务
-                    var launchTask = new Task(() =>
-                    {
-                        try
-                        {
-                            // 等待一段时间，确保窗口关闭流程已经开始
-                            Thread.Sleep(200);
-
-                            // 使用UI线程启动应用
-                            Application.Current.Dispatcher.Invoke(() =>
-                            {
-                                try
-                                {
-                                    // 检查应用路径是否存在
-                                    if (File.Exists(appPath) || !appPath.Contains(":\\"))
-                                    {
-                                        // 创建进程启动信息
-                                        var psi = new ProcessStartInfo
-                                        {
-                                            FileName = appPath,
-                                            UseShellExecute = true,
-                                        };
-
-                                        // 启动应用程序
-                                        var process = Process.Start(psi);
-                                        LogHelper.WriteLogToFile($"应用程序 {appName} 已启动");
-                                    }
-                                    else
-                                    {
-                                        LogHelper.WriteLogToFile($"应用路径不存在: {appPath}", LogHelper.LogType.Error);
-                                        MessageBox.Show($"找不到应用程序: {appPath}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
-                                    }
-                                }
-                                catch (Exception ex)
-                                {
-                                    LogHelper.WriteLogToFile($"启动应用程序失败: {ex.Message}", LogHelper.LogType.Error);
-                                    MessageBox.Show($"启动应用程序失败: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
-                                }
-                            });
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.WriteLogToFile($"应用启动任务出错: {ex.Message}", LogHelper.LogType.Error);
-                        }
-                    });
-
-                    // 关闭窗口
-                    try
-                    {
-                        Dispatcher.BeginInvoke(new Action(() =>
-                        {
-                            try { Close(); } catch { }
-
-                            // 启动应用程序任务
-                            launchTask.Start();
-                        }), DispatcherPriority.Background);
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.WriteLogToFile($"关闭窗口或启动任务时出错: {ex.Message}", LogHelper.LogType.Error);
-                        // 如果无法通过UI关闭窗口，直接启动任务
-                        launchTask.Start();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"应用按钮点击事件出错: {ex.Message}", LogHelper.LogType.Error);
-                try { IsClosing = true; Close(); } catch { }
-            }
-        }
-
-        #region 固定模式拖拽事件
-
-        /// <summary>
-        /// 应用按钮鼠标按下事件
-        /// </summary>
-        private void AppButton_PreviewMouseDown(object sender, MouseButtonEventArgs e)
-        {
-            if (!_isFixMode) return;
-
-            if (e.ChangedButton == MouseButton.Left && sender is Button button)
-            {
-                _draggingButton = button;
-                _dragStartPoint = e.GetPosition(AppPanel);
-                button.CaptureMouse();
-                button.Opacity = 0.7;
-
-                // 阻止事件冒泡，以避免触发按钮点击
-                e.Handled = true;
-            }
-        }
-
-        /// <summary>
-        /// 应用按钮鼠标移动事件
-        /// </summary>
-        private void AppButton_PreviewMouseMove(object sender, MouseEventArgs e)
-        {
-            if (!_isFixMode || _draggingButton == null) return;
-
-            if (e.LeftButton == MouseButtonState.Pressed)
-            {
-                Point currentPosition = e.GetPosition(AppPanel);
-
-                // 移动按钮
-                System.Windows.Controls.Canvas.SetLeft(_draggingButton, currentPosition.X - _draggingButton.ActualWidth / 2);
-                System.Windows.Controls.Canvas.SetTop(_draggingButton, currentPosition.Y - _draggingButton.ActualHeight / 2);
-
-                // 将按钮移到最上层
-                Panel.SetZIndex(_draggingButton, 100);
-
-                // 阻止事件冒泡
-                e.Handled = true;
-            }
-        }
-
-        /// <summary>
-        /// 应用按钮鼠标释放事件
-        /// </summary>
-        private void AppButton_PreviewMouseUp(object sender, MouseButtonEventArgs e)
-        {
-            if (!_isFixMode || _draggingButton == null) return;
-
-            // 释放鼠标捕获
-            _draggingButton.ReleaseMouseCapture();
-
-            // 计算新位置
-            Point releasePoint = e.GetPosition(AppPanel);
-            int newPosition = CalculateGridPosition(releasePoint);
-
-            // 获取当前项目
-            LauncherItem currentItem = _appButtons[_draggingButton];
-
-            // 重新排序
-            ReorderItems(currentItem, newPosition);
-
-            // 重新加载应用项
-            LoadLauncherItems();
-
-            // 保存配置
-            _plugin.SaveConfig();
-
-            // 清除拖拽状态
-            _draggingButton.Opacity = 1;
-            Panel.SetZIndex(_draggingButton, 0);
-            _draggingButton = null;
-
-            // 阻止事件冒泡
-            e.Handled = true;
-        }
-
-        /// <summary>
-        /// 计算网格位置
-        /// </summary>
-        private int CalculateGridPosition(Point point)
-        {
-            // 计算行和列
-            int columnCount = 4; // 每行最多4个应用
-            int columnWidth = 90; // 应用宽度（包括边距）
-            int rowHeight = 90; // 应用高度（包括边距）
-
-            int column = (int)(point.X / columnWidth);
-            int row = (int)(point.Y / rowHeight);
-
-            // 确保在有效范围内
-            column = Math.Max(0, Math.Min(column, columnCount - 1));
-            row = Math.Max(0, row);
-
-            // 计算位置索引
-            return row * columnCount + column;
-        }
-
-        /// <summary>
-        /// 重新排序应用项
-        /// </summary>
-        private void ReorderItems(LauncherItem item, int newPosition)
-        {
-            try
-            {
-                // 设置项目为固定位置
-                item.IsPositionFixed = true;
-
-                // 如果位置相同，无需调整
-                if (item.Position == newPosition)
-                {
-                    return;
-                }
-
-                // 获取所有可见项目
-                var visibleItems = _plugin.LauncherItems
-                    .Where(i => i.IsVisible)
-                    .OrderBy(i => i.Position)
-                    .ToList();
-
-                // 移除当前项目
-                visibleItems.Remove(item);
-
-                // 查找插入位置
-                int insertIndex = 0;
-                for (int i = 0; i < visibleItems.Count; i++)
-                {
-                    if (visibleItems[i].Position >= newPosition)
-                    {
-                        insertIndex = i;
-                        break;
-                    }
-                    insertIndex = i + 1;
-                }
-
-                // 插入项目
-                visibleItems.Insert(insertIndex, item);
-
-                // 重新分配位置
-                for (int i = 0; i < visibleItems.Count; i++)
-                {
-                    visibleItems[i].Position = i;
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"重新排序应用项时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        #endregion
-
-        #region 窗口事件处理
-
-        /// <summary>
-        /// 窗口失去焦点事件
-        /// </summary>
-        private void Window_Deactivated(object sender, EventArgs e)
-        {
-            try
-            {
-                // 只有在非固定模式、窗口已加载、未处于关闭状态且IsLoaded=true时关闭窗口
-                if (!_isFixMode && IsLoaded && !IsClosing)
-                {
-                    // 标记为正在关闭
-                    IsClosing = true;
-
-                    // 使用Dispatcher.BeginInvoke而不是直接调用Close，避免冲突
-                    Dispatcher.BeginInvoke(new Action(() =>
-                    {
-                        try
-                        {
-                            // 再次检查窗口状态
-                            if (IsLoaded && !IsClosing)
-                            {
-                                Close();
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.WriteLogToFile($"延迟关闭窗口时出错: {ex.Message}", LogHelper.LogType.Error);
-                        }
-                    }), DispatcherPriority.Background);
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"窗口失去焦点关闭时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 窗口是否正在关闭
-        /// </summary>
-        private bool IsClosing { get; set; }
-
-        /// <summary>
-        /// 重写OnClosing方法，标记窗口正在关闭
-        /// </summary>
-        protected override void OnClosing(CancelEventArgs e)
-        {
-            IsClosing = true;
-            base.OnClosing(e);
-        }
-
-        /// <summary>
-        /// 关闭按钮点击事件
-        /// </summary>
-        private void BtnClose_Click(object sender, RoutedEventArgs e)
-        {
-            Close();
-        }
-
-        /// <summary>
-        /// 固定模式按钮点击事件
-        /// </summary>
-        private void BtnFixMode_Click(object sender, RoutedEventArgs e)
-        {
-            // 切换固定模式
-            _isFixMode = !_isFixMode;
-
-            // 更新固定模式按钮图标颜色
-            FixModeIcon.Fill = _isFixMode ? Brushes.Yellow : Brushes.White;
-
-            // 显示提示
-            if (_isFixMode)
-            {
-                MessageBox.Show("已进入固定模式，您可以拖动应用图标调整位置。", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
-            }
-        }
-
-        #endregion
-    }
-}

Ink Canvas/Helpers/Plugins/BuiltIn/SuperLauncherPlugin.cs

@@ -1,589 +0,0 @@
-using Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-namespace Ink_Canvas.Helpers.Plugins.BuiltIn
-{
-    /// <summary>
-    /// 超级启动台插件
-    /// </summary>
-    public class SuperLauncherPlugin : PluginBase
-    {
-        #region 插件基本信息
-
-        public override string Name => "超级启动台";
-
-        public override string Description => "在浮动栏添加一个启动台按钮，可快速启动常用应用程序。";
-
-        public override Version Version => new Version(1, 0, 1);
-
-        public override string Author => "ICC CE 团队";
-
-        public override bool IsBuiltIn => true;
-
-        #endregion
-
-        #region 插件属性和字段
-
-        /// <summary>
-        /// 启动台配置
-        /// </summary>
-        public LauncherConfig Config { get; private set; }
-
-        /// <summary>
-        /// 启动台应用程序列表
-        /// </summary>
-        public ObservableCollection<LauncherItem> LauncherItems { get; private set; }
-
-        /// <summary>
-        /// 启动台按钮
-        /// </summary>
-        private LauncherButton _launcherButton;
-
-        /// <summary>
-        /// 启动台窗口
-        /// </summary>
-        private LauncherWindow _launcherWindow;
-
-        /// <summary>
-        /// 配置文件路径
-        /// </summary>
-        private readonly string _configPath = Path.Combine(App.RootPath, "PluginConfigs", "SuperLauncher.json");
-
-        /// <summary>
-        /// 标记是否已添加到浮动栏
-        /// </summary>
-        private bool _isAddedToFloatingBar;
-
-        #endregion
-
-        #region 插件生命周期
-
-        public override void Initialize()
-        {
-            try
-            {
-                base.Initialize();
-
-                // 创建配置目录
-                string configDir = Path.Combine(App.RootPath, "PluginConfigs");
-                if (!Directory.Exists(configDir))
-                {
-                    Directory.CreateDirectory(configDir);
-                }
-
-                // 加载配置
-                LoadConfig();
-
-                LogHelper.WriteLogToFile("超级启动台插件已初始化");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"初始化超级启动台插件时出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-            }
-        }
-
-        public override void Enable()
-        {
-            try
-            {
-                if (IsEnabled) return; // 防止重复启用
-
-                // 创建启动台按钮
-                if (_launcherButton == null)
-                {
-                    _launcherButton = new LauncherButton(this);
-                    LogHelper.WriteLogToFile("超级启动台按钮已创建");
-                }
-
-                // 添加启动台按钮到浮动栏
-                AddLauncherButtonToFloatingBar();
-
-                // 设置启用状态
-                base.Enable();
-
-                // 保存插件配置
-                SavePluginSettings();
-
-                LogHelper.WriteLogToFile("超级启动台插件已启用");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"启用超级启动台插件时出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-            }
-        }
-
-        public override void Disable()
-        {
-            try
-            {
-                if (!IsEnabled) return; // 防止重复禁用
-
-                // 从浮动栏移除启动台按钮
-                RemoveLauncherButtonFromFloatingBar();
-
-                // 如果启动台窗口打开，则关闭
-                if (_launcherWindow != null && _launcherWindow.IsVisible)
-                {
-                    _launcherWindow.Close();
-                    _launcherWindow = null;
-                }
-
-                // 设置禁用状态
-                base.Disable();
-
-                // 保存插件配置
-                SavePluginSettings();
-
-                LogHelper.WriteLogToFile("超级启动台插件已禁用");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"禁用超级启动台插件时出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-            }
-        }
-
-        public override UserControl GetSettingsView()
-        {
-            return new LauncherSettingsControl(this);
-        }
-
-        public override void Cleanup()
-        {
-            // 保存配置
-            SaveConfig();
-
-            // 从浮动栏移除启动台按钮
-            RemoveLauncherButtonFromFloatingBar();
-
-            // 如果启动台窗口打开，则关闭
-            if (_launcherWindow != null && _launcherWindow.IsVisible)
-            {
-                _launcherWindow.Close();
-                _launcherWindow = null;
-            }
-
-            base.Cleanup();
-        }
-
-        /// <summary>
-        /// 保存插件设置
-        /// </summary>
-        public override void SavePluginSettings()
-        {
-            try
-            {
-                // 确保配置已加载
-                if (Config == null)
-                {
-                    LoadConfig();
-                }
-
-                // 更新其他设置，但不更改插件启用状态
-
-                // 保存配置
-                SaveConfig();
-
-                LogHelper.WriteLogToFile("超级启动台插件设置已保存");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"保存超级启动台插件设置时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        #endregion
-
-        #region 配置管理
-
-        /// <summary>
-        /// 加载配置
-        /// </summary>
-        private void LoadConfig()
-        {
-            try
-            {
-                if (File.Exists(_configPath))
-                {
-                    string json = File.ReadAllText(_configPath);
-                    Config = JsonConvert.DeserializeObject<LauncherConfig>(json) ?? CreateDefaultConfig();
-                    LauncherItems = new ObservableCollection<LauncherItem>(Config.Items ?? new List<LauncherItem>());
-
-                    // 注意：不再根据配置更改插件启用状态
-                    // 插件状态由PluginManager统一管理
-                }
-                else
-                {
-                    Config = CreateDefaultConfig();
-                    LauncherItems = new ObservableCollection<LauncherItem>(Config.Items);
-                    SaveConfig();
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"加载超级启动台配置时出错: {ex.Message}", LogHelper.LogType.Error);
-                Config = CreateDefaultConfig();
-                LauncherItems = new ObservableCollection<LauncherItem>(Config.Items);
-            }
-        }
-
-        /// <summary>
-        /// 保存配置
-        /// </summary>
-        public void SaveConfig()
-        {
-            try
-            {
-                // 同步LauncherItems到Config
-                Config.Items = new List<LauncherItem>(LauncherItems);
-
-                // 序列化并保存配置
-                string json = JsonConvert.SerializeObject(Config, Formatting.Indented);
-                File.WriteAllText(_configPath, json);
-
-                LogHelper.WriteLogToFile("超级启动台配置已保存");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"保存超级启动台配置时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 创建默认配置
-        /// </summary>
-        private LauncherConfig CreateDefaultConfig()
-        {
-            var config = new LauncherConfig
-            {
-                ButtonPosition = LauncherButtonPosition.Right,
-                // 不再使用IsEnabled，插件状态由PluginManager管理
-                Items = new List<LauncherItem>
-                {
-                    new LauncherItem
-                    {
-                        Name = "资源管理器",
-                        Path = @"C:\Windows\explorer.exe",
-                        IsVisible = true,
-                        Position = 0
-                    }
-                }
-            };
-
-            return config;
-        }
-
-        #endregion
-
-        #region 启动台按钮管理
-
-        /// <summary>
-        /// 将启动台按钮添加到浮动栏
-        /// </summary>
-        private void AddLauncherButtonToFloatingBar()
-        {
-            try
-            {
-                // 如果已经添加，先移除
-                if (_isAddedToFloatingBar)
-                {
-                    RemoveLauncherButtonFromFloatingBar();
-                    _isAddedToFloatingBar = false;
-                }
-
-                // 获取主窗口实例
-                var mainWindow = Application.Current.MainWindow;
-                if (mainWindow == null)
-                {
-                    LogHelper.WriteLogToFile("未找到主窗口实例，无法添加启动台按钮", LogHelper.LogType.Error);
-                    return;
-                }
-
-                // 创建启动台按钮
-                _launcherButton = new LauncherButton(this);
-                var buttonElement = _launcherButton.Element;
-
-                // 查找浮动栏
-                var floatingBar = mainWindow.FindName("StackPanelFloatingBar") as Panel;
-                if (floatingBar == null)
-                {
-                    // 如果直接查找失败，则尝试遍历可视树查找
-                    Panel floatingBarPanelFromTree = null;
-                    FindStackPanelFloatingBar(mainWindow, ref floatingBarPanelFromTree);
-                    floatingBar = floatingBarPanelFromTree;
-                }
-
-                if (floatingBar == null)
-                {
-                    LogHelper.WriteLogToFile("未找到浮动栏，无法添加启动台按钮", LogHelper.LogType.Error);
-                    return;
-                }
-
-                // 添加启动台按钮到浮动栏
-                if (Config.ButtonPosition == LauncherButtonPosition.Left)
-                {
-                    floatingBar.Children.Insert(0, buttonElement);
-                    LogHelper.WriteLogToFile("启动台按钮已添加到浮动栏左侧");
-                }
-                else
-                {
-                    floatingBar.Children.Add(buttonElement);
-                    LogHelper.WriteLogToFile("启动台按钮已添加到浮动栏右侧");
-                }
-
-                _isAddedToFloatingBar = true;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"添加启动台按钮到浮动栏时出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-            }
-        }
-
-        /// <summary>
-        /// 递归查找StackPanelFloatingBar
-        /// </summary>
-        private void FindStackPanelFloatingBar(DependencyObject parent, ref Panel result)
-        {
-            if (parent == null || result != null) return;
-
-            try
-            {
-                // 检查当前对象是否为我们要找的面板
-                if (parent is Panel panel && panel.Name == "StackPanelFloatingBar")
-                {
-                    result = panel;
-                    return;
-                }
-
-                // 获取子元素数量
-                int childCount = VisualTreeHelper.GetChildrenCount(parent);
-
-                // 遍历所有子元素
-                for (int i = 0; i < childCount; i++)
-                {
-                    DependencyObject child = VisualTreeHelper.GetChild(parent, i);
-                    FindStackPanelFloatingBar(child, ref result);
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"查找StackPanelFloatingBar时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 从浮动栏移除启动台按钮
-        /// </summary>
-        private void RemoveLauncherButtonFromFloatingBar()
-        {
-            try
-            {
-                if (!_isAddedToFloatingBar || _launcherButton == null)
-                {
-                    return;
-                }
-
-                // 获取主窗口实例
-                var mainWindow = Application.Current.MainWindow;
-                if (mainWindow == null)
-                {
-                    LogHelper.WriteLogToFile("未找到主窗口实例，无法移除启动台按钮", LogHelper.LogType.Error);
-                    return;
-                }
-
-                // 获取按钮元素
-                var buttonElement = _launcherButton.Element;
-
-                // 查找浮动栏
-                var floatingBar = mainWindow.FindName("StackPanelFloatingBar") as Panel;
-                if (floatingBar == null)
-                {
-                    // 如果直接查找失败，则尝试遍历可视树查找
-                    Panel floatingBarPanelFromTree = null;
-                    FindStackPanelFloatingBar(mainWindow, ref floatingBarPanelFromTree);
-                    floatingBar = floatingBarPanelFromTree;
-                }
-
-                if (floatingBar == null)
-                {
-                    LogHelper.WriteLogToFile("未找到浮动栏，无法移除启动台按钮", LogHelper.LogType.Error);
-                    return;
-                }
-
-                // 从浮动栏移除启动台按钮
-                if (floatingBar.Children.Contains(buttonElement))
-                {
-                    floatingBar.Children.Remove(buttonElement);
-                    LogHelper.WriteLogToFile("启动台按钮已从浮动栏移除");
-                }
-
-                _isAddedToFloatingBar = false;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"移除启动台按钮时出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-            }
-        }
-
-        /// <summary>
-        /// 更新启动台按钮位置
-        /// </summary>
-        public void UpdateButtonPosition()
-        {
-            try
-            {
-                // 如果按钮已添加到浮动栏，重新添加以更新位置
-                if (_isAddedToFloatingBar)
-                {
-                    RemoveLauncherButtonFromFloatingBar();
-                    AddLauncherButtonToFloatingBar();
-                    LogHelper.WriteLogToFile($"启动台按钮位置已更新为: {Config.ButtonPosition}");
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"更新启动台按钮位置时出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-            }
-        }
-
-        #endregion
-
-        #region 启动台功能
-
-        /// <summary>
-        /// 显示启动台窗口
-        /// </summary>
-        /// <param name="buttonPosition">按钮在屏幕上的位置</param>
-        public void ShowLauncherWindow(Point buttonPosition)
-        {
-            try
-            {
-                // 如果窗口已存在，关闭它
-                if (_launcherWindow != null && _launcherWindow.IsVisible)
-                {
-                    _launcherWindow.Close();
-                    _launcherWindow = null;
-                    return;
-                }
-
-                // 创建新的启动台窗口
-                _launcherWindow = new LauncherWindow(this);
-
-                // 计算窗口位置，使其位于按钮上方
-                PositionLauncherWindow(_launcherWindow, buttonPosition);
-
-                // 显示窗口
-                _launcherWindow.Show();
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"显示启动台窗口时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 设置启动台窗口位置
-        /// </summary>
-        /// <param name="window">启动台窗口</param>
-        /// <param name="buttonPosition">按钮在屏幕上的位置</param>
-        private void PositionLauncherWindow(LauncherWindow window, Point buttonPosition)
-        {
-            // 确保窗口已加载
-            if (window.ActualWidth == 0 || window.ActualHeight == 0)
-            {
-                window.WindowStartupLocation = WindowStartupLocation.CenterScreen;
-
-                // 设置窗口加载完成后的位置
-                window.Loaded += (s, e) =>
-                {
-                    // 窗口位于按钮上方居中
-                    double left = buttonPosition.X - (window.ActualWidth / 2);
-                    double top = buttonPosition.Y - window.ActualHeight - 10; // 在按钮上方留出一些间距
-
-                    // 确保窗口在屏幕内
-                    left = Math.Max(0, Math.Min(left, SystemParameters.WorkArea.Width - window.ActualWidth));
-                    top = Math.Max(0, Math.Min(top, SystemParameters.WorkArea.Height - window.ActualHeight));
-
-                    window.Left = left;
-                    window.Top = top;
-                };
-            }
-            else
-            {
-                // 窗口位于按钮上方居中
-                double left = buttonPosition.X - (window.ActualWidth / 2);
-                double top = buttonPosition.Y - window.ActualHeight - 10; // 在按钮上方留出一些间距
-
-                // 确保窗口在屏幕内
-                left = Math.Max(0, Math.Min(left, SystemParameters.WorkArea.Width - window.ActualWidth));
-                top = Math.Max(0, Math.Min(top, SystemParameters.WorkArea.Height - window.ActualHeight));
-
-                window.Left = left;
-                window.Top = top;
-            }
-        }
-
-        /// <summary>
-        /// 添加应用到启动台
-        /// </summary>
-        /// <param name="item">启动台项</param>
-        public void AddLauncherItem(LauncherItem item)
-        {
-            // 如果项目数量已达上限，则不添加
-            if (LauncherItems.Count >= 40)
-            {
-                MessageBox.Show("启动台项目数量已达上限(40个)！", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
-                return;
-            }
-
-            // 寻找合适的位置
-            if (item.Position < 0)
-            {
-                item.Position = FindNextAvailablePosition();
-            }
-
-            // 添加项目并保存配置
-            LauncherItems.Add(item);
-            SaveConfig();
-        }
-
-        /// <summary>
-        /// 查找下一个可用位置
-        /// </summary>
-        private int FindNextAvailablePosition()
-        {
-            // 获取已使用的位置列表
-            var usedPositions = new HashSet<int>();
-            foreach (var item in LauncherItems)
-            {
-                usedPositions.Add(item.Position);
-            }
-
-            // 查找第一个可用位置
-            for (int i = 0; i < 40; i++)
-            {
-                if (!usedPositions.Contains(i))
-                {
-                    return i;
-                }
-            }
-
-            // 如果所有位置都已使用，则返回0
-            return 0;
-        }
-
-        #endregion
-    }
-}

Ink Canvas/Helpers/Plugins/EnhancedPluginBase.cs

@@ -1,92 +0,0 @@
-using System.Windows.Controls;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 增强的插件基类，提供对插件服务的访问和基本实现
-    /// </summary>
-    public abstract class EnhancedPluginBase : PluginBase, IEnhancedPlugin
-    {
-        /// <summary>
-        /// 插件服务实例
-        /// </summary>
-        public IPluginService PluginService { get; private set; }
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        protected EnhancedPluginBase()
-        {
-            PluginService = PluginServiceManager.Instance;
-        }
-
-        /// <summary>
-        /// 插件启动时调用，在Initialize之后
-        /// </summary>
-        public virtual void OnStartup()
-        {
-            LogHelper.WriteLogToFile($"插件 {Name} 已启动");
-        }
-
-        /// <summary>
-        /// 插件关闭时调用，在Cleanup之前
-        /// </summary>
-        public virtual void OnShutdown()
-        {
-            LogHelper.WriteLogToFile($"插件 {Name} 正在关闭");
-        }
-
-        /// <summary>
-        /// 获取插件的菜单项
-        /// </summary>
-        /// <returns>菜单项集合</returns>
-        public virtual MenuItem[] GetMenuItems()
-        {
-            return new MenuItem[0];
-        }
-
-        /// <summary>
-        /// 获取插件的工具栏按钮
-        /// </summary>
-        /// <returns>工具栏按钮集合</returns>
-        public virtual Button[] GetToolbarButtons()
-        {
-            return new Button[0];
-        }
-
-        /// <summary>
-        /// 获取插件的状态栏信息
-        /// </summary>
-        /// <returns>状态栏信息</returns>
-        public virtual string GetStatusBarInfo()
-        {
-            return $"{Name} v{Version} - {(IsEnabled ? "已启用" : "已禁用")}";
-        }
-
-        /// <summary>
-        /// 插件配置变更时调用
-        /// </summary>
-        public virtual void OnConfigurationChanged()
-        {
-            LogHelper.WriteLogToFile($"插件 {Name} 配置已变更");
-        }
-
-        /// <summary>
-        /// 重写初始化方法，调用OnStartup
-        /// </summary>
-        public override void Initialize()
-        {
-            base.Initialize();
-            OnStartup();
-        }
-
-        /// <summary>
-        /// 重写清理方法，调用OnShutdown
-        /// </summary>
-        public override void Cleanup()
-        {
-            OnShutdown();
-            base.Cleanup();
-        }
-    }
-}

Ink Canvas/Helpers/Plugins/EnhancedPluginBaseV2.cs

@@ -1,241 +0,0 @@
-using System.Windows.Controls;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 增强的插件基类 V2，提供对三个专门服务接口的访问
-    /// 插件开发者可以根据需要选择性地使用这些服务
-    /// </summary>
-    public abstract class EnhancedPluginBaseV2 : PluginBase, IEnhancedPlugin
-    {
-        /// <summary>
-        /// 获取服务实例
-        /// </summary>
-        public IGetService GetService { get; private set; }
-
-        /// <summary>
-        /// 窗口服务实例
-        /// </summary>
-        public IWindowService WindowService { get; private set; }
-
-        /// <summary>
-        /// 操作服务实例
-        /// </summary>
-        public IActionService ActionService { get; private set; }
-
-        /// <summary>
-        /// 插件服务实例（兼容性）
-        /// </summary>
-        public IPluginService PluginService { get; private set; }
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        protected EnhancedPluginBaseV2()
-        {
-            // 初始化所有服务实例
-            PluginService = PluginServiceManager.Instance;
-            GetService = PluginServiceManager.Instance;
-            WindowService = PluginServiceManager.Instance;
-            ActionService = PluginServiceManager.Instance;
-        }
-
-        /// <summary>
-        /// 插件启动时调用，在Initialize之后
-        /// </summary>
-        public virtual void OnStartup()
-        {
-            LogHelper.WriteLogToFile($"插件 {Name} 已启动");
-        }
-
-        /// <summary>
-        /// 插件关闭时调用，在Cleanup之前
-        /// </summary>
-        public virtual void OnShutdown()
-        {
-            LogHelper.WriteLogToFile($"插件 {Name} 正在关闭");
-        }
-
-        /// <summary>
-        /// 获取插件的菜单项
-        /// </summary>
-        /// <returns>菜单项集合</returns>
-        public virtual MenuItem[] GetMenuItems()
-        {
-            return new MenuItem[0];
-        }
-
-        /// <summary>
-        /// 获取插件的工具栏按钮
-        /// </summary>
-        /// <returns>工具栏按钮集合</returns>
-        public virtual Button[] GetToolbarButtons()
-        {
-            return new Button[0];
-        }
-
-        /// <summary>
-        /// 获取插件的状态栏信息
-        /// </summary>
-        /// <returns>状态栏信息</returns>
-        public virtual string GetStatusBarInfo()
-        {
-            return $"{Name} v{Version} - {(IsEnabled ? "已启用" : "已禁用")}";
-        }
-
-        /// <summary>
-        /// 插件配置变更时调用
-        /// </summary>
-        public virtual void OnConfigurationChanged()
-        {
-            LogHelper.WriteLogToFile($"插件 {Name} 配置已变更");
-        }
-
-        #region 便捷方法
-
-        /// <summary>
-        /// 显示通知消息
-        /// </summary>
-        /// <param name="message">消息内容</param>
-        /// <param name="type">消息类型</param>
-        protected void ShowNotification(string message, NotificationType type = NotificationType.Info)
-        {
-            WindowService.ShowNotification(message, type);
-        }
-
-        /// <summary>
-        /// 显示确认对话框
-        /// </summary>
-        /// <param name="message">消息内容</param>
-        /// <param name="title">标题</param>
-        /// <returns>用户选择结果</returns>
-        protected bool ShowConfirmDialog(string message, string title = "确认")
-        {
-            return WindowService.ShowConfirmDialog(message, title);
-        }
-
-        /// <summary>
-        /// 显示输入对话框
-        /// </summary>
-        /// <param name="message">提示消息</param>
-        /// <param name="title">标题</param>
-        /// <param name="defaultValue">默认值</param>
-        /// <returns>用户输入内容</returns>
-        protected string ShowInputDialog(string message, string title = "输入", string defaultValue = "")
-        {
-            return WindowService.ShowInputDialog(message, title, defaultValue);
-        }
-
-        /// <summary>
-        /// 获取系统设置
-        /// </summary>
-        /// <typeparam name="T">设置类型</typeparam>
-        /// <param name="key">设置键</param>
-        /// <param name="defaultValue">默认值</param>
-        /// <returns>设置值</returns>
-        protected T GetSetting<T>(string key, T defaultValue = default(T))
-        {
-            return GetService.GetSetting(key, defaultValue);
-        }
-
-        /// <summary>
-        /// 设置系统设置
-        /// </summary>
-        /// <typeparam name="T">设置类型</typeparam>
-        /// <param name="key">设置键</param>
-        /// <param name="value">设置值</param>
-        protected void SetSetting<T>(string key, T value)
-        {
-            ActionService.SetSetting(key, value);
-        }
-
-        /// <summary>
-        /// 保存设置
-        /// </summary>
-        protected void SaveSettings()
-        {
-            ActionService.SaveSettings();
-        }
-
-        /// <summary>
-        /// 清除当前画布
-        /// </summary>
-        protected void ClearCanvas()
-        {
-            ActionService.ClearCanvas();
-        }
-
-        /// <summary>
-        /// 撤销操作
-        /// </summary>
-        protected void Undo()
-        {
-            ActionService.Undo();
-        }
-
-        /// <summary>
-        /// 重做操作
-        /// </summary>
-        protected void Redo()
-        {
-            ActionService.Redo();
-        }
-
-        /// <summary>
-        /// 检查是否可以撤销
-        /// </summary>
-        protected bool CanUndo => GetService.CanUndo;
-
-        /// <summary>
-        /// 检查是否可以重做
-        /// </summary>
-        protected bool CanRedo => GetService.CanRedo;
-
-        /// <summary>
-        /// 获取当前绘制模式
-        /// </summary>
-        protected int CurrentDrawingMode => GetService.CurrentDrawingMode;
-
-        /// <summary>
-        /// 设置绘制模式
-        /// </summary>
-        /// <param name="mode">绘制模式</param>
-        protected void SetDrawingMode(int mode)
-        {
-            ActionService.SetDrawingMode(mode);
-        }
-
-        /// <summary>
-        /// 注册事件处理器
-        /// </summary>
-        /// <param name="eventName">事件名称</param>
-        /// <param name="handler">事件处理器</param>
-        protected void RegisterEventHandler(string eventName, System.EventHandler handler)
-        {
-            ActionService.RegisterEventHandler(eventName, handler);
-        }
-
-        /// <summary>
-        /// 注销事件处理器
-        /// </summary>
-        /// <param name="eventName">事件名称</param>
-        /// <param name="handler">事件处理器</param>
-        protected void UnregisterEventHandler(string eventName, System.EventHandler handler)
-        {
-            ActionService.UnregisterEventHandler(eventName, handler);
-        }
-
-        /// <summary>
-        /// 触发事件
-        /// </summary>
-        /// <param name="eventName">事件名称</param>
-        /// <param name="sender">事件发送者</param>
-        /// <param name="args">事件参数</param>
-        protected void TriggerEvent(string eventName, object sender, System.EventArgs args)
-        {
-            ActionService.TriggerEvent(eventName, sender, args);
-        }
-
-        #endregion
-    }
-}

Ink Canvas/Helpers/Plugins/IActionService.cs

@@ -1,296 +0,0 @@
-using System;
-using System.Windows.Media;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 操作服务接口，统一所有执行操作相关的方法
-    /// </summary>
-    public interface IActionService
-    {
-        #region 画布操作
-
-        /// <summary>
-        /// 清除当前画布
-        /// </summary>
-        void ClearCanvas();
-
-        /// <summary>
-        /// 清除所有画布
-        /// </summary>
-        void ClearAllCanvases();
-
-        /// <summary>
-        /// 添加新页面
-        /// </summary>
-        void AddNewPage();
-
-        /// <summary>
-        /// 删除当前页面
-        /// </summary>
-        void DeleteCurrentPage();
-
-        /// <summary>
-        /// 切换到指定页面
-        /// </summary>
-        /// <param name="pageIndex">页面索引</param>
-        void SwitchToPage(int pageIndex);
-
-        /// <summary>
-        /// 切换到下一页
-        /// </summary>
-        void NextPage();
-
-        /// <summary>
-        /// 切换到上一页
-        /// </summary>
-        void PreviousPage();
-
-        #endregion
-
-        #region 绘制操作
-
-        /// <summary>
-        /// 设置绘制模式
-        /// </summary>
-        /// <param name="mode">绘制模式</param>
-        void SetDrawingMode(int mode);
-
-        /// <summary>
-        /// 设置笔触宽度
-        /// </summary>
-        /// <param name="width">宽度</param>
-        void SetInkWidth(double width);
-
-        /// <summary>
-        /// 设置笔触颜色
-        /// </summary>
-        /// <param name="color">颜色</param>
-        void SetInkColor(Color color);
-
-        /// <summary>
-        /// 设置高亮笔宽度
-        /// </summary>
-        /// <param name="width">宽度</param>
-        void SetHighlighterWidth(double width);
-
-        /// <summary>
-        /// 设置橡皮擦大小
-        /// </summary>
-        /// <param name="size">大小</param>
-        void SetEraserSize(int size);
-
-        /// <summary>
-        /// 设置橡皮擦类型
-        /// </summary>
-        /// <param name="type">类型</param>
-        void SetEraserType(int type);
-
-        /// <summary>
-        /// 设置橡皮擦形状
-        /// </summary>
-        /// <param name="shape">形状</param>
-        void SetEraserShape(int shape);
-
-        /// <summary>
-        /// 设置笔触透明度
-        /// </summary>
-        /// <param name="alpha">透明度</param>
-        void SetInkAlpha(double alpha);
-
-        /// <summary>
-        /// 设置笔触样式
-        /// </summary>
-        /// <param name="style">样式</param>
-        void SetInkStyle(int style);
-
-        /// <summary>
-        /// 设置背景颜色
-        /// </summary>
-        /// <param name="color">颜色</param>
-        void SetBackgroundColor(string color);
-
-        #endregion
-
-        #region 文件操作
-
-        /// <summary>
-        /// 保存画布内容
-        /// </summary>
-        /// <param name="filePath">文件路径</param>
-        void SaveCanvas(string filePath);
-
-        /// <summary>
-        /// 加载画布内容
-        /// </summary>
-        /// <param name="filePath">文件路径</param>
-        void LoadCanvas(string filePath);
-
-        /// <summary>
-        /// 导出为图片
-        /// </summary>
-        /// <param name="filePath">文件路径</param>
-        /// <param name="format">图片格式</param>
-        void ExportAsImage(string filePath, string format);
-
-        /// <summary>
-        /// 导出为PDF
-        /// </summary>
-        /// <param name="filePath">文件路径</param>
-        void ExportAsPDF(string filePath);
-
-        #endregion
-
-        #region 撤销重做操作
-
-        /// <summary>
-        /// 撤销操作
-        /// </summary>
-        void Undo();
-
-        /// <summary>
-        /// 重做操作
-        /// </summary>
-        void Redo();
-
-        #endregion
-
-        #region 选择操作
-
-        /// <summary>
-        /// 全选
-        /// </summary>
-        void SelectAll();
-
-        /// <summary>
-        /// 取消选择
-        /// </summary>
-        void DeselectAll();
-
-        /// <summary>
-        /// 删除选中内容
-        /// </summary>
-        void DeleteSelected();
-
-        /// <summary>
-        /// 复制选中内容
-        /// </summary>
-        void CopySelected();
-
-        /// <summary>
-        /// 剪切选中内容
-        /// </summary>
-        void CutSelected();
-
-        /// <summary>
-        /// 粘贴内容
-        /// </summary>
-        void Paste();
-
-        #endregion
-
-        #region 系统设置操作
-
-        /// <summary>
-        /// 设置系统设置
-        /// </summary>
-        /// <typeparam name="T">设置类型</typeparam>
-        /// <param name="key">设置键</param>
-        /// <param name="value">设置值</param>
-        void SetSetting<T>(string key, T value);
-
-        /// <summary>
-        /// 保存设置到文件
-        /// </summary>
-        void SaveSettings();
-
-        /// <summary>
-        /// 从文件加载设置
-        /// </summary>
-        void LoadSettings();
-
-        /// <summary>
-        /// 重置设置为默认值
-        /// </summary>
-        void ResetSettings();
-
-        #endregion
-
-        #region 插件管理操作
-
-        /// <summary>
-        /// 启用插件
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        void EnablePlugin(string pluginName);
-
-        /// <summary>
-        /// 禁用插件
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        void DisablePlugin(string pluginName);
-
-        /// <summary>
-        /// 卸载插件
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        void UnloadPlugin(string pluginName);
-
-        #endregion
-
-        #region 事件系统操作
-
-        /// <summary>
-        /// 注册事件处理器
-        /// </summary>
-        /// <param name="eventName">事件名称</param>
-        /// <param name="handler">事件处理器</param>
-        void RegisterEventHandler(string eventName, EventHandler handler);
-
-        /// <summary>
-        /// 注销事件处理器
-        /// </summary>
-        /// <param name="eventName">事件名称</param>
-        /// <param name="handler">事件处理器</param>
-        void UnregisterEventHandler(string eventName, EventHandler handler);
-
-        /// <summary>
-        /// 触发事件
-        /// </summary>
-        /// <param name="eventName">事件名称</param>
-        /// <param name="sender">事件发送者</param>
-        /// <param name="args">事件参数</param>
-        void TriggerEvent(string eventName, object sender, EventArgs args);
-
-        #endregion
-
-        #region 应用程序操作
-
-        /// <summary>
-        /// 重启应用程序
-        /// </summary>
-        void RestartApplication();
-
-        /// <summary>
-        /// 退出应用程序
-        /// </summary>
-        void ExitApplication();
-
-        /// <summary>
-        /// 检查更新
-        /// </summary>
-        void CheckForUpdates();
-
-        /// <summary>
-        /// 打开帮助文档
-        /// </summary>
-        void OpenHelpDocument();
-
-        /// <summary>
-        /// 打开关于页面
-        /// </summary>
-        void OpenAboutPage();
-
-        #endregion
-    }
-}

Ink Canvas/Helpers/Plugins/ICCPPPluginAdapter.cs

@@ -1,178 +0,0 @@
-using System;
-using System.IO;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// ICCPP 插件适配器，用于加载和管理 .iccpp 格式的插件
-    /// </summary>
-    public class ICCPPPluginAdapter : PluginBase
-    {
-        private readonly byte[] _pluginData;
-        private readonly string _pluginPath;
-        private readonly string _pluginName;
-        private readonly Version _pluginVersion;
-        private bool _isInitialized;
-
-        /// <summary>
-        /// 创建 ICCPP 插件适配器
-        /// </summary>
-        /// <param name="pluginPath">插件文件路径</param>
-        /// <param name="pluginData">插件文件数据</param>
-        public ICCPPPluginAdapter(string pluginPath, byte[] pluginData)
-        {
-            _pluginPath = pluginPath;
-            _pluginData = pluginData;
-            PluginPath = pluginPath;
-
-            // 从文件名获取插件名称
-            _pluginName = Path.GetFileNameWithoutExtension(pluginPath);
-            _pluginVersion = new Version(1, 0, 0); // 默认版本
-
-            // 尝试从插件数据中读取更多信息
-            TryReadPluginMetadata();
-        }
-
-        public ICCPPPluginAdapter()
-        {
-            _pluginPath = string.Empty;
-            _pluginData = new byte[0];
-            PluginPath = string.Empty;
-            _pluginName = "ICCPPPlugin";
-            _pluginVersion = new Version(1, 0, 0);
-            // 可选：初始化其他字段
-        }
-
-        /// <summary>
-        /// 尝试从插件数据中读取元数据
-        /// </summary>
-        private void TryReadPluginMetadata()
-        {
-            try
-            {
-                // 这里可以根据 .iccpp 文件的实际格式解析元数据
-                // 例如，如果文件有特定的头部结构，可以在这里解析
-
-                // 示例：如果前100字节包含元数据
-                if (_pluginData.Length > 100)
-                {
-                    // 解析元数据的代码...
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"解析插件 {_pluginName} 元数据时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        #region IPlugin 接口实现
-
-        /// <summary>
-        /// 插件名称
-        /// </summary>
-        public override string Name => _pluginName;
-
-        /// <summary>
-        /// 插件描述
-        /// </summary>
-        public override string Description => $"{_pluginName} (ICCPP 格式插件)";
-
-        /// <summary>
-        /// 插件版本
-        /// </summary>
-        public override Version Version => _pluginVersion;
-
-        /// <summary>
-        /// 插件作者
-        /// </summary>
-        public override string Author => "未知";
-
-        /// <summary>
-        /// 是否为内置插件
-        /// </summary>
-        public override bool IsBuiltIn => false;
-
-        /// <summary>
-        /// 初始化插件
-        /// </summary>
-        public override void Initialize()
-        {
-            if (_isInitialized) return;
-
-            try
-            {
-                // 这里可以添加 .iccpp 插件的初始化逻辑
-                // 例如，根据文件格式加载特定资源
-
-                LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已初始化");
-                _isInitialized = true;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"初始化 ICCPP 插件 {Name} 时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 启用插件
-        /// </summary>
-        public override void Enable()
-        {
-            if (IsEnabled) return;
-
-            try
-            {
-                // 这里可以添加 .iccpp 插件的启用逻辑
-                // 例如，加载动态库、注册事件等
-
-                base.Enable(); // 设置启用状态并触发事件
-                LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已启用");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"启用 ICCPP 插件 {Name} 时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 禁用插件
-        /// </summary>
-        public override void Disable()
-        {
-            if (!IsEnabled) return;
-
-            try
-            {
-                // 这里可以添加 .iccpp 插件的禁用逻辑
-                // 例如，卸载动态库、注销事件等
-
-                base.Disable(); // 设置禁用状态并触发事件
-                LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已禁用");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"禁用 ICCPP 插件 {Name} 时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 清理插件资源
-        /// </summary>
-        public override void Cleanup()
-        {
-            try
-            {
-                // 这里可以添加 .iccpp 插件的清理逻辑
-                // 例如，释放资源等
-
-                LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已清理资源");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"清理 ICCPP 插件 {Name} 资源时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        #endregion
-    }
-}

Ink Canvas/Helpers/Plugins/IEnhancedPlugin.cs

@@ -1,48 +0,0 @@
-using System.Windows.Controls;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 增强的插件接口，提供对插件服务的访问
-    /// </summary>
-    public interface IEnhancedPlugin : IPlugin
-    {
-        /// <summary>
-        /// 获取插件服务实例
-        /// </summary>
-        IPluginService PluginService { get; }
-
-        /// <summary>
-        /// 插件启动时调用，在Initialize之后
-        /// </summary>
-        void OnStartup();
-
-        /// <summary>
-        /// 插件关闭时调用，在Cleanup之前
-        /// </summary>
-        void OnShutdown();
-
-        /// <summary>
-        /// 获取插件的菜单项
-        /// </summary>
-        /// <returns>菜单项集合</returns>
-        MenuItem[] GetMenuItems();
-
-        /// <summary>
-        /// 获取插件的工具栏按钮
-        /// </summary>
-        /// <returns>工具栏按钮集合</returns>
-        Button[] GetToolbarButtons();
-
-        /// <summary>
-        /// 获取插件的状态栏信息
-        /// </summary>
-        /// <returns>状态栏信息</returns>
-        string GetStatusBarInfo();
-
-        /// <summary>
-        /// 插件配置变更时调用
-        /// </summary>
-        void OnConfigurationChanged();
-    }
-}

Ink Canvas/Helpers/Plugins/IGetService.cs

@@ -1,214 +0,0 @@
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 获取服务接口，统一所有获取类的方法
-    /// </summary>
-    public interface IGetService
-    {
-        #region 窗口和UI获取
-
-        /// <summary>
-        /// 获取主窗口引用
-        /// </summary>
-        Window MainWindow { get; }
-
-        /// <summary>
-        /// 获取当前画布
-        /// </summary>
-        InkCanvas CurrentCanvas { get; }
-
-        /// <summary>
-        /// 获取所有画布页面
-        /// </summary>
-        List<Canvas> AllCanvasPages { get; }
-
-        /// <summary>
-        /// 获取当前页面索引
-        /// </summary>
-        int CurrentPageIndex { get; }
-
-        /// <summary>
-        /// 获取当前页面数量
-        /// </summary>
-        int TotalPageCount { get; }
-
-        /// <summary>
-        /// 获取浮动工具栏
-        /// </summary>
-        FrameworkElement FloatingToolBar { get; }
-
-        /// <summary>
-        /// 获取左侧面板
-        /// </summary>
-        FrameworkElement LeftPanel { get; }
-
-        /// <summary>
-        /// 获取右侧面板
-        /// </summary>
-        FrameworkElement RightPanel { get; }
-
-        /// <summary>
-        /// 获取顶部面板
-        /// </summary>
-        FrameworkElement TopPanel { get; }
-
-        /// <summary>
-        /// 获取底部面板
-        /// </summary>
-        FrameworkElement BottomPanel { get; }
-
-        #endregion
-
-        #region 绘制工具状态获取
-
-        /// <summary>
-        /// 获取当前绘制模式
-        /// </summary>
-        int CurrentDrawingMode { get; }
-
-        /// <summary>
-        /// 获取当前笔触宽度
-        /// </summary>
-        double CurrentInkWidth { get; }
-
-        /// <summary>
-        /// 获取当前笔触颜色
-        /// </summary>
-        Color CurrentInkColor { get; }
-
-        /// <summary>
-        /// 获取当前高亮笔宽度
-        /// </summary>
-        double CurrentHighlighterWidth { get; }
-
-        /// <summary>
-        /// 获取当前橡皮擦大小
-        /// </summary>
-        int CurrentEraserSize { get; }
-
-        /// <summary>
-        /// 获取当前橡皮擦类型
-        /// </summary>
-        int CurrentEraserType { get; }
-
-        /// <summary>
-        /// 获取当前橡皮擦形状
-        /// </summary>
-        int CurrentEraserShape { get; }
-
-        /// <summary>
-        /// 获取当前笔触透明度
-        /// </summary>
-        double CurrentInkAlpha { get; }
-
-        /// <summary>
-        /// 获取当前笔触样式
-        /// </summary>
-        int CurrentInkStyle { get; }
-
-        /// <summary>
-        /// 获取当前背景颜色
-        /// </summary>
-        string CurrentBackgroundColor { get; }
-
-        #endregion
-
-        #region 应用状态获取
-
-        /// <summary>
-        /// 获取当前主题模式
-        /// </summary>
-        bool IsDarkTheme { get; }
-
-        /// <summary>
-        /// 获取当前是否为白板模式
-        /// </summary>
-        bool IsWhiteboardMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为PPT模式
-        /// </summary>
-        bool IsPPTMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为全屏模式
-        /// </summary>
-        bool IsFullScreenMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为画板模式
-        /// </summary>
-        bool IsCanvasMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为选择模式
-        /// </summary>
-        bool IsSelectionMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为擦除模式
-        /// </summary>
-        bool IsEraserMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为形状绘制模式
-        /// </summary>
-        bool IsShapeDrawingMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为高亮模式
-        /// </summary>
-        bool IsHighlighterMode { get; }
-
-        #endregion
-
-        #region 撤销重做状态获取
-
-        /// <summary>
-        /// 获取是否可以撤销
-        /// </summary>
-        bool CanUndo { get; }
-
-        /// <summary>
-        /// 获取是否可以重做
-        /// </summary>
-        bool CanRedo { get; }
-
-        #endregion
-
-        #region 系统设置获取
-
-        /// <summary>
-        /// 获取系统设置
-        /// </summary>
-        /// <typeparam name="T">设置类型</typeparam>
-        /// <param name="key">设置键</param>
-        /// <param name="defaultValue">默认值</param>
-        /// <returns>设置值</returns>
-        T GetSetting<T>(string key, T defaultValue = default(T));
-
-        #endregion
-
-        #region 插件信息获取
-
-        /// <summary>
-        /// 获取所有已加载的插件
-        /// </summary>
-        /// <returns>插件列表</returns>
-        List<IPlugin> GetAllPlugins();
-
-        /// <summary>
-        /// 获取指定插件
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        /// <returns>插件实例</returns>
-        IPlugin GetPlugin(string pluginName);
-
-        #endregion
-    }
-}

Ink Canvas/Helpers/Plugins/IPlugin.cs

@@ -1,67 +0,0 @@
-using System;
-using System.Windows.Controls;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 定义插件的基本接口
-    /// </summary>
-    public interface IPlugin
-    {
-        /// <summary>
-        /// 插件名称
-        /// </summary>
-        string Name { get; }
-
-        /// <summary>
-        /// 插件描述
-        /// </summary>
-        string Description { get; }
-
-        /// <summary>
-        /// 插件版本
-        /// </summary>
-        Version Version { get; }
-
-        /// <summary>
-        /// 插件作者
-        /// </summary>
-        string Author { get; }
-
-        /// <summary>
-        /// 是否为内置插件
-        /// </summary>
-        bool IsBuiltIn { get; }
-
-        /// <summary>
-        /// 初始化插件
-        /// 此方法在插件加载时被调用，用于执行一些初始化工作
-        /// </summary>
-        void Initialize();
-
-        /// <summary>
-        /// 启用插件
-        /// 此方法在插件被用户或系统启用时调用，激活插件功能
-        /// </summary>
-        void Enable();
-
-        /// <summary>
-        /// 禁用插件
-        /// 此方法在插件被用户或系统禁用时调用，停用插件功能
-        /// </summary>
-        void Disable();
-
-        /// <summary>
-        /// 获取插件设置界面
-        /// 此方法返回插件的设置界面控件，用于展示在设置窗口
-        /// </summary>
-        /// <returns>插件设置界面</returns>
-        UserControl GetSettingsView();
-
-        /// <summary>
-        /// 插件卸载时的清理工作
-        /// 此方法在插件被卸载前调用，用于释放资源和执行清理
-        /// </summary>
-        void Cleanup();
-    }
-}

Ink Canvas/Helpers/Plugins/IPluginService.cs

@@ -1,38 +0,0 @@
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 插件服务接口，提供对软件内部功能的访问
-    /// 继承自三个专门的服务接口：获取服务、窗口服务、操作服务
-    /// </summary>
-    public interface IPluginService : IGetService, IWindowService, IActionService
-    {
-        // 这个接口现在继承自三个专门的服务接口
-        // 所有方法都在子接口中定义，这里不需要重复定义
-    }
-
-    /// <summary>
-    /// 通知类型枚举
-    /// </summary>
-    public enum NotificationType
-    {
-        /// <summary>
-        /// 信息
-        /// </summary>
-        Info,
-
-        /// <summary>
-        /// 成功
-        /// </summary>
-        Success,
-
-        /// <summary>
-        /// 警告
-        /// </summary>
-        Warning,
-
-        /// <summary>
-        /// 错误
-        /// </summary>
-        Error
-    }
-}

Ink Canvas/Helpers/Plugins/IWindowService.cs

@@ -1,152 +0,0 @@
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 窗口服务接口，统一所有窗口操作相关的方法
-    /// </summary>
-    public interface IWindowService
-    {
-        #region 窗口显示和隐藏
-
-        /// <summary>
-        /// 显示设置窗口
-        /// </summary>
-        void ShowSettingsWindow();
-
-        /// <summary>
-        /// 隐藏设置窗口
-        /// </summary>
-        void HideSettingsWindow();
-
-        /// <summary>
-        /// 显示插件设置窗口
-        /// </summary>
-        void ShowPluginSettingsWindow();
-
-        /// <summary>
-        /// 隐藏插件设置窗口
-        /// </summary>
-        void HidePluginSettingsWindow();
-
-        /// <summary>
-        /// 显示帮助窗口
-        /// </summary>
-        void ShowHelpWindow();
-
-        /// <summary>
-        /// 隐藏帮助窗口
-        /// </summary>
-        void HideHelpWindow();
-
-        /// <summary>
-        /// 显示关于窗口
-        /// </summary>
-        void ShowAboutWindow();
-
-        /// <summary>
-        /// 隐藏关于窗口
-        /// </summary>
-        void HideAboutWindow();
-
-        #endregion
-
-        #region 对话框和通知
-
-        /// <summary>
-        /// 显示通知消息
-        /// </summary>
-        /// <param name="message">消息内容</param>
-        /// <param name="type">消息类型</param>
-        void ShowNotification(string message, NotificationType type = NotificationType.Info);
-
-        /// <summary>
-        /// 显示确认对话框
-        /// </summary>
-        /// <param name="message">消息内容</param>
-        /// <param name="title">标题</param>
-        /// <returns>用户选择结果</returns>
-        bool ShowConfirmDialog(string message, string title = "确认");
-
-        /// <summary>
-        /// 显示输入对话框
-        /// </summary>
-        /// <param name="message">提示消息</param>
-        /// <param name="title">标题</param>
-        /// <param name="defaultValue">默认值</param>
-        /// <returns>用户输入内容</returns>
-        string ShowInputDialog(string message, string title = "输入", string defaultValue = "");
-
-        #endregion
-
-        #region 窗口状态控制
-
-        /// <summary>
-        /// 设置窗口全屏状态
-        /// </summary>
-        /// <param name="isFullScreen">是否全屏</param>
-        void SetFullScreen(bool isFullScreen);
-
-        /// <summary>
-        /// 设置窗口置顶状态
-        /// </summary>
-        /// <param name="isTopMost">是否置顶</param>
-        void SetTopMost(bool isTopMost);
-
-        /// <summary>
-        /// 设置窗口可见性
-        /// </summary>
-        /// <param name="isVisible">是否可见</param>
-        void SetWindowVisibility(bool isVisible);
-
-        /// <summary>
-        /// 最小化窗口
-        /// </summary>
-        void MinimizeWindow();
-
-        /// <summary>
-        /// 最大化窗口
-        /// </summary>
-        void MaximizeWindow();
-
-        /// <summary>
-        /// 恢复窗口
-        /// </summary>
-        void RestoreWindow();
-
-        /// <summary>
-        /// 关闭窗口
-        /// </summary>
-        void CloseWindow();
-
-        #endregion
-
-        #region 窗口位置和大小
-
-        /// <summary>
-        /// 设置窗口位置
-        /// </summary>
-        /// <param name="x">X坐标</param>
-        /// <param name="y">Y坐标</param>
-        void SetWindowPosition(double x, double y);
-
-        /// <summary>
-        /// 设置窗口大小
-        /// </summary>
-        /// <param name="width">宽度</param>
-        /// <param name="height">高度</param>
-        void SetWindowSize(double width, double height);
-
-        /// <summary>
-        /// 获取窗口位置
-        /// </summary>
-        /// <returns>窗口位置</returns>
-        (double x, double y) GetWindowPosition();
-
-        /// <summary>
-        /// 获取窗口大小
-        /// </summary>
-        /// <returns>窗口大小</returns>
-        (double width, double height) GetWindowSize();
-
-        #endregion
-    }
-}

Ink Canvas/Helpers/Plugins/PluginBase.cs

@@ -1,161 +0,0 @@
-using System;
-using System.Windows.Controls;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 插件基类，提供基本实现
-    /// </summary>
-    public abstract class PluginBase : IPlugin
-    {
-        /// <summary>
-        /// 插件状态（私有字段）
-        /// </summary>
-        private bool _isEnabled;
-
-        /// <summary>
-        /// 插件状态（公共属性）
-        /// </summary>
-        public bool IsEnabled
-        {
-            get => _isEnabled;
-            protected set
-            {
-                if (_isEnabled != value)
-                {
-                    _isEnabled = value;
-                    OnEnabledStateChanged(value);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 插件ID
-        /// </summary>
-        public string Id { get; protected set; }
-
-        /// <summary>
-        /// 插件路径
-        /// </summary>
-        public string PluginPath { get; set; }
-
-        /// <summary>
-        /// 插件名称
-        /// </summary>
-        public abstract string Name { get; }
-
-        /// <summary>
-        /// 插件描述
-        /// </summary>
-        public abstract string Description { get; }
-
-        /// <summary>
-        /// 插件版本
-        /// </summary>
-        public abstract Version Version { get; }
-
-        /// <summary>
-        /// 插件作者
-        /// </summary>
-        public abstract string Author { get; }
-
-        /// <summary>
-        /// 是否为内置插件
-        /// </summary>
-        public virtual bool IsBuiltIn => false;
-
-        /// <summary>
-        /// 状态变更事件
-        /// </summary>
-        public event EventHandler<bool> EnabledStateChanged;
-
-        /// <summary>
-        /// 初始化插件
-        /// </summary>
-        public virtual void Initialize()
-        {
-            Id = GetType().FullName;
-
-            // 添加日志，记录插件名称
-            try
-            {
-                string name = Name;
-                LogHelper.WriteLogToFile($"初始化插件: ID={Id}, 名称={name ?? "未命名"}");
-
-                if (string.IsNullOrEmpty(name))
-                {
-                    LogHelper.WriteLogToFile($"警告: 插件 {Id} 的名称为空", LogHelper.LogType.Warning);
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"获取插件名称时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-
-            LogHelper.WriteLogToFile($"插件 {Name} 已初始化");
-        }
-
-        /// <summary>
-        /// 启用插件
-        /// </summary>
-        public virtual void Enable()
-        {
-            if (!IsEnabled)
-            {
-                IsEnabled = true;
-                LogHelper.WriteLogToFile($"插件 {Name} 已启用");
-            }
-        }
-
-        /// <summary>
-        /// 禁用插件
-        /// </summary>
-        public virtual void Disable()
-        {
-            if (IsEnabled)
-            {
-                IsEnabled = false;
-                LogHelper.WriteLogToFile($"插件 {Name} 已禁用");
-            }
-        }
-
-        /// <summary>
-        /// 获取插件设置界面
-        /// </summary>
-        /// <returns>插件设置界面</returns>
-        public virtual UserControl GetSettingsView()
-        {
-            // 默认返回空设置页面
-            return new UserControl();
-        }
-
-        /// <summary>
-        /// 插件卸载时的清理工作
-        /// </summary>
-        public virtual void Cleanup()
-        {
-            LogHelper.WriteLogToFile($"插件 {Name} 已卸载");
-        }
-
-        /// <summary>
-        /// 保存插件自身的设置
-        /// 注意：此方法仅用于保存插件的特定设置，不应影响插件启用/禁用状态
-        /// 插件启用状态由PluginManager统一管理
-        /// </summary>
-        public virtual void SavePluginSettings()
-        {
-            // 默认实现不做任何事情
-            // 子类可以重写此方法，将自身设置保存到配置文件中
-            LogHelper.WriteLogToFile($"插件 {Name} 设置已保存", LogHelper.LogType.Event);
-        }
-
-        /// <summary>
-        /// 触发状态变更事件
-        /// </summary>
-        /// <param name="isEnabled">是否启用</param>
-        protected virtual void OnEnabledStateChanged(bool isEnabled)
-        {
-            EnabledStateChanged?.Invoke(this, isEnabled);
-        }
-    }
-}

Ink Canvas/Helpers/Plugins/PluginConfigurationManager.cs

@@ -1,273 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 插件配置管理器，允许插件管理自己的配置
-    /// </summary>
-    public class PluginConfigurationManager
-    {
-        private static readonly string PluginConfigDirectory = Path.Combine(App.RootPath, "PluginConfigs");
-        private static readonly Dictionary<string, Dictionary<string, object>> _pluginConfigs = new Dictionary<string, Dictionary<string, object>>();
-        private static readonly object _lockObject = new object();
-
-        static PluginConfigurationManager()
-        {
-            // 确保配置目录存在
-            if (!Directory.Exists(PluginConfigDirectory))
-            {
-                Directory.CreateDirectory(PluginConfigDirectory);
-            }
-        }
-
-        /// <summary>
-        /// 获取插件配置值
-        /// </summary>
-        /// <typeparam name="T">配置值类型</typeparam>
-        /// <param name="pluginName">插件名称</param>
-        /// <param name="key">配置键</param>
-        /// <param name="defaultValue">默认值</param>
-        /// <returns>配置值</returns>
-        public static T GetConfiguration<T>(string pluginName, string key, T defaultValue = default(T))
-        {
-            lock (_lockObject)
-            {
-                try
-                {
-                    if (_pluginConfigs.TryGetValue(pluginName, out var pluginConfig))
-                    {
-                        if (pluginConfig.TryGetValue(key, out var value))
-                        {
-                            if (value is T typedValue)
-                            {
-                                return typedValue;
-                            }
-
-                            // 尝试类型转换
-                            try
-                            {
-                                return (T)Convert.ChangeType(value, typeof(T));
-                            }
-                            catch
-                            {
-                                return defaultValue;
-                            }
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteLogToFile($"获取插件 {pluginName} 配置 {key} 时出错: {ex.Message}", LogHelper.LogType.Error);
-                }
-
-                return defaultValue;
-            }
-        }
-
-        /// <summary>
-        /// 设置插件配置值
-        /// </summary>
-        /// <typeparam name="T">配置值类型</typeparam>
-        /// <param name="pluginName">插件名称</param>
-        /// <param name="key">配置键</param>
-        /// <param name="value">配置值</param>
-        public static void SetConfiguration<T>(string pluginName, string key, T value)
-        {
-            lock (_lockObject)
-            {
-                try
-                {
-                    if (!_pluginConfigs.ContainsKey(pluginName))
-                    {
-                        _pluginConfigs[pluginName] = new Dictionary<string, object>();
-                    }
-
-                    _pluginConfigs[pluginName][key] = value;
-
-                    // 异步保存配置
-                    Task.Run(() => SavePluginConfiguration(pluginName));
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteLogToFile($"设置插件 {pluginName} 配置 {key} 时出错: {ex.Message}", LogHelper.LogType.Error);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 删除插件配置
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        /// <param name="key">配置键</param>
-        public static void RemoveConfiguration(string pluginName, string key)
-        {
-            lock (_lockObject)
-            {
-                try
-                {
-                    if (_pluginConfigs.TryGetValue(pluginName, out var pluginConfig))
-                    {
-                        if (pluginConfig.Remove(key))
-                        {
-                            // 异步保存配置
-                            Task.Run(() => SavePluginConfiguration(pluginName));
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteLogToFile($"删除插件 {pluginName} 配置 {key} 时出错: {ex.Message}", LogHelper.LogType.Error);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 获取插件的所有配置
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        /// <returns>配置字典</returns>
-        public static Dictionary<string, object> GetAllConfigurations(string pluginName)
-        {
-            lock (_lockObject)
-            {
-                if (_pluginConfigs.TryGetValue(pluginName, out var pluginConfig))
-                {
-                    return new Dictionary<string, object>(pluginConfig);
-                }
-                return new Dictionary<string, object>();
-            }
-        }
-
-        /// <summary>
-        /// 清除插件的所有配置
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        public static void ClearAllConfigurations(string pluginName)
-        {
-            lock (_lockObject)
-            {
-                try
-                {
-                    if (_pluginConfigs.Remove(pluginName))
-                    {
-                        // 删除配置文件
-                        string configFile = Path.Combine(PluginConfigDirectory, $"{pluginName}.json");
-                        if (File.Exists(configFile))
-                        {
-                            File.Delete(configFile);
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteLogToFile($"清除插件 {pluginName} 所有配置时出错: {ex.Message}", LogHelper.LogType.Error);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 加载插件配置
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        public static void LoadPluginConfiguration(string pluginName)
-        {
-            try
-            {
-                string configFile = Path.Combine(PluginConfigDirectory, $"{pluginName}.json");
-                if (File.Exists(configFile))
-                {
-                    string json = File.ReadAllText(configFile);
-                    var config = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
-
-                    lock (_lockObject)
-                    {
-                        _pluginConfigs[pluginName] = config ?? new Dictionary<string, object>();
-                    }
-
-                    LogHelper.WriteLogToFile($"已加载插件 {pluginName} 的配置");
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"加载插件 {pluginName} 配置时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 保存插件配置
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        private static void SavePluginConfiguration(string pluginName)
-        {
-            try
-            {
-                Dictionary<string, object> pluginConfig;
-                lock (_lockObject)
-                {
-                    if (!_pluginConfigs.TryGetValue(pluginName, out pluginConfig))
-                    {
-                        return;
-                    }
-                }
-
-                string configFile = Path.Combine(PluginConfigDirectory, $"{pluginName}.json");
-                string json = JsonConvert.SerializeObject(pluginConfig, Formatting.Indented);
-                File.WriteAllText(configFile, json);
-
-                LogHelper.WriteLogToFile($"已保存插件 {pluginName} 的配置");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"保存插件 {pluginName} 配置时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 加载所有插件的配置
-        /// </summary>
-        public static void LoadAllPluginConfigurations()
-        {
-            try
-            {
-                if (Directory.Exists(PluginConfigDirectory))
-                {
-                    string[] configFiles = Directory.GetFiles(PluginConfigDirectory, "*.json");
-                    foreach (string configFile in configFiles)
-                    {
-                        string pluginName = Path.GetFileNameWithoutExtension(configFile);
-                        LoadPluginConfiguration(pluginName);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"加载所有插件配置时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 保存所有插件的配置
-        /// </summary>
-        public static void SaveAllPluginConfigurations()
-        {
-            try
-            {
-                lock (_lockObject)
-                {
-                    foreach (string pluginName in _pluginConfigs.Keys)
-                    {
-                        SavePluginConfiguration(pluginName);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"保存所有插件配置时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-    }
-}

Ink Canvas/Helpers/Plugins/PluginServiceManager.cs

@@ -1,509 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 插件服务管理器，实现IPluginService接口，提供对软件内部功能的访问
-    /// </summary>
-    public class PluginServiceManager : IPluginService
-    {
-        private static PluginServiceManager _instance;
-        private MainWindow _mainWindow;
-        private Dictionary<string, EventHandler> _eventHandlers;
-
-        /// <summary>
-        /// 单例实例
-        /// </summary>
-        public static PluginServiceManager Instance
-        {
-            get
-            {
-                if (_instance == null)
-                {
-                    _instance = new PluginServiceManager();
-                }
-                return _instance;
-            }
-        }
-
-        private PluginServiceManager()
-        {
-            _eventHandlers = new Dictionary<string, EventHandler>();
-        }
-
-        /// <summary>
-        /// 设置主窗口引用
-        /// </summary>
-        /// <param name="mainWindow">主窗口实例</param>
-        public void SetMainWindow(MainWindow mainWindow)
-        {
-            _mainWindow = mainWindow;
-        }
-
-        #region 窗口和UI访问
-
-        public Window MainWindow => _mainWindow;
-
-        public InkCanvas CurrentCanvas => null; // 暂时返回null，避免访问权限问题
-
-        public List<Canvas> AllCanvasPages => new List<Canvas>(); // 暂时返回空列表
-
-        public int CurrentPageIndex => 0; // 暂时返回0
-
-        public int TotalPageCount => 0; // 暂时返回0
-
-        public FrameworkElement FloatingToolBar => _mainWindow?.ViewboxFloatingBar;
-
-        public FrameworkElement LeftPanel => _mainWindow?.BlackboardLeftSide;
-
-        public FrameworkElement RightPanel => _mainWindow?.BlackboardRightSide;
-
-        public FrameworkElement TopPanel => _mainWindow?.BorderTools;
-
-        public FrameworkElement BottomPanel => _mainWindow?.BorderSettings;
-
-        #endregion
-
-        #region 绘制工具状态
-
-        public int CurrentDrawingMode => 0; // 暂时返回0
-
-        public double CurrentInkWidth => 2.5; // 暂时返回默认值
-
-        public Color CurrentInkColor => Colors.Black; // 暂时返回默认值
-
-        public double CurrentHighlighterWidth => 20.0; // 暂时返回默认值
-
-        public int CurrentEraserSize => 2; // 暂时返回默认值
-
-        public int CurrentEraserType => 0; // 暂时返回默认值
-
-        public int CurrentEraserShape => 0; // 暂时返回默认值
-
-        public double CurrentInkAlpha => 255.0; // 暂时返回默认值
-
-        public int CurrentInkStyle => 0; // 暂时返回默认值
-
-        public string CurrentBackgroundColor => "#162924"; // 暂时返回默认值
-
-        #endregion
-
-        #region 应用状态
-
-        public bool IsDarkTheme => false; // 暂时返回默认值
-
-        public bool IsWhiteboardMode => false; // 暂时返回默认值
-
-        public bool IsPPTMode => false; // 暂时返回默认值
-
-        public bool IsFullScreenMode => false; // 暂时返回默认值
-
-        public bool IsCanvasMode => true; // 暂时返回默认值
-
-        public bool IsSelectionMode => false; // 暂时返回默认值
-
-        public bool IsEraserMode => false; // 暂时返回默认值
-
-        public bool IsShapeDrawingMode => false; // 暂时返回默认值
-
-        public bool IsHighlighterMode => false; // 暂时返回默认值
-
-        #endregion
-
-        #region IGetService 实现
-
-        public bool CanUndo => false; // 暂时返回默认值
-
-        public bool CanRedo => false; // 暂时返回默认值
-
-        public T GetSetting<T>(string key, T defaultValue = default(T))
-        {
-            // 暂时不实现，避免访问权限问题
-            return defaultValue;
-        }
-
-        public List<IPlugin> GetAllPlugins()
-        {
-            return new List<IPlugin>(PluginManager.Instance.Plugins);
-        }
-
-        public IPlugin GetPlugin(string pluginName)
-        {
-            return PluginManager.Instance.Plugins.FirstOrDefault(p => p.Name == pluginName);
-        }
-
-        #endregion
-
-        #region IWindowService 实现
-
-        public void ShowSettingsWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void HideSettingsWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ShowPluginSettingsWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void HidePluginSettingsWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ShowHelpWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void HideHelpWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ShowAboutWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void HideAboutWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ShowNotification(string message, NotificationType type = NotificationType.Info)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public bool ShowConfirmDialog(string message, string title = "确认")
-        {
-            // 暂时不实现，避免访问权限问题
-            return false;
-        }
-
-        public string ShowInputDialog(string message, string title = "输入", string defaultValue = "")
-        {
-            // 暂时不实现，避免访问权限问题
-            return defaultValue;
-        }
-
-        public void SetFullScreen(bool isFullScreen)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetTopMost(bool isTopMost)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetWindowVisibility(bool isVisible)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void MinimizeWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void MaximizeWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void RestoreWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void CloseWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetWindowPosition(double x, double y)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetWindowSize(double width, double height)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public (double x, double y) GetWindowPosition()
-        {
-            // 暂时不实现，避免访问权限问题
-            return (0, 0);
-        }
-
-        public (double width, double height) GetWindowSize()
-        {
-            // 暂时不实现，避免访问权限问题
-            return (800, 600);
-        }
-
-        #endregion
-
-        #region IActionService 实现
-
-        public void ClearCanvas()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ClearAllCanvases()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void AddNewPage()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void DeleteCurrentPage()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SwitchToPage(int pageIndex)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void NextPage()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void PreviousPage()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetDrawingMode(int mode)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetInkWidth(double width)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetInkColor(Color color)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetHighlighterWidth(double width)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetEraserSize(int size)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetEraserType(int type)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetEraserShape(int shape)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetInkAlpha(double alpha)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetInkStyle(int style)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetBackgroundColor(string color)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SaveCanvas(string filePath)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void LoadCanvas(string filePath)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ExportAsImage(string filePath, string format)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ExportAsPDF(string filePath)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void Undo()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void Redo()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SelectAll()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void DeselectAll()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void DeleteSelected()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void CopySelected()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void CutSelected()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void Paste()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetSetting<T>(string key, T value)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SaveSettings()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void LoadSettings()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ResetSettings()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void EnablePlugin(string pluginName)
-        {
-            var plugin = GetPlugin(pluginName);
-            if (plugin != null)
-            {
-                PluginManager.Instance.TogglePlugin(plugin, true);
-            }
-        }
-
-        public void DisablePlugin(string pluginName)
-        {
-            var plugin = GetPlugin(pluginName);
-            if (plugin != null)
-            {
-                PluginManager.Instance.TogglePlugin(plugin, false);
-            }
-        }
-
-        public void UnloadPlugin(string pluginName)
-        {
-            var plugin = GetPlugin(pluginName);
-            if (plugin != null)
-            {
-                PluginManager.Instance.UnloadPlugin(plugin);
-            }
-        }
-
-        public void RegisterEventHandler(string eventName, EventHandler handler)
-        {
-            if (!_eventHandlers.ContainsKey(eventName))
-            {
-                _eventHandlers[eventName] = handler;
-            }
-            else
-            {
-                _eventHandlers[eventName] += handler;
-            }
-        }
-
-        public void UnregisterEventHandler(string eventName, EventHandler handler)
-        {
-            if (_eventHandlers.ContainsKey(eventName))
-            {
-                _eventHandlers[eventName] -= handler;
-            }
-        }
-
-        public void TriggerEvent(string eventName, object sender, EventArgs args)
-        {
-            if (_eventHandlers.ContainsKey(eventName))
-            {
-                _eventHandlers[eventName]?.Invoke(sender, args);
-            }
-        }
-
-        public void RestartApplication()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ExitApplication()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void CheckForUpdates()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void OpenHelpDocument()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void OpenAboutPage()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        #endregion
-    }
-}

Ink Canvas/Helpers/Plugins/PluginTemplate.cs

@@ -1,276 +0,0 @@
-using System;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 插件模板，用于开发者参考
-    /// 注意：实际开发时，请将此类移到单独的程序集中
-    /// </summary>
-    public class PluginTemplate : PluginBase
-    {
-        #region 插件基本信息
-
-        /// <summary>
-        /// 插件名称
-        /// </summary>
-        public override string Name => "插件模板";
-
-        /// <summary>
-        /// 插件描述
-        /// </summary>
-        public override string Description => "这是一个插件开发模板，用于开发者参考。";
-
-        /// <summary>
-        /// 插件版本
-        /// </summary>
-        public override Version Version => new Version(1, 0, 0);
-
-        /// <summary>
-        /// 插件作者
-        /// </summary>
-        public override string Author => "Your Name";
-
-        /// <summary>
-        /// 是否为内置插件（外部插件请返回false）
-        /// </summary>
-        public override bool IsBuiltIn => false;
-
-        #endregion
-
-        #region 插件生命周期
-
-        /// <summary>
-        /// 插件初始化
-        /// 在这里进行插件的初始化工作，如加载配置、注册事件等
-        /// </summary>
-        public override void Initialize()
-        {
-            // 先调用基类方法，这样会设置插件ID和记录日志
-            base.Initialize();
-
-            // TODO: 在这里进行插件初始化工作
-
-            // 示例：记录初始化信息
-            LogHelper.WriteLogToFile($"插件 {Name} 开始初始化");
-
-            // 示例：加载配置
-            LoadConfig();
-
-            // 示例：注册自定义事件
-            // MainWindow.Instance.SomeEvent += OnSomeEvent;
-
-            LogHelper.WriteLogToFile($"插件 {Name} 初始化完成");
-        }
-
-        /// <summary>
-        /// 启用插件
-        /// 在这里激活插件功能
-        /// </summary>
-        public override void Enable()
-        {
-            // 先调用基类方法，这样会设置插件状态和记录日志
-            base.Enable();
-
-            // TODO: 在这里启用插件功能
-
-            LogHelper.WriteLogToFile($"插件 {Name} 已启用");
-        }
-
-        /// <summary>
-        /// 禁用插件
-        /// 在这里停用插件功能
-        /// </summary>
-        public override void Disable()
-        {
-            // 先调用基类方法，这样会设置插件状态和记录日志
-            base.Disable();
-
-            // TODO: 在这里禁用插件功能
-
-            LogHelper.WriteLogToFile($"插件 {Name} 已禁用");
-        }
-
-        /// <summary>
-        /// 清理资源
-        /// 在插件卸载时调用，清理资源
-        /// </summary>
-        public override void Cleanup()
-        {
-            // TODO: 在这里清理插件资源
-
-            // 示例：取消注册事件
-            // MainWindow.Instance.SomeEvent -= OnSomeEvent;
-
-            // 示例：保存配置
-            SaveConfig();
-
-            // 最后调用基类方法
-            base.Cleanup();
-        }
-
-        #endregion
-
-        #region 插件配置
-
-        /// <summary>
-        /// 加载插件配置
-        /// </summary>
-        private void LoadConfig()
-        {
-            try
-            {
-                // TODO: 从文件或其他位置加载配置
-                // 示例：
-                // string configPath = Path.Combine(App.RootPath, "PluginConfigs", "YourPluginName.json");
-                // if (File.Exists(configPath))
-                // {
-                //     string json = File.ReadAllText(configPath);
-                //     YourConfig = Newtonsoft.Json.JsonConvert.DeserializeObject<YourConfigClass>(json);
-                // }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"加载插件配置时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 保存插件配置
-        /// </summary>
-        private void SaveConfig()
-        {
-            try
-            {
-                // TODO: 保存配置到文件或其他位置
-                // 示例：
-                // string configDir = Path.Combine(App.RootPath, "PluginConfigs");
-                // if (!Directory.Exists(configDir))
-                // {
-                //     Directory.CreateDirectory(configDir);
-                // }
-                // string configPath = Path.Combine(configDir, "YourPluginName.json");
-                // string json = Newtonsoft.Json.JsonConvert.SerializeObject(YourConfig, Newtonsoft.Json.Formatting.Indented);
-                // File.WriteAllText(configPath, json);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"保存插件配置时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        #endregion
-
-        #region 插件设置界面
-
-        /// <summary>
-        /// 获取插件设置界面
-        /// </summary>
-        /// <returns>插件设置界面</returns>
-        public override UserControl GetSettingsView()
-        {
-            // 创建插件设置界面
-            return new PluginTemplateSettingsControl();
-        }
-
-        #endregion
-
-        #region 插件功能方法
-
-        // TODO: 在这里添加插件的具体功能方法
-
-        /// <summary>
-        /// 示例方法：执行一些功能
-        /// </summary>
-        public void DoSomething()
-        {
-            if (!IsEnabled) return;
-
-            try
-            {
-                // TODO: 实现你的功能
-                MessageBox.Show("插件功能执行示例", "插件模板", MessageBoxButton.OK, MessageBoxImage.Information);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"执行插件功能时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        #endregion
-    }
-
-    /// <summary>
-    /// 插件设置控件
-    /// </summary>
-    public class PluginTemplateSettingsControl : UserControl
-    {
-        public PluginTemplateSettingsControl()
-        {
-            // 创建设置界面布局
-            var panel = new StackPanel
-            {
-                Margin = new Thickness(10)
-            };
-
-            // 添加标题
-            panel.Children.Add(new TextBlock
-            {
-                Text = "插件模板设置",
-                FontSize = 16,
-                FontWeight = FontWeights.Bold,
-                Margin = new Thickness(0, 0, 0, 10)
-            });
-
-            // 添加说明文字
-            panel.Children.Add(new TextBlock
-            {
-                Text = "这是一个示例设置界面，你可以在这里添加自己的设置控件。",
-                TextWrapping = TextWrapping.Wrap,
-                Margin = new Thickness(0, 0, 0, 15)
-            });
-
-            // 添加示例设置选项
-            var checkBox = new CheckBox
-            {
-                Content = "启用某项功能",
-                Margin = new Thickness(0, 0, 0, 10)
-            };
-            panel.Children.Add(checkBox);
-
-            // 添加文本输入框
-            panel.Children.Add(new TextBlock
-            {
-                Text = "设置项:",
-                Margin = new Thickness(0, 5, 0, 5)
-            });
-
-            panel.Children.Add(new TextBox
-            {
-                Margin = new Thickness(0, 0, 0, 10),
-                Width = 200,
-                HorizontalAlignment = HorizontalAlignment.Left
-            });
-
-            // 添加按钮
-            var button = new Button
-            {
-                Content = "保存设置",
-                Padding = new Thickness(10, 5, 10, 5),
-                Margin = new Thickness(0, 10, 0, 0),
-                HorizontalAlignment = HorizontalAlignment.Left
-            };
-
-            button.Click += (sender, e) =>
-            {
-                MessageBox.Show("设置已保存！", "插件模板", MessageBoxButton.OK, MessageBoxImage.Information);
-            };
-
-            panel.Children.Add(button);
-
-            // 设置控件内容
-            Content = panel;
-        }
-    }
-}

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/SaveFileNameHelper.cs

@@ -0,0 +1,68 @@
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 渲染保存文件名模板。支持占位符: {date} {time} {datetime} {mode} {page} {count} {type}。
+    /// 当模板为空、渲染结果非法或仅含分隔符时，回退到默认时间戳命名。
+    /// </summary>
+    public static class SaveFileNameHelper
+    {
+        private const string DefaultDateTime = "yyyy-MM-dd HH-mm-ss-fff";
+
+        public static string Render(string template, SaveFileNameContext ctx)
+        {
+            if (ctx == null) ctx = new SaveFileNameContext();
+            var now = ctx.Time ?? DateTime.Now;
+
+            if (string.IsNullOrWhiteSpace(template))
+                return now.ToString(DefaultDateTime);
+
+            try
+            {
+                string result = template
+                    .Replace("{date}", now.ToString("yyyy-MM-dd"))
+                    .Replace("{time}", now.ToString("HH-mm-ss"))
+                    .Replace("{datetime}", now.ToString(DefaultDateTime))
+                    .Replace("{mode}", ctx.Mode ?? "")
+                    .Replace("{page}", ctx.Page?.ToString() ?? "")
+                    .Replace("{count}", ctx.Count?.ToString() ?? "")
+                    .Replace("{type}", ctx.Type ?? "");
+
+                result = SanitizeFileName(result);
+
+                if (string.IsNullOrWhiteSpace(result) || Regex.IsMatch(result, @"^[\s\-_]+$"))
+                    return now.ToString(DefaultDateTime);
+
+                return result;
+            }
+            catch
+            {
+                return now.ToString(DefaultDateTime);
+            }
+        }
+
+        private static string SanitizeFileName(string name)
+        {
+            if (string.IsNullOrEmpty(name)) return name;
+            foreach (var c in Path.GetInvalidFileNameChars())
+            {
+                name = name.Replace(c, '_');
+            }
+            return name.Trim();
+        }
+    }
+
+    public class SaveFileNameContext
+    {
+        public DateTime? Time { get; set; }
+        /// <summary>"Annotation" or "BlackBoard" or "Screenshot" etc.</summary>
+        public string Mode { get; set; }
+        /// <summary>"User" or "Auto"</summary>
+        public string Type { get; set; }
+        public int? Page { get; set; }
+        public int? Count { get; set; }
+    }
+}