improve:展台

新增将展台替换为希沃展台快捷启动功能

.all-contributorsrc

@@ -16,16 +16,8 @@
       "contributions": [
         "maintenance",
         "doc",
-        "code"
-      ]
-    },
-    {
-      "login": "Hydro11451",
-      "name": "Hydrogen",
-      "avatar_url": "https://avatars.githubusercontent.com/u/214308559?v=4",
-      "profile": "http://hydro11451.qzz.io",
-      "contributions": [
-        "code"
+        "code",
+        "design"
       ]
     },
     {
@@ -45,7 +37,10 @@
       "contributions": [
         "blog",
         "doc",
-        "design"
+        "design",
+        "test",
+        "tutorial",
+        "video"
       ]
     },
     {
@@ -85,9 +80,66 @@
       "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"
+      ]
+    },
+    {
+      "login": "doudou0720",
+      "name": "doudou0720",
+      "avatar_url": "https://avatars.githubusercontent.com/u/98651603?v=4",
+      "profile": "https://github.com/doudou0720",
+      "contributions": [
+        "code",
+        "blog"
+      ]
+    },
+    {
+      "login": "PANDAJSR",
+      "name": "PANDAJSR",
+      "avatar_url": "https://avatars.githubusercontent.com/u/170189561?v=4",
+      "profile": "https://github.com/PANDAJSR",
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "LiuYan-xwx",
+      "name": "流焰xwx",
+      "avatar_url": "https://avatars.githubusercontent.com/u/66517348?v=4",
+      "profile": "http://lyxwx.top",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Super-Yyt",
+      "name": "Super-Yyt",
+      "avatar_url": "https://avatars.githubusercontent.com/u/206630707?v=4",
+      "profile": "https://github.com/Super-Yyt",
+      "contributions": [
+        "infra",
+        "blog"
+      ]
     }
   ]
 }

.devcontainer/devcontainer.json

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

.github/ISSUE_TEMPLATE/01-bug_report.yml

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

.github/ISSUE_TEMPLATE/02-feature_request.yml

@@ -1,6 +1,6 @@
 name: 功能请求 | Feature Request
 description: 提出你对本项目的功能建议 | Suggest an idea for this project
-labels: [enhancement]
+type: Feature
 body:
   - type: markdown
     attributes:
@@ -20,7 +20,7 @@ body:
       label: 需求动机 | Motivation
       description: 为什么需要这个功能？| Why do you need this feature?
     validations:
-      required: false
+      required: true
   - type: textarea
     id: design
     attributes:
@@ -35,3 +35,10 @@ body:
       description: 其他补充说明或建议 | Any other context or suggestions
     validations:
       required: false
+  - type: upload
+    id: files
+    attributes:
+      label: 上传有关文件 | Upload relevant files
+      description: "你可以在此处上传相关文件 | You can upload relevant files here."
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/03-bug_report.md

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

.github/ISSUE_TEMPLATE/04-feature_request.md

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

.github/workflows/dotnet-desktop.yml

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

.github/workflows/prcheck.yml

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

.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 }}\net472\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\net472\*" "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="beta" \
+            ${SHA:+-f sha="$SHA"}

.gitignore

@@ -1,3 +1,432 @@
-obj/
-bin/
-.vs
+## 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

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

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../alpha" vcs="Git" />
   </component>
 </project>

.vs/Ink Canvas/v17/DocumentLayout.backup.json

@@ -1,398 +0,0 @@
-{
-  "Version": 1,
-  "WorkspaceRootPath": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\",
-  "Documents": [
-    {
-      "AbsoluteMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|c:\\users\\dubi906w\\source\\repos\\icc-ce\\ink canvas\\mainwindow_cs\\mw_floatingbaricons.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|solutionrelative:ink canvas\\mainwindow_cs\\mw_floatingbaricons.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\README.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:README.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\privacy.txt||{8B382828-6202-11D1-8870-0000F87579D2}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:privacy.txt||{8B382828-6202-11D1-8870-0000F87579D2}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Manual.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Manual.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\LICENSE||{8B382828-6202-11D1-8870-0000F87579D2}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:LICENSE||{8B382828-6202-11D1-8870-0000F87579D2}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas.sln.DotSettings.user||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Ink Canvas.sln.DotSettings.user||{FA3CD31E-987B-443A-9B81-186104E8DAC1}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|c:\\users\\dubi906w\\source\\repos\\icc-ce\\ink canvas\\mainwindow_cs\\mw_ppt.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|solutionrelative:ink canvas\\mainwindow_cs\\mw_ppt.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|c:\\users\\dubi906w\\source\\repos\\icc-ce\\ink canvas\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
-      "RelativeMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|solutionrelative:ink canvas\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|"
-    }
-  ],
-  "DocumentGroupContainers": [
-    {
-      "Orientation": 0,
-      "VerticalTabListWidth": 256,
-      "DocumentGroups": [
-        {
-          "DockedWidth": 210,
-          "SelectedChildIndex": 48,
-          "Children": [
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{387cb18d-6153-4156-9257-9ac3f9207bbe}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{e8b06f52-6d01-11d2-aa7d-00c04f990343}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{46c87f81-5a06-43a8-9e25-85d33bac49f8}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{269a02dc-6af8-11d3-bdc4-00c04f688e50}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{99b8fa2f-ab90-4f57-9c32-949f146f1914}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{c79b74ff-f1d7-4c94-aefa-4d22bfe1b1f9}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:128:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:2:0:{34c7837f-3b3a-449c-bdf0-bdad86cbaf4a}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{37aba9be-445a-11d3-9949-00c04f68fd0a}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{dcc4ea97-1c0c-482b-b205-e541c0df9728}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:128:0:{75188d03-9892-4ae2-abf1-207126247ce5}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:129:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{4a9b7e51-aa16-11d0-a8c5-00a0c921a4d2}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:132:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:133:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:3:0:{34c7837f-3b3a-449c-bdf0-bdad86cbaf4a}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:153:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:154:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:152:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:151:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:150:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:148:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:149:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:136:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:144:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:147:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:145:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:146:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:143:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:142:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:141:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:140:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:139:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:138:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:137:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:135:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:134:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:129:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:130:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:129:0:{75188d03-9892-4ae2-abf1-207126247ce5}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{cce594b6-0c39-4442-ba28-10c64ac7e89f}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{b1e99781-ab81-11d0-b683-00aa00a3ee26}"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 0,
-              "Title": "MW_FloatingBarIcons.cs",
-              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow_cs\\MW_FloatingBarIcons.cs",
-              "RelativeDocumentMoniker": "Ink Canvas\\MainWindow_cs\\MW_FloatingBarIcons.cs",
-              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow_cs\\MW_FloatingBarIcons.cs",
-              "RelativeToolTip": "Ink Canvas\\MainWindow_cs\\MW_FloatingBarIcons.cs",
-              "ViewState": "AgIAAOgCAAAAAAAAAAAuwEoGAAAIAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-05-31T10:49:24.719Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "README.md",
-              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\README.md",
-              "RelativeDocumentMoniker": "README.md",
-              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\README.md",
-              "RelativeToolTip": "README.md",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|",
-              "WhenOpened": "2025-05-31T10:48:22.883Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 7,
-              "Title": "MainWindow.xaml",
-              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow.xaml",
-              "RelativeDocumentMoniker": "Ink Canvas\\MainWindow.xaml",
-              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow.xaml",
-              "RelativeToolTip": "Ink Canvas\\MainWindow.xaml",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
-              "WhenOpened": "2025-05-24T13:22:56.715Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 9,
-              "Title": "Microsoft.Common.CurrentVersion.targets",
-              "DocumentMoniker": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets",
-              "RelativeDocumentMoniker": "..\\..\\..\\..\\..\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets",
-              "ToolTip": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets",
-              "RelativeToolTip": "..\\..\\..\\..\\..\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets",
-              "ViewState": "AgIAAGsJAAAAAAAAAAAQwIEJAAAEAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003801|",
-              "WhenOpened": "2025-05-24T13:06:01.053Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 6,
-              "Title": "MW_PPT.cs",
-              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
-              "RelativeDocumentMoniker": "Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
-              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
-              "RelativeToolTip": "Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
-              "ViewState": "AgIAAFgAAAAAAAAAAAAUwHQAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-05-24T13:04:47.205Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 8,
-              "Title": "README.md",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md",
-              "RelativeDocumentMoniker": "..\\..\\..\\..\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md",
-              "RelativeToolTip": "..\\..\\..\\..\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|",
-              "WhenOpened": "2025-05-24T13:04:01.407Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 2,
-              "Title": "privacy.txt",
-              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\privacy.txt",
-              "RelativeDocumentMoniker": "privacy.txt",
-              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\privacy.txt",
-              "RelativeToolTip": "privacy.txt",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003109|",
-              "WhenOpened": "2025-05-24T13:04:01.337Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 3,
-              "Title": "Manual.md",
-              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Manual.md",
-              "RelativeDocumentMoniker": "Manual.md",
-              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Manual.md",
-              "RelativeToolTip": "Manual.md",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|",
-              "WhenOpened": "2025-05-24T13:04:00.986Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 4,
-              "Title": "LICENSE",
-              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\LICENSE",
-              "RelativeDocumentMoniker": "LICENSE",
-              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\LICENSE",
-              "RelativeToolTip": "LICENSE",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
-              "WhenOpened": "2025-05-24T13:04:00.902Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 5,
-              "Title": "Ink Canvas.sln.DotSettings.user",
-              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas.sln.DotSettings.user",
-              "RelativeDocumentMoniker": "Ink Canvas.sln.DotSettings.user",
-              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas.sln.DotSettings.user",
-              "RelativeToolTip": "Ink Canvas.sln.DotSettings.user",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003464|",
-              "WhenOpened": "2025-05-24T13:04:00.792Z"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{d84ee353-0bef-5a41-a649-8f89aca5d84d}"
-            }
-          ]
-        },
-        {
-          "DockedWidth": 204,
-          "SelectedChildIndex": -1,
-          "Children": [
-            {
-              "$type": "Bookmark",
-              "Name": "ST:1:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{590a070c-4fcd-52d9-87da-dfaa11710261}"
-            }
-          ]
-        },
-        {
-          "DockedWidth": 190,
-          "SelectedChildIndex": -1,
-          "Children": [
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{f4fc5ff1-28ef-4b04-ad02-6b298310ccc7}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

.vs/Ink Canvas/v17/DocumentLayout.json

@@ -1,398 +0,0 @@
-{
-  "Version": 1,
-  "WorkspaceRootPath": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\",
-  "Documents": [
-    {
-      "AbsoluteMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|c:\\users\\dubi906w\\source\\repos\\icc-ce\\ink canvas\\mainwindow_cs\\mw_floatingbaricons.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|solutionrelative:ink canvas\\mainwindow_cs\\mw_floatingbaricons.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\README.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:README.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\privacy.txt||{8B382828-6202-11D1-8870-0000F87579D2}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:privacy.txt||{8B382828-6202-11D1-8870-0000F87579D2}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Manual.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Manual.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\LICENSE||{8B382828-6202-11D1-8870-0000F87579D2}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:LICENSE||{8B382828-6202-11D1-8870-0000F87579D2}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas.sln.DotSettings.user||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Ink Canvas.sln.DotSettings.user||{FA3CD31E-987B-443A-9B81-186104E8DAC1}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|c:\\users\\dubi906w\\source\\repos\\icc-ce\\ink canvas\\mainwindow_cs\\mw_ppt.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|solutionrelative:ink canvas\\mainwindow_cs\\mw_ppt.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|c:\\users\\dubi906w\\source\\repos\\icc-ce\\ink canvas\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
-      "RelativeMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|solutionrelative:ink canvas\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|"
-    }
-  ],
-  "DocumentGroupContainers": [
-    {
-      "Orientation": 0,
-      "VerticalTabListWidth": 256,
-      "DocumentGroups": [
-        {
-          "DockedWidth": 210,
-          "SelectedChildIndex": 48,
-          "Children": [
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{387cb18d-6153-4156-9257-9ac3f9207bbe}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{e8b06f52-6d01-11d2-aa7d-00c04f990343}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{46c87f81-5a06-43a8-9e25-85d33bac49f8}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{269a02dc-6af8-11d3-bdc4-00c04f688e50}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{99b8fa2f-ab90-4f57-9c32-949f146f1914}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{c79b74ff-f1d7-4c94-aefa-4d22bfe1b1f9}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:128:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:2:0:{34c7837f-3b3a-449c-bdf0-bdad86cbaf4a}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{37aba9be-445a-11d3-9949-00c04f68fd0a}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{dcc4ea97-1c0c-482b-b205-e541c0df9728}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:128:0:{75188d03-9892-4ae2-abf1-207126247ce5}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:129:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{4a9b7e51-aa16-11d0-a8c5-00a0c921a4d2}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:132:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:133:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:3:0:{34c7837f-3b3a-449c-bdf0-bdad86cbaf4a}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:153:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:154:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:152:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:151:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:150:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:148:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:149:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:136:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:144:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:147:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:145:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:146:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:143:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:142:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:141:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:140:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:139:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:138:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:137:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:135:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:134:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:129:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:130:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:129:0:{75188d03-9892-4ae2-abf1-207126247ce5}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{cce594b6-0c39-4442-ba28-10c64ac7e89f}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{b1e99781-ab81-11d0-b683-00aa00a3ee26}"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 0,
-              "Title": "MW_FloatingBarIcons.cs",
-              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow_cs\\MW_FloatingBarIcons.cs",
-              "RelativeDocumentMoniker": "Ink Canvas\\MainWindow_cs\\MW_FloatingBarIcons.cs",
-              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow_cs\\MW_FloatingBarIcons.cs",
-              "RelativeToolTip": "Ink Canvas\\MainWindow_cs\\MW_FloatingBarIcons.cs",
-              "ViewState": "AgIAAOgCAAAAAAAAAAAuwEoGAAAIAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-05-31T10:49:24.719Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "README.md",
-              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\README.md",
-              "RelativeDocumentMoniker": "README.md",
-              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\README.md",
-              "RelativeToolTip": "README.md",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|",
-              "WhenOpened": "2025-05-31T10:48:22.883Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 7,
-              "Title": "MainWindow.xaml",
-              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow.xaml",
-              "RelativeDocumentMoniker": "Ink Canvas\\MainWindow.xaml",
-              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow.xaml",
-              "RelativeToolTip": "Ink Canvas\\MainWindow.xaml",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
-              "WhenOpened": "2025-05-24T13:22:56.715Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 9,
-              "Title": "Microsoft.Common.CurrentVersion.targets",
-              "DocumentMoniker": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets",
-              "RelativeDocumentMoniker": "..\\..\\..\\..\\..\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets",
-              "ToolTip": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets",
-              "RelativeToolTip": "..\\..\\..\\..\\..\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets",
-              "ViewState": "AgIAAGsJAAAAAAAAAAAQwIEJAAAEAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003801|",
-              "WhenOpened": "2025-05-24T13:06:01.053Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 6,
-              "Title": "MW_PPT.cs",
-              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
-              "RelativeDocumentMoniker": "Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
-              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
-              "RelativeToolTip": "Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
-              "ViewState": "AgIAAFgAAAAAAAAAAAAUwHQAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-05-24T13:04:47.205Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 8,
-              "Title": "README.md",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md",
-              "RelativeDocumentMoniker": "..\\..\\..\\..\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md",
-              "RelativeToolTip": "..\\..\\..\\..\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|",
-              "WhenOpened": "2025-05-24T13:04:01.407Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 2,
-              "Title": "privacy.txt",
-              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\privacy.txt",
-              "RelativeDocumentMoniker": "privacy.txt",
-              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\privacy.txt",
-              "RelativeToolTip": "privacy.txt",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003109|",
-              "WhenOpened": "2025-05-24T13:04:01.337Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 3,
-              "Title": "Manual.md",
-              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Manual.md",
-              "RelativeDocumentMoniker": "Manual.md",
-              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Manual.md",
-              "RelativeToolTip": "Manual.md",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|",
-              "WhenOpened": "2025-05-24T13:04:00.986Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 4,
-              "Title": "LICENSE",
-              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\LICENSE",
-              "RelativeDocumentMoniker": "LICENSE",
-              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\LICENSE",
-              "RelativeToolTip": "LICENSE",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
-              "WhenOpened": "2025-05-24T13:04:00.902Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 5,
-              "Title": "Ink Canvas.sln.DotSettings.user",
-              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas.sln.DotSettings.user",
-              "RelativeDocumentMoniker": "Ink Canvas.sln.DotSettings.user",
-              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas.sln.DotSettings.user",
-              "RelativeToolTip": "Ink Canvas.sln.DotSettings.user",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003464|",
-              "WhenOpened": "2025-05-24T13:04:00.792Z"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{d84ee353-0bef-5a41-a649-8f89aca5d84d}"
-            }
-          ]
-        },
-        {
-          "DockedWidth": 204,
-          "SelectedChildIndex": -1,
-          "Children": [
-            {
-              "$type": "Bookmark",
-              "Name": "ST:1:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{590a070c-4fcd-52d9-87da-dfaa11710261}"
-            }
-          ]
-        },
-        {
-          "DockedWidth": 190,
-          "SelectedChildIndex": -1,
-          "Children": [
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{f4fc5ff1-28ef-4b04-ad02-6b298310ccc7}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

.vs/VSWorkspaceState.json

@@ -1,7 +0,0 @@
-{
-  "ExpandedNodes": [
-    ""
-  ],
-  "SelectedNode": "\\Ink Canvas.sln",
-  "PreviewInSolutionExplorer": false
-}

.vs/icc-0610.2.2/v17/DocumentLayout.backup.json

@@ -1,290 +0,0 @@
-{
-  "Version": 1,
-  "WorkspaceRootPath": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.2\\",
-  "Documents": [
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\System.ValueTuple.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Settings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\OSVersionExt.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Office.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\NHotkey.Wpf.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\NHotkey.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Newtonsoft.Json.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Microsoft.Office.Interop.PowerPoint.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\MdXaml.Plugins.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\MdXaml.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.Controls.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\InkCanvasForClass.exe.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\ICSharpCode.AvalonEdit.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IAWinFX.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IALoader.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IACore.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Hardcodet.NotifyIcon.Wpf.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    }
-  ],
-  "DocumentGroupContainers": [
-    {
-      "Orientation": 0,
-      "VerticalTabListWidth": 256,
-      "DocumentGroups": [
-        {
-          "DockedWidth": 200,
-          "SelectedChildIndex": 0,
-          "Children": [
-            {
-              "$type": "Document",
-              "DocumentIndex": 0,
-              "Title": "System.ValueTuple.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\System.ValueTuple.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\System.ValueTuple.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\System.ValueTuple.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\System.ValueTuple.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:48.138Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "Settings.json",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Settings.json",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\Settings.json",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Settings.json",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\Settings.json",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
-              "WhenOpened": "2025-05-24T13:02:44.878Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 2,
-              "Title": "OSVersionExt.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\OSVersionExt.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\OSVersionExt.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\OSVersionExt.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\OSVersionExt.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:44.837Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 3,
-              "Title": "Office.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Office.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\Office.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Office.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\Office.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:44.774Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 4,
-              "Title": "NHotkey.Wpf.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\NHotkey.Wpf.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\NHotkey.Wpf.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\NHotkey.Wpf.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\NHotkey.Wpf.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:44.718Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 5,
-              "Title": "NHotkey.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\NHotkey.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\NHotkey.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\NHotkey.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\NHotkey.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:44.662Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 6,
-              "Title": "Newtonsoft.Json.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Newtonsoft.Json.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\Newtonsoft.Json.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Newtonsoft.Json.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\Newtonsoft.Json.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:44.589Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 7,
-              "Title": "Microsoft.Office.Interop.PowerPoint.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Microsoft.Office.Interop.PowerPoint.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\Microsoft.Office.Interop.PowerPoint.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Microsoft.Office.Interop.PowerPoint.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\Microsoft.Office.Interop.PowerPoint.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:43.932Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 8,
-              "Title": "MdXaml.Plugins.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\MdXaml.Plugins.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\MdXaml.Plugins.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\MdXaml.Plugins.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\MdXaml.Plugins.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:43.838Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 9,
-              "Title": "MdXaml.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\MdXaml.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\MdXaml.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\MdXaml.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\MdXaml.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:43.776Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 10,
-              "Title": "iNKORE.UI.WPF.Modern.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:43.573Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 11,
-              "Title": "iNKORE.UI.WPF.Modern.Controls.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.Controls.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.Controls.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.Controls.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.Controls.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:43.432Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 12,
-              "Title": "iNKORE.UI.WPF.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\iNKORE.UI.WPF.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\iNKORE.UI.WPF.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:42.807Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 13,
-              "Title": "InkCanvasForClass.exe.config",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\InkCanvasForClass.exe.config",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\InkCanvasForClass.exe.config",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\InkCanvasForClass.exe.config",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\InkCanvasForClass.exe.config",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|",
-              "WhenOpened": "2025-05-24T13:02:27.288Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 14,
-              "Title": "ICSharpCode.AvalonEdit.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\ICSharpCode.AvalonEdit.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\ICSharpCode.AvalonEdit.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\ICSharpCode.AvalonEdit.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\ICSharpCode.AvalonEdit.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:22.847Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 15,
-              "Title": "IAWinFX.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IAWinFX.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\IAWinFX.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IAWinFX.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\IAWinFX.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:22.816Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 16,
-              "Title": "IALoader.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IALoader.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\IALoader.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IALoader.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\IALoader.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:22.784Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 17,
-              "Title": "IACore.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IACore.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\IACore.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IACore.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\IACore.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:22.753Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 18,
-              "Title": "Hardcodet.NotifyIcon.Wpf.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Hardcodet.NotifyIcon.Wpf.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\Hardcodet.NotifyIcon.Wpf.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Hardcodet.NotifyIcon.Wpf.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\Hardcodet.NotifyIcon.Wpf.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:22.113Z"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

.vs/icc-0610.2.2/v17/DocumentLayout.json

@@ -1,338 +0,0 @@
-{
-  "Version": 1,
-  "WorkspaceRootPath": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.2\\",
-  "Documents": [
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.2\\icc.png||{177559E0-D141-11D0-92DF-00A0C9138C45}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:icc.png||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.2\\AutomaticUpdateVersionControl.txt||{8B382828-6202-11D1-8870-0000F87579D2}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:AutomaticUpdateVersionControl.txt||{8B382828-6202-11D1-8870-0000F87579D2}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.2\\.gitignore||{3B902123-F8A7-4915-9F01-361F908088D0}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:.gitignore||{3B902123-F8A7-4915-9F01-361F908088D0}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\System.ValueTuple.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Settings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\OSVersionExt.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Office.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\NHotkey.Wpf.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\NHotkey.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Newtonsoft.Json.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Microsoft.Office.Interop.PowerPoint.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\MdXaml.Plugins.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\MdXaml.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.Controls.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\InkCanvasForClass.exe.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\ICSharpCode.AvalonEdit.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IAWinFX.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IALoader.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IACore.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Hardcodet.NotifyIcon.Wpf.dll||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    }
-  ],
-  "DocumentGroupContainers": [
-    {
-      "Orientation": 0,
-      "VerticalTabListWidth": 256,
-      "DocumentGroups": [
-        {
-          "DockedWidth": 200,
-          "SelectedChildIndex": 0,
-          "Children": [
-            {
-              "$type": "Document",
-              "DocumentIndex": 0,
-              "Title": "icc.png - PNG [256x256, 32 \u4F4D, PNG]",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.2\\icc.png",
-              "RelativeDocumentMoniker": "icc.png",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.2\\icc.png - PNG [256x256, 32 \u4F4D, PNG]",
-              "RelativeToolTip": "icc.png - PNG [256x256, 32 \u4F4D, PNG]",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001533|",
-              "WhenOpened": "2025-05-24T13:03:45.63Z",
-              "EditorCaption": " - PNG [256x256, 32 \u4F4D, PNG]"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "AutomaticUpdateVersionControl.txt",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.2\\AutomaticUpdateVersionControl.txt",
-              "RelativeDocumentMoniker": "AutomaticUpdateVersionControl.txt",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.2\\AutomaticUpdateVersionControl.txt",
-              "RelativeToolTip": "AutomaticUpdateVersionControl.txt",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003109|",
-              "WhenOpened": "2025-05-24T13:03:45.517Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 2,
-              "Title": ".gitignore",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.2\\.gitignore",
-              "RelativeDocumentMoniker": ".gitignore",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.2\\.gitignore",
-              "RelativeToolTip": ".gitignore",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
-              "WhenOpened": "2025-05-24T13:03:43.13Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 3,
-              "Title": "System.ValueTuple.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\System.ValueTuple.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\System.ValueTuple.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\System.ValueTuple.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\System.ValueTuple.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:48.138Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 4,
-              "Title": "Settings.json",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Settings.json",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\Settings.json",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Settings.json",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\Settings.json",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
-              "WhenOpened": "2025-05-24T13:02:44.878Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 5,
-              "Title": "OSVersionExt.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\OSVersionExt.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\OSVersionExt.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\OSVersionExt.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\OSVersionExt.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:44.837Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 6,
-              "Title": "Office.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Office.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\Office.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Office.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\Office.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:44.774Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 7,
-              "Title": "NHotkey.Wpf.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\NHotkey.Wpf.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\NHotkey.Wpf.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\NHotkey.Wpf.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\NHotkey.Wpf.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:44.718Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 8,
-              "Title": "NHotkey.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\NHotkey.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\NHotkey.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\NHotkey.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\NHotkey.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:44.662Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 9,
-              "Title": "Newtonsoft.Json.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Newtonsoft.Json.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\Newtonsoft.Json.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Newtonsoft.Json.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\Newtonsoft.Json.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:44.589Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 10,
-              "Title": "Microsoft.Office.Interop.PowerPoint.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Microsoft.Office.Interop.PowerPoint.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\Microsoft.Office.Interop.PowerPoint.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Microsoft.Office.Interop.PowerPoint.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\Microsoft.Office.Interop.PowerPoint.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:43.932Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 11,
-              "Title": "MdXaml.Plugins.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\MdXaml.Plugins.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\MdXaml.Plugins.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\MdXaml.Plugins.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\MdXaml.Plugins.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:43.838Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 12,
-              "Title": "MdXaml.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\MdXaml.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\MdXaml.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\MdXaml.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\MdXaml.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:43.776Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 13,
-              "Title": "iNKORE.UI.WPF.Modern.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:43.573Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 14,
-              "Title": "iNKORE.UI.WPF.Modern.Controls.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.Controls.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.Controls.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.Controls.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\iNKORE.UI.WPF.Modern.Controls.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:43.432Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 15,
-              "Title": "iNKORE.UI.WPF.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\iNKORE.UI.WPF.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\iNKORE.UI.WPF.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\iNKORE.UI.WPF.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:42.807Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 16,
-              "Title": "InkCanvasForClass.exe.config",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\InkCanvasForClass.exe.config",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\InkCanvasForClass.exe.config",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\InkCanvasForClass.exe.config",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\InkCanvasForClass.exe.config",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|",
-              "WhenOpened": "2025-05-24T13:02:27.288Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 17,
-              "Title": "ICSharpCode.AvalonEdit.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\ICSharpCode.AvalonEdit.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\ICSharpCode.AvalonEdit.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\ICSharpCode.AvalonEdit.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\ICSharpCode.AvalonEdit.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:22.847Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 18,
-              "Title": "IAWinFX.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IAWinFX.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\IAWinFX.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IAWinFX.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\IAWinFX.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:22.816Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 19,
-              "Title": "IALoader.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IALoader.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\IALoader.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IALoader.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\IALoader.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:22.784Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 20,
-              "Title": "IACore.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IACore.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\IACore.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\IACore.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\IACore.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:22.753Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 21,
-              "Title": "Hardcodet.NotifyIcon.Wpf.dll",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Hardcodet.NotifyIcon.Wpf.dll",
-              "RelativeDocumentMoniker": "..\\..\\InkCanvasForClass\\Hardcodet.NotifyIcon.Wpf.dll",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\InkCanvasForClass\\Hardcodet.NotifyIcon.Wpf.dll",
-              "RelativeToolTip": "..\\..\\InkCanvasForClass\\Hardcodet.NotifyIcon.Wpf.dll",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001697|",
-              "WhenOpened": "2025-05-24T13:02:22.113Z"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

.vs/icc-0610.2.3/v17/DocumentLayout.backup.json

@@ -1,67 +0,0 @@
-{
-  "Version": 1,
-  "WorkspaceRootPath": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\",
-  "Documents": [
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\icc.png||{177559E0-D141-11D0-92DF-00A0C9138C45}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:icc.png||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\AutomaticUpdateVersionControl.txt||{8B382828-6202-11D1-8870-0000F87579D2}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:AutomaticUpdateVersionControl.txt||{8B382828-6202-11D1-8870-0000F87579D2}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\.gitignore||{3B902123-F8A7-4915-9F01-361F908088D0}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:.gitignore||{3B902123-F8A7-4915-9F01-361F908088D0}"
-    }
-  ],
-  "DocumentGroupContainers": [
-    {
-      "Orientation": 0,
-      "VerticalTabListWidth": 256,
-      "DocumentGroups": [
-        {
-          "DockedWidth": 200,
-          "SelectedChildIndex": 0,
-          "Children": [
-            {
-              "$type": "Document",
-              "DocumentIndex": 0,
-              "Title": "icc.png",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\icc.png",
-              "RelativeDocumentMoniker": "icc.png",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\icc.png",
-              "RelativeToolTip": "icc.png",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001533|",
-              "WhenOpened": "2025-05-24T13:12:49.619Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "AutomaticUpdateVersionControl.txt",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\AutomaticUpdateVersionControl.txt",
-              "RelativeDocumentMoniker": "AutomaticUpdateVersionControl.txt",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\AutomaticUpdateVersionControl.txt",
-              "RelativeToolTip": "AutomaticUpdateVersionControl.txt",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003109|",
-              "WhenOpened": "2025-05-24T13:12:49.575Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 2,
-              "Title": ".gitignore",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\.gitignore",
-              "RelativeDocumentMoniker": ".gitignore",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\.gitignore",
-              "RelativeToolTip": ".gitignore",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
-              "WhenOpened": "2025-05-24T13:12:49.025Z"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

.vs/icc-0610.2.3/v17/DocumentLayout.json

@@ -1,72 +0,0 @@
-{
-  "Version": 1,
-  "WorkspaceRootPath": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\",
-  "Documents": [
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\icc.png||{177559E0-D141-11D0-92DF-00A0C9138C45}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:icc.png||{177559E0-D141-11D0-92DF-00A0C9138C45}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\AutomaticUpdateVersionControl.txt||{8B382828-6202-11D1-8870-0000F87579D2}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:AutomaticUpdateVersionControl.txt||{8B382828-6202-11D1-8870-0000F87579D2}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\.gitignore||{3B902123-F8A7-4915-9F01-361F908088D0}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:.gitignore||{3B902123-F8A7-4915-9F01-361F908088D0}"
-    }
-  ],
-  "DocumentGroupContainers": [
-    {
-      "Orientation": 0,
-      "VerticalTabListWidth": 256,
-      "DocumentGroups": [
-        {
-          "DockedWidth": 200,
-          "SelectedChildIndex": 1,
-          "Children": [
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 0,
-              "Title": "icc.png - PNG [1328x1328, 32 \u4F4D, PNG]",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\icc.png",
-              "RelativeDocumentMoniker": "icc.png",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\icc.png - PNG [1328x1328, 32 \u4F4D, PNG]",
-              "RelativeToolTip": "icc.png - PNG [1328x1328, 32 \u4F4D, PNG]",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001533|",
-              "WhenOpened": "2025-05-24T13:12:49.619Z",
-              "EditorCaption": " - PNG [1328x1328, 32 \u4F4D, PNG]"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "AutomaticUpdateVersionControl.txt",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\AutomaticUpdateVersionControl.txt",
-              "RelativeDocumentMoniker": "AutomaticUpdateVersionControl.txt",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\AutomaticUpdateVersionControl.txt",
-              "RelativeToolTip": "AutomaticUpdateVersionControl.txt",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003109|",
-              "WhenOpened": "2025-05-24T13:12:49.575Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 2,
-              "Title": ".gitignore",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\.gitignore",
-              "RelativeDocumentMoniker": ".gitignore",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\.gitignore",
-              "RelativeToolTip": ".gitignore",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
-              "WhenOpened": "2025-05-24T13:12:49.025Z"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

AutomaticUpdateVersionControl.txt

@@ -1 +1 @@
-1.7.5.0
+1.7.18.0

Ink Canvas.sln

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

Ink Canvas.sln.DotSettings.user

@@ -1,2 +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></wpf:ResourceDictionary>

Ink Canvas/App.xaml

@@ -4,18 +4,19 @@
              xmlns:local="clr-namespace:Ink_Canvas"
              xmlns:tb="http://www.hardcodet.net/taskbar"
              xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
-             StartupUri="MainWindow.xaml">
+             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">
@@ -32,11 +33,11 @@
                     </MenuItem.Icon>
                 </MenuItem>
                 <Separator Margin="0,3" />
-                <MenuItem>
+                <MenuItem Name="DisableAllHotkeysMenuItem" Click="DisableAllHotkeysMenuItem_Clicked">
                     <MenuItem.Header>
-                        <ui:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
                             <TextBlock FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="禁用所有快捷键" />
-                        </ui:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
                     </MenuItem.Header>
                     <MenuItem.Icon>
                         <Image Width="28" Height="28" Margin="-2">
@@ -54,9 +55,9 @@
                 </MenuItem>
                 <MenuItem Name="ForceFullScreenTrayIconMenuItem" Click="ForceFullScreenTrayIconMenuItem_Clicked">
                     <MenuItem.Header>
-                        <ui:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
                             <TextBlock FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="强制全屏化" />
-                            <ui:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
+                            <ikw:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
                                 <Border Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="CTRL" />
                                 </Border>
@@ -64,8 +65,8 @@
                                 <Border Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="F" />
                                 </Border>
-                            </ui:SimpleStackPanel>
-                        </ui:SimpleStackPanel>
+                            </ikw:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
                     </MenuItem.Header>
                     <MenuItem.Icon>
                         <Image Width="28" Height="28" Margin="-2">
@@ -87,9 +88,9 @@
                 </MenuItem>
                 <MenuItem Name="FoldFloatingBarTrayIconMenuItem" Click="FoldFloatingBarTrayIconMenuItem_Clicked">
                     <MenuItem.Header>
-                        <ui:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
                             <TextBlock Name="FoldFloatingBarTrayIconMenuItemHeaderText" FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="切换为收纳模式" />
-                            <ui:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
+                            <ikw:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
                                 <Border Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="CTRL" />
                                 </Border>
@@ -97,8 +98,8 @@
                                 <Border Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="S" />
                                 </Border>
-                            </ui:SimpleStackPanel>
-                        </ui:SimpleStackPanel>
+                            </ikw:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
                     </MenuItem.Header>
                     <MenuItem.Icon>
                         <Grid>
@@ -132,9 +133,9 @@
                 </MenuItem>
                 <MenuItem Name="ResetFloatingBarPositionTrayIconMenuItem" Click="ResetFloatingBarPositionTrayIconMenuItem_Clicked">
                     <MenuItem.Header>
-                        <ui:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
                             <TextBlock FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="重置工具栏位置" />
-                            <ui:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
+                            <ikw:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
                                 <Border  Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="CTRL" />
                                 </Border>
@@ -142,8 +143,8 @@
                                 <Border Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="T" />
                                 </Border>
-                            </ui:SimpleStackPanel>
-                        </ui:SimpleStackPanel>
+                            </ikw:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
                     </MenuItem.Header>
                     <MenuItem.Icon>
                         <Image Width="28" Height="28" Margin="-2">
@@ -163,9 +164,9 @@
                 <Separator Margin="0,3" />
                 <MenuItem Name="RestartAppTrayIconMenuItem" Click="RestartAppTrayIconMenuItem_Clicked">
                     <MenuItem.Header>
-                        <ui:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
                             <TextBlock FontSize="14" FontWeight="Bold" VerticalAlignment="Center" Foreground="#2563eb" Text="重启软件" />
-                            <ui:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
+                            <ikw:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
                                 <Border  Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="CTRL" />
                                 </Border>
@@ -173,8 +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="R" />
                                 </Border>
-                            </ui:SimpleStackPanel>
-                        </ui:SimpleStackPanel>
+                            </ikw:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
                     </MenuItem.Header>
                     <MenuItem.Icon>
                         <Image Width="24" Height="24">
@@ -195,9 +196,9 @@
                 </MenuItem>
                 <MenuItem Name="CloseAppTrayIconMenuItem" Click="CloseAppTrayIconMenuItem_Clicked">
                     <MenuItem.Header>
-                        <ui:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
                             <TextBlock FontSize="14" FontWeight="Bold" VerticalAlignment="Center" Foreground="#dc2626" Text="退出软件" />
-                            <ui:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
+                            <ikw:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4" Margin="16,0,0,0">
                                 <Border  Padding="4,2,4,1" Background="#e4e4e7" BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="2.5">
                                     <TextBlock FontSize="8" Foreground="#3f3f46" FontWeight="Bold" Text="CTRL" />
                                 </Border>
@@ -205,8 +206,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">
@@ -232,12 +233,11 @@
                             ContextMenu="{StaticResource SysTrayMenu}"
                             IconSource="/Resources/icc.ico"/>
                 <ResourceDictionary.MergedDictionaries>
-                <ui:ThemeResources RequestedTheme="Light"/>
+                <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

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

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

@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
-  <xs:element name="Weavers">
-    <xs:complexType>
-      <xs:all>
-        <xs:element name="Costura" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:all>
-              <xs:element minOccurs="0" maxOccurs="1" name="ExcludeAssemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="IncludeAssemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>Obsolete, use UnmanagedWinX86Assemblies instead</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinX86Assemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of unmanaged X86 (32 bit) assembly names to include, delimited with line breaks.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged64Assemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>Obsolete, use UnmanagedWinX64Assemblies instead.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinX64Assemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of unmanaged X64 (64 bit) assembly names to include, delimited with line breaks.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinArm64Assemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of unmanaged Arm64 (64 bit) assembly names to include, delimited with line breaks.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="PreloadOrder" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>The order of preloaded assemblies, delimited with line breaks.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-            </xs:all>
-            <xs:attribute name="CreateTemporaryAssemblies" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="IncludeDebugSymbols" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="DisableCompression" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="DisableCleanup" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="DisableEventSubscription" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>The attach method no longer subscribes to the `AppDomain.AssemblyResolve` (.NET 4.x) and `AssemblyLoadContext.Resolving` (.NET 6.0+) events.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="LoadAtModuleInit" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="IgnoreSatelliteAssemblies" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="ExcludeAssemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="IncludeAssemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="Unmanaged32Assemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>Obsolete, use UnmanagedWinX86Assemblies instead</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="UnmanagedWinX86Assemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of unmanaged X86 (32 bit) assembly names to include, delimited with |.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="Unmanaged64Assemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>Obsolete, use UnmanagedWinX64Assemblies instead</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="UnmanagedWinX64Assemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of unmanaged X64 (64 bit) assembly names to include, delimited with |.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="UnmanagedWinArm64Assemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of unmanaged Arm64 (64 bit) assembly names to include, delimited with |.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="PreloadOrder" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>The order of preloaded assemblies, delimited with |.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-          </xs:complexType>
-        </xs:element>
-      </xs:all>
-      <xs:attribute name="VerifyAssembly" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="GenerateXsd" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>

Ink Canvas/Helpers/AdvancedBezierSmoothing.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Threading;
@@ -11,7 +12,7 @@ using System.Windows.Threading;
 namespace Ink_Canvas.Helpers
 {
     /// <summary>
-    /// 异步硬件加速的墨迹平滑处理器
+    /// 改进的异步硬件加速墨迹平滑处理器，使用优化的三次贝塞尔曲线拟合
     /// </summary>
     public class AsyncAdvancedBezierSmoothing
     {
@@ -26,11 +27,13 @@ namespace Ink_Canvas.Helpers
             _processingTasks = new ConcurrentDictionary<Stroke, CancellationTokenSource>();
         }
 
-        public double SmoothingStrength { get; set; } = 0.3; // 大幅降低强度
-        public double ResampleInterval { get; set; } = 3.0; // 大幅增加间隔减少点数
-        public int InterpolationSteps { get; set; } = 4; // 极大减少插值步数
+        public double SmoothingStrength { get; set; } = 0.4; // 适中的平滑强度
+        public double ResampleInterval { get; set; } = 2.5; // 适中的重采样间隔
+        public int InterpolationSteps { get; set; } = 12; // 增加插值步数提高精度
         public bool UseHardwareAcceleration { get; set; } = true;
         public int MaxConcurrentTasks { get; set; } = Environment.ProcessorCount;
+        public bool UseAdaptiveInterpolation { get; set; } = true; // 自适应插值
+        public double CurveTension { get; set; } = 0.3; // 曲线张力参数
 
         /// <summary>
         /// 异步平滑笔画
@@ -89,15 +92,26 @@ namespace Ink_Canvas.Helpers
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            // 简化处理：只进行轻度平滑，避免点数爆炸
-            var smoothedPoints = ApplyLightSmoothing(originalPoints);
+            // 使用改进的贝塞尔曲线拟合
+            var smoothedPoints = ApplyImprovedBezierSmoothing(originalPoints);
+
+            System.Diagnostics.Debug.WriteLine($"AsyncAdvancedBezierSmoothing: 原始点数={originalPoints.Length}, 平滑后点数={smoothedPoints.Length}");
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            // 确保点数不会过多
-            if (smoothedPoints.Length > originalPoints.Length * 2)
+            // 放宽点数限制
+            if (smoothedPoints.Length > originalPoints.Length * 3.0)
             {
-                // 如果点数增加太多，回退到原始笔画
+                System.Diagnostics.Debug.WriteLine($"AsyncAdvancedBezierSmoothing: 点数过多，进行重采样");
+                // 如果点数增加太多，进行重采样
+                smoothedPoints = ResampleEquidistantOptimized(smoothedPoints, ResampleInterval);
+            }
+
+            // 进一步放宽最终检查
+            if (smoothedPoints.Length > originalPoints.Length * 2.5)
+            {
+                System.Diagnostics.Debug.WriteLine($"AsyncAdvancedBezierSmoothing: 重采样后点数仍然过多，返回原始笔画");
+                // 如果仍然太多点，使用原始笔画
                 return stroke;
             }
 
@@ -107,38 +121,404 @@ namespace Ink_Canvas.Helpers
                 DrawingAttributes = stroke.DrawingAttributes.Clone()
             };
 
+            System.Diagnostics.Debug.WriteLine($"AsyncAdvancedBezierSmoothing: 成功创建平滑笔画");
             return smoothedStroke;
         }
 
         /// <summary>
-        /// 轻度平滑处理，避免点数爆炸
+        /// 改进的贝塞尔曲线平滑处理
         /// </summary>
-        private StylusPoint[] ApplyLightSmoothing(StylusPoint[] points)
+        private StylusPoint[] ApplyImprovedBezierSmoothing(StylusPoint[] points)
         {
-            if (points.Length < 3) return points;
+            if (points.Length < 6) return points; // 5次贝塞尔需要6个点
 
             var result = new List<StylusPoint>();
-            result.Add(points[0]); // 保持第一个点
 
-            // 简单的3点平均平滑
-            for (int i = 1; i < points.Length - 1; i++)
+            // 添加第一个点
+            result.Add(points[0]);
+
+            // 使用5次贝塞尔曲线，每次移动1个点确保连续性
+            for (int i = 0; i < points.Length - 5; i++)
             {
-                var prev = points[i - 1];
-                var curr = points[i];
-                var next = points[i + 1];
+                var p0 = points[i];
+                var p1 = points[i + 1];
+                var p2 = points[i + 2];
+                var p3 = points[i + 3];
+                var p4 = points[i + 4];
+                var p5 = points[i + 5];
 
-                // 3点平均
-                double x = (prev.X + curr.X + next.X) / 3.0;
-                double y = (prev.Y + curr.Y + next.Y) / 3.0;
-                float pressure = (prev.PressureFactor + curr.PressureFactor + next.PressureFactor) / 3.0f;
+                // 计算5次贝塞尔的控制点
+                var controlPoints = CalculateQuinticControlPoints(p0, p1, p2, p3, p4, p5);
 
-                result.Add(new StylusPoint(x, y, Math.Max(pressure, 0.1f)));
+                // 生成插值点
+                if (i == 0)
+                {
+                    // 第一个窗口：生成更多插值点
+                    for (int j = 1; j <= 4; j++)
+                    {
+                        double t = (double)j / 5;
+                        var bezierPoint = CalculateQuinticBezierPoint(p0, controlPoints, p5, t);
+                        result.Add(bezierPoint);
+                    }
+                }
+                else
+                {
+                    // 后续窗口：只生成最后一个插值点，避免重复
+                    double t = 4.0 / 5.0; // 只取最后一个插值点
+                    var bezierPoint = CalculateQuinticBezierPoint(p0, controlPoints, p5, t);
+                    result.Add(bezierPoint);
+                }
             }
 
-            result.Add(points[points.Length - 1]); // 保持最后一个点
+            // 添加最后一个点
+            result.Add(points[points.Length - 1]);
 
+            System.Diagnostics.Debug.WriteLine($"ApplyImprovedBezierSmoothing: 原始点数={points.Length}, 生成点数={result.Count}");
+
+            // 使用更宽松的去重
+            return RemoveDuplicatePointsLoose(result.ToArray());
+        }
+
+        /// <summary>
+        /// 5次贝塞尔曲线控制点计算
+        /// </summary>
+        private (Point cp1, Point cp2, Point cp3, Point cp4) CalculateQuinticControlPoints(
+            StylusPoint p0, StylusPoint p1, StylusPoint p2, StylusPoint p3, StylusPoint p4, StylusPoint p5)
+        {
+            // 计算控制点距离（基于相邻点距离）
+            double dist1 = Math.Sqrt((p1.X - p0.X) * (p1.X - p0.X) + (p1.Y - p0.Y) * (p1.Y - p0.Y));
+            double dist2 = Math.Sqrt((p2.X - p1.X) * (p2.X - p1.X) + (p2.Y - p1.Y) * (p2.Y - p1.Y));
+            double dist3 = Math.Sqrt((p4.X - p3.X) * (p4.X - p3.X) + (p4.Y - p3.Y) * (p4.Y - p3.Y));
+            double dist4 = Math.Sqrt((p5.X - p4.X) * (p5.X - p4.X) + (p5.Y - p4.Y) * (p5.Y - p4.Y));
+
+            // 使用更小的控制点距离，产生超平滑的曲线
+            double controlDist1 = dist1 * 0.15;
+            double controlDist2 = dist2 * 0.15;
+            double controlDist3 = dist3 * 0.15;
+            double controlDist4 = dist4 * 0.15;
+
+            // 计算控制点方向 - 使用更平滑的方向计算
+            double dir1X = p2.X - p0.X;
+            double dir1Y = p2.Y - p0.Y;
+            double dir2X = p3.X - p1.X;
+            double dir2Y = p3.Y - p1.Y;
+            double dir3X = p4.X - p2.X;
+            double dir3Y = p4.Y - p2.Y;
+            double dir4X = p5.X - p3.X;
+            double dir4Y = p5.Y - p3.Y;
+
+            // 归一化方向
+            NormalizeVector(ref dir1X, ref dir1Y);
+            NormalizeVector(ref dir2X, ref dir2Y);
+            NormalizeVector(ref dir3X, ref dir3Y);
+            NormalizeVector(ref dir4X, ref dir4Y);
+
+            // 计算控制点
+            var cp1 = new Point(p1.X + dir1X * controlDist1, p1.Y + dir1Y * controlDist1);
+            var cp2 = new Point(p2.X + dir2X * controlDist2, p2.Y + dir2Y * controlDist2);
+            var cp3 = new Point(p3.X - dir3X * controlDist3, p3.Y - dir3Y * controlDist3);
+            var cp4 = new Point(p4.X - dir4X * controlDist4, p4.Y - dir4Y * controlDist4);
+
+            return (cp1, cp2, cp3, cp4);
+        }
+
+        /// <summary>
+        /// 归一化向量
+        /// </summary>
+        private void NormalizeVector(ref double x, ref double y)
+        {
+            double length = Math.Sqrt(x * x + y * y);
+            if (length > 0)
+            {
+                x /= length;
+                y /= length;
+            }
+        }
+
+        /// <summary>
+        /// 5次贝塞尔曲线点计算
+        /// </summary>
+        private StylusPoint CalculateQuinticBezierPoint(StylusPoint p0, (Point cp1, Point cp2, Point cp3, Point cp4) controlPoints, StylusPoint p5, double t)
+        {
+            double oneMinusT = 1 - t;
+            double oneMinusT2 = oneMinusT * oneMinusT;
+            double oneMinusT3 = oneMinusT2 * oneMinusT;
+            double oneMinusT4 = oneMinusT3 * oneMinusT;
+            double oneMinusT5 = oneMinusT4 * oneMinusT;
+
+            double t2 = t * t;
+            double t3 = t2 * t;
+            double t4 = t3 * t;
+            double t5 = t4 * t;
+
+            // 5次贝塞尔曲线公式
+            double x = oneMinusT5 * p0.X +
+                      5 * oneMinusT4 * t * controlPoints.cp1.X +
+                      10 * oneMinusT3 * t2 * controlPoints.cp2.X +
+                      10 * oneMinusT2 * t3 * controlPoints.cp3.X +
+                      5 * oneMinusT * t4 * controlPoints.cp4.X +
+                      t5 * p5.X;
+
+            double y = oneMinusT5 * p0.Y +
+                      5 * oneMinusT4 * t * controlPoints.cp1.Y +
+                      10 * oneMinusT3 * t2 * controlPoints.cp2.Y +
+                      10 * oneMinusT2 * t3 * controlPoints.cp3.Y +
+                      5 * oneMinusT * t4 * controlPoints.cp4.Y +
+                      t5 * p5.Y;
+
+            // 压力插值 - 使用线性插值
+            float pressure = (float)((1 - t) * p0.PressureFactor + t * p5.PressureFactor);
+
+            return new StylusPoint(x, y, Math.Max(pressure, 0.1f));
+        }
+
+        /// <summary>
+        /// 简化的控制点计算 
+        /// </summary>
+        private (Point cp1, Point cp2) CalculateSimpleControlPoints(StylusPoint p0, StylusPoint p1, StylusPoint p2, StylusPoint p3)
+        {
+            // 计算控制点距离（基于线段长度）
+            double dist1 = Math.Sqrt((p1.X - p0.X) * (p1.X - p0.X) + (p1.Y - p0.Y) * (p1.Y - p0.Y));
+            double dist2 = Math.Sqrt((p3.X - p2.X) * (p3.X - p2.X) + (p3.Y - p2.Y) * (p3.Y - p2.Y));
+
+            // 使用更小的控制点距离，产生更平滑的曲线
+            double controlDist1 = dist1 * 0.2; // 进一步减少控制点影响
+            double controlDist2 = dist2 * 0.2;
+
+            // 计算控制点方向 - 使用更平滑的方向计算
+            double dir1X = p2.X - p0.X; // 使用更远的点计算方向
+            double dir1Y = p2.Y - p0.Y;
+            double dir2X = p3.X - p1.X;
+            double dir2Y = p3.Y - p1.Y;
+
+            // 归一化方向
+            double len1 = Math.Sqrt(dir1X * dir1X + dir1Y * dir1Y);
+            double len2 = Math.Sqrt(dir2X * dir2X + dir2Y * dir2Y);
+
+            if (len1 > 0)
+            {
+                dir1X /= len1;
+                dir1Y /= len1;
+            }
+
+            if (len2 > 0)
+            {
+                dir2X /= len2;
+                dir2Y /= len2;
+            }
+
+            // 计算控制点
+            var cp1 = new Point(
+                p1.X + dir1X * controlDist1,
+                p1.Y + dir1Y * controlDist1
+            );
+
+            var cp2 = new Point(
+                p2.X - dir2X * controlDist2,
+                p2.Y - dir2Y * controlDist2
+            );
+
+            return (cp1, cp2);
+        }
+
+        /// <summary>
+        /// 宽松的去重算法
+        /// </summary>
+        private StylusPoint[] RemoveDuplicatePointsLoose(StylusPoint[] points)
+        {
+            if (points.Length < 2) return points;
+
+            var result = new List<StylusPoint>();
+            result.Add(points[0]);
+
+            double minDistance = 0.1; // 非常小的距离阈值，几乎不去重
+
+            for (int i = 1; i < points.Length; i++)
+            {
+                var lastPoint = result[result.Count - 1];
+                var currentPoint = points[i];
+
+                // 计算距离
+                double distance = Math.Sqrt(
+                    (currentPoint.X - lastPoint.X) * (currentPoint.X - lastPoint.X) +
+                    (currentPoint.Y - lastPoint.Y) * (currentPoint.Y - lastPoint.Y));
+
+                // 如果距离足够大，添加这个点
+                if (distance >= minDistance)
+                {
+                    result.Add(currentPoint);
+                }
+            }
+
+            System.Diagnostics.Debug.WriteLine($"RemoveDuplicatePointsLoose: 输入点数={points.Length}, 输出点数={result.Count}");
             return result.ToArray();
         }
+
+        /// <summary>
+        /// 计算贝塞尔曲线上的点
+        /// </summary>
+        private StylusPoint CalculateBezierPoint(StylusPoint p0, Point cp1, Point cp2, StylusPoint p3, double t)
+        {
+            double x = Math.Pow(1 - t, 3) * p0.X +
+                      3 * Math.Pow(1 - t, 2) * t * cp1.X +
+                      3 * (1 - t) * Math.Pow(t, 2) * cp2.X +
+                      Math.Pow(t, 3) * p3.X;
+
+            double y = Math.Pow(1 - t, 3) * p0.Y +
+                      3 * Math.Pow(1 - t, 2) * t * cp1.Y +
+                      3 * (1 - t) * Math.Pow(t, 2) * cp2.Y +
+                      Math.Pow(t, 3) * p3.Y;
+
+            // 压力插值
+            float pressure = (float)(Math.Pow(1 - t, 3) * p0.PressureFactor +
+                                   3 * Math.Pow(1 - t, 2) * t * p0.PressureFactor +
+                                   3 * (1 - t) * Math.Pow(t, 2) * p3.PressureFactor +
+                                   Math.Pow(t, 3) * p3.PressureFactor);
+
+            return new StylusPoint(x, y, Math.Max(pressure, 0.1f));
+        }
+
+        /// <summary>
+        /// 计算改进的控制点
+        /// </summary>
+        private (Point cp1, Point cp2) CalculateImprovedControlPoints(StylusPoint p0, StylusPoint p1, StylusPoint p2, StylusPoint p3)
+        {
+            // 计算切线方向
+            var tangent1 = new Vector(p1.X - p0.X, p1.Y - p0.Y);
+            var tangent2 = new Vector(p3.X - p2.X, p3.Y - p2.Y);
+
+            // 归一化切线
+            if (tangent1.Length > 0) tangent1.Normalize();
+            if (tangent2.Length > 0) tangent2.Normalize();
+
+            // 计算控制点距离（基于点间距离）
+            double dist1 = Math.Sqrt((p1.X - p0.X) * (p1.X - p0.X) + (p1.Y - p0.Y) * (p1.Y - p0.Y));
+            double dist2 = Math.Sqrt((p3.X - p2.X) * (p3.X - p2.X) + (p3.Y - p2.Y) * (p3.Y - p2.Y));
+
+            double controlDist1 = dist1 * CurveTension;
+            double controlDist2 = dist2 * 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 int CalculateAdaptiveSteps(StylusPoint p0, StylusPoint p1, StylusPoint p2, StylusPoint p3)
+        {
+            // 基于曲线长度和复杂度计算步数
+            double totalLength = 0;
+            totalLength += Math.Sqrt((p1.X - p0.X) * (p1.X - p0.X) + (p1.Y - p0.Y) * (p1.Y - p0.Y));
+            totalLength += Math.Sqrt((p2.X - p1.X) * (p2.X - p1.X) + (p2.Y - p1.Y) * (p2.Y - p1.Y));
+            totalLength += Math.Sqrt((p3.X - p2.X) * (p3.X - p2.X) + (p3.Y - p2.Y) * (p3.Y - p2.Y));
+
+            // 计算曲率（简化版本）
+            double curvature = CalculateCurvature(p0, p1, p2, p3);
+
+            // 基于长度和曲率计算步数
+            int baseSteps = Math.Max(8, Math.Min(20, (int)(totalLength / 10)));
+            int curvatureSteps = (int)(curvature * 10);
+
+            return Math.Max(InterpolationSteps, Math.Min(24, 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[] RemoveDuplicatePoints(StylusPoint[] points)
+        {
+            if (points.Length < 2) return points;
+
+            var result = new List<StylusPoint>();
+            result.Add(points[0]);
+
+            double minDistance = 0.3; // 进一步减少最小距离阈值，保留更多平滑点
+
+            for (int i = 1; i < points.Length; i++)
+            {
+                var lastPoint = result[result.Count - 1];
+                var currentPoint = points[i];
+
+                // 计算距离
+                double distance = Math.Sqrt(
+                    (currentPoint.X - lastPoint.X) * (currentPoint.X - lastPoint.X) +
+                    (currentPoint.Y - lastPoint.Y) * (currentPoint.Y - lastPoint.Y));
+
+                // 如果距离足够大，添加这个点
+                if (distance >= minDistance)
+                {
+                    result.Add(currentPoint);
+                }
+            }
+
+            System.Diagnostics.Debug.WriteLine($"RemoveDuplicatePoints: 输入点数={points.Length}, 输出点数={result.Count}");
+            return result.ToArray();
+        }
+
+        /// <summary>
+        /// 使用控制点的三次贝塞尔曲线计算
+        /// </summary>
+        private StylusPoint CubicBezierWithControlPoints((Point cp1, Point cp2) controlPoints, double t, StylusPoint p0, StylusPoint p3)
+        {
+            var p1 = controlPoints.cp1;
+            var p2 = controlPoints.cp2;
+
+            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 * p1.X + c2 * p2.X + c3 * p3.X;
+            double y = c0 * p0.Y + c1 * p1.Y + c2 * p2.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>
@@ -352,23 +732,31 @@ namespace Ink_Canvas.Helpers
     /// </summary>
     public class AdvancedBezierSmoothing
     {
-        public double SmoothingStrength { get; set; } = 0.3;
-        public double ResampleInterval { get; set; } = 3.0;
-        public int InterpolationSteps { get; set; } = 4;
+        public double SmoothingStrength { get; set; } = 0.6;
+        public double ResampleInterval { get; set; } = 2.0;
+        public int InterpolationSteps { get; set; } = 12;
 
         public Stroke SmoothStroke(Stroke stroke)
         {
             if (stroke == null || stroke.StylusPoints.Count < 3)
+            {
+                System.Diagnostics.Debug.WriteLine($"AdvancedBezierSmoothing: 笔画点数不足，跳过平滑 (点数: {stroke?.StylusPoints.Count ?? 0})");
                 return stroke;
+            }
 
-            var originalPoints = stroke.StylusPoints.ToList();
+            System.Diagnostics.Debug.WriteLine($"AdvancedBezierSmoothing: 开始平滑处理，原始点数: {stroke.StylusPoints.Count}");
 
-            // 简化处理：只进行轻度平滑
-            var smoothedPoints = ApplyLightExponentialSmoothing(originalPoints, 0.2); // 很轻的平滑
+            var originalPoints = stroke.StylusPoints.ToArray();
+
+            // 使用真正的贝塞尔曲线平滑
+            var smoothedPoints = ApplyCubicBezierSmoothing(originalPoints);
+
+            System.Diagnostics.Debug.WriteLine($"AdvancedBezierSmoothing: 平滑完成，平滑后点数: {smoothedPoints.Length}");
 
             // 检查点数是否合理
-            if (smoothedPoints.Count > originalPoints.Count * 1.5)
+            if (smoothedPoints.Length > originalPoints.Length * 10.0)
             {
+                System.Diagnostics.Debug.WriteLine($"AdvancedBezierSmoothing: 点数增加过多，返回原始笔画 (原始:{originalPoints.Length}, 平滑后:{smoothedPoints.Length})");
                 return stroke; // 如果点数增加太多，返回原始笔画
             }
 
@@ -376,9 +764,140 @@ namespace Ink_Canvas.Helpers
             {
                 DrawingAttributes = stroke.DrawingAttributes.Clone()
             };
+
+            System.Diagnostics.Debug.WriteLine($"AdvancedBezierSmoothing: 创建平滑笔画成功");
             return smoothedStroke;
         }
 
+        /// <summary>
+        /// 三次贝塞尔曲线平滑 
+        /// </summary>
+        private StylusPoint[] ApplyCubicBezierSmoothing(StylusPoint[] points)
+        {
+            if (points.Length < 4) return points;
+
+            var result = new List<StylusPoint>();
+            result.Add(points[0]);
+
+            // 使用更保守的窗口大小和插值
+            int windowSize = Math.Min(4, points.Length);
+            int stepSize = Math.Max(1, points.Length / 10); // 根据点数动态调整步长
+
+            for (int i = 0; i <= points.Length - windowSize; i += stepSize)
+            {
+                if (i + windowSize - 1 >= points.Length) break;
+
+                var p0 = points[i];
+                var p1 = points[Math.Min(i + 1, points.Length - 1)];
+                var p2 = points[Math.Min(i + 2, points.Length - 1)];
+                var p3 = points[Math.Min(i + windowSize - 1, points.Length - 1)];
+
+                // 计算控制点
+                var controlPoints = CalculateControlPoints(p0, p1, p2, p3);
+
+                // 只生成2-3个插值点
+                int steps = 2;
+
+                // 生成贝塞尔曲线点
+                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 RemoveDuplicatePoints(result.ToArray());
+        }
+
+        /// <summary>
+        /// 去除重复点
+        /// </summary>
+        private StylusPoint[] RemoveDuplicatePoints(StylusPoint[] points)
+        {
+            if (points.Length <= 1) return points;
+
+            var result = new List<StylusPoint> { points[0] };
+            double minDistance = 1.0; // 最小距离阈值
+
+            for (int i = 1; i < points.Length; i++)
+            {
+                var lastPoint = result[result.Count - 1];
+                var currentPoint = points[i];
+
+                double distance = Math.Sqrt(Math.Pow(currentPoint.X - lastPoint.X, 2) +
+                                          Math.Pow(currentPoint.Y - lastPoint.Y, 2));
+
+                if (distance > minDistance)
+                {
+                    result.Add(currentPoint);
+                }
+            }
+
+            return result.ToArray();
+        }
+
+        /// <summary>
+        /// 计算控制点
+        /// </summary>
+        private (Point cp1, Point cp2) CalculateControlPoints(StylusPoint p0, StylusPoint p1, StylusPoint p2, StylusPoint p3)
+        {
+            // 计算切线方向
+            var tangent1 = new Vector(p1.X - p0.X, p1.Y - p0.Y);
+            var tangent2 = new Vector(p3.X - p2.X, p3.Y - p2.Y);
+
+            // 归一化切线
+            if (tangent1.Length > 0) tangent1.Normalize();
+            if (tangent2.Length > 0) tangent2.Normalize();
+
+            // 计算控制点距离
+            double dist1 = Math.Sqrt((p1.X - p0.X) * (p1.X - p0.X) + (p1.Y - p0.Y) * (p1.Y - p0.Y));
+            double dist2 = Math.Sqrt((p3.X - p2.X) * (p3.X - p2.X) + (p3.Y - p2.Y) * (p3.Y - p2.Y));
+
+            double controlDist1 = dist1 * SmoothingStrength;
+            double controlDist2 = dist2 * SmoothingStrength;
+
+            // 计算控制点
+            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 StylusPoint CalculateBezierPoint(StylusPoint p0, Point cp1, Point cp2, StylusPoint p3, double t)
+        {
+            double x = Math.Pow(1 - t, 3) * p0.X +
+                      3 * Math.Pow(1 - t, 2) * t * cp1.X +
+                      3 * (1 - t) * Math.Pow(t, 2) * cp2.X +
+                      Math.Pow(t, 3) * p3.X;
+
+            double y = Math.Pow(1 - t, 3) * p0.Y +
+                      3 * Math.Pow(1 - t, 2) * t * cp1.Y +
+                      3 * (1 - t) * Math.Pow(t, 2) * cp2.Y +
+                      Math.Pow(t, 3) * p3.Y;
+
+            // 压力插值
+            float pressure = (float)(Math.Pow(1 - t, 3) * p0.PressureFactor +
+                                   3 * Math.Pow(1 - t, 2) * t * p0.PressureFactor +
+                                   3 * (1 - t) * Math.Pow(t, 2) * p3.PressureFactor +
+                                   Math.Pow(t, 3) * p3.PressureFactor);
+
+            return new StylusPoint(x, y, Math.Max(pressure, 0.1f));
+        }
+
         /// <summary>
         /// 轻度指数平滑
         /// </summary>
@@ -457,7 +976,7 @@ namespace Ink_Canvas.Helpers
             return result;
         }
 
-        private List<StylusPoint> SlidingBezierFit(List<StylusPoint> points, int window = 4, int steps = 24)
+        private List<StylusPoint> SlidingBezierFit(List<StylusPoint> points, int window = 4, int steps = 48) // 从24增加到48
         {
             var result = new List<StylusPoint>();
             if (points.Count < window) return points;

Ink Canvas/Helpers/AnimationsHelper.cs

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

Ink Canvas/Helpers/AutoBackupManager.cs

@@ -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

@@ -13,8 +13,8 @@ namespace Ink_Canvas.Helpers
     {
         private static readonly DependencyProperty IsAvoidFullScreenEnabledProperty =
             DependencyProperty.RegisterAttached(
-                "IsAvoidFullScreenEnabled", 
-                typeof(bool), 
+                "IsAvoidFullScreenEnabled",
+                typeof(bool),
                 typeof(AvoidFullScreenHelper));
 
         private static bool _isBoardMode;
@@ -122,19 +122,19 @@ namespace Ink_Canvas.Helpers
         {
             // 获取所有显示器
             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.X,
+                    screen.WorkingArea.Y,
+                    screen.WorkingArea.Width,
                     screen.WorkingArea.Height);
-                    
+
                 var intersection = Rect.Intersect(windowRect, screenRect);
                 if (intersection.Width * intersection.Height > maxIntersection)
                 {
@@ -142,11 +142,11 @@ namespace Ink_Canvas.Helpers
                     targetScreen = screen;
                 }
             }
-            
+
             // 如果没找到，使用主显示器
             if (targetScreen == null)
                 targetScreen = Screen.PrimaryScreen;
-                
+
             return new Rect(
                 targetScreen.WorkingArea.X,
                 targetScreen.WorkingArea.Y,
@@ -159,21 +159,21 @@ namespace Ink_Canvas.Helpers
             // 调整尺寸以适应工作区域
             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;
         }
     }

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

@@ -112,4 +112,44 @@ namespace Ink_Canvas.Converter
         }
         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;
+        }
+    }
 }

Ink Canvas/Helpers/DelAutoSavedFiles.cs

@@ -1,47 +1,64 @@
 using System;
 using System.IO;
 
-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) {
+                    }
+                    catch (Exception ex)
+                    {
                         LogHelper.WriteLogToFile("DelAutoSavedFiles | 处理文件时出错: " + ex, LogHelper.LogType.Error);
                     }
                 }
 
-                try { // 递归删除空文件夹
+                try
+                { // 递归删除空文件夹
                     DeleteEmptyFolders(directoryPath);
-                } catch (Exception ex) {
+                }
+                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

@@ -14,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/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

@@ -25,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;
@@ -35,7 +36,26 @@ 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 string WindowTitle()
+        {
             IntPtr foregroundWindowHandle = GetForegroundWindow();
 
             const int nChars = 256;
@@ -45,7 +65,8 @@ namespace Ink_Canvas.Helpers
             return windowTitle.ToString();
         }
 
-        public static string WindowClassName() {
+        public static string WindowClassName()
+        {
             IntPtr foregroundWindowHandle = GetForegroundWindow();
 
             const int nChars = 256;
@@ -55,7 +76,8 @@ namespace Ink_Canvas.Helpers
             return className.ToString();
         }
 
-        public static RECT WindowRect() {
+        public static RECT WindowRect()
+        {
             IntPtr foregroundWindowHandle = GetForegroundWindow();
 
             RECT windowRect;
@@ -64,15 +86,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";
             }
@@ -89,7 +115,8 @@ 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";
             }
@@ -97,10 +124,28 @@ namespace Ink_Canvas.Helpers
 
         public static double GetTaskbarHeight(Screen screen, double dpiScaleY)
         {
-            // 获取工作区和屏幕高度的差值
-            var workingArea = screen.WorkingArea;
-            var bounds = screen.Bounds;
-            int taskbarHeight = bounds.Height - workingArea.Height;
+            // 创建RECT结构体表示屏幕边界
+            RECT screenRect = new RECT
+            {
+                Left = screen.Bounds.Left,
+                Top = screen.Bounds.Top,
+                Right = screen.Bounds.Right,
+                Bottom = screen.Bounds.Bottom
+            };
+
+            // 获取屏幕句柄
+            const uint MONITOR_DEFAULTTONEAREST = 0x00000002;
+            IntPtr hMonitor = MonitorFromRect(ref screenRect, MONITOR_DEFAULTTONEAREST);
+
+            // 初始化MONITORINFO结构体
+            MONITORINFO monitorInfo = new MONITORINFO();
+            monitorInfo.cbSize = (uint)Marshal.SizeOf(typeof(MONITORINFO));
+
+            // 获取监视器信息
+            GetMonitorInfo(hMonitor, ref monitorInfo);
+
+            // 计算任务栏高度：monitorInfo.rcMonitor.bottom减去monitorInfo.rcWork.bottom的值
+            int taskbarHeight = monitorInfo.rcMonitor.Bottom - monitorInfo.rcWork.Bottom;
             // 考虑 DPI 缩放
             return taskbarHeight / dpiScaleY;
         }

Ink Canvas/Helpers/FullScreenHelper.Win32.cs

@@ -81,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)
                 {
@@ -99,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)
                 {

Ink Canvas/Helpers/FullScreenHelper.cs

@@ -67,12 +67,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 +81,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 +95,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 +139,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)
                 {
@@ -201,7 +201,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 +245,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))
                         {
                             //基于显示器信息设置窗口尺寸位置

Ink Canvas/Helpers/HardwareAcceleratedInkProcessor.cs

@@ -16,7 +16,6 @@ namespace Ink_Canvas.Helpers
     {
         private readonly RenderTargetBitmap _renderTarget;
         private readonly DrawingVisual _drawingVisual;
-        private readonly DrawingContext _drawingContext;
         private bool _isInitialized;
 
         public HardwareAcceleratedInkProcessor(int width = 1920, int height = 1080)
@@ -24,11 +23,11 @@ namespace Ink_Canvas.Helpers
             // 创建硬件加速的渲染目标
             _renderTarget = new RenderTargetBitmap(width, height, 96, 96, PixelFormats.Pbgra32);
             _drawingVisual = new DrawingVisual();
-            
+
             // 启用硬件加速
             RenderOptions.SetBitmapScalingMode(_drawingVisual, BitmapScalingMode.HighQuality);
             RenderOptions.SetEdgeMode(_drawingVisual, EdgeMode.Aliased);
-            
+
             _isInitialized = true;
         }
 
@@ -46,10 +45,10 @@ namespace Ink_Canvas.Helpers
                 {
                     // 使用PathGeometry进行硬件加速的曲线拟合
                     var pathGeometry = CreateSmoothPathGeometry(originalStroke.StylusPoints);
-                    
+
                     // 将PathGeometry转换回StylusPoint集合
                     var smoothedPoints = ConvertPathGeometryToStylusPoints(pathGeometry, originalStroke.StylusPoints);
-                    
+
                     return new Stroke(new StylusPointCollection(smoothedPoints))
                     {
                         DrawingAttributes = originalStroke.DrawingAttributes.Clone()
@@ -69,22 +68,22 @@ namespace Ink_Canvas.Helpers
         {
             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 += 3)
+
+            // 使用贝塞尔曲线段创建平滑路径，增加插点密度
+            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;
         }
@@ -96,11 +95,11 @@ namespace Ink_Canvas.Helpers
         {
             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)
@@ -116,10 +115,10 @@ namespace Ink_Canvas.Helpers
                     }
                 }
             }
-            
+
             // 保持原始压感信息
             InterpolatePressure(result, originalPoints);
-            
+
             return result;
         }
 
@@ -129,13 +128,13 @@ namespace Ink_Canvas.Helpers
         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));
@@ -145,26 +144,26 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 使用GPU加速的并行贝塞尔计算
         /// </summary>
-        public static StylusPoint[] ParallelBezierInterpolation(StylusPoint[] controlPoints, int segments = 16)
+        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;
         }
 
@@ -178,80 +177,23 @@ namespace Ink_Canvas.Helpers
             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资源
+        /// 释放GPU相关资源标记
         /// </summary>
         public void Dispose()
         {
-            _drawingContext?.Close();
-            _renderTarget?.Clear();
+
             _isInitialized = false;
         }
     }
 
-    /// <summary>
-    /// 质量配置枚举
-    /// </summary>
-    public enum InkSmoothingQuality
-    {
-        HighPerformance = 0,  // 高性能低质量
-        Balanced = 1,         // 平衡
-        HighQuality = 2       // 高质量低性能
-    }
 
-    /// <summary>
-    /// 墨迹平滑配置
-    /// </summary>
-    public class InkSmoothingConfig
-    {
-        public InkSmoothingQuality Quality { get; set; } = InkSmoothingQuality.Balanced;
-        public bool UseHardwareAcceleration { get; set; } = true;
-        public bool UseAsyncProcessing { get; set; } = true;
-        public int MaxConcurrentTasks { get; set; } = Environment.ProcessorCount;
-        public double SmoothingStrength { get; set; } = 0.6;
-        public double ResampleInterval { get; set; } = 1.2;
-        public int InterpolationSteps { get; set; } = 16;
-
-        public static InkSmoothingConfig FromSettings()
-        {
-            return new InkSmoothingConfig
-            {
-                Quality = (InkSmoothingQuality)MainWindow.Settings.Canvas.InkSmoothingQuality,
-                UseHardwareAcceleration = MainWindow.Settings.Canvas.UseHardwareAcceleration,
-                UseAsyncProcessing = MainWindow.Settings.Canvas.UseAsyncInkSmoothing,
-                MaxConcurrentTasks = MainWindow.Settings.Canvas.MaxConcurrentSmoothingTasks > 0 ?
-                    MainWindow.Settings.Canvas.MaxConcurrentSmoothingTasks : Environment.ProcessorCount
-            };
-        }
-
-        public void ApplyQualitySettings()
-        {
-            switch (Quality)
-            {
-                case InkSmoothingQuality.HighPerformance:
-                    SmoothingStrength = 0.4;
-                    ResampleInterval = 2.0;
-                    InterpolationSteps = 8;
-                    break;
-                case InkSmoothingQuality.Balanced:
-                    SmoothingStrength = 0.6;
-                    ResampleInterval = 1.2;
-                    InterpolationSteps = 16;
-                    break;
-                case InkSmoothingQuality.HighQuality:
-                    SmoothingStrength = 0.8;
-                    ResampleInterval = 0.8;
-                    InterpolationSteps = 32;
-                    break;
-            }
-        }
-    }
 }

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

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Reflection;
-using System.Windows;
 
 namespace Ink_Canvas.Helpers
 {
@@ -13,7 +12,7 @@ namespace Ink_Canvas.Helpers
     {
         private static readonly string[] RequiredDlls = {
             "IACore.dll",
-            "IALoader.dll", 
+            "IALoader.dll",
             "IAWinFX.dll"
         };
 
@@ -30,7 +29,7 @@ namespace Ink_Canvas.Helpers
                 foreach (string dllName in RequiredDlls)
                 {
                     string targetPath = Path.Combine(appDirectory, dllName);
-                    
+
                     // 检查文件是否已存在且有效
                     if (File.Exists(targetPath) && IsValidDll(targetPath))
                     {
@@ -109,7 +108,7 @@ namespace Ink_Canvas.Helpers
                     return false;
 
                 FileInfo fileInfo = new FileInfo(filePath);
-                
+
                 // 检查文件大小（空文件或过小的文件可能无效）
                 if (fileInfo.Length < 1024) // 小于1KB可能无效
                     return false;
@@ -140,11 +139,11 @@ namespace Ink_Canvas.Helpers
             try
             {
                 string appDirectory = AppDomain.CurrentDomain.BaseDirectory;
-                
+
                 foreach (string dllName in RequiredDlls)
                 {
                     string filePath = Path.Combine(appDirectory, dllName);
-                    
+
                     if (File.Exists(filePath))
                     {
                         try

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

Ink Canvas/Helpers/InkRecognizeHelper.cs

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

Ink Canvas/Helpers/InkShapeRecognition.cs

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

Ink Canvas/Helpers/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

@@ -25,7 +25,7 @@ namespace Ink_Canvas.Helpers
             _uiDispatcher = uiDispatcher;
             _config = InkSmoothingConfig.FromSettings();
             _config.ApplyQualitySettings();
-            
+
             _asyncSmoothing = new AsyncAdvancedBezierSmoothing(uiDispatcher)
             {
                 SmoothingStrength = _config.SmoothingStrength,
@@ -34,7 +34,7 @@ namespace Ink_Canvas.Helpers
                 UseHardwareAcceleration = _config.UseHardwareAcceleration,
                 MaxConcurrentTasks = _config.MaxConcurrentTasks
             };
-            
+
             _hardwareProcessor = new HardwareAcceleratedInkProcessor();
             _performanceMonitor = new InkSmoothingPerformanceMonitor();
         }
@@ -42,7 +42,7 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 平滑笔画（自动选择最佳方法）
         /// </summary>
-        public async Task<Stroke> SmoothStrokeAsync(Stroke originalStroke, 
+        public async Task<Stroke> SmoothStrokeAsync(Stroke originalStroke,
             Action<Stroke, Stroke> onCompleted = null,
             CancellationToken cancellationToken = default)
         {
@@ -142,7 +142,7 @@ namespace Ink_Canvas.Helpers
         {
             var newConfig = InkSmoothingConfig.FromSettings();
             newConfig.ApplyQualitySettings();
-            
+
             _asyncSmoothing.SmoothingStrength = newConfig.SmoothingStrength;
             _asyncSmoothing.ResampleInterval = newConfig.ResampleInterval;
             _asyncSmoothing.InterpolationSteps = newConfig.InterpolationSteps;
@@ -189,33 +189,36 @@ namespace Ink_Canvas.Helpers
         public static InkSmoothingConfig GetRecommendedConfig()
         {
             var config = new InkSmoothingConfig();
-            
+
             // 根据系统性能调整配置
             var processorCount = Environment.ProcessorCount;
             var isHardwareAccelerated = IsHardwareAccelerationSupported();
-            
-            if (processorCount >= 8 && isHardwareAccelerated)
+
+            if (processorCount >= 4 && isHardwareAccelerated)
             {
-                config.Quality = InkSmoothingQuality.HighQuality;
+                // 降低高质量模式的门槛，4核以上且支持硬件加速就使用高质量
+                config.Quality = (InkSmoothingConfig.SmoothingQuality)InkSmoothingConfig.InkSmoothingQuality.HighQuality;
                 config.UseHardwareAcceleration = true;
                 config.UseAsyncProcessing = true;
                 config.MaxConcurrentTasks = Math.Min(processorCount, 8);
             }
-            else if (processorCount >= 4)
+            else if (processorCount >= 2)
             {
-                config.Quality = InkSmoothingQuality.Balanced;
+                // 2核以上使用平衡模式
+                config.Quality = (InkSmoothingConfig.SmoothingQuality)InkSmoothingConfig.InkSmoothingQuality.Balanced;
                 config.UseHardwareAcceleration = isHardwareAccelerated;
                 config.UseAsyncProcessing = true;
                 config.MaxConcurrentTasks = Math.Min(processorCount, 4);
             }
             else
             {
-                config.Quality = InkSmoothingQuality.HighPerformance;
+                // 单核或性能较低的设备使用高性能模式
+                config.Quality = (InkSmoothingConfig.SmoothingQuality)InkSmoothingConfig.InkSmoothingQuality.HighPerformance;
                 config.UseHardwareAcceleration = false;
                 config.UseAsyncProcessing = false;
                 config.MaxConcurrentTasks = 1;
             }
-            
+
             config.ApplyQualitySettings();
             return config;
         }

Ink Canvas/Helpers/IsOutsideOfScreenHelper.cs

@@ -5,11 +5,15 @@ 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;
             }
 
@@ -19,7 +23,8 @@ namespace Ink_Canvas.Helpers {
             var screens = Screen.AllScreens;
             return !screens.Any(x => x.Bounds.IntersectsWith(targetBounds));
 
-            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)));

Ink Canvas/Helpers/LocalizationHelper.cs

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

Ink Canvas/Helpers/LogHelper.cs

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

Ink Canvas/Helpers/MultiTouchInput.cs

@@ -1,4 +1,5 @@
-using System;
+using System;
+using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Ink;
 using System.Windows.Input;
@@ -8,27 +9,53 @@ namespace Ink_Canvas.Helpers
 {
     public class VisualCanvas : FrameworkElement
     {
+        private readonly List<DrawingVisual> _visuals = new List<DrawingVisual>();
+
         protected override Visual GetVisualChild(int index)
         {
-            return Visual;
+            if (index < 0 || index >= _visuals.Count)
+                throw new ArgumentOutOfRangeException(nameof(index));
+            return _visuals[index];
         }
 
-        protected override int VisualChildrenCount => 1;
+        protected override int VisualChildrenCount => _visuals.Count;
 
-        public VisualCanvas(DrawingVisual visual)
+        public VisualCanvas()
         {
-            Visual = visual;
+            CacheMode = new BitmapCache();
+
+            RenderOptions.SetBitmapScalingMode(this, BitmapScalingMode.HighQuality);
+            RenderOptions.SetEdgeMode(this, EdgeMode.Aliased);
+            RenderOptions.SetCachingHint(this, CachingHint.Cache);
+        }
+
+        public void AddVisual(DrawingVisual visual)
+        {
+            if (visual == null) return;
+            _visuals.Add(visual);
             AddVisualChild(visual);
         }
+        public void Clear()
+        {
+            foreach (var visual in _visuals)
+            {
+                RemoveVisualChild(visual);
+            }
+            _visuals.Clear();
+        }
 
-        public DrawingVisual Visual { get; }
+        public IReadOnlyList<DrawingVisual> Visuals => _visuals;
     }
 
     /// <summary>
-    ///     用于显示笔迹的类
+    /// 用于显示笔迹的类 
     /// </summary>
-    public class StrokeVisual : DrawingVisual
+    public class StrokeVisual
     {
+        private int _lastDrawnPointCount = 0;
+        private const int INCREMENTAL_DRAW_THRESHOLD = 2;
+        private VisualCanvas _visualCanvas;
+
         /// <summary>
         ///     创建显示笔迹的类
         /// </summary>
@@ -43,7 +70,7 @@ namespace Ink_Canvas.Helpers
         }
 
         /// <summary>
-        ///     创建显示笔迹的类
+        /// 创建显示笔迹的类
         /// </summary>
         /// <param name="drawingAttributes"></param>
         public StrokeVisual(DrawingAttributes drawingAttributes)
@@ -52,12 +79,20 @@ namespace Ink_Canvas.Helpers
         }
 
         /// <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)
@@ -74,25 +109,119 @@ namespace Ink_Canvas.Helpers
         }
 
         /// <summary>
-        ///     重新画出笔迹
+        /// 绘制点段到新的DrawingVisual
+        /// </summary>
+        private static double PressureToVisualScale(float pressureFactor, bool ignorePressure)
+        {
+            if (ignorePressure)
+                return 1.0;
+            // 与 WPF 墨迹观感接近：0.5 为标称，压低变细、抬高变粗（预览此前固定 Pen 宽，等同忽略压感）
+            return Math.Max(0.22, Math.Min(2.1, 0.42 + 1.16 * pressureFactor));
+        }
+
+        private void DrawSegmentToNewVisual(int startIndex, int endIndex)
+        {
+            if (Stroke == null || Stroke.StylusPoints.Count == 0 || _visualCanvas == null) return;
+            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()
         {
-            try
+            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)
             {
-                using (var dc = RenderOpen())
+                try
                 {
-                    Stroke.Draw(dc);
+                    if (_lastDrawnPointCount == 0)
+                    {
+                        // 首次绘制：绘制所有点
+                        DrawSegmentToNewVisual(0, currentPointCount);
+                        _lastDrawnPointCount = currentPointCount;
+                    }
+                    else
+                    {
+                        // 从上次绘制的最后一个点开始
+                        int startIndex = Math.Max(0, _lastDrawnPointCount - 1);
+                        DrawSegmentToNewVisual(startIndex, currentPointCount);
+                        _lastDrawnPointCount = currentPointCount;
+                    }
                 }
+                catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
             }
-            catch { }
+        }
+
+        /// <summary>
+        /// 强制重绘
+        /// </summary>
+        public void ForceRedraw()
+        {
+            if (_visualCanvas != null)
+            {
+                _visualCanvas.Clear();
+            }
+            _lastDrawnPointCount = 0;
+            Redraw();
         }
 
         private readonly DrawingAttributes _drawingAttributes;
 
-        public static implicit operator Stroke(StrokeVisual v)
-        {
-            throw new NotImplementedException();
-        }
     }
 }

Ink Canvas/Helpers/PPTInkManager.cs

@@ -0,0 +1,604 @@
+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();
+            LogHelper.WriteLogToFile("已清除所有墨迹", LogHelper.LogType.Trace);
+        }
+
+        /// <summary>
+        /// 用指定的笔迹集合替换内部存储中对应幻灯片索引的内存流：释放（并忽略释放错误）旧流，将 <paramref name="strokes"/> 序列化到新的 <see cref="MemoryStream"/> 并保存回内部数组。
+        /// </summary>
+        /// <param name="slideIndex">要替换的幻灯片索引（内部内存流数组的索引）。</param>
+        /// <param name="strokes">要序列化并保存到内存流的笔迹集合。</param>
+        private void ReplaceSlideStream(int slideIndex, StrokeCollection strokes)
+        {
+            try { _memoryStreams[slideIndex]?.Dispose(); } catch (Exception ex) { LogHelper.WriteLogToFile($"释放旧内存流失败: {ex}", LogHelper.LogType.Warning); }
+            var ms = new MemoryStream();
+            strokes.Save(ms);
+            ms.Position = 0;
+            _memoryStreams[slideIndex] = ms;
+        }
+
+        /// <summary>
+        /// 从指定文件夹删除对应幻灯片的笔迹文件（按四位索引命名）；如果文件不存在或删除失败则静默忽略错误。
+        /// </summary>
+        /// <param name="folderPath">存放笔迹文件的文件夹路径。</param>
+        /// <param name="slideIndex">用于生成文件名的幻灯片索引（格式化为四位，例如 1 -> "0001"）。</param>
+        private void TryDeleteStrokeFile(string folderPath, int slideIndex)
+        {
+            try
+            {
+                string path = Path.Combine(folderPath, slideIndex.ToString("0000") + StrokeFileExtension);
+                if (File.Exists(path)) File.Delete(path);
+            }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+        }
+
+        /// <summary>
+        /// 检查当前墨迹内存使用状况并在超过阈值时触发清理操作。
+        /// </summary>
+        /// <remarks>
+        /// 会更新内部的内存使用统计并刷新上次清理时间；当总占用超过 MaxMemoryUsageBytes 时，会记录警告并调用 CleanupInactiveSlideStrokes 清理不活跃幻灯页的墨迹流。若检查或清理过程中发生异常，会记录错误日志。
+        /// </remarks>
+        private void CheckAndPerformMemoryCleanup()
+        {
+            try
+            {
+                var now = DateTime.Now;
+                if (now - _lastMemoryCleanup < TimeSpan.FromMinutes(MemoryCleanupIntervalMinutes)) return;
+
+                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
+    }
+}

Ink Canvas/Helpers/PPTROTConnectionHelper.cs

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

Ink Canvas/Helpers/PPTUIManager.cs

@@ -0,0 +1,526 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Threading;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// PPT UI管理器 - 统一管理PPT相关的UI更新和样式设置
+    /// </summary>
+    public class PPTUIManager
+    {
+        #region Properties
+        public bool ShowPPTButton { get; set; } = true;
+        public int PPTButtonsDisplayOption { get; set; } = 2222;
+        public int PPTSButtonsOption { get; set; } = 221;
+        public int PPTBButtonsOption { get; set; } = 121;
+        public int PPTLSButtonPosition { get; set; } = 0;
+        public int PPTRSButtonPosition { get; set; } = 0;
+        public int PPTLBButtonPosition { get; set; } = 0;
+        public int PPTRBButtonPosition { get; set; } = 0;
+        public bool EnablePPTButtonPageClickable { get; set; } = true;
+        public bool EnablePPTButtonLongPressPageTurn { get; set; } = true;
+        public double PPTLSButtonOpacity { get; set; } = 0.5;
+        public double PPTRSButtonOpacity { get; set; } = 0.5;
+        public double PPTLBButtonOpacity { get; set; } = 0.5;
+        public double PPTRBButtonOpacity { get; set; } = 0.5;
+        #endregion
+
+        #region Private Fields
+        private readonly MainWindow _mainWindow;
+        private readonly Dispatcher _dispatcher;
+        #endregion
+
+        #region Constructor
+        public PPTUIManager(MainWindow mainWindow)
+        {
+            _mainWindow = mainWindow ?? throw new ArgumentNullException(nameof(mainWindow));
+            _dispatcher = _mainWindow.Dispatcher;
+        }
+        #endregion
+
+        #region Public Methods
+        /// <summary>
+        /// 更新PPT连接状态UI
+        /// </summary>
+        public void UpdateConnectionStatus(bool isConnected)
+        {
+            _dispatcher.InvokeAsync(() =>
+            {
+                try
+                {
+                    if (isConnected)
+                    {
+                        _mainWindow.StackPanelPPTControls.Visibility = Visibility.Visible;
+                        _mainWindow.BtnPPTSlideShow.Visibility = Visibility.Visible;
+                    }
+                    else
+                    {
+                        _mainWindow.StackPanelPPTControls.Visibility = Visibility.Collapsed;
+                        _mainWindow.BtnPPTSlideShow.Visibility = Visibility.Collapsed;
+                        _mainWindow.BtnPPTSlideShowEnd.Visibility = Visibility.Collapsed;
+                        HideAllNavigationPanels();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"更新PPT连接状态UI失败: {ex}", LogHelper.LogType.Error);
+                }
+            });
+        }
+
+        /// <summary>
+        /// 更新幻灯片放映状态UI
+        /// </summary>
+        public void UpdateSlideShowStatus(bool isInSlideShow, int currentSlide = 0, int totalSlides = 0)
+        {
+            _dispatcher.InvokeAsync(() =>
+            {
+                try
+                {
+                    if (isInSlideShow)
+                    {
+                        _mainWindow.BtnPPTSlideShow.Visibility = Visibility.Collapsed;
+                        _mainWindow.BtnPPTSlideShowEnd.Visibility = Visibility.Visible;
+
+                        // 只有在页数有效时才更新页码显示
+                        if (currentSlide > 0 && totalSlides > 0)
+                        {
+                            _mainWindow.PPTBtnPageNow.Text = currentSlide.ToString();
+                            _mainWindow.PPTBtnPageTotal.Text = $"/ {totalSlides}";
+                        }
+                        else
+                        {
+                            // 页数无效时清空页码显示
+                            _mainWindow.PPTBtnPageNow.Text = "?";
+                            _mainWindow.PPTBtnPageTotal.Text = "/ ?";
+                        }
+
+                        UpdateNavigationPanelsVisibility();
+                        UpdateNavigationButtonStyles();
+                        _mainWindow.UpdatePPTTimeCapsuleVisibility();
+                        _mainWindow.UpdatePPTQuickPanelVisibility();
+                        if (MainWindow.Settings.Advanced.IsEnableAvoidFullScreenHelper)
+                        {
+                            // 设置为画板模式，允许全屏操作
+                            AvoidFullScreenHelper.SetBoardMode(true);
+                            _dispatcher.BeginInvoke(new Action(() =>
+                            {
+                                MainWindow.MoveWindow(new WindowInteropHelper(_mainWindow).Handle, 0, 0,
+                                    System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width,
+                                    System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height, true);
+                            }), DispatcherPriority.ApplicationIdle);
+
+                            _mainWindow.isFullScreenApplied = true; // 标记已应用全屏处理
+                        }
+                    }
+                    else
+                    {
+                        _mainWindow.BtnPPTSlideShow.Visibility = Visibility.Visible;
+                        _mainWindow.BtnPPTSlideShowEnd.Visibility = Visibility.Collapsed;
+                        HideAllNavigationPanels();
+                        _mainWindow.UpdatePPTTimeCapsuleVisibility();
+                        _mainWindow.UpdatePPTQuickPanelVisibility();
+                        if (MainWindow.Settings.Advanced.IsEnableAvoidFullScreenHelper)
+                        {
+                            // 恢复为非画板模式，重新启用全屏限制
+                            AvoidFullScreenHelper.SetBoardMode(false);
+
+                            _dispatcher.BeginInvoke(new Action(() =>
+                            {
+                                // 退出PPT放映模式，恢复到工作区域大小
+                                var workingArea = System.Windows.Forms.Screen.PrimaryScreen.WorkingArea;
+                                MainWindow.MoveWindow(new WindowInteropHelper(_mainWindow).Handle,
+                                    workingArea.X, workingArea.Y,
+                                    workingArea.Width, workingArea.Height, true);
+                            }), DispatcherPriority.ApplicationIdle);
+
+                            _mainWindow.isFullScreenApplied = false; // 标记全屏处理已还原
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"更新幻灯片放映状态UI失败: {ex}", LogHelper.LogType.Error);
+                }
+            });
+        }
+
+        /// <summary>
+        /// 更新当前页码显示
+        /// </summary>
+        public void UpdateCurrentSlideNumber(int currentSlide, int totalSlides)
+        {
+            _dispatcher.InvokeAsync(() =>
+            {
+                try
+                {
+                    // 只有在页数有效时才更新页码显示
+                    if (currentSlide > 0 && totalSlides > 0)
+                    {
+                        _mainWindow.PPTBtnPageNow.Text = currentSlide.ToString();
+                        _mainWindow.PPTBtnPageTotal.Text = $"/ {totalSlides}";
+                    }
+                    else
+                    {
+                        // 页数无效时清空页码显示
+                        _mainWindow.PPTBtnPageNow.Text = "?";
+                        _mainWindow.PPTBtnPageTotal.Text = "/ ?";
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"更新页码显示失败: {ex}", LogHelper.LogType.Error);
+                }
+            });
+        }
+
+        /// <summary>
+        /// 处理PPT放映状态变化
+        /// </summary>
+        public void OnSlideShowStateChanged(bool isInSlideShow)
+        {
+            _dispatcher.InvokeAsync(() =>
+            {
+                try
+                {
+                    if (!isInSlideShow)
+                    {
+                        // 如果不在放映模式，隐藏所有导航面板
+                        HideAllNavigationPanels();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"处理PPT放映状态变化失败: {ex}", LogHelper.LogType.Error);
+                }
+            });
+        }
+
+        /// <summary>
+        /// 更新导航面板显示状态
+        /// </summary>
+        public void UpdateNavigationPanelsVisibility()
+        {
+            _dispatcher.InvokeAsync(() =>
+            {
+                try
+                {
+                    // 检查是否应该显示PPT按钮
+                    // 不仅要检查按钮设置，还要确保确实在PPT放映模式下且页数有效
+                    bool isInSlideShow = _mainWindow.PPTManager?.IsInSlideShow == true;
+                    int slidesCount = _mainWindow.PPTManager?.SlidesCount ?? 0;
+                    bool hasValidPageCount = slidesCount > 0;
+
+                    bool shouldShowButtons = ShowPPTButton &&
+                                          _mainWindow.BtnPPTSlideShowEnd.Visibility == Visibility.Visible &&
+                                          isInSlideShow &&
+                                          hasValidPageCount &&
+                                          !MainWindow.Settings.Automation.IsAutoFoldInPPTSlideShow;
+
+                    if (!shouldShowButtons)
+                    {
+                        HideAllNavigationPanels();
+                        return;
+                    }
+
+                    // 设置侧边按钮位置
+                    _mainWindow.LeftSidePanelForPPTNavigation.Margin = new Thickness(0, 0, 0, PPTLSButtonPosition * 2);
+                    _mainWindow.RightSidePanelForPPTNavigation.Margin = new Thickness(0, 0, 0, PPTRSButtonPosition * 2);
+
+                    // 设置底部按钮水平位置
+                    _mainWindow.LeftBottomPanelForPPTNavigation.Margin = new Thickness(6 + PPTLBButtonPosition, 0, 0, 6);
+                    _mainWindow.RightBottomPanelForPPTNavigation.Margin = new Thickness(0, 0, 6 + PPTRBButtonPosition, 6);
+
+                    // 根据显示选项设置面板可见性
+                    var displayOption = PPTButtonsDisplayOption.ToString();
+                    if (displayOption.Length >= 4)
+                    {
+                        var options = displayOption.ToCharArray();
+
+                        // 左下角面板
+                        if (options[0] == '2')
+                            AnimationsHelper.ShowWithFadeIn(_mainWindow.LeftBottomPanelForPPTNavigation);
+                        else
+                            _mainWindow.LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+
+                        // 右下角面板
+                        if (options[1] == '2')
+                            AnimationsHelper.ShowWithFadeIn(_mainWindow.RightBottomPanelForPPTNavigation);
+                        else
+                            _mainWindow.RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+
+                        // 左侧面板
+                        if (options[2] == '2')
+                            AnimationsHelper.ShowWithFadeIn(_mainWindow.LeftSidePanelForPPTNavigation);
+                        else
+                            _mainWindow.LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
+
+                        // 右侧面板
+                        if (options[3] == '2')
+                            AnimationsHelper.ShowWithFadeIn(_mainWindow.RightSidePanelForPPTNavigation);
+                        else
+                            _mainWindow.RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"更新导航面板显示状态失败: {ex}", LogHelper.LogType.Error);
+                }
+            });
+        }
+
+        /// <summary>
+        /// 更新导航按钮样式
+        /// </summary>
+        public void UpdateNavigationButtonStyles()
+        {
+            _dispatcher.InvokeAsync(() =>
+            {
+                try
+                {
+                    UpdateSideButtonStyles();
+                    UpdateBottomButtonStyles();
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"更新导航按钮样式失败: {ex}", LogHelper.LogType.Error);
+                }
+            });
+        }
+
+        /// <summary>
+        /// 隐藏所有导航面板
+        /// </summary>
+        public void HideAllNavigationPanels()
+        {
+            _dispatcher.InvokeAsync(() =>
+            {
+                try
+                {
+                    _mainWindow.LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                    _mainWindow.RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                    _mainWindow.LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                    _mainWindow.RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"隐藏导航面板失败: {ex}", LogHelper.LogType.Error);
+                }
+            });
+        }
+
+        /// <summary>
+        /// 显示/隐藏侧边栏退出按钮
+        /// </summary>
+        public void UpdateSidebarExitButtons(bool show)
+        {
+            _dispatcher.InvokeAsync(() =>
+            {
+                try
+                {
+                    var visibility = show ? Visibility.Visible : Visibility.Collapsed;
+
+                    if (_mainWindow.BtnExitPptFromSidebarLeft != null)
+                        _mainWindow.BtnExitPptFromSidebarLeft.Visibility = visibility;
+
+                    if (_mainWindow.BtnExitPptFromSidebarRight != null)
+                        _mainWindow.BtnExitPptFromSidebarRight.Visibility = visibility;
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"更新侧边栏退出按钮失败: {ex}", LogHelper.LogType.Error);
+                }
+            });
+        }
+
+        /// <summary>
+        /// 设置浮动栏透明度
+        /// </summary>
+        public void SetFloatingBarOpacity(double opacity)
+        {
+            _dispatcher.InvokeAsync(() =>
+            {
+                try
+                {
+                    _mainWindow.ViewboxFloatingBar.Opacity = opacity;
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"设置浮动栏透明度失败: {ex}", LogHelper.LogType.Error);
+                }
+            });
+        }
+
+        /// <summary>
+        /// 设置主面板边距
+        /// </summary>
+        public void SetMainPanelMargin(Thickness margin)
+        {
+            _dispatcher.InvokeAsync(() =>
+            {
+                try
+                {
+                    _mainWindow.ViewBoxStackPanelMain.Margin = margin;
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"设置主面板边距失败: {ex}", LogHelper.LogType.Error);
+                }
+            });
+        }
+        #endregion
+
+        #region Private Methods
+        private void UpdateSideButtonStyles()
+        {
+            try
+            {
+                var sideOption = PPTSButtonsOption.ToString();
+                if (sideOption.Length < 3) return;
+
+                var options = sideOption.ToCharArray();
+
+                // 页码按钮显示
+                var pageButtonVisibility = options[0] == '2' ? Visibility.Visible : Visibility.Collapsed;
+                _mainWindow.PPTLSPageButton.Visibility = pageButtonVisibility;
+                _mainWindow.PPTRSPageButton.Visibility = pageButtonVisibility;
+
+                // 透明度设置 - 直接使用用户设置的透明度值
+                _mainWindow.PPTBtnLSBorder.Opacity = PPTLSButtonOpacity;
+                _mainWindow.PPTBtnRSBorder.Opacity = PPTRSButtonOpacity;
+
+                // 颜色主题
+                bool isDarkTheme = options[2] == '2';
+                ApplyButtonTheme(_mainWindow.PPTBtnLSBorder, _mainWindow.PPTBtnRSBorder, isDarkTheme, true);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"更新侧边按钮样式失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
+        private void UpdateBottomButtonStyles()
+        {
+            try
+            {
+                var bottomOption = PPTBButtonsOption.ToString();
+                if (bottomOption.Length < 3) return;
+
+                var options = bottomOption.ToCharArray();
+
+                // 页码按钮显示
+                var pageButtonVisibility = options[0] == '2' ? Visibility.Visible : Visibility.Collapsed;
+                _mainWindow.PPTLBPageButton.Visibility = pageButtonVisibility;
+                _mainWindow.PPTRBPageButton.Visibility = pageButtonVisibility;
+
+                // 透明度设置 - 直接使用用户设置的透明度值
+                _mainWindow.PPTBtnLBBorder.Opacity = PPTLBButtonOpacity;
+                _mainWindow.PPTBtnRBBorder.Opacity = PPTRBButtonOpacity;
+
+                // 颜色主题
+                bool isDarkTheme = options[2] == '2';
+                ApplyButtonTheme(_mainWindow.PPTBtnLBBorder, _mainWindow.PPTBtnRBBorder, isDarkTheme, false);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"更新底部按钮样式失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
+        private void ApplyButtonTheme(Border leftBorder, Border rightBorder, bool isDarkTheme, bool isSideButton)
+        {
+            try
+            {
+                Color backgroundColor, borderColor, foregroundColor, feedbackColor;
+
+                if (isDarkTheme)
+                {
+                    backgroundColor = Color.FromRgb(39, 39, 42);
+                    borderColor = Color.FromRgb(82, 82, 91);
+                    foregroundColor = Colors.White;
+                    feedbackColor = Colors.White;
+                }
+                else
+                {
+                    backgroundColor = Color.FromRgb(244, 244, 245);
+                    borderColor = Color.FromRgb(161, 161, 170);
+                    foregroundColor = Color.FromRgb(39, 39, 42);
+                    feedbackColor = Color.FromRgb(24, 24, 27);
+                }
+
+                // 应用背景和边框颜色
+                var backgroundBrush = new SolidColorBrush(backgroundColor);
+                var borderBrush = new SolidColorBrush(borderColor);
+
+                leftBorder.Background = backgroundBrush;
+                leftBorder.BorderBrush = borderBrush;
+                rightBorder.Background = backgroundBrush;
+                rightBorder.BorderBrush = borderBrush;
+
+                // 应用图标和文字颜色
+                var foregroundBrush = new SolidColorBrush(foregroundColor);
+                var feedbackBrush = new SolidColorBrush(feedbackColor);
+
+                if (isSideButton)
+                {
+                    ApplySideButtonColors(foregroundBrush, feedbackBrush);
+                }
+                else
+                {
+                    ApplyBottomButtonColors(foregroundBrush, feedbackBrush);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"应用按钮主题失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
+        private void ApplySideButtonColors(SolidColorBrush foregroundBrush, SolidColorBrush feedbackBrush)
+        {
+            // 图标颜色
+            _mainWindow.PPTLSPreviousButtonGeometry.Brush = foregroundBrush;
+            _mainWindow.PPTRSPreviousButtonGeometry.Brush = foregroundBrush;
+            _mainWindow.PPTLSNextButtonGeometry.Brush = foregroundBrush;
+            _mainWindow.PPTRSNextButtonGeometry.Brush = foregroundBrush;
+
+            // 反馈背景颜色
+            _mainWindow.PPTLSPreviousButtonFeedbackBorder.Background = feedbackBrush;
+            _mainWindow.PPTRSPreviousButtonFeedbackBorder.Background = feedbackBrush;
+            _mainWindow.PPTLSPageButtonFeedbackBorder.Background = feedbackBrush;
+            _mainWindow.PPTRSPageButtonFeedbackBorder.Background = feedbackBrush;
+            _mainWindow.PPTLSNextButtonFeedbackBorder.Background = feedbackBrush;
+            _mainWindow.PPTRSNextButtonFeedbackBorder.Background = feedbackBrush;
+
+            // 文字颜色
+            TextBlock.SetForeground(_mainWindow.PPTLSPageButton, foregroundBrush);
+            TextBlock.SetForeground(_mainWindow.PPTRSPageButton, foregroundBrush);
+        }
+
+        private void ApplyBottomButtonColors(SolidColorBrush foregroundBrush, SolidColorBrush feedbackBrush)
+        {
+            // 图标颜色
+            _mainWindow.PPTLBPreviousButtonGeometry.Brush = foregroundBrush;
+            _mainWindow.PPTRBPreviousButtonGeometry.Brush = foregroundBrush;
+            _mainWindow.PPTLBNextButtonGeometry.Brush = foregroundBrush;
+            _mainWindow.PPTRBNextButtonGeometry.Brush = foregroundBrush;
+
+            // 反馈背景颜色
+            _mainWindow.PPTLBPreviousButtonFeedbackBorder.Background = feedbackBrush;
+            _mainWindow.PPTRBPreviousButtonFeedbackBorder.Background = feedbackBrush;
+            _mainWindow.PPTLBPageButtonFeedbackBorder.Background = feedbackBrush;
+            _mainWindow.PPTRBPageButtonFeedbackBorder.Background = feedbackBrush;
+            _mainWindow.PPTLBNextButtonFeedbackBorder.Background = feedbackBrush;
+            _mainWindow.PPTRBNextButtonFeedbackBorder.Background = feedbackBrush;
+
+            // 文字颜色
+            TextBlock.SetForeground(_mainWindow.PPTLBPageButton, foregroundBrush);
+            TextBlock.SetForeground(_mainWindow.PPTRBPageButton, foregroundBrush);
+        }
+        #endregion
+    }
+}

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

@@ -1,9 +1,9 @@
+using iNKORE.UI.WPF.Controls;
 using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using iNKORE.UI.WPF.Modern.Controls;
 
 namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
 {
@@ -16,17 +16,17 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
         /// 父插件
         /// </summary>
         private readonly SuperLauncherPlugin _plugin;
-        
+
         /// <summary>
         /// 实际按钮控件
         /// </summary>
         private readonly SimpleStackPanel _panel;
-        
+
         /// <summary>
         /// 获取按钮UI元素
         /// </summary>
         public UIElement Element => _panel;
-        
+
         /// <summary>
         /// 构造函数
         /// </summary>
@@ -37,7 +37,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
             {
                 _plugin = plugin;
                 LogHelper.WriteLogToFile("开始创建启动台按钮");
-                
+
                 // 创建SimpleStackPanel
                 _panel = new SimpleStackPanel
                 {
@@ -48,13 +48,13 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                     Margin = new Thickness(0, -2, 0, 0),
                     Background = Brushes.Transparent
                 };
-                
+
                 LogHelper.WriteLogToFile("创建SimpleStackPanel完成");
-                
+
                 // 添加图标
                 var image = CreateIconImage();
                 _panel.Children.Add(image);
-                
+
                 // 添加文本
                 TextBlock textBlock = new TextBlock
                 {
@@ -65,18 +65,18 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                     TextAlignment = TextAlignment.Center
                 };
                 _panel.Children.Add(textBlock);
-                
+
                 // 设置鼠标事件
                 _panel.MouseDown += Panel_MouseDown;
                 _panel.MouseUp += Panel_MouseUp;
                 _panel.MouseLeave += Panel_MouseLeave;
-                
+
                 // 右键菜单支持
                 _panel.ContextMenu = CreateContextMenu();
-                
+
                 // 设置工具提示
                 _panel.ToolTip = "启动台";
-                
+
                 LogHelper.WriteLogToFile("启动台按钮创建完成");
             }
             catch (Exception ex)
@@ -85,7 +85,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 LogHelper.NewLog(ex);
             }
         }
-        
+
         /// <summary>
         /// 创建右键菜单
         /// </summary>
@@ -95,31 +95,31 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
             {
                 // 创建菜单
                 ContextMenu menu = new ContextMenu();
-                
+
                 // 创建位置切换菜单项
                 MenuItem positionMenuItem = new MenuItem();
-                positionMenuItem.Header = _plugin.Config.ButtonPosition == LauncherButtonPosition.Left ? 
+                positionMenuItem.Header = _plugin.Config.ButtonPosition == LauncherButtonPosition.Left ?
                     "移至右侧" : "移至左侧";
-                positionMenuItem.Click += (s, e) => 
+                positionMenuItem.Click += (s, e) =>
                 {
                     // 切换位置
-                    _plugin.Config.ButtonPosition = _plugin.Config.ButtonPosition == LauncherButtonPosition.Left ? 
+                    _plugin.Config.ButtonPosition = _plugin.Config.ButtonPosition == LauncherButtonPosition.Left ?
                         LauncherButtonPosition.Right : LauncherButtonPosition.Left;
-                    
+
                     // 更新按钮位置
                     _plugin.UpdateButtonPosition();
-                    
+
                     // 保存配置
                     _plugin.SaveConfig();
-                    
+
                     LogHelper.WriteLogToFile($"通过右键菜单切换启动台按钮位置为: {_plugin.Config.ButtonPosition}");
                 };
                 menu.Items.Add(positionMenuItem);
-                
+
                 // 添加设置菜单项
                 MenuItem settingsMenuItem = new MenuItem();
                 settingsMenuItem.Header = "打开设置";
-                settingsMenuItem.Click += (s, e) => 
+                settingsMenuItem.Click += (s, e) =>
                 {
                     // 打开插件设置窗口
                     var mainWindow = Application.Current.MainWindow;
@@ -142,7 +142,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                     }
                 };
                 menu.Items.Add(settingsMenuItem);
-                
+
                 return menu;
             }
             catch (Exception ex)
@@ -151,7 +151,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 return null;
             }
         }
-        
+
         /// <summary>
         /// 获取实际的UI元素
         /// </summary>
@@ -160,7 +160,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
         {
             return _panel;
         }
-        
+
         /// <summary>
         /// 创建图标图像
         /// </summary>
@@ -174,40 +174,40 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                     Height = 17,
                     Margin = new Thickness(0, 3, 0, 0)
                 };
-                
+
                 // 设置位图缩放模式
                 RenderOptions.SetBitmapScalingMode(image, BitmapScalingMode.HighQuality);
-                
+
                 // 创建绘图图像
                 DrawingImage drawingImage = new DrawingImage();
                 DrawingGroup drawingGroup = new DrawingGroup();
                 drawingGroup.ClipGeometry = Geometry.Parse("M0,0 V24 H24 V0 H0 Z");
-                
+
                 // 使用提供的应用网格图标
                 GeometryDrawing geometryDrawing = new GeometryDrawing
                 {
                     Brush = new SolidColorBrush(Color.FromRgb(0x1B, 0x1B, 0x1B)),
                     Geometry = Geometry.Parse("F0 M24,24z M0,0z M4.41721,4.29873C4.35178,4.29873,4.29873,4.35178,4.29873,4.41721L4.29873,9.15646C4.29873,9.22189,4.35178,9.27494,4.41721,9.27494L9.15646,9.27494C9.22189,9.27494,9.27494,9.22189,9.27494,9.15646L9.27494,4.41721C9.27494,4.35178,9.22189,4.29873,9.15646,4.29873L4.41721,4.29873z M2.64,4.41721C2.64,3.43569,3.43569,2.64,4.41721,2.64L9.15646,2.64C10.138,2.64,10.9337,3.43569,10.9337,4.41721L10.9337,9.15646C10.9337,10.138,10.138,10.9337,9.15646,10.9337L4.41721,10.9337C3.43569,10.9337,2.64,10.138,2.64,9.15646L2.64,4.41721z M14.8435,4.29873C14.7781,4.29873,14.7251,4.35178,14.7251,4.41721L14.7251,9.15646C14.7251,9.22189,14.7781,9.27494,14.8435,9.27494L19.5828,9.27494C19.6482,9.27494,19.7013,9.22189,19.7013,9.15646L19.7013,4.41721C19.7013,4.35178,19.6482,4.29873,19.5828,4.29873L14.8435,4.29873z M13.0663,4.41721C13.0663,3.43569,13.862,2.64,14.8435,2.64L19.5828,2.64C20.5643,2.64,21.36,3.43569,21.36,4.41721L21.36,9.15646C21.36,10.138,20.5643,10.9337,19.5828,10.9337L14.8435,10.9337C13.862,10.9337,13.0663,10.138,13.0663,9.15646L13.0663,4.41721z M14.8435,14.7251C14.7781,14.7251,14.7251,14.7781,14.7251,14.8435L14.7251,19.5828C14.7251,19.6482,14.7781,19.7013,14.8435,19.7013L19.5828,19.7013C19.6482,19.7013,19.7013,19.6482,19.7013,19.5828L19.7013,14.8435C19.7013,14.7781,19.6482,14.7251,19.5828,14.7251L14.8435,14.7251z M13.0663,14.8435C13.0663,13.862,13.862,13.0663,14.8435,13.0663L19.5828,13.0663C20.5643,13.0663,21.36,13.862,21.36,14.8435L21.36,19.5828C21.36,20.5643,20.5643,21.36,19.5828,21.36L14.8435,21.36C13.862,21.36,13.0663,20.5643,13.0663,19.5828L13.0663,14.8435z M4.41721,14.7251C4.35178,14.7251,4.29873,14.7781,4.29873,14.8435L4.29873,19.5828C4.29873,19.6482,4.35178,19.7013,4.41721,19.7013L9.15646,19.7013C9.22189,19.7013,9.27494,19.6482,9.27494,19.5828L9.27494,14.8435C9.27494,14.7781,9.22189,14.7251,9.15646,14.7251L4.41721,14.7251z M2.64,14.8435C2.64,13.862,3.43569,13.0663,4.41721,13.0663L9.15646,13.0663C10.138,13.0663,10.9337,13.862,10.9337,14.8435L10.9337,19.5828C10.9337,20.5643,10.138,21.36,9.15646,21.36L4.41721,21.36C3.43569,21.36,2.64,20.5643,2.64,19.5828L2.64,14.8435z")
                 };
-                
+
                 drawingGroup.Children.Add(geometryDrawing);
-                
+
                 // 设置图像源
                 drawingImage.Drawing = drawingGroup;
                 image.Source = drawingImage;
-                
+
                 return image;
             }
             catch (Exception ex)
             {
                 LogHelper.WriteLogToFile($"创建图标图像时出错: {ex.Message}", LogHelper.LogType.Error);
                 LogHelper.NewLog(ex);
-                
+
                 // 返回一个空图像
                 return new Image();
             }
         }
-        
+
         /// <summary>
         /// 鼠标按下事件
         /// </summary>
@@ -224,7 +224,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 LogHelper.WriteLogToFile($"启动台按钮鼠标按下事件出错: {ex.Message}", LogHelper.LogType.Error);
             }
         }
-        
+
         /// <summary>
         /// 鼠标抬起事件
         /// </summary>
@@ -237,14 +237,14 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 {
                     return;
                 }
-                
+
                 // 恢复背景
                 _panel.Background = Brushes.Transparent;
                 LogHelper.WriteLogToFile("启动台按钮鼠标抬起，准备显示启动台窗口");
-                
+
                 // 获取按钮在屏幕上的位置
                 Point buttonPosition = _panel.PointToScreen(new Point(_panel.ActualWidth / 2, 0));
-                
+
                 // 显示启动台窗口
                 _plugin.ShowLauncherWindow(buttonPosition);
             }
@@ -254,7 +254,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 LogHelper.NewLog(ex);
             }
         }
-        
+
         /// <summary>
         /// 鼠标离开事件
         /// </summary>
@@ -271,4 +271,4 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
             }
         }
     }
-} 
+}

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

@@ -1,3 +1,5 @@
+using Microsoft.Win32;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -8,8 +10,6 @@ using System.Windows;
 using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using Microsoft.Win32;
-using Newtonsoft.Json;
 
 namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
 {
@@ -22,13 +22,13 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
         /// 左侧
         /// </summary>
         Left,
-        
+
         /// <summary>
         /// 右侧
         /// </summary>
         Right
     }
-    
+
     /// <summary>
     /// 启动台配置
     /// </summary>
@@ -38,13 +38,13 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
         /// 启动台按钮位置
         /// </summary>
         public LauncherButtonPosition ButtonPosition { get; set; } = LauncherButtonPosition.Right;
-        
+
         /// <summary>
         /// 启动台应用程序列表
         /// </summary>
         public List<LauncherItem> Items { get; set; } = new List<LauncherItem>();
     }
-    
+
     /// <summary>
     /// 启动台应用项
     /// </summary>
@@ -54,33 +54,33 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
         /// 应用程序名称
         /// </summary>
         public string Name { get; set; }
-        
+
         /// <summary>
         /// 应用程序路径
         /// </summary>
         public string Path { get; set; }
-        
+
         /// <summary>
         /// 是否可见
         /// </summary>
         public bool IsVisible { get; set; } = true;
-        
+
         /// <summary>
         /// 在启动台中的位置（0-39）
         /// </summary>
         public int Position { get; set; } = -1;
-        
+
         /// <summary>
         /// 是否已固定位置
         /// </summary>
         public bool IsPositionFixed { get; set; } = false;
-        
+
         /// <summary>
         /// 图标缓存
         /// </summary>
         [JsonIgnore]
         private ImageSource _iconCache;
-        
+
         /// <summary>
         /// 获取应用程序图标
         /// </summary>
@@ -93,7 +93,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 {
                     return _iconCache;
                 }
-                
+
                 try
                 {
                     if (File.Exists(Path))
@@ -106,7 +106,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                                 icon.Handle,
                                 Int32Rect.Empty,
                                 BitmapSizeOptions.FromEmptyOptions());
-                            
+
                             icon.Dispose();
                             return _iconCache;
                         }
@@ -126,7 +126,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                                     string[] parts = iconPath.Split(',');
                                     string iconFile = parts[0].Trim('"');
                                     int iconIndex = parts.Length > 1 ? Convert.ToInt32(parts[1]) : 0;
-                                    
+
                                     if (File.Exists(iconFile))
                                     {
                                         Icon icon = IconExtractor.Extract(iconFile, iconIndex, true);
@@ -136,7 +136,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                                                 icon.Handle,
                                                 Int32Rect.Empty,
                                                 BitmapSizeOptions.FromEmptyOptions());
-                                            
+
                                             icon.Dispose();
                                             return _iconCache;
                                         }
@@ -150,12 +150,12 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 {
                     LogHelper.WriteLogToFile($"获取应用图标时出错: {ex.Message}", LogHelper.LogType.Error);
                 }
-                
+
                 // 返回默认图标
                 return GetDefaultIcon();
             }
         }
-        
+
         /// <summary>
         /// 获取默认图标
         /// </summary>
@@ -179,7 +179,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                                     icon.Handle,
                                     Int32Rect.Empty,
                                     BitmapSizeOptions.FromEmptyOptions());
-                                
+
                                 icon.Dispose();
                                 return _iconCache;
                             }
@@ -190,7 +190,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                         LogHelper.WriteLogToFile($"获取资源管理器图标时出错: {ex.Message}", LogHelper.LogType.Warning);
                         // 如果获取Windows图标失败，回退到默认图标
                     }
-                    
+
                     // 回退到备用图标
                     string explorerIconPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources", "Icons-Fluent", "ic_fluent_folder_24_regular.png");
                     if (File.Exists(explorerIconPath))
@@ -201,7 +201,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                         return _iconCache;
                     }
                 }
-                
+
                 // 返回一个简单的默认图标
                 string iconPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources", "Icons-png", "icc.png");
                 if (File.Exists(iconPath))
@@ -211,7 +211,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                     _iconCache = image;
                     return _iconCache;
                 }
-                
+
                 // 如果还是没有找到，尝试使用应用程序图标
                 string appIconPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources", "Icons-Fluent", "ic_fluent_apps_24_regular.png");
                 if (File.Exists(appIconPath))
@@ -222,14 +222,14 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                     return _iconCache;
                 }
             }
-            catch (Exception ex) 
+            catch (Exception ex)
             {
                 LogHelper.WriteLogToFile($"获取默认图标时出错: {ex.Message}", LogHelper.LogType.Error);
             }
-            
+
             return null;
         }
-        
+
         /// <summary>
         /// 启动应用程序
         /// </summary>
@@ -242,7 +242,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                     LogHelper.WriteLogToFile("无法启动应用程序：路径为空", LogHelper.LogType.Error);
                     return;
                 }
-                
+
                 // 检查文件是否存在
                 if (!File.Exists(Path) && !Path.Contains(":\\"))
                 {
@@ -264,7 +264,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                     };
                     Process.Start(psi);
                 }
-                
+
                 LogHelper.WriteLogToFile($"已启动应用程序: {Path}");
             }
             catch (Exception ex)
@@ -274,7 +274,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
             }
         }
     }
-    
+
     /// <summary>
     /// 图标提取工具类
     /// </summary>
@@ -294,7 +294,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 IntPtr large;
                 IntPtr small;
                 ExtractIconEx(file, index, out large, out small, 1);
-                
+
                 try
                 {
                     return Icon.FromHandle(largeIcon ? large : small);
@@ -307,7 +307,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 {
                     if (large != IntPtr.Zero)
                         DestroyIcon(large);
-                    
+
                     if (small != IntPtr.Zero)
                         DestroyIcon(small);
                 }
@@ -317,7 +317,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 return null;
             }
         }
-        
+
         [DllImport("Shell32.dll", EntryPoint = "ExtractIconEx")]
         private static extern int ExtractIconEx(
             [MarshalAs(UnmanagedType.LPStr)] string lpszFile,
@@ -325,8 +325,8 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
             out IntPtr phiconLarge,
             out IntPtr phiconSmall,
             int nIcons);
-        
+
         [DllImport("User32.dll")]
         private static extern int DestroyIcon(IntPtr hIcon);
     }
-} 
+}

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

@@ -1,10 +1,10 @@
+using Ink_Canvas.Windows;
+using Microsoft.Win32;
 using System;
 using System.ComponentModel;
 using System.IO;
 using System.Windows;
 using System.Windows.Controls;
-using Ink_Canvas.Windows;
-using Microsoft.Win32;
 
 namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
 {
@@ -17,7 +17,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
         /// 父插件
         /// </summary>
         private readonly SuperLauncherPlugin _plugin;
-        
+
         /// <summary>
         /// 构造函数
         /// </summary>
@@ -25,20 +25,20 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
         public LauncherSettingsControl(SuperLauncherPlugin plugin)
         {
             InitializeComponent();
-            
+
             _plugin = plugin;
-            
+
             // 设置按钮位置
             RbtnLeft.IsChecked = _plugin.Config.ButtonPosition == LauncherButtonPosition.Left;
             RbtnRight.IsChecked = _plugin.Config.ButtonPosition == LauncherButtonPosition.Right;
-            
+
             // 绑定应用列表
             DgApps.ItemsSource = _plugin.LauncherItems;
-            
+
             // 初始化按钮状态
             UpdateButtonStates();
         }
-        
+
         /// <summary>
         /// 更新按钮状态
         /// </summary>
@@ -48,16 +48,16 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
             BtnEdit.IsEnabled = hasSelection;
             BtnDelete.IsEnabled = hasSelection;
         }
-        
+
         /// <summary>
         /// 位置单选按钮选择事件
         /// </summary>
         private void RbtnPosition_Checked(object sender, RoutedEventArgs e)
         {
             if (!IsLoaded) return;
-            
+
             LauncherButtonPosition oldPosition = _plugin.Config.ButtonPosition;
-            
+
             if (sender == RbtnLeft)
             {
                 _plugin.Config.ButtonPosition = LauncherButtonPosition.Left;
@@ -66,7 +66,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
             {
                 _plugin.Config.ButtonPosition = LauncherButtonPosition.Right;
             }
-            
+
             // 如果位置发生变化，更新按钮位置
             if (oldPosition != _plugin.Config.ButtonPosition)
             {
@@ -74,10 +74,10 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 {
                     // 更新按钮位置
                     _plugin.UpdateButtonPosition();
-                    
+
                     // 保存配置
                     _plugin.SaveConfig();
-                    
+
                     LogHelper.WriteLogToFile($"启动台按钮位置已更改为: {_plugin.Config.ButtonPosition}");
                 }
                 catch (Exception ex)
@@ -87,7 +87,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 }
             }
         }
-        
+
         /// <summary>
         /// 添加按钮点击事件
         /// </summary>
@@ -103,7 +103,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                     IsVisible = true,
                     Position = -1 // 让插件管理器分配位置
                 };
-                
+
                 // 直接显示编辑对话框
                 EditLauncherItem(item, true);
             }
@@ -113,7 +113,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 MessageBox.Show($"添加启动项时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
-        
+
         /// <summary>
         /// 编辑应用按钮点击事件
         /// </summary>
@@ -124,7 +124,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 EditLauncherItem(item, false);
             }
         }
-        
+
         /// <summary>
         /// 删除应用按钮点击事件
         /// </summary>
@@ -134,22 +134,22 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
             {
                 // 确认删除
                 MessageBoxResult result = MessageBox.Show(
-                    $"确定要删除 {item.Name} 吗？", 
-                    "删除确认", 
-                    MessageBoxButton.YesNo, 
+                    $"确定要删除 {item.Name} 吗？",
+                    "删除确认",
+                    MessageBoxButton.YesNo,
                     MessageBoxImage.Question);
-                
+
                 if (result == MessageBoxResult.Yes)
                 {
                     // 从集合中移除
                     _plugin.LauncherItems.Remove(item);
-                    
+
                     // 保存配置
                     _plugin.SaveConfig();
                 }
             }
         }
-        
+
         /// <summary>
         /// 保存设置按钮点击事件
         /// </summary>
@@ -159,7 +159,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
             {
                 // 保存配置
                 _plugin.SaveConfig();
-                
+
                 // 如果插件已启用，重新加载启动台按钮
                 if (_plugin.IsEnabled)
                 {
@@ -170,7 +170,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 {
                     // 如果插件未启用，则启用它
                     _plugin.Enable();
-                    
+
                     // 通知PluginSettingsWindow刷新插件列表
                     var window = Window.GetWindow(this);
                     if (window is PluginSettingsWindow pluginSettingsWindow)
@@ -179,7 +179,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                         pluginSettingsWindow.RefreshPluginList();
                     }
                 }
-                
+
                 MessageBox.Show("设置已保存并应用！", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
             }
             catch (Exception ex)
@@ -188,7 +188,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 MessageBox.Show($"保存设置时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
-        
+
         /// <summary>
         /// 应用项选择变更事件
         /// </summary>
@@ -196,7 +196,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
         {
             UpdateButtonStates();
         }
-        
+
         /// <summary>
         /// 编辑启动项
         /// </summary>
@@ -213,63 +213,63 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 WindowStartupLocation = WindowStartupLocation.CenterScreen,
                 ResizeMode = ResizeMode.NoResize
             };
-            
+
             // 创建编辑表单
             Grid grid = new Grid
             {
                 Margin = new Thickness(20)
             };
-            
+
             grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
             grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
             grid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
-            
+
             grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(80) });
             grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
-            
+
             // 名称输入框
-            TextBlock nameLabel = new TextBlock 
-            { 
-                Text = "名称:", 
-                VerticalAlignment = VerticalAlignment.Center 
+            TextBlock nameLabel = new TextBlock
+            {
+                Text = "名称:",
+                VerticalAlignment = VerticalAlignment.Center
             };
-            TextBox nameTextBox = new TextBox 
-            { 
-                Text = item.Name, 
-                Margin = new Thickness(0, 5, 0, 5) 
+            TextBox nameTextBox = new TextBox
+            {
+                Text = item.Name,
+                Margin = new Thickness(0, 5, 0, 5)
             };
-            
+
             Grid.SetRow(nameLabel, 0);
             Grid.SetColumn(nameLabel, 0);
             Grid.SetRow(nameTextBox, 0);
             Grid.SetColumn(nameTextBox, 1);
-            
+
             grid.Children.Add(nameLabel);
             grid.Children.Add(nameTextBox);
-            
+
             // 路径输入框
-            TextBlock pathLabel = new TextBlock 
-            { 
-                Text = "路径:", 
-                VerticalAlignment = VerticalAlignment.Center 
+            TextBlock pathLabel = new TextBlock
+            {
+                Text = "路径:",
+                VerticalAlignment = VerticalAlignment.Center
             };
             Grid pathGrid = new Grid();
             pathGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
             pathGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength() });
-            
-            TextBox pathTextBox = new TextBox 
-            { 
-                Text = item.Path, 
-                Margin = new Thickness(0, 5, 5, 5) 
+
+            TextBox pathTextBox = new TextBox
+            {
+                Text = item.Path,
+                Margin = new Thickness(0, 5, 5, 5)
             };
-            Button browseButton = new Button 
-            { 
-                Content = "浏览", 
+            Button browseButton = new Button
+            {
+                Content = "浏览",
                 Padding = new Thickness(5, 0, 5, 0),
                 Margin = new Thickness(0, 5, 0, 5)
             };
-            
-            browseButton.Click += (s, e) => 
+
+            browseButton.Click += (s, e) =>
             {
                 OpenFileDialog dialog = new OpenFileDialog
                 {
@@ -278,11 +278,11 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                     Multiselect = false,
                     FileName = pathTextBox.Text
                 };
-                
+
                 if (dialog.ShowDialog() == true)
                 {
                     pathTextBox.Text = dialog.FileName;
-                    
+
                     // 如果选择的是.exe文件，自动获取文件名填入名称字段
                     if (Path.GetExtension(dialog.FileName).ToLower() == ".exe")
                     {
@@ -295,20 +295,20 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                     }
                 }
             };
-            
+
             Grid.SetColumn(pathTextBox, 0);
             Grid.SetColumn(browseButton, 1);
             pathGrid.Children.Add(pathTextBox);
             pathGrid.Children.Add(browseButton);
-            
+
             Grid.SetRow(pathLabel, 1);
             Grid.SetColumn(pathLabel, 0);
             Grid.SetRow(pathGrid, 1);
             Grid.SetColumn(pathGrid, 1);
-            
+
             grid.Children.Add(pathLabel);
             grid.Children.Add(pathGrid);
-            
+
             // 确认和取消按钮
             StackPanel buttonPanel = new StackPanel
             {
@@ -316,7 +316,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 HorizontalAlignment = HorizontalAlignment.Right,
                 Margin = new Thickness(0, 10, 0, 0)
             };
-            
+
             Button okButton = new Button
             {
                 Content = "确定",
@@ -324,15 +324,15 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                 Margin = new Thickness(0, 0, 10, 0),
                 IsDefault = true
             };
-            
+
             Button cancelButton = new Button
             {
                 Content = "取消",
                 Padding = new Thickness(15, 5, 15, 5),
                 IsCancel = true
             };
-            
-            okButton.Click += (s, e) => 
+
+            okButton.Click += (s, e) =>
             {
                 // 验证输入
                 if (string.IsNullOrWhiteSpace(nameTextBox.Text))
@@ -340,17 +340,17 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                     MessageBox.Show("请输入应用名称！", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
                     return;
                 }
-                
+
                 if (string.IsNullOrWhiteSpace(pathTextBox.Text))
                 {
                     MessageBox.Show("请输入应用路径！", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
                     return;
                 }
-                
+
                 // 更新项目
                 item.Name = nameTextBox.Text;
                 item.Path = pathTextBox.Text;
-                
+
                 // 如果是新建，添加到集合
                 if (isNew)
                 {
@@ -363,34 +363,34 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
                     {
                         view.Refresh();
                     }
-                    
+
                     // 保存配置
                     _plugin.SaveConfig();
                 }
-                
+
                 editWindow.DialogResult = true;
                 editWindow.Close();
             };
-            
-            cancelButton.Click += (s, e) => 
+
+            cancelButton.Click += (s, e) =>
             {
                 editWindow.DialogResult = false;
                 editWindow.Close();
             };
-            
+
             buttonPanel.Children.Add(okButton);
             buttonPanel.Children.Add(cancelButton);
-            
+
             Grid.SetRow(buttonPanel, 2);
             Grid.SetColumnSpan(buttonPanel, 2);
-            
+
             grid.Children.Add(buttonPanel);
-            
+
             // 设置窗口内容
             editWindow.Content = grid;
-            
+
             // 显示窗口
             editWindow.ShowDialog();
         }
     }
-} 
+}

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

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

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

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

Ink Canvas/Helpers/Plugins/EnhancedPluginBase.cs

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

Ink Canvas/Helpers/Plugins/EnhancedPluginBaseV2.cs

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

Ink Canvas/Helpers/Plugins/IActionService.cs

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

Ink Canvas/Helpers/Plugins/ICCPPPluginAdapter.cs

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

Ink Canvas/Helpers/Plugins/IEnhancedPlugin.cs

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