improve:自动更新

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

.all-contributorsrc

@@ -0,0 +1,158 @@
+{
+  "$schema": "https://www.schemastore.org/all-contributors.json",
+  "projectName": "community",
+  "projectOwner": "InkCanvasForClass",
+  "files": [
+    "README.md"
+  ],
+  "commitType": "docs",
+  "commitConvention": "angular",
+  "contributorsPerLine": 5,
+  "contributors": [
+    {
+      "login": "CJKmkp",
+      "name": "CJK_mkp",
+      "avatar_url": "https://avatars.githubusercontent.com/u/113243675?v=4",
+      "profile": "https://github.com/CJKmkp",
+      "contributions": [
+        "maintenance",
+        "doc",
+        "code",
+        "design"
+      ]
+    },
+    {
+      "login": "CreeperAWA",
+      "name": "CreeperAWA",
+      "avatar_url": "https://avatars.githubusercontent.com/u/134939494?v=4",
+      "profile": "https://github.com/CreeperAWA",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "2-2-3-trimethylpentane",
+      "name": "2,2,3-三甲基戊烷",
+      "avatar_url": "https://avatars.githubusercontent.com/u/141403762?v=4",
+      "profile": "https://github.com/2-2-3-trimethylpentane",
+      "contributions": [
+        "blog",
+        "doc",
+        "design",
+        "test",
+        "tutorial",
+        "video"
+      ]
+    },
+    {
+      "login": "Alan-CRL",
+      "name": "Alan-CRL",
+      "avatar_url": "https://avatars.githubusercontent.com/u/92425617?v=4",
+      "profile": "https://github.com/Alan-CRL",
+      "contributions": [
+        "code",
+        "infra",
+        "doc",
+        "financial"
+      ]
+    },
+    {
+      "login": "MKStoler1024",
+      "name": "MKStoler1024",
+      "avatar_url": "https://avatars.githubusercontent.com/u/158786854?v=4",
+      "profile": "https://github.com/MKStoler1024",
+      "contributions": [
+        "doc",
+        "code",
+        "design"
+      ]
+    },
+    {
+      "login": "awesome-iwb",
+      "name": "Awesome Iwb",
+      "avatar_url": "https://avatars.githubusercontent.com/u/184760810?v=4",
+      "profile": "https://github.com/awesome-iwb",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "PrefacedCorg",
+      "name": "PrefacedCorg",
+      "avatar_url": "https://avatars.githubusercontent.com/u/129855423?v=4",
+      "profile": "https://github.com/PrefacedCorg",
+      "contributions": [
+        "code",
+        "design"
+      ]
+    },
+    {
+      "login": "Jursin",
+      "name": "Jursin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/127487914?v=4",
+      "profile": "http://blog.jursin.top",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "Tayasui-rainnya",
+      "name": "tayasui rainnya!",
+      "avatar_url": "https://avatars.githubusercontent.com/u/156585442?v=4",
+      "profile": "https://github.com/Tayasui-rainnya",
+      "contributions": [
+        "design",
+        "code"
+      ]
+    },
+    {
+      "login": "doudou0720",
+      "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

@@ -0,0 +1,66 @@
+name: Bug 报告 | Bug Report
+description: 反馈软件缺陷或异常 | Report a bug to help us improve
+type: Bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢你的反馈！请详细填写以下内容，便于我们定位问题。
+        Thank you for your feedback! Please fill out the following information to help us locate the issue.
+        
+        在报告问题之前，请确保你的软件已经更新到最新Beta版本，否则我们可能会无条件直接关闭该Issue，感谢配合！
+        Before reporting the issue, please make sure your software has been updated to the latest Beta version. Otherwise, we may unconditionally close this Issue without any further notice. Thank you for your cooperation!
+  - type: input
+    id: version
+    attributes:
+      label: 软件版本 | App Version
+      description: 可在设置中的“关于”界面查看 | You can find it on the "About" interface in the settings
+      placeholder: 例如 v1.2.3 | e.g. v1.2.3
+    validations:
+      required: true
+  - type: input
+    id: os
+    attributes:
+      label: 操作系统及版本 | OS & Version
+      placeholder: 例如 Windows 10 22H2 64位 | e.g. Windows 10 22H2 64bit
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: 问题描述 | Description
+      description: 简要描述遇到的问题 | Briefly describe the problem
+    validations:
+      required: true
+  - type: textarea
+    id: steps
+    attributes:
+      label: 复现步骤 | Steps to Reproduce
+      description: 如何复现该问题？如有必要可附截图/录屏/触发该问题的文件 | How to reproduce this bug? Screenshots/recordings/specific files if needed
+      placeholder: |
+        1. 
+        2. 
+        3. 
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: 期望结果 | Expected Behavior
+      description: 你期望的正确行为或结果 | What did you expect to happen?
+    validations:
+      required: true
+  - type: textarea
+    id: extra
+    attributes:
+      label: 其他补充信息 | Additional Info
+      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

@@ -0,0 +1,44 @@
+name: 功能请求 | Feature Request
+description: 提出你对本项目的功能建议 | Suggest an idea for this project
+type: Feature
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢你的建议！请详细描述你的需求。
+        Thank you for your suggestion! Please describe your needs in detail.
+  - type: textarea
+    id: description
+    attributes:
+      label: 功能描述 | Description
+      description: 请描述你希望添加的功能 | Describe the feature you want
+    validations:
+      required: true
+  - type: textarea
+    id: motivation
+    attributes:
+      label: 需求动机 | Motivation
+      description: 为什么需要这个功能？| Why do you need this feature?
+    validations:
+      required: true
+  - type: textarea
+    id: design
+    attributes:
+      label: 期望设计 | Expected Design
+      description: （可选）描述或画出你期望的界面或交互 | (Optional) Describe or sketch the expected UI/UX
+    validations:
+      required: false
+  - type: textarea
+    id: extra
+    attributes:
+      label: 其他补充信息 | Additional Info
+      description: 其他补充说明或建议 | Any other context or suggestions
+    validations:
+      required: false
+  - type: upload
+    id: files
+    attributes:
+      label: 上传有关文件 | Upload relevant files
+      description: "你可以在此处上传相关文件 | You can upload relevant files here."
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/03-bug_report.md

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

.github/ISSUE_TEMPLATE/04-feature_request.md

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,22 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-## Description
-
-
-## Reproduction
-
-
-## Expected behavior
-
-
-## Screenshots
-
-
-## Additional context

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,10 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-## Description

.github/workflows/dotnet-desktop.yml

@@ -0,0 +1,106 @@
+name: .NET Build & Package
+
+on:
+  push:
+    branches: [ net6 ]
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-${{ github.head_ref || github.sha }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  build-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
+        with:
+          cache: true
+          cache-dependency-path: '**/packages.lock.json'
+      
+      - name: Restore Package 
+        run: dotnet restore "Ink Canvas.sln" --locked-mode
+      
+      - name: Build the Solution
+        env:
+          DLASS_SENTRY_DSN: ${{ secrets.DLASS_SENTRY_DSN }}
+        run: msbuild /p:platform="${{ matrix.architecture }}" /p:configuration="Debug" /p:GitFlow="$GITFLOW" "Ink Canvas/InkCanvasForClass.csproj" /m /p:UseMultiToolTask=true /p:EnforceProcessCountAcrossBuilds=true /verbosity:minimal -maxcpucount /p:RunAnalyzers=false
+
+      - name: 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/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

@@ -0,0 +1,754 @@
+name: Pre-release and Changelog
+
+on:
+  push:
+    tags:
+      - '*'
+  workflow_dispatch:
+    inputs:
+      version_type:
+        description: 'Version bump type'
+        required: true
+        default: 'patch'
+        type: choice
+        options:
+        - patch
+        - minor
+        - major
+        - build
+      prerelease:
+        description: 'Create as pre-release'
+        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 }}
+  cancel-in-progress: true
+
+jobs:
+  prepare:
+    runs-on: windows-latest
+    outputs:
+      tag_name: ${{ steps.get_tag.outputs.tag_name }}
+      version: ${{ steps.get_tag.outputs.version }}
+      is_prerelease: ${{ steps.release_type.outputs.is_prerelease }}
+      changelog: ${{ steps.read_changelog.outputs.changelog }}
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+
+      # ========== 获取当前版本 ==========
+      - name: Get current version from Git tag
+        id: get_version
+        run: |
+          # 获取最新的tag
+          $latestTag = git describe --tags --abbrev=0 2>$null
+          if ($latestTag) {
+            $version = $latestTag
+            echo "Found latest tag: $latestTag"
+          } else {
+            # 如果没有tag，使用默认值
+            $version = "1.0.0.0"
+            echo "No tag found, using default version: $version"
+          }
+          echo "current_version=$version" >> $env:GITHUB_OUTPUT
+          echo "Current version: $version"
+
+      # ========== 处理版本号和标签名 ==========
+      - name: Get tag name and version
+        id: get_tag
+        run: |
+          if ("${{ github.event_name }}" -eq "push") {
+            # 从 push tag 事件获取原始标签名
+            $tagName = "${{ github.ref }}".Replace("refs/tags/", "")
+            $cleanVersion = $tagName
+            
+            echo "tag_name=$tagName" >> $env:GITHUB_OUTPUT
+            echo "version=$cleanVersion" >> $env:GITHUB_OUTPUT
+            echo "Using pushed tag: $tagName, version: $cleanVersion"
+          } else {
+            # 从 workflow_dispatch 计算新版本（4位格式）
+            $currentVersion = "${{ steps.get_version.outputs.current_version }}"
+            $versionParts = $currentVersion.Split('.')
+            
+            # 确保版本号格式正确（至少4部分）
+            if ($versionParts.Length -ge 4) {
+              $major = [int]$versionParts[0]
+              $minor = [int]$versionParts[1]
+              $patch = [int]$versionParts[2]
+              $build = [int]$versionParts[3]
+            } else {
+              # 如果版本号格式不正确，补充为4位
+              if ($versionParts.Length -ge 3) {
+                $major = [int]$versionParts[0]
+                $minor = [int]$versionParts[1]
+                $patch = [int]$versionParts[2]
+                $build = 0
+              } else {
+                # 如果版本号格式不正确，抛出错误
+                echo "Error: Invalid version format. Expected format: x.y.z.w (e.g., 1.7.18.0)"
+                exit 1
+              }
+            }
+            
+            $versionType = "${{ github.event.inputs.version_type }}"
+            $isPrerelease = "${{ github.event.inputs.prerelease }}" -eq "true"
+            
+            switch ($versionType) {
+              "major" { 
+                $major++
+                $minor = 0
+                $patch = 0
+                $build = 0
+              }
+              "minor" { 
+                $minor++
+                $patch = 0
+                $build = 0
+              }
+              "patch" { 
+                $patch++
+                $build = 0
+              }
+              "build" { 
+                $build++
+              }
+            }
+            
+            # 生成新版本号（4位格式，如1.7.18.0）
+            $newVersion = "$major.$minor.$patch.$build"
+            
+            # 根据是否为预发布决定版本号最后一位
+            # 如果是预发布，确保最后一位不为0（使用1）
+            if ($isPrerelease -and $build -eq 0) {
+              $build = 1
+              $newVersion = "$major.$minor.$patch.$build"
+            }
+            $tagName = $newVersion
+            
+            echo "tag_name=$tagName" >> $env:GITHUB_OUTPUT
+            echo "version=$newVersion" >> $env:GITHUB_OUTPUT
+            echo "New tag: $tagName, version: $newVersion"
+          }
+
+      - name: Determine release type
+        id: release_type
+        run: |
+          if ("${{ github.event_name }}" -eq "push") {
+            # 根据版本号最后一位确定是否为预发布版本
+            # 最后一位为0表示正式版本，非0表示预发布版本
+            $version = "${{ steps.get_tag.outputs.version }}"
+            $versionParts = $version.Split('.')
+            if ($versionParts.Length -ge 4) {
+              $build = [int]$versionParts[3]
+              if ($build -eq 0) {
+                echo "is_prerelease=false" >> $env:GITHUB_OUTPUT
+                echo "This is a release"
+              } else {
+                echo "is_prerelease=true" >> $env:GITHUB_OUTPUT
+                echo "This is a pre-release (beta)"
+              }
+            } else {
+              echo "is_prerelease=false" >> $env:GITHUB_OUTPUT
+              echo "This is a release (invalid version format)"
+            }
+          } else {
+            # workflow_dispatch 方式
+            echo "is_prerelease=${{ github.event.inputs.prerelease }}" >> $env:GITHUB_OUTPUT
+          }
+
+      # ========== 使用 git-cliff 生成变更日志 ==========
+      - name: Generate changelog with git-cliff (for pushed tag)
+        if: github.event_name == 'push'
+        id: git_cliff_tag
+        uses: orhun/git-cliff-action@v4
+        with:
+          config: build/cliff.toml  # 使用项目build目录的 cliff.toml 配置
+          args: --latest --tag ${{ steps.get_tag.outputs.tag_name }} --output CHANGELOG.md
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Generate changelog with git-cliff (for workflow_dispatch)
+        if: github.event_name == 'workflow_dispatch'
+        id: git_cliff_unreleased
+        uses: orhun/git-cliff-action@v4
+        with:
+          config: build/cliff.toml
+          args: --unreleased --tag ${{ steps.get_tag.outputs.tag_name }} --output CHANGELOG.md
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Read changelog content
+        id: read_changelog
+        run: |
+          $changelogContent = Get-Content -Path CHANGELOG.md -Raw
+          echo "changelog<<EOF" >> $env:GITHUB_OUTPUT
+          echo $changelogContent >> $env:GITHUB_OUTPUT
+          echo "EOF" >> $env:GITHUB_OUTPUT
+
+  build:
+    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 }}
+      installer_size: ${{ steps.calculate_installer_size.outputs.installer_size }}
+    
+    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
+        with:
+          cache: true
+          cache-dependency-path: '**/packages.lock.json'
+      
+      - name: Restore Package 
+        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="${{ 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\${{ 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
+            exit 1
+          }
+
+      - name: Install Inno Setup Unofficial Language Files
+        if: steps.check-exe.outputs.build_success == 'true'
+        run: |
+          # 创建临时目录用于下载文件
+          New-Item -ItemType Directory -Path "temp_lang" -Force
+          
+          # 下载英语英国版语言文件
+          Invoke-WebRequest -Uri "https://github.com/jrsoftware/issrc/raw/refs/heads/main/Files/Languages/Unofficial/EnglishBritish.isl" -OutFile "temp_lang/EnglishBritish.isl"
+          
+          # 下载简体中文版语言文件
+          Invoke-WebRequest -Uri "https://github.com/jrsoftware/issrc/raw/refs/heads/main/Files/Languages/Unofficial/ChineseSimplified.isl" -OutFile "temp_lang/ChineseSimplified.isl"
+          
+          # 将文件移动到 Inno Setup 的语言目录
+          Move-Item -Path "temp_lang/EnglishBritish.isl" -Destination "C:/Program Files (x86)/Inno Setup 6/Languages/EnglishBritish.isl" -Force
+          Move-Item -Path "temp_lang/ChineseSimplified.isl" -Destination "C:/Program Files (x86)/Inno Setup 6/Languages/ChineseSimplified.isl" -Force
+          
+          # 清理临时目录
+          Remove-Item -Path "temp_lang" -Recurse -Force
+
+      - name: Create Release Archive
+        id: create_archive
+        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 = ""
+          }
+          
+          $archiveName = "InkCanvasForClass.CE.$version$suffix.zip"
+          
+          # 创建发布目录
+          New-Item -ItemType Directory -Path "release" -Force
+          
+          # 复制发布文件（使用架构特定的路径）
+          Copy-Item "Ink Canvas\bin\Release\$architecture\net6.0-windows10.0.19041.0\*" "release/" -Recurse -Force
+          
+          # 创建压缩包
+          Compress-Archive -Path "release/*" -DestinationPath $archiveName -Force
+          
+          echo "archive_name=$archiveName" >> $env:GITHUB_OUTPUT
+          
+      - name: Prepare Inno Setup script
+        if: steps.check-exe.outputs.build_success == 'true'
+        run: |
+          $version = "${{ needs.prepare.outputs.version }}"
+          $architecture = "${{ matrix.architecture }}"
+          
+          # 更新 ISS 文件中的版本信息
+          $issPath = "build/InkCanvasForClass CE.iss"
+          $issContent = Get-Content -Path $issPath -Raw
+          
+          # 替换版本信息
+          $issContent = $issContent -replace '#define MyAppVersion ".*"', "#define MyAppVersion `"$version`""
+          
+          # 替换源文件路径为相对路径（考虑到ISS文件在build目录下，需要返回上级目录）
+          $issContent = $issContent -replace 'Source: ".*\\{#MyAppExeName}";', 'Source: "../release/{#MyAppExeName}";'
+          $issContent = $issContent -replace 'Source: ".*\\InkCanvasForClass.exe.config";', 'Source: "../release/InkCanvasForClass.exe.config";'
+          
+          # 更新输出目录为当前目录
+          $issContent = $issContent -replace 'OutputDir=.*', 'OutputDir=.'
+          
+          # 更新默认安装目录
+          $issContent = $issContent -replace 'DefaultDirName=.*', 'DefaultDirName={autopf}/{#MyAppName}'
+          
+          # 更新许可证文件路径为相对路径（考虑到ISS文件在build目录下，需要返回上级目录）
+          $issContent = $issContent -replace 'LicenseFile=.*', 'LicenseFile=../LICENSE'
+          
+          # 保存修改后的 ISS 文件
+          $issContent | Set-Content -Path $issPath -Encoding UTF8
+          
+      - name: Build MSI installer with Inno Setup
+        if: steps.check-exe.outputs.build_success == 'true'
+        uses: Minionguyjpro/Inno-Setup-Action@v1.2.7
+        with:
+          path: build/InkCanvasForClass CE.iss
+          options: /O.
+          
+      - name: Rename installer file
+        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$suffix.Setup.exe"
+          
+          if (Test-Path $setupFile) {
+            Rename-Item -Path $setupFile -NewName $newSetupName
+          } else {
+            Write-Error "Setup file not found: $setupFile"
+          }
+          
+      - name: Calculate archive size
+        id: calculate_size
+        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 = ""
+          }
+          
+          $archiveName = "InkCanvasForClass.CE.$version$suffix.zip"
+          
+          # 获取文件大小（字节）
+          $fileSize = (Get-Item $archiveName).Length
+          
+          echo "zip_size=$fileSize" >> $env:GITHUB_OUTPUT
+          
+      - name: Calculate installer size
+        id: calculate_installer_size
+        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 = ""
+          }
+          
+          $installerName = "InkCanvasForClass.CE.$version$suffix.Setup.exe"
+          
+          if (Test-Path $installerName) {
+            # 获取文件大小（字节）
+            $fileSize = (Get-Item $installerName).Length
+            
+            echo "installer_size=$fileSize" >> $env:GITHUB_OUTPUT
+          } else {
+            Write-Error "Installer file not found: $installerName"
+          }
+          
+      - name: Upload Build Artifacts
+        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 = ""
+          }
+          
+          $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 }}-${{ matrix.architecture }}
+          path: |
+            ${{ steps.get_file_names.outputs.zip_file }}
+            ${{ steps.get_file_names.outputs.setup_file }}
+
+      - name: Create Build Summary
+        if: always()
+        shell: bash
+        run: |
+          echo "# Release Build Summary" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          
+          if [ "${{ steps.check-exe.outputs.build_success }}" = "true" ]; then
+            echo "## ✅ Release Build Successful" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            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
+            
+            if [ -n "${{ steps.calculate_size.outputs.zip_size }}" ]; then
+              echo "**Archive Size:** ${{ steps.calculate_size.outputs.zip_size }} bytes" >> $GITHUB_STEP_SUMMARY
+            fi
+            
+            if [ -n "${{ steps.calculate_installer_size.outputs.installer_size }}" ]; then
+              echo "**Installer Size:** ${{ steps.calculate_installer_size.outputs.installer_size }} bytes" >> $GITHUB_STEP_SUMMARY
+            fi
+            
+          else
+            echo "## ❌ Release Build Failed" >> $GITHUB_STEP_SUMMARY
+            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
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "Check build logs for details." >> $GITHUB_STEP_SUMMARY
+          fi
+
+  sign:
+    needs: [prepare, build]
+    if: success()
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
+    steps:
+      - name: Download Build Artifacts
+        uses: actions/download-artifact@v8
+        with:
+          pattern: build-files-${{ needs.prepare.outputs.version }}-*
+          merge-multiple: false
+          
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.14'
+          
+      - name: Sign release artifacts with sigstore-python
+        uses: sigstore/gh-action-sigstore-python@v3.3.0
+        with:
+          inputs: |
+            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@v7
+        with:
+          name: signed-files-${{ needs.prepare.outputs.version }}
+          path: |
+            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-slim
+    permissions:
+      contents: write
+    outputs:
+      enhanced_changelog: ${{steps.enhanced_changelog.outputs.enhanced_changelog}}
+
+    steps:
+      - name: Download Build Artifacts
+        uses: actions/download-artifact@v8
+        with:
+          pattern: build-files-${{ needs.prepare.outputs.version }}-*
+          merge-multiple: true
+          
+      - name: Download Signed Artifacts (if exists)
+        uses: actions/download-artifact@v8
+        with:
+          name: signed-files-${{ needs.prepare.outputs.version }}
+        continue-on-error: true
+          
+      - name: Create enhanced changelog with file table
+        id: enhanced_changelog
+        run: |
+          version='${{ needs.prepare.outputs.version }}'
+          
+          # 读取git-cliff生成的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'
+          
+          # 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
+          
+          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=$(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=$(wc -c < "InkCanvasForClass.CE.$version.Setup.exe.sigstore.json")
+            fileTable+=$'| InkCanvasForClass.CE.'"$version"'.Setup.exe.sigstore.json | '"$sigstoreSize"' bytes |\n'
+          fi
+          
+          fileTable+=$'\n*文件大小信息由GitHub Actions自动生成*\n'
+          
+          # 将表格附加到原始changelog
+          enhancedChangelog="${originalChangelog}${fileTable}"
+          
+          # 输出增强版changelog内容
+          echo "enhanced_changelog<<EOF" >> $GITHUB_OUTPUT
+          echo "$enhancedChangelog" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+          
+          echo "Enhanced changelog created with file information table"
+          
+      - name: Display Release Info
+        run: |
+          echo "=== Creating Release ==="
+          echo "Version: ${{ needs.prepare.outputs.version }}"
+          echo "Tag: ${{ needs.prepare.outputs.tag_name }}"
+          echo "Pre-release: ${{ needs.prepare.outputs.is_prerelease }}"
+          
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ needs.prepare.outputs.tag_name }}
+          name: ICC CE ${{ needs.prepare.outputs.version }}
+          body: |
+            ${{ steps.enhanced_changelog.outputs.enhanced_changelog }}
+          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 }}
+  
+  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

@@ -1,16 +1,433 @@
-InkCanvasForClass/obj
-InkCanvasForClass/bin
-InkCanvasForClassX/obj
-InkCanvasForClassX/bin
-InkCanvasForClass.IACoreHelper/obj
-InkCanvasForClass.IACoreHelper/bin
-InkCanvasForClass.PowerPoint.InteropHelper/obj
-InkCanvasForClass.PowerPoint.InteropHelper/bin
-InkCanvasForClass.PowerPoint.VstoPlugin/obj
-InkCanvasForClass.PowerPoint.VstoPlugin/bin
-InkCanvasForClass.IccInkCanvas/obj
-InkCanvasForClass.IccInkCanvas/bin
-InkCanvasForClass.IccInkCanvas.Demo/obj
-InkCanvasForClass.IccInkCanvas.Demo/bin
-.vs
-.idea
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+*.env
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+
+[Dd]ebug/x64/
+[Dd]ebugPublic/x64/
+[Rr]elease/x64/
+[Rr]eleases/x64/
+bin/x64/
+obj/x64/
+
+[Dd]ebug/x86/
+[Dd]ebugPublic/x86/
+[Rr]elease/x86/
+[Rr]eleases/x86/
+bin/x86/
+obj/x86/
+
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+[Aa][Rr][Mm]64[Ee][Cc]/
+bld/
+[Oo]bj/
+[Oo]ut/
+[Ll]og/
+[Ll]ogs/
+
+# Build results on 'Bin' directories
+**/[Bb]in/*
+# Uncomment if you have tasks that rely on *.refresh files to move binaries
+# (https://github.com/github/gitignore/pull/3736)
+#!**/[Bb]in/*.refresh
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+*.trx
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Approval Tests result files
+*.received.*
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.idb
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+# but not Directory.Build.rsp, as it configures directory-level build defaults
+!Directory.Build.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.tlog
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio 6 workspace and project file (working project files containing files to include in project)
+*.dsw
+*.dsp
+
+# Visual Studio 6 technical files
+*.ncb
+*.aps
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+**/.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+**/.fake/
+
+# CodeRush personal settings
+**/.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+**/__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+#tools/**
+#!tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+MSBuild_Logs/
+
+# AWS SAM Build and Temporary Artifacts folder
+.aws-sam
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+**/.mfractor/
+
+# Local History for Visual Studio
+**/.localhistory/
+
+# Visual Studio History (VSHistory) files
+.vshistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+**/.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+
+# Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Telemetry DSN configuration file (contains sensitive information)
+telemetry_dsn.txt
+**/telemetry_dsn.txt
+.trae/skills/migrate-toggle-switch/SKILL.md

.idea/.idea.Ink Canvas/.idea/.gitignore

@@ -1,12 +1,12 @@
-# 默认忽略的文件
+# Default ignored files
 /shelf/
 /workspace.xml
-# Rider 忽略的文件
-/contentModel.xml
+# Rider ignored files
 /projectSettingsUpdater.xml
 /modules.xml
+/contentModel.xml
 /.idea.Ink Canvas.iml
-# 基于编辑器的 HTTP 客户端请求
+# Editor-based HTTP Client requests
 /httpRequests/
 # Datasource local storage ignored files
 /dataSources/

.idea/.idea.Ink Canvas/.idea/indexLayout.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="UserContentModel">
-    <attachedFolders />
+    <attachedFolders>
+      <Path>../../ICC CE main</Path>
+    </attachedFolders>
     <explicitIncludes />
     <explicitExcludes />
   </component>

.idea/.idea.Ink Canvas/.idea/vcs.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../alpha" vcs="Git" />
   </component>
 </project>

AutomaticUpdateVersionControl.txt

@@ -0,0 +1 @@
+1.7.18.0

CHANGELOG

@@ -1,36 +0,0 @@
-rev-1.0.0.0:
-1. 重写大部分代码中...
-
-5.0.5.0:
-1. 支持自动收纳希沃轻白板5C，希沃白板3，鸿合轻量白板。
-2. 支持自动查杀鸿合屏幕书写。
-3. 带来FitToCurve，给平滑墨迹加上了开关。
-4. 修复了FitToCurve导致的部分形状绘制出错的问题也保留了其他墨迹的FitToCurve。
-5. 白板，浮动工具栏，子面板，设置UI几乎全部优化。
-6. 添加修改橡皮大小，橡皮形状的菜单。
-7. PPT现在会自动提示是否关闭自动播放和排练计时。
-8. 条件性的墨迹识别，可以关闭部分不需要的形状识别。可以修改是否为墨迹识别的三角形或矩形应用模拟压感值。
-9. 带来了荧光笔功能并为荧光笔适配了形状识别。
-10. 允许清空墨迹时可删除历史记录。
-11. 带来了Quick Panel。
-12. 浮动工具栏缩放调节，取消收纳按钮图标修改。
-13. 修复了多指书写StylusDown事件可能触发在工具栏而不是inkCanvas上导致的Bug。
-14. 修复了鼠标和触摸屏（无RealTimeStylus和非多指书写模式）的绘制时Pointer捕获Bug。
-15. Merge了Ink Canvas的新撤回行为
-16. 修复了白板模式下直接新增页面导致的TimeMachine不记录历史记录的Bug
-17. 添加了一个简陋的白板页面列表。
-18. 优化了墨迹重播，支持暂停，重新开始和倍速，拥有更人性化的UI。
-19. 优化自动收纳行为和FoldFloatingBar函数的相关Bug修复。
-20. 添加了EdgeGestureUtil实验性选项。
-21. 添加了ForceFullScreen实验性选项
-22. 添加了FullScreenHelper实验性选项。
-23. 添加了ResolutionChangeDetection和DPIChangeDetection实验性选项。
-24. 修复了同时打开ICC和ICA的冲突。
-25. 修复浮动工具栏手势按钮开启多指书写时InkCanvas的InkCanvasEditingMode被修改为None的Bug。
-26. 修复Merge ICA仓库代码后导致浮动工具栏批注按钮UI MouseLeave反馈的问题。
-27. 为大部分UI的按钮添加了lastBorderMouseDown的检测代码和MouseDown的视觉反馈。
-28. 支持自动收纳安道系列，艺云系列和 MAXHUB 白板书写。
-
-4.5.8.0:
-1. 将ICA的代码换了个名字变成了InkCanvasForClass，万物起源。
-2. 优化了ICA的部分UI界面设计。

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+QQ:2564608840.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

Ink Canvas.sln

@@ -1,21 +1,13 @@
-
+
 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}") = "InkCanvasForClassX", "InkCanvasForClassX\InkCanvasForClassX.csproj", "{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InkCanvasForClass", "Ink Canvas\InkCanvasForClass.csproj", "{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InkCanvasForClass", "InkCanvasForClass\InkCanvasForClass.csproj", "{2474F5B0-6FA7-4D70-8A00-167BBB03264D}"
+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}") = "InkCanvasForClass.IACoreHelper", "InkCanvasForClass.IACoreHelper\InkCanvasForClass.IACoreHelper.csproj", "{693973B6-69C1-4A37-B329-F366A07BF60A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InkCanvasForClass.PowerPoint.InteropHelper", "InkCanvasForClass.PowerPoint.InteropHelper\InkCanvasForClass.PowerPoint.InteropHelper.csproj", "{2D8A9217-465A-4F57-BD58-CE02450390C4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InkCanvasForClass.PowerPoint.VstoPlugin", "InkCanvasForClass.PowerPoint.VstoPlugin\InkCanvasForClass.PowerPoint.VstoPlugin.csproj", "{8C593467-E54D-4FA7-881C-78F3CC48A867}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InkCanvasForClass.IccInkCanvas", "InkCanvasForClass.IccInkCanvas\InkCanvasForClass.IccInkCanvas.csproj", "{43929D8F-5630-4786-B75D-E203EA3E992F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InkCanvasForClass.IccInkCanvas.Demo", "InkCanvasForClass.IccInkCanvas.Demo\InkCanvasForClass.IccInkCanvas.Demo.csproj", "{94E97F70-CACD-453B-8114-08DFFDDA5A46}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InkCanvas.Controls", "InkCanvas.Controls\InkCanvas.Controls.csproj", "{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -29,223 +21,68 @@ Global
 		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
-		x86 Debug|Any CPU = x86 Debug|Any CPU
-		x86 Debug|ARM = x86 Debug|ARM
-		x86 Debug|ARM64 = x86 Debug|ARM64
-		x86 Debug|x64 = x86 Debug|x64
-		x86 Debug|x86 = x86 Debug|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Debug|ARM.Build.0 = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Debug|x64.Build.0 = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Debug|x86.Build.0 = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Release|Any CPU.Build.0 = Release|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Release|ARM.ActiveCfg = Release|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Release|ARM.Build.0 = Release|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Release|ARM64.Build.0 = Release|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Release|x64.ActiveCfg = Release|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Release|x64.Build.0 = Release|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Release|x86.ActiveCfg = Release|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.Release|x86.Build.0 = Release|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.x86 Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.x86 Debug|Any CPU.Build.0 = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.x86 Debug|ARM.ActiveCfg = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.x86 Debug|ARM.Build.0 = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.x86 Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.x86 Debug|ARM64.Build.0 = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.x86 Debug|x64.ActiveCfg = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.x86 Debug|x64.Build.0 = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.x86 Debug|x86.ActiveCfg = Debug|Any CPU
-		{98DF6AA1-DD4D-4C70-A0A2-4B2974D97D51}.x86 Debug|x86.Build.0 = Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Debug|ARM.Build.0 = Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Debug|x64.Build.0 = Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Debug|x86.Build.0 = Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Release|ARM.ActiveCfg = Release|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Release|ARM.Build.0 = Release|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Release|ARM64.Build.0 = Release|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Release|x64.ActiveCfg = Release|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Release|x64.Build.0 = Release|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Release|x86.ActiveCfg = Release|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.Release|x86.Build.0 = Release|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.x86 Debug|Any CPU.ActiveCfg = x86 Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.x86 Debug|Any CPU.Build.0 = x86 Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.x86 Debug|ARM.ActiveCfg = x86 Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.x86 Debug|ARM.Build.0 = x86 Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.x86 Debug|ARM64.ActiveCfg = x86 Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.x86 Debug|ARM64.Build.0 = x86 Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.x86 Debug|x64.ActiveCfg = x86 Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.x86 Debug|x64.Build.0 = x86 Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.x86 Debug|x86.ActiveCfg = x86 Debug|Any CPU
-		{2474F5B0-6FA7-4D70-8A00-167BBB03264D}.x86 Debug|x86.Build.0 = x86 Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Debug|ARM.Build.0 = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Debug|x64.Build.0 = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Debug|x86.Build.0 = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Release|ARM.ActiveCfg = Release|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Release|ARM.Build.0 = Release|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Release|ARM64.Build.0 = Release|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Release|x64.ActiveCfg = Release|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Release|x64.Build.0 = Release|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Release|x86.ActiveCfg = Release|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.Release|x86.Build.0 = Release|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.x86 Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.x86 Debug|Any CPU.Build.0 = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.x86 Debug|ARM.ActiveCfg = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.x86 Debug|ARM.Build.0 = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.x86 Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.x86 Debug|ARM64.Build.0 = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.x86 Debug|x64.ActiveCfg = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.x86 Debug|x64.Build.0 = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.x86 Debug|x86.ActiveCfg = Debug|Any CPU
-		{693973B6-69C1-4A37-B329-F366A07BF60A}.x86 Debug|x86.Build.0 = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Debug|ARM.Build.0 = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Debug|x64.Build.0 = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Debug|x86.Build.0 = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Release|ARM.ActiveCfg = Release|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Release|ARM.Build.0 = Release|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Release|ARM64.Build.0 = Release|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Release|x64.ActiveCfg = Release|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Release|x64.Build.0 = Release|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Release|x86.ActiveCfg = Release|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.Release|x86.Build.0 = Release|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.x86 Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.x86 Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.x86 Debug|ARM.ActiveCfg = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.x86 Debug|ARM.Build.0 = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.x86 Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.x86 Debug|ARM64.Build.0 = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.x86 Debug|x64.ActiveCfg = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.x86 Debug|x64.Build.0 = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.x86 Debug|x86.ActiveCfg = Debug|Any CPU
-		{2D8A9217-465A-4F57-BD58-CE02450390C4}.x86 Debug|x86.Build.0 = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Debug|ARM.Build.0 = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Debug|x64.Build.0 = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Debug|x86.Build.0 = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Release|ARM.ActiveCfg = Release|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Release|ARM.Build.0 = Release|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Release|ARM64.Build.0 = Release|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Release|x64.ActiveCfg = Release|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Release|x64.Build.0 = Release|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Release|x86.ActiveCfg = Release|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.Release|x86.Build.0 = Release|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.x86 Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.x86 Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.x86 Debug|ARM.ActiveCfg = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.x86 Debug|ARM.Build.0 = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.x86 Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.x86 Debug|ARM64.Build.0 = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.x86 Debug|x64.ActiveCfg = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.x86 Debug|x64.Build.0 = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.x86 Debug|x86.ActiveCfg = Debug|Any CPU
-		{8C593467-E54D-4FA7-881C-78F3CC48A867}.x86 Debug|x86.Build.0 = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Debug|ARM.Build.0 = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Debug|x64.Build.0 = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Debug|x86.Build.0 = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Release|ARM.ActiveCfg = Release|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Release|ARM.Build.0 = Release|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Release|ARM64.Build.0 = Release|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Release|x64.ActiveCfg = Release|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Release|x64.Build.0 = Release|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Release|x86.ActiveCfg = Release|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.Release|x86.Build.0 = Release|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.x86 Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.x86 Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.x86 Debug|ARM.ActiveCfg = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.x86 Debug|ARM.Build.0 = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.x86 Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.x86 Debug|ARM64.Build.0 = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.x86 Debug|x64.ActiveCfg = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.x86 Debug|x64.Build.0 = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.x86 Debug|x86.ActiveCfg = Debug|Any CPU
-		{43929D8F-5630-4786-B75D-E203EA3E992F}.x86 Debug|x86.Build.0 = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Debug|ARM.Build.0 = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Debug|x64.Build.0 = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Debug|x86.Build.0 = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Release|Any CPU.Build.0 = Release|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Release|ARM.ActiveCfg = Release|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Release|ARM.Build.0 = Release|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Release|ARM64.Build.0 = Release|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Release|x64.ActiveCfg = Release|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Release|x64.Build.0 = Release|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Release|x86.ActiveCfg = Release|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.Release|x86.Build.0 = Release|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.x86 Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.x86 Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.x86 Debug|ARM.ActiveCfg = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.x86 Debug|ARM.Build.0 = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.x86 Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.x86 Debug|ARM64.Build.0 = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.x86 Debug|x64.ActiveCfg = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.x86 Debug|x64.Build.0 = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.x86 Debug|x86.ActiveCfg = Debug|Any CPU
-		{94E97F70-CACD-453B-8114-08DFFDDA5A46}.x86 Debug|x86.Build.0 = Debug|Any CPU
+		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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|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|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|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.sln.DotSettings.user

@@ -1,5 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/PencilsConfiguration/ActualSeverity/@EntryValue">WARNING</s:String>
-	<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD;
-  &lt;Assembly Path="D:\vs\ica\InkCanvasForClass\IAWinFX.dll" /&gt;&#xD;
-&lt;/AssemblyExplorer&gt;</s:String></wpf:ResourceDictionary>

Ink Canvas/App.xaml

@@ -1,20 +1,23 @@
-<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:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
+             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>
             <Style TargetType="ui:ScrollViewerEx">
                 <EventSetter Event="PreviewMouseWheel" Handler="ScrollViewer_PreviewMouseWheel"/>
             </Style>
-            <ContextMenu Opened="SysTrayMenu_Opened" x:Shared="false" x:Key="SysTrayMenu" Padding="6" ui:ThemeManager.RequestedTheme="Light">
+            <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">
@@ -30,12 +33,42 @@
                         </Image>
                     </MenuItem.Icon>
                 </MenuItem>
-                <Separator Margin="0,3" />
-                <MenuItem>
+                <MenuItem Name="TempShowMainWindowTrayIconMenuItem" Click="TempShowMainWindowTrayIconMenuItem_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="{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>
+                        <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">
@@ -53,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>
@@ -63,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">
@@ -86,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>
@@ -96,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>
@@ -131,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>
@@ -141,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">
@@ -162,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>
@@ -172,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">
@@ -194,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>
@@ -204,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">
@@ -230,13 +263,12 @@
                             ToolTipText="InkCanvasForClass"
                             ContextMenu="{StaticResource SysTrayMenu}"
                             IconSource="/Resources/icc.ico"/>
-                <ResourceDictionary.MergedDictionaries>
-                <ui:ThemeResources RequestedTheme="Light"/>
+            <ResourceDictionary.MergedDictionaries>
+                <ui:ThemeResources/>
                 <ui:XamlControlsResources />
                 <ResourceDictionary Source="Resources/SeewoImageDictionary.xaml"/>
                 <ResourceDictionary Source="Resources/DrawShapeImageDictionary.xaml"/>
                 <ResourceDictionary Source="Resources/IconImageDictionary.xaml"/>
-                <ResourceDictionary Source="Resources/Styles/Light.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

Ink Canvas/AssemblyInfo.cs

@@ -1,16 +1,17 @@
-using System.Reflection;
+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.
 [assembly: AssemblyTitle("InkCanvasForClass")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Dubi906w")]
+[assembly: AssemblyCompany("CJK_mkp")]
 [assembly: AssemblyProduct("InkCanvasForClass")]
-[assembly: AssemblyCopyright("Copyright © HARKOTEK Studio 2024")]
+[assembly: AssemblyCopyright("Copyright © CJK_mkp 2025-2026")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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("5.0.2.0")]
-[assembly: AssemblyFileVersion("5.0.2.0")]
+[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

@@ -0,0 +1,77 @@
+<UserControl x:Class="Ink_Canvas.Controls.QuickDrawFloatingButtonControl"
+             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"
+             mc:Ignorable="d"
+             Width="65" Height="45">
+    
+    <Border Background="{DynamicResource QuickDrawFloatingButtonBackground}" 
+            CornerRadius="8" 
+            BorderThickness="1" 
+            BorderBrush="{DynamicResource QuickDrawFloatingButtonBorderBrush}">
+        <Border.Effect>
+            <DropShadowEffect Color="Black" Direction="315" ShadowDepth="3" Opacity="0.3" BlurRadius="5"/>
+        </Border.Effect>
+        
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="22"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            
+            <!-- 拖动区域 -->
+            <Border Grid.Column="0" 
+                    MouseLeftButtonDown="DragArea_MouseLeftButtonDown"
+                    MouseMove="DragArea_MouseMove"
+                    MouseLeftButtonUp="DragArea_MouseLeftButtonUp"
+                    Cursor="SizeAll"
+                    Background="Transparent">
+                <Grid VerticalAlignment="Center" Height="14" IsHitTestVisible="False">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="4"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="4"/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
+                    
+                    <!-- 三个白色横线 -->
+                    <Border Grid.Row="0" Background="{DynamicResource QuickDrawFloatingButtonIconForeground}" Height="2" Width="10" 
+                            HorizontalAlignment="Center" 
+                            CornerRadius="1" Opacity="0.8" IsHitTestVisible="False"/>
+                    <Border Grid.Row="2" Background="{DynamicResource QuickDrawFloatingButtonIconForeground}" Height="2" Width="10" 
+                            HorizontalAlignment="Center" 
+                            CornerRadius="1" Opacity="0.8" IsHitTestVisible="False"/>
+                    <Border Grid.Row="4" Background="{DynamicResource QuickDrawFloatingButtonIconForeground}" Height="2" Width="10" 
+                            HorizontalAlignment="Center" 
+                            CornerRadius="1" Opacity="0.8" IsHitTestVisible="False"/>
+                </Grid>
+            </Border>
+            
+            <!-- 半透明分割线 -->
+            <Rectangle Grid.Column="1" Width="1" Fill="#20FFFFFF" Margin="0,8,0,8"/>
+            
+            <!-- 按钮区域 -->
+            <Border Grid.Column="2" 
+                    MouseLeftButtonDown="FloatingButton_Click" 
+                    Cursor="Hand"
+                    Background="Transparent">
+                <Grid IsHitTestVisible="False">
+                    <Path Data="M5 7C5 8.06087 5.42143 9.07828 6.17157 9.82843C6.92172 10.5786 7.93913 11 9 11C10.0609 11 11.0783 10.5786 11.8284 9.82843C12.5786 9.07828 13 8.06087 13 7C13 5.93913 12.5786 4.92172 11.8284 4.17157C11.0783 3.42143 10.0609 3 9 3C7.93913 3 6.92172 3.42143 6.17157 4.17157C5.42143 4.92172 5 5.93913 5 7Z M3 21V19C3 17.9391 3.42143 16.9217 4.17157 16.1716C4.92172 15.4214 5.93913 15 7 15H11C12.0609 15 13.0783 15.4214 13.8284 16.1716C14.5786 16.9217 15 17.9391 15 19V21 M16 3.13C16.8604 3.35031 17.623 3.85071 18.1676 4.55232C18.7122 5.25392 19.0078 6.11683 19.0078 7.005C19.0078 7.89318 18.7122 8.75608 18.1676 9.45769C17.623 10.1593 16.8604 10.6597 16 10.88 M21 21V19C20.9949 18.1172 20.6979 17.2608 20.1553 16.5644C19.6126 15.868 18.8548 15.3707 18 15.15" 
+                          Stroke="{DynamicResource QuickDrawFloatingButtonIconForeground}" 
+                          StrokeThickness="2" 
+                          StrokeLineJoin="Round" 
+                          Fill="Transparent" 
+                          Width="20" Height="20" 
+                          Stretch="Uniform" 
+                          HorizontalAlignment="Center" 
+                          VerticalAlignment="Center"
+                          IsHitTestVisible="False"/>
+                </Grid>
+            </Border>
+        </Grid>
+    </Border>
+</UserControl>
+

Ink Canvas/Controls/QuickDrawFloatingButtonControl.xaml.cs

@@ -0,0 +1,148 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Threading;
+using HorizontalAlignment = System.Windows.HorizontalAlignment;
+using MouseEventArgs = System.Windows.Input.MouseEventArgs;
+using VerticalAlignment = System.Windows.VerticalAlignment;
+
+namespace Ink_Canvas.Controls
+{
+    /// <summary>
+    /// 快抽悬浮按钮控件
+    /// </summary>
+    public partial class QuickDrawFloatingButtonControl : UserControl
+    {
+        private bool _isDragging = false;
+        private Point _dragStartPoint;
+        private Point _controlStartPoint;
+
+        public QuickDrawFloatingButtonControl()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// 快抽按钮点击事件
+        /// </summary>
+        private void FloatingButton_Click(object sender, MouseButtonEventArgs e)
+        {
+            try
+            {
+                // 如果正在拖动，不触发点击事件
+                if (_isDragging) return;
+
+                // 打开快抽窗口
+                var quickDrawWindow = new QuickDrawWindow();
+                quickDrawWindow.ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                Helpers.LogHelper.WriteLogToFile($"打开快抽窗口失败: {ex.Message}", Helpers.LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 拖动区域鼠标按下事件
+        /// </summary>
+        private void DragArea_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            _isDragging = false;
+
+            // 记录鼠标在屏幕上的初始位置
+            _dragStartPoint = this.PointToScreen(e.GetPosition(this));
+
+            // 记录控件的初始位置
+            var parent = this.Parent as FrameworkElement;
+            if (parent != null)
+            {
+                var transform = this.TransformToVisual(parent);
+                var currentPos = transform.Transform(new Point(0, 0));
+                _controlStartPoint = currentPos;
+            }
+            else
+            {
+                var currentMargin = this.Margin;
+                _controlStartPoint = new Point(
+                    double.IsNaN(currentMargin.Left) ? 0 : currentMargin.Left,
+                    double.IsNaN(currentMargin.Top) ? 0 : currentMargin.Top);
+            }
+
+            ((UIElement)sender).CaptureMouse();
+            e.Handled = true;
+        }
+
+        /// <summary>
+        /// 拖动区域鼠标移动事件
+        /// </summary>
+        private void DragArea_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (e.LeftButton == MouseButtonState.Pressed && ((UIElement)sender).IsMouseCaptured)
+            {
+                // 获取鼠标在屏幕上的当前位置
+                Point currentScreenPoint = this.PointToScreen(e.GetPosition(this));
+                Vector diff = currentScreenPoint - _dragStartPoint;
+
+                if (!_isDragging && (Math.Abs(diff.X) > 3 || Math.Abs(diff.Y) > 3))
+                {
+                    _isDragging = true;
+                    // 切换到绝对定位模式
+                    this.HorizontalAlignment = HorizontalAlignment.Left;
+                    this.VerticalAlignment = VerticalAlignment.Top;
+                }
+
+                if (_isDragging)
+                {
+                    // 计算新位置
+                    var parent = this.Parent as FrameworkElement;
+                    if (parent != null)
+                    {
+                        // 计算屏幕坐标相对于父容器的位置
+                        var parentPoint = parent.PointFromScreen(currentScreenPoint);
+                        var startParentPoint = parent.PointFromScreen(_dragStartPoint);
+
+                        // 计算相对于初始位置的偏移
+                        double offsetX = parentPoint.X - startParentPoint.X;
+                        double offsetY = parentPoint.Y - startParentPoint.Y;
+
+                        // 新位置 = 初始位置 + 偏移
+                        double newLeft = _controlStartPoint.X + offsetX;
+                        double newTop = _controlStartPoint.Y + offsetY;
+
+                        // 限制在父容器范围内
+                        newLeft = Math.Max(0, Math.Min(newLeft, parent.ActualWidth - this.ActualWidth));
+                        newTop = Math.Max(0, Math.Min(newTop, parent.ActualHeight - this.ActualHeight));
+
+                        // 更新Margin
+                        this.Margin = new Thickness(newLeft, newTop, 0, 0);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 拖动区域鼠标释放事件
+        /// </summary>
+        private void DragArea_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            if (((UIElement)sender).IsMouseCaptured)
+            {
+                ((UIElement)sender).ReleaseMouseCapture();
+            }
+
+            if (_isDragging)
+            {
+                Dispatcher.BeginInvoke(new Action(() => { _isDragging = false; }),
+                    DispatcherPriority.Background);
+            }
+            else
+            {
+                _isDragging = false;
+            }
+
+            e.Handled = true;
+        }
+    }
+}
+

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/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <Costura ExcludeAssemblies="IACore|IALoader|IAWinFX" />
+</Weavers>

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

@@ -0,0 +1,225 @@
+using Newtonsoft.Json;
+using System;
+using System.IO;
+using System.Linq;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 自动备份管理器
+    /// 负责管理配置文件的自动备份功能
+    /// </summary>
+    public static class AutoBackupManager
+    {
+        private static readonly string BackupDir = Path.Combine(App.RootPath, "Backups");
+        private static readonly string SettingsFile = Path.Combine(App.RootPath, "Configs", "Settings.json");
+        private static readonly string BackupPrefix = "Settings_AutoBackup_";
+
+        /// <summary>
+        /// 检查是否需要执行自动备份
+        /// </summary>
+        /// <param name="settings">设置对象</param>
+        /// <returns>如果需要备份返回<see langword="true"/>，否则返回<see langword="false"/></returns>
+        public static bool ShouldPerformAutoBackup(Settings settings)
+        {
+            try
+            {
+                // 如果自动备份功能未启用，不执行备份
+                if (!settings.Advanced.IsAutoBackupEnabled)
+                {
+                    return false;
+                }
+
+                // 如果从未备份过，需要创建首次备份
+                if (settings.Advanced.LastAutoBackupTime == DateTime.MinValue)
+                {
+                    return true;
+                }
+
+                // 检查是否已超过备份间隔
+                var daysSinceLastBackup = (DateTime.Now - settings.Advanced.LastAutoBackupTime).TotalDays;
+                return daysSinceLastBackup >= settings.Advanced.AutoBackupIntervalDays;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"检查自动备份条件时出错: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 执行自动备份
+        /// </summary>
+        /// <remarks>
+        /// 为主配置文件创建一次自动备份并在成功后更新并保存设置中的最后备份时间。
+        /// </remarks>
+        /// <param name="settings">应用的设置对象；在成功备份后会更新 settings.Advanced.LastAutoBackupTime 并调用保存操作。</param>
+        /// <returns><see langword="true"/> 表示备份成功，<see langword="false"/> 表示备份失败或被跳过。</returns>
+        public static bool PerformAutoBackup(Settings settings)
+        {
+            try
+            {
+                // 确保备份目录存在
+                if (!Directory.Exists(BackupDir))
+                {
+                    ProcessProtectionManager.WithWriteAccess(BackupDir, () => Directory.CreateDirectory(BackupDir));
+                }
+
+                // 检查主配置文件是否存在
+                if (!File.Exists(SettingsFile))
+                {
+                    LogHelper.WriteLogToFile("主配置文件不存在，跳过自动备份", LogHelper.LogType.Warning);
+                    return false;
+                }
+
+                // 创建备份文件名（使用当前日期时间）
+                string backupFileName = $"{BackupPrefix}{DateTime.Now:yyyyMMdd_HHmmss}.json";
+                string backupPath = Path.Combine(BackupDir, backupFileName);
+
+                // 复制主配置文件到备份位置
+                ProcessProtectionManager.WithWriteAccess(backupPath, () => File.Copy(SettingsFile, backupPath, true));
+
+                // 更新最后备份时间
+                settings.Advanced.LastAutoBackupTime = DateTime.Now;
+                MainWindow.SaveSettingsToFile();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"执行自动备份时出错: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 尝试从备份恢复配置文件
+        /// </summary>
+        /// <remarks>
+        /// 从最新可用的自动备份恢复主设置文件（Settings.json）。如果当前设置文件存在，会先将其复制到备份目录并加上时间戳作为“损坏”的备份副本，然后用最新备份覆盖原文件。
+        /// </remarks>
+        /// <returns><see langword="true"/> 如果恢复成功，<see langword="false"/> 否则。</returns>
+        public static bool TryRestoreFromBackup()
+        {
+            try
+            {
+                // 确保备份目录存在
+                if (!Directory.Exists(BackupDir))
+                {
+                    LogHelper.WriteLogToFile("备份目录不存在，无法从备份恢复", LogHelper.LogType.Warning);
+                    return false;
+                }
+
+                // 查找最新的备份文件
+                var backupFiles = Directory.GetFiles(BackupDir, $"{BackupPrefix}*.json")
+                    .OrderByDescending(f => File.GetCreationTime(f))
+                    .ToArray();
+
+                if (backupFiles.Length == 0)
+                {
+                    LogHelper.WriteLogToFile("没有找到可用的备份文件", LogHelper.LogType.Warning);
+                    return false;
+                }
+
+                // 尝试使用最新的备份文件
+                string latestBackup = backupFiles[0];
+
+                // 验证备份文件是否有效
+                try
+                {
+                    string backupJson = File.ReadAllText(latestBackup);
+                    var testSettings = JsonConvert.DeserializeObject<Settings>(backupJson);
+                    if (testSettings == null)
+                    {
+                        LogHelper.WriteLogToFile("备份文件内容无效，无法恢复", LogHelper.LogType.Error);
+                        return false;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"备份文件验证失败: {ex.Message}", LogHelper.LogType.Error);
+                    return false;
+                }
+
+                // 备份当前损坏的配置文件（如果存在）
+                if (File.Exists(SettingsFile))
+                {
+                    string corruptedBackup = Path.Combine(BackupDir, $"Settings_Corrupted_{DateTime.Now:yyyyMMdd_HHmmss}.json");
+                    ProcessProtectionManager.WithWriteAccess(corruptedBackup, () => File.Copy(SettingsFile, corruptedBackup, true));
+                }
+
+                // 从备份恢复配置文件
+                ProcessProtectionManager.WithWriteAccess(SettingsFile, () => File.Copy(latestBackup, SettingsFile, true));
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"从备份恢复配置文件时出错: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 清理过期的备份文件
+        /// 保留最近30天的备份文件
+        /// </summary>
+        /// <remarks>
+        /// 删除备份目录中按“备份前缀”匹配且创建时间早于 30 天的自动备份文件（即自动备份文件的命名前缀），不会删除诸如 Settings_Corrupted_*.json 之类的其他备份或错误状态文件。
+        /// 如果备份目录不存在则不执行任何操作；删除操作在受写入保护的上下文中执行，任何错误会被记录但不会抛出异常。
+        /// </remarks>
+        public static void CleanupOldBackups()
+        {
+            try
+            {
+                if (!Directory.Exists(BackupDir))
+                {
+                    return;
+                }
+
+                var cutoffDate = DateTime.Now.AddDays(-30);
+                var backupFiles = Directory.GetFiles(BackupDir, $"{BackupPrefix}*.json");
+
+                int deletedCount = 0;
+                foreach (var file in backupFiles)
+                {
+                    if (File.GetCreationTime(file) < cutoffDate)
+                    {
+                        ProcessProtectionManager.WithWriteAccess(file, () => File.Delete(file));
+                        deletedCount++;
+                    }
+                }
+
+                if (deletedCount > 0)
+                {
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"清理过期备份文件时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 初始化自动备份功能
+        /// 在应用程序启动时调用
+        /// </summary>
+        /// <param name="settings">设置对象</param>
+        public static void Initialize(Settings settings)
+        {
+            try
+            {
+                // 检查是否需要执行自动备份
+                if (ShouldPerformAutoBackup(settings))
+                {
+                    PerformAutoBackup(settings);
+                }
+
+                // 清理过期备份
+                CleanupOldBackups();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"初始化自动备份功能时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,209 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Forms;
+using System.Windows.Interop;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 防止窗口进入全屏状态的辅助类
+    /// </summary>
+    public static class AvoidFullScreenHelper
+    {
+        private static readonly DependencyProperty IsAvoidFullScreenEnabledProperty =
+            DependencyProperty.RegisterAttached(
+                "IsAvoidFullScreenEnabled",
+                typeof(bool),
+                typeof(AvoidFullScreenHelper));
+
+        private static bool _isBoardMode;
+        public static void SetBoardMode(bool isBoardMode)
+        {
+            _isBoardMode = isBoardMode;
+        }
+
+        public static void StartAvoidFullScreen(Window window)
+        {
+            if (window == null)
+                throw new ArgumentNullException(nameof(window));
+
+            if (!(bool)window.GetValue(IsAvoidFullScreenEnabledProperty))
+            {
+                var hwndSource = PresentationSource.FromVisual(window) as HwndSource;
+                if (hwndSource != null)
+                {
+                    hwndSource.AddHook(KeepInWorkingAreaHook);
+                    window.SetValue(IsAvoidFullScreenEnabledProperty, true);
+                }
+            }
+        }
+
+        public static void StopAvoidFullScreen(Window window)
+        {
+            if (window == null)
+                throw new ArgumentNullException(nameof(window));
+
+            if ((bool)window.GetValue(IsAvoidFullScreenEnabledProperty))
+            {
+                var hwndSource = PresentationSource.FromVisual(window) as HwndSource;
+                if (hwndSource != null)
+                {
+                    hwndSource.RemoveHook(KeepInWorkingAreaHook);
+                    window.ClearValue(IsAvoidFullScreenEnabledProperty);
+                }
+            }
+        }
+
+        public static bool GetIsAvoidFullScreenEnabled(DependencyObject obj) => (bool)obj.GetValue(IsAvoidFullScreenEnabledProperty);
+        public static void SetIsAvoidFullScreenEnabled(DependencyObject obj, bool value) => obj.SetValue(IsAvoidFullScreenEnabledProperty, value);
+
+        private static IntPtr KeepInWorkingAreaHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            // 只拦截主画布窗口的全屏（最大化）操作
+            var window = HwndSource.FromHwnd(hwnd)?.RootVisual as Window;
+            if (window == null) return IntPtr.Zero;
+            // 这里假设主画布窗口类名为MainWindow（如有不同请调整）
+            if (window.GetType().Name != "MainWindow") return IntPtr.Zero;
+
+            if (_isBoardMode)
+            {
+                // 画板模式下允许全屏/最大化，不拦截
+                return IntPtr.Zero;
+            }
+            const int WM_WINDOWPOSCHANGING = 0x0046;
+            const int WM_SYSCOMMAND = 0x0112;
+            const int SC_MAXIMIZE = 0xF030;
+            if (msg == WM_SYSCOMMAND && wParam.ToInt32() == SC_MAXIMIZE)
+            {
+                // 拦截最大化命令，强制还原窗口并调整到工作区
+                window.WindowState = WindowState.Normal;
+                var workingArea = GetWorkingArea(new Rect(window.Left, window.Top, window.Width, window.Height));
+                window.Left = workingArea.Left;
+                window.Top = workingArea.Top;
+                window.Width = workingArea.Width;
+                window.Height = workingArea.Height;
+                handled = true;
+                return IntPtr.Zero;
+            }
+            if (msg != WM_WINDOWPOSCHANGING)
+                return IntPtr.Zero;
+
+            try
+            {
+                var pos = (WindowPosition)Marshal.PtrToStructure(lParam, typeof(WindowPosition));
+                if ((pos.Flags & (WindowPositionFlags.SWP_NOMOVE | WindowPositionFlags.SWP_NOSIZE)) != 0)
+                    return IntPtr.Zero;
+                // 只处理主画布窗口
+                // 计算目标矩形
+                var targetRect = new Rect(
+                    (pos.Flags & WindowPositionFlags.SWP_NOMOVE) == 0 ? pos.X : window.Left,
+                    (pos.Flags & WindowPositionFlags.SWP_NOMOVE) == 0 ? pos.Y : window.Top,
+                    (pos.Flags & WindowPositionFlags.SWP_NOSIZE) == 0 ? pos.Width : window.Width,
+                    (pos.Flags & WindowPositionFlags.SWP_NOSIZE) == 0 ? pos.Height : window.Height);
+                var workingArea = GetWorkingArea(targetRect);
+                var adjustedRect = AdjustRectToWorkingArea(targetRect, workingArea);
+                pos.X = (int)adjustedRect.Left;
+                pos.Y = (int)adjustedRect.Top;
+                pos.Width = (int)adjustedRect.Width;
+                pos.Height = (int)adjustedRect.Height;
+                pos.Flags &= ~(WindowPositionFlags.SWP_NOSIZE | WindowPositionFlags.SWP_NOMOVE | WindowPositionFlags.SWP_NOREDRAW);
+                pos.Flags |= WindowPositionFlags.SWP_NOCOPYBITS;
+                Marshal.StructureToPtr(pos, lParam, false);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"窗口位置调整失败: {ex.Message}");
+            }
+            return IntPtr.Zero;
+        }
+
+        private static Rect GetWorkingArea(Rect windowRect)
+        {
+            // 获取所有显示器
+            var screens = Screen.AllScreens;
+
+            // 确定窗口主要位于哪个显示器上
+            Screen targetScreen = null;
+            double maxIntersection = 0;
+
+            foreach (var screen in screens)
+            {
+                var screenRect = new Rect(
+                    screen.WorkingArea.X,
+                    screen.WorkingArea.Y,
+                    screen.WorkingArea.Width,
+                    screen.WorkingArea.Height);
+
+                var intersection = Rect.Intersect(windowRect, screenRect);
+                if (intersection.Width * intersection.Height > maxIntersection)
+                {
+                    maxIntersection = intersection.Width * intersection.Height;
+                    targetScreen = screen;
+                }
+            }
+
+            // 如果没找到，使用主显示器
+            if (targetScreen == null)
+                targetScreen = Screen.PrimaryScreen;
+
+            return new Rect(
+                targetScreen.WorkingArea.X,
+                targetScreen.WorkingArea.Y,
+                targetScreen.WorkingArea.Width,
+                targetScreen.WorkingArea.Height);
+        }
+
+        private static Rect AdjustRectToWorkingArea(Rect windowRect, Rect workingArea)
+        {
+            // 调整尺寸以适应工作区域
+            if (windowRect.Width > workingArea.Width)
+                windowRect.Width = workingArea.Width;
+
+            if (windowRect.Height > workingArea.Height)
+                windowRect.Height = workingArea.Height;
+
+            // 调整位置以确保窗口完全在工作区域内
+            if (windowRect.Left < workingArea.Left)
+                windowRect.X = workingArea.Left;
+            else if (windowRect.Right > workingArea.Right)
+                windowRect.X = workingArea.Right - windowRect.Width;
+
+            if (windowRect.Top < workingArea.Top)
+                windowRect.Y = workingArea.Top;
+            else if (windowRect.Bottom > workingArea.Bottom)
+                windowRect.Y = workingArea.Bottom - windowRect.Height;
+
+            return windowRect;
+        }
+    }
+
+    // 使用WPF原生类型替代Win32结构
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct WindowPosition
+    {
+        public IntPtr Hwnd;
+        public IntPtr HwndInsertAfter;
+        public int X;
+        public int Y;
+        public int Width;
+        public int Height;
+        public WindowPositionFlags Flags;
+    }
+
+    [Flags]
+    internal enum WindowPositionFlags : uint
+    {
+        SWP_NOSIZE = 0x0001,
+        SWP_NOMOVE = 0x0002,
+        SWP_NOZORDER = 0x0004,
+        SWP_NOREDRAW = 0x0008,
+        SWP_NOACTIVATE = 0x0010,
+        SWP_FRAMECHANGED = 0x0020,
+        SWP_SHOWWINDOW = 0x0040,
+        SWP_HIDEWINDOW = 0x0080,
+        SWP_NOCOPYBITS = 0x0100,
+        SWP_NOOWNERZORDER = 0x0200,
+        SWP_NOSENDCHANGING = 0x0400,
+    }
+}

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

@@ -0,0 +1,424 @@
+using AForge.Video;
+using AForge.Video.DirectShow;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Linq;
+using System.Windows.Media.Imaging;
+using System.Windows.Threading;
+
+namespace Ink_Canvas.Helpers
+{
+    public class CameraService : IDisposable
+    {
+        private VideoCaptureDevice _videoSource;
+        private bool _isCapturing;
+        private Bitmap _currentFrame;
+        private readonly object _frameLock = new object();
+        private Dispatcher _dispatcher;
+
+        // 新增属性
+        private int _rotationAngle = 0; // 0=0度，1=90度，2=180度，3=270度
+        private int _resolutionWidth = 640;
+        private int _resolutionHeight = 480;
+
+        public event EventHandler<Bitmap> FrameReceived;
+        public event EventHandler<string> ErrorOccurred;
+
+        public bool IsCapturing => _isCapturing;
+        public List<FilterInfo> AvailableCameras { get; private set; }
+        public FilterInfo CurrentCamera { get; private set; }
+
+        // 新增属性
+        public int RotationAngle
+        {
+            get => _rotationAngle;
+            set => _rotationAngle = Math.Max(0, Math.Min(3, value));
+        }
+
+        public int ResolutionWidth
+        {
+            get => _resolutionWidth;
+            set => _resolutionWidth = Math.Max(320, Math.Min(3840, value));
+        }
+
+        public int ResolutionHeight
+        {
+            get => _resolutionHeight;
+            set => _resolutionHeight = Math.Max(240, Math.Min(2160, value));
+        }
+
+        public CameraService()
+        {
+            _dispatcher = Dispatcher.CurrentDispatcher;
+            AvailableCameras = new List<FilterInfo>();
+            RefreshCameraList();
+        }
+
+        public CameraService(int rotationAngle, int resolutionWidth, int resolutionHeight)
+        {
+            _dispatcher = Dispatcher.CurrentDispatcher;
+            AvailableCameras = new List<FilterInfo>();
+            _rotationAngle = rotationAngle;
+            _resolutionWidth = resolutionWidth;
+            _resolutionHeight = resolutionHeight;
+            RefreshCameraList();
+        }
+
+        /// <summary>
+        /// 刷新可用摄像头列表
+        /// </summary>
+        public void RefreshCameraList()
+        {
+            try
+            {
+                AvailableCameras.Clear();
+                var videoDevices = new FilterInfoCollection(FilterCategory.VideoInputDevice);
+
+                foreach (FilterInfo device in videoDevices)
+                {
+                    AvailableCameras.Add(device);
+                }
+
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"刷新摄像头列表失败: {ex.Message}", LogHelper.LogType.Error);
+                ErrorOccurred?.Invoke(this, $"刷新摄像头列表失败: {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 开始摄像头预览
+        /// </summary>
+        /// <param name="cameraIndex">摄像头索引</param>
+        public bool StartPreview(int cameraIndex = 0)
+        {
+            try
+            {
+                if (AvailableCameras.Count == 0)
+                {
+                    RefreshCameraList();
+                    if (AvailableCameras.Count == 0)
+                    {
+                        ErrorOccurred?.Invoke(this, "未找到可用的摄像头设备");
+                        return false;
+                    }
+                }
+
+                if (cameraIndex < 0 || cameraIndex >= AvailableCameras.Count)
+                {
+                    ErrorOccurred?.Invoke(this, "摄像头索引超出范围");
+                    return false;
+                }
+
+                // 停止当前预览
+                StopPreview();
+
+                CurrentCamera = AvailableCameras[cameraIndex];
+                _videoSource = new VideoCaptureDevice(CurrentCamera.MonikerString);
+
+                // 设置视频源事件处理
+                _videoSource.NewFrame += VideoSource_NewFrame;
+
+                // 启动视频源
+                _videoSource.Start();
+
+                _isCapturing = true;
+                LogHelper.WriteLogToFile($"开始摄像头预览: {CurrentCamera.Name}");
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"启动摄像头预览失败: {ex.Message}", LogHelper.LogType.Error);
+                ErrorOccurred?.Invoke(this, $"启动摄像头预览失败: {ex.Message}");
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 停止摄像头预览
+        /// </summary>
+        public void StopPreview()
+        {
+            try
+            {
+                if (_videoSource != null && _videoSource.IsRunning)
+                {
+                    _videoSource.SignalToStop();
+                    _videoSource.WaitForStop();
+                    _videoSource.NewFrame -= VideoSource_NewFrame;
+                    _videoSource = null;
+                }
+
+                _isCapturing = false;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"停止摄像头预览失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 切换到指定摄像头
+        /// </summary>
+        /// <param name="cameraIndex">摄像头索引</param>
+        public bool SwitchCamera(int cameraIndex)
+        {
+            try
+            {
+                if (cameraIndex < 0 || cameraIndex >= AvailableCameras.Count)
+                {
+                    ErrorOccurred?.Invoke(this, "摄像头索引超出范围");
+                    return false;
+                }
+
+                return StartPreview(cameraIndex);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"切换摄像头失败: {ex.Message}", LogHelper.LogType.Error);
+                ErrorOccurred?.Invoke(this, $"切换摄像头失败: {ex.Message}");
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 获取当前帧的BitmapSource（WPF格式），直接返回可用的WPF位图
+        /// </summary>
+        public BitmapSource GetCurrentFrameAsBitmapSource()
+        {
+            lock (_frameLock)
+            {
+                if (_currentFrame == null)
+                    return null;
+
+                try
+                {
+                    // 验证位图有效性
+                    if (_currentFrame.Width <= 0 || _currentFrame.Height <= 0)
+                        return null;
+
+                    // 使用更安全的方法转换位图
+                    var bitmapData = _currentFrame.LockBits(
+                        new Rectangle(0, 0, _currentFrame.Width, _currentFrame.Height),
+                        ImageLockMode.ReadOnly,
+                        _currentFrame.PixelFormat);
+
+                    try
+                    {
+                        // 根据像素格式选择合适的WPF像素格式
+                        System.Windows.Media.PixelFormat wpfPixelFormat;
+                        switch (_currentFrame.PixelFormat)
+                        {
+                            case PixelFormat.Format24bppRgb:
+                                wpfPixelFormat = System.Windows.Media.PixelFormats.Bgr24;
+                                break;
+                            case PixelFormat.Format32bppArgb:
+                                wpfPixelFormat = System.Windows.Media.PixelFormats.Bgra32;
+                                break;
+                            case PixelFormat.Format32bppRgb:
+                                wpfPixelFormat = System.Windows.Media.PixelFormats.Bgr32;
+                                break;
+                            default:
+                                wpfPixelFormat = System.Windows.Media.PixelFormats.Bgr24;
+                                break;
+                        }
+
+                        var bitmapSource = BitmapSource.Create(
+                            bitmapData.Width,
+                            bitmapData.Height,
+                            _currentFrame.HorizontalResolution,
+                            _currentFrame.VerticalResolution,
+                            wpfPixelFormat,
+                            null,
+                            bitmapData.Scan0,
+                            bitmapData.Stride * bitmapData.Height,
+                            bitmapData.Stride);
+
+                        bitmapSource.Freeze();
+                        return bitmapSource;
+                    }
+                    finally
+                    {
+                        _currentFrame.UnlockBits(bitmapData);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"转换帧为BitmapSource失败: {ex.Message}", LogHelper.LogType.Error);
+                    return null;
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// 视频源新帧事件处理
+        /// </summary>
+        private void VideoSource_NewFrame(object sender, NewFrameEventArgs eventArgs)
+        {
+            try
+            {
+                lock (_frameLock)
+                {
+                    // 释放之前的帧
+                    _currentFrame?.Dispose();
+
+                    // 创建新的位图，避免Clone的问题
+                    var sourceFrame = eventArgs.Frame;
+
+                    if (sourceFrame != null)
+                    {
+                        try
+                        {
+                            var width = sourceFrame.Width;
+                            var height = sourceFrame.Height;
+
+                            if (width > 0 && height > 0)
+                            {
+                                // 应用旋转
+                                Bitmap rotatedFrame = ApplyRotation(sourceFrame);
+
+                                int targetWidth = _resolutionWidth;
+                                int targetHeight = _resolutionHeight;
+
+                                if (_rotationAngle == 1 || _rotationAngle == 3)
+                                {
+                                    targetWidth = _resolutionHeight;
+                                    targetHeight = _resolutionWidth;
+                                }
+
+                                _currentFrame = ResizeImageWithAspectRatio(rotatedFrame, targetWidth, targetHeight);
+
+                                rotatedFrame?.Dispose();
+                            }
+                            else
+                            {
+                                _currentFrame = null;
+                            }
+                        }
+                        catch (Exception frameEx)
+                        {
+                            LogHelper.WriteLogToFile($"处理源帧失败: {frameEx.Message}", LogHelper.LogType.Error);
+                            _currentFrame = null;
+                        }
+                    }
+                    else
+                    {
+                        _currentFrame = null;
+                    }
+                }
+
+                // 在UI线程中触发事件
+                _dispatcher.BeginInvoke(new Action(() =>
+                {
+                    FrameReceived?.Invoke(this, _currentFrame);
+                }));
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"处理新帧失败: {ex.Message}", LogHelper.LogType.Error);
+                ErrorOccurred?.Invoke(this, $"处理新帧失败: {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 获取摄像头名称列表
+        /// </summary>
+        public List<string> GetCameraNames()
+        {
+            return AvailableCameras.Select(camera => camera.Name).ToList();
+        }
+
+        /// <summary>
+        /// 检查是否有可用摄像头
+        /// </summary>
+        public bool HasAvailableCameras()
+        {
+            if (AvailableCameras.Count == 0)
+            {
+                RefreshCameraList();
+            }
+            return AvailableCameras.Count > 0;
+        }
+
+        /// <summary>
+        /// 应用旋转到图像
+        /// </summary>
+        private Bitmap ApplyRotation(Bitmap source)
+        {
+            if (_rotationAngle == 0)
+                return new Bitmap(source);
+
+            var rotationType = RotateFlipType.RotateNoneFlipNone;
+            switch (_rotationAngle)
+            {
+                case 1: rotationType = RotateFlipType.Rotate90FlipNone; break;
+                case 2: rotationType = RotateFlipType.Rotate180FlipNone; break;
+                case 3: rotationType = RotateFlipType.Rotate270FlipNone; break;
+            }
+
+            var rotated = new Bitmap(source);
+            rotated.RotateFlip(rotationType);
+            return rotated;
+        }
+
+        /// <summary>
+        /// 调整图像大小
+        /// </summary>
+        private Bitmap ResizeImageWithAspectRatio(Bitmap source, int targetWidth, int targetHeight)
+        {
+            if (source.Width == targetWidth && source.Height == targetHeight)
+                return new Bitmap(source);
+
+            double scaleX = (double)targetWidth / source.Width;
+            double scaleY = (double)targetHeight / source.Height;
+            double scale = Math.Min(scaleX, scaleY);
+
+            // 计算实际尺寸
+            int actualWidth = (int)(source.Width * scale);
+            int actualHeight = (int)(source.Height * scale);
+
+            var resized = new Bitmap(actualWidth, actualHeight, PixelFormat.Format24bppRgb);
+            using (var graphics = Graphics.FromImage(resized))
+            {
+                graphics.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic;
+                graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+                graphics.PixelOffsetMode = System.Drawing.Drawing2D.PixelOffsetMode.HighQuality;
+                graphics.DrawImage(source, 0, 0, actualWidth, actualHeight);
+            }
+            return resized;
+        }
+
+        /// <summary>
+        /// 调整图像大小
+        /// </summary>
+        private Bitmap ResizeImage(Bitmap source, int width, int height)
+        {
+            if (source.Width == width && source.Height == height)
+                return new Bitmap(source);
+
+            var resized = new Bitmap(width, height, PixelFormat.Format24bppRgb);
+            using (var graphics = Graphics.FromImage(resized))
+            {
+                graphics.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic;
+                graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+                graphics.PixelOffsetMode = System.Drawing.Drawing2D.PixelOffsetMode.HighQuality;
+                graphics.DrawImage(source, 0, 0, width, height);
+            }
+            return resized;
+        }
+
+        public void Dispose()
+        {
+            StopPreview();
+
+            lock (_frameLock)
+            {
+                _currentFrame?.Dispose();
+            }
+        }
+    }
+}

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

@@ -0,0 +1,179 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace Ink_Canvas.Converter
+{
+    public class BooleanToVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if ((bool)value)
+            {
+                return Visibility.Visible;
+            }
+
+            return Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if ((bool)value)
+            {
+                return Visibility.Visible;
+            }
+
+            return Visibility.Collapsed;
+        }
+    }
+    public class VisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            Visibility visibility = (Visibility)value;
+            if (visibility == Visibility.Visible)
+            {
+                return Visibility.Collapsed;
+            }
+
+            return Visibility.Visible;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            Visibility visibility = (Visibility)value;
+            if (visibility == Visibility.Visible)
+            {
+                return Visibility.Collapsed;
+            }
+
+            return Visibility.Visible;
+        }
+    }
+
+    public class IntNumberToString : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if ((double)value == 0)
+            {
+                return "无限制";
+            }
+
+            return ((double)value) + "人";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if ((double)value == 0)
+            {
+                return "无限制";
+            }
+
+            return ((double)value) + "人";
+        }
+    }
+
+    public class IntNumberToString2 : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if ((double)value == 0)
+            {
+                return "自动截图";
+            }
+
+            return ((double)value) + "条";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if ((double)value == 0)
+            {
+                return "自动截图";
+            }
+
+            return ((double)value) + "条";
+        }
+    }
+
+    public class IsEnabledToOpacityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            bool isChecked = (bool)value;
+            if (isChecked)
+            {
+                return 1d;
+            }
+
+            return 0.35;
+        }
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { throw new NotImplementedException(); }
+    }
+
+    public class InverseBooleanToVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if ((bool)value)
+            {
+                return Visibility.Collapsed;
+            }
+
+            return Visibility.Visible;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if ((bool)value)
+            {
+                return Visibility.Collapsed;
+            }
+
+            return Visibility.Visible;
+        }
+    }
+
+    public class RippleEffectTranslationConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is double d)
+            {
+                return -d / 2;
+            }
+            return 0.0;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return null;
+        }
+    }
+
+    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/DelAutoSavedFiles.cs

@@ -1,48 +1,64 @@
 using System;
 using System.IO;
-using System.Windows;
 
-namespace Ink_Canvas.Helpers {
-    internal class DelAutoSavedFiles {
-        public static void DeleteFilesOlder(string directoryPath, int daysThreshold) {
+namespace Ink_Canvas.Helpers
+{
+    internal class DelAutoSavedFiles
+    {
+        public static void DeleteFilesOlder(string directoryPath, int daysThreshold)
+        {
             string[] extensionsToDel = { ".icstk", ".png" };
-            if (Directory.Exists(directoryPath)) {
+            if (Directory.Exists(directoryPath))
+            {
                 // 获取目录中的所有子目录
                 string[] subDirectories = Directory.GetDirectories(directoryPath, "*", SearchOption.AllDirectories);
-                foreach (string subDirectory in subDirectories) {
-                    try {
+                foreach (string subDirectory in subDirectories)
+                {
+                    try
+                    {
                         // 获取子目录下的所有文件
                         string[] files = Directory.GetFiles(subDirectory);
-                        foreach (string filePath in files) {
+                        foreach (string filePath in files)
+                        {
                             // 获取文件的创建日期
                             DateTime creationDate = File.GetCreationTime(filePath);
                             // 获取文件的扩展名
                             string fileExtension = Path.GetExtension(filePath);
                             // 如果文件的创建日期早于指定天数且是要删除的扩展名，则删除文件
-                            if (creationDate < DateTime.Now.AddDays(-daysThreshold)) {
+                            if (creationDate < DateTime.Now.AddDays(-daysThreshold))
+                            {
                                 if (Array.Exists(extensionsToDel, ext => ext.Equals(fileExtension, StringComparison.OrdinalIgnoreCase))
-                                    || Path.GetFileName(filePath).Equals("Position", StringComparison.OrdinalIgnoreCase)) {
+                                    || Path.GetFileName(filePath).Equals("Position", StringComparison.OrdinalIgnoreCase))
+                                {
                                     File.Delete(filePath);
                                 }
                             }
                         }
-                    } catch (Exception ex) {
-                        LogHelper.WriteLogToFile("DelAutoSavedFiles | 处理文件时出错: " + ex.ToString(), LogHelper.LogType.Error);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile("DelAutoSavedFiles | 处理文件时出错: " + ex, LogHelper.LogType.Error);
                     }
                 }
 
-                try { // 递归删除空文件夹
+                try
+                { // 递归删除空文件夹
                     DeleteEmptyFolders(directoryPath);
-                } catch (Exception ex) {
-                    LogHelper.WriteLogToFile("DelAutoSavedFiles | 处理文件时出错: " + ex.ToString(), LogHelper.LogType.Error);
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile("DelAutoSavedFiles | 处理文件时出错: " + ex, LogHelper.LogType.Error);
                 }
             }
         }
 
-        private static void DeleteEmptyFolders(string directoryPath) {
-            foreach (string dir in Directory.GetDirectories(directoryPath)) {
+        private static void DeleteEmptyFolders(string directoryPath)
+        {
+            foreach (string dir in Directory.GetDirectories(directoryPath))
+            {
                 DeleteEmptyFolders(dir);
-                if (Directory.GetFiles(dir).Length == 0 && Directory.GetDirectories(dir).Length == 0) {
+                if (Directory.GetFiles(dir).Length == 0 && Directory.GetDirectories(dir).Length == 0)
+                {
                     Directory.Delete(dir, false);
                 }
             }

Ink Canvas/Helpers/DelayActionHelper.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Timers;
 
 namespace Ink_Canvas.Helpers
@@ -18,10 +14,13 @@ namespace Ink_Canvas.Helpers
         /// <param name="inv">同步的對象，一般傳入控件，不需要可null</param>
         public void DebounceAction(int timeMs, ISynchronizeInvoke inv, Action action)
         {
-            lock (this) {
-                if (_timerDebounce == null) {
+            lock (this)
+            {
+                if (_timerDebounce == null)
+                {
                     _timerDebounce = new Timer(timeMs) { AutoReset = false };
-                    _timerDebounce.Elapsed += (o, e) => {
+                    _timerDebounce.Elapsed += (o, e) =>
+                    {
                         _timerDebounce.Stop(); _timerDebounce.Close(); _timerDebounce = null;
                         InvokeAction(action, inv);
                     };

Ink Canvas/Helpers/DlassApiClient.cs

@@ -0,0 +1,484 @@
+using Newtonsoft.Json;
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// Dlass API 客户端，用于与服务端通信
+    /// </summary>
+    public class DlassApiClient : IDisposable
+    {
+        private const string DEFAULT_BASE_URL = "https://dlass.tech";
+        private readonly string _appId;
+        private readonly string _appSecret;
+        private readonly string _baseUrl;
+        private HttpClient _httpClient;
+        private string _accessToken;
+        private DateTime _tokenExpiresAt;
+
+        private string _userToken;
+
+        /// <summary>
+        /// 初始化 Dlass API 客户端
+        /// </summary>
+        /// <param name="appId">应用ID</param>
+        /// <param name="appSecret">应用密钥</param>
+        /// <param name="baseUrl">API基础URL，如果为空则使用默认URL</param>
+        /// <param name="userToken">用户Token，如果提供则优先使用用户token而不是App Secret</param>
+        public DlassApiClient(string appId, string appSecret, string baseUrl = null, string userToken = null)
+        {
+            _appId = appId ?? throw new ArgumentNullException(nameof(appId));
+            _appSecret = appSecret ?? throw new ArgumentNullException(nameof(appSecret));
+            _userToken = userToken;
+            _baseUrl = baseUrl ?? DEFAULT_BASE_URL;
+
+            _baseUrl = _baseUrl.TrimEnd('/');
+            if (!_baseUrl.StartsWith("http://") && !_baseUrl.StartsWith("https://"))
+            {
+                _baseUrl = "https://" + _baseUrl;
+            }
+
+            _httpClient = new HttpClient
+            {
+                BaseAddress = new Uri(_baseUrl),
+                Timeout = TimeSpan.FromSeconds(30)
+            };
+            _httpClient.DefaultRequestHeaders.Add("User-Agent", "InkCanvas/1.0");
+        }
+
+        /// <summary>
+        /// 获取访问令牌（Access Token）
+        /// </summary>
+        /// <param name="cancellationToken">取消令牌</param>
+        public async Task<string> GetAccessTokenAsync(CancellationToken cancellationToken = default)
+        {
+            if (!string.IsNullOrEmpty(_userToken))
+            {
+                return _userToken;
+            }
+
+            if (!string.IsNullOrEmpty(_accessToken) && DateTime.Now < _tokenExpiresAt.AddMinutes(-5))
+            {
+                return _accessToken;
+            }
+
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                var requestData = new
+                {
+                    app_id = _appId,
+                    app_secret = _appSecret,
+                    grant_type = "client_credentials"
+                };
+
+                var json = JsonConvert.SerializeObject(requestData);
+                var content = new StringContent(json, Encoding.UTF8, "application/json");
+
+                var response = await _httpClient.PostAsync("/oauth/token", content, cancellationToken);
+                var responseContent = await response.Content.ReadAsStringAsync();
+
+                if (response.IsSuccessStatusCode)
+                {
+                    var tokenResponse = JsonConvert.DeserializeObject<TokenResponse>(responseContent);
+                    _accessToken = tokenResponse.AccessToken;
+                    _tokenExpiresAt = DateTime.Now.AddSeconds(tokenResponse.ExpiresIn ?? 3600);
+                    return _accessToken;
+                }
+                else
+                {
+                    throw new Exception($"获取Access Token失败: {response.StatusCode}");
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
+            catch (HttpRequestException httpEx)
+            {
+                throw new Exception($"获取Access Token时网络错误: {httpEx.Message}", httpEx);
+            }
+            catch (Exception ex)
+            {
+                throw new Exception($"获取Access Token时出错: {ex.Message}", ex);
+            }
+        }
+
+        /// <summary>
+        /// 发送GET请求
+        /// </summary>
+        /// <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(cancellationToken);
+                }
+
+                var request = new HttpRequestMessage(HttpMethod.Get, endpoint);
+
+                if (requireAuth && !string.IsNullOrEmpty(token))
+                {
+                    if (!string.IsNullOrEmpty(_userToken))
+                    {
+                        request.Headers.Add("X-User-Token", token);
+                    }
+                    else
+                    {
+                        request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", token);
+                    }
+                }
+
+                var response = await _httpClient.SendAsync(request, cancellationToken);
+                var content = await response.Content.ReadAsStringAsync();
+
+                if (response.IsSuccessStatusCode)
+                {
+                    if (string.IsNullOrEmpty(content))
+                    {
+                        return default(T);
+                    }
+                    return JsonConvert.DeserializeObject<T>(content);
+                }
+                else
+                {
+                    throw new Exception($"API请求失败: {response.StatusCode} - {content}");
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
+            catch (HttpRequestException httpEx)
+            {
+                throw new Exception($"发送请求时出错: {httpEx.Message}", httpEx);
+            }
+            catch (Exception ex)
+            {
+                throw new Exception($"发送请求时出错: {ex.Message}", ex);
+            }
+        }
+
+        /// <summary>
+        /// 发送POST请求
+        /// </summary>
+        /// <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(cancellationToken);
+                }
+
+                var request = new HttpRequestMessage(HttpMethod.Post, endpoint);
+
+                if (requireAuth && !string.IsNullOrEmpty(token))
+                {
+                    if (!string.IsNullOrEmpty(_userToken))
+                    {
+                        request.Headers.Add("X-User-Token", token);
+                    }
+                    else
+                    {
+                        request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", token);
+                    }
+                }
+
+                if (data != null)
+                {
+                    var json = JsonConvert.SerializeObject(data);
+                    request.Content = new StringContent(json, Encoding.UTF8, "application/json");
+                }
+
+                var response = await _httpClient.SendAsync(request, cancellationToken);
+                var content = await response.Content.ReadAsStringAsync();
+
+                if (response.IsSuccessStatusCode)
+                {
+                    if (string.IsNullOrEmpty(content))
+                    {
+                        return default(T);
+                    }
+                    return JsonConvert.DeserializeObject<T>(content);
+                }
+                else
+                {
+                    throw new Exception($"API请求失败: {response.StatusCode} - {content}");
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
+            catch (HttpRequestException httpEx)
+            {
+                throw new Exception($"发送请求时出错: {httpEx.Message}", httpEx);
+            }
+            catch (Exception ex)
+            {
+                throw new Exception($"发送请求时出错: {ex.Message}", ex);
+            }
+        }
+
+        /// <summary>
+        /// 发送PUT请求
+        /// </summary>
+        /// <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(cancellationToken);
+                }
+
+                var request = new HttpRequestMessage(HttpMethod.Put, endpoint);
+
+                if (requireAuth && !string.IsNullOrEmpty(token))
+                {
+                    // 如果是用户token，使用X-User-Token header
+                    if (!string.IsNullOrEmpty(_userToken))
+                    {
+                        request.Headers.Add("X-User-Token", token);
+                    }
+                    else
+                    {
+                        request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", token);
+                    }
+                }
+
+                if (data != null)
+                {
+                    var json = JsonConvert.SerializeObject(data);
+                    request.Content = new StringContent(json, Encoding.UTF8, "application/json");
+                }
+
+                var response = await _httpClient.SendAsync(request, cancellationToken);
+                var content = await response.Content.ReadAsStringAsync();
+
+                if (response.IsSuccessStatusCode)
+                {
+                    if (string.IsNullOrEmpty(content))
+                    {
+                        return default(T);
+                    }
+                    return JsonConvert.DeserializeObject<T>(content);
+                }
+                else
+                {
+                    throw new Exception($"API请求失败: {response.StatusCode} - {content}");
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
+            catch (HttpRequestException httpEx)
+            {
+                throw new Exception($"发送请求时出错: {httpEx.Message}", httpEx);
+            }
+            catch (Exception ex)
+            {
+                throw new Exception($"发送请求时出错: {ex.Message}", ex);
+            }
+        }
+
+        /// <summary>
+        /// 发送DELETE请求
+        /// </summary>
+        /// <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(cancellationToken);
+                }
+
+                var request = new HttpRequestMessage(HttpMethod.Delete, endpoint);
+
+                if (requireAuth && !string.IsNullOrEmpty(token))
+                {
+                    // 如果是用户token，使用X-User-Token header
+                    if (!string.IsNullOrEmpty(_userToken))
+                    {
+                        request.Headers.Add("X-User-Token", token);
+                    }
+                    else
+                    {
+                        request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", token);
+                    }
+                }
+
+                var response = await _httpClient.SendAsync(request, cancellationToken);
+
+                if (response.IsSuccessStatusCode)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
+            catch (HttpRequestException)
+            {
+                return false;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 上传笔记文件
+        /// </summary>
+        /// <param name="endpoint">上传端点</param>
+        /// <param name="filePath">文件路径</param>
+        /// <param name="boardId">白板ID</param>
+        /// <param name="secretKey">白板密钥</param>
+        /// <param name="title">笔记标题（可选）</param>
+        /// <param name="description">笔记描述（可选）</param>
+        /// <param name="tags">笔记标签（可选）</param>
+        /// <param name="cancellationToken">取消令牌</param>
+        public async Task<T> UploadNoteAsync<T>(string endpoint, string filePath, string boardId, string secretKey, string title = null, string description = null, string tags = null, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                if (!File.Exists(filePath))
+                {
+                    throw new FileNotFoundException($"文件不存在: {filePath}");
+                }
+
+                var request = new HttpRequestMessage(HttpMethod.Post, endpoint);
+
+                // 设置白板认证头
+                request.Headers.Add("X-Board-ID", boardId);
+                request.Headers.Add("X-Secret-Key", secretKey);
+
+                // 创建multipart/form-data内容
+                var content = new MultipartFormDataContent();
+
+                // 添加文件
+                var fileContent = new ByteArrayContent(File.ReadAllBytes(filePath));
+                var fileName = Path.GetFileName(filePath);
+                fileContent.Headers.ContentType = new MediaTypeHeaderValue("application/octet-stream");
+                content.Add(fileContent, "file", fileName);
+
+                // 添加可选参数
+                if (!string.IsNullOrEmpty(title))
+                {
+                    content.Add(new StringContent(title), "title");
+                }
+                if (!string.IsNullOrEmpty(description))
+                {
+                    content.Add(new StringContent(description), "description");
+                }
+                if (!string.IsNullOrEmpty(tags))
+                {
+                    content.Add(new StringContent(tags), "tags");
+                }
+
+                request.Content = content;
+
+                var response = await _httpClient.SendAsync(request, cancellationToken);
+                var responseContent = await response.Content.ReadAsStringAsync();
+
+                if (response.IsSuccessStatusCode)
+                {
+                    if (string.IsNullOrEmpty(responseContent))
+                    {
+                        return default(T);
+                    }
+                    return JsonConvert.DeserializeObject<T>(responseContent);
+                }
+                else
+                {
+                    throw new Exception($"上传文件失败: {response.StatusCode} - {responseContent}");
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
+            catch (HttpRequestException httpEx)
+            {
+                throw new Exception($"上传文件时网络错误: {httpEx.Message}", httpEx);
+            }
+            catch (Exception ex)
+            {
+                throw new Exception($"上传文件时出错: {ex.Message}", ex);
+            }
+        }
+
+        /// <summary>
+        /// 释放资源
+        /// </summary>
+        public void Dispose()
+        {
+            _httpClient?.Dispose();
+        }
+
+        #region 内部类
+
+        /// <summary>
+        /// Token响应模型
+        /// </summary>
+        private class TokenResponse
+        {
+            [JsonProperty("access_token")]
+            public string AccessToken { get; set; }
+
+            [JsonProperty("expires_in")]
+            public int? ExpiresIn { get; set; }
+
+            [JsonProperty("token_type")]
+            public string TokenType { get; set; }
+        }
+
+        #endregion
+    }
+}
+

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

@@ -1,19 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.VisualBasic;
-using System.Collections;
-using System.Data;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
 
 namespace Ink_Canvas.Helpers
 {
@@ -83,7 +71,7 @@ namespace Ink_Canvas.Helpers
             [FieldOffset(8)]
             private DateTime date;
             [FieldOffset(8)]
-            private System.Runtime.InteropServices.ComTypes.FILETIME filetime;
+            private FILETIME filetime;
 
             [FieldOffset(8)]
             private Blob blobVal;
@@ -128,7 +116,7 @@ namespace Ink_Canvas.Helpers
                         case VarEnum.VT_BLOB:
                             return GetBlob();
                     }
-                    throw new NotImplementedException("PropVariant " + ve.ToString());
+                    throw new NotImplementedException("PropVariant " + ve);
                 }
             }
         }
@@ -157,17 +145,17 @@ namespace Ink_Canvas.Helpers
 
         #region "Interfaces"
 
-        [ComImport(), Guid("886D8EEB-8CF2-4446-8D02-CDBA1DBDCF99"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+        [ComImport, Guid("886D8EEB-8CF2-4446-8D02-CDBA1DBDCF99"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         public interface IPropertyStore
         {
             [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-            void GetCount([Out(), In()] ref uint cProps);
+            void GetCount([Out, In] ref uint cProps);
             [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-            void GetAt([In()] uint iProp, ref PropertyKey pkey);
+            void GetAt([In] uint iProp, ref PropertyKey pkey);
             [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-            void GetValue([In()] ref PropertyKey key, ref PropVariant pv);
+            void GetValue([In] ref PropertyKey key, ref PropVariant pv);
             [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-            void SetValue([In()] ref PropertyKey key, [In()] ref PropVariant pv);
+            void SetValue([In] ref PropertyKey key, [In] ref PropVariant pv);
             [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
             void Commit();
             [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]

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

@@ -0,0 +1,691 @@
+using Microsoft.Win32;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Security;
+using System.Text;
+using System.Threading;
+using System.Windows;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 文件关联管理器，用于注册和处理.icstk文件的关联
+    /// </summary>
+    public static class FileAssociationManager
+    {
+        private const string FileExtension = ".icstk";
+        private const string FileTypeName = "InkCanvasStrokesFile";
+        private const string AppName = "Ink Canvas";
+        private const string AppDescription = "Ink Canvas Strokes File";
+
+        // IPC相关常量
+        private const string IpcMutexName = "InkCanvasFileAssociationIpc";
+        private const string IpcEventName = "InkCanvasFileAssociationEvent";
+        private const string IpcFilePrefix = "InkCanvasFileAssociation_";
+        private const string IpcBoardModePrefix = "InkCanvasBoardMode_";
+        private const string IpcShowModePrefix = "InkCanvasShowMode_";
+        private const string IpcUriCommandPrefix = "InkCanvasUriCommand_";
+        private const int IpcTimeout = 5000; // 5秒超时
+
+        /// <summary>
+        /// 注册.icstk文件关联
+        /// </summary>
+        public static bool RegisterFileAssociation()
+        {
+            try
+            {
+                string exePath = Process.GetCurrentProcess().MainModule.FileName;
+
+                // 注册文件类型
+                using (RegistryKey fileTypeKey = Registry.ClassesRoot.CreateSubKey(FileTypeName))
+                {
+                    fileTypeKey.SetValue("", AppDescription);
+                    fileTypeKey.SetValue("FriendlyTypeName", AppDescription);
+
+                    // 设置默认图标
+                    using (RegistryKey defaultIconKey = fileTypeKey.CreateSubKey("DefaultIcon"))
+                    {
+                        defaultIconKey.SetValue("", $"\"{exePath}\",0");
+                    }
+
+                    // 设置打开命令
+                    using (RegistryKey shellKey = fileTypeKey.CreateSubKey("shell"))
+                    using (RegistryKey openKey = shellKey.CreateSubKey("open"))
+                    using (RegistryKey commandKey = openKey.CreateSubKey("command"))
+                    {
+                        commandKey.SetValue("", $"\"{exePath}\" \"%1\"");
+                    }
+                }
+
+                // 注册文件扩展名
+                using (RegistryKey extensionKey = Registry.ClassesRoot.CreateSubKey(FileExtension))
+                {
+                    extensionKey.SetValue("", FileTypeName);
+                }
+
+                // 刷新系统文件关联缓存
+                RefreshSystemFileAssociations();
+
+                LogHelper.WriteLogToFile($"成功注册{FileExtension}文件关联", LogHelper.LogType.Event);
+                return true;
+            }
+            catch (SecurityException ex)
+            {
+                LogHelper.WriteLogToFile($"注册文件关联时权限不足: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+            catch (UnauthorizedAccessException ex)
+            {
+                LogHelper.WriteLogToFile($"注册文件关联时访问被拒绝: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"注册文件关联时出错: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 注销.icstk文件关联
+        /// </summary>
+        public static bool UnregisterFileAssociation()
+        {
+            try
+            {
+                // 删除文件扩展名关联
+                Registry.ClassesRoot.DeleteSubKeyTree(FileExtension, false);
+
+                // 删除文件类型定义
+                Registry.ClassesRoot.DeleteSubKeyTree(FileTypeName, false);
+
+                // 刷新系统文件关联缓存
+                RefreshSystemFileAssociations();
+
+                LogHelper.WriteLogToFile($"成功注销{FileExtension}文件关联", LogHelper.LogType.Event);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"注销文件关联时出错: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 检查文件关联是否已注册
+        /// </summary>
+        public static bool IsFileAssociationRegistered()
+        {
+            try
+            {
+                using (RegistryKey extensionKey = Registry.ClassesRoot.OpenSubKey(FileExtension))
+                {
+                    if (extensionKey == null) return false;
+
+                    string fileType = extensionKey.GetValue("") as string;
+                    if (string.IsNullOrEmpty(fileType)) return false;
+
+                    using (RegistryKey fileTypeKey = Registry.ClassesRoot.OpenSubKey(fileType))
+                    {
+                        if (fileTypeKey == null) return false;
+
+                        using (RegistryKey shellKey = fileTypeKey.OpenSubKey("shell\\open\\command"))
+                        {
+                            if (shellKey == null) return false;
+
+                            string command = shellKey.GetValue("") as string;
+                            if (string.IsNullOrEmpty(command)) return false;
+
+                            // 检查命令是否指向当前应用程序
+                            string currentExePath = Process.GetCurrentProcess().MainModule.FileName;
+                            return command.Contains(currentExePath);
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"检查文件关联状态时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// 显示文件关联状态
+        /// </summary>
+        public static void ShowFileAssociationStatus()
+        {
+            bool isRegistered = IsFileAssociationRegistered();
+            LogHelper.WriteLogToFile($"{FileExtension}文件关联状态: {(isRegistered ? "已注册" : "未注册")}", LogHelper.LogType.Event);
+        }
+
+        /// <summary>
+        /// 刷新系统文件关联缓存
+        /// </summary>
+        private static void RefreshSystemFileAssociations()
+        {
+            try
+            {
+                // 通知系统文件关联已更改
+                SHChangeNotify(0x08000000, 0, IntPtr.Zero, IntPtr.Zero);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"刷新文件关联缓存时出错: {ex.Message}", LogHelper.LogType.Warning);
+            }
+        }
+
+        /// <summary>
+        /// 处理命令行参数中的文件路径
+        /// </summary>
+        /// <param name="args">命令行参数</param>
+        /// <returns>找到的.icstk文件路径，如果没有找到则返回null</returns>
+        public static string GetIcstkFileFromArgs(string[] args)
+        {
+            if (args == null || args.Length == 0) return null;
+
+            foreach (string arg in args)
+            {
+                if (string.IsNullOrEmpty(arg)) continue;
+
+                // 检查是否为.icstk文件
+                if (Path.GetExtension(arg).Equals(FileExtension, StringComparison.OrdinalIgnoreCase))
+                {
+                    // 检查文件是否存在
+                    if (File.Exists(arg))
+                    {
+                        LogHelper.WriteLogToFile($"从命令行参数中找到.icstk文件: {arg}", LogHelper.LogType.Event);
+                        return arg;
+                    }
+                    else
+                    {
+                        LogHelper.WriteLogToFile($"命令行参数中的.icstk文件不存在: {arg}", LogHelper.LogType.Warning);
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// 尝试通过IPC将文件路径发送给已运行的实例
+        /// </summary>
+        /// <param name="filePath">要打开的文件路径</param>
+        /// <returns>是否成功发送</returns>
+        public static bool TrySendFileToExistingInstance(string filePath)
+        {
+            try
+            {
+                LogHelper.WriteLogToFile($"尝试通过IPC发送文件路径给已运行实例: {filePath}", LogHelper.LogType.Event);
+
+                // 创建IPC文件
+                string tempDir = Path.GetTempPath();
+                string ipcFileName = IpcFilePrefix + Guid.NewGuid().ToString("N") + ".tmp";
+                string ipcFilePath = Path.Combine(tempDir, ipcFileName);
+
+                // 写入文件路径到IPC文件
+                File.WriteAllText(ipcFilePath, filePath, Encoding.UTF8);
+
+                // 创建事件通知已运行实例
+                using (EventWaitHandle ipcEvent = new EventWaitHandle(false, EventResetMode.ManualReset, IpcEventName))
+                {
+                    ipcEvent.Set();
+                }
+
+                // 等待一段时间让已运行实例处理文件
+                Thread.Sleep(1000);
+
+                // 清理IPC文件
+                try
+                {
+                    if (File.Exists(ipcFilePath))
+                    {
+                        File.Delete(ipcFilePath);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"清理IPC文件失败: {ex.Message}", LogHelper.LogType.Warning);
+                }
+
+                LogHelper.WriteLogToFile("IPC文件路径发送完成", LogHelper.LogType.Event);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"通过IPC发送文件路径失败: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 尝试通过IPC将白板模式命令发送给已运行的实例
+        /// </summary>
+        /// <returns>是否成功发送</returns>
+        public static bool TrySendBoardModeCommandToExistingInstance()
+        {
+            try
+            {
+                LogHelper.WriteLogToFile("尝试通过IPC发送白板模式命令给已运行实例", LogHelper.LogType.Event);
+
+                // 创建IPC文件
+                string tempDir = Path.GetTempPath();
+                string ipcFileName = IpcBoardModePrefix + Guid.NewGuid().ToString("N") + ".tmp";
+                string ipcFilePath = Path.Combine(tempDir, ipcFileName);
+
+                // 写入白板模式命令到IPC文件
+                File.WriteAllText(ipcFilePath, "BOARD_MODE", Encoding.UTF8);
+
+                // 创建事件通知已运行实例
+                using (EventWaitHandle ipcEvent = new EventWaitHandle(false, EventResetMode.ManualReset, IpcEventName))
+                {
+                    ipcEvent.Set();
+                }
+
+                // 等待一段时间让已运行实例处理命令
+                Thread.Sleep(1000);
+
+                // 清理IPC文件
+                try
+                {
+                    if (File.Exists(ipcFilePath))
+                    {
+                        File.Delete(ipcFilePath);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"清理IPC文件失败: {ex.Message}", LogHelper.LogType.Warning);
+                }
+
+                LogHelper.WriteLogToFile("IPC白板模式命令发送完成", LogHelper.LogType.Event);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"通过IPC发送白板模式命令失败: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 尝试通过IPC将展开浮动栏命令发送给已运行的实例
+        /// </summary>
+        /// <returns>是否成功发送</returns>
+        public static bool TrySendShowModeCommandToExistingInstance()
+        {
+            try
+            {
+                LogHelper.WriteLogToFile("尝试通过IPC发送展开浮动栏命令给已运行实例", LogHelper.LogType.Event);
+
+                // 创建IPC文件
+                string tempDir = Path.GetTempPath();
+                string ipcFileName = IpcShowModePrefix + Guid.NewGuid().ToString("N") + ".tmp";
+                string ipcFilePath = Path.Combine(tempDir, ipcFileName);
+
+                // 写入展开浮动栏命令到IPC文件
+                File.WriteAllText(ipcFilePath, "SHOW_MODE", Encoding.UTF8);
+
+                // 创建事件通知已运行实例
+                using (EventWaitHandle ipcEvent = new EventWaitHandle(false, EventResetMode.ManualReset, IpcEventName))
+                {
+                    ipcEvent.Set();
+                }
+
+                // 等待一段时间让已运行实例处理命令
+                Thread.Sleep(1000);
+
+                // 清理IPC文件
+                try
+                {
+                    if (File.Exists(ipcFilePath))
+                    {
+                        File.Delete(ipcFilePath);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"清理IPC文件失败: {ex.Message}", LogHelper.LogType.Warning);
+                }
+
+                LogHelper.WriteLogToFile("IPC展开浮动栏命令发送完成", LogHelper.LogType.Event);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"通过IPC发送展开浮动栏命令失败: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 尝试通过IPC将URI命令发送给已运行的实例
+        /// </summary>
+        /// <param name="uri">URI命令</param>
+        /// <returns>是否成功发送</returns>
+        public static bool TrySendUriCommandToExistingInstance(string uri)
+        {
+            try
+            {
+                LogHelper.WriteLogToFile($"尝试通过IPC发送URI命令给已运行实例: {uri}", LogHelper.LogType.Event);
+
+                // 创建IPC文件
+                string tempDir = Path.GetTempPath();
+                string ipcFileName = IpcUriCommandPrefix + Guid.NewGuid().ToString("N") + ".tmp";
+                string ipcFilePath = Path.Combine(tempDir, ipcFileName);
+
+                // 写入URI命令到IPC文件
+                File.WriteAllText(ipcFilePath, uri, Encoding.UTF8);
+
+                // 创建事件通知已运行实例
+                using (EventWaitHandle ipcEvent = new EventWaitHandle(false, EventResetMode.ManualReset, IpcEventName))
+                {
+                    ipcEvent.Set();
+                }
+
+                // 等待一段时间让已运行实例处理命令
+                Thread.Sleep(1000);
+
+                // 清理IPC文件
+                try
+                {
+                    if (File.Exists(ipcFilePath))
+                    {
+                        File.Delete(ipcFilePath);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"清理IPC文件失败: {ex.Message}", LogHelper.LogType.Warning);
+                }
+
+                LogHelper.WriteLogToFile("IPC URI命令发送完成", LogHelper.LogType.Event);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"通过IPC发送URI命令失败: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 启动IPC监听器，等待其他实例发送文件路径
+        /// </summary>
+        public static void StartIpcListener()
+        {
+            try
+            {
+                Thread ipcThread = new Thread(() =>
+                {
+                    try
+                    {
+                        LogHelper.WriteLogToFile("启动IPC监听器", LogHelper.LogType.Event);
+
+                        using (EventWaitHandle ipcEvent = new EventWaitHandle(false, EventResetMode.ManualReset, IpcEventName))
+                        {
+                            while (true)
+                            {
+                                // 等待IPC事件
+                                if (ipcEvent.WaitOne(IpcTimeout))
+                                {
+                                    // 处理IPC文件
+                                    ProcessIpcFiles();
+
+                                    // 重置事件
+                                    ipcEvent.Reset();
+                                }
+
+                                // 检查应用是否还在运行
+                                if (Application.Current == null || Application.Current.Dispatcher == null)
+                                {
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"IPC监听器出错: {ex.Message}", LogHelper.LogType.Error);
+                    }
+                });
+
+                ipcThread.IsBackground = true;
+                ipcThread.Start();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"启动IPC监听器失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 处理IPC文件
+        /// </summary>
+        private static void ProcessIpcFiles()
+        {
+            try
+            {
+                string tempDir = Path.GetTempPath();
+
+                // 处理文件路径IPC文件
+                string[] ipcFiles = Directory.GetFiles(tempDir, IpcFilePrefix + "*.tmp");
+                foreach (string ipcFile in ipcFiles)
+                {
+                    try
+                    {
+                        // 读取文件路径
+                        string filePath = File.ReadAllText(ipcFile, Encoding.UTF8);
+
+                        if (!string.IsNullOrEmpty(filePath) && File.Exists(filePath))
+                        {
+                            LogHelper.WriteLogToFile($"IPC接收到文件路径: {filePath}", LogHelper.LogType.Event);
+
+                            // 在UI线程中处理文件打开
+                            Application.Current.Dispatcher.BeginInvoke(new Action(() =>
+                            {
+                                try
+                                {
+                                    // 获取主窗口并打开文件
+                                    if (Application.Current.MainWindow is MainWindow mainWindow)
+                                    {
+                                        mainWindow.OpenSingleStrokeFile(filePath);
+                                        mainWindow.ShowNotification($"已加载墨迹文件: {Path.GetFileName(filePath)}");
+                                    }
+                                }
+                                catch (Exception ex)
+                                {
+                                    LogHelper.WriteLogToFile($"IPC处理文件打开失败: {ex.Message}", LogHelper.LogType.Error);
+                                }
+                            }));
+                        }
+
+                        // 删除IPC文件
+                        File.Delete(ipcFile);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"处理IPC文件失败: {ex.Message}", LogHelper.LogType.Warning);
+
+                        // 尝试删除损坏的IPC文件
+                        try
+                        {
+                            if (File.Exists(ipcFile))
+                            {
+                                File.Delete(ipcFile);
+                            }
+                        }
+                        catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
+                    }
+                }
+
+                // 处理白板模式命令IPC文件
+                string[] boardModeFiles = Directory.GetFiles(tempDir, IpcBoardModePrefix + "*.tmp");
+                foreach (string ipcFile in boardModeFiles)
+                {
+                    try
+                    {
+                        // 读取命令内容
+                        string command = File.ReadAllText(ipcFile, Encoding.UTF8);
+
+                        if (command == "BOARD_MODE")
+                        {
+                            LogHelper.WriteLogToFile("IPC接收到白板模式命令", LogHelper.LogType.Event);
+
+                            // 在UI线程中处理白板模式切换
+                            Application.Current.Dispatcher.BeginInvoke(new Action(() =>
+                            {
+                                try
+                                {
+                                    // 获取主窗口并切换到白板模式
+                                    if (Application.Current.MainWindow is MainWindow mainWindow)
+                                    {
+                                        mainWindow.SwitchToBoardMode();
+                                        mainWindow.ShowNotification("已切换到白板模式");
+                                    }
+                                }
+                                catch (Exception ex)
+                                {
+                                    LogHelper.WriteLogToFile($"IPC处理白板模式切换失败: {ex.Message}", LogHelper.LogType.Error);
+                                }
+                            }));
+                        }
+
+                        // 删除IPC文件
+                        File.Delete(ipcFile);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"处理白板模式IPC文件失败: {ex.Message}", LogHelper.LogType.Warning);
+
+                        // 尝试删除损坏的IPC文件
+                        try
+                        {
+                            if (File.Exists(ipcFile))
+                            {
+                                File.Delete(ipcFile);
+                            }
+                        }
+                        catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
+                    }
+                }
+
+                // 处理展开浮动栏命令IPC文件
+                string[] showModeFiles = Directory.GetFiles(tempDir, IpcShowModePrefix + "*.tmp");
+                foreach (string ipcFile in showModeFiles)
+                {
+                    try
+                    {
+                        // 读取命令内容
+                        string command = File.ReadAllText(ipcFile, Encoding.UTF8);
+
+                        if (command == "SHOW_MODE")
+                        {
+                            LogHelper.WriteLogToFile("IPC接收到展开浮动栏命令", LogHelper.LogType.Event);
+
+                            // 在UI线程中处理展开浮动栏
+                            Application.Current.Dispatcher.BeginInvoke(new Action(async () =>
+                            {
+                                try
+                                {
+                                    // 获取主窗口并展开浮动栏
+                                    if (Application.Current.MainWindow is MainWindow mainWindow)
+                                    {
+                                        // 如果当前处于收纳模式，则展开浮动栏
+                                        if (mainWindow.isFloatingBarFolded)
+                                        {
+                                            await mainWindow.UnFoldFloatingBar(new object());
+                                        }
+                                        mainWindow.ShowNotification("已退出收纳模式并恢复浮动栏");
+                                    }
+                                }
+                                catch (Exception ex)
+                                {
+                                    LogHelper.WriteLogToFile($"IPC处理展开浮动栏失败: {ex.Message}", LogHelper.LogType.Error);
+                                }
+                            }));
+                        }
+
+                        // 删除IPC文件
+                        File.Delete(ipcFile);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"处理展开浮动栏IPC文件失败: {ex.Message}", LogHelper.LogType.Warning);
+
+                        // 尝试删除损坏的IPC文件
+                        try
+                        {
+                            if (File.Exists(ipcFile))
+                            {
+                                File.Delete(ipcFile);
+                            }
+                        }
+                        catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
+                    }
+                }
+
+                // 处理URI命令IPC文件
+                string[] uriCommandFiles = Directory.GetFiles(tempDir, IpcUriCommandPrefix + "*.tmp");
+                foreach (string ipcFile in uriCommandFiles)
+                {
+                    try
+                    {
+                        // 读取命令内容
+                        string uri = File.ReadAllText(ipcFile, Encoding.UTF8);
+
+                        if (!string.IsNullOrEmpty(uri))
+                        {
+                            LogHelper.WriteLogToFile($"IPC接收到URI命令: {uri}", LogHelper.LogType.Event);
+
+                            // 在UI线程中处理URI命令
+                            Application.Current.Dispatcher.BeginInvoke(new Action(() =>
+                            {
+                                try
+                                {
+                                    // 获取主窗口并处理URI命令
+                                    if (Application.Current.MainWindow is MainWindow mainWindow)
+                                    {
+                                        mainWindow.HandleUriCommand(uri);
+                                    }
+                                }
+                                catch (Exception ex)
+                                {
+                                    LogHelper.WriteLogToFile($"IPC处理URI命令失败: {ex.Message}", LogHelper.LogType.Error);
+                                }
+                            }));
+                        }
+
+                        // 删除IPC文件
+                        File.Delete(ipcFile);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"处理URI命令IPC文件失败: {ex.Message}", LogHelper.LogType.Warning);
+
+                        // 尝试删除损坏的IPC文件
+                        try
+                        {
+                            if (File.Exists(ipcFile))
+                            {
+                                File.Delete(ipcFile);
+                            }
+                        }
+                        catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"处理IPC文件时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        [DllImport("shell32.dll")]
+        private static extern void SHChangeNotify(uint wEventId, uint uFlags, IntPtr dwItem1, IntPtr dwItem2);
+    }
+}

Ink Canvas/Helpers/FloatingWindowInterceptorManager.cs

@@ -0,0 +1,398 @@
+using Ink_Canvas.Helpers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Ink_Canvas
+{
+    /// <summary>
+    /// 悬浮窗拦截管理器
+    /// </summary>
+    public class FloatingWindowInterceptorManager : IDisposable
+    {
+        #region 私有字段
+
+        private FloatingWindowInterceptor _interceptor;
+        private bool _isInitialized;
+        private bool _disposed;
+        private FloatingWindowInterceptorSettings _settings;
+
+        #endregion
+
+        #region 事件
+
+        public event EventHandler<FloatingWindowInterceptor.WindowInterceptedEventArgs> WindowIntercepted;
+        public event EventHandler<FloatingWindowInterceptor.WindowRestoredEventArgs> WindowRestored;
+
+        #endregion
+
+        #region 公共属性
+
+        public bool IsEnabled => _interceptor != null && _settings != null && _settings.IsEnabled;
+        public bool IsRunning => _interceptor != null && _interceptor.IsRunning;
+
+        #endregion
+
+        #region 公共方法
+
+        /// <summary>
+        /// 初始化拦截器
+        /// </summary>
+        public void Initialize(FloatingWindowInterceptorSettings settings)
+        {
+            if (_isInitialized) return;
+
+            try
+            {
+                _settings = settings ?? new FloatingWindowInterceptorSettings();
+                _interceptor = new FloatingWindowInterceptor();
+
+                // 订阅事件
+                _interceptor.WindowIntercepted += OnWindowIntercepted;
+                _interceptor.WindowRestored += OnWindowRestored;
+
+                // 应用配置
+                ApplySettings();
+
+                _isInitialized = true;
+
+                // 如果设置了自动启动，则启动拦截器
+                if (_settings.AutoStart && _settings.IsEnabled)
+                {
+                    Start();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"初始化悬浮窗拦截器失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 启动拦截器
+        /// </summary>
+        public void Start()
+        {
+            if (!_isInitialized || _settings == null) return;
+
+            if (_interceptor == null) return;
+
+            try
+            {
+                _interceptor.Start(_settings.ScanIntervalMs);
+                LogHelper.WriteLogToFile("悬浮窗拦截器已启动", LogHelper.LogType.Event);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"启动悬浮窗拦截器失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 停止拦截器
+        /// </summary>
+        public void Stop()
+        {
+            if (_interceptor == null) return;
+
+            try
+            {
+                _interceptor.Stop();
+                LogHelper.WriteLogToFile("悬浮窗拦截器已停止", LogHelper.LogType.Event);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"停止悬浮窗拦截器失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 设置拦截规则
+        /// </summary>
+        public void SetInterceptRule(FloatingWindowInterceptor.InterceptType type, bool enabled)
+        {
+            if (_interceptor == null || _settings == null) return;
+
+            try
+            {
+                _interceptor.SetInterceptRule(type, enabled);
+
+                // 更新设置
+                var ruleName = type.ToString();
+                if (_settings.InterceptRules.ContainsKey(ruleName))
+                {
+                    _settings.InterceptRules[ruleName] = enabled;
+                }
+
+                // 获取规则信息以处理父子关系
+                var rule = _interceptor.GetInterceptRule(type);
+                if (rule != null)
+                {
+                    // 如果是父规则，更新所有子规则的设置
+                    if (rule.ChildTypes.Count > 0)
+                    {
+                        foreach (var childType in rule.ChildTypes)
+                        {
+                            var childRuleName = childType.ToString();
+                            if (_settings.InterceptRules.ContainsKey(childRuleName))
+                            {
+                                _settings.InterceptRules[childRuleName] = enabled;
+                            }
+                        }
+                    }
+                    // 如果是子规则，更新父规则的设置
+                    else if (rule.ParentType.HasValue)
+                    {
+                        var parentRule = _interceptor.GetInterceptRule(rule.ParentType.Value);
+                        if (parentRule != null)
+                        {
+                            var parentRuleName = rule.ParentType.Value.ToString();
+                            if (_settings.InterceptRules.ContainsKey(parentRuleName))
+                            {
+                                _settings.InterceptRules[parentRuleName] = parentRule.IsEnabled;
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"设置拦截规则失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 获取拦截规则
+        /// </summary>
+        public FloatingWindowInterceptor.InterceptRule GetInterceptRule(FloatingWindowInterceptor.InterceptType type)
+        {
+            return _interceptor?.GetInterceptRule(type);
+        }
+
+        /// <summary>
+        /// 获取所有拦截规则
+        /// </summary>
+        public Dictionary<FloatingWindowInterceptor.InterceptType, FloatingWindowInterceptor.InterceptRule> GetAllRules()
+        {
+            return _interceptor?.GetAllRules() ?? new Dictionary<FloatingWindowInterceptor.InterceptType, FloatingWindowInterceptor.InterceptRule>();
+        }
+
+        /// <summary>
+        /// 手动扫描一次
+        /// </summary>
+        public void ScanOnce()
+        {
+            if (_interceptor == null) return;
+
+            try
+            {
+                _interceptor.ScanOnce();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"手动扫描失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+
+        /// <summary>
+        /// 恢复所有被拦截的窗口
+        /// </summary>
+        public void RestoreAllWindows()
+        {
+            if (_interceptor == null) return;
+
+            try
+            {
+                _interceptor.RestoreAllWindows();
+                LogHelper.WriteLogToFile("已恢复所有被拦截的窗口", LogHelper.LogType.Event);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"恢复窗口失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 应用设置
+        /// </summary>
+        public void ApplySettings()
+        {
+            if (_interceptor == null || _settings == null) return;
+
+            try
+            {
+                // 应用拦截规则设置
+                foreach (var kvp in _settings.InterceptRules)
+                {
+                    if (Enum.TryParse<FloatingWindowInterceptor.InterceptType>(kvp.Key, out var type))
+                    {
+                        _interceptor.SetInterceptRule(type, kvp.Value);
+                    }
+                }
+
+                // 如果启用了拦截器，则启动
+                if (_settings.IsEnabled && !IsRunning)
+                {
+                    Start();
+                }
+                // 如果禁用了拦截器，则停止
+                else if (!_settings.IsEnabled && IsRunning)
+                {
+                    Stop();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"应用设置失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 更新扫描间隔
+        /// </summary>
+        public void UpdateScanInterval(int intervalMs)
+        {
+            if (_interceptor == null || _settings == null) return;
+
+            try
+            {
+                _settings.ScanIntervalMs = intervalMs;
+
+                // 如果正在运行，重启以应用新间隔
+                if (IsRunning)
+                {
+                    Stop();
+                    Start();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"更新扫描间隔失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 获取拦截统计信息
+        /// </summary>
+        public InterceptStatistics GetStatistics()
+        {
+            if (_interceptor == null || _settings == null) return new InterceptStatistics();
+
+            try
+            {
+                var rules = GetAllRules();
+                var enabledRules = rules.Count(r => r.Value.IsEnabled);
+                var totalRules = rules.Count;
+
+                return new InterceptStatistics
+                {
+                    TotalRules = totalRules,
+                    EnabledRules = enabledRules,
+                    IsRunning = IsRunning,
+                    ScanIntervalMs = _settings.ScanIntervalMs
+                };
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"获取统计信息失败: {ex.Message}", LogHelper.LogType.Error);
+                return new InterceptStatistics();
+            }
+        }
+
+        #endregion
+
+        #region 私有方法
+
+        private void OnWindowIntercepted(object sender, FloatingWindowInterceptor.WindowInterceptedEventArgs e)
+        {
+            try
+            {
+                // 记录日志
+                LogHelper.WriteLogToFile($"拦截窗口: {e.WindowTitle} ({e.InterceptType})", LogHelper.LogType.Event);
+
+                // 显示通知（如果启用）
+                if (_settings != null && _settings.ShowNotifications)
+                {
+                    ShowNotification($"已拦截悬浮窗: {e.Rule.Description}");
+                }
+
+                // 触发事件
+                WindowIntercepted?.Invoke(this, e);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"处理窗口拦截事件失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        private void OnWindowRestored(object sender, FloatingWindowInterceptor.WindowRestoredEventArgs e)
+        {
+            try
+            {
+                // 记录日志
+                LogHelper.WriteLogToFile($"恢复窗口: {e.InterceptType}", LogHelper.LogType.Event);
+
+                // 触发事件
+                WindowRestored?.Invoke(this, e);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"处理窗口恢复事件失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        private void ShowNotification(string message)
+        {
+            try
+            {
+                // 这里可以集成系统通知或自定义通知
+                // 暂时使用调试输出
+                System.Diagnostics.Debug.WriteLine($"通知: {message}");
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"显示通知失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        #endregion
+
+        #region 辅助类
+
+        public class InterceptStatistics
+        {
+            public int TotalRules { get; set; }
+            public int EnabledRules { get; set; }
+            public bool IsRunning { get; set; }
+            public int ScanIntervalMs { get; set; }
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        public void Dispose()
+        {
+            if (_disposed) return;
+
+            try
+            {
+                Stop();
+                _interceptor?.Dispose();
+                _interceptor = null;
+                _isInitialized = false;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"释放悬浮窗拦截器失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+            finally
+            {
+                _disposed = true;
+            }
+        }
+
+        #endregion
+    }
+}

Ink Canvas/Helpers/ForegroundWindowInfo.cs

@@ -1,7 +1,8 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Windows.Forms;
 
 namespace Ink_Canvas.Helpers
 {
@@ -24,7 +25,8 @@ namespace Ink_Canvas.Helpers
         private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
 
         [StructLayout(LayoutKind.Sequential)]
-        public struct RECT {
+        public struct RECT
+        {
             public int Left;
             public int Top;
             public int Right;
@@ -34,7 +36,31 @@ namespace Ink_Canvas.Helpers
             public int Height => Bottom - Top;
         }
 
-        public static string WindowTitle() {
+        [StructLayout(LayoutKind.Sequential)]
+        private struct MONITORINFO
+        {
+            public uint cbSize;
+            public RECT rcMonitor;
+            public RECT rcWork;
+            public uint dwFlags;
+        }
+
+        [DllImport("user32.dll")]
+        private static extern bool GetMonitorInfo(IntPtr hMonitor, ref MONITORINFO lpmi);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr MonitorFromWindow(IntPtr hwnd, uint dwFlags);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr MonitorFromRect(ref RECT lprc, uint dwFlags);
+
+        public static IntPtr GetForegroundWindowHandle()
+        {
+            return GetForegroundWindow();
+        }
+
+        public static string WindowTitle()
+        {
             IntPtr foregroundWindowHandle = GetForegroundWindow();
 
             const int nChars = 256;
@@ -44,7 +70,8 @@ namespace Ink_Canvas.Helpers
             return windowTitle.ToString();
         }
 
-        public static string WindowClassName() {
+        public static string WindowClassName()
+        {
             IntPtr foregroundWindowHandle = GetForegroundWindow();
 
             const int nChars = 256;
@@ -54,7 +81,8 @@ namespace Ink_Canvas.Helpers
             return className.ToString();
         }
 
-        public static RECT WindowRect() {
+        public static RECT WindowRect()
+        {
             IntPtr foregroundWindowHandle = GetForegroundWindow();
 
             RECT windowRect;
@@ -63,15 +91,19 @@ namespace Ink_Canvas.Helpers
             return windowRect;
         }
 
-        public static string ProcessName() {
+        public static string ProcessName()
+        {
             IntPtr foregroundWindowHandle = GetForegroundWindow();
             uint processId;
             GetWindowThreadProcessId(foregroundWindowHandle, out processId);
 
-            try {
+            try
+            {
                 Process process = Process.GetProcessById((int)processId);
                 return process.ProcessName;
-            } catch (ArgumentException) {
+            }
+            catch (ArgumentException)
+            {
                 // Process with the given ID not found
                 return "Unknown";
             }
@@ -88,10 +120,39 @@ namespace Ink_Canvas.Helpers
                 Process process = Process.GetProcessById((int)processId);
                 return process.MainModule.FileName;
             }
-            catch {
+            catch
+            {
                 // Process with the given ID not found
                 return "Unknown";
             }
         }
+
+        public static double GetTaskbarHeight(Screen screen, double dpiScaleY)
+        {
+            // 创建RECT结构体表示屏幕边界
+            RECT screenRect = new RECT
+            {
+                Left = screen.Bounds.Left,
+                Top = screen.Bounds.Top,
+                Right = screen.Bounds.Right,
+                Bottom = screen.Bounds.Bottom
+            };
+
+            // 获取屏幕句柄
+            const uint MONITOR_DEFAULTTONEAREST = 0x00000002;
+            IntPtr hMonitor = MonitorFromRect(ref screenRect, MONITOR_DEFAULTTONEAREST);
+
+            // 初始化MONITORINFO结构体
+            MONITORINFO monitorInfo = new MONITORINFO();
+            monitorInfo.cbSize = (uint)Marshal.SizeOf(typeof(MONITORINFO));
+
+            // 获取监视器信息
+            GetMonitorInfo(hMonitor, ref monitorInfo);
+
+            // 计算任务栏高度：monitorInfo.rcMonitor.bottom减去monitorInfo.rcWork.bottom的值
+            int taskbarHeight = monitorInfo.rcMonitor.Bottom - monitorInfo.rcWork.Bottom;
+            // 考虑 DPI 缩放
+            return taskbarHeight / dpiScaleY;
+        }
     }
 }

Ink Canvas/Helpers/FullScreenHelper.Win32.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
 
 // 由衷感謝 lindexi 提供的 《WPF 稳定的全屏化窗口方法》
 // 文章鏈接：https://blog.lindexi.com/post/WPF-%E7%A8%B3%E5%AE%9A%E7%9A%84%E5%85%A8%E5%B1%8F%E5%8C%96%E7%AA%97%E5%8F%A3%E6%96%B9%E6%B3%95.html
@@ -83,7 +81,7 @@ namespace Ink_Canvas.Helpers
                 public static extern bool GetWindowPlacement(IntPtr hWnd, ref WINDOWPLACEMENT lpwndpl);
 
                 public static IntPtr GetWindowLongPtr(IntPtr hWnd, GetWindowLongFields nIndex) =>
-                    GetWindowLongPtr(hWnd, (int) nIndex);
+                    GetWindowLongPtr(hWnd, (int)nIndex);
 
                 public static IntPtr GetWindowLongPtr(IntPtr hWnd, int nIndex)
                 {
@@ -101,7 +99,7 @@ namespace Ink_Canvas.Helpers
                 public static extern IntPtr GetWindowLongPtr_x64(IntPtr hWnd, int nIndex);
 
                 public static IntPtr SetWindowLongPtr(IntPtr hWnd, GetWindowLongFields nIndex, IntPtr dwNewLong) =>
-                    SetWindowLongPtr(hWnd, (int) nIndex, dwNewLong);
+                    SetWindowLongPtr(hWnd, (int)nIndex, dwNewLong);
 
                 public static IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr dwNewLong)
                 {
@@ -266,8 +264,8 @@ namespace Ink_Canvas.Helpers
             /// </summary>
             public int Width
             {
-                get { return unchecked((int) (Right - Left)); }
-                set { Right = unchecked((int) (Left + value)); }
+                get { return unchecked(Right - Left); }
+                set { Right = unchecked(Left + value); }
             }
 
             /// <summary>
@@ -275,8 +273,8 @@ namespace Ink_Canvas.Helpers
             /// </summary>
             public int Height
             {
-                get { return unchecked((int) (Bottom - Top)); }
-                set { Bottom = unchecked((int) (Top + value)); }
+                get { return unchecked(Bottom - Top); }
+                set { Bottom = unchecked(Top + value); }
             }
 
             public bool Equals(Rectangle other)
@@ -298,10 +296,10 @@ namespace Ink_Canvas.Helpers
             {
                 unchecked
                 {
-                    var hashCode = (int) Left;
-                    hashCode = (hashCode * 397) ^ (int) Top;
-                    hashCode = (hashCode * 397) ^ (int) Right;
-                    hashCode = (hashCode * 397) ^ (int) Bottom;
+                    var hashCode = Left;
+                    hashCode = (hashCode * 397) ^ Top;
+                    hashCode = (hashCode * 397) ^ Right;
+                    hashCode = (hashCode * 397) ^ Bottom;
                     return hashCode;
                 }
             }

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;
@@ -67,12 +66,12 @@ namespace Ink_Canvas.Helpers
 
                 //获取当前窗口的位置大小状态并保存
                 var placement = new WINDOWPLACEMENT();
-                placement.Size = (uint) Marshal.SizeOf(placement);
+                placement.Size = (uint)Marshal.SizeOf(placement);
                 Win32.User32.GetWindowPlacement(hwnd, ref placement);
                 window.SetValue(BeforeFullScreenWindowPlacementProperty, placement);
 
                 //修改窗口样式
-                var style = (WindowStyles) Win32.User32.GetWindowLongPtr(hwnd, GetWindowLongFields.GWL_STYLE);
+                var style = (WindowStyles)Win32.User32.GetWindowLongPtr(hwnd, GetWindowLongFields.GWL_STYLE);
                 window.SetValue(BeforeFullScreenWindowStyleProperty, style);
                 //将窗口恢复到还原模式，在有标题栏的情况下最大化模式下无法全屏,
                 //这里采用还原，不修改标题栏的方式
@@ -81,7 +80,7 @@ namespace Ink_Canvas.Helpers
                 //去掉WS_MAXIMIZEBOX，禁用最大化，如果最大化会退出全屏
                 //去掉WS_MAXIMIZE，使窗口变成还原状态，不使用ShowWindow(hwnd, ShowWindowCommands.SW_RESTORE)，避免看到窗口变成还原状态这一过程（也避免影响窗口的Visible状态）
                 style &= (~(WindowStyles.WS_THICKFRAME | WindowStyles.WS_MAXIMIZEBOX | WindowStyles.WS_MAXIMIZE));
-                Win32.User32.SetWindowLongPtr(hwnd, GetWindowLongFields.GWL_STYLE, (IntPtr) style);
+                Win32.User32.SetWindowLongPtr(hwnd, GetWindowLongFields.GWL_STYLE, (IntPtr)style);
 
                 //禁用 DWM 过渡动画 忽略返回值，若DWM关闭不做处理
                 Win32.Dwmapi.DwmSetWindowAttribute(hwnd, DWMWINDOWATTRIBUTE.DWMWA_TRANSITIONS_FORCEDISABLED, 1,
@@ -95,8 +94,8 @@ namespace Ink_Canvas.Helpers
                     //不能用 placement 的坐标，placement是工作区坐标，不是屏幕坐标。
 
                     //使用窗口当前的矩形调用下设置窗口位置和尺寸的方法，让Hook来进行调整窗口位置和尺寸到全屏模式
-                    Win32.User32.SetWindowPos(hwnd, (IntPtr) HwndZOrder.HWND_TOPMOST, rect.Left, rect.Top, rect.Width,
-                        rect.Height, (int) WindowPositionFlags.SWP_NOZORDER);
+                    Win32.User32.SetWindowPos(hwnd, (IntPtr)HwndZOrder.HWND_TOPMOST, rect.Left, rect.Top, rect.Width,
+                        rect.Height, (int)WindowPositionFlags.SWP_NOZORDER);
                 }
             }
         }
@@ -139,7 +138,7 @@ namespace Ink_Canvas.Helpers
                 //不要改变Style里的WS_MAXIMIZE，否则会使窗口变成最大化状态，但是尺寸不对
                 //也不要设置回Style里的WS_MINIMIZE,否则会导致窗口最小化按钮显示成还原按钮
                 Win32.User32.SetWindowLongPtr(hwnd, GetWindowLongFields.GWL_STYLE,
-                    (IntPtr) (style & (~(WindowStyles.WS_MAXIMIZE | WindowStyles.WS_MINIMIZE))));
+                    (IntPtr)(style & (~(WindowStyles.WS_MAXIMIZE | WindowStyles.WS_MINIMIZE))));
 
                 if ((style & WindowStyles.WS_MINIMIZE) != 0)
                 {
@@ -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消息
@@ -201,7 +198,7 @@ namespace Ink_Canvas.Helpers
                 try
                 {
                     //得到WINDOWPOS结构体
-                    var pos = (WindowPosition) Marshal.PtrToStructure(lParam, typeof(WindowPosition));
+                    var pos = (WindowPosition)Marshal.PtrToStructure(lParam, typeof(WindowPosition));
 
                     if ((pos.Flags & WindowPositionFlags.SWP_NOMOVE) != 0 &&
                         (pos.Flags & WindowPositionFlags.SWP_NOSIZE) != 0)
@@ -245,7 +242,7 @@ namespace Ink_Canvas.Helpers
                         //使用目标矩形获取显示器信息
                         var monitor = Win32.User32.MonitorFromRect(targetRect, MonitorFlag.MONITOR_DEFAULTTOPRIMARY);
                         var info = new MonitorInfo();
-                        info.Size = (uint) Marshal.SizeOf(info);
+                        info.Size = (uint)Marshal.SizeOf(info);
                         if (Win32.User32.GetMonitorInfo(monitor, ref info))
                         {
                             //基于显示器信息设置窗口尺寸位置
@@ -278,10 +275,7 @@ namespace Ink_Canvas.Helpers
                                     window.Width = logicalSize.X;
                                     window.Height = logicalSize.Y;
                                 }
-                                else
-                                {
-                                    //这个hwnd是前面从Window来的，如果现在他不是Window...... 你信么
-                                }
+                                //这个hwnd是前面从Window来的，如果现在他不是Window...... 你信么
                             }
 
                             //将修改后的结构体拷贝回去

Ink Canvas/Helpers/HardwareAcceleratedInkProcessor.cs

@@ -0,0 +1,199 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 硬件加速的墨迹处理器，利用WPF的GPU渲染能力
+    /// </summary>
+    public class HardwareAcceleratedInkProcessor
+    {
+        private readonly RenderTargetBitmap _renderTarget;
+        private readonly DrawingVisual _drawingVisual;
+        private bool _isInitialized;
+
+        public HardwareAcceleratedInkProcessor(int width = 1920, int height = 1080)
+        {
+            // 创建硬件加速的渲染目标
+            _renderTarget = new RenderTargetBitmap(width, height, 96, 96, PixelFormats.Pbgra32);
+            _drawingVisual = new DrawingVisual();
+
+            // 启用硬件加速
+            RenderOptions.SetBitmapScalingMode(_drawingVisual, BitmapScalingMode.HighQuality);
+            RenderOptions.SetEdgeMode(_drawingVisual, EdgeMode.Aliased);
+
+            _isInitialized = true;
+        }
+
+        /// <summary>
+        /// 使用GPU加速的贝塞尔曲线平滑
+        /// </summary>
+        public async Task<Stroke> SmoothStrokeWithGPU(Stroke originalStroke)
+        {
+            if (!_isInitialized || originalStroke == null || originalStroke.StylusPoints.Count < 2)
+                return originalStroke;
+
+            return await Task.Run(() =>
+            {
+                try
+                {
+                    // 使用PathGeometry进行硬件加速的曲线拟合
+                    var pathGeometry = CreateSmoothPathGeometry(originalStroke.StylusPoints);
+
+                    // 将PathGeometry转换回StylusPoint集合
+                    var smoothedPoints = ConvertPathGeometryToStylusPoints(pathGeometry, originalStroke.StylusPoints);
+
+                    return new Stroke(new StylusPointCollection(smoothedPoints))
+                    {
+                        DrawingAttributes = originalStroke.DrawingAttributes.Clone()
+                    };
+                }
+                catch
+                {
+                    return originalStroke;
+                }
+            });
+        }
+
+        /// <summary>
+        /// 创建平滑的路径几何体
+        /// </summary>
+        private PathGeometry CreateSmoothPathGeometry(StylusPointCollection points)
+        {
+            var pathGeometry = new PathGeometry();
+            var pathFigure = new PathFigure();
+
+            if (points.Count < 2) return pathGeometry;
+
+            pathFigure.StartPoint = new Point(points[0].X, points[0].Y);
+
+            // 使用贝塞尔曲线段创建平滑路径，增加插点密度
+            for (int i = 0; i < points.Count - 1; i += 2)  // 从i+=3改为i+=2，增加插点密度
+            {
+                var p1 = i + 1 < points.Count ? new Point(points[i + 1].X, points[i + 1].Y) : pathFigure.StartPoint;
+                var p2 = i + 2 < points.Count ? new Point(points[i + 2].X, points[i + 2].Y) : p1;
+                var p3 = i + 3 < points.Count ? new Point(points[i + 3].X, points[i + 3].Y) : p2;
+
+                var bezierSegment = new BezierSegment(p1, p2, p3, true);
+                pathFigure.Segments.Add(bezierSegment);
+            }
+
+            pathGeometry.Figures.Add(pathFigure);
+            return pathGeometry;
+        }
+
+        /// <summary>
+        /// 将PathGeometry转换为StylusPoint集合
+        /// </summary>
+        private List<StylusPoint> ConvertPathGeometryToStylusPoints(PathGeometry pathGeometry, StylusPointCollection originalPoints)
+        {
+            var result = new List<StylusPoint>();
+            var flattened = pathGeometry.GetFlattenedPathGeometry();
+
+            foreach (var figure in flattened.Figures)
+            {
+                result.Add(new StylusPoint(figure.StartPoint.X, figure.StartPoint.Y, 0.5f));
+
+                foreach (var segment in figure.Segments)
+                {
+                    if (segment is LineSegment lineSegment)
+                    {
+                        result.Add(new StylusPoint(lineSegment.Point.X, lineSegment.Point.Y, 0.5f));
+                    }
+                    else if (segment is PolyLineSegment polyLineSegment)
+                    {
+                        foreach (var point in polyLineSegment.Points)
+                        {
+                            result.Add(new StylusPoint(point.X, point.Y, 0.5f));
+                        }
+                    }
+                }
+            }
+
+            // 保持原始压感信息
+            InterpolatePressure(result, originalPoints);
+
+            return result;
+        }
+
+        /// <summary>
+        /// 插值压感信息
+        /// </summary>
+        private void InterpolatePressure(List<StylusPoint> smoothedPoints, StylusPointCollection originalPoints)
+        {
+            if (originalPoints.Count == 0 || smoothedPoints.Count == 0) return;
+
+            for (int i = 0; i < smoothedPoints.Count; i++)
+            {
+                double ratio = (double)i / (smoothedPoints.Count - 1);
+                int originalIndex = (int)(ratio * (originalPoints.Count - 1));
+                originalIndex = Math.Max(0, Math.Min(originalIndex, originalPoints.Count - 1));
+
+                var point = smoothedPoints[i];
+                float pressure = originalPoints[originalIndex].PressureFactor;
+                smoothedPoints[i] = new StylusPoint(point.X, point.Y, Math.Max(pressure, 0.1f));
+            }
+        }
+
+        /// <summary>
+        /// 使用GPU加速的并行贝塞尔计算
+        /// </summary>
+        public static StylusPoint[] ParallelBezierInterpolation(StylusPoint[] controlPoints, int segments = 32)
+        {
+            if (controlPoints.Length < 4) return controlPoints;
+
+            var result = new StylusPoint[segments * (controlPoints.Length / 4)];
+
+            Parallel.For(0, controlPoints.Length / 4, segmentIndex =>
+            {
+                var p0 = controlPoints[segmentIndex * 4];
+                var p1 = controlPoints[segmentIndex * 4 + 1];
+                var p2 = controlPoints[segmentIndex * 4 + 2];
+                var p3 = controlPoints[segmentIndex * 4 + 3];
+
+                for (int i = 0; i < segments; i++)
+                {
+                    double t = (double)i / (segments - 1);
+                    result[segmentIndex * segments + i] = CubicBezierFast(p0, p1, p2, p3, t);
+                }
+            });
+
+            return result;
+        }
+
+        /// <summary>
+        /// 优化的三次贝塞尔曲线计算
+        /// </summary>
+        private static StylusPoint CubicBezierFast(StylusPoint p0, StylusPoint p1, StylusPoint p2, StylusPoint p3, double t)
+        {
+            double u = 1 - t;
+            double tt = t * t;
+            double uu = u * u;
+            double uuu = uu * u;
+            double ttt = tt * t;
+
+            double x = uuu * p0.X + 3 * uu * t * p1.X + 3 * u * tt * p2.X + ttt * p3.X;
+            double y = uuu * p0.Y + 3 * uu * t * p1.Y + 3 * u * tt * p2.Y + ttt * p3.Y;
+            float pressure = (float)(p1.PressureFactor * u + p2.PressureFactor * t);
+
+            return new StylusPoint(x, y, Math.Max(pressure, 0.1f));
+        }
+
+        /// <summary>
+        /// 释放GPU相关资源标记
+        /// </summary>
+        public void Dispose()
+        {
+
+            _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/IACoreDllExtractor.cs

@@ -0,0 +1,167 @@
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// IACore DLL自动释放器
+    /// 在应用启动时自动释放IACore相关的DLL文件到应用程序目录
+    /// </summary>
+    public static class IACoreDllExtractor
+    {
+        private static readonly string[] RequiredDlls = {
+            "IACore.dll",
+            "IALoader.dll",
+            "IAWinFX.dll"
+        };
+
+        /// <summary>
+        /// 在应用启动时释放IACore相关DLL
+        /// </summary>
+        public static void ExtractIACoreDlls()
+        {
+            try
+            {
+                string appDirectory = AppDomain.CurrentDomain.BaseDirectory;
+                LogHelper.WriteLogToFile("开始检查并释放IACore相关DLL文件");
+
+                foreach (string dllName in RequiredDlls)
+                {
+                    string targetPath = Path.Combine(appDirectory, dllName);
+
+                    // 检查文件是否已存在且有效
+                    if (File.Exists(targetPath) && IsValidDll(targetPath))
+                    {
+                        LogHelper.WriteLogToFile($"{dllName} 已存在且有效，跳过释放");
+                        continue;
+                    }
+
+                    // 从嵌入资源中释放DLL
+                    if (ExtractDllFromResource(dllName, targetPath))
+                    {
+                        LogHelper.WriteLogToFile($"成功释放 {dllName} 到 {targetPath}");
+                    }
+                    else
+                    {
+                        LogHelper.WriteLogToFile($"警告：无法释放 {dllName}，可能影响形状识别功能", LogHelper.LogType.Warning);
+                    }
+                }
+
+                LogHelper.WriteLogToFile("IACore DLL释放检查完成");
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"释放IACore DLL时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 从嵌入资源中提取DLL文件
+        /// </summary>
+        private static bool ExtractDllFromResource(string dllName, string targetPath)
+        {
+            try
+            {
+                Assembly assembly = Assembly.GetExecutingAssembly();
+                string resourceName = $"Ink_Canvas.Resources.IACore.{dllName}";
+
+                using (Stream resourceStream = assembly.GetManifestResourceStream(resourceName))
+                {
+                    if (resourceStream == null)
+                    {
+                        LogHelper.WriteLogToFile($"未找到嵌入资源: {resourceName}", LogHelper.LogType.Warning);
+                        return false;
+                    }
+
+                    // 确保目标目录存在
+                    string targetDirectory = Path.GetDirectoryName(targetPath);
+                    if (!Directory.Exists(targetDirectory))
+                    {
+                        Directory.CreateDirectory(targetDirectory);
+                    }
+
+                    // 写入文件
+                    using (FileStream fileStream = new FileStream(targetPath, FileMode.Create, FileAccess.Write))
+                    {
+                        resourceStream.CopyTo(fileStream);
+                    }
+
+                    return true;
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"从资源提取 {dllName} 失败: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 检查DLL文件是否有效
+        /// </summary>
+        private static bool IsValidDll(string filePath)
+        {
+            try
+            {
+                if (!File.Exists(filePath))
+                    return false;
+
+                FileInfo fileInfo = new FileInfo(filePath);
+
+                // 检查文件大小（空文件或过小的文件可能无效）
+                if (fileInfo.Length < 1024) // 小于1KB可能无效
+                    return false;
+
+                // 简单检查PE头（DLL文件应该以MZ开头）
+                using (FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read))
+                {
+                    byte[] buffer = new byte[2];
+                    if (fs.Read(buffer, 0, 2) == 2)
+                    {
+                        return buffer[0] == 0x4D && buffer[1] == 0x5A; // "MZ"
+                    }
+                }
+
+                return false;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 清理释放的DLL文件（可选，在应用退出时调用）
+        /// </summary>
+        public static void CleanupExtractedDlls()
+        {
+            try
+            {
+                string appDirectory = AppDomain.CurrentDomain.BaseDirectory;
+
+                foreach (string dllName in RequiredDlls)
+                {
+                    string filePath = Path.Combine(appDirectory, dllName);
+
+                    if (File.Exists(filePath))
+                    {
+                        try
+                        {
+                            File.Delete(filePath);
+                            LogHelper.WriteLogToFile($"已清理 {dllName}");
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"清理 {dllName} 失败: {ex.Message}", LogHelper.LogType.Warning);
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"清理IACore DLL时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+    }
+}

Ink Canvas/Helpers/IPPTLinkManager.cs

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

Ink Canvas/Helpers/ImprovedBezierSmoothing.cs

@@ -0,0 +1,325 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Ink;
+using System.Windows.Input;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 改进的三次贝塞尔曲线平滑算法
+    /// </summary>
+    public class ImprovedBezierSmoothing
+    {
+        private readonly InkSmoothingConfig _config;
+
+        public ImprovedBezierSmoothing(InkSmoothingConfig config = null)
+        {
+            _config = config ?? new InkSmoothingConfig();
+        }
+
+        /// <summary>
+        /// 使用改进的贝塞尔曲线算法平滑笔画
+        /// </summary>
+        public Stroke SmoothStroke(Stroke originalStroke)
+        {
+            if (originalStroke == null || originalStroke.StylusPoints.Count < 3)
+                return originalStroke;
+
+            var originalPoints = originalStroke.StylusPoints.ToArray();
+
+            // 预处理：去除噪声点
+            var cleanedPoints = RemoveNoisePoints(originalPoints);
+
+            // 使用改进的贝塞尔曲线拟合
+            var smoothedPoints = ApplyCubicBezierSmoothing(cleanedPoints);
+
+            // 后处理：重采样和优化
+            var finalPoints = PostProcessPoints(smoothedPoints);
+
+            return new Stroke(new StylusPointCollection(finalPoints))
+            {
+                DrawingAttributes = originalStroke.DrawingAttributes.Clone()
+            };
+        }
+
+        /// <summary>
+        /// 去除噪声点
+        /// </summary>
+        private StylusPoint[] RemoveNoisePoints(StylusPoint[] points)
+        {
+            if (points.Length < 3) return points;
+
+            var result = new List<StylusPoint> { points[0] };
+            double minDistance = _config.ResampleInterval * 0.5;
+
+            for (int i = 1; i < points.Length - 1; i++)
+            {
+                var prev = result[result.Count - 1];
+                var curr = points[i];
+                var next = points[i + 1];
+
+                // 计算到前一个点的距离
+                double distToPrev = Math.Sqrt((curr.X - prev.X) * (curr.X - prev.X) +
+                                            (curr.Y - prev.Y) * (curr.Y - prev.Y));
+
+                // 如果距离太近，跳过这个点
+                if (distToPrev < minDistance)
+                    continue;
+
+                // 检查是否为异常点（与前后点形成锐角）
+                if (IsOutlierPoint(prev, curr, next))
+                    continue;
+
+                result.Add(curr);
+            }
+
+            result.Add(points[points.Length - 1]);
+            return result.ToArray();
+        }
+
+        /// <summary>
+        /// 检查是否为异常点
+        /// </summary>
+        private bool IsOutlierPoint(StylusPoint prev, StylusPoint curr, StylusPoint next)
+        {
+            var v1 = new Vector(curr.X - prev.X, curr.Y - prev.Y);
+            var v2 = new Vector(next.X - curr.X, next.Y - curr.Y);
+
+            if (v1.Length == 0 || v2.Length == 0) return false;
+
+            v1.Normalize();
+            v2.Normalize();
+
+            double dotProduct = Vector.Multiply(v1, v2);
+            double angle = Math.Acos(Math.Max(-1, Math.Min(1, dotProduct)));
+
+            // 如果角度小于30度，认为是异常点
+            return angle < Math.PI / 6;
+        }
+
+        /// <summary>
+        /// 应用三次贝塞尔曲线平滑
+        /// </summary>
+        private StylusPoint[] ApplyCubicBezierSmoothing(StylusPoint[] points)
+        {
+            if (points.Length < 4) return points;
+
+            var result = new List<StylusPoint>();
+            result.Add(points[0]);
+
+            // 使用滑动窗口进行贝塞尔曲线拟合
+            for (int i = 0; i <= points.Length - 4; i++)
+            {
+                var p0 = points[i];
+                var p1 = points[i + 1];
+                var p2 = points[i + 2];
+                var p3 = points[i + 3];
+
+                // 计算控制点
+                var controlPoints = CalculateOptimalControlPoints(p0, p1, p2, p3);
+
+                // 计算插值步数
+                int steps = CalculateInterpolationSteps(p0, p1, p2, p3);
+
+                // 生成贝塞尔曲线点
+                for (int j = 1; j <= steps; j++)
+                {
+                    double t = (double)j / steps;
+                    var bezierPoint = CalculateBezierPoint(p0, controlPoints.cp1, controlPoints.cp2, p3, t);
+                    result.Add(bezierPoint);
+                }
+            }
+
+            result.Add(points[points.Length - 1]);
+            return result.ToArray();
+        }
+
+        /// <summary>
+        /// 计算最优控制点
+        /// </summary>
+        private (Point cp1, Point cp2) CalculateOptimalControlPoints(StylusPoint p0, StylusPoint p1, StylusPoint p2, StylusPoint p3)
+        {
+            // 计算切线方向
+            var tangent1 = CalculateTangent(p0, p1, p2);
+            var tangent2 = CalculateTangent(p1, p2, p3);
+
+            // 计算控制点距离
+            double dist1 = CalculateDistance(p0, p1);
+            double dist2 = CalculateDistance(p2, p3);
+
+            double controlDist1 = dist1 * _config.CurveTension;
+            double controlDist2 = dist2 * _config.CurveTension;
+
+            // 计算控制点
+            var cp1 = new Point(
+                p1.X + tangent1.X * controlDist1,
+                p1.Y + tangent1.Y * controlDist1
+            );
+
+            var cp2 = new Point(
+                p2.X - tangent2.X * controlDist2,
+                p2.Y - tangent2.Y * controlDist2
+            );
+
+            return (cp1, cp2);
+        }
+
+        /// <summary>
+        /// 计算切线方向
+        /// </summary>
+        private Vector CalculateTangent(StylusPoint p0, StylusPoint p1, StylusPoint p2)
+        {
+            var v1 = new Vector(p1.X - p0.X, p1.Y - p0.Y);
+            var v2 = new Vector(p2.X - p1.X, p2.Y - p1.Y);
+
+            // 如果向量长度为零，返回零向量
+            if (v1.Length == 0 || v2.Length == 0)
+                return new Vector(0, 0);
+
+            v1.Normalize();
+            v2.Normalize();
+
+            // 返回平均方向
+            var tangent = (v1 + v2) / 2;
+            if (tangent.Length > 0)
+                tangent.Normalize();
+
+            return tangent;
+        }
+
+        /// <summary>
+        /// 计算两点间距离
+        /// </summary>
+        private double CalculateDistance(StylusPoint p1, StylusPoint p2)
+        {
+            double dx = p2.X - p1.X;
+            double dy = p2.Y - p1.Y;
+            return Math.Sqrt(dx * dx + dy * dy);
+        }
+
+        /// <summary>
+        /// 计算插值步数
+        /// </summary>
+        private int CalculateInterpolationSteps(StylusPoint p0, StylusPoint p1, StylusPoint p2, StylusPoint p3)
+        {
+            if (!_config.UseAdaptiveInterpolation)
+                return _config.InterpolationSteps;
+
+            // 计算曲线长度
+            double totalLength = CalculateDistance(p0, p1) + CalculateDistance(p1, p2) + CalculateDistance(p2, p3);
+
+            // 计算曲率
+            double curvature = CalculateCurvature(p0, p1, p2, p3);
+
+            // 基于长度和曲率计算步数
+            int baseSteps = Math.Max(8, Math.Min(20, (int)(totalLength / 10)));
+            int curvatureSteps = (int)(curvature * 15);
+
+            return Math.Max(_config.InterpolationSteps, Math.Min(30, baseSteps + curvatureSteps));
+        }
+
+        /// <summary>
+        /// 计算曲率
+        /// </summary>
+        private double CalculateCurvature(StylusPoint p0, StylusPoint p1, StylusPoint p2, StylusPoint p3)
+        {
+            var v1 = new Vector(p1.X - p0.X, p1.Y - p0.Y);
+            var v2 = new Vector(p2.X - p1.X, p2.Y - p1.Y);
+            var v3 = new Vector(p3.X - p2.X, p3.Y - p2.Y);
+
+            if (v1.Length == 0 || v2.Length == 0 || v3.Length == 0) return 0;
+
+            v1.Normalize();
+            v2.Normalize();
+            v3.Normalize();
+
+            // 计算角度变化
+            double angle1 = Math.Acos(Math.Max(-1, Math.Min(1, Vector.Multiply(v1, v2))));
+            double angle2 = Math.Acos(Math.Max(-1, Math.Min(1, Vector.Multiply(v2, v3))));
+
+            return (angle1 + angle2) / Math.PI; // 归一化到0-1
+        }
+
+        /// <summary>
+        /// 计算贝塞尔曲线上的点
+        /// </summary>
+        private StylusPoint CalculateBezierPoint(StylusPoint p0, Point cp1, Point cp2, StylusPoint p3, double t)
+        {
+            double u = 1 - t;
+            double tt = t * t;
+            double uu = u * u;
+            double uuu = uu * u;
+            double ttt = tt * t;
+
+            // 预计算系数
+            double c0 = uuu;
+            double c1 = 3 * uu * t;
+            double c2 = 3 * u * tt;
+            double c3 = ttt;
+
+            double x = c0 * p0.X + c1 * cp1.X + c2 * cp2.X + c3 * p3.X;
+            double y = c0 * p0.Y + c1 * cp1.Y + c2 * cp2.Y + c3 * p3.Y;
+
+            // 插值压力值
+            float pressure = (float)(p0.PressureFactor * u + p3.PressureFactor * t);
+            pressure = Math.Max(pressure, 0.1f);
+
+            return new StylusPoint(x, y, pressure);
+        }
+
+        /// <summary>
+        /// 后处理点集
+        /// </summary>
+        private StylusPoint[] PostProcessPoints(StylusPoint[] points)
+        {
+            if (points.Length == 0) return points;
+
+            // 如果点数过多，进行重采样
+            if (points.Length > _config.MaxPointsPerStroke)
+            {
+                return ResamplePoints(points, _config.ResampleInterval);
+            }
+
+            return points;
+        }
+
+        /// <summary>
+        /// 重采样点集
+        /// </summary>
+        private StylusPoint[] ResamplePoints(StylusPoint[] points, double interval)
+        {
+            var result = new List<StylusPoint> { points[0] };
+            double accumulated = 0;
+
+            for (int i = 1; i < points.Length; i++)
+            {
+                var prev = result[result.Count - 1];
+                var curr = points[i];
+                double dx = curr.X - prev.X;
+                double dy = curr.Y - prev.Y;
+                double dist = Math.Sqrt(dx * dx + dy * dy);
+
+                if (dist + accumulated >= interval)
+                {
+                    double t = (interval - accumulated) / dist;
+                    double x = prev.X + t * dx;
+                    double y = prev.Y + t * dy;
+                    float pressure = (float)(prev.PressureFactor * (1 - t) + curr.PressureFactor * t);
+                    pressure = Math.Max(pressure, 0.1f);
+
+                    result.Add(new StylusPoint(x, y, pressure));
+                    accumulated = 0;
+                    i--; // 重新处理当前点
+                }
+                else
+                {
+                    accumulated += dist;
+                }
+            }
+
+            return result.ToArray();
+        }
+    }
+}

Ink Canvas/Helpers/InkFadeManager.cs

@@ -0,0 +1,895 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 墨迹渐隐管理器 - 管理墨迹的渐隐动画和状态
+    /// </summary>
+    public class InkFadeManager
+    {
+        #region Properties
+        /// <summary>
+        /// 是否启用墨迹渐隐功能
+        /// </summary>
+        public bool IsEnabled { get; set; }
+
+        /// <summary>
+        /// 墨迹渐隐时间（毫秒）
+        /// </summary>
+        public int FadeTime { get; set; } = 3000;
+
+        /// <summary>
+        /// 渐隐动画持续时间（毫秒）
+        /// </summary>
+        public int AnimationDuration { get; set; } = 1000;
+        #endregion
+
+        #region Private Fields
+        private readonly MainWindow _mainWindow;
+        private readonly Dispatcher _dispatcher;
+        private readonly Dictionary<Stroke, DispatcherTimer> _fadeTimers;
+        private readonly Dictionary<Stroke, UIElement> _strokeVisuals;
+        private readonly Dictionary<Stroke, Point> _strokeStartPoints;
+        private readonly Dictionary<Stroke, Point> _strokeEndPoints;
+        #endregion
+
+        #region Constructor
+        public InkFadeManager(MainWindow mainWindow)
+        {
+            _mainWindow = mainWindow ?? throw new ArgumentNullException(nameof(mainWindow));
+            _dispatcher = _mainWindow.Dispatcher;
+            _fadeTimers = new Dictionary<Stroke, DispatcherTimer>();
+            _strokeVisuals = new Dictionary<Stroke, UIElement>();
+            _strokeStartPoints = new Dictionary<Stroke, Point>();
+            _strokeEndPoints = new Dictionary<Stroke, Point>();
+        }
+        #endregion
+
+        #region Public Methods
+        /// <summary>
+        /// 添加需要渐隐的墨迹
+        /// </summary>
+        /// <param name="stroke">墨迹对象</param>
+        /// <param name="startPoint">落笔点</param>
+        /// <param name="endPoint">抬笔点</param>
+        public void AddFadingStroke(Stroke stroke, Point startPoint, Point endPoint)
+        {
+            if (!IsEnabled || stroke == null)
+            {
+                return;
+            }
+
+            try
+            {
+                // 确保主窗口的InkCanvas保持Ink编辑模式，防止墨迹渐隐时切换到鼠标模式
+                if (_mainWindow.inkCanvas.EditingMode != InkCanvasEditingMode.Ink)
+                {
+                    _mainWindow.inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+                }
+
+                // 记录墨迹的起点和终点
+                _strokeStartPoints[stroke] = startPoint;
+                _strokeEndPoints[stroke] = endPoint;
+
+                // 创建墨迹的视觉元素（湿墨迹状态）
+                var strokeVisual = CreateStrokeVisual(stroke);
+                if (strokeVisual == null) return;
+
+                _strokeVisuals[stroke] = strokeVisual;
+
+                // 创建定时器，在指定时间后开始渐隐动画
+                var timer = new DispatcherTimer
+                {
+                    Interval = TimeSpan.FromMilliseconds(FadeTime)
+                };
+
+                timer.Tick += (sender, e) =>
+                {
+                    StartFadeAnimation(stroke);
+                    timer.Stop();
+                    _fadeTimers.Remove(stroke);
+                };
+
+                _fadeTimers[stroke] = timer;
+                timer.Start();
+
+                // 将视觉元素添加到画布上
+                _dispatcher.InvokeAsync(() =>
+                {
+                    try
+                    {
+                        if (_mainWindow.inkCanvas != null)
+                        {
+                            // 将墨迹添加到 inkCanvas 的父容器中，而不是 inkCanvas.Children
+                            // 这样可以避免坐标系统问题
+                            var parent = _mainWindow.inkCanvas.Parent as Panel;
+                            if (parent != null)
+                            {
+                                parent.Children.Add(strokeVisual);
+                            }
+                            else
+                            {
+                                // 如果无法获取父容器，则添加到 inkCanvas.Children
+                                _mainWindow.inkCanvas.Children.Add(strokeVisual);
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"添加墨迹视觉元素到画布失败: {ex}", LogHelper.LogType.Error);
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"添加渐隐墨迹失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 移除墨迹
+        /// </summary>
+        /// <param name="stroke">要移除的墨迹</param>
+        public void RemoveStroke(Stroke stroke)
+        {
+            if (stroke == null) return;
+
+            try
+            {
+                if (_fadeTimers.TryGetValue(stroke, out var timer))
+                {
+                    timer.Stop();
+                    _fadeTimers.Remove(stroke);
+                }
+
+                if (_strokeVisuals.TryGetValue(stroke, out var visual))
+                {
+                    _dispatcher.InvokeAsync(() =>
+                    {
+                        try
+                        {
+                            // 从父容器中移除墨迹
+                            var parent = _mainWindow.inkCanvas?.Parent as Panel;
+                            if (parent != null && parent.Children.Contains(visual))
+                            {
+                                parent.Children.Remove(visual);
+                            }
+                            else if (_mainWindow.inkCanvas != null && _mainWindow.inkCanvas.Children.Contains(visual))
+                            {
+                                _mainWindow.inkCanvas.Children.Remove(visual);
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"从画布移除墨迹视觉元素失败: {ex}", LogHelper.LogType.Error);
+                        }
+                    });
+
+                    _strokeVisuals.Remove(stroke);
+                }
+
+                _strokeStartPoints.Remove(stroke);
+                _strokeEndPoints.Remove(stroke);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"移除渐隐墨迹失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 清除所有渐隐墨迹
+        /// </summary>
+        public void ClearAllFadingStrokes()
+        {
+            try
+            {
+                foreach (var timer in _fadeTimers.Values)
+                {
+                    timer.Stop();
+                }
+
+                _fadeTimers.Clear();
+
+                _dispatcher.InvokeAsync(() =>
+                {
+                    try
+                    {
+                        if (_mainWindow.inkCanvas != null)
+                        {
+                            var parent = _mainWindow.inkCanvas.Parent as Panel;
+                            foreach (var visual in _strokeVisuals.Values)
+                            {
+                                if (parent != null && parent.Children.Contains(visual))
+                                {
+                                    parent.Children.Remove(visual);
+                                }
+                                else if (_mainWindow.inkCanvas.Children.Contains(visual))
+                                {
+                                    _mainWindow.inkCanvas.Children.Remove(visual);
+                                }
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"清除所有墨迹视觉元素失败: {ex}", LogHelper.LogType.Error);
+                    }
+                });
+
+                _strokeVisuals.Clear();
+                _strokeStartPoints.Clear();
+                _strokeEndPoints.Clear();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"清除所有渐隐墨迹失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 更新渐隐时间设置
+        /// </summary>
+        /// <param name="fadeTime">新的渐隐时间（毫秒）</param>
+        public void UpdateFadeTime(int fadeTime)
+        {
+            FadeTime = fadeTime;
+
+            foreach (var kvp in _fadeTimers)
+            {
+                var stroke = kvp.Key;
+                var timer = kvp.Value;
+
+                timer.Stop();
+                timer.Interval = TimeSpan.FromMilliseconds(FadeTime);
+                timer.Start();
+            }
+        }
+
+
+
+        /// <summary>
+        /// 启用墨迹渐隐功能
+        /// </summary>
+        public void Enable()
+        {
+            IsEnabled = true;
+        }
+
+        /// <summary>
+        /// 禁用墨迹渐隐功能
+        /// </summary>
+        public void Disable()
+        {
+            IsEnabled = false;
+        }
+        #endregion
+
+        #region Private Methods
+        /// <summary>
+        /// 创建墨迹的视觉元素
+        /// </summary>
+        /// <param name="stroke">墨迹对象</param>
+        /// <returns>视觉元素</returns>
+        private UIElement CreateStrokeVisual(Stroke stroke)
+        {
+            try
+            {
+                // 创建路径几何，使用墨迹的实际位置
+                var geometry = stroke.GetGeometry();
+                if (geometry == null)
+                {
+                    return null;
+                }
+
+                // 获取绘画属性
+                var drawingAttribs = stroke.DrawingAttributes;
+
+                // 创建路径元素，确保使用正确的绘画属性
+                var path = new Path
+                {
+                    Data = geometry,
+                    Stroke = new SolidColorBrush(drawingAttribs.Color),
+                    StrokeThickness = drawingAttribs.Width, // 使用原始墨迹的粗细
+                    StrokeStartLineCap = PenLineCap.Round,
+                    StrokeEndLineCap = PenLineCap.Round,
+                    StrokeLineJoin = PenLineJoin.Round,
+                    Fill = drawingAttribs.IsHighlighter ? new SolidColorBrush(drawingAttribs.Color) : null, // 高亮笔需要填充
+                    Opacity = 0.95, // 初始透明度更高，显得更自然
+
+                    // 优化渲染质量
+                    UseLayoutRounding = false,
+                    SnapsToDevicePixels = false
+                };
+
+                // 如果是高亮笔，调整透明度和混合模式
+                if (drawingAttribs.IsHighlighter)
+                {
+                    path.Opacity = 0.4; // 高亮笔初始透明度更低，更符合荧光笔特性
+
+                    // 为高亮笔添加特殊的混合效果
+                    // 使用更柔和的笔触样式
+                    path.StrokeStartLineCap = PenLineCap.Flat;
+                    path.StrokeEndLineCap = PenLineCap.Flat;
+                    path.StrokeLineJoin = PenLineJoin.Miter;
+
+                    // 高亮笔通常需要更宽的笔触来覆盖下面的内容
+                    if (drawingAttribs.Width < 20)
+                    {
+                        path.StrokeThickness = Math.Max(drawingAttribs.Width * 1.5, 20);
+                    }
+
+                    // 为高亮笔添加轻微的模糊效果，使渐隐更加自然
+                    path.Effect = new BlurEffect
+                    {
+                        Radius = 0.5, // 轻微的模糊效果
+                        KernelType = KernelType.Gaussian
+                    };
+                }
+
+                // 不设置任何变换，保持墨迹原有粗细
+                var bounds = geometry.Bounds;
+
+                // 设置墨迹的初始位置
+                System.Windows.Controls.Canvas.SetLeft(path, bounds.Left);
+                System.Windows.Controls.Canvas.SetTop(path, bounds.Top);
+
+                return path;
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// 开始渐隐动画
+        /// </summary>
+        /// <param name="stroke">要渐隐的墨迹</param>
+        private void StartFadeAnimation(Stroke stroke)
+        {
+            if (!_strokeVisuals.TryGetValue(stroke, out var visual)) return;
+
+            try
+            {
+                _dispatcher.InvokeAsync(() =>
+                {
+                    // 获取当前透明度和判断是否为高亮笔
+                    var currentOpacity = visual.Opacity;
+                    var isHighlighter = stroke.DrawingAttributes.IsHighlighter;
+
+                    // 根据墨迹类型选择不同的动画效果
+                    if (isHighlighter)
+                    {
+                        StartHighlighterFadeAnimation(visual, stroke, currentOpacity);
+                    }
+                    else
+                    {
+                        StartNormalStrokeFadeAnimation(visual, stroke, currentOpacity);
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"开始渐隐动画失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 开始普通墨迹的渐隐动画
+        /// </summary>
+        private void StartNormalStrokeFadeAnimation(UIElement visual, Stroke stroke, double currentOpacity)
+        {
+            try
+            {
+                StartProgressiveFadeAnimation(visual, stroke, currentOpacity, AnimationDuration);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"开始普通墨迹渐隐动画失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 统一渐隐动画 - 整个墨迹作为一个整体进行渐隐，与擦除效果一致
+        /// </summary>
+        private void StartUnifiedFadeAnimation(UIElement visual, Stroke stroke, double currentOpacity, int duration)
+        {
+            try
+            {
+                // 创建透明度动画，模拟擦除时的效果
+                var fadeAnimation = new DoubleAnimation
+                {
+                    From = currentOpacity,
+                    To = 0.0,
+                    Duration = TimeSpan.FromMilliseconds(duration),
+                    EasingFunction = new CubicEase { EasingMode = EasingMode.EaseInOut }
+                };
+
+                // 如果是高亮笔，添加轻微的缩放效果，使渐隐更加自然
+                if (stroke.DrawingAttributes.IsHighlighter)
+                {
+                    // 创建轻微的缩放动画，模拟墨迹"蒸发"的效果
+                    var scaleAnimation = new DoubleAnimation
+                    {
+                        From = 1.0,
+                        To = 0.95, // 轻微缩小，增加自然感
+                        Duration = TimeSpan.FromMilliseconds(duration),
+                        EasingFunction = new QuadraticEase { EasingMode = EasingMode.EaseIn }
+                    };
+
+                    // 创建缩放变换
+                    var scaleTransform = new ScaleTransform();
+                    visual.RenderTransform = scaleTransform;
+                    visual.RenderTransformOrigin = new Point(0.5, 0.5);
+
+                    // 应用缩放动画
+                    scaleTransform.BeginAnimation(ScaleTransform.ScaleXProperty, scaleAnimation);
+                    scaleTransform.BeginAnimation(ScaleTransform.ScaleYProperty, scaleAnimation);
+                }
+
+                // 添加动画完成事件
+                fadeAnimation.Completed += (sender, e) => OnAnimationCompleted(visual, stroke);
+
+                // 应用透明度动画
+                visual.BeginAnimation(UIElement.OpacityProperty, fadeAnimation);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"统一渐隐动画失败: {ex}", LogHelper.LogType.Error);
+                OnAnimationCompleted(visual, stroke);
+            }
+        }
+
+        /// <summary>
+        /// 开始高亮笔的渐隐动画
+        /// </summary>
+        private void StartHighlighterFadeAnimation(UIElement visual, Stroke stroke, double currentOpacity)
+        {
+            try
+            {
+                // 高亮笔使用统一的渐隐动画，与擦除效果一致
+                StartUnifiedFadeAnimation(visual, stroke, currentOpacity, (int)(AnimationDuration * 1.2));
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"开始高亮笔渐隐动画失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 渐进式渐隐动画 - 从起点到终点逐渐消失
+        /// </summary>
+        private void StartProgressiveFadeAnimation(UIElement visual, Stroke stroke, double currentOpacity, int duration)
+        {
+            try
+            {
+                // 确保所有墨迹都能显示动画，包括短墨迹
+                if (stroke.StylusPoints.Count < 2)
+                {
+                    // 只有1个点的墨迹也使用分段动画，确保视觉效果
+                    CreateSegmentedStroke(visual, stroke, currentOpacity, duration);
+                    return;
+                }
+
+                // 将墨迹分段并创建多个 Path
+                CreateSegmentedStroke(visual, stroke, currentOpacity, duration);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"渐进式渐隐动画失败: {ex}", LogHelper.LogType.Error);
+                // 失败时回退到简单动画
+                StartSimpleFadeAnimation(visual, stroke, currentOpacity, duration);
+            }
+        }
+
+        /// <summary>
+        /// 创建分段墨迹并开始渐进消失
+        /// </summary>
+        private void CreateSegmentedStroke(UIElement originalVisual, Stroke stroke, double opacity, int duration)
+        {
+            try
+            {
+                var stylusPoints = stroke.StylusPoints;
+                var totalPoints = stylusPoints.Count;
+
+                // 分段算法 - 确保所有墨迹都有足够的动画效果
+                var strokeLength = CalculateStrokeLength(stylusPoints);
+                var segmentCount = CalculateOptimalSegmentCount(totalPoints, strokeLength);
+
+                // 强制最小分段数量，确保短墨迹也有动画效果
+                segmentCount = Math.Max(segmentCount, 4);
+
+                var pointsPerSegment = Math.Max(1, totalPoints / segmentCount);
+
+                // 隐藏原始视觉元素
+                originalVisual.Visibility = Visibility.Hidden;
+
+                var segments = new List<UIElement>();
+                var parent = _mainWindow.inkCanvas?.Parent as Panel;
+                if (parent == null)
+                {
+                    // 如果父容器不是Panel，直接使用InkCanvas
+                    parent = null; // 稍后会检查并使用InkCanvas.Children
+                }
+
+                // 创建各个分段 - 确保短墨迹也能正确分段
+                for (int i = 0; i < segmentCount; i++)
+                {
+                    var startIndex = i * pointsPerSegment;
+                    var endIndex = (i == segmentCount - 1) ? totalPoints - 1 : (i + 1) * pointsPerSegment;
+
+                    // 确保有足够的点来创建分段，对于短墨迹特殊处理
+                    if (endIndex <= startIndex && totalPoints > 1)
+                    {
+                        // 短墨迹：每个点作为一个分段
+                        startIndex = i;
+                        endIndex = Math.Min(i + 1, totalPoints - 1);
+                    }
+
+                    // 为每个分段添加重叠，确保连接处平滑
+                    var overlap = Math.Max(1, pointsPerSegment / 6); // 15%的重叠，平衡平滑与速度
+                    var actualStartIndex = Math.Max(0, startIndex - overlap);
+                    var actualEndIndex = Math.Min(totalPoints - 1, endIndex + overlap);
+
+                    var segment = CreateStrokeSegment(stroke, actualStartIndex, actualEndIndex, opacity);
+                    if (segment != null)
+                    {
+                        segments.Add(segment);
+                        if (parent != null)
+                        {
+                            parent.Children.Add(segment);
+                        }
+                        else if (_mainWindow.inkCanvas != null)
+                        {
+                            _mainWindow.inkCanvas.Children.Add(segment);
+                        }
+                    }
+                }
+
+                // 开始分段渐隐动画
+                StartSegmentedFadeAnimation(segments, stroke, originalVisual, duration);
+            }
+            catch (Exception)
+            {
+                StartSimpleFadeAnimation(originalVisual, stroke, opacity, duration);
+            }
+        }
+
+        /// <summary>
+        /// 创建墨迹分段
+        /// </summary>
+        private UIElement CreateStrokeSegment(Stroke originalStroke, int startIndex, int endIndex, double opacity)
+        {
+            try
+            {
+                // 创建分段的 StylusPoint 集合
+                var segmentPoints = new StylusPointCollection();
+                for (int i = startIndex; i <= endIndex && i < originalStroke.StylusPoints.Count; i++)
+                {
+                    segmentPoints.Add(originalStroke.StylusPoints[i]);
+                }
+
+                if (segmentPoints.Count < 2) return null;
+
+                // 创建分段墨迹
+                var segmentStroke = new Stroke(segmentPoints)
+                {
+                    DrawingAttributes = originalStroke.DrawingAttributes.Clone()
+                };
+
+                // 创建分段的视觉元素
+                var geometry = segmentStroke.GetGeometry();
+                if (geometry == null) return null;
+
+                var drawingAttribs = segmentStroke.DrawingAttributes;
+                var path = new Path
+                {
+                    Data = geometry,
+                    Stroke = new SolidColorBrush(drawingAttribs.Color),
+                    StrokeThickness = drawingAttribs.Width,
+                    StrokeStartLineCap = drawingAttribs.IsHighlighter ? PenLineCap.Flat : PenLineCap.Round,
+                    StrokeEndLineCap = drawingAttribs.IsHighlighter ? PenLineCap.Flat : PenLineCap.Round,
+                    StrokeLineJoin = drawingAttribs.IsHighlighter ? PenLineJoin.Miter : PenLineJoin.Round,
+                    Fill = drawingAttribs.IsHighlighter ? new SolidColorBrush(drawingAttribs.Color) : null,
+                    Opacity = opacity,
+                    UseLayoutRounding = false,
+                    SnapsToDevicePixels = false
+                };
+
+                // 设置位置
+                var bounds = geometry.Bounds;
+                System.Windows.Controls.Canvas.SetLeft(path, bounds.Left);
+                System.Windows.Controls.Canvas.SetTop(path, bounds.Top);
+
+                return path;
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// 开始分段渐隐动画
+        /// </summary>
+        private void StartSegmentedFadeAnimation(List<UIElement> segments, Stroke originalStroke, UIElement originalVisual, int totalDuration)
+        {
+            try
+            {
+                // 动画时序算法
+                var segmentDuration = CalculateOptimalSegmentDuration(totalDuration, segments.Count);
+                var animationCurve = CreateAppleStyleAnimationCurve(segments.Count, totalDuration);
+
+                // 跟踪动画完成状态
+                var completedSegments = new HashSet<UIElement>();
+                var totalSegments = segments.Count;
+
+                // 渐隐效果 - 使用自然的动画曲线
+                for (int i = 0; i < segments.Count; i++)
+                {
+                    var segment = segments[i];
+
+                    // 使用预计算的动画曲线获取延迟时间
+                    var delay = animationCurve[i];
+
+                    // 使用定时器延迟启动每个分段的动画
+                    var timer = new DispatcherTimer
+                    {
+                        Interval = TimeSpan.FromMilliseconds(delay)
+                    };
+
+                    int segmentIndex = i; // 捕获当前索引
+                    timer.Tick += (sender, e) =>
+                    {
+                        StartSingleSegmentFadeAnimation(segment, segmentDuration, () =>
+                        {
+                            // 动画完成回调
+                            lock (completedSegments)
+                            {
+                                completedSegments.Add(segment);
+
+                                // 检查是否所有分段都完成了
+                                if (completedSegments.Count >= totalSegments)
+                                {
+                                    CleanupSegmentedAnimation(segments, originalStroke, originalVisual);
+                                }
+                            }
+                        });
+                        timer.Stop();
+                    };
+
+                    timer.Start();
+                }
+
+                // 设置一个安全超时定时器，防止无限等待
+                var safetyTimeout = totalDuration + (segments.Count * segmentDuration) + 1200; // 额外1.2秒缓冲，确保动画完整
+                var safetyTimer = new DispatcherTimer
+                {
+                    Interval = TimeSpan.FromMilliseconds(safetyTimeout)
+                };
+
+                safetyTimer.Tick += (sender, e) =>
+                {
+                    CleanupSegmentedAnimation(segments, originalStroke, originalVisual);
+                    safetyTimer.Stop();
+                };
+
+                safetyTimer.Start();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"分段渐隐动画失败: {ex}", LogHelper.LogType.Error);
+                CleanupSegmentedAnimation(segments, originalStroke, originalVisual);
+            }
+        }
+
+        /// <summary>
+        /// 单个分段的渐隐动画
+        /// </summary>
+        private void StartSingleSegmentFadeAnimation(UIElement segment, int duration, Action onCompleted = null)
+        {
+            try
+            {
+                // 只使用透明度动画，保持墨迹原有粗细
+                var fadeAnimation = new DoubleAnimation
+                {
+                    From = segment.Opacity,
+                    To = 0.0,
+                    Duration = TimeSpan.FromMilliseconds(duration),
+                    EasingFunction = new CubicEase { EasingMode = EasingMode.EaseInOut } // 更平滑的缓动
+                };
+
+                // 添加动画完成事件
+                if (onCompleted != null)
+                {
+                    fadeAnimation.Completed += (sender, e) =>
+                    {
+                        onCompleted?.Invoke();
+                    };
+                }
+
+                // 只应用透明度动画，不改变墨迹大小
+                segment.BeginAnimation(UIElement.OpacityProperty, fadeAnimation);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"单个分段渐隐动画失败: {ex}", LogHelper.LogType.Error);
+                // 即使失败也要调用完成回调
+                onCompleted?.Invoke();
+            }
+        }
+
+        /// <summary>
+        /// 清理分段动画
+        /// </summary>
+        private void CleanupSegmentedAnimation(List<UIElement> segments, Stroke originalStroke, UIElement originalVisual)
+        {
+            try
+            {
+                // 移除所有分段
+                var parent = _mainWindow.inkCanvas?.Parent as Panel;
+
+                foreach (var segment in segments)
+                {
+                    if (parent != null && parent.Children.Contains(segment))
+                    {
+                        parent.Children.Remove(segment);
+                    }
+                    else if (_mainWindow.inkCanvas != null && _mainWindow.inkCanvas.Children.Contains(segment))
+                    {
+                        _mainWindow.inkCanvas.Children.Remove(segment);
+                    }
+                }
+
+                // 清理原始墨迹
+                OnAnimationCompleted(originalVisual, originalStroke);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"清理分段动画失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 简单渐隐动画（备用方案）
+        /// </summary>
+        private void StartSimpleFadeAnimation(UIElement visual, Stroke stroke, double currentOpacity, int duration)
+        {
+            try
+            {
+                var fadeAnimation = new DoubleAnimation
+                {
+                    From = currentOpacity,
+                    To = 0.0,
+                    Duration = TimeSpan.FromMilliseconds(duration),
+                    EasingFunction = new QuadraticEase { EasingMode = EasingMode.EaseIn }
+                };
+
+                fadeAnimation.Completed += (sender, e) => OnAnimationCompleted(visual, stroke);
+                visual.BeginAnimation(UIElement.OpacityProperty, fadeAnimation);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"简单渐隐动画失败: {ex}", LogHelper.LogType.Error);
+                OnAnimationCompleted(visual, stroke);
+            }
+        }
+
+        /// <summary>
+        /// 计算墨迹的实际长度
+        /// </summary>
+        private double CalculateStrokeLength(StylusPointCollection points)
+        {
+            if (points.Count < 2) return 0;
+
+            double totalLength = 0;
+            for (int i = 1; i < points.Count; i++)
+            {
+                var p1 = points[i - 1].ToPoint();
+                var p2 = points[i].ToPoint();
+                totalLength += Math.Sqrt(Math.Pow(p2.X - p1.X, 2) + Math.Pow(p2.Y - p1.Y, 2));
+            }
+            return totalLength;
+        }
+
+        /// <summary>
+        /// 根据墨迹特性计算最优分段数量 - 平衡速度与完整性
+        /// </summary>
+        private int CalculateOptimalSegmentCount(int pointCount, double strokeLength)
+        {
+            // 平衡速度与完整性，确保动画效果的同时提高速度
+            const double PIXELS_PER_SEGMENT = 12.0; // 每段适中长度，平衡效果与速度
+            const int MIN_SEGMENTS = 5; // 适当的最小分段数，确保动画效果
+            const int MAX_SEGMENTS = 100; // 适中的最大分段数，平衡性能与效果
+
+            // 根据长度计算基础分段数
+            var lengthBasedSegments = Math.Max(MIN_SEGMENTS, (int)(strokeLength / PIXELS_PER_SEGMENT));
+
+            // 根据点密度调整，平衡效果与速度
+            var density = pointCount > 0 ? strokeLength / pointCount : 1;
+            var densityFactor = Math.Max(0.4, Math.Min(2.5, density / 1.8));
+
+            var finalSegments = (int)(lengthBasedSegments * densityFactor);
+
+            // 对于短墨迹，确保至少有4个分段
+            if (pointCount <= 5)
+            {
+                finalSegments = Math.Max(finalSegments, 4);
+            }
+
+            // 限制在合理范围内
+            return Math.Min(MAX_SEGMENTS, Math.Max(MIN_SEGMENTS, finalSegments));
+        }
+
+        /// <summary>
+        /// 计算最优的单段动画持续时间 - 平衡速度与完整性
+        /// </summary>
+        private int CalculateOptimalSegmentDuration(int totalDuration, int segmentCount)
+        {
+            // 平衡速度与动画完整性
+            var baseDuration = totalDuration / Math.Max(segmentCount, 1);
+            var minDuration = 150; // 每段最少150ms，确保动画完整显示
+            var maxDuration = 500; // 每段最多500ms，平衡速度与完整性
+
+            return Math.Max(minDuration, Math.Min(maxDuration, baseDuration));
+        }
+
+        /// <summary>
+        /// 创建优化的动画时间曲线 - 平衡速度与完整性
+        /// </summary>
+        private int[] CreateAppleStyleAnimationCurve(int segmentCount, int totalDuration)
+        {
+            var curve = new int[segmentCount];
+
+            // 平衡速度与完整性，确保动画有足够时间播放
+            var availableTime = totalDuration * 0.6; // 使用60%的总时间，给动画留足够缓冲
+            var delayBetweenSegments = Math.Max(60, availableTime / Math.Max(segmentCount, 1));
+
+            for (int i = 0; i < segmentCount; i++)
+            {
+                // 线性延迟，确保每个分段都有足够时间
+                curve[i] = (int)(i * delayBetweenSegments);
+            }
+
+            return curve;
+        }
+
+        /// <summary>
+        /// 动画完成后的统一处理
+        /// </summary>
+        private void OnAnimationCompleted(UIElement visual, Stroke stroke)
+        {
+            try
+            {
+                // 从父容器中移除墨迹
+                var parent = _mainWindow.inkCanvas?.Parent as Panel;
+                if (parent != null && parent.Children.Contains(visual))
+                {
+                    parent.Children.Remove(visual);
+                }
+                else if (_mainWindow.inkCanvas != null && _mainWindow.inkCanvas.Children.Contains(visual))
+                {
+                    _mainWindow.inkCanvas.Children.Remove(visual);
+                }
+
+                RemoveStroke(stroke);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"渐隐动画完成后清理墨迹失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+        #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

@@ -0,0 +1,324 @@
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Ink;
+using System.Windows.Media;
+
+namespace Ink_Canvas.Helpers
+{
+    public class InkRecognizeHelper
+    {
+        /// <summary>IACore / IAWinFX 形状识别（典型用于 32 位进程）。</summary>
+        public static ShapeRecognizeResult RecognizeShapeIACore(StrokeCollection strokes)
+        {
+            if (strokes == null || strokes.Count == 0)
+                return default;
+
+            var analyzer = new InkAnalyzer();
+            analyzer.AddStrokes(strokes);
+            analyzer.SetStrokesType(strokes, StrokeType.Drawing);
+
+            AnalysisAlternate analysisAlternate = null;
+            int strokesCount = strokes.Count;
+            var sfsaf = analyzer.Analyze();
+            if (sfsaf.Successful)
+            {
+                var alternates = analyzer.GetAlternates();
+                if (alternates.Count > 0)
+                {
+                    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;
+                    }
+                }
+            }
+
+            analyzer.Dispose();
+
+            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")
+                || name.Contains("Ellipse"))
+            {
+                return true;
+            }
+            return false;
+        }
+    }
+
+    //Recognizer 的实现
+
+    public enum RecognizeLanguage
+    {
+        SimplifiedChinese = 0x0804,
+        TraditionalChinese = 0x7c03,
+        English = 0x0809
+    }
+
+    public class ShapeRecognizeResult
+    {
+        public ShapeRecognizeResult(Point centroid, PointCollection hotPoints, AnalysisAlternate analysisAlternate, InkDrawingNode node)
+        {
+            Centroid = centroid;
+            HotPoints = hotPoints;
+            AnalysisAlternate = analysisAlternate;
+            InkDrawingNode = node;
+        }
+
+        public AnalysisAlternate AnalysisAlternate { get; }
+
+        public Point Centroid { get; set; }
+
+        public PointCollection HotPoints { get; }
+
+        public InkDrawingNode InkDrawingNode { get; }
+    }
+
+    /// <summary>
+    /// 图形识别类
+    /// </summary>
+    //public class ShapeRecogniser
+    //{
+    //    public InkAnalyzer _inkAnalyzer = null;
+
+    //    private ShapeRecogniser()
+    //    {
+    //        this._inkAnalyzer = new InkAnalyzer
+    //        {
+    //            AnalysisModes = AnalysisModes.AutomaticReconciliationEnabled
+    //        };
+    //    }
+
+    //    /// <summary>
+    //    /// 根据笔迹集合返回图形名称字符串
+    //    /// </summary>
+    //    /// <param name="strokeCollection"></param>
+    //    /// <returns></returns>
+    //    public InkDrawingNode Recognition(StrokeCollection strokeCollection)
+    //    {
+    //        if (strokeCollection == null)
+    //        {
+    //            //MessageBox.Show("dddddd");
+    //            return null;
+    //        }
+
+    //        InkDrawingNode result = null;
+    //        try
+    //        {
+    //            this._inkAnalyzer.AddStrokes(strokeCollection);
+    //            if (this._inkAnalyzer.Analyze().Successful)
+    //            {
+    //                result = _internalAnalyzer(this._inkAnalyzer);
+    //                this._inkAnalyzer.RemoveStrokes(strokeCollection);
+    //            }
+    //        }
+    //        catch (System.Exception ex)
+    //        {
+    //            //result = ex.Message;
+    //            System.Diagnostics.Debug.WriteLine(ex.Message);
+    //        }
+
+    //        return result;
+    //    }
+
+    //    /// <summary>
+    //    /// 实现笔迹的分析，返回图形对应的字符串
+    //    /// 你在实际的应用中根据返回的字符串来生成对应的Shape
+    //    /// </summary>
+    //    /// <param name="ink"></param>
+    //    /// <returns></returns>
+    //    private InkDrawingNode _internalAnalyzer(InkAnalyzer ink)
+    //    {
+    //        try
+    //        {
+    //            ContextNodeCollection nodecollections = ink.FindNodesOfType(ContextNodeType.InkDrawing);
+    //            foreach (ContextNode node in nodecollections)
+    //            {
+    //                InkDrawingNode drawingNode = node as InkDrawingNode;
+    //                if (drawingNode != null)
+    //                {
+    //                    return drawingNode;//.GetShapeName();
+    //                }
+    //            }
+    //        }
+    //        catch (System.Exception ex)
+    //        {
+    //            System.Diagnostics.Debug.WriteLine(ex.Message);
+    //        }
+
+    //        return null;
+    //    }
+
+
+    //    private static ShapeRecogniser instance = null;
+    //    public static ShapeRecogniser Instance
+    //    {
+    //        get
+    //        {
+    //            return instance == null ? (instance = new ShapeRecogniser()) : instance;
+    //        }
+    //    }
+    //}
+
+
+    //用于自动控制其他形状相对于圆的位置
+
+    public class Circle
+    {
+        public Circle(Point centroid, double r, Stroke stroke)
+        {
+            Centroid = centroid;
+            R = r;
+            Stroke = stroke;
+        }
+
+        public Point Centroid { get; set; }
+
+        public double R { get; set; }
+
+        public Stroke Stroke { get; set; }
+    }
+}

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

@@ -0,0 +1,164 @@
+using System;
+using System.Diagnostics;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 墨迹平滑配置类
+    /// </summary>
+    public class InkSmoothingConfig
+    {
+        // 基本平滑参数
+        public double SmoothingStrength { get; set; } = 0.4;
+        public double ResampleInterval { get; set; } = 2.5;
+        public int InterpolationSteps { get; set; } = 12;
+
+        // 贝塞尔曲线参数
+        public bool UseAdaptiveInterpolation { get; set; } = true;
+        public double CurveTension { get; set; } = 0.3;
+        public double MinCurvatureThreshold { get; set; } = 0.1;
+        public double MaxCurvatureThreshold { get; set; } = 0.8;
+
+        // 性能参数
+        public bool UseHardwareAcceleration { get; set; } = true;
+        public bool UseAsyncProcessing { get; set; } = true;
+        public int MaxConcurrentTasks { get; set; } = Environment.ProcessorCount;
+        public int MaxPointsPerStroke { get; set; } = 10000;
+
+        // 质量设置
+        public SmoothingQuality Quality { get; set; } = SmoothingQuality.Balanced;
+
+        public enum SmoothingQuality
+        {
+            Performance,    // 性能优先
+            Balanced,       // 平衡
+            Quality        // 质量优先
+        }
+
+        // 兼容性枚举
+        public enum InkSmoothingQuality
+        {
+            HighPerformance = 0,  // 高性能低质量
+            Balanced = 1,         // 平衡
+            HighQuality = 2       // 高质量低性能
+        }
+
+        /// <summary>
+        /// 从设置中加载配置
+        /// </summary>
+        public static InkSmoothingConfig FromSettings()
+        {
+            var config = new InkSmoothingConfig();
+
+            try
+            {
+                // 尝试从MainWindow.Settings加载配置（兼容性）
+                if (MainWindow.Settings?.Canvas != null)
+                {
+                    config.Quality = (SmoothingQuality)MainWindow.Settings.Canvas.InkSmoothingQuality;
+                    config.UseHardwareAcceleration = MainWindow.Settings.Canvas.UseHardwareAcceleration;
+                    config.UseAsyncProcessing = MainWindow.Settings.Canvas.UseAsyncInkSmoothing;
+                    config.MaxConcurrentTasks = MainWindow.Settings.Canvas.MaxConcurrentSmoothingTasks > 0 ?
+                        MainWindow.Settings.Canvas.MaxConcurrentSmoothingTasks : Environment.ProcessorCount;
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"加载平滑配置失败: {ex.Message}");
+            }
+
+            return config;
+        }
+
+        /// <summary>
+        /// 应用质量设置 
+        /// </summary>
+        public void ApplyQualitySettings()
+        {
+            // 保存用户设置的异步处理偏好
+            bool userAsyncPreference = UseAsyncProcessing;
+
+            switch (Quality)
+            {
+                case SmoothingQuality.Performance:
+                    SmoothingStrength = 0.15;
+                    ResampleInterval = 5.0;
+                    InterpolationSteps = 4;
+                    UseAdaptiveInterpolation = false;
+                    CurveTension = 0.15;
+                    MaxConcurrentTasks = Math.Max(1, Environment.ProcessorCount / 2);
+                    UseHardwareAcceleration = true;
+                    UseAsyncProcessing = userAsyncPreference;
+                    break;
+
+                case SmoothingQuality.Balanced:
+                    SmoothingStrength = 0.3;
+                    ResampleInterval = 3.0;
+                    InterpolationSteps = 8;
+                    UseAdaptiveInterpolation = true;
+                    CurveTension = 0.25;
+                    MaxConcurrentTasks = Environment.ProcessorCount;
+                    UseHardwareAcceleration = true;
+                    UseAsyncProcessing = userAsyncPreference;
+                    break;
+
+                case SmoothingQuality.Quality:
+                    SmoothingStrength = 0.5;
+                    ResampleInterval = 2.0;
+                    InterpolationSteps = 15;
+                    UseAdaptiveInterpolation = true;
+                    CurveTension = 0.35;
+                    MaxConcurrentTasks = Environment.ProcessorCount;
+                    UseHardwareAcceleration = true;
+                    UseAsyncProcessing = userAsyncPreference;
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// 保存配置到设置
+        /// </summary>
+        public void SaveToSettings()
+        {
+            try
+            {
+                // 尝试保存到MainWindow.Settings（兼容性）
+                if (MainWindow.Settings?.Canvas != null)
+                {
+                    MainWindow.Settings.Canvas.InkSmoothingQuality = (int)Quality;
+                    MainWindow.Settings.Canvas.UseHardwareAcceleration = UseHardwareAcceleration;
+                    MainWindow.Settings.Canvas.UseAsyncInkSmoothing = UseAsyncProcessing;
+                    MainWindow.Settings.Canvas.MaxConcurrentSmoothingTasks = MaxConcurrentTasks;
+
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"保存平滑配置失败: {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 验证配置参数
+        /// </summary>
+        public bool Validate()
+        {
+            return SmoothingStrength >= 0.0 && SmoothingStrength <= 1.0 &&
+                   ResampleInterval > 0.0 &&
+                   InterpolationSteps > 0 && InterpolationSteps <= 50 &&
+                   CurveTension >= 0.0 && CurveTension <= 1.0 &&
+                   MaxConcurrentTasks > 0 &&
+                   MaxPointsPerStroke > 0;
+        }
+
+        /// <summary>
+        /// 获取配置摘要
+        /// </summary>
+        public string GetSummary()
+        {
+            return $"质量: {Quality}, 强度: {SmoothingStrength:F2}, 间隔: {ResampleInterval:F1}, " +
+                   $"步数: {InterpolationSteps}, 自适应: {UseAdaptiveInterpolation}, " +
+                   $"张力: {CurveTension:F2}, 硬件加速: {UseHardwareAcceleration}";
+        }
+    }
+}

Ink Canvas/Helpers/InkSmoothingManager.cs

@@ -0,0 +1,262 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Ink;
+using System.Windows.Media;
+using System.Windows.Threading;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 统一的墨迹平滑管理器，整合异步处理和硬件加速
+    /// </summary>
+    public class InkSmoothingManager : IDisposable
+    {
+        private readonly AsyncAdvancedBezierSmoothing _asyncSmoothing;
+        private readonly HardwareAcceleratedInkProcessor _hardwareProcessor;
+        private readonly InkSmoothingPerformanceMonitor _performanceMonitor;
+        private readonly InkSmoothingConfig _config;
+        private readonly Dispatcher _uiDispatcher;
+        private bool _disposed;
+
+        public InkSmoothingManager(Dispatcher uiDispatcher)
+        {
+            _uiDispatcher = uiDispatcher;
+            _config = InkSmoothingConfig.FromSettings();
+            _config.ApplyQualitySettings();
+
+            _asyncSmoothing = new AsyncAdvancedBezierSmoothing(uiDispatcher)
+            {
+                SmoothingStrength = _config.SmoothingStrength,
+                ResampleInterval = _config.ResampleInterval,
+                InterpolationSteps = _config.InterpolationSteps,
+                UseHardwareAcceleration = _config.UseHardwareAcceleration,
+                MaxConcurrentTasks = _config.MaxConcurrentTasks
+            };
+
+            _hardwareProcessor = new HardwareAcceleratedInkProcessor();
+            _performanceMonitor = new InkSmoothingPerformanceMonitor();
+        }
+
+        /// <summary>
+        /// 平滑笔画（自动选择最佳方法）
+        /// </summary>
+        public async Task<Stroke> SmoothStrokeAsync(Stroke originalStroke,
+            Action<Stroke, Stroke> onCompleted = null,
+            CancellationToken cancellationToken = default)
+        {
+            if (originalStroke == null || originalStroke.StylusPoints.Count < 2)
+                return originalStroke;
+
+            var stopwatch = Stopwatch.StartNew();
+            Stroke result = originalStroke;
+
+            try
+            {
+                if (_config.UseAsyncProcessing)
+                {
+                    // 使用异步处理
+                    result = await _asyncSmoothing.SmoothStrokeAsync(originalStroke, onCompleted, cancellationToken);
+                }
+                else if (_config.UseHardwareAcceleration)
+                {
+                    // 使用硬件加速但同步处理
+                    result = await _hardwareProcessor.SmoothStrokeWithGPU(originalStroke);
+                    onCompleted?.Invoke(originalStroke, result);
+                }
+                else
+                {
+                    // 回退到传统同步处理
+                    result = await Task.Run(() =>
+                    {
+                        var traditionalSmoothing = new AdvancedBezierSmoothing();
+                        return traditionalSmoothing.SmoothStroke(originalStroke);
+                    }, cancellationToken);
+                    onCompleted?.Invoke(originalStroke, result);
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                result = originalStroke;
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"墨迹平滑失败: {ex.Message}");
+                result = originalStroke;
+            }
+            finally
+            {
+                stopwatch.Stop();
+                _performanceMonitor.RecordProcessingTime(stopwatch.Elapsed);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// 同步平滑笔画（用于向后兼容）
+        /// </summary>
+        public Stroke SmoothStroke(Stroke originalStroke)
+        {
+            if (originalStroke == null || originalStroke.StylusPoints.Count < 2)
+                return originalStroke;
+
+            var stopwatch = Stopwatch.StartNew();
+            Stroke result;
+
+            try
+            {
+                if (_config.UseHardwareAcceleration)
+                {
+                    // 使用硬件加速的同步版本
+                    var task = _hardwareProcessor.SmoothStrokeWithGPU(originalStroke);
+                    task.Wait(5000); // 5秒超时
+                    result = task.Status == TaskStatus.RanToCompletion ? task.Result : originalStroke;
+                }
+                else
+                {
+                    // 传统同步处理
+                    var traditionalSmoothing = new AdvancedBezierSmoothing();
+                    result = traditionalSmoothing.SmoothStroke(originalStroke);
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"同步墨迹平滑失败: {ex.Message}");
+                result = originalStroke;
+            }
+            finally
+            {
+                stopwatch.Stop();
+                _performanceMonitor.RecordProcessingTime(stopwatch.Elapsed);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// 更新配置
+        /// </summary>
+        public void UpdateConfig()
+        {
+            var newConfig = InkSmoothingConfig.FromSettings();
+            newConfig.ApplyQualitySettings();
+
+            _asyncSmoothing.SmoothingStrength = newConfig.SmoothingStrength;
+            _asyncSmoothing.ResampleInterval = newConfig.ResampleInterval;
+            _asyncSmoothing.InterpolationSteps = newConfig.InterpolationSteps;
+            _asyncSmoothing.UseHardwareAcceleration = newConfig.UseHardwareAcceleration;
+            _asyncSmoothing.MaxConcurrentTasks = newConfig.MaxConcurrentTasks;
+        }
+
+        /// <summary>
+        /// 获取性能统计信息
+        /// </summary>
+        public string GetPerformanceStats()
+        {
+            return $"平均处理时间: {_performanceMonitor.GetAverageProcessingTimeMs():F2}ms, " +
+                   $"最大处理时间: {_performanceMonitor.GetMaxProcessingTimeMs():F2}ms, " +
+                   $"样本数: {_performanceMonitor.GetSampleCount()}";
+        }
+
+        /// <summary>
+        /// 取消所有正在进行的任务
+        /// </summary>
+        public void CancelAllTasks()
+        {
+            _asyncSmoothing?.CancelAllTasks();
+        }
+
+        /// <summary>
+        /// 检查系统是否支持硬件加速
+        /// </summary>
+        public static bool IsHardwareAccelerationSupported()
+        {
+            try
+            {
+                return RenderCapability.Tier >= 0x00020000;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 获取推荐的配置
+        /// </summary>
+        public static InkSmoothingConfig GetRecommendedConfig()
+        {
+            var config = new InkSmoothingConfig();
+
+            // 根据系统性能调整配置
+            var processorCount = Environment.ProcessorCount;
+            var isHardwareAccelerated = IsHardwareAccelerationSupported();
+
+            if (processorCount >= 4 && isHardwareAccelerated)
+            {
+                // 降低高质量模式的门槛，4核以上且支持硬件加速就使用高质量
+                config.Quality = (InkSmoothingConfig.SmoothingQuality)InkSmoothingConfig.InkSmoothingQuality.HighQuality;
+                config.UseHardwareAcceleration = true;
+                config.UseAsyncProcessing = true;
+                config.MaxConcurrentTasks = Math.Min(processorCount, 8);
+            }
+            else if (processorCount >= 2)
+            {
+                // 2核以上使用平衡模式
+                config.Quality = (InkSmoothingConfig.SmoothingQuality)InkSmoothingConfig.InkSmoothingQuality.Balanced;
+                config.UseHardwareAcceleration = isHardwareAccelerated;
+                config.UseAsyncProcessing = true;
+                config.MaxConcurrentTasks = Math.Min(processorCount, 4);
+            }
+            else
+            {
+                // 单核或性能较低的设备使用高性能模式
+                config.Quality = (InkSmoothingConfig.SmoothingQuality)InkSmoothingConfig.InkSmoothingQuality.HighPerformance;
+                config.UseHardwareAcceleration = false;
+                config.UseAsyncProcessing = false;
+                config.MaxConcurrentTasks = 1;
+            }
+
+            config.ApplyQualitySettings();
+            return config;
+        }
+
+        /// <summary>
+        /// 应用推荐配置到设置
+        /// </summary>
+        public static void ApplyRecommendedSettings()
+        {
+            var config = GetRecommendedConfig();
+
+            MainWindow.Settings.Canvas.InkSmoothingQuality = (int)config.Quality;
+            MainWindow.Settings.Canvas.UseHardwareAcceleration = config.UseHardwareAcceleration;
+            MainWindow.Settings.Canvas.UseAsyncInkSmoothing = config.UseAsyncProcessing;
+            MainWindow.Settings.Canvas.MaxConcurrentSmoothingTasks = config.MaxConcurrentTasks;
+        }
+
+        public void Dispose()
+        {
+            if (!_disposed)
+            {
+                CancelAllTasks();
+                _asyncSmoothing?.Dispose();
+                _hardwareProcessor?.Dispose();
+                _disposed = true;
+            }
+        }
+    }
+
+    /// <summary>
+    /// 墨迹平滑事件参数
+    /// </summary>
+    public class InkSmoothingEventArgs : EventArgs
+    {
+        public Stroke OriginalStroke { get; set; }
+        public Stroke SmoothedStroke { get; set; }
+        public TimeSpan ProcessingTime { get; set; }
+        public bool WasAsync { get; set; }
+        public bool UsedHardwareAcceleration { get; set; }
+    }
+}

Ink Canvas/Helpers/IsOutsideOfScreenHelper.cs

@@ -1,32 +1,36 @@
-using System;
-using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Interop;
 using System.Windows;
+using System.Windows.Forms;
+using System.Windows.Interop;
+using Point = System.Windows.Point;
 
-namespace Ink_Canvas.Helpers {
-    internal class IsOutsideOfScreenHelper {
-        public static bool IsOutsideOfScreen(FrameworkElement target) {
+namespace Ink_Canvas.Helpers
+{
+    internal class IsOutsideOfScreenHelper
+    {
+        public static bool IsOutsideOfScreen(FrameworkElement target)
+        {
             var hwndSource = (HwndSource)PresentationSource.FromVisual(target);
-            if (hwndSource is null) {
+            if (hwndSource is null)
+            {
                 return true;
             }
 
             var hWnd = hwndSource.Handle;
             var targetBounds = GetPixelBoundsToScreen(target);
 
-            var screens = System.Windows.Forms.Screen.AllScreens;
+            var screens = Screen.AllScreens;
             return !screens.Any(x => x.Bounds.IntersectsWith(targetBounds));
 
-            System.Drawing.Rectangle GetPixelBoundsToScreen(FrameworkElement visual) {
+            Rectangle GetPixelBoundsToScreen(FrameworkElement visual)
+            {
                 var pixelBoundsToScreen = Rect.Empty;
                 pixelBoundsToScreen.Union(visual.PointToScreen(new Point(0, 0)));
                 pixelBoundsToScreen.Union(visual.PointToScreen(new Point(visual.ActualWidth, 0)));
                 pixelBoundsToScreen.Union(visual.PointToScreen(new Point(0, visual.ActualHeight)));
                 pixelBoundsToScreen.Union(visual.PointToScreen(new Point(visual.ActualWidth, visual.ActualHeight)));
-                return new System.Drawing.Rectangle(
+                return new Rectangle(
                     (int)pixelBoundsToScreen.X, (int)pixelBoundsToScreen.Y,
                     (int)pixelBoundsToScreen.Width, (int)pixelBoundsToScreen.Height);
             }

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

@@ -0,0 +1,174 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
+
+namespace Ink_Canvas.Helpers
+{
+    class LogHelper
+    {
+        public static string LogFile = "Log.txt";
+        private static string LogsFolder = "Logs";
+        private static string AppStartTime = DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss");
+        private static readonly long MaxLogsFolderSizeBytes = 5 * 1024 * 1024; // 5MB
+
+        public static void NewLog(string str)
+        {
+            WriteLogToFile(str);
+        }
+
+        public static void NewLog(Exception ex)
+        {
+            if (ex == null) return;
+            var stackTrace = ex.StackTrace ?? "<no stack trace>";
+            var msg = $"[Exception] Type: {ex.GetType().FullName}\nMessage: {ex.Message}\nStackTrace: {stackTrace}";
+            if (ex.InnerException != null)
+            {
+                msg += $"\nInnerException: {ex.InnerException.GetType().FullName} - {ex.InnerException.Message}\n{ex.InnerException.StackTrace}";
+            }
+            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)
+        {
+            // 检查日志是否启用
+            if (MainWindow.Settings != null && MainWindow.Settings.Advanced != null && !MainWindow.Settings.Advanced.IsLogEnabled) return;
+
+            string strLogType = logType.ToString();
+            try
+            {
+                string file;
+
+                // 检查是否启用了日期保存功能
+                if (MainWindow.Settings != null && MainWindow.Settings.Advanced != null && MainWindow.Settings.Advanced.IsSaveLogByDate)
+                {
+                    // 确保Logs文件夹存在
+                    string logsPath = Path.Combine(App.RootPath, LogsFolder);
+                    if (!Directory.Exists(logsPath))
+                    {
+                        Directory.CreateDirectory(logsPath);
+                    }
+
+                    // 检查Logs文件夹大小，如果超过5MB则清空
+                    CheckAndCleanLogsFolder(logsPath);
+
+                    // 使用软件启动时间作为日志文件名
+                    file = Path.Combine(logsPath, $"Log_{AppStartTime}.txt");
+                }
+                else
+                {
+                    file = App.RootPath + LogFile;
+                }
+
+                if (!Directory.Exists(App.RootPath))
+                {
+                    ProcessProtectionManager.WithWriteAccess(App.RootPath, () => Directory.CreateDirectory(App.RootPath));
+                }
+
+                var threadId = Thread.CurrentThread.ManagedThreadId;
+                var callingMethod = new StackTrace(2, true).GetFrame(0);
+                string callerInfo = "<unknown>";
+                if (callingMethod != null)
+                {
+                    var method = callingMethod.GetMethod();
+                    if (method != null)
+                    {
+                        var className = method.DeclaringType != null ? method.DeclaringType.FullName : "<no class>";
+                        callerInfo = $"{className}.{method.Name}";
+                    }
+                }
+                string logLine = string.Format("{0} [T{1}] [{2}] [{3}] {4}", DateTime.Now.ToString("O"), threadId, strLogType, callerInfo, str);
+                DebugConsoleManager.WriteLine(logLine);
+                ProcessProtectionManager.WithWriteAccess(file, () =>
+                {
+                    using (StreamWriter sw = new StreamWriter(file, true))
+                    {
+                        sw.WriteLine(logLine);
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[LogHelper] WriteLogToFile failed: {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 检查指定日志文件夹的总大小，并在超过 MaxLogsFolderSizeBytes 时删除该文件夹下的所有文件并记录清理日志。
+        /// </summary>
+        /// <param name="logsPath">要检查和清理的日志文件夹路径。</param>
+        /// <remarks>
+        /// - 如果目录不存在则直接返回。 
+        /// - 当总大小超过 MaxLogsFolderSizeBytes 时，会尝试删除目录下的每个文件（单个删除失败将被忽略）。 
+        /// - 清理完成后会向该目录下的 Log_{AppStartTime}.txt 写入一条带有时间戳和 [Cleanup] 标签的记录。 
+        /// - 方法内部捕获并忽略所有异常以避免影响调用者流程。
+        /// </remarks>
+        private static void CheckAndCleanLogsFolder(string logsPath)
+        {
+            try
+            {
+                long totalSize = 0;
+                DirectoryInfo dirInfo = new DirectoryInfo(logsPath);
+
+                // 如果目录不存在，直接返回
+                if (!dirInfo.Exists) return;
+
+                // 计算文件夹大小
+                foreach (FileInfo file in dirInfo.GetFiles())
+                {
+                    totalSize += file.Length;
+                }
+
+                // 如果超过5MB，清空文件夹
+                if (totalSize > MaxLogsFolderSizeBytes)
+                {
+                    foreach (FileInfo file in dirInfo.GetFiles())
+                    {
+                        try
+                        {
+                            file.Delete();
+                        }
+                        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.";
+                    var logFile = Path.Combine(logsPath, $"Log_{AppStartTime}.txt");
+                    ProcessProtectionManager.WithWriteAccess(logFile, () =>
+                    {
+                        using (StreamWriter sw = new StreamWriter(logFile, true))
+                        {
+                            sw.WriteLine($"{DateTime.Now:O} [Cleanup] {cleanupMessage}");
+                        }
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[LogHelper] CheckAndCleanLogsFolder failed: {ex.Message}");
+            }
+        }
+
+        internal static void WriteLogToFile(string v, object warning)
+        {
+            WriteLogToFile($"[Warning] {v}", LogType.Warning);
+        }
+
+        public enum LogType
+        {
+            Info,
+            Trace,
+            Error,
+            Event,
+            Warning
+        }
+    }
+}

Ink Canvas/Helpers/MultiTouchInput.cs

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

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

@@ -0,0 +1,603 @@
+using Microsoft.Office.Interop.PowerPoint;
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Windows.Ink;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// PPT墨迹管理器 - 负责按幻灯片保存/加载墨迹、自动保存与内存管理。
+    /// </summary>
+    public class PPTInkManager : IDisposable
+    {
+        #region Properties
+        public bool IsAutoSaveEnabled { get; set; } = true;
+        public string AutoSaveLocation { get; set; } = "";
+        public StrokeCollection CurrentStrokes { get; private set; } = new StrokeCollection();
+        #endregion
+
+        #region Private Fields
+        private MemoryStream[] _memoryStreams;
+        private const int DefaultMaxSlides = 100;
+        private int _maxSlides = DefaultMaxSlides;
+        private string _currentPresentationId = "";
+        private readonly object _lockObject = new object();
+        private bool _disposed;
+
+        // 墨迹锁定机制，防止翻页时的墨迹冲突
+        private DateTime _inkLockUntil = DateTime.MinValue;
+        private int _lockedSlideIndex = -1;
+        private const int InkLockMilliseconds = 500;
+
+        // 添加快速切换保护机制
+        private DateTime _lastSwitchTime = DateTime.MinValue;
+        private int _lastSwitchSlideIndex = -1;
+        private const int MinSwitchIntervalMs = 100;
+
+        private long _totalMemoryUsage;
+        private const long MaxMemoryUsageBytes = 100 * 1024 * 1024; // 100MB
+        private DateTime _lastMemoryCleanup = DateTime.MinValue;
+        private const int MemoryCleanupIntervalMinutes = 5;
+
+        private const string StrokeFileExtension = ".icstk";
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// 初始化 PPTInkManager 实例并为内部内存流分配初始容量以跟踪默认最大幻灯片数加上备用槽位。
+        /// </summary>
+        public PPTInkManager()
+        {
+            InitializeMemoryStreams(DefaultMaxSlides + 2);
+        }
+
+        /// <summary>
+        /// 根据指定容量初始化用于存储每页墨迹的内存流数组。
+        /// </summary>
+        /// <param name="capacity">期望的数组容量；如果小于 2，则会使用 2 作为最小容量。</param>
+        private void InitializeMemoryStreams(int capacity)
+        {
+            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
+                {
+                    ClearAllStrokesInternal();
+                    _inkLockUntil = DateTime.MinValue;
+                    _lockedSlideIndex = -1;
+                    _lastSwitchSlideIndex = -1;
+                    _lastSwitchTime = DateTime.MinValue;
+
+                    _currentPresentationId = GeneratePresentationId(presentation);
+
+                    int slideCount = 0;
+                    try
+                    {
+                        slideCount = presentation.Slides.Count;
+                    }
+                    catch (COMException comEx)
+                    {
+                        uint hr = (uint)comEx.HResult;
+                        if (hr == 0x80048010) return;
+                        throw;
+                    }
+
+                    int capacity = slideCount + 2;
+                    _maxSlides = Math.Max(_maxSlides, slideCount);
+                    _memoryStreams = new MemoryStream[capacity];
+
+                    if (IsAutoSaveEnabled && !string.IsNullOrEmpty(AutoSaveLocation))
+                        LoadSavedStrokes();
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"初始化演示文稿墨迹管理失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+        }
+
+        /// <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)) return;
+                    if (slideIndex >= _memoryStreams.Length) return;
+
+                    ReplaceSlideStream(slideIndex, strokes);
+                    CheckAndPerformMemoryCleanup();
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"保存第{slideIndex}页墨迹失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+        }
+
+        /// <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) return;
+                    ReplaceSlideStream(slideIndex, strokes);
+                    LogHelper.WriteLogToFile($"已强制保存第{slideIndex}页墨迹", LogHelper.LogType.Trace);
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"强制保存第{slideIndex}页墨迹失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+        }
+
+        /// <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)
+            {
+                try
+                {
+                    if (slideIndex < _memoryStreams.Length && _memoryStreams[slideIndex] != null && _memoryStreams[slideIndex].Length > 0)
+                    {
+                        _memoryStreams[slideIndex].Position = 0;
+                        return new StrokeCollection(_memoryStreams[slideIndex]);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"加载第{slideIndex}页墨迹失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+
+            return new StrokeCollection();
+        }
+
+        /// <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)
+                    {
+                        LogHelper.WriteLogToFile($"快速切换保护：忽略重复请求 页{slideIndex}", LogHelper.LogType.Trace);
+                        return LoadSlideStrokes(slideIndex);
+                    }
+
+                    LockInkForSlide(slideIndex);
+                    StrokeCollection newStrokes = LoadSlideStrokes(slideIndex);
+                    _lastSwitchTime = now;
+                    _lastSwitchSlideIndex = slideIndex;
+                    return newStrokes;
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"切换到第{slideIndex}页失败: {ex}", LogHelper.LogType.Error);
+                    return new StrokeCollection();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存所有墨迹到文件
+        /// </summary>
+        /// <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
+                {
+                    string folderPath = GetPresentationFolderPath();
+                    if (!Directory.Exists(folderPath))
+                        Directory.CreateDirectory(folderPath);
+
+                    int positionToSave = currentSlideIndex > 0 ? currentSlideIndex : (_lockedSlideIndex > 0 ? _lockedSlideIndex : _lastSwitchSlideIndex);
+                    if (positionToSave > 0)
+                    {
+                        try { File.WriteAllText(Path.Combine(folderPath, "Position"), positionToSave.ToString()); }
+                        catch (Exception ex) { LogHelper.WriteLogToFile($"保存 Position 失败: {ex}", LogHelper.LogType.Warning); }
+                    }
+
+                    int slideCount = 0;
+                    try { slideCount = presentation.Slides.Count; }
+                    catch (COMException comEx)
+                    {
+                        if ((uint)comEx.HResult == 0x80048010) return;
+                        throw;
+                    }
+
+                    for (int i = 1; i <= slideCount && i < _memoryStreams.Length; i++)
+                    {
+                        if (_memoryStreams[i] == null) continue;
+                        try
+                        {
+                            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)
+                                {
+                                    string basePath = Path.Combine(folderPath, i.ToString("0000"));
+                                    File.WriteAllBytes(basePath + StrokeFileExtension, buf);
+                                }
+                            }
+                            else
+                            {
+                                TryDeleteStrokeFile(folderPath, i);
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"保存第{i}页墨迹到文件失败: {ex}", LogHelper.LogType.Error);
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"保存墨迹到文件失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 从文件加载已保存的墨迹
+        /// </summary>
+        /// <remarks>
+        /// 从自动保存目录加载已保存的幻灯片墨迹数据到内存流中，供后续显示和编辑使用。
+        /// 仅在启用自动保存且已设置 AutoSaveLocation 时执行。函数获取当前演示文稿的自动保存文件夹，遍历以 <c>.icstk</c> 为扩展名的文件，
+        /// 将文件名（去除扩展名）解析为幻灯片索引并在合法且文件大小大于 8 字节时加载到对应的内存流槽位。对单个文件的读取失败会记录错误并继续处理其他文件；
+        /// 若成功加载则会记录已加载页数。方法在内部使用锁以保证线程安全。
+        /// </remarks>
+        public void LoadSavedStrokes()
+        {
+            ThrowIfDisposed();
+            if (!IsAutoSaveEnabled || string.IsNullOrEmpty(AutoSaveLocation)) return;
+
+            lock (_lockObject)
+            {
+                try
+                {
+                    string folderPath = GetPresentationFolderPath();
+                    if (!Directory.Exists(folderPath)) return;
+
+                    var dir = new DirectoryInfo(folderPath);
+                    int loadedCount = 0;
+                    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
+                        {
+                            byte[] bytes = File.ReadAllBytes(file.FullName);
+                            if (bytes.Length > 8)
+                            {
+                                _memoryStreams[slideIndex] = new MemoryStream(bytes);
+                                _memoryStreams[slideIndex].Position = 0;
+                                loadedCount++;
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"加载墨迹文件 {file.Name} 失败: {ex}", LogHelper.LogType.Error);
+                        }
+                    }
+
+                    if (loadedCount > 0)
+                        LogHelper.WriteLogToFile($"已从磁盘加载 {loadedCount} 页墨迹", LogHelper.LogType.Trace);
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"从文件加载墨迹失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 清除所有墨迹
+        /// </summary>
+        /// <remarks>
+        /// 清除并释放当前演示文稿所有幻灯片的墨迹数据和相关内存资源。
+        /// 该方法在内部加锁以保证线程安全；会处置并清空所有内部存储的墨迹流、重建内部流数组并清空 CurrentStrokes。
+        /// </remarks>
+        public void ClearAllStrokes()
+        {
+            ThrowIfDisposed();
+            lock (_lockObject)
+            {
+                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)
+        {
+            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;
+                _lockedSlideIndex = -1;
+                _lastSwitchTime = DateTime.MinValue;
+                _lastSwitchSlideIndex = -1;
+            }
+        }
+
+        #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;
+
+                long currentMemoryUsage = 0;
+                if (_memoryStreams != null)
+                {
+                    for (int i = 0; i < _memoryStreams.Length; i++)
+                        if (_memoryStreams[i] != null) currentMemoryUsage += _memoryStreams[i].Length;
+                }
+                _totalMemoryUsage = currentMemoryUsage;
+
+                if (currentMemoryUsage > MaxMemoryUsageBytes)
+                {
+                    LogHelper.WriteLogToFile($"墨迹内存超限 ({currentMemoryUsage / (1024 * 1024)}MB)，执行清理", LogHelper.LogType.Warning);
+                    CleanupInactiveSlideStrokes();
+                }
+                _lastMemoryCleanup = now;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"内存清理检查失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 清理不活跃幻灯片的内存化墨迹数据以回收内存空间。
+        /// </summary>
+        /// <remarks>
+        /// 将释放除当前锁定幻灯片与最近切换幻灯片之外的每页内存流（若存在），并将对应数组项设为 null；完成后若有释放，会记录已清理页数与释放的总大小（KB）。
+        /// </remarks>
+        private void CleanupInactiveSlideStrokes()
+        {
+            if (_memoryStreams == null) return;
+            int cleaned = 0;
+            long freed = 0;
+            for (int i = 0; i < _memoryStreams.Length; i++)
+            {
+                if (i == _lockedSlideIndex || i == _lastSwitchSlideIndex) continue;
+                if (_memoryStreams[i] != null)
+                {
+                    long len = _memoryStreams[i].Length;
+                    try { _memoryStreams[i].Dispose(); freed += len; cleaned++; }
+                    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+                    finally { _memoryStreams[i] = null; }
+                }
+            }
+            if (cleaned > 0)
+                LogHelper.WriteLogToFile($"已清理 {cleaned} 页墨迹，释放 {freed / 1024}KB", LogHelper.LogType.Trace);
+        }
+
+        /// <summary>
+        /// 生成基于演示文稿名称、幻灯片数量和路径哈希的标识符字符串。
+        /// </summary>
+        /// <returns>由 `名称_幻灯片数_路径哈希` 组成的标识符；若生成失败则返回形如 `unknown_{ticks}` 的回退标识符。</returns>
+        private string GeneratePresentationId(Presentation presentation)
+        {
+            try
+            {
+                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);
+                return $"unknown_{DateTime.Now.Ticks}";
+            }
+        }
+
+        private string GetPresentationFolderPath()
+        {
+            return Path.Combine(AutoSaveLocation, "Auto Saved - Presentations", _currentPresentationId);
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// 释放 PPTInkManager 持有的资源并清除所有内存中的笔迹数据。
+        /// </summary>
+        /// <remarks>
+        /// 调用后该实例将进入已释放状态，不应再被使用。方法为幂等且线程安全：如果已释放则立即返回，否则在同步区内清理资源并标记为已释放。
+        /// </remarks>
+        public void Dispose()
+        {
+            if (_disposed) return;
+            lock (_lockObject) { ClearAllStrokesInternal(); }
+            _disposed = true;
+            GC.SuppressFinalize(this);
+        }
+
+        private void ThrowIfDisposed()
+        {
+            if (_disposed) throw new ObjectDisposedException(nameof(PPTInkManager));
+        }
+
+        #endregion
+    }
+}