add:i18n

* 软件设置内的贡献者列表添加了 PANDA-JSR

* 设置窗口：新增可拖动区域

.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"
       ]
     },
     {
@@ -98,6 +93,53 @@
       "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,105 @@
-name: .NET Build
+name: .NET Build & Package
 
 on:
   push:
-    branches: [ main,beta ]
+    branches: [ main, beta ]
   pull_request:
-    branches: [ main ]
+    types: [opened, synchronize, reopened ]
+    branches: [ main, beta ]
+    paths-ignore:
+      - '**/*.md'
+  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
-
     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@v2
+      
+      - 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="AnyCPU" /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\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
+          path: "Ink Canvas/bin/Debug/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 "" >> $GITHUB_STEP_SUMMARY
+            echo "[Download Artifact](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "[Nightly.link Download](https://nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }}/InkCanvasForClass.CE.debug.zip) \([GhProxy Fastly Mirror](https://cdn.gh-proxy.com/nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }}/InkCanvasForClass.CE.debug.zip) / [GhProxy Mirror](https://gh-proxy.com/nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }}/InkCanvasForClass.CE.debug.zip)\)" >> $GITHUB_STEP_SUMMARY
+          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 "**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,646 @@
+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
+    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@v2
+      
+      - 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="AnyCPU" /p:configuration="Release" /p:GitFlow="Github Action" "Ink Canvas/InkCanvasForClass.csproj" /m /p:UseMultiToolTask=true /p:EnforceProcessCountAcrossBuilds=true /verbosity:minimal -maxcpucount /p:RunAnalyzers=false
+
+      - name: Check if exe file is generated
+        id: check-exe
+        run: |
+          $exePath = "Ink Canvas/bin/Release/net472/InkCanvasForClass.exe"
+          
+          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 }}"
+          $archiveName = "InkCanvasForClass.CE.$version.zip"
+          
+          # 创建发布目录
+          New-Item -ItemType Directory -Path "release" -Force
+          
+          # 复制发布文件
+          Copy-Item "Ink Canvas/bin/Release/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 }}"
+          
+          # 更新 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 }}"
+          $setupFile = "InkCanvasForClass CE Setup.exe"
+          $newSetupName = "InkCanvasForClass.CE.$version.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 }}"
+          $archiveName = "InkCanvasForClass.CE.$version.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 }}"
+          $installerName = "InkCanvasForClass.CE.$version.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'
+        uses: actions/upload-artifact@v7
+        with:
+          name: build-files-${{ needs.prepare.outputs.version }}
+          path: |
+            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}.zip
+            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}.Setup.exe
+
+      - 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 "**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 "**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:
+          name: build-files-${{ needs.prepare.outputs.version }}
+          
+      - 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.2.0
+        with:
+          inputs: |
+            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}.zip
+            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}.Setup.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: |
+            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}.zip.sigstore.json
+            InkCanvasForClass.CE.${{ needs.prepare.outputs.version }}.Setup.exe.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:
+          name: build-files-${{ needs.prepare.outputs.version }}
+          
+      - 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'
+          
+          # ZIP 文件信息
+          fileTable+=$'| InkCanvasForClass.CE.'"$version"
+          fileTable+=$'.zip | ${{ needs.build.outputs.zip_size }} bytes |\n'
+          
+          # 安装包文件信息
+          installerSize="${{ needs.build.outputs.installer_size }}"
+          if [ -n "$installerSize" ]; then
+            fileTable+=$'| InkCanvasForClass.CE.'"$version"'.Setup.exe | '"$installerSize"' bytes |\n'
+          fi
+          
+          # 检查是否有签名文件
+          if [ -f "InkCanvasForClass.CE.$version.zip.sigstore.json" ]; then
+            sigstoreSize=$(stat -c%s "InkCanvasForClass.CE.$version.zip.sigstore.json")
+            fileTable+=$'| InkCanvasForClass.CE.'"$version"'.zip.sigstore.json | '"$sigstoreSize"' bytes |\n'
+          fi
+          
+          # 检查安装程序签名文件
+          if [ -f "InkCanvasForClass.CE.$version.Setup.exe.sigstore.json" ]; then
+            sigstoreSize=$(stat -c%s "InkCanvasForClass.CE.$version.Setup.exe.sigstore.json")
+            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 }}.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()
+    runs-on: ubuntu-slim
+    permissions:
+      id-token: write
+      contents: write
+    steps:
+      - name: Download Build Artifacts
+        uses: actions/download-artifact@v8
+        with:
+          name: build-files-${{ needs.prepare.outputs.version }}
+
+      - 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 }}"
+          ZIP_FILE="$GITHUB_WORKSPACE/InkCanvasForClass.CE.$VERSION.zip"
+          
+          if [ "$IS_PRERELEASE" == "true" ]; then
+            mkdir -p Beta
+            cp "$ZIP_FILE" Beta/
+            git add Beta/InkCanvasForClass.CE.$VERSION.zip
+            git commit -m "Add $VERSION PreRelease"
+          else
+            mkdir -p Release Beta
+            cp "$ZIP_FILE" Release/
+            cp "$ZIP_FILE" Beta/
+            git add Release/InkCanvasForClass.CE.$VERSION.zip Beta/InkCanvasForClass.CE.$VERSION.zip
+            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 }}.zip
+          fail_on_unmatched_files: false
+          repository: "InkCanvasForClass/community-beta"
+        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,4 +1,432 @@
-obj/
-bin/
+## 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/
-/Ink Canvas/obj
+# 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

AutomaticUpdateVersionControl.txt

@@ -1 +1 @@
-1.7.10.0
+1.7.18.0

Ink Canvas.sln.DotSettings.user

@@ -1,4 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/PencilsConfiguration/ActualSeverity/@EntryValue">WARNING</s:String>
-	<s:String x:Key="/Default/Environment/Hierarchy/Build/BuildTool/CustomBuildToolPath/@EntryValue">C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\amd64\MSBuild.exe</s:String>
-	<s:Int64 x:Key="/Default/Environment/Hierarchy/Build/BuildTool/MsbuildVersion/@EntryValue">1114112</s:Int64></wpf:ResourceDictionary>

Ink Canvas/App.xaml

@@ -4,6 +4,7 @@
              xmlns:local="clr-namespace:Ink_Canvas"
              xmlns:tb="http://www.hardcodet.net/taskbar"
              xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+             xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
 >
     <Application.Resources>
         <ResourceDictionary>
@@ -13,9 +14,9 @@
             <ContextMenu Opened="SysTrayMenu_Opened" Closed="SysTrayMenu_Closed" x:Shared="false" x:Key="SysTrayMenu" Padding="6" ui:ThemeManager.RequestedTheme="Light">
                 <MenuItem IsCheckable="True" IsChecked="False" Checked="HideICCMainWindowTrayIconMenuItem_Checked" Unchecked="HideICCMainWindowTrayIconMenuItem_UnChecked" Name="HideICCMainWindowTrayIconMenuItem">
                     <MenuItem.Header>
-                        <ui:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
                             <TextBlock Name="HideICCMainWindowTrayIconMenuItemHeaderText" FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="隐藏ICC主窗口" />
-                        </ui:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
                     </MenuItem.Header>
                     <MenuItem.Icon>
                         <Image Width="28" Height="28" Margin="-2">
@@ -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

@@ -10,7 +10,7 @@ using System.Windows;
 [assembly: AssemblyConfiguration("")]
 [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.10.0")]
-[assembly: AssemblyFileVersion("1.7.10.0")]
+[assembly: AssemblyVersion("1.7.18.8")]
+[assembly: AssemblyFileVersion("1.7.18.8")]

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

@@ -95,18 +95,22 @@ namespace Ink_Canvas.Helpers
             // 使用改进的贝塞尔曲线拟合
             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 * 1.5)
+            // 进一步放宽最终检查
+            if (smoothedPoints.Length > originalPoints.Length * 2.5)
             {
+                System.Diagnostics.Debug.WriteLine($"AsyncAdvancedBezierSmoothing: 重采样后点数仍然过多，返回原始笔画");
                 // 如果仍然太多点，使用原始笔画
                 return stroke;
             }
@@ -117,6 +121,7 @@ namespace Ink_Canvas.Helpers
                 DrawingAttributes = stroke.DrawingAttributes.Clone()
             };
 
+            System.Diagnostics.Debug.WriteLine($"AsyncAdvancedBezierSmoothing: 成功创建平滑笔画");
             return smoothedStroke;
         }
 
@@ -125,33 +130,42 @@ namespace Ink_Canvas.Helpers
         /// </summary>
         private StylusPoint[] ApplyImprovedBezierSmoothing(StylusPoint[] points)
         {
-            if (points.Length < 4) return points;
+            if (points.Length < 6) return points; // 5次贝塞尔需要6个点
 
             var result = new List<StylusPoint>();
 
             // 添加第一个点
             result.Add(points[0]);
 
-            // 使用非重叠的窗口进行贝塞尔曲线拟合
-            for (int i = 0; i < points.Length - 3; i += 3) // 每次移动3个点，避免重叠
+            // 使用5次贝塞尔曲线，每次移动1个点确保连续性
+            for (int i = 0; i < points.Length - 5; i++)
             {
                 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 + 3, points.Length - 1)];
+                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];
 
-                // 计算改进的控制点
-                var controlPoints = CalculateImprovedControlPoints(p0, p1, p2, p3);
+                // 计算5次贝塞尔的控制点
+                var controlPoints = CalculateQuinticControlPoints(p0, p1, p2, p3, p4, p5);
 
-                // 限制插值步数，避免点数爆炸
-                int steps = Math.Min(UseAdaptiveInterpolation ?
-                    CalculateAdaptiveSteps(p0, p1, p2, p3) : InterpolationSteps, 16);
-
-                // 生成贝塞尔曲线点，但跳过第一个点避免重复
-                for (int j = 1; j <= steps; j++)
+                // 生成插值点
+                if (i == 0)
                 {
-                    double t = (double)j / steps;
-                    var bezierPoint = CubicBezierWithControlPoints(controlPoints, t, p0, p3);
+                    // 第一个窗口：生成更多插值点
+                    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);
                 }
             }
@@ -159,8 +173,209 @@ namespace Ink_Canvas.Helpers
             // 添加最后一个点
             result.Add(points[points.Length - 1]);
 
-            // 去重和优化点数
-            return RemoveDuplicatePoints(result.ToArray());
+            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>
@@ -251,7 +466,7 @@ namespace Ink_Canvas.Helpers
             var result = new List<StylusPoint>();
             result.Add(points[0]);
 
-            double minDistance = ResampleInterval * 0.5; // 最小距离阈值
+            double minDistance = 0.3; // 进一步减少最小距离阈值，保留更多平滑点
 
             for (int i = 1; i < points.Length; i++)
             {
@@ -270,6 +485,7 @@ namespace Ink_Canvas.Helpers
                 }
             }
 
+            System.Diagnostics.Debug.WriteLine($"RemoveDuplicatePoints: 输入点数={points.Length}, 输出点数={result.Count}");
             return result.ToArray();
         }
 
@@ -516,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; } = 8;
+        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; // 如果点数增加太多，返回原始笔画
             }
 
@@ -540,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>

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

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

Ink Canvas/Helpers/BaseUploadQueue.cs

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

Ink Canvas/Helpers/CameraService.cs

@@ -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/DeviceIdentifier.cs

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

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

@@ -1,12 +1,12 @@
+using Microsoft.Win32;
 using System;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Security;
-using System.Windows;
-using Microsoft.Win32;
-using System.Threading;
 using System.Text;
+using System.Threading;
+using System.Windows;
 
 namespace Ink_Canvas.Helpers
 {
@@ -19,11 +19,14 @@ namespace Ink_Canvas.Helpers
         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>
@@ -34,19 +37,19 @@ namespace Ink_Canvas.Helpers
             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"))
@@ -55,16 +58,16 @@ namespace Ink_Canvas.Helpers
                         commandKey.SetValue("", $"\"{exePath}\" \"%1\"");
                     }
                 }
-                
+
                 // 注册文件扩展名
                 using (RegistryKey extensionKey = Registry.ClassesRoot.CreateSubKey(FileExtension))
                 {
                     extensionKey.SetValue("", FileTypeName);
                 }
-                
+
                 // 刷新系统文件关联缓存
                 RefreshSystemFileAssociations();
-                
+
                 LogHelper.WriteLogToFile($"成功注册{FileExtension}文件关联", LogHelper.LogType.Event);
                 return true;
             }
@@ -94,13 +97,13 @@ namespace Ink_Canvas.Helpers
             {
                 // 删除文件扩展名关联
                 Registry.ClassesRoot.DeleteSubKeyTree(FileExtension, false);
-                
+
                 // 删除文件类型定义
                 Registry.ClassesRoot.DeleteSubKeyTree(FileTypeName, false);
-                
+
                 // 刷新系统文件关联缓存
                 RefreshSystemFileAssociations();
-                
+
                 LogHelper.WriteLogToFile($"成功注销{FileExtension}文件关联", LogHelper.LogType.Event);
                 return true;
             }
@@ -121,21 +124,21 @@ namespace Ink_Canvas.Helpers
                 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);
@@ -147,7 +150,7 @@ namespace Ink_Canvas.Helpers
             {
                 LogHelper.WriteLogToFile($"检查文件关联状态时出错: {ex.Message}", LogHelper.LogType.Error);
             }
-            
+
             return false;
         }
 
@@ -184,11 +187,11 @@ namespace Ink_Canvas.Helpers
         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))
                 {
@@ -204,7 +207,7 @@ namespace Ink_Canvas.Helpers
                     }
                 }
             }
-            
+
             return null;
         }
 
@@ -218,24 +221,24 @@ namespace Ink_Canvas.Helpers
             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
                 {
@@ -248,7 +251,7 @@ namespace Ink_Canvas.Helpers
                 {
                     LogHelper.WriteLogToFile($"清理IPC文件失败: {ex.Message}", LogHelper.LogType.Warning);
                 }
-                
+
                 LogHelper.WriteLogToFile("IPC文件路径发送完成", LogHelper.LogType.Event);
                 return true;
             }
@@ -259,6 +262,157 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        /// <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>
@@ -271,7 +425,7 @@ namespace Ink_Canvas.Helpers
                     try
                     {
                         LogHelper.WriteLogToFile("启动IPC监听器", LogHelper.LogType.Event);
-                        
+
                         using (EventWaitHandle ipcEvent = new EventWaitHandle(false, EventResetMode.ManualReset, IpcEventName))
                         {
                             while (true)
@@ -281,11 +435,11 @@ namespace Ink_Canvas.Helpers
                                 {
                                     // 处理IPC文件
                                     ProcessIpcFiles();
-                                    
+
                                     // 重置事件
                                     ipcEvent.Reset();
                                 }
-                                
+
                                 // 检查应用是否还在运行
                                 if (Application.Current == null || Application.Current.Dispatcher == null)
                                 {
@@ -299,7 +453,7 @@ namespace Ink_Canvas.Helpers
                         LogHelper.WriteLogToFile($"IPC监听器出错: {ex.Message}", LogHelper.LogType.Error);
                     }
                 });
-                
+
                 ipcThread.IsBackground = true;
                 ipcThread.Start();
             }
@@ -317,19 +471,20 @@ namespace Ink_Canvas.Helpers
             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(() =>
                             {
@@ -348,14 +503,14 @@ namespace Ink_Canvas.Helpers
                                 }
                             }));
                         }
-                        
+
                         // 删除IPC文件
                         File.Delete(ipcFile);
                     }
                     catch (Exception ex)
                     {
                         LogHelper.WriteLogToFile($"处理IPC文件失败: {ex.Message}", LogHelper.LogType.Warning);
-                        
+
                         // 尝试删除损坏的IPC文件
                         try
                         {
@@ -364,7 +519,163 @@ namespace Ink_Canvas.Helpers
                                 File.Delete(ipcFile);
                             }
                         }
-                        catch { }
+                        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); }
                     }
                 }
             }
@@ -377,4 +688,4 @@ namespace Ink_Canvas.Helpers
         [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

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

Ink Canvas/Helpers/GlobalHotkeyManager.cs

@@ -5,6 +5,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text;
+using System.Windows;
+using System.Windows.Forms;
 using System.Windows.Input;
 
 namespace Ink_Canvas.Helpers
@@ -20,8 +22,18 @@ namespace Ink_Canvas.Helpers
         private bool _isDisposed;
         private bool _hotkeysShouldBeRegistered = true; // 启动时注册热键
 
+        // 多屏幕支持相关字段
+        private Screen _currentScreen;
+        private bool _isMultiScreenMode = false;
+        private bool _enableScreenSpecificHotkeys = true; // 是否启用基于屏幕的热键注册
+
+        // 智能热键管理相关字段
+        private bool _isWindowFocused = false;
+        private bool _isMouseOverWindow = false;
+        private System.Windows.Threading.DispatcherTimer _mousePositionTimer;
+
         // 配置文件路径
-        private static readonly string HotkeyConfigFile = Path.Combine(App.RootPath, "HotkeyConfig.json");
+        private static readonly string HotkeyConfigFile = Path.Combine(App.RootPath, "Configs", "HotkeyConfig.json");
         #endregion
 
         #region Constructor
@@ -30,6 +42,12 @@ namespace Ink_Canvas.Helpers
             _mainWindow = mainWindow ?? throw new ArgumentNullException(nameof(mainWindow));
             _registeredHotkeys = new Dictionary<string, HotkeyInfo>();
             _hotkeysShouldBeRegistered = true; // 启动时注册热键
+
+            // 初始化多屏幕支持
+            InitializeMultiScreenSupport();
+
+            // 启动时确保配置文件存在
+            EnsureConfigFileExists();
         }
         #endregion
 
@@ -49,11 +67,27 @@ namespace Ink_Canvas.Helpers
                 if (_isDisposed)
                     return false;
 
+                // 检查是否应该注册热键（基于屏幕和模式）
+                if (!ShouldRegisterHotkeys())
+                {
+                    return false;
+                }
+
                 // 如果快捷键已存在，先注销
                 if (_registeredHotkeys.ContainsKey(hotkeyName))
                 {
                     UnregisterHotkey(hotkeyName);
                 }
+                else
+                {
+                    try
+                    {
+                        HotkeyManager.Current.Remove(hotkeyName);
+                    }
+                    catch
+                    {
+                    }
+                }
 
                 // 创建快捷键信息
                 var hotkeyInfo = new HotkeyInfo
@@ -82,12 +116,14 @@ namespace Ink_Canvas.Helpers
                 });
 
                 _registeredHotkeys[hotkeyName] = hotkeyInfo;
-                // 成功注册全局快捷键
+
+                // 记录注册信息
+                var screenInfo = _isMultiScreenMode ? $" (屏幕: {_currentScreen?.DeviceName})" : "";
+
                 return true;
             }
-            catch (Exception ex)
+            catch (Exception)
             {
-                LogHelper.WriteLogToFile($"注册全局快捷键 {hotkeyName} 失败: {ex.Message}", LogHelper.LogType.Error);
                 return false;
             }
         }
@@ -176,7 +212,6 @@ namespace Ink_Canvas.Helpers
             {
                 if (!File.Exists(HotkeyConfigFile))
                 {
-                    LogHelper.WriteLogToFile("快捷键配置文件不存在");
                     return new List<HotkeyInfo>();
                 }
 
@@ -209,7 +244,6 @@ namespace Ink_Canvas.Helpers
                     });
                 }
 
-                LogHelper.WriteLogToFile($"从配置文件读取到 {hotkeyList.Count} 个快捷键信息");
                 return hotkeyList;
             }
             catch (Exception ex)
@@ -280,28 +314,27 @@ namespace Ink_Canvas.Helpers
                     return;
                 }
 
+                // 如果配置文件不存在，先创建默认配置文件
+                if (!File.Exists(HotkeyConfigFile))
+                {
+                    LogHelper.WriteLogToFile($"快捷键配置文件不存在: {HotkeyConfigFile}", LogHelper.LogType.Warning);
+                    CreateDefaultConfigFile();
+                    RegisterDefaultHotkeys();
+                    _hotkeysShouldBeRegistered = true;
+                    return;
+                }
+
                 // 尝试从配置文件加载
                 if (LoadHotkeysFromConfigFile())
                 {
                     // 成功从配置文件加载快捷键设置
                     _hotkeysShouldBeRegistered = true;
-                    LogHelper.WriteLogToFile("成功从配置文件加载快捷键设置");
                 }
                 else
                 {
-                    // 如果配置文件不存在或加载失败，使用默认快捷键
-                    if (!File.Exists(HotkeyConfigFile))
-                    {
-                        LogHelper.WriteLogToFile("配置文件不存在，注册默认快捷键");
-                        RegisterDefaultHotkeys();
-                        _hotkeysShouldBeRegistered = true;
-                    }
-                    else
-                    {
-                        LogHelper.WriteLogToFile("配置文件存在但加载失败，回退到默认快捷键", LogHelper.LogType.Warning);
-                        RegisterDefaultHotkeys();
-                        _hotkeysShouldBeRegistered = true;
-                    }
+                    LogHelper.WriteLogToFile("配置文件存在但加载失败，回退到默认快捷键", LogHelper.LogType.Warning);
+                    RegisterDefaultHotkeys();
+                    _hotkeysShouldBeRegistered = true;
                 }
             }
             catch (Exception ex)
@@ -318,11 +351,9 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                LogHelper.WriteLogToFile("开始保存快捷键配置到配置文件", LogHelper.LogType.Event);
 
                 if (SaveHotkeysToConfigFile())
                 {
-                    LogHelper.WriteLogToFile("快捷键配置已成功保存到配置文件", LogHelper.LogType.Event);
                 }
                 else
                 {
@@ -346,16 +377,28 @@ namespace Ink_Canvas.Helpers
                 if (!_hotkeysShouldBeRegistered)
                 {
                     _hotkeysShouldBeRegistered = true;
-                    LogHelper.WriteLogToFile("启用快捷键注册功能");
 
-                    // 立即加载快捷键设置
-                    LoadHotkeysFromSettings();
+                    // 启动鼠标位置监控定时器
+                    if (_isMultiScreenMode && _enableScreenSpecificHotkeys && _mousePositionTimer != null)
+                    {
+                        _mousePositionTimer.Start();
+                    }
+
+                    // 根据上下文决定是否立即加载快捷键
+                    if (ShouldEnableHotkeysBasedOnContext())
+                    {
+                        LoadHotkeysFromSettings();
+                    }
                 }
                 else
                 {
-                    LogHelper.WriteLogToFile("快捷键注册功能已经启用，重新加载快捷键设置");
-                    // 即使已经启用，也要重新加载快捷键设置以确保快捷键正常工作
-                    LoadHotkeysFromSettings();
+                    if (_registeredHotkeys.Count == 0)
+                    {
+                        if (ShouldEnableHotkeysBasedOnContext())
+                        {
+                            LoadHotkeysFromSettings();
+                        }
+                    }
                 }
             }
             catch (Exception ex)
@@ -375,14 +418,18 @@ namespace Ink_Canvas.Helpers
                 if (_hotkeysShouldBeRegistered)
                 {
                     _hotkeysShouldBeRegistered = false;
-                    LogHelper.WriteLogToFile("禁用快捷键注册功能");
+
+                    // 停止鼠标位置监控定时器
+                    if (_mousePositionTimer != null && _mousePositionTimer.IsEnabled)
+                    {
+                        _mousePositionTimer.Stop();
+                    }
 
                     // 注销所有快捷键
                     UnregisterAllHotkeys();
                 }
                 else
                 {
-                    LogHelper.WriteLogToFile("快捷键注册功能已经禁用");
                 }
             }
             catch (Exception ex)
@@ -407,20 +454,27 @@ namespace Ink_Canvas.Helpers
                     {
                         // 如果设置允许，则在鼠标模式下也启用快捷键
                         EnableHotkeyRegistration();
-                        LogHelper.WriteLogToFile("切换到鼠标模式，但根据设置保持快捷键启用");
+
+                        if (_hotkeysShouldBeRegistered && _registeredHotkeys.Count == 0)
+                        {
+                            LoadHotkeysFromSettings();
+                        }
                     }
                     else
                     {
                         // 鼠标模式下禁用快捷键，让键盘操作放行
                         DisableHotkeyRegistration();
-                        LogHelper.WriteLogToFile("切换到鼠标模式，禁用快捷键以放行键盘操作");
                     }
                 }
                 else
                 {
                     // 非鼠标模式下启用快捷键
                     EnableHotkeyRegistration();
-                    LogHelper.WriteLogToFile("切换到非鼠标模式，启用快捷键");
+
+                    if (_hotkeysShouldBeRegistered && _registeredHotkeys.Count == 0)
+                    {
+                        LoadHotkeysFromSettings();
+                    }
                 }
             }
             catch (Exception ex)
@@ -457,7 +511,6 @@ namespace Ink_Canvas.Helpers
 
                 if (success)
                 {
-                    LogHelper.WriteLogToFile($"成功更新快捷键 {hotkeyName}: {modifiers}+{key}", LogHelper.LogType.Event);
                     // 自动保存配置
                     SaveHotkeysToSettings();
                 }
@@ -470,9 +523,424 @@ namespace Ink_Canvas.Helpers
                 return false;
             }
         }
+
+        /// <summary>
+        /// 启用基于屏幕的热键注册
+        /// </summary>
+        public void EnableScreenSpecificHotkeys()
+        {
+            try
+            {
+                _enableScreenSpecificHotkeys = true;
+
+                // 如果当前在多屏幕环境下，刷新热键注册
+                if (_isMultiScreenMode)
+                {
+                    RefreshHotkeysForCurrentScreen();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"启用基于屏幕的热键注册时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 禁用基于屏幕的热键注册
+        /// </summary>
+        public void DisableScreenSpecificHotkeys()
+        {
+            try
+            {
+                _enableScreenSpecificHotkeys = false;
+
+                // 重新注册热键（全局模式）
+                if (_hotkeysShouldBeRegistered)
+                {
+                    RefreshHotkeysForCurrentScreen();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"禁用基于屏幕的热键注册时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 获取当前屏幕信息
+        /// </summary>
+        /// <returns>当前屏幕信息</returns>
+        public string GetCurrentScreenInfo()
+        {
+            try
+            {
+                if (_isMultiScreenMode && _currentScreen != null)
+                {
+                    return $"多屏幕环境 - 当前屏幕: {_currentScreen.DeviceName} ({_currentScreen.Bounds.Width}x{_currentScreen.Bounds.Height})";
+                }
+                else
+                {
+                    return "单屏幕环境";
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"获取当前屏幕信息时出错: {ex.Message}", LogHelper.LogType.Error);
+                return "无法获取屏幕信息";
+            }
+        }
+
+        /// <summary>
+        /// 检查是否启用了基于屏幕的热键注册
+        /// </summary>
+        /// <returns>是否启用</returns>
+        public bool IsScreenSpecificHotkeysEnabled()
+        {
+            return _enableScreenSpecificHotkeys && _isMultiScreenMode;
+        }
+
+        /// <summary>
+        /// 手动刷新当前屏幕的热键注册
+        /// </summary>
+        public void RefreshCurrentScreenHotkeys()
+        {
+            try
+            {
+                RefreshHotkeysForCurrentScreen();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"刷新当前屏幕热键时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
         #endregion
 
         #region Private Helper Methods
+        /// <summary>
+        /// 初始化多屏幕支持
+        /// </summary>
+        private void InitializeMultiScreenSupport()
+        {
+            try
+            {
+                // 检测是否有多个屏幕
+                _isMultiScreenMode = ScreenDetectionHelper.HasMultipleScreens();
+
+                if (_isMultiScreenMode)
+                {
+                    // 获取当前窗口所在的屏幕
+                    _currentScreen = ScreenDetectionHelper.GetWindowScreen(_mainWindow);
+
+                    // 监听窗口位置变化事件
+                    _mainWindow.LocationChanged += OnWindowLocationChanged;
+
+                    // 初始化智能热键管理
+                    InitializeSmartHotkeyManagement();
+                }
+                else
+                {
+                    _currentScreen = ScreenDetectionHelper.GetPrimaryScreen();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"初始化多屏幕支持时出错: {ex.Message}", LogHelper.LogType.Error);
+                _isMultiScreenMode = false;
+                _currentScreen = ScreenDetectionHelper.GetPrimaryScreen();
+            }
+        }
+
+        /// <summary>
+        /// 初始化智能热键管理
+        /// </summary>
+        private void InitializeSmartHotkeyManagement()
+        {
+            try
+            {
+                // 监听窗口焦点事件
+                _mainWindow.GotFocus += OnWindowGotFocus;
+                _mainWindow.LostFocus += OnWindowLostFocus;
+
+                // 监听鼠标进入/离开事件
+                _mainWindow.MouseEnter += OnMouseEnterWindow;
+                _mainWindow.MouseLeave += OnMouseLeaveWindow;
+
+                // 初始化鼠标位置监控定时器
+                _mousePositionTimer = new System.Windows.Threading.DispatcherTimer();
+                _mousePositionTimer.Interval = TimeSpan.FromMilliseconds(500); // 每500ms检查一次
+                _mousePositionTimer.Tick += OnMousePositionTimerTick;
+
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"初始化热键管理时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 窗口位置变化事件处理
+        /// </summary>
+        private void OnWindowLocationChanged(object sender, EventArgs e)
+        {
+            try
+            {
+                if (!_isMultiScreenMode || !_enableScreenSpecificHotkeys)
+                    return;
+
+                var newScreen = ScreenDetectionHelper.GetWindowScreen(_mainWindow);
+                if (newScreen != null && newScreen != _currentScreen)
+                {
+                    _currentScreen = newScreen;
+
+                    // 重新注册热键以适应新屏幕
+                    RefreshHotkeysForCurrentScreen();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"处理窗口位置变化时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 为当前屏幕刷新热键注册
+        /// </summary>
+        private void RefreshHotkeysForCurrentScreen()
+        {
+            try
+            {
+                if (!_hotkeysShouldBeRegistered)
+                    return;
+
+                // 注销所有现有热键
+                UnregisterAllHotkeys();
+
+                // 重新注册热键
+                LoadHotkeysFromSettings();
+
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"刷新当前屏幕热键时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 窗口获得焦点事件处理
+        /// </summary>
+        private void OnWindowGotFocus(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                _isWindowFocused = true;
+                UpdateHotkeyStateBasedOnContext();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"处理窗口获得焦点事件时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 窗口失去焦点事件处理
+        /// </summary>
+        private void OnWindowLostFocus(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                _isWindowFocused = false;
+                UpdateHotkeyStateBasedOnContext();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"处理窗口失去焦点事件时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 鼠标进入窗口事件处理
+        /// </summary>
+        private void OnMouseEnterWindow(object sender, System.Windows.Input.MouseEventArgs e)
+        {
+            try
+            {
+                _isMouseOverWindow = true;
+                UpdateHotkeyStateBasedOnContext();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"处理鼠标进入窗口事件时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 鼠标离开窗口事件处理
+        /// </summary>
+        private void OnMouseLeaveWindow(object sender, System.Windows.Input.MouseEventArgs e)
+        {
+            try
+            {
+                _isMouseOverWindow = false;
+                UpdateHotkeyStateBasedOnContext();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"处理鼠标离开窗口事件时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 鼠标位置定时器事件处理
+        /// </summary>
+        private void OnMousePositionTimerTick(object sender, EventArgs e)
+        {
+            try
+            {
+                if (!_isMultiScreenMode || !_enableScreenSpecificHotkeys)
+                    return;
+
+                // 检查鼠标是否在当前窗口所在的屏幕上
+                var mousePosition = Control.MousePosition;
+                var currentScreen = Screen.FromPoint(mousePosition);
+
+                // 无论屏幕是否变化，都检查热键状态
+                // 这样可以确保热键状态始终与当前上下文保持一致
+                bool shouldEnableHotkeys = ShouldEnableHotkeysBasedOnContext();
+                bool currentlyHasHotkeys = _registeredHotkeys.Count > 0;
+
+                if (shouldEnableHotkeys && !currentlyHasHotkeys)
+                {
+                    UpdateHotkeyStateBasedOnContext();
+                }
+                else if (!shouldEnableHotkeys && currentlyHasHotkeys)
+                {
+                    UpdateHotkeyStateBasedOnContext();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"处理鼠标位置定时器事件时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 根据上下文更新热键状态
+        /// </summary>
+        private void UpdateHotkeyStateBasedOnContext()
+        {
+            try
+            {
+                if (!_hotkeysShouldBeRegistered)
+                    return;
+
+                bool shouldEnableHotkeys = ShouldEnableHotkeysBasedOnContext();
+                bool currentlyHasHotkeys = _registeredHotkeys.Count > 0;
+
+                if (shouldEnableHotkeys && !currentlyHasHotkeys)
+                {
+                    // 需要注册快捷键
+                    LoadHotkeysFromSettings();
+                }
+                else if (!shouldEnableHotkeys && currentlyHasHotkeys)
+                {
+                    // 需要注销快捷键
+                    UnregisterAllHotkeys();
+                }
+                // 如果状态没有变化，则不进行任何操作
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"根据上下文更新热键状态时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 检查是否应该注册热键（基于屏幕和模式）
+        /// </summary>
+        /// <returns>是否应该注册热键</returns>
+        private bool ShouldRegisterHotkeys()
+        {
+            try
+            {
+                // 如果禁用热键注册，则不注册
+                if (!_hotkeysShouldBeRegistered)
+                    return false;
+
+                // 如果启用基于屏幕的热键注册
+                if (_enableScreenSpecificHotkeys && _isMultiScreenMode)
+                {
+                    return ShouldEnableHotkeysBasedOnContext();
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"检查是否应该注册热键时出错: {ex.Message}", LogHelper.LogType.Error);
+                return true; // 出错时默认注册
+            }
+        }
+
+        /// <summary>
+        /// 根据上下文检查是否应该启用热键
+        /// </summary>
+        /// <returns>是否应该启用热键</returns>
+        private bool ShouldEnableHotkeysBasedOnContext()
+        {
+            try
+            {
+                // 检查当前是否处于鼠标模式
+                bool isMouseMode = IsInSelectMode();
+
+                if (isMouseMode)
+                {
+                    // 鼠标模式下，根据设置决定是否启用快捷键
+                    return MainWindow.Settings.Appearance.EnableHotkeysInMouseMode;
+                }
+                else
+                {
+                    // 非鼠标模式下，需要检查焦点和屏幕位置
+
+                    // 策略1：鼠标在窗口上时启用热键（最高优先级）
+                    if (_isMouseOverWindow)
+                    {
+                        return true;
+                    }
+
+                    // 策略2：在多屏幕环境下，检查鼠标是否在当前窗口所在的屏幕上
+                    if (_isMultiScreenMode && _enableScreenSpecificHotkeys)
+                    {
+                        var mousePosition = Control.MousePosition;
+                        var mouseScreen = Screen.FromPoint(mousePosition);
+
+                        if (mouseScreen == _currentScreen)
+                        {
+                            return true;
+                        }
+                        else
+                        {
+                            return false;
+                        }
+                    }
+
+                    // 策略3：单屏幕环境下，窗口有焦点时启用热键
+                    if (_isWindowFocused)
+                    {
+                        return true;
+                    }
+
+                    // 策略4：如果以上都不满足，但在非鼠标模式下，仍然启用快捷键
+                    // 这样可以确保在批注模式下快捷键始终可用
+                    return true;
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"检查是否应该启用热键时出错: {ex.Message}", LogHelper.LogType.Error);
+                return true; // 出错时默认启用
+            }
+        }
+
         /// <summary>
         /// 切换到指定笔类型
         /// </summary>
@@ -505,6 +973,88 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        /// <summary>
+        /// 确保配置文件存在，如果不存在则创建
+        /// </summary>
+        private void EnsureConfigFileExists()
+        {
+            try
+            {
+                // 如果配置文件不存在，创建默认配置文件
+                if (!File.Exists(HotkeyConfigFile))
+                {
+                    CreateDefaultConfigFile();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"确保快捷键配置文件存在时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 创建默认的快捷键配置文件
+        /// </summary>
+        private void CreateDefaultConfigFile()
+        {
+            try
+            {
+                // 确保配置目录存在
+                string configDir = Path.GetDirectoryName(HotkeyConfigFile);
+                if (!Directory.Exists(configDir))
+                {
+                    Directory.CreateDirectory(configDir);
+                }
+
+                // 创建默认配置对象
+                var config = new HotkeyConfig
+                {
+                    Version = "1.0",
+                    LastModified = DateTime.Now,
+                    Hotkeys = new List<HotkeyConfigItem>()
+                };
+
+                // 添加默认快捷键配置
+                config.Hotkeys.AddRange(new[]
+                {
+                    new HotkeyConfigItem { Name = "Undo", Key = Key.Z, Modifiers = ModifierKeys.Control },
+                    new HotkeyConfigItem { Name = "Redo", Key = Key.Y, Modifiers = ModifierKeys.Control },
+                    new HotkeyConfigItem { Name = "Clear", Key = Key.E, Modifiers = ModifierKeys.Control },
+                    new HotkeyConfigItem { Name = "Paste", Key = Key.V, Modifiers = ModifierKeys.Control },
+                    new HotkeyConfigItem { Name = "SelectTool", Key = Key.S, Modifiers = ModifierKeys.Alt },
+                    new HotkeyConfigItem { Name = "DrawTool", Key = Key.D, Modifiers = ModifierKeys.Alt },
+                    new HotkeyConfigItem { Name = "EraserTool", Key = Key.E, Modifiers = ModifierKeys.Alt },
+                    new HotkeyConfigItem { Name = "BlackboardTool", Key = Key.B, Modifiers = ModifierKeys.Alt },
+                    new HotkeyConfigItem { Name = "QuitDrawTool", Key = Key.Q, Modifiers = ModifierKeys.Alt },
+                    new HotkeyConfigItem { Name = "Pen1", Key = Key.D1, Modifiers = ModifierKeys.Alt },
+                    new HotkeyConfigItem { Name = "Pen2", Key = Key.D2, Modifiers = ModifierKeys.Alt },
+                    new HotkeyConfigItem { Name = "Pen3", Key = Key.D3, Modifiers = ModifierKeys.Alt },
+                    new HotkeyConfigItem { Name = "Pen4", Key = Key.D4, Modifiers = ModifierKeys.Alt },
+                    new HotkeyConfigItem { Name = "Pen5", Key = Key.D5, Modifiers = ModifierKeys.Alt },
+                    new HotkeyConfigItem { Name = "DrawLine", Key = Key.L, Modifiers = ModifierKeys.Alt },
+                    new HotkeyConfigItem { Name = "Screenshot", Key = Key.C, Modifiers = ModifierKeys.Alt },
+                    new HotkeyConfigItem { Name = "Hide", Key = Key.V, Modifiers = ModifierKeys.Alt },
+                    new HotkeyConfigItem { Name = "Exit", Key = Key.Escape, Modifiers = ModifierKeys.None }
+                });
+
+                // 序列化为JSON
+                var settings = new JsonSerializerSettings
+                {
+                    Formatting = Formatting.Indented
+                };
+
+                string jsonContent = JsonConvert.SerializeObject(config, settings);
+
+                // 写入配置文件
+                File.WriteAllText(HotkeyConfigFile, jsonContent, Encoding.UTF8);
+
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"创建默认快捷键配置文件时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
         /// <summary>
         /// 从配置文件加载快捷键设置
         /// </summary>
@@ -561,7 +1111,6 @@ namespace Ink_Canvas.Helpers
                     }
                 }
 
-                LogHelper.WriteLogToFile($"成功加载 {successCount}/{config.Hotkeys.Count} 个快捷键配置", LogHelper.LogType.Event);
                 if (successCount > 0)
                 {
                     _hotkeysShouldBeRegistered = true;
@@ -620,7 +1169,6 @@ namespace Ink_Canvas.Helpers
                 // 直接写入原文件，覆盖原有内容
                 File.WriteAllText(HotkeyConfigFile, jsonContent, Encoding.UTF8);
 
-                LogHelper.WriteLogToFile($"快捷键配置已保存到: {HotkeyConfigFile}", LogHelper.LogType.Event);
                 return true;
             }
             catch (Exception ex)
@@ -826,6 +1374,29 @@ namespace Ink_Canvas.Helpers
         {
             if (!_isDisposed)
             {
+                // 注销所有快捷键
+                UnregisterAllHotkeys();
+
+                // 停止定时器
+                if (_mousePositionTimer != null)
+                {
+                    _mousePositionTimer.Stop();
+                    _mousePositionTimer = null;
+                }
+
+                // 移除事件监听器
+                if (_mainWindow != null)
+                {
+                    if (_isMultiScreenMode)
+                    {
+                        _mainWindow.LocationChanged -= OnWindowLocationChanged;
+                    }
+
+                    _mainWindow.GotFocus -= OnWindowGotFocus;
+                    _mainWindow.LostFocus -= OnWindowLostFocus;
+                    _mainWindow.MouseEnter -= OnMouseEnterWindow;
+                    _mainWindow.MouseLeave -= OnMouseLeaveWindow;
+                }
 
                 _isDisposed = true;
             }

Ink Canvas/Helpers/HardwareAcceleratedInkProcessor.cs

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

Ink Canvas/Helpers/HashHelper.cs

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

Ink Canvas/Helpers/IPPTLinkManager.cs

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

Ink Canvas/Helpers/InkFadeManager.cs

@@ -71,6 +71,11 @@ namespace Ink_Canvas.Helpers
 
             try
             {
+                // 确保主窗口的InkCanvas保持Ink编辑模式，防止墨迹渐隐时切换到鼠标模式
+                if (_mainWindow.inkCanvas.EditingMode != InkCanvasEditingMode.Ink)
+                {
+                    _mainWindow.inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+                }
 
                 // 记录墨迹的起点和终点
                 _strokeStartPoints[stroke] = startPoint;

Ink Canvas/Helpers/InkSmoothingConfig.cs

@@ -71,37 +71,46 @@ namespace Ink_Canvas.Helpers
         }
 
         /// <summary>
-        /// 应用质量设置
+        /// 应用质量设置 
         /// </summary>
         public void ApplyQualitySettings()
         {
+            // 保存用户设置的异步处理偏好
+            bool userAsyncPreference = UseAsyncProcessing;
+
             switch (Quality)
             {
                 case SmoothingQuality.Performance:
-                    SmoothingStrength = 0.2;
-                    ResampleInterval = 4.0;
-                    InterpolationSteps = 6;
+                    SmoothingStrength = 0.15;
+                    ResampleInterval = 5.0;
+                    InterpolationSteps = 4;
                     UseAdaptiveInterpolation = false;
-                    CurveTension = 0.2;
+                    CurveTension = 0.15;
                     MaxConcurrentTasks = Math.Max(1, Environment.ProcessorCount / 2);
+                    UseHardwareAcceleration = true;
+                    UseAsyncProcessing = userAsyncPreference;
                     break;
 
                 case SmoothingQuality.Balanced:
-                    SmoothingStrength = 0.4;
-                    ResampleInterval = 2.5;
-                    InterpolationSteps = 12;
+                    SmoothingStrength = 0.3;
+                    ResampleInterval = 3.0;
+                    InterpolationSteps = 8;
                     UseAdaptiveInterpolation = true;
-                    CurveTension = 0.3;
+                    CurveTension = 0.25;
                     MaxConcurrentTasks = Environment.ProcessorCount;
+                    UseHardwareAcceleration = true;
+                    UseAsyncProcessing = userAsyncPreference;
                     break;
 
                 case SmoothingQuality.Quality:
-                    SmoothingStrength = 0.6;
-                    ResampleInterval = 1.5;
-                    InterpolationSteps = 20;
+                    SmoothingStrength = 0.5;
+                    ResampleInterval = 2.0;
+                    InterpolationSteps = 15;
                     UseAdaptiveInterpolation = true;
-                    CurveTension = 0.4;
+                    CurveTension = 0.35;
                     MaxConcurrentTasks = Environment.ProcessorCount;
+                    UseHardwareAcceleration = true;
+                    UseAsyncProcessing = userAsyncPreference;
                     break;
             }
         }

Ink Canvas/Helpers/LocalizationHelper.cs

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

Ink Canvas/Helpers/LogHelper.cs

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

Ink Canvas/Helpers/MultiTouchInput.cs

@@ -1,4 +1,5 @@
-using System;
+using System;
+using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Ink;
 using System.Windows.Input;
@@ -8,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,105 @@ namespace Ink_Canvas.Helpers
         }
 
         /// <summary>
-        ///     重新画出笔迹
+        /// 绘制点段到新的DrawingVisual
+        /// </summary>
+        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;
+
+            // 创建新的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())
+            {
+                var pen = new Pen(new SolidColorBrush(drawingAttributes.Color), drawingAttributes.Width);
+                pen.StartLineCap = PenLineCap.Round;
+                pen.EndLineCap = PenLineCap.Round;
+                pen.LineJoin = PenLineJoin.Round;
+
+                // 绘制指定范围内的点段
+                if (endIndex - startIndex >= 2)
+                {
+                    // 多个点，绘制线段
+                    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);
+                        dc.DrawLine(pen, startPoint, endPoint);
+                    }
+                }
+                else if (endIndex - startIndex == 1 && startIndex < points.Count)
+                {
+                    // 只有一个点，绘制圆点
+                    var brush = new SolidColorBrush(drawingAttributes.Color);
+                    var point = points[startIndex];
+                    dc.DrawEllipse(brush, null, new Point(point.X, point.Y),
+                        drawingAttributes.Width / 2, drawingAttributes.Height / 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

@@ -1,14 +1,13 @@
-using Microsoft.Office.Interop.PowerPoint;
+using Microsoft.Office.Interop.PowerPoint;
 using System;
 using System.IO;
-using System.Security.Cryptography;
-using System.Text;
+using System.Runtime.InteropServices;
 using System.Windows.Ink;
 
 namespace Ink_Canvas.Helpers
 {
     /// <summary>
-    /// PPT墨迹管理器 - 负责PPT中墨迹的保存、加载和同步
+    /// PPT墨迹管理器 - 负责按幻灯片保存/加载墨迹、自动保存与内存管理。
     /// </summary>
     public class PPTInkManager : IDisposable
     {
@@ -20,7 +19,8 @@ namespace Ink_Canvas.Helpers
 
         #region Private Fields
         private MemoryStream[] _memoryStreams;
-        private int _maxSlides = 100;
+        private const int DefaultMaxSlides = 100;
+        private int _maxSlides = DefaultMaxSlides;
         private string _currentPresentationId = "";
         private readonly object _lockObject = new object();
         private bool _disposed;
@@ -29,53 +29,92 @@ namespace Ink_Canvas.Helpers
         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();
+            InitializeMemoryStreams(DefaultMaxSlides + 2);
         }
 
-        private void InitializeMemoryStreams()
+        /// <summary>
+        /// 根据指定容量初始化用于存储每页墨迹的内存流数组。
+        /// </summary>
+        /// <param name="capacity">期望的数组容量；如果小于 2，则会使用 2 作为最小容量。</param>
+        private void InitializeMemoryStreams(int capacity)
         {
-            _memoryStreams = new MemoryStream[_maxSlides + 2];
+            if (_memoryStreams != null)
+            {
+                for (int i = 0; i < _memoryStreams.Length; i++)
+                {
+                    try { _memoryStreams[i]?.Dispose(); } catch (Exception ex) { LogHelper.WriteLogToFile($"InitializeMemoryStreams 释放内存流 {i} 失败: {ex}", LogHelper.LogType.Warning); }
+                }
+            }
+            _memoryStreams = new MemoryStream[Math.Max(2, capacity)];
         }
         #endregion
 
         #region Public Methods
+
         /// <summary>
         /// 初始化新的演示文稿
         /// </summary>
+        /// <remarks>
+        /// 为新的或当前的演示文稿初始化墨迹管理器的内部状态。
+        /// 方法会清除所有内存中的笔迹数据，重置墨迹写入锁与快速切换追踪，并根据演示文稿的幻灯片数量分配内部内存缓冲区。
+        /// 如果已启用自动保存且设置了 <see cref="AutoSaveLocation"/>，则会尝试加载磁盘上的已保存墨迹文件。
+        /// </remarks>
+        /// <param name="presentation">要初始化的 PowerPoint Presentation 实例；为 null 时方法不执行任何操作并直接返回。</param>
         public void InitializePresentation(Presentation presentation)
         {
+            ThrowIfDisposed();
             if (presentation == null) return;
 
             lock (_lockObject)
             {
                 try
                 {
-                    // 完全清理之前的墨迹状态
-                    ClearAllStrokes();
-
-                    // 重置墨迹锁定状态
+                    ClearAllStrokesInternal();
                     _inkLockUntil = DateTime.MinValue;
                     _lockedSlideIndex = -1;
+                    _lastSwitchSlideIndex = -1;
+                    _lastSwitchTime = DateTime.MinValue;
 
-                    // 生成演示文稿唯一标识符
                     _currentPresentationId = GeneratePresentationId(presentation);
 
-                    // 重新初始化内存流数组
-                    var slideCount = presentation.Slides.Count;
-                    _memoryStreams = new MemoryStream[slideCount + 2];
-
-                    // 如果启用自动保存，尝试加载已保存的墨迹
-                    if (IsAutoSaveEnabled && !string.IsNullOrEmpty(AutoSaveLocation))
+                    int slideCount = 0;
+                    try
                     {
-                        LoadSavedStrokes();
+                        slideCount = presentation.Slides.Count;
+                    }
+                    catch (COMException comEx)
+                    {
+                        uint hr = (uint)comEx.HResult;
+                        if (hr == 0x80048010) return;
+                        throw;
                     }
 
-                    LogHelper.WriteLogToFile($"已初始化演示文稿墨迹管理: {presentation.Name}, 幻灯片数量: {slideCount}", LogHelper.LogType.Trace);
+                    int capacity = slideCount + 2;
+                    _maxSlides = Math.Max(_maxSlides, slideCount);
+                    _memoryStreams = new MemoryStream[capacity];
+
+                    if (IsAutoSaveEnabled && !string.IsNullOrEmpty(AutoSaveLocation))
+                        LoadSavedStrokes();
                 }
                 catch (Exception ex)
                 {
@@ -87,33 +126,25 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 保存当前页面的墨迹
         /// </summary>
+        /// <remarks>
+        /// 将指定幻灯片的墨迹保存到内部内存缓存，并在必要时触发内存清理。
+        /// </remarks>
+        /// <param name="slideIndex">要保存的幻灯片索引（从 1 开始）。方法在索引小于或等于 0 时不执行任何操作。</param>
+        /// <param name="strokes">要保存的墨迹集合；为 null 时方法不执行任何操作。</param>
         public void SaveCurrentSlideStrokes(int slideIndex, StrokeCollection strokes)
         {
+            ThrowIfDisposed();
             if (slideIndex <= 0 || strokes == null) return;
 
             lock (_lockObject)
             {
                 try
                 {
-                    // 检查墨迹锁定
-                    if (!CanWriteInk(slideIndex))
-                    {
-                        LogHelper.WriteLogToFile($"墨迹写入被锁定，当前页:{slideIndex}，锁定页:{_lockedSlideIndex}", LogHelper.LogType.Warning);
-                        return;
-                    }
+                    if (!CanWriteInk(slideIndex)) return;
+                    if (slideIndex >= _memoryStreams.Length) return;
 
-                    if (slideIndex < _memoryStreams.Length)
-                    {
-                        var ms = new MemoryStream();
-                        strokes.Save(ms);
-                        ms.Position = 0;
-
-                        // 释放旧的内存流
-                        _memoryStreams[slideIndex]?.Dispose();
-                        _memoryStreams[slideIndex] = ms;
-
-                        LogHelper.WriteLogToFile($"已保存第{slideIndex}页墨迹，大小: {ms.Length} bytes", LogHelper.LogType.Trace);
-                    }
+                    ReplaceSlideStream(slideIndex, strokes);
+                    CheckAndPerformMemoryCleanup();
                 }
                 catch (Exception ex)
                 {
@@ -122,11 +153,45 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        /// <summary>
+        /// 强制保存指定页墨迹到内存（不受锁定限制）。用于放映结束前保存当前画布到当前页。
+        /// </summary>
+        /// <remarks>
+        /// 强制将指定幻灯片的墨迹保存到内部内存缓存，覆盖该幻灯片已有的墨迹数据。
+        /// </remarks>
+        /// <param name="slideIndex">要保存的幻灯片索引（从 1 开始）。</param>
+        /// <param name="strokes">要保存的墨迹集合，不能为空。</param>
+        public void ForceSaveSlideStrokes(int slideIndex, StrokeCollection strokes)
+        {
+            ThrowIfDisposed();
+            if (slideIndex <= 0 || strokes == null) return;
+
+            lock (_lockObject)
+            {
+                try
+                {
+                    if (slideIndex >= _memoryStreams.Length) 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)
@@ -136,9 +201,7 @@ namespace Ink_Canvas.Helpers
                     if (slideIndex < _memoryStreams.Length && _memoryStreams[slideIndex] != null && _memoryStreams[slideIndex].Length > 0)
                     {
                         _memoryStreams[slideIndex].Position = 0;
-                        var strokes = new StrokeCollection(_memoryStreams[slideIndex]);
-                        LogHelper.WriteLogToFile($"已加载第{slideIndex}页墨迹，笔画数量: {strokes.Count}", LogHelper.LogType.Trace);
-                        return strokes;
+                        return new StrokeCollection(_memoryStreams[slideIndex]);
                     }
                 }
                 catch (Exception ex)
@@ -153,33 +216,30 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 切换到指定页面并加载墨迹
         /// </summary>
+        /// <remarks>
+        /// 切换到指定幻灯片并返回该幻灯片的已加载笔迹集合。
+        /// </remarks>
+        /// <param name="slideIndex">要切换到的幻灯片索引（从 1 开始）。</param>
+        /// <param name="currentStrokes">可选的当前笔迹集合，用于在切换时提供当前画面状态。</param>
+        /// <returns>`StrokeCollection`：指定幻灯片已加载的笔迹集合；若加载失败则返回一个空的 `StrokeCollection`。</returns>
         public StrokeCollection SwitchToSlide(int slideIndex, StrokeCollection currentStrokes = null)
         {
+            ThrowIfDisposed();
             lock (_lockObject)
             {
                 try
                 {
-                    // 如果有当前墨迹，先保存到正确的页面
-                    if (currentStrokes != null && currentStrokes.Count > 0)
+                    var now = DateTime.Now;
+                    if (now - _lastSwitchTime < TimeSpan.FromMilliseconds(MinSwitchIntervalMs) && _lastSwitchSlideIndex == slideIndex)
                     {
-                        // 确定要保存的页面索引
-                        int saveToSlideIndex = _lockedSlideIndex > 0 ? _lockedSlideIndex : slideIndex;
-
-                        // 确保页面索引有效
-                        if (saveToSlideIndex > 0 && saveToSlideIndex < _memoryStreams.Length)
-                        {
-                            SaveCurrentSlideStrokes(saveToSlideIndex, currentStrokes);
-                            LogHelper.WriteLogToFile($"已保存第{saveToSlideIndex}页墨迹，墨迹数量: {currentStrokes.Count}", LogHelper.LogType.Trace);
-                        }
+                        LogHelper.WriteLogToFile($"快速切换保护：忽略重复请求 页{slideIndex}", LogHelper.LogType.Trace);
+                        return LoadSlideStrokes(slideIndex);
                     }
 
-                    // 设置墨迹锁定
                     LockInkForSlide(slideIndex);
-
-                    // 加载新页面的墨迹
-                    var newStrokes = LoadSlideStrokes(slideIndex);
-                    LogHelper.WriteLogToFile($"已切换到第{slideIndex}页，加载墨迹数量: {newStrokes.Count}", LogHelper.LogType.Trace);
-
+                    StrokeCollection newStrokes = LoadSlideStrokes(slideIndex);
+                    _lastSwitchTime = now;
+                    _lastSwitchSlideIndex = slideIndex;
                     return newStrokes;
                 }
                 catch (Exception ex)
@@ -193,68 +253,66 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 保存所有墨迹到文件
         /// </summary>
-        public void SaveAllStrokesToFile(Presentation presentation)
+        /// <remarks>
+        /// 将内存中当前演示文稿的每页墨迹保存到磁盘，并根据情况写入当前播放位置文件。
+        /// 仅在 IsAutoSaveEnabled 为真且 AutoSaveLocation 已设置时执行。会在演示文稿专属文件夹中写入按页编号的墨迹文件（带 `.icstk` 扩展名）和可选的 Position 文件。遇到特定 COM 错误（HRESULT 0x80048010）时会中止保存当前幻灯片计数读取而不抛出异常；单页保存失败会记录错误并继续处理其他页。
+        /// </remarks>
+        /// <param name="presentation">要保存墨迹的 PowerPoint 演示文稿对象。</param>
+        /// <param name="currentSlideIndex">当前播放的页码；如果大于 0 则以此值写入 Position 文件，否则使用当前被锁定的页码或最后切换的页码作为保存位置。</param>
+        public void SaveAllStrokesToFile(Presentation presentation, int currentSlideIndex = -1)
         {
+            ThrowIfDisposed();
             if (!IsAutoSaveEnabled || string.IsNullOrEmpty(AutoSaveLocation) || presentation == null) return;
 
             lock (_lockObject)
             {
                 try
                 {
-                    var folderPath = GetPresentationFolderPath();
+                    string folderPath = GetPresentationFolderPath();
                     if (!Directory.Exists(folderPath))
-                    {
                         Directory.CreateDirectory(folderPath);
+
+                    int positionToSave = currentSlideIndex > 0 ? currentSlideIndex : (_lockedSlideIndex > 0 ? _lockedSlideIndex : _lastSwitchSlideIndex);
+                    if (positionToSave > 0)
+                    {
+                        try { File.WriteAllText(Path.Combine(folderPath, "Position"), positionToSave.ToString()); }
+                        catch (Exception ex) { LogHelper.WriteLogToFile($"保存 Position 失败: {ex}", LogHelper.LogType.Warning); }
                     }
 
-                    // 保存位置信息
-                    try
+                    int slideCount = 0;
+                    try { slideCount = presentation.Slides.Count; }
+                    catch (COMException comEx)
                     {
-                        File.WriteAllText(Path.Combine(folderPath, "Position"), _lockedSlideIndex.ToString());
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.WriteLogToFile($"保存位置信息失败: {ex}", LogHelper.LogType.Error);
+                        if ((uint)comEx.HResult == 0x80048010) return;
+                        throw;
                     }
 
-                    // 保存所有页面的墨迹
-                    int savedCount = 0;
-                    for (int i = 1; i <= presentation.Slides.Count && i < _memoryStreams.Length; i++)
+                    for (int i = 1; i <= slideCount && i < _memoryStreams.Length; i++)
                     {
-                        if (_memoryStreams[i] != null)
+                        if (_memoryStreams[i] == null) continue;
+                        try
                         {
-                            try
+                            if (_memoryStreams[i].Length > 8)
                             {
-                                if (_memoryStreams[i].Length > 8)
+                                _memoryStreams[i].Position = 0;
+                                byte[] buf = new byte[_memoryStreams[i].Length];
+                                int read = _memoryStreams[i].Read(buf, 0, buf.Length);
+                                if (read > 0)
                                 {
-                                    var srcBuf = new byte[_memoryStreams[i].Length];
-                                    _memoryStreams[i].Position = 0;
-                                    var byteLength = _memoryStreams[i].Read(srcBuf, 0, srcBuf.Length);
-
-                                    var filePath = Path.Combine(folderPath, i.ToString("0000") + ".icstk");
-                                    File.WriteAllBytes(filePath, srcBuf);
-                                    savedCount++;
-
-                                    LogHelper.WriteLogToFile($"已保存第{i}页墨迹，大小: {byteLength} bytes", LogHelper.LogType.Trace);
-                                }
-                                else
-                                {
-                                    // 删除空的墨迹文件
-                                    var filePath = Path.Combine(folderPath, i.ToString("0000") + ".icstk");
-                                    if (File.Exists(filePath))
-                                    {
-                                        File.Delete(filePath);
-                                    }
+                                    string basePath = Path.Combine(folderPath, i.ToString("0000"));
+                                    File.WriteAllBytes(basePath + StrokeFileExtension, buf);
                                 }
                             }
-                            catch (Exception ex)
+                            else
                             {
-                                LogHelper.WriteLogToFile($"保存第{i}页墨迹失败: {ex}", LogHelper.LogType.Error);
+                                TryDeleteStrokeFile(folderPath, i);
                             }
                         }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"保存第{i}页墨迹到文件失败: {ex}", LogHelper.LogType.Error);
+                        }
                     }
-
-                    LogHelper.WriteLogToFile($"已保存{savedCount}页墨迹到文件", LogHelper.LogType.Event);
                 }
                 catch (Exception ex)
                 {
@@ -266,42 +324,50 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 从文件加载已保存的墨迹
         /// </summary>
+        /// <remarks>
+        /// 从自动保存目录加载已保存的幻灯片墨迹数据到内存流中，供后续显示和编辑使用。
+        /// 仅在启用自动保存且已设置 AutoSaveLocation 时执行。函数获取当前演示文稿的自动保存文件夹，遍历以 <c>.icstk</c> 为扩展名的文件，
+        /// 将文件名（去除扩展名）解析为幻灯片索引并在合法且文件大小大于 8 字节时加载到对应的内存流槽位。对单个文件的读取失败会记录错误并继续处理其他文件；
+        /// 若成功加载则会记录已加载页数。方法在内部使用锁以保证线程安全。
+        /// </remarks>
         public void LoadSavedStrokes()
         {
+            ThrowIfDisposed();
             if (!IsAutoSaveEnabled || string.IsNullOrEmpty(AutoSaveLocation)) return;
 
             lock (_lockObject)
             {
                 try
                 {
-                    var folderPath = GetPresentationFolderPath();
+                    string folderPath = GetPresentationFolderPath();
                     if (!Directory.Exists(folderPath)) return;
 
-                    var files = new DirectoryInfo(folderPath).GetFiles("*.icstk");
+                    var dir = new DirectoryInfo(folderPath);
                     int loadedCount = 0;
-
-                    foreach (var file in files)
+                    foreach (FileInfo file in dir.GetFiles("*" + StrokeFileExtension))
                     {
+                        string nameWithoutExt = Path.GetFileNameWithoutExtension(file.Name);
+                        if (!int.TryParse(nameWithoutExt, out int slideIndex) || slideIndex <= 0) continue;
+                        if (slideIndex >= _memoryStreams.Length) continue;
+
                         try
                         {
-                            if (int.TryParse(Path.GetFileNameWithoutExtension(file.Name), out int slideIndex))
+                            byte[] bytes = File.ReadAllBytes(file.FullName);
+                            if (bytes.Length > 8)
                             {
-                                if (slideIndex > 0 && slideIndex < _memoryStreams.Length)
-                                {
-                                    var fileBytes = File.ReadAllBytes(file.FullName);
-                                    _memoryStreams[slideIndex] = new MemoryStream(fileBytes);
-                                    _memoryStreams[slideIndex].Position = 0;
-                                    loadedCount++;
-                                }
+                                _memoryStreams[slideIndex] = new MemoryStream(bytes);
+                                _memoryStreams[slideIndex].Position = 0;
+                                loadedCount++;
                             }
                         }
                         catch (Exception ex)
                         {
-                            LogHelper.WriteLogToFile($"加载墨迹文件{file.Name}失败: {ex}", LogHelper.LogType.Error);
+                            LogHelper.WriteLogToFile($"加载墨迹文件 {file.Name} 失败: {ex}", LogHelper.LogType.Error);
                         }
                     }
 
-                    LogHelper.WriteLogToFile($"已从文件加载{loadedCount}页墨迹", LogHelper.LogType.Event);
+                    if (loadedCount > 0)
+                        LogHelper.WriteLogToFile($"已从磁盘加载 {loadedCount} 页墨迹", LogHelper.LogType.Trace);
                 }
                 catch (Exception ex)
                 {
@@ -313,101 +379,226 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 清除所有墨迹
         /// </summary>
+        /// <remarks>
+        /// 清除并释放当前演示文稿所有幻灯片的墨迹数据和相关内存资源。
+        /// 该方法在内部加锁以保证线程安全；会处置并清空所有内部存储的墨迹流、重建内部流数组并清空 CurrentStrokes。
+        /// </remarks>
         public void ClearAllStrokes()
         {
+            ThrowIfDisposed();
             lock (_lockObject)
             {
-                try
-                {
-                    for (int i = 0; i < _memoryStreams.Length; i++)
-                    {
-                        _memoryStreams[i]?.Dispose();
-                        _memoryStreams[i] = null;
-                    }
-
-                    CurrentStrokes.Clear();
-                    LogHelper.WriteLogToFile("已清除所有墨迹", LogHelper.LogType.Trace);
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteLogToFile($"清除墨迹失败: {ex}", LogHelper.LogType.Error);
-                }
+                ClearAllStrokesInternal();
             }
         }
 
         /// <summary>
-        /// 翻页后锁定墨迹写入
+        /// 为指定幻灯片设置短时墨迹写入锁，防止在该时间窗口内对其他幻灯片进行写入操作。
         /// </summary>
+        /// <param name="slideIndex">要上锁的幻灯片索引（大于 0）。锁从调用时刻开始，持续 InkLockMilliseconds 毫秒。</param>
         public void LockInkForSlide(int slideIndex)
         {
+            ThrowIfDisposed();
             _inkLockUntil = DateTime.Now.AddMilliseconds(InkLockMilliseconds);
             _lockedSlideIndex = slideIndex;
         }
 
         /// <summary>
-        /// 检查是否可以写入墨迹
+        /// 确定在当前滑页上下文中是否允许写入墨迹（基于短期的墨迹写入锁与容差窗口）。
         /// </summary>
+        /// <param name="currentSlideIndex">当前尝试写入墨迹的幻灯片索引（从 1 开始）。</param>
+        /// <returns>`true` 如果允许写入墨迹（锁已过期、目标为被锁定的幻灯片，或处于短暂的容差窗口内），`false` 否则。</returns>
         public bool CanWriteInk(int currentSlideIndex)
         {
-            if (DateTime.Now < _inkLockUntil) return false;
-            if (currentSlideIndex != _lockedSlideIndex && _lockedSlideIndex > 0) return false;
-            return true;
+            ThrowIfDisposed();
+            if (DateTime.Now >= _inkLockUntil) return true;
+            if (currentSlideIndex == _lockedSlideIndex) return true;
+            if (DateTime.Now - (_inkLockUntil.AddMilliseconds(-InkLockMilliseconds)) < TimeSpan.FromMilliseconds(50)) return true;
+            return false;
         }
+
+        /// <summary>
+        /// 重置与墨迹书写和幻灯片切换相关的锁与跟踪状态为初始（未锁定）值。
+        /// </summary>
+        /// <remarks>
+        /// 将内部的墨迹写入到期时间、当前被锁定的幻灯片索引、上次切换时间和上次切换的幻灯片索引均恢复为默认未设置状态。
+        /// </remarks>
+        public void ResetLockState()
+        {
+            ThrowIfDisposed();
+            lock (_lockObject)
+            {
+                _inkLockUntil = DateTime.MinValue;
+                _lockedSlideIndex = -1;
+                _lastSwitchTime = DateTime.MinValue;
+                _lastSwitchSlideIndex = -1;
+            }
+        }
+
         #endregion
 
-        #region Private Methods
+        #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
             {
-                var presentationPath = presentation.FullName;
-                var fileHash = GetFileHash(presentationPath);
-                return $"{presentation.Name}_{presentation.Slides.Count}_{fileHash}";
+                string path = presentation.FullName;
+                string hash = HashHelper.GetFileHash(path);
+                return $"{presentation.Name}_{presentation.Slides.Count}_{hash}";
             }
             catch (Exception ex)
             {
-                LogHelper.WriteLogToFile($"生成演示文稿ID失败: {ex}", LogHelper.LogType.Error);
+                LogHelper.WriteLogToFile($"生成演示文稿 ID 失败: {ex}", LogHelper.LogType.Error);
                 return $"unknown_{DateTime.Now.Ticks}";
             }
         }
 
-        private string GetFileHash(string filePath)
-        {
-            try
-            {
-                if (string.IsNullOrEmpty(filePath)) return "unknown";
-
-                using (var md5 = MD5.Create())
-                {
-                    byte[] hashBytes = md5.ComputeHash(Encoding.UTF8.GetBytes(filePath));
-                    return BitConverter.ToString(hashBytes).Replace("-", "").Substring(0, 8);
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"计算文件哈希值失败: {ex}", LogHelper.LogType.Error);
-                return "error";
-            }
-        }
-
         private string GetPresentationFolderPath()
         {
             return Path.Combine(AutoSaveLocation, "Auto Saved - Presentations", _currentPresentationId);
         }
+
         #endregion
 
         #region Dispose
+
+        /// <summary>
+        /// 释放 PPTInkManager 持有的资源并清除所有内存中的笔迹数据。
+        /// </summary>
+        /// <remarks>
+        /// 调用后该实例将进入已释放状态，不应再被使用。方法为幂等且线程安全：如果已释放则立即返回，否则在同步区内清理资源并标记为已释放。
+        /// </remarks>
         public void Dispose()
         {
-            if (!_disposed)
-            {
-                lock (_lockObject)
-                {
-                    ClearAllStrokes();
-                }
-                _disposed = true;
-            }
+            if (_disposed) return;
+            lock (_lockObject) { ClearAllStrokesInternal(); }
+            _disposed = true;
+            GC.SuppressFinalize(this);
         }
+
+        private void ThrowIfDisposed()
+        {
+            if (_disposed) throw new ObjectDisposedException(nameof(PPTInkManager));
+        }
+
         #endregion
     }
-}
+}

Ink Canvas/Helpers/PPTROTConnectionHelper.cs

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

Ink Canvas/Helpers/PPTUIManager.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Threading;
 
@@ -22,6 +23,10 @@ namespace Ink_Canvas.Helpers
         public int PPTRBButtonPosition { get; set; } = 0;
         public bool EnablePPTButtonPageClickable { get; set; } = true;
         public bool EnablePPTButtonLongPressPageTurn { get; set; } = true;
+        public double PPTLSButtonOpacity { get; set; } = 0.5;
+        public double PPTRSButtonOpacity { get; set; } = 0.5;
+        public double PPTLBButtonOpacity { get; set; } = 0.5;
+        public double PPTRBButtonOpacity { get; set; } = 0.5;
         #endregion
 
         #region Private Fields
@@ -86,24 +91,55 @@ namespace Ink_Canvas.Helpers
                         {
                             _mainWindow.PPTBtnPageNow.Text = currentSlide.ToString();
                             _mainWindow.PPTBtnPageTotal.Text = $"/ {totalSlides}";
-                            LogHelper.WriteLogToFile($"更新PPT页码显示: {currentSlide}/{totalSlides}", LogHelper.LogType.Trace);
                         }
                         else
                         {
                             // 页数无效时清空页码显示
                             _mainWindow.PPTBtnPageNow.Text = "?";
                             _mainWindow.PPTBtnPageTotal.Text = "/ ?";
-                            LogHelper.WriteLogToFile($"PPT页数无效，清空页码显示: 当前页={currentSlide}, 总页数={totalSlides}", LogHelper.LogType.Warning);
                         }
 
                         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)
@@ -127,14 +163,12 @@ namespace Ink_Canvas.Helpers
                     {
                         _mainWindow.PPTBtnPageNow.Text = currentSlide.ToString();
                         _mainWindow.PPTBtnPageTotal.Text = $"/ {totalSlides}";
-                        LogHelper.WriteLogToFile($"更新PPT页码显示: {currentSlide}/{totalSlides}", LogHelper.LogType.Trace);
                     }
                     else
                     {
                         // 页数无效时清空页码显示
                         _mainWindow.PPTBtnPageNow.Text = "?";
                         _mainWindow.PPTBtnPageTotal.Text = "/ ?";
-                        LogHelper.WriteLogToFile($"PPT页数无效，清空页码显示: 当前页={currentSlide}, 总页数={totalSlides}", LogHelper.LogType.Warning);
                     }
                 }
                 catch (Exception ex)
@@ -157,7 +191,6 @@ namespace Ink_Canvas.Helpers
                     {
                         // 如果不在放映模式，隐藏所有导航面板
                         HideAllNavigationPanels();
-                        LogHelper.WriteLogToFile("PPT放映状态变化：隐藏导航面板", LogHelper.LogType.Trace);
                     }
                 }
                 catch (Exception ex)
@@ -181,21 +214,19 @@ namespace Ink_Canvas.Helpers
                     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;
+                                          hasValidPageCount &&
+                                          !MainWindow.Settings.Automation.IsAutoFoldInPPTSlideShow;
 
                     if (!shouldShowButtons)
                     {
                         HideAllNavigationPanels();
-                        LogHelper.WriteLogToFile($"隐藏PPT导航面板 - 放映状态: {isInSlideShow}, 页数: {slidesCount}, 按钮设置: {ShowPPTButton}", LogHelper.LogType.Trace);
                         return;
                     }
 
-                    LogHelper.WriteLogToFile($"显示PPT导航面板 - 放映状态: {isInSlideShow}, 页数: {slidesCount}", LogHelper.LogType.Trace);
-
                     // 设置侧边按钮位置
                     _mainWindow.LeftSidePanelForPPTNavigation.Margin = new Thickness(0, 0, 0, PPTLSButtonPosition * 2);
                     _mainWindow.RightSidePanelForPPTNavigation.Margin = new Thickness(0, 0, 0, PPTRSButtonPosition * 2);
@@ -358,10 +389,9 @@ namespace Ink_Canvas.Helpers
                 _mainWindow.PPTLSPageButton.Visibility = pageButtonVisibility;
                 _mainWindow.PPTRSPageButton.Visibility = pageButtonVisibility;
 
-                // 透明度设置
-                var opacity = options[1] == '2' ? 0.5 : 1.0;
-                _mainWindow.PPTBtnLSBorder.Opacity = opacity;
-                _mainWindow.PPTBtnRSBorder.Opacity = opacity;
+                // 透明度设置 - 直接使用用户设置的透明度值
+                _mainWindow.PPTBtnLSBorder.Opacity = PPTLSButtonOpacity;
+                _mainWindow.PPTBtnRSBorder.Opacity = PPTRSButtonOpacity;
 
                 // 颜色主题
                 bool isDarkTheme = options[2] == '2';
@@ -387,10 +417,9 @@ namespace Ink_Canvas.Helpers
                 _mainWindow.PPTLBPageButton.Visibility = pageButtonVisibility;
                 _mainWindow.PPTRBPageButton.Visibility = pageButtonVisibility;
 
-                // 透明度设置
-                var opacity = options[1] == '2' ? 0.5 : 1.0;
-                _mainWindow.PPTBtnLBBorder.Opacity = opacity;
-                _mainWindow.PPTBtnRBBorder.Opacity = opacity;
+                // 透明度设置 - 直接使用用户设置的透明度值
+                _mainWindow.PPTBtnLBBorder.Opacity = PPTLBButtonOpacity;
+                _mainWindow.PPTBtnRBBorder.Opacity = PPTRBButtonOpacity;
 
                 // 颜色主题
                 bool isDarkTheme = options[2] == '2';

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

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

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

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

Ink Canvas/Helpers/Plugins/EnhancedPluginBaseV2.cs

@@ -238,4 +238,4 @@ namespace Ink_Canvas.Helpers.Plugins
 
         #endregion
     }
-} 
+}

Ink Canvas/Helpers/Plugins/IActionService.cs

@@ -293,4 +293,4 @@ namespace Ink_Canvas.Helpers.Plugins
 
         #endregion
     }
-} 
+}

Ink Canvas/Helpers/Plugins/IGetService.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
@@ -212,4 +211,4 @@ namespace Ink_Canvas.Helpers.Plugins
 
         #endregion
     }
-} 
+}

Ink Canvas/Helpers/Plugins/IPluginService.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
 namespace Ink_Canvas.Helpers.Plugins
 {
     /// <summary>

Ink Canvas/Helpers/Plugins/IWindowService.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Ink_Canvas.Helpers.Plugins
 {
     /// <summary>
@@ -151,4 +149,4 @@ namespace Ink_Canvas.Helpers.Plugins
 
         #endregion
     }
-} 
+}

Ink Canvas/Helpers/Plugins/PluginManager.cs

@@ -20,8 +20,8 @@ namespace Ink_Canvas.Helpers.Plugins
     public class PluginManager
     {
         private static readonly string PluginsDirectory = Path.Combine(App.RootPath, "Plugins");
-        private static readonly string PluginConfigFile = Path.Combine(App.RootPath, "PluginConfig.json");
-        private static readonly string PluginConfigBackupFile = Path.Combine(App.RootPath, "PluginConfig.json.bak");
+        private static readonly string PluginConfigFile = Path.Combine(App.RootPath, "Configs", "PluginConfig.json");
+        private static readonly string PluginConfigBackupFile = Path.Combine(App.RootPath, "Configs", "PluginConfig.json.bak");
 
         private static PluginManager _instance;
         private static SemaphoreSlim _configLock = new SemaphoreSlim(1, 1);
@@ -79,8 +79,6 @@ namespace Ink_Canvas.Helpers.Plugins
                 Directory.CreateDirectory(PluginsDirectory);
             }
 
-            // 加载插件配置
-            LoadConfig();
 
             // 初始化自动保存计时器（3秒）
             _autoSaveTimer = new Timer(3000);

Ink Canvas/Helpers/ProcessProtectionManager.cs

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

Ink Canvas/Helpers/SafeZipExtractor.cs

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

Ink Canvas/Helpers/ScreenDetectionHelper.cs

@@ -0,0 +1,156 @@
+using System;
+using System.Drawing;
+using System.Windows;
+using System.Windows.Forms;
+using System.Windows.Interop;
+using Point = System.Windows.Point;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 屏幕检测帮助类 - 用于检测窗口所在的屏幕和屏幕信息
+    /// </summary>
+    public static class ScreenDetectionHelper
+    {
+        /// <summary>
+        /// 获取窗口所在的屏幕
+        /// </summary>
+        /// <param name="window">要检测的窗口</param>
+        /// <returns>窗口所在的屏幕，如果无法检测则返回主屏幕</returns>
+        public static Screen GetWindowScreen(Window window)
+        {
+            try
+            {
+                if (window == null)
+                    return Screen.PrimaryScreen;
+
+                // 获取窗口的句柄
+                var hwndSource = PresentationSource.FromVisual(window) as HwndSource;
+                if (hwndSource == null)
+                    return Screen.PrimaryScreen;
+
+                // 获取窗口在屏幕上的位置
+                var windowRect = GetWindowScreenBounds(window);
+
+                // 查找与窗口重叠最多的屏幕
+                Screen targetScreen = null;
+                double maxIntersection = 0;
+
+                foreach (var screen in Screen.AllScreens)
+                {
+                    var intersection = Rectangle.Intersect(windowRect, screen.Bounds);
+                    if (intersection.Width * intersection.Height > maxIntersection)
+                    {
+                        maxIntersection = intersection.Width * intersection.Height;
+                        targetScreen = screen;
+                    }
+                }
+
+                return targetScreen ?? Screen.PrimaryScreen;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"检测窗口屏幕时出错: {ex.Message}", LogHelper.LogType.Warning);
+                return Screen.PrimaryScreen;
+            }
+        }
+
+        /// <summary>
+        /// 获取窗口在屏幕坐标系中的边界
+        /// </summary>
+        /// <param name="window">要检测的窗口</param>
+        /// <returns>窗口的屏幕边界</returns>
+        private static Rectangle GetWindowScreenBounds(Window window)
+        {
+            try
+            {
+                // 获取窗口左上角在屏幕上的位置
+                var topLeft = window.PointToScreen(new Point(0, 0));
+
+                // 获取窗口右下角在屏幕上的位置
+                var bottomRight = window.PointToScreen(new Point(window.ActualWidth, window.ActualHeight));
+
+                return new Rectangle(
+                    (int)topLeft.X,
+                    (int)topLeft.Y,
+                    (int)(bottomRight.X - topLeft.X),
+                    (int)(bottomRight.Y - topLeft.Y));
+            }
+            catch
+            {
+                // 如果无法获取精确位置，返回窗口的Left和Top
+                return new Rectangle(
+                    (int)window.Left,
+                    (int)window.Top,
+                    (int)window.Width,
+                    (int)window.Height);
+            }
+        }
+
+        /// <summary>
+        /// 检查是否有多个屏幕
+        /// </summary>
+        /// <returns>如果有多个屏幕返回true，否则返回false</returns>
+        public static bool HasMultipleScreens()
+        {
+            try
+            {
+                return Screen.AllScreens.Length > 1;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 获取主屏幕
+        /// </summary>
+        /// <returns>主屏幕</returns>
+        public static Screen GetPrimaryScreen()
+        {
+            try
+            {
+                return Screen.PrimaryScreen;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// 获取所有屏幕信息
+        /// </summary>
+        /// <returns>所有屏幕的数组</returns>
+        public static Screen[] GetAllScreens()
+        {
+            try
+            {
+                return Screen.AllScreens;
+            }
+            catch
+            {
+                return new Screen[] { Screen.PrimaryScreen };
+            }
+        }
+
+        /// <summary>
+        /// 检查窗口是否在主屏幕上
+        /// </summary>
+        /// <param name="window">要检查的窗口</param>
+        /// <returns>如果窗口在主屏幕上返回true，否则返回false</returns>
+        public static bool IsWindowOnPrimaryScreen(Window window)
+        {
+            try
+            {
+                var windowScreen = GetWindowScreen(window);
+                return windowScreen == Screen.PrimaryScreen;
+            }
+            catch
+            {
+                return true; // 出错时假设在主屏幕
+            }
+        }
+    }
+}

Ink Canvas/Helpers/SecurityManager.cs

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

Ink Canvas/Helpers/StartupCount.cs

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

Ink Canvas/Helpers/TelemetryUploader.cs

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

Ink Canvas/Helpers/TimeMachine.cs

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

Ink Canvas/Helpers/UIAccessDllExtractor.cs

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

Ink Canvas/Helpers/UploadHelper.cs

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

Ink Canvas/Helpers/UploadQueueHelper.cs

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

Ink Canvas/Helpers/UriSchemeHelper.cs

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

Ink Canvas/Helpers/WebDavUploadQueue.cs

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

Ink Canvas/Helpers/WebDavUploader.cs

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

Ink Canvas/Helpers/WindowOverviewModel.cs

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

Ink Canvas/Helpers/WindowZOrderManager.cs

@@ -156,7 +156,7 @@ namespace Ink_Canvas.Helpers
                 // 使用更直接的方法：先激活窗口，再置顶
                 window.Activate();
                 window.Focus();
-                
+
                 // 设置窗口为置顶
                 SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0,
                     SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW | SWP_NOOWNERZORDER);

Ink Canvas/Helpers/WindowsNotificationHelper.cs

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

Ink Canvas/InkCanvasForClass.csproj

@@ -1,10 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <RuntimeIdentifiers>win;win-x86;win-x64;win-arm64</RuntimeIdentifiers>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Ink_Canvas</RootNamespace>
     <AssemblyName>InkCanvasForClass</AssemblyName>
     <TargetFramework>net472</TargetFramework>
+    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>false</IsWebBootstrapper>
@@ -24,8 +25,12 @@
     <BootstrapperEnabled>false</BootstrapperEnabled>
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>
-    <Configurations>Release;x86 Debug;Debug</Configurations>
-    <Platforms>AnyCPU;x86</Platforms>
+    <Configurations>Debug;Release;x86 Debug</Configurations>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>embedded</DebugType>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <Prefer32Bit>True</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x86 Debug|AnyCPU'">
     <DebugType>embedded</DebugType>
@@ -144,18 +149,28 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
-    <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.27" />
+    <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="2.0.1" />
+    <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.10.2.1" />
+    <PackageReference Include="iNKORE.UI.WPF" Version="1.2.8" />
     <PackageReference Include="MdXaml" Version="1.27.0" />
     <PackageReference Include="Microsoft.Office.Interop.PowerPoint" Version="15.0.4420.1018" />
     <PackageReference Include="MicrosoftOfficeCore" Version="15.0.0" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
+    <PackageReference Include="Microsoft.International.Converters.PinYinConverter" Version="1.0.0" />
+    <PackageReference Include="Sentry" Version="6.1.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NHotkey.Wpf" Version="3.0.0" />
-    <PackageReference Include="OSVersionExt" Version="3.0.0" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+    <PackageReference Include="NHotkey.Wpf" Version="4.0.0" />
+    <PackageReference Include="OSVersionExt" Version="4.1.0" />
+    <PackageReference Include="AForge.Video" Version="2.2.5" />
+    <PackageReference Include="AForge.Video.DirectShow" Version="2.2.5" />
+    <PackageReference Include="AForge.Imaging" Version="2.2.5" />
+    <PackageReference Include="AForge.Math" Version="2.2.5" />
+    <PackageReference Include="WebDav.Client" Version="2.9.0" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(MSBuildRuntimeType)' == 'Full'">
     <COMReference Include="IWshRuntimeLibrary">
       <Guid>{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}</Guid>
       <VersionMajor>1</VersionMajor>
@@ -184,13 +199,28 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
+  <ItemGroup Condition="'$(MSBuildRuntimeType)' != 'Full'">
+    <Reference Include="Interop.IWshRuntimeLibrary">
+      <HintPath>libs\Interop.IWshRuntimeLibrary.dll</HintPath>
+      <Private>False</Private>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Interop.stdole">
+      <HintPath>libs\Interop.stdole.dll</HintPath>
+      <Private>False</Private>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+  </ItemGroup>
   <ItemGroup>
     <None Include="Resources\TimerDownNotice.wav" />
+    <None Include="Resources\ProgressiveAudio.wav" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\IACore\IACore.dll" />
     <EmbeddedResource Include="Resources\IACore\IALoader.dll" />
     <EmbeddedResource Include="Resources\IACore\IAWinFX.dll" />
+    <EmbeddedResource Include="UIAccessDLL_x64.dll" />
+    <EmbeddedResource Include="UIAccessDLL_x86.dll" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Cursors\Cursor.cur" />
@@ -202,6 +232,7 @@
     <Resource Include="Resources\DeveloperAvatars\RaspberryKan.jpg" />
     <Resource Include="Resources\DeveloperAvatars\wwei.png" />
     <Resource Include="Resources\DeveloperAvatars\yuwenhui2020.png" />
+    <Resource Include="Resources\DeveloperAvatars\CJKmkp.jpg" />
     <Resource Include="Resources\icc.ico" />
     <Resource Include="Resources\Icons-png\AdmoxBooth.png" />
     <Resource Include="Resources\Icons-png\AdmoxWhiteboard.png" />
@@ -216,6 +247,10 @@
     <Resource Include="Resources\Icons-png\icc-transparent-dark.png" />
     <Resource Include="Resources\Icons-png\icc-transparent.png" />
     <Resource Include="Resources\Icons-png\icc.png" />
+    <Resource Include="Resources\Icons-png\icc-dark.png" />
+    <Resource Include="Resources\Icons-png\icc-noshadow.png" />
+    <Resource Include="Resources\Icons-png\icc-sharpdark.png" />
+    <Resource Include="Resources\Icons-png\icc-transparent-light-small.png" />
     <Resource Include="Resources\Icons-png\InkCanvas.png" />
     <Resource Include="Resources\Icons-png\kuanciya.png" />
     <Resource Include="Resources\Icons-png\kuandogeyuanliangwo.png" />
@@ -232,6 +267,10 @@
     <Resource Include="Resources\Icons-png\undo.png" />
     <Resource Include="Resources\Icons-png\minimize.png" />
     <Resource Include="Resources\Icons-png\penUpright.png" />
+    <Resource Include="Resources\new-icons\multi-touch_white.png" />
+    <Resource Include="Resources\new-icons\hand-move_white.png" />
+    <Resource Include="Resources\new-icons\zoom_white.png" />
+    <Resource Include="Resources\new-icons\rotate_white.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Icons-png\twoFingelMove-Blue.png" />
@@ -248,6 +287,8 @@
     <Resource Include="Resources\DeveloperAvatars\kengwang.png" />
     <Resource Include="Resources\DeveloperAvatars\STBBRD.png" />
     <Resource Include="Resources\DeveloperAvatars\WXRIW.png" />
+    <Resource Include="Resources\DeveloperAvatars\PrefacedCorg.jpg" />
+    <Resource Include="Resources\DeveloperAvatars\PANDA-JSR.jpg" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Icons-png\down.png" />
@@ -273,6 +314,17 @@
   <ItemGroup>
     <Resource Include="Resources\Icons-Fluent\ic_fluent_delete_24_regular.png" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="privacy.txt" />
+    <EmbeddedResource Include="telemetry_dsn.txt" Condition="Exists('telemetry_dsn.txt') AND '$(DLASS_SENTRY_DSN)' == ''">
+      <Link>telemetry_dsn.txt</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="$(MSBuildProjectDirectory)\telemetry_dsn.generated.txt" Condition="'$(DLASS_SENTRY_DSN)' != ''">
+      <Link>telemetry_dsn.txt</Link>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </EmbeddedResource>
+  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Icons-Fluent\ic_fluent_cursorWITHdelete_24_regular.png" />
   </ItemGroup>
@@ -280,7 +332,9 @@
     <Resource Include="Resources\Icons-Fluent\ic_fluent_arrow_circle_left_24_regular.png" />
     <Resource Include="Resources\Icons-Fluent\ic_fluent_arrow_circle_right_24_regular.png" />
     <Resource Include="Resources\Icons-Fluent\ic_fluent_weather_moon_24_regular.png" />
+    <Resource Include="Resources\Icons-Fluent\ic_fluent_weather_moon_24_regular_white.png" />
     <Resource Include="Resources\Icons-Fluent\ic_fluent_weather_sunny_24_regular.png" />
+    <Resource Include="Resources\Icons-Fluent\ic_fluent_weather_sunny_24_regular_white.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Icons-Fluent\ic_fluent_signature_24_regular.png" />
@@ -315,6 +369,7 @@
   <ItemGroup>
     <Resource Include="Resources\Icons-Fluent\ic_fluent_arrow_rotate_clockwise_24_regular.png" />
     <Resource Include="Resources\Icons-Fluent\ic_fluent_scale_fit_24_regular.png" />
+    <Resource Include="Resources\Icons-Fluent\ic_fluent_scale_fit_24_regular_white.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Icons-Fluent\ic_fluent_scales_24_regular.png" />
@@ -332,9 +387,6 @@
   <ItemGroup>
     <Resource Include="Resources\Icons-Fluent\ic_fluent_clock_24_regular.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Icons-Fluent\ic_fluent_book_question_mark_24_regular.png" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Icons-Fluent\ic_fluent_keyboard_24_regular.png" />
   </ItemGroup>
@@ -402,6 +454,7 @@
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\new-icons\gesture.png" />
+    <Resource Include="Resources\new-icons\gesture_white.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\new-icons\gesture-enabled.png" />
@@ -449,6 +502,37 @@
   <ItemGroup>
     <Resource Include="Resources\Icons-png\geo-icons\cube.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\arrow_white.png" />
+    <Resource Include="Resources\Icons-png\geo-icons\dashed-line_white.png" />
+    <Resource Include="Resources\Icons-png\geo-icons\dotted-line_white.png" />
+    <Resource Include="Resources\Icons-png\geo-icons\line_white.png" />
+    <Resource Include="Resources\Icons-png\geo-icons\paralle-lines_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\centered-square_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\centered-circle_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\centered-circle-dashed_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\centered-oval_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\square_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\cylinder_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\cone_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\cube_white.png" />
+  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Icons-png\EasiNote.png" />
     <Resource Include="Resources\Icons-png\EasiNote3C.png" />
@@ -485,9 +569,30 @@
     <Resource Include="Resources\new-icons\unfold-chevron.png" />
     <Resource Include="Resources\new-icons\zoom.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-Fluent\ic_fluent_person_money_24_regular-light.png" />
+    <Resource Include="Resources\Icons-Fluent\ic_fluent_people_money_24_regular-light.png" />
+    <Resource Include="Resources\Icons-Fluent\ic_fluent_timer_24_regular-light.png" />
+    <Resource Include="Resources\new-icons\blackboard-light.png" />
+    <Resource Include="Resources\new-icons\end-slides-show-light.png" />
+    <Resource Include="Resources\new-icons\eye-light.png" />
+    <Resource Include="Resources\new-icons\chevron-left-light.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-Fluent\ic_fluent_keyboard_24_regular_white.png" />
+    <Resource Include="Resources\Icons-Fluent\ic_fluent_control_button_24_regular_white.png" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Remove="AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Remove="Properties\Strings.en-US.resx" />
+    <EmbeddedResource Remove="**\Strings.en-US.resx" />
+    <None Include="Properties\Strings.en-US.resx" />
+    <EmbeddedResource Include="Properties\Strings.enUS.xml">
+      <LogicalName>Ink_Canvas.Properties.Strings.enUS.xml</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
   <ItemGroup>
     <None Remove="MainWindow.xaml~RF6c3144.TMP" />
     <None Remove="Resources\Cursors\Cursor.cur" />
@@ -511,6 +616,10 @@
     <None Remove="Resources\Icons-png\icc-transparent-dark.png" />
     <None Remove="Resources\Icons-png\icc-transparent.png" />
     <None Remove="Resources\Icons-png\icc.png" />
+    <None Remove="Resources\Icons-png\icc-dark.png" />
+    <None Remove="Resources\Icons-png\icc-noshadow.png" />
+    <None Remove="Resources\Icons-png\icc-sharpdark.png" />
+    <None Remove="Resources\Icons-png\icc-transparent-light-small.png" />
     <None Remove="Resources\Icons-png\idt.png" />
     <None Remove="Resources\Icons-png\InkCanvas.png" />
     <None Remove="Resources\Icons-png\kuanciya.png" />
@@ -547,14 +656,31 @@
   <ItemGroup>
     <Resource Include="Resources\Icons-png\idt.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Fonts\LXGWWenKaiTC-Regular.ttf" />
+  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Icons-png\HiteAnnotation.png" />
+    <Resource Include="Resources\Icons-png\AiClass.png" />
+    <Resource Include="Resources\Icons-png\天喻教育云.png" />
+    <Resource Include="Resources\Icons-png\畅言智慧课堂.png" />
     <Resource Include="Resources\PresentationExample\bottombar-dark.png" />
     <Resource Include="Resources\PresentationExample\bottombar-white.png" />
     <Resource Include="Resources\PresentationExample\page.jpg" />
     <Resource Include="Resources\PresentationExample\sidebar-dark.png" />
     <Resource Include="Resources\PresentationExample\sidebar-white.png" />
     <Resource Include="Resources\PresentationExample\toolbar.png" />
+    <Resource Include="Resources\Startup-animation\ICC Spring.png" />
+    <Resource Include="Resources\Startup-animation\ICC Summer.png" />
+    <Resource Include="Resources\Startup-animation\ICC Autumn.png" />
+    <Resource Include="Resources\Startup-animation\ICC Winter.png" />
+    <Resource Include="Resources\Startup-animation\ICC Horse.png" />
+    <Resource Include="Resources\Icons-Fluent\ic_fluent_copy_24_regular_white.png" />
+    <Resource Include="Resources\Icons-Fluent\ic_fluent_copy_add_24_regular_white.png" />
+    <Resource Include="Resources\Icons-Fluent\ic_fluent_flip_horizontal_24_regular_white.png" />
+    <Resource Include="Resources\Icons-Fluent\ic_fluent_flip_vertical_24_regular_white.png" />
+    <Resource Include="Resources\Icons-Fluent\ic_fluent_edit_24_regular_white.png" />
+    <Resource Include="Resources\Icons-Fluent\ic_fluent_delete_24_regular_white.png" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Properties\Settings.Designer.cs">
@@ -569,4 +695,11 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
-</Project>
+  <Target Name="GenerateTelemetryDsn" BeforeTargets="PrepareResources" Condition="'$(DLASS_SENTRY_DSN)' != ''">
+    <WriteLinesToFile File="$(MSBuildProjectDirectory)\telemetry_dsn.generated.txt" Lines="$(DLASS_SENTRY_DSN)" Overwrite="true" />
+  </Target>
+
+  <Target Name="CleanTelemetryDsn" AfterTargets="Build;Clean" Condition="Exists('$(MSBuildProjectDirectory)\telemetry_dsn.generated.txt')">
+    <Delete Files="$(MSBuildProjectDirectory)\telemetry_dsn.generated.txt" />
+  </Target>
+</Project>

Ink Canvas/InkCanvasForClass.csproj.user

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <_LastSelectedProfileId>D:\vs\ica\Ink Canvas\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
-  </PropertyGroup>
-</Project>

Ink Canvas/MainWindow_cs/ConfigHelper.cs

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

Ink Canvas/MainWindow_cs/MW_AutoFold.cs

@@ -1,4 +1,4 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using iNKORE.UI.WPF.Modern;
 using System;
 using System.Threading;
@@ -13,9 +13,31 @@ namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
+        /// <summary>
+        /// 浮动栏是否折叠的标志。
+        /// </summary>
         public bool isFloatingBarFolded;
+
+        /// <summary>
+        /// 浮动栏正在改变隐藏模式的标志，用于防止重复操作。
+        /// </summary>
         private bool isFloatingBarChangingHideMode;
 
+        /// <summary>
+        /// 立即关闭白板模式，恢复到批注模式。
+        /// </summary>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 检查是否正在显示或隐藏黑板，如果是则直接返回
+        /// 2. 设置显示/隐藏黑板的标志为true
+        /// 3. 立即隐藏所有子面板
+        /// 4. 如果启用了自动切换多指手势，则关闭多指平移
+        /// 5. 隐藏所有水印
+        /// 6. 切换到批注模式
+        /// 7. 设置退出按钮前景色为白色
+        /// 8. 设置应用主题为深色
+        /// 9. 200毫秒后重置显示/隐藏黑板的标志为false
+        /// </remarks>
         private void CloseWhiteboardImmediately()
         {
             if (isDisplayingOrHidingBlackboard) return;
@@ -38,11 +60,35 @@ namespace Ink_Canvas
             }).Start();
         }
 
+        /// <summary>
+        /// 处理折叠浮动栏的鼠标点击事件。
+        /// </summary>
+        /// <param name="sender">事件发送者。</param>
+        /// <param name="e">鼠标按钮事件参数。</param>
         public async void FoldFloatingBar_MouseUp(object sender, MouseButtonEventArgs e)
         {
             await FoldFloatingBar(sender);
         }
 
+        /// <summary>
+        /// 折叠浮动栏，将其收纳到侧边栏。
+        /// </summary>
+        /// <param name="sender">事件发送者。</param>
+        /// <param name="isAutoFoldCommand">是否为自动折叠命令。</param>
+        /// <returns>表示异步操作的任务。</returns>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 检查是否应该拒绝操作（如点击了折叠图标但上次鼠标按下的对象不是折叠图标）
+        /// 2. 设置折叠/展开标志
+        /// 3. 检查浮动栏是否已经折叠或正在改变隐藏模式，如果是则直接返回
+        /// 4. 处理墨迹重放相关的UI元素
+        /// 5. 设置浮动栏状态标志，关闭白板模式（如果当前在白板模式）
+        /// 6. 如果是用户手动折叠且画布上有较多墨迹，显示通知
+        /// 7. 清空画布墨迹
+        /// 8. 隐藏PPT导航面板和浮动栏拖动网格
+        /// 9. 执行浮动栏和侧边栏的动画
+        /// 10. 如果开启了彻底隐藏，则隐藏主窗口
+        /// </remarks>
         public async Task FoldFloatingBar(object sender, bool isAutoFoldCommand = false)
         {
             var isShouldRejectAction = false;
@@ -54,7 +100,10 @@ namespace Ink_Canvas
                 if (sender == Fold_Icon && lastBorderMouseDownObject != Fold_Icon) isShouldRejectAction = true;
             });
 
-            if (isShouldRejectAction) return;
+            if (isShouldRejectAction)
+            {
+                return;
+            }
 
             // FloatingBarIcons_MouseUp_New(sender);
             if (sender == null)
@@ -63,7 +112,12 @@ namespace Ink_Canvas
                 foldFloatingBarByUser = true;
             unfoldFloatingBarByUser = false;
 
-            if (isFloatingBarChangingHideMode) return;
+            if (isFloatingBarFolded) return;
+
+            if (isFloatingBarChangingHideMode)
+            {
+                return;
+            }
 
             await Dispatcher.InvokeAsync(() =>
             {
@@ -103,9 +157,28 @@ namespace Ink_Canvas
                 HideSubPanels("cursor");
                 SidePannelMarginAnimation(-10);
             });
-            isFloatingBarChangingHideMode = false;
+
+            // 新增：如果开启了彻底隐藏，则隐藏主窗口
+            if (Settings.Automation.ThoroughlyHideWhenFolded)
+            {
+                await Dispatcher.InvokeAsync(() =>
+                {
+                    this.Visibility = Visibility.Hidden;
+                });
+            }
         }
 
+        /// <summary>
+        /// 处理左侧展开按钮显示快捷面板的鼠标点击事件。
+        /// </summary>
+        /// <param name="sender">事件发送者。</param>
+        /// <param name="e">鼠标按钮事件参数。</param>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 检查是否显示快捷面板
+        /// 2. 如果显示快捷面板，则隐藏右侧快捷面板，显示左侧快捷面板并执行动画
+        /// 3. 否则，调用展开浮动栏的方法
+        /// </remarks>
         private async void LeftUnFoldButtonDisplayQuickPanel_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (Settings.Appearance.IsShowQuickPanel)
@@ -136,6 +209,17 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理右侧展开按钮显示快捷面板的鼠标点击事件。
+        /// </summary>
+        /// <param name="sender">事件发送者。</param>
+        /// <param name="e">鼠标按钮事件参数。</param>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 检查是否显示快捷面板
+        /// 2. 如果显示快捷面板，则隐藏左侧快捷面板，显示右侧快捷面板并执行动画
+        /// 3. 否则，调用展开浮动栏的方法
+        /// </remarks>
         private async void RightUnFoldButtonDisplayQuickPanel_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (Settings.Appearance.IsShowQuickPanel)
@@ -166,6 +250,15 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 隐藏左侧快捷面板。
+        /// </summary>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 检查左侧快捷面板是否可见，如果不可见则直接返回
+        /// 2. 执行左侧快捷面板的隐藏动画
+        /// 3. 等待动画完成后，设置左侧快捷面板的边距并将其折叠
+        /// </remarks>
         private async void HideLeftQuickPanel()
         {
             if (LeftUnFoldButtonQuickPanel.Visibility == Visibility.Visible)
@@ -191,6 +284,15 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 隐藏右侧快捷面板。
+        /// </summary>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 检查右侧快捷面板是否可见，如果不可见则直接返回
+        /// 2. 执行右侧快捷面板的隐藏动画
+        /// 3. 等待动画完成后，设置右侧快捷面板的边距并将其折叠
+        /// </remarks>
         private async void HideRightQuickPanel()
         {
             if (RightUnFoldButtonQuickPanel.Visibility == Visibility.Visible)
@@ -216,19 +318,61 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理隐藏快捷面板的鼠标点击事件。
+        /// </summary>
+        /// <param name="sender">事件发送者。</param>
+        /// <param name="e">鼠标按钮事件参数。</param>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 隐藏左侧快捷面板
+        /// 2. 隐藏右侧快捷面板
+        /// </remarks>
         private void HideQuickPanel_MouseUp(object sender, MouseButtonEventArgs e)
         {
             HideLeftQuickPanel();
             HideRightQuickPanel();
         }
 
+        /// <summary>
+        /// 处理展开浮动栏的鼠标点击事件。
+        /// </summary>
+        /// <param name="sender">事件发送者。</param>
+        /// <param name="e">鼠标按钮事件参数。</param>
         public async void UnFoldFloatingBar_MouseUp(object sender, MouseButtonEventArgs e)
         {
             await UnFoldFloatingBar(sender);
         }
 
+        /// <summary>
+        /// 展开浮动栏，将其从侧边栏恢复到正常状态。
+        /// </summary>
+        /// <param name="sender">事件发送者。</param>
+        /// <returns>表示异步操作的任务。</returns>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 如果之前彻底隐藏了主窗口，先恢复显示
+        /// 2. 隐藏左右侧快捷面板
+        /// 3. 设置展开/折叠标志
+        /// 4. 检查浮动栏是否正在改变隐藏模式，如果是则直接返回
+        /// 5. 设置浮动栏状态标志，标记为未折叠
+        /// 6. 根据设置决定是否自动切换至批注模式
+        /// 7. 根据PPT放映模式和设置显示或隐藏翻页按钮
+        /// 8. 在屏幕模式下显示浮动栏并执行动画
+        /// 9. 执行侧边栏动画
+        /// 10. 等待UI完全更新后，重新设置当前选中模式的按钮高亮状态
+        /// </remarks>
         public async Task UnFoldFloatingBar(object sender)
         {
+            // 新增：如果之前彻底隐藏了，先恢复显示
+            if (this.Visibility != Visibility.Visible)
+            {
+                await Dispatcher.InvokeAsync(() =>
+                {
+                    this.Visibility = Visibility.Visible;
+                });
+            }
+
             await Dispatcher.InvokeAsync(() =>
             {
                 LeftUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
@@ -240,7 +384,11 @@ namespace Ink_Canvas
                 unfoldFloatingBarByUser = true;
             foldFloatingBarByUser = false;
 
-            if (isFloatingBarChangingHideMode) return;
+            if (isFloatingBarChangingHideMode)
+            {
+                return;
+            }
+
 
             await Dispatcher.InvokeAsync(() =>
             {
@@ -260,7 +408,7 @@ namespace Ink_Canvas
                 }
 
                 // 只有在PPT放映模式下且页数有效时才显示翻页按钮
-                if (StackPanelPPTControls.Visibility == Visibility.Visible && 
+                if (StackPanelPPTControls.Visibility == Visibility.Visible &&
                     BtnPPTSlideShowEnd.Visibility == Visibility.Visible &&
                     PPTManager?.IsInSlideShow == true &&
                     PPTManager?.SlidesCount > 0)
@@ -271,7 +419,6 @@ namespace Ink_Canvas
                     if (dopsc[1] == '2' && !isDisplayingOrHidingBlackboard) AnimationsHelper.ShowWithFadeIn(RightBottomPanelForPPTNavigation);
                     if (dopsc[2] == '2' && !isDisplayingOrHidingBlackboard) AnimationsHelper.ShowWithFadeIn(LeftSidePanelForPPTNavigation);
                     if (dopsc[3] == '2' && !isDisplayingOrHidingBlackboard) AnimationsHelper.ShowWithFadeIn(RightSidePanelForPPTNavigation);
-                    LogHelper.WriteLogToFile($"从收纳模式恢复时显示PPT翻页按钮 - 放映状态: {PPTManager?.IsInSlideShow}, 页数: {PPTManager?.SlidesCount}", LogHelper.LogType.Trace);
                 }
                 else
                 {
@@ -280,25 +427,24 @@ namespace Ink_Canvas
                     RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
                     LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                     RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                    LogHelper.WriteLogToFile($"从收纳模式恢复时隐藏PPT翻页按钮 - 放映状态: {PPTManager?.IsInSlideShow}, 页数: {PPTManager?.SlidesCount}", LogHelper.LogType.Trace);
                 }
 
-                // 新增：只在屏幕模式下显示浮动栏
+                // 新只在屏幕模式下显示浮动栏
                 if (currentMode == 0)
                 {
                     // 强制更新布局以确保ActualWidth正确
                     ViewboxFloatingBar.UpdateLayout();
-                    
+
                     // 等待一小段时间让布局完全更新
                     Task.Delay(50);
-                    
+
                     // 再次强制更新布局
                     ViewboxFloatingBar.UpdateLayout();
-                    
+
                     // 强制重新测量和排列
                     ViewboxFloatingBar.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
                     ViewboxFloatingBar.Arrange(new Rect(ViewboxFloatingBar.DesiredSize));
-                    
+
                     if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
                         ViewboxFloatingBarMarginAnimation(60);
                     else
@@ -307,14 +453,13 @@ namespace Ink_Canvas
                 SidePannelMarginAnimation(-50, !unfoldFloatingBarByUser);
             });
 
-            // 修复：在浮动栏展开后，重新设置按钮高亮状态
             await Dispatcher.InvokeAsync(async () =>
             {
                 try
                 {
                     // 等待UI完全更新
                     await Task.Delay(100);
-                    
+
                     // 获取当前选中的模式并重新设置高光位置
                     string selectedToolMode = GetCurrentSelectedMode();
                     if (!string.IsNullOrEmpty(selectedToolMode))
@@ -328,9 +473,23 @@ namespace Ink_Canvas
                 }
             });
 
-            isFloatingBarChangingHideMode = false;
         }
 
+        /// <summary>
+        /// 执行侧边栏边距动画，用于折叠或展开侧边栏。
+        /// </summary>
+        /// <param name="MarginFromEdge">侧边栏距边缘的边距值。可能的值：-50（完全折叠）, -10（半展开）</param>
+        /// <param name="isNoAnimation">是否禁用动画效果。</param>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 如果边距值为-10（半展开），则显示左侧边栏
+        /// 2. 创建并执行左侧边栏的边距动画
+        /// 3. 创建并执行右侧边栏的边距动画
+        /// 4. 等待600毫秒让动画完成
+        /// 5. 直接设置侧边栏的最终边距值
+        /// 6. 如果边距值为-50（完全折叠），则隐藏左侧边栏
+        /// 7. 重置浮动栏正在改变隐藏模式的标志为false
+        /// </remarks>
         private async void SidePannelMarginAnimation(int MarginFromEdge, bool isNoAnimation = false) // Possible value: -50, -10
         {
             await Dispatcher.InvokeAsync(() =>
@@ -367,4 +526,4 @@ namespace Ink_Canvas
             isFloatingBarChangingHideMode = false;
         }
     }
-}
+}

Ink Canvas/MainWindow_cs/MW_AutoStart.cs

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

Ink Canvas/MainWindow_cs/MW_AutoTheme.cs

@@ -1,63 +1,353 @@
-using iNKORE.UI.WPF.Modern;
+using iNKORE.UI.WPF.Modern;
 using Microsoft.Win32;
 using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Media;
+using System.Windows.Threading;
 using Application = System.Windows.Application;
+using ui = iNKORE.UI.WPF.Controls;
 
 namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
-        private Color FloatBarForegroundColor = Color.FromRgb(102, 102, 102);
+        /// <summary>
+        /// 浮动栏前景色，根据当前主题动态更新。
+        /// </summary>
+        private Color FloatBarForegroundColor;
 
-        private void SetTheme(string theme)
+        /// <summary>
+        /// 应用并切换到指定的主题（"Light" 或 "Dark"），更新主题资源并刷新相关 UI 元素以反映主题变化。
+        /// </summary>
+        /// <param name="theme">主题标识，支持 "Light" 或 "Dark"（区分大小写）。</param>
+        /// <param name="autoSwitchIcon">若为 true，则根据主题自动切换并保存浮动工具栏的图标设置。</param>
+        private void SetTheme(string theme, bool autoSwitchIcon = false)
         {
+            // 清理现有的主题资源
+            var resourcesToRemove = new List<ResourceDictionary>();
+            foreach (var dict in Application.Current.Resources.MergedDictionaries)
+            {
+                if (dict.Source != null &&
+                    (dict.Source.ToString().Contains("Light.xaml") ||
+                     dict.Source.ToString().Contains("Dark.xaml")))
+                {
+                    resourcesToRemove.Add(dict);
+                }
+            }
+
+            foreach (var dict in resourcesToRemove)
+            {
+                Application.Current.Resources.MergedDictionaries.Remove(dict);
+            }
+
             if (theme == "Light")
             {
+                // 先加载主题
                 var rd1 = new ResourceDictionary
-                { Source = new Uri("Resources/Styles/Light.xaml", UriKind.Relative) };
+                {
+                    Source = new Uri("Resources/Styles/Light.xaml", UriKind.Relative)
+                };
                 Application.Current.Resources.MergedDictionaries.Add(rd1);
 
-                var rd2 = new ResourceDictionary
-                { Source = new Uri("Resources/DrawShapeImageDictionary.xaml", UriKind.Relative) };
-                Application.Current.Resources.MergedDictionaries.Add(rd2);
+                // 异步加载图形资源，避免阻塞启动
+                _ = Task.Run(async () =>
+                {
+                    await Task.Delay(100);
+                    Dispatcher.Invoke(() =>
+                    {
+                        var rd2 = new ResourceDictionary
+                        {
+                            Source = new Uri("Resources/DrawShapeImageDictionary.xaml", UriKind.Relative)
+                        };
+                        Application.Current.Resources.MergedDictionaries.Add(rd2);
 
-                var rd3 = new ResourceDictionary
-                { Source = new Uri("Resources/SeewoImageDictionary.xaml", UriKind.Relative) };
-                Application.Current.Resources.MergedDictionaries.Add(rd3);
+                        var rd3 = new ResourceDictionary
+                        {
+                            Source = new Uri("Resources/SeewoImageDictionary.xaml", UriKind.Relative)
+                        };
+                        Application.Current.Resources.MergedDictionaries.Add(rd3);
 
-                var rd4 = new ResourceDictionary
-                { Source = new Uri("Resources/IconImageDictionary.xaml", UriKind.Relative) };
-                Application.Current.Resources.MergedDictionaries.Add(rd4);
+                        var rd4 = new ResourceDictionary
+                        {
+                            Source = new Uri("Resources/IconImageDictionary.xaml", UriKind.Relative)
+                        };
+                        Application.Current.Resources.MergedDictionaries.Add(rd4);
+                    });
+                });
 
                 ThemeManager.SetRequestedTheme(window, ElementTheme.Light);
 
-                FloatBarForegroundColor = (Color)Application.Current.FindResource("FloatBarForegroundColor");
+                InitializeFloatBarForegroundColor();
+
+                // 刷新快速面板图标
+                RefreshQuickPanelIcons();
+
+                // 刷新墨迹选中栏图标
+                RefreshStrokeSelectionIcons();
+
+                // 刷新图片选中栏图标
+                RefreshImageSelectionIcons();
+
+                // 刷新手势按钮图标
+                RefreshGestureButtonIcon();
+
+                RefreshFloatingBarHighlightColors();
+
+                if (autoSwitchIcon)
+                {
+                    AutoSwitchFloatingBarIconForTheme("Light");
+                }
+
+                // 强制刷新UI
+                window.InvalidateVisual();
+
+                // 通知其他窗口刷新主题
+                RefreshOtherWindowsTheme();
             }
             else if (theme == "Dark")
             {
+                // 先加载主题
                 var rd1 = new ResourceDictionary { Source = new Uri("Resources/Styles/Dark.xaml", UriKind.Relative) };
                 Application.Current.Resources.MergedDictionaries.Add(rd1);
 
-                var rd2 = new ResourceDictionary
-                { Source = new Uri("Resources/DrawShapeImageDictionary.xaml", UriKind.Relative) };
-                Application.Current.Resources.MergedDictionaries.Add(rd2);
+                // 异步加载图形资源，避免阻塞启动
+                _ = Task.Run(async () =>
+                {
+                    await Task.Delay(100);
+                    Dispatcher.Invoke(() =>
+                    {
+                        var rd2 = new ResourceDictionary
+                        {
+                            Source = new Uri("Resources/DrawShapeImageDictionary.xaml", UriKind.Relative)
+                        };
+                        Application.Current.Resources.MergedDictionaries.Add(rd2);
 
-                var rd3 = new ResourceDictionary
-                { Source = new Uri("Resources/SeewoImageDictionary.xaml", UriKind.Relative) };
-                Application.Current.Resources.MergedDictionaries.Add(rd3);
+                        var rd3 = new ResourceDictionary
+                        {
+                            Source = new Uri("Resources/SeewoImageDictionary.xaml", UriKind.Relative)
+                        };
+                        Application.Current.Resources.MergedDictionaries.Add(rd3);
 
-                var rd4 = new ResourceDictionary
-                { Source = new Uri("Resources/IconImageDictionary.xaml", UriKind.Relative) };
-                Application.Current.Resources.MergedDictionaries.Add(rd4);
+                        var rd4 = new ResourceDictionary
+                        {
+                            Source = new Uri("Resources/IconImageDictionary.xaml", UriKind.Relative)
+                        };
+                        Application.Current.Resources.MergedDictionaries.Add(rd4);
+                    });
+                });
 
                 ThemeManager.SetRequestedTheme(window, ElementTheme.Dark);
 
-                FloatBarForegroundColor = (Color)Application.Current.FindResource("FloatBarForegroundColor");
+                InitializeFloatBarForegroundColor();
+
+                // 刷新快速面板图标
+                RefreshQuickPanelIcons();
+
+                // 刷新墨迹选中栏图标
+                RefreshStrokeSelectionIcons();
+
+                // 刷新图片选中栏图标
+                RefreshImageSelectionIcons();
+
+                // 刷新手势按钮图标
+                RefreshGestureButtonIcon();
+
+                RefreshFloatingBarHighlightColors();
+
+                if (autoSwitchIcon)
+                {
+                    AutoSwitchFloatingBarIconForTheme("Dark");
+                }
+
+                // 强制刷新UI
+                window.InvalidateVisual();
+
+                // 通知其他窗口刷新主题
+                RefreshOtherWindowsTheme();
             }
         }
 
+        /// <summary>
+        /// 初始化FloatBarForegroundColor，从当前主题资源中加载颜色
+        /// </summary>
+        private void InitializeFloatBarForegroundColor()
+        {
+            try
+            {
+                FloatBarForegroundColor = (Color)Application.Current.FindResource("FloatBarForegroundColor");
+
+                // 强制刷新浮动工具栏按钮颜色
+                RefreshFloatingBarButtonColors();
+            }
+            catch (Exception)
+            {
+                // 如果无法从资源中加载，使用默认颜色
+                FloatBarForegroundColor = Color.FromRgb(0, 0, 0);
+            }
+        }
+
+        /// <summary>
+        /// 刷新快速面板图标
+        /// </summary>
+        private void RefreshQuickPanelIcons()
+        {
+            try
+            {
+                if (LeftUnFoldButtonQuickPanel != null)
+                {
+                    LeftUnFoldButtonQuickPanel.InvalidateVisual();
+                }
+                if (RightUnFoldButtonQuickPanel != null)
+                {
+                    RightUnFoldButtonQuickPanel.InvalidateVisual();
+                }
+                if (LeftSidePanel != null)
+                {
+                    LeftSidePanel.InvalidateVisual();
+                }
+                if (RightSidePanel != null)
+                {
+                    RightSidePanel.InvalidateVisual();
+                }
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        /// <summary>
+        /// 刷新浮动栏高光条颜色
+        /// </summary>
+        private void RefreshFloatingBarHighlightColors()
+        {
+            try
+            {
+                if (FloatingbarSelectionBG != null && FloatingbarSelectionBG.Visibility == Visibility.Visible)
+                {
+                    // 根据主题设置高光颜色
+                    Color highlightBackgroundColor;
+                    Color highlightBarColor;
+                    bool isDarkTheme = Settings.Appearance.Theme == 1 ||
+                                       (Settings.Appearance.Theme == 2 && !IsSystemThemeLight());
+
+                    if (isDarkTheme)
+                    {
+                        highlightBackgroundColor = Color.FromArgb(21, 102, 204, 255);
+                        highlightBarColor = Color.FromRgb(102, 204, 255);
+                    }
+                    else
+                    {
+                        highlightBackgroundColor = Color.FromArgb(21, 59, 130, 246);
+                        highlightBarColor = Color.FromRgb(37, 99, 235);
+                    }
+
+                    // 设置高光背景颜色
+                    FloatingbarSelectionBG.Background = new SolidColorBrush(highlightBackgroundColor);
+                    if (FloatingbarSelectionBG.Child is System.Windows.Controls.Canvas canvas && canvas.Children.Count > 0)
+                    {
+                        var firstChild = canvas.Children[0];
+                        if (firstChild is Border innerBorder)
+                        {
+                            innerBorder.Background = new SolidColorBrush(highlightBarColor);
+                        }
+                    }
+                }
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        /// <summary>
+        /// 刷新浮动工具栏按钮颜色
+        /// </summary>
+        private void RefreshFloatingBarButtonColors()
+        {
+            try
+            {
+                // 根据主题选择高光颜色
+                Color selectedColor;
+                bool isDarkTheme = Settings.Appearance.Theme == 1 ||
+                                   (Settings.Appearance.Theme == 2 && !IsSystemThemeLight());
+
+                if (isDarkTheme)
+                {
+                    selectedColor = Color.FromRgb(102, 204, 255);
+                }
+                else
+                {
+                    selectedColor = Color.FromRgb(30, 58, 138);
+                }
+
+                // 根据当前模式设置按钮颜色
+                switch (_currentToolMode)
+                {
+                    case "cursor":
+                        CursorIconGeometry.Brush = new SolidColorBrush(selectedColor);
+                        PenIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        StrokeEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        CircleEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        LassoSelectIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        break;
+                    case "pen":
+                    case "color":
+                        CursorIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        PenIconGeometry.Brush = new SolidColorBrush(selectedColor);
+                        StrokeEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        CircleEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        LassoSelectIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        break;
+                    case "eraser":
+                        CursorIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        PenIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        StrokeEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        CircleEraserIconGeometry.Brush = new SolidColorBrush(selectedColor);
+                        LassoSelectIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        break;
+                    case "eraserByStrokes":
+                        CursorIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        PenIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        StrokeEraserIconGeometry.Brush = new SolidColorBrush(selectedColor);
+                        CircleEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        LassoSelectIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        break;
+                    case "select":
+                        CursorIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        PenIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        StrokeEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        CircleEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        LassoSelectIconGeometry.Brush = new SolidColorBrush(selectedColor);
+                        break;
+                    default:
+                        // 默认情况，所有按钮都使用主题颜色
+                        CursorIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        PenIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        StrokeEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        CircleEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        LassoSelectIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        break;
+                }
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        /// <summary>
+        /// 处理系统主题偏好变化事件，根据当前设置更新应用主题。
+        /// </summary>
+        /// <param name="sender">事件发送者。</param>
+        /// <param name="e">用户偏好变化事件参数。</param>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 根据当前主题设置（Settings.Appearance.Theme）决定使用哪种主题
+        /// 2. 如果设置为0（浅色主题），则设置为Light主题
+        /// 3. 如果设置为1（深色主题），则设置为Dark主题
+        /// 4. 如果设置为2（跟随系统主题），则根据系统主题设置应用相应的主题
+        /// </remarks>
         private void SystemEvents_UserPreferenceChanged(object sender, UserPreferenceChangedEventArgs e)
         {
             switch (Settings.Appearance.Theme)
@@ -75,6 +365,17 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 检查系统主题是否为浅色主题。
+        /// </summary>
+        /// <returns>系统主题为浅色返回true，深色返回false。</returns>
+        /// <remarks>
+        /// 操作包括：
+        /// 1. 从注册表中读取系统主题设置
+        /// 2. 检查"SystemUsesLightTheme"键的值
+        /// 3. 如果值为1，则表示系统使用浅色主题
+        /// 4. 捕获可能的异常，确保方法不会因异常而崩溃
+        /// </remarks>
         private bool IsSystemThemeLight()
         {
             var light = false;
@@ -87,9 +388,232 @@ namespace Ink_Canvas
                 if (themeKey != null) keyValue = (int)themeKey.GetValue("SystemUsesLightTheme");
                 if (keyValue == 1) light = true;
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
 
             return light;
         }
+
+        /// <summary>
+        /// 根据主题自动切换浮动栏图标
+        /// </summary>
+        private void AutoSwitchFloatingBarIconForTheme(string theme)
+        {
+            try
+            {
+                if (theme == "Light")
+                {
+                    Settings.Appearance.FloatingBarImg = 0;
+                }
+                else if (theme == "Dark")
+                {
+                    Settings.Appearance.FloatingBarImg = 3;
+                }
+
+                UpdateFloatingBarIcon();
+                UpdateFloatingBarIconComboBox();
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        /// <summary>
+        /// 更新设置界面中的浮动栏图标选择下拉框显示
+        /// </summary>
+        private void UpdateFloatingBarIconComboBox()
+        {
+            try
+            {
+                if (ComboBoxFloatingBarImg != null)
+                {
+                    ComboBoxFloatingBarImg.SelectedIndex = Settings.Appearance.FloatingBarImg;
+                }
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        /// <summary>
+        /// 刷新墨迹选中栏图标
+        /// </summary>
+        private void RefreshStrokeSelectionIcons()
+        {
+            try
+            {
+                if (BorderStrokeSelectionControl != null)
+                {
+                    // 强制刷新墨迹选中栏的视觉状态
+                    BorderStrokeSelectionControl.InvalidateVisual();
+
+                    // 刷新墨迹选中栏内的所有图标
+                    var viewbox = BorderStrokeSelectionControl.Child as Viewbox;
+                    if (viewbox?.Child is ui.SimpleStackPanel stackPanel)
+                    {
+                        RefreshStrokeSelectionIconsRecursive(stackPanel);
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                // 忽略异常，确保主题切换不会因为图标刷新失败而中断
+            }
+        }
+
+        /// <summary>
+        /// 递归刷新墨迹选中栏内的图标
+        /// </summary>
+        private void RefreshStrokeSelectionIconsRecursive(System.Windows.Controls.Panel panel)
+        {
+            try
+            {
+                foreach (var child in panel.Children)
+                {
+                    if (child is Image image)
+                    {
+                        // 强制刷新图像
+                        image.InvalidateVisual();
+                    }
+                    else if (child is System.Windows.Controls.Panel childPanel)
+                    {
+                        // 递归处理子面板
+                        RefreshStrokeSelectionIconsRecursive(childPanel);
+                    }
+                    else if (child is Border border && border.Child is System.Windows.Controls.Panel borderPanel)
+                    {
+                        // 处理Border内的面板
+                        RefreshStrokeSelectionIconsRecursive(borderPanel);
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                // 忽略异常
+            }
+        }
+
+        /// <summary>
+        /// 刷新图片选中栏图标
+        /// </summary>
+        private void RefreshImageSelectionIcons()
+        {
+            try
+            {
+                if (BorderImageSelectionControl != null)
+                {
+                    // 强制刷新图片选中栏的视觉状态
+                    BorderImageSelectionControl.InvalidateVisual();
+
+                    // 刷新图片选中栏内的所有图标
+                    var viewbox = BorderImageSelectionControl.Child as Viewbox;
+                    if (viewbox?.Child is ui.SimpleStackPanel stackPanel)
+                    {
+                        RefreshImageSelectionIconsRecursive(stackPanel);
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                // 忽略异常，确保主题切换不会因为图标刷新失败而中断
+            }
+        }
+
+        /// <summary>
+        /// 递归刷新图片选中栏内的图标
+        /// </summary>
+        private void RefreshImageSelectionIconsRecursive(System.Windows.Controls.Panel panel)
+        {
+            try
+            {
+                foreach (var child in panel.Children)
+                {
+                    if (child is Image image)
+                    {
+                        // 强制刷新图像
+                        image.InvalidateVisual();
+                    }
+                    else if (child is System.Windows.Controls.Panel childPanel)
+                    {
+                        // 递归处理子面板
+                        RefreshImageSelectionIconsRecursive(childPanel);
+                    }
+                    else if (child is Border border && border.Child is System.Windows.Controls.Panel borderPanel)
+                    {
+                        // 处理Border内的面板
+                        RefreshImageSelectionIconsRecursive(borderPanel);
+                    }
+                    else if (child is Grid grid)
+                    {
+                        // 处理Grid内的子元素
+                        foreach (var gridChild in grid.Children)
+                        {
+                            if (gridChild is Image gridImage)
+                            {
+                                gridImage.InvalidateVisual();
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                // 忽略异常
+            }
+        }
+
+        /// <summary>
+        /// 刷新手势按钮图标
+        /// </summary>
+        private void RefreshGestureButtonIcon()
+        {
+            try
+            {
+                // 调用手势按钮颜色和图标更新方法，该方法会根据当前主题和手势状态设置正确的图标
+                CheckEnableTwoFingerGestureBtnColorPrompt();
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        /// <summary>
+        /// 刷新其他窗口的主题
+        /// </summary>
+        private void RefreshOtherWindowsTheme()
+        {
+            try
+            {
+                // 刷新所有打开的窗口
+                foreach (Window window in Application.Current.Windows)
+                {
+                    if (window is CountdownTimerWindow timerWindow)
+                    {
+                        timerWindow.RefreshTheme();
+                    }
+                    else if (window is RandWindow randWindow)
+                    {
+                        randWindow.RefreshTheme();
+                    }
+                    else if (window is OperatingGuideWindow operatingGuideWindow)
+                    {
+                        operatingGuideWindow.RefreshTheme();
+                    }
+                }
+
+                // 刷新计时器控件
+                if (TimerControl != null)
+                {
+                    TimerControl.RefreshTheme();
+                }
+
+                if (MinimizedTimerControl != null)
+                {
+                    MinimizedTimerControl.RefreshTheme();
+                }
+            }
+            catch (Exception)
+            {
+            }
+        }
     }
 }

Ink Canvas/MainWindow_cs/MW_BoardControls.cs

@@ -1,26 +1,62 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Ink;
 using System.Windows.Media;
+using System.Windows.Threading;
 
 namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
+        /// <summary>
+        /// 存储每个白板页面的墨迹集合
+        /// </summary>
         private StrokeCollection[] strokeCollections = new StrokeCollection[101];
+
+        /// <summary>
+        /// 存储每个白板页面的最后操作模式是否为重做
+        /// </summary>
         private bool[] whiteboadLastModeIsRedo = new bool[101];
+
+        /// <summary>
+        /// 存储最后一次触摸按下时的墨迹集合
+        /// </summary>
         private StrokeCollection lastTouchDownStrokeCollection = new StrokeCollection();
 
+        /// <summary>
+        /// 当前白板页面索引
+        /// </summary>
         private int CurrentWhiteboardIndex = 1;
-        private int WhiteboardTotalCount = 1;
-        private TimeMachineHistory[][] TimeMachineHistories = new TimeMachineHistory[101][]; //最多99页，0用来存储非白板时的墨迹以便还原
 
-        // 保存每页白板图片信息
+        /// <summary>
+        /// 白板页面总数
+        /// </summary>
+        private int WhiteboardTotalCount = 1;
+
+        /// <summary>
+        /// 存储每个白板页面的时间机器历史记录
+        /// </summary>
+        private TimeMachineHistory[][] TimeMachineHistories = new TimeMachineHistory[101][];
+
+        /// <summary>
+        /// 存储每个白板页面的多指书写模式状态
+        /// </summary>
+        private bool[] savedMultiTouchModeStates = new bool[101];
+
+        /// <summary>
+        /// 将当前画布上的所有未保存的图片/媒体和墨迹提交到时间机器历史并将导出结果保存为指定页的快照。
+        /// </summary>
+        /// <param name="isBackupMain">为 true 时将导出结果保存到主备份槽（索引 0）；为 false 时保存到当前白板索引。</param>
+        /// <remarks>
+        /// - 会提交画布上缺失于历史记录的 Image/MediaElement（但跳过 Tag 等于 VideoPresenterLiveFrameTag 的 Image）和缺失的墨迹；  
+        /// - 导出后把结果存入 TimeMachineHistories 的相应索引，并保存当前多指书写模式到 savedMultiTouchModeStates；  
+        /// - 导出后会清除时间机器的临时墨迹历史以释放内存。  
+        /// - 此方法有副作用：修改 TimeMachineHistories、savedMultiTouchModeStates，并通过 timeMachine 的提交方法改变其内部历史状态。
+        /// </remarks>
         private void SaveStrokes(bool isBackupMain = false)
         {
             // 确保画布上的所有UI元素都被保存到时间机器历史记录中
@@ -47,6 +83,10 @@ namespace Ink_Canvas
             {
                 if (child is Image || child is MediaElement)
                 {
+                    if (child is Image img && img.Tag is string tag && tag == VideoPresenterLiveFrameTag)
+                    {
+                        continue;
+                    }
                     if (!elementsInHistory.Contains(child))
                     {
                         timeMachine.CommitElementInsertHistory(child);
@@ -97,6 +137,8 @@ namespace Ink_Canvas
             {
                 var timeMachineHistory = timeMachine.ExportTimeMachineHistory();
                 TimeMachineHistories[0] = timeMachineHistory;
+                // 保存多指书写模式状态
+                savedMultiTouchModeStates[0] = isInMultiTouchMode;
                 timeMachine.ClearStrokeHistory();
 
 
@@ -105,27 +147,56 @@ namespace Ink_Canvas
             {
                 var timeMachineHistory = timeMachine.ExportTimeMachineHistory();
                 TimeMachineHistories[CurrentWhiteboardIndex] = timeMachineHistory;
+                // 保存多指书写模式状态
+                savedMultiTouchModeStates[CurrentWhiteboardIndex] = isInMultiTouchMode;
                 timeMachine.ClearStrokeHistory();
 
 
             }
         }
 
+        /// <summary>
+        /// 清除画布上的所有墨迹并执行内存清理
+        /// </summary>
+        /// <param name="isErasedByCode">是否由代码触发的清除操作</param>
+        /// <remarks>
+        /// - 根据参数设置当前提交类型
+        /// - 清除画布上的所有墨迹
+        /// - 恢复当前提交类型为用户输入
+        /// </remarks>
         private void ClearStrokes(bool isErasedByCode)
         {
             _currentCommitType = CommitReason.ClearingCanvas;
             if (isErasedByCode) _currentCommitType = CommitReason.CodeInput;
 
-
-
-            // 只清除笔画，不清除图片元素
-            // 图片元素的清除由调用方决定
             inkCanvas.Strokes.Clear();
 
             _currentCommitType = CommitReason.UserInput;
         }
 
-        // 恢复每页白板图片信息
+        private static HashSet<UIElement> CollectRemovedElementsFromHistory(TimeMachineHistory[] history)
+        {
+            var set = new HashSet<UIElement>();
+            if (history == null) return set;
+            foreach (var h in history)
+            {
+                if (h.CommitType == TimeMachineHistoryType.ElementInsert && h.StrokeHasBeenCleared && h.InsertedElement != null)
+                    set.Add(h.InsertedElement);
+            }
+            return set;
+        }
+
+        /// <summary>
+        /// 恢复指定白板页面的墨迹和元素信息
+        /// </summary>
+        /// <param name="isBackupMain">是否恢复主备份页面</param>
+        /// <remarks>
+        /// - 隐藏图片选择工具栏
+        /// - 清空当前画布的墨迹和所有内容
+        /// - 从时间机器历史记录中恢复页面内容
+        /// - 恢复多指书写模式状态
+        /// - 包含异常处理
+        /// </remarks>
         private void RestoreStrokes(bool isBackupMain = false)
         {
             try
@@ -160,13 +231,40 @@ namespace Ink_Canvas
                 if (isBackupMain)
                 {
                     timeMachine.ImportTimeMachineHistory(TimeMachineHistories[0]);
-                    foreach (var item in TimeMachineHistories[0]) ApplyHistoryToCanvas(item);
+                    var removed0 = CollectRemovedElementsFromHistory(TimeMachineHistories[0]);
+                    var elementsToProcess = new List<UIElement>();
+                    foreach (var item in TimeMachineHistories[0])
+                    {
+                        if (item.CommitType == TimeMachineHistoryType.ElementInsert &&
+                            !item.StrokeHasBeenCleared &&
+                            item.InsertedElement != null &&
+                            !removed0.Contains(item.InsertedElement))
+                        {
+                            elementsToProcess.Add(item.InsertedElement);
+                        }
+                        ApplyHistoryToCanvas(item, null, removed0);
+                    }
+                    RestoreMultiTouchModeState(0);
+                    ProcessElementsAfterRestore(elementsToProcess);
                 }
                 else
                 {
                     timeMachine.ImportTimeMachineHistory(TimeMachineHistories[CurrentWhiteboardIndex]);
-                    // 通过时间机器历史恢复所有内容（墨迹和图片）
-                    foreach (var item in TimeMachineHistories[CurrentWhiteboardIndex]) ApplyHistoryToCanvas(item);
+                    var removed = CollectRemovedElementsFromHistory(TimeMachineHistories[CurrentWhiteboardIndex]);
+                    var elementsToProcess = new List<UIElement>();
+                    foreach (var item in TimeMachineHistories[CurrentWhiteboardIndex])
+                    {
+                        if (item.CommitType == TimeMachineHistoryType.ElementInsert &&
+                            !item.StrokeHasBeenCleared &&
+                            item.InsertedElement != null &&
+                            !removed.Contains(item.InsertedElement))
+                        {
+                            elementsToProcess.Add(item.InsertedElement);
+                        }
+                        ApplyHistoryToCanvas(item, null, removed);
+                    }
+                    RestoreMultiTouchModeState(CurrentWhiteboardIndex);
+                    ProcessElementsAfterRestore(elementsToProcess);
                 }
 
 
@@ -177,6 +275,88 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 在恢复页面后统一处理所有图片/媒体元素的位置和事件绑定，提升含图片页面的加载性能。
+        /// 先批量添加所有元素到画布，再统一处理位置和事件，减少布局更新次数。
+        /// </summary>
+        private void ProcessElementsAfterRestore(List<UIElement> elements)
+        {
+            if (elements == null || elements.Count == 0) return;
+
+            // 使用低优先级异步处理，让 UI 先响应，图片位置和事件绑定稍后完成
+            Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new Action(() =>
+            {
+                foreach (var element in elements)
+                {
+                    if (!inkCanvas.Children.Contains(element)) continue;
+
+                    if (element is Image img)
+                    {
+                        double left = InkCanvas.GetLeft(img);
+                        double top = InkCanvas.GetTop(img);
+                        if (double.IsNaN(left) || double.IsNaN(top))
+                        {
+                            CenterAndScaleElement(img);
+                        }
+                        BindElementEvents(img);
+                    }
+                    else if (element is MediaElement media)
+                    {
+                        double left = InkCanvas.GetLeft(media);
+                        double top = InkCanvas.GetTop(media);
+                        if (double.IsNaN(left) || double.IsNaN(top))
+                        {
+                            CenterAndScaleElement(media);
+                        }
+                        BindElementEvents(media);
+                    }
+                }
+            }));
+        }
+
+        /// <summary>
+        /// 恢复多指书写模式状态
+        /// </summary>
+        private void RestoreMultiTouchModeState(int pageIndex)
+        {
+            try
+            {
+                // 检查是否保存了多指书写模式状态
+                if (savedMultiTouchModeStates[pageIndex])
+                {
+                    // 更新UI状态
+                    if (ToggleSwitchEnableMultiTouchMode != null)
+                    {
+                        ToggleSwitchEnableMultiTouchMode.IsOn = true;
+                    }
+
+                    LogHelper.WriteLogToFile($"恢复多指书写模式状态 - 页面索引: {pageIndex}", LogHelper.LogType.Info);
+                }
+                else
+                {
+                    // 更新UI状态
+                    if (ToggleSwitchEnableMultiTouchMode != null)
+                    {
+                        ToggleSwitchEnableMultiTouchMode.IsOn = false;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"恢复多指书写模式状态失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 处理白板页面索引按钮点击事件，显示或隐藏侧边页面列表
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 处理左侧页面列表按钮点击：显示或隐藏左侧页面列表
+        /// - 处理右侧页面列表按钮点击：显示或隐藏右侧页面列表
+        /// - 显示页面列表时会刷新列表内容并滚动到当前页面
+        /// </remarks>
         private async void BtnWhiteBoardPageIndex_Click(object sender, EventArgs e)
         {
             if (sender == BtnLeftPageListWB)
@@ -191,9 +371,12 @@ namespace Ink_Canvas
                     RefreshBlackBoardSidePageListView();
                     AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardBorderLeftPageListView);
                     await Task.Delay(1);
-                    ScrollViewToVerticalTop(
-                        (ListViewItem)BlackBoardLeftSidePageListView.ItemContainerGenerator.ContainerFromIndex(
-                            CurrentWhiteboardIndex - 1), BlackBoardLeftSidePageListScrollViewer);
+                    var leftContainer = BlackBoardLeftSidePageListView.ItemContainerGenerator.ContainerFromIndex(
+                        CurrentWhiteboardIndex - 1) as ListViewItem;
+                    if (leftContainer != null)
+                    {
+                        ScrollViewToVerticalTop(leftContainer, BlackBoardLeftSidePageListScrollViewer);
+                    }
                 }
             }
             else if (sender == BtnRightPageListWB)
@@ -208,14 +391,23 @@ namespace Ink_Canvas
                     RefreshBlackBoardSidePageListView();
                     AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardBorderRightPageListView);
                     await Task.Delay(1);
-                    ScrollViewToVerticalTop(
-                        (ListViewItem)BlackBoardRightSidePageListView.ItemContainerGenerator.ContainerFromIndex(
-                            CurrentWhiteboardIndex - 1), BlackBoardRightSidePageListScrollViewer);
+                    var rightContainer = BlackBoardRightSidePageListView.ItemContainerGenerator.ContainerFromIndex(
+                        CurrentWhiteboardIndex - 1) as ListViewItem;
+                    if (rightContainer != null)
+                    {
+                        ScrollViewToVerticalTop(rightContainer, BlackBoardRightSidePageListScrollViewer);
+                    }
                 }
             }
 
         }
 
+        /// <summary>
+        /// 切换到前一白板页并在切换过程中保存与恢复画布和相关状态（如果当前已是第一页则不执行任何操作）。
+        /// </summary>
+        /// <remarks>
+        /// 该方法在切换前会取消当前选中元素（同时保留并恢复编辑模式）、调用视频呈现器的离开页前钩子、保存当前页的笔迹与元素、清空画布；切换到前一页后恢复该页内容、调用视频呈现器的页已更改钩子并刷新页面索引显示。
+        /// </remarks>
         private void BtnWhiteBoardSwitchPrevious_Click(object sender, EventArgs e)
         {
             if (CurrentWhiteboardIndex <= 1) return;
@@ -231,22 +423,30 @@ namespace Ink_Canvas
                 currentSelectedElement = null;
             }
 
+            VideoPresenter_BeforePageLeave();
             SaveStrokes();
 
             ClearStrokes(true);
             CurrentWhiteboardIndex--;
 
             RestoreStrokes();
+            VideoPresenter_OnPageChanged();
 
             UpdateIndexInfoDisplay();
         }
 
+        /// <summary>
+        /// 切换到白板的下一页；在到达最后一页时会新增一页。方法在切页前保存当前页面的笔迹/多媒体状态，在切页后恢复目标页面的内容并更新界面状态。
+        /// </summary>
+        /// <param name="sender">触发事件的源对象（通常为按钮）。</param>
+        /// <param name="e">事件参数。</param>
         private void BtnWhiteBoardSwitchNext_Click(object sender, EventArgs e)
         {
-            Trace.WriteLine("113223234");
+            if (CurrentWhiteboardIndex < WhiteboardTotalCount &&
+                Settings.Automation.IsAutoSaveStrokesAtClear &&
+                inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber)
+                CaptureAndEnqueueScreenshotSave(isHideNotification: true);
 
-            if (Settings.Automation.IsAutoSaveStrokesAtClear &&
-                inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber) SaveScreenShot(true);
             if (CurrentWhiteboardIndex >= WhiteboardTotalCount)
             {
                 // 在最后一页时，点击"新页面"按钮直接新增一页
@@ -265,21 +465,34 @@ namespace Ink_Canvas
                 currentSelectedElement = null;
             }
 
+            VideoPresenter_BeforePageLeave();
             SaveStrokes();
 
             ClearStrokes(true);
             CurrentWhiteboardIndex++;
 
             RestoreStrokes();
+            VideoPresenter_OnPageChanged();
 
             UpdateIndexInfoDisplay();
         }
 
+        /// <summary>
+        /// 在白板集合中添加一个新页面：在切换前保存并清除当前页面的笔迹与状态，插入新空白页面，恢复并刷新与页面相关的 UI 状态。
+        /// </summary>
+        /// <remarks>
+        /// - 在达到最大页面数（99）时不执行任何操作。  
+        /// - 在切换前若启用了自动保存且笔迹数量超过阈值，会保存当前画面截图。  
+        /// - 若有选中元素，会取消选中并恢复编辑模式。  
+        /// - 将当前页面的历史保存到时间轴并清空画布，然后在白板集合中插入一个空白页面（其历史为 null），随后恢复该页面并触发页面变更回调。  
+        /// - 更新页码显示并在达到上限时禁用添加按钮；若侧边页列表可见，则刷新该列表。  
+        /// </remarks>
         private void BtnWhiteBoardAdd_Click(object sender, EventArgs e)
         {
             if (WhiteboardTotalCount >= 99) return;
             if (Settings.Automation.IsAutoSaveStrokesAtClear &&
-                inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber) SaveScreenShot(true);
+                inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber)
+                CaptureAndEnqueueScreenshotSave(isHideNotification: true);
 
             // 隐藏图片选择工具栏
             if (currentSelectedElement != null)
@@ -292,6 +505,7 @@ namespace Ink_Canvas
                 currentSelectedElement = null;
             }
 
+            VideoPresenter_BeforePageLeave();
             SaveStrokes();
             ClearStrokes(true);
 
@@ -299,14 +513,20 @@ namespace Ink_Canvas
             CurrentWhiteboardIndex++;
 
             if (CurrentWhiteboardIndex != WhiteboardTotalCount)
+            {
                 for (var i = WhiteboardTotalCount; i > CurrentWhiteboardIndex; i--)
+                {
                     TimeMachineHistories[i] = TimeMachineHistories[i - 1];
+                    savedMultiTouchModeStates[i] = savedMultiTouchModeStates[i - 1];
+                }
+            }
 
             // 确保新页面的历史记录为空
             TimeMachineHistories[CurrentWhiteboardIndex] = null;
 
             // 恢复新页面（这会清空画布，因为历史记录为null）
             RestoreStrokes();
+            VideoPresenter_OnPageChanged();
 
             UpdateIndexInfoDisplay();
 
@@ -318,36 +538,93 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理白板页面删除按钮点击事件，删除当前白板页面
+        /// </summary>
         private void BtnWhiteBoardDelete_Click(object sender, RoutedEventArgs e)
         {
-            // 隐藏图片选择工具栏
+            DeleteWhiteBoardPageByIndex(CurrentWhiteboardIndex);
+        }
+
+        /// <summary>
+        /// 按页码删除指定白板页（用于预览列表等）。仅当总页数大于 1 时有效。
+        /// </summary>
+        /// <param name="pageIndex">要删除的页码（1 到 WhiteboardTotalCount）</param>
+        private void DeleteWhiteBoardPageByIndex(int pageIndex)
+        {
+            if (WhiteboardTotalCount <= 1 || pageIndex < 1 || pageIndex > WhiteboardTotalCount)
+                return;
+
             if (currentSelectedElement != null)
             {
-                // 保存当前编辑模式
                 var previousEditingMode = inkCanvas.EditingMode;
                 UnselectElement(currentSelectedElement);
-                // 恢复编辑模式
                 inkCanvas.EditingMode = previousEditingMode;
                 currentSelectedElement = null;
             }
 
-            ClearStrokes(true);
+            if (pageIndex == CurrentWhiteboardIndex)
+            {
+                ClearStrokes(true);
 
-            if (CurrentWhiteboardIndex != WhiteboardTotalCount)
-                for (var i = CurrentWhiteboardIndex; i <= WhiteboardTotalCount; i++)
-                    TimeMachineHistories[i] = TimeMachineHistories[i + 1];
-            else
+                var oldTotal = WhiteboardTotalCount;
+                if (CurrentWhiteboardIndex != oldTotal)
+                {
+                    for (var i = CurrentWhiteboardIndex; i < oldTotal; i++)
+                    {
+                        TimeMachineHistories[i] = FlattenPageHistory(TimeMachineHistories[i + 1]);
+                        savedMultiTouchModeStates[i] = savedMultiTouchModeStates[i + 1];
+                    }
+                }
+                else
+                {
+                    CurrentWhiteboardIndex--;
+                }
+
+                TimeMachineHistories[oldTotal] = null;
+                WhiteboardTotalCount--;
+                RestoreStrokes();
+            }
+            else if (pageIndex < CurrentWhiteboardIndex)
+            {
+                for (var i = pageIndex; i < WhiteboardTotalCount; i++)
+                {
+                    TimeMachineHistories[i] = FlattenPageHistory(TimeMachineHistories[i + 1]);
+                    savedMultiTouchModeStates[i] = savedMultiTouchModeStates[i + 1];
+                }
+                TimeMachineHistories[WhiteboardTotalCount] = null;
+                WhiteboardTotalCount--;
                 CurrentWhiteboardIndex--;
-
-            WhiteboardTotalCount--;
-
-            RestoreStrokes();
+            }
+            else
+            {
+                for (var i = pageIndex; i < WhiteboardTotalCount; i++)
+                {
+                    TimeMachineHistories[i] = FlattenPageHistory(TimeMachineHistories[i + 1]);
+                    savedMultiTouchModeStates[i] = savedMultiTouchModeStates[i + 1];
+                }
+                TimeMachineHistories[WhiteboardTotalCount] = null;
+                WhiteboardTotalCount--;
+            }
 
             UpdateIndexInfoDisplay();
-
             if (WhiteboardTotalCount < 99) BtnWhiteBoardAdd.IsEnabled = true;
+            if (BoardBorderLeftPageListView?.Visibility == Visibility.Visible ||
+                BoardBorderRightPageListView?.Visibility == Visibility.Visible)
+                RefreshBlackBoardSidePageListView();
         }
 
+        /// <summary>
+        /// 更新白板页码信息显示和按钮状态
+        /// </summary>
+        /// <remarks>
+        /// - 更新页码显示文本
+        /// - 设置下一页按钮文本（根据是否为最后一页）
+        /// - 启用或禁用下一页按钮（根据是否为最后一页和最大页面数）
+        /// - 设置按钮颜色和透明度
+        /// - 启用或禁用上一页按钮（根据是否为第一页）
+        /// - 设置删除按钮状态（根据页面总数）
+        /// </remarks>
         private void UpdateIndexInfoDisplay()
         {
             TextBlockWhiteBoardIndexInfo.Text =
@@ -360,13 +637,25 @@ namespace Ink_Canvas
             BtnLeftWhiteBoardSwitchNextLabel.Text = isLastPage ? "新页面" : "下一页";
             BtnRightWhiteBoardSwitchNextLabel.Text = isLastPage ? "新页面" : "下一页";
 
-            // 始终允许点击“下一页/新页面”按钮（除非已达最大页数）
-            BtnWhiteBoardSwitchNext.IsEnabled = !isMaxPage;
+            if (isLastPage)
+            {
+                BtnWhiteBoardSwitchNext.IsEnabled = !isMaxPage;
+            }
+            else
+            {
+                BtnWhiteBoardSwitchNext.IsEnabled = true;
+            }
 
-            // 保持按钮常亮（高亮）
-            BtnLeftWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
+            // 获取主题颜色资源
+            var iconForegroundBrush = Application.Current.FindResource("IconForeground") as SolidColorBrush;
+
+            // 设置下一页按钮颜色
+            if (iconForegroundBrush != null)
+            {
+                BtnLeftWhiteBoardSwitchNextGeometry.Brush = iconForegroundBrush;
+                BtnRightWhiteBoardSwitchNextGeometry.Brush = iconForegroundBrush;
+            }
             BtnLeftWhiteBoardSwitchNextLabel.Opacity = 1;
-            BtnRightWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
             BtnRightWhiteBoardSwitchNextLabel.Opacity = 1;
 
             BtnWhiteBoardSwitchPrevious.IsEnabled = true;
@@ -374,16 +663,23 @@ namespace Ink_Canvas
             if (CurrentWhiteboardIndex == 1)
             {
                 BtnWhiteBoardSwitchPrevious.IsEnabled = false;
-                BtnLeftWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27));
+                if (iconForegroundBrush != null)
+                {
+                    var disabledBrush = new SolidColorBrush(Color.FromArgb(127, iconForegroundBrush.Color.R, iconForegroundBrush.Color.G, iconForegroundBrush.Color.B));
+                    BtnLeftWhiteBoardSwitchPreviousGeometry.Brush = disabledBrush;
+                    BtnRightWhiteBoardSwitchPreviousGeometry.Brush = disabledBrush;
+                }
                 BtnLeftWhiteBoardSwitchPreviousLabel.Opacity = 0.5;
-                BtnRightWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27));
                 BtnRightWhiteBoardSwitchPreviousLabel.Opacity = 0.5;
             }
             else
             {
-                BtnLeftWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
+                if (iconForegroundBrush != null)
+                {
+                    BtnLeftWhiteBoardSwitchPreviousGeometry.Brush = iconForegroundBrush;
+                    BtnRightWhiteBoardSwitchPreviousGeometry.Brush = iconForegroundBrush;
+                }
                 BtnLeftWhiteBoardSwitchPreviousLabel.Opacity = 1;
-                BtnRightWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
                 BtnRightWhiteBoardSwitchPreviousLabel.Opacity = 1;
             }
 

Ink Canvas/MainWindow_cs/MW_BoardIcons.cs

@@ -1,4 +1,4 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using System;
 using System.Diagnostics;
 using System.Windows;
@@ -12,6 +12,19 @@ namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
+        /// <summary>
+        /// 处理背景颜色按钮点击事件，显示或隐藏背景颜色选项面板
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 检查应用是否已加载
+        /// - 创建背景选项面板（如果不存在）
+        /// - 显示或隐藏背景选项面板
+        /// - 隐藏其他可能显示的面板
+        /// - 处理白板/黑板模式切换
+        /// - 更新背景颜色和墨迹颜色
+        /// </remarks>
         private void BoardChangeBackgroundColorBtn_MouseUp(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
@@ -61,7 +74,7 @@ namespace Ink_Canvas
                 ICCWaterMarkWhite.Visibility = Visibility.Collapsed;
 
                 // 设置为白板默认背景色
-                Color defaultWhiteboardColor = Color.FromRgb(234, 235, 237);
+                Color defaultWhiteboardColor = Color.FromRgb(255, 255, 255);
 
                 if (currentMode == 1) // 白板模式
                 {
@@ -124,7 +137,18 @@ namespace Ink_Canvas
             CheckColorTheme(true);
         }
 
-        // 创建背景选项面板
+        /// <summary>
+        /// 创建背景颜色选项面板
+        /// </summary>
+        /// <remarks>
+        /// - 加载自定义背景色
+        /// - 创建背景选项面板UI
+        /// - 添加标题栏和关闭按钮
+        /// - 添加白板/黑板模式选择按钮
+        /// - 添加RGB颜色选择器
+        /// - 添加颜色预览和应用按钮
+        /// - 将面板添加到主网格
+        /// </remarks>
         private void CreateBackgroundPalette()
         {
             // 确保加载自定义背景色
@@ -135,7 +159,7 @@ namespace Ink_Canvas
             {
                 Name = "BackgroundPalette",
                 Visibility = Visibility.Collapsed,
-                Background = new SolidColorBrush(Colors.White),
+                Background = (SolidColorBrush)Application.Current.FindResource("SettingsPageBackground"),
                 Opacity = 1,
                 BorderBrush = new SolidColorBrush(Color.FromRgb(0x25, 0x63, 0xeb)),
                 BorderThickness = new Thickness(1),
@@ -166,7 +190,7 @@ namespace Ink_Canvas
             var titleText = new TextBlock
             {
                 Text = "背景设置",
-                Foreground = new SolidColorBrush(Colors.White),
+                Foreground = (SolidColorBrush)Application.Current.FindResource("FloatBarForeground"),
                 Padding = new Thickness(0, 5, 0, 0),
                 FontSize = 11,
                 FontWeight = FontWeights.Bold,
@@ -198,7 +222,7 @@ namespace Ink_Canvas
             var modeTitle = new TextBlock
             {
                 Text = "白板模式",
-                Foreground = new SolidColorBrush(Color.FromRgb(0x17, 0x25, 0x54)),
+                Foreground = (SolidColorBrush)Application.Current.FindResource("TextForeground"),
                 FontSize = 10,
                 FontWeight = FontWeights.Bold,
                 HorizontalAlignment = HorizontalAlignment.Center,
@@ -233,7 +257,7 @@ namespace Ink_Canvas
                 ICCWaterMarkWhite.Visibility = Visibility.Collapsed;
 
                 // 设置为白板默认背景色
-                Color defaultWhiteboardColor = Color.FromRgb(234, 235, 237);
+                Color defaultWhiteboardColor = Color.FromRgb(255, 255, 255);
 
                 if (currentMode == 1) // 白板模式
                 {
@@ -319,7 +343,7 @@ namespace Ink_Canvas
             var separator = new Border
             {
                 Height = 1,
-                Background = new SolidColorBrush(Color.FromRgb(0xd4, 0xd4, 0xd8)),
+                Background = (SolidColorBrush)Application.Current.FindResource("SettingsPageBorderBrush"),
                 Margin = new Thickness(0, 12, 0, 12)
             };
             contentPanel.Children.Add(separator);
@@ -328,7 +352,7 @@ namespace Ink_Canvas
             var colorTitle = new TextBlock
             {
                 Text = "背景颜色",
-                Foreground = new SolidColorBrush(Color.FromRgb(0x17, 0x25, 0x54)),
+                Foreground = (SolidColorBrush)Application.Current.FindResource("TextForeground"),
                 FontSize = 10,
                 FontWeight = FontWeights.Bold,
                 HorizontalAlignment = HorizontalAlignment.Center,
@@ -342,7 +366,7 @@ namespace Ink_Canvas
                 Width = 100,
                 Height = 40,
                 BorderThickness = new Thickness(1),
-                BorderBrush = new SolidColorBrush(Color.FromRgb(0xd4, 0xd4, 0xd8)),
+                BorderBrush = (SolidColorBrush)Application.Current.FindResource("SettingsPageBorderBrush"),
                 Background = new SolidColorBrush(Colors.White),
                 CornerRadius = new CornerRadius(4),
                 Margin = new Thickness(0, 0, 0, 10),
@@ -378,7 +402,7 @@ namespace Ink_Canvas
             // 先创建所有滑块控件
             // R滑块和文本框
             var rPanel = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(10, 0, 10, 5) };
-            var rLabel = new TextBlock { Text = "R:", Width = 20, VerticalAlignment = VerticalAlignment.Center };
+            var rLabel = new TextBlock { Text = "R:", Width = 20, VerticalAlignment = VerticalAlignment.Center, Foreground = (SolidColorBrush)Application.Current.FindResource("TextForeground") };
             var rSlider = new Slider
             {
                 Minimum = 0,
@@ -393,12 +417,13 @@ namespace Ink_Canvas
                 Text = currentBackgroundColor.R.ToString(),
                 Width = 30,
                 VerticalAlignment = VerticalAlignment.Center,
-                TextAlignment = TextAlignment.Right
+                TextAlignment = TextAlignment.Right,
+                Foreground = (SolidColorBrush)Application.Current.FindResource("TextForeground")
             };
 
             // G滑块和文本框
             var gPanel = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(10, 0, 10, 5) };
-            var gLabel = new TextBlock { Text = "G:", Width = 20, VerticalAlignment = VerticalAlignment.Center };
+            var gLabel = new TextBlock { Text = "G:", Width = 20, VerticalAlignment = VerticalAlignment.Center, Foreground = (SolidColorBrush)Application.Current.FindResource("TextForeground") };
             var gSlider = new Slider
             {
                 Minimum = 0,
@@ -413,12 +438,13 @@ namespace Ink_Canvas
                 Text = currentBackgroundColor.G.ToString(),
                 Width = 30,
                 VerticalAlignment = VerticalAlignment.Center,
-                TextAlignment = TextAlignment.Right
+                TextAlignment = TextAlignment.Right,
+                Foreground = (SolidColorBrush)Application.Current.FindResource("TextForeground")
             };
 
             // B滑块和文本框
             var bPanel = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(10, 0, 10, 5) };
-            var bLabel = new TextBlock { Text = "B:", Width = 20, VerticalAlignment = VerticalAlignment.Center };
+            var bLabel = new TextBlock { Text = "B:", Width = 20, VerticalAlignment = VerticalAlignment.Center, Foreground = (SolidColorBrush)Application.Current.FindResource("TextForeground") };
             var bSlider = new Slider
             {
                 Minimum = 0,
@@ -433,7 +459,8 @@ namespace Ink_Canvas
                 Text = currentBackgroundColor.B.ToString(),
                 Width = 30,
                 VerticalAlignment = VerticalAlignment.Center,
-                TextAlignment = TextAlignment.Right
+                TextAlignment = TextAlignment.Right,
+                Foreground = (SolidColorBrush)Application.Current.FindResource("TextForeground")
             };
 
             // 现在添加事件处理程序
@@ -540,7 +567,13 @@ namespace Ink_Canvas
             }
         }
 
-        // 更新背景按钮状态
+        /// <summary>
+        /// 更新背景颜色选项面板中的按钮状态
+        /// </summary>
+        /// <remarks>
+        /// - 更新白板和黑板按钮的背景和前景色
+        /// - 根据当前使用的模式设置按钮状态
+        /// </remarks>
         private void UpdateBackgroundButtonsState()
         {
             if (BackgroundPalette != null && BackgroundPalette.Child is StackPanel stackPanel)
@@ -579,10 +612,14 @@ namespace Ink_Canvas
             }
         }
 
-        // 添加成员变量保存背景面板引用
+        /// <summary>
+        /// 背景颜色选项面板
+        /// </summary>
         private Border BackgroundPalette { get; set; }
 
-        // 添加成员变量保存当前自定义背景色
+        /// <summary>
+        /// 当前自定义背景色
+        /// </summary>
         private Color? CustomBackgroundColor { get; set; }
 
         /// <summary>
@@ -699,6 +736,17 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理套索工具图标点击事件，切换到选择模式
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 禁用橡皮擦模式
+        /// - 禁用形状绘制模式
+        /// - 设置当前工具模式为选择模式
+        /// - 根据编辑模式设置光标
+        /// </remarks>
         private void BoardLassoIcon_Click(object sender, RoutedEventArgs e)
         {
             forceEraser = false;
@@ -709,6 +757,22 @@ namespace Ink_Canvas
             SetCursorBasedOnEditingMode(inkCanvas);
         }
 
+        /// <summary>
+        /// 处理橡皮擦图标点击事件，切换到按笔画擦除模式
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 禁用高级橡皮擦系统
+        /// - 启用橡皮擦模式
+        /// - 设置橡皮擦形状为圆形
+        /// - 设置当前工具模式为按笔画擦除
+        /// - 禁用形状绘制模式
+        /// - 重置钢笔类型和属性
+        /// - 触发编辑模式变更事件
+        /// - 取消单指拖动模式
+        /// - 隐藏子面板
+        /// </remarks>
         private void BoardEraserIconByStrokes_Click(object sender, RoutedEventArgs e)
         {
             //if (BoardEraserByStrokes.Background.ToString() == "#FF679CF4") {
@@ -716,7 +780,7 @@ namespace Ink_Canvas
             //}
             //else {
             // 禁用高级橡皮擦系统
-            DisableAdvancedEraserSystem();
+            DisableEraserOverlay();
 
             forceEraser = true;
             forcePointEraser = false;
@@ -726,7 +790,6 @@ namespace Ink_Canvas
             SetCurrentToolMode(InkCanvasEditingMode.EraseByStroke);
             drawingShapeMode = 0;
 
-            // 修复：切换到线擦时，确保重置笔的状态
             penType = 0;
             drawingAttributes.IsHighlighter = false;
             drawingAttributes.StylusTip = StylusTip.Ellipse;
@@ -738,6 +801,18 @@ namespace Ink_Canvas
             //}
         }
 
+        /// <summary>
+        /// 处理删除图标点击事件，清空画布内容
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 调用钢笔图标点击事件
+        /// - 调用符号删除鼠标抬起事件
+        /// - 根据设置决定是否清空图片
+        /// - 如果设置为清空图片，则清空所有子元素
+        /// - 否则，保存非笔画元素并在清空后恢复
+        /// </remarks>
         private void BoardSymbolIconDelete_MouseUp(object sender, RoutedEventArgs e)
         {
             PenIcon_Click(null, null);
@@ -762,6 +837,19 @@ namespace Ink_Canvas
                 Debug.WriteLine($"BoardSymbolIconDelete: inkCanvas.Children.Count after restore: {inkCanvas.Children.Count}");
             }
         }
+        /// <summary>
+        /// 处理删除墨迹和历史记录图标点击事件，清空画布内容和时间机器历史
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 调用钢笔图标点击事件
+        /// - 调用符号删除鼠标抬起事件
+        /// - 根据设置决定是否清空时间机器历史
+        /// - 根据设置决定是否清空图片
+        /// - 如果设置为清空图片，则清空所有子元素
+        /// - 否则，保存非笔画元素并在清空后恢复
+        /// </remarks>
         private void BoardSymbolIconDeleteInkAndHistories_MouseUp(object sender, RoutedEventArgs e)
         {
             PenIcon_Click(null, null);
@@ -788,12 +876,31 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 处理启动希沃视频展台图标点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 调用图片黑板鼠标抬起事件
+        /// - 启动希沃视频展台软件
+        /// </remarks>
         private void BoardLaunchEasiCamera_MouseUp(object sender, MouseButtonEventArgs e)
         {
             ImageBlackboard_MouseUp(null, null);
             SoftwareLauncher.LaunchEasiCamera("希沃视频展台");
         }
 
+        /// <summary>
+        /// 处理启动Desmos计算器图标点击事件
+        /// </summary>
+        /// <param name="sender">事件发送者</param>
+        /// <param name="e">事件参数</param>
+        /// <remarks>
+        /// - 立即隐藏所有子面板
+        /// - 调用图片黑板鼠标抬起事件
+        /// - 打开Desmos计算器网页
+        /// </remarks>
         private void BoardLaunchDesmos_MouseUp(object sender, MouseButtonEventArgs e)
         {
             HideSubPanelsImmediately();
@@ -855,4 +962,4 @@ namespace Ink_Canvas
             }
         }
     }
-}
+}

Ink Canvas/MainWindow_cs/MW_ClipboardHandler.cs

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

Ink Canvas/MainWindow_cs/MW_Colors.cs

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

Ink Canvas/MainWindow_cs/MW_Eraser.xaml

@@ -1,36 +1,46 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <DrawingGroup x:Key="EraserDrawingGroup" ClipGeometry="M0,0 V56 H38 V0 H0 Z">
-        <GeometryDrawing Brush="#FFF2EEEB" Geometry="F1 M38,56z M0,0z M0,4C0,1.79086,1.79086,0,4,0L34,0C36.2091,0,38,1.79086,38,4L38,52C38,54.2091,36.2091,56,34,56L4,56C1.79086,56,0,54.2091,0,52L0,4z" />
-        <GeometryDrawing Brush="#FFCDCDCD" Geometry="F0 M38,56z M0,0z M34,1L4,1C2.34315,1,1,2.34315,1,4L1,52C1,53.6569,2.34315,55,4,55L34,55C35.6569,55,37,53.6569,37,52L37,4C37,2.34315,35.6569,1,34,1z M4,0C1.79086,0,0,1.79086,0,4L0,52C0,54.2091,1.79086,56,4,56L34,56C36.2091,56,38,54.2091,38,52L38,4C38,1.79086,36.2091,0,34,0L4,0z" />
-        <GeometryDrawing Brush="#FFD1CFCD" Geometry="F1 M38,56z M0,0z M12,19.5C12,18.1193,13.1193,17,14.5,17L14.5,17C15.8807,17,17,18.1193,17,19.5L17,36.5C17,37.8807,15.8807,39,14.5,39L14.5,39C13.1193,39,12,37.8807,12,36.5L12,19.5z" />
-        <GeometryDrawing Geometry="F0 M38,56z M0,0z M11.5,19.5C11.5,17.8431 12.8431,16.5 14.5,16.5 16.1569,16.5 17.5,17.8431 17.5,19.5L17.5,36.5C17.5,38.1569 16.1569,39.5 14.5,39.5 12.8431,39.5 11.5,38.1569 11.5,36.5L11.5,19.5z M14.5,17.5C13.3954,17.5,12.5,18.3954,12.5,19.5L12.5,36.5C12.5,37.6046 13.3954,38.5 14.5,38.5 15.6046,38.5 16.5,37.6046 16.5,36.5L16.5,19.5C16.5,18.3954,15.6046,17.5,14.5,17.5z">
-            <GeometryDrawing.Brush>
-                <SolidColorBrush Color="#FF6F6F6F" Opacity="0.25" />
-            </GeometryDrawing.Brush>
-        </GeometryDrawing>
-        <GeometryDrawing Brush="#FFD1CFCD" Geometry="F1 M38,56z M0,0z M21,19.5C21,18.1193,22.1193,17,23.5,17L23.5,17C24.8807,17,26,18.1193,26,19.5L26,36.5C26,37.8807,24.8807,39,23.5,39L23.5,39C22.1193,39,21,37.8807,21,36.5L21,19.5z" />
-        <GeometryDrawing Geometry="F0 M38,56z M0,0z M20.5,19.5C20.5,17.8431 21.8431,16.5 23.5,16.5 25.1569,16.5 26.5,17.8431 26.5,19.5L26.5,36.5C26.5,38.1569 25.1569,39.5 23.5,39.5 21.8431,39.5 20.5,38.1569 20.5,36.5L20.5,19.5z M23.5,17.5C22.3954,17.5,21.5,18.3954,21.5,19.5L21.5,36.5C21.5,37.6046 22.3954,38.5 23.5,38.5 24.6046,38.5 25.5,37.6046 25.5,36.5L25.5,19.5C25.5,18.3954,24.6046,17.5,23.5,17.5z">
-            <GeometryDrawing.Brush>
-                <SolidColorBrush Color="#FF6F6F6F" Opacity="0.25" />
-            </GeometryDrawing.Brush>
-        </GeometryDrawing>
-    </DrawingGroup>
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">    
+    <!-- 矩形橡皮擦图像资源 -->
+    <DrawingImage x:Key="RectangleEraserImageSource">
+        <DrawingImage.Drawing>
+            <DrawingGroup ClipGeometry="M0,0 V56 H38 V0 H0 Z">
+                <GeometryDrawing Brush="#FFF2EEEB" Geometry="F1 M38,56z M0,0z M0,4C0,1.79086,1.79086,0,4,0L34,0C36.2091,0,38,1.79086,38,4L38,52C38,54.2091,36.2091,56,34,56L4,56C1.79086,56,0,54.2091,0,52L0,4z" />
+                <GeometryDrawing Brush="#FFCDCDCD" Geometry="F0 M38,56z M0,0z M34,1L4,1C2.34315,1,1,2.34315,1,4L1,52C1,53.6569,2.34315,55,4,55L34,55C35.6569,55,37,53.6569,37,52L37,4C37,2.34315,35.6569,1,34,1z M4,0C1.79086,0,0,1.79086,0,4L0,52C0,54.2091,1.79086,56,4,56L34,56C36.2091,56,38,54.2091,38,52L38,4C38,1.79086,36.2091,0,34,0L4,0z" />
+                <GeometryDrawing Brush="#FFD1CFCD" Geometry="F1 M38,56z M0,0z M12,19.5C12,18.1193,13.1193,17,14.5,17L14.5,17C15.8807,17,17,18.1193,17,19.5L17,36.5C17,37.8807,15.8807,39,14.5,39L14.5,39C13.1193,39,12,37.8807,12,36.5L12,19.5z" />
+                <GeometryDrawing Geometry="F0 M38,56z M0,0z M11.5,19.5C11.5,17.8431 12.8431,16.5 14.5,16.5 16.1569,16.5 17.5,17.8431 17.5,19.5L17.5,36.5C17.5,38.1569 16.1569,39.5 14.5,39.5 12.8431,39.5 11.5,38.1569 11.5,36.5L11.5,19.5z M14.5,17.5C13.3954,17.5,12.5,18.3954,12.5,19.5L12.5,36.5C12.5,37.6046 13.3954,38.5 14.5,38.5 15.6046,38.5 16.5,37.6046 16.5,36.5L16.5,19.5C16.5,18.3954,15.6046,17.5,14.5,17.5z">
+                    <GeometryDrawing.Brush>
+                        <SolidColorBrush Color="#FF6F6F6F" Opacity="0.25" />
+                    </GeometryDrawing.Brush>
+                </GeometryDrawing>
+                <GeometryDrawing Brush="#FFD1CFCD" Geometry="F1 M38,56z M0,0z M21,19.5C21,18.1193,22.1193,17,23.5,17L23.5,17C24.8807,17,26,18.1193,26,19.5L26,36.5C26,37.8807,24.8807,39,23.5,39L23.5,39C22.1193,39,21,37.8807,21,36.5L21,19.5z" />
+                <GeometryDrawing Geometry="F0 M38,56z M0,0z M20.5,19.5C20.5,17.8431 21.8431,16.5 23.5,16.5 25.1569,16.5 26.5,17.8431 26.5,19.5L26.5,36.5C26.5,38.1569 25.1569,39.5 23.5,39.5 21.8431,39.5 20.5,38.1569 20.5,36.5L20.5,19.5z M23.5,17.5C22.3954,17.5,21.5,18.3954,21.5,19.5L21.5,36.5C21.5,37.6046 22.3954,38.5 23.5,38.5 24.6046,38.5 25.5,37.6046 25.5,36.5L25.5,19.5C25.5,18.3954,24.6046,17.5,23.5,17.5z">
+                    <GeometryDrawing.Brush>
+                        <SolidColorBrush Color="#FF6F6F6F" Opacity="0.25" />
+                    </GeometryDrawing.Brush>
+                </GeometryDrawing>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
 
-    <DrawingGroup x:Key="EraserCircleDrawingGroup" ClipGeometry="M0,0 V56 H56 V0 H0 Z">
-        <GeometryDrawing Brush="#FFF2EEEB" Geometry="F1 M56,56z M0,0z M0,28C0,12.536,12.536,0,28,0L28,0C43.464,0,56,12.536,56,28L56,28C56,43.464,43.464,56,28,56L28,56C12.536,56,0,43.464,0,28L0,28z" />
-        <GeometryDrawing Brush="#FFCDCDCD" Geometry="F0 M56,56z M0,0z M1,28C1,42.9117 13.0883,55 28,55 42.9117,55 55,42.9117 55,28 55,13.0883 42.9117,1 28,1 13.0883,1 1,13.0883 1,28z M28,0C12.536,0 0,12.536 0,28 0,43.464 12.536,56 28,56 43.464,56 56,43.464 56,28 56,12.536 43.464,0 28,0z" />
-        <GeometryDrawing Brush="#FFD1CFCD" Geometry="F1 M56,56z M0,0z M21,19.5C21,18.1193,22.1193,17,23.5,17L23.5,17C24.8807,17,26,18.1193,26,19.5L26,36.5C26,37.8807,24.8807,39,23.5,39L23.5,39C22.1193,39,21,37.8807,21,36.5L21,19.5z" />
-        <GeometryDrawing Geometry="F0 M56,56z M0,0z M20.5,19.5C20.5,17.8431 21.8431,16.5 23.5,16.5 25.1569,16.5 26.5,17.8431 26.5,19.5L26.5,36.5C26.5,38.1569 25.1569,39.5 23.5,39.5 21.8431,39.5 20.5,38.1569 20.5,36.5L20.5,19.5z M23.5,17.5C22.3954,17.5,21.5,18.3954,21.5,19.5L21.5,36.5C21.5,37.6046 22.3954,38.5 23.5,38.5 24.6046,38.5 25.5,37.6046 25.5,36.5L25.5,19.5C25.5,18.3954,24.6046,17.5,23.5,17.5z">
-            <GeometryDrawing.Brush>
-                <SolidColorBrush Color="#FF6F6F6F" Opacity="0.25" />
-            </GeometryDrawing.Brush>
-        </GeometryDrawing>
-        <GeometryDrawing Brush="#FFD1CFCD" Geometry="F1 M56,56z M0,0z M30,19.5C30,18.1193,31.1193,17,32.5,17L32.5,17C33.8807,17,35,18.1193,35,19.5L35,36.5C35,37.8807,33.8807,39,32.5,39L32.5,39C31.1193,39,30,37.8807,30,36.5L30,19.5z" />
-        <GeometryDrawing Geometry="F0 M56,56z M0,0z M29.5,19.5C29.5,17.8431 30.8431,16.5 32.5,16.5 34.1569,16.5 35.5,17.8431 35.5,19.5L35.5,36.5C35.5,38.1569 34.1569,39.5 32.5,39.5 30.8431,39.5 29.5,38.1569 29.5,36.5L29.5,19.5z M32.5,17.5C31.3954,17.5,30.5,18.3954,30.5,19.5L30.5,36.5C30.5,37.6046 31.3954,38.5 32.5,38.5 33.6046,38.5 34.5,37.6046 34.5,36.5L34.5,19.5C34.5,18.3954,33.6046,17.5,32.5,17.5z">
-            <GeometryDrawing.Brush>
-                <SolidColorBrush Color="#FF6F6F6F" Opacity="0.25" />
-            </GeometryDrawing.Brush>
-        </GeometryDrawing>
-    </DrawingGroup>
+    <!-- 圆形橡皮擦图像资源 -->
+    <DrawingImage x:Key="EllipseEraserImageSource">
+        <DrawingImage.Drawing>
+            <DrawingGroup ClipGeometry="M0,0 V56 H56 V0 H0 Z">
+                <GeometryDrawing Brush="#FFF2EEEB" Geometry="F1 M56,56z M0,0z M0,28C0,12.536,12.536,0,28,0L28,0C43.464,0,56,12.536,56,28L56,28C56,43.464,43.464,56,28,56L28,56C12.536,56,0,43.464,0,28L0,28z" />
+                <GeometryDrawing Brush="#FFCDCDCD" Geometry="F0 M56,56z M0,0z M1,28C1,42.9117 13.0883,55 28,55 42.9117,55 55,42.9117 55,28 55,13.0883 42.9117,1 28,1 13.0883,1 1,13.0883 1,28z M28,0C12.536,0 0,12.536 0,28 0,43.464 12.536,56 28,56 43.464,56 56,43.464 56,28 56,12.536 43.464,0 28,0z" />
+                <GeometryDrawing Brush="#FFD1CFCD" Geometry="F1 M56,56z M0,0z M21,19.5C21,18.1193,22.1193,17,23.5,17L23.5,17C24.8807,17,26,18.1193,26,19.5L26,36.5C26,37.8807,24.8807,39,23.5,39L23.5,39C22.1193,39,21,37.8807,21,36.5L21,19.5z" />
+                <GeometryDrawing Geometry="F0 M56,56z M0,0z M20.5,19.5C20.5,17.8431 21.8431,16.5 23.5,16.5 25.1569,16.5 26.5,17.8431 26.5,19.5L26.5,36.5C26.5,38.1569 25.1569,39.5 23.5,39.5 21.8431,39.5 20.5,38.1569 20.5,36.5L20.5,19.5z M23.5,17.5C22.3954,17.5,21.5,18.3954,21.5,19.5L21.5,36.5C21.5,37.6046 22.3954,38.5 23.5,38.5 24.6046,38.5 25.5,37.6046 25.5,36.5L25.5,19.5C25.5,18.3954,24.6046,17.5,23.5,17.5z">
+                    <GeometryDrawing.Brush>
+                        <SolidColorBrush Color="#FF6F6F6F" Opacity="0.25" />
+                    </GeometryDrawing.Brush>
+                </GeometryDrawing>
+                <GeometryDrawing Brush="#FFD1CFCD" Geometry="F1 M56,56z M0,0z M30,19.5C30,18.1193,31.1193,17,32.5,17L32.5,17C33.8807,17,35,18.1193,35,19.5L35,36.5C35,37.8807,33.8807,39,32.5,39L32.5,39C31.1193,39,30,37.8807,30,36.5L30,19.5z" />
+                <GeometryDrawing Geometry="F0 M56,56z M0,0z M29.5,19.5C29.5,17.8431 30.8431,16.5 32.5,16.5 34.1569,16.5 35.5,17.8431 35.5,19.5L35.5,36.5C35.5,38.1569 34.1569,39.5 32.5,39.5 30.8431,39.5 29.5,38.1569 29.5,36.5L29.5,19.5z M32.5,17.5C31.3954,17.5,30.5,18.3954,30.5,19.5L30.5,36.5C30.5,37.6046 31.3954,38.5 32.5,38.5 33.6046,38.5 34.5,37.6046 34.5,36.5L34.5,19.5C34.5,18.3954,33.6046,17.5,32.5,17.5z">
+                    <GeometryDrawing.Brush>
+                        <SolidColorBrush Color="#FF6F6F6F" Opacity="0.25" />
+                    </GeometryDrawing.Brush>
+                </GeometryDrawing>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
 </ResourceDictionary>

Ink Canvas/MainWindow_cs/MW_FloatingWindowInterceptor.cs

@@ -0,0 +1,360 @@
+using Ink_Canvas.Helpers;
+using iNKORE.UI.WPF.Modern.Controls;
+using System;
+using System.Linq;
+using System.Windows;
+
+namespace Ink_Canvas
+{
+    public partial class MainWindow : Window
+    {
+        #region 悬浮窗拦截功能
+
+        /// <summary>
+        /// 初始化悬浮窗拦截管理器
+        /// </summary>
+        private void InitializeFloatingWindowInterceptor()
+        {
+            try
+            {
+                _floatingWindowInterceptorManager = new FloatingWindowInterceptorManager();
+
+                // 订阅事件
+                _floatingWindowInterceptorManager.WindowIntercepted += OnFloatingWindowIntercepted;
+                _floatingWindowInterceptorManager.WindowRestored += OnFloatingWindowRestored;
+
+                // 初始化拦截器
+                _floatingWindowInterceptorManager.Initialize(Settings.Automation.FloatingWindowInterceptor);
+
+                // 加载UI状态
+                LoadFloatingWindowInterceptorUI();
+
+                LogHelper.WriteLogToFile("悬浮窗拦截管理器初始化完成", LogHelper.LogType.Event);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"初始化悬浮窗拦截管理器失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 加载悬浮窗拦截UI状态
+        /// </summary>
+        private void LoadFloatingWindowInterceptorUI()
+        {
+            try
+            {
+                if (!isLoaded) return;
+
+                // 设置主开关状态
+                ToggleSwitchFloatingWindowInterceptorEnabled.IsOn = Settings.Automation.FloatingWindowInterceptor.IsEnabled;
+
+                // 设置各个拦截规则的状态
+                foreach (var kvp in Settings.Automation.FloatingWindowInterceptor.InterceptRules)
+                {
+                    var toggleName = $"ToggleSwitch{kvp.Key}";
+                    var toggle = FindName(toggleName) as ToggleSwitch;
+                    if (toggle != null)
+                    {
+                        toggle.IsOn = kvp.Value;
+                    }
+                }
+
+                // 更新UI可见性
+                UpdateFloatingWindowInterceptorUI();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"加载悬浮窗拦截UI状态失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 更新悬浮窗拦截UI
+        /// </summary>
+        private void UpdateFloatingWindowInterceptorUI()
+        {
+            try
+            {
+                var isEnabled = Settings.Automation.FloatingWindowInterceptor.IsEnabled;
+                FloatingWindowInterceptorGrid.Visibility = isEnabled ? Visibility.Visible : Visibility.Collapsed;
+
+                // 计算启用的规则数量
+                var enabledRulesCount = Settings.Automation.FloatingWindowInterceptor.InterceptRules.Where(kvp => kvp.Value).Count();
+                var totalRulesCount = Settings.Automation.FloatingWindowInterceptor.InterceptRules.Count;
+
+                // 更新状态文本
+                if (_floatingWindowInterceptorManager != null)
+                {
+                    var stats = _floatingWindowInterceptorManager.GetStatistics();
+                    TextBlockFloatingWindowInterceptorStatus.Text = stats.IsRunning
+                        ? $"拦截器运行中 - 已启用 {enabledRulesCount}/{totalRulesCount} 个规则"
+                        : $"拦截器未启动 - 已启用 {enabledRulesCount}/{totalRulesCount} 个规则";
+                }
+                else
+                {
+                    TextBlockFloatingWindowInterceptorStatus.Text = $"拦截器未初始化 - 已启用 {enabledRulesCount}/{totalRulesCount} 个规则";
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"更新悬浮窗拦截UI失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 窗口被拦截事件处理
+        /// </summary>
+        private void OnFloatingWindowIntercepted(object sender, FloatingWindowInterceptor.WindowInterceptedEventArgs e)
+        {
+            try
+            {
+                // 在UI线程中更新状态
+                Dispatcher.BeginInvoke(new Action(() =>
+                {
+                    UpdateFloatingWindowInterceptorUI();
+                }));
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"处理窗口拦截事件失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 窗口被恢复事件处理
+        /// </summary>
+        private void OnFloatingWindowRestored(object sender, FloatingWindowInterceptor.WindowRestoredEventArgs e)
+        {
+            try
+            {
+                // 在UI线程中更新状态
+                Dispatcher.BeginInvoke(new Action(() =>
+                {
+                    UpdateFloatingWindowInterceptorUI();
+                }));
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"处理窗口恢复事件失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        #endregion
+
+        #region 悬浮窗拦截事件处理
+
+        /// <summary>
+        /// 主开关切换事件
+        /// </summary>
+        private void ToggleSwitchFloatingWindowInterceptorEnabled_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+
+            try
+            {
+                Settings.Automation.FloatingWindowInterceptor.IsEnabled = ToggleSwitchFloatingWindowInterceptorEnabled.IsOn;
+
+                if (_floatingWindowInterceptorManager != null)
+                {
+                    if (Settings.Automation.FloatingWindowInterceptor.IsEnabled)
+                    {
+                        _floatingWindowInterceptorManager.Start();
+                    }
+                    else
+                    {
+                        _floatingWindowInterceptorManager.Stop();
+                    }
+                }
+
+                UpdateFloatingWindowInterceptorUI();
+                SaveSettingsToFile();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"切换悬浮窗拦截主开关失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 希沃白板3拦截开关
+        /// </summary>
+        private void ToggleSwitchSeewoWhiteboard3Floating_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoWhiteboard3Floating, ToggleSwitchSeewoWhiteboard3Floating.IsOn);
+        }
+
+        /// <summary>
+        /// 希沃白板5拦截开关
+        /// </summary>
+        private void ToggleSwitchSeewoWhiteboard5Floating_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoWhiteboard5Floating, ToggleSwitchSeewoWhiteboard5Floating.IsOn);
+        }
+
+        /// <summary>
+        /// 希沃白板5C拦截开关
+        /// </summary>
+        private void ToggleSwitchSeewoWhiteboard5CFloating_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoWhiteboard5CFloating, ToggleSwitchSeewoWhiteboard5CFloating.IsOn);
+        }
+
+        /// <summary>
+        /// 希沃品课侧栏拦截开关
+        /// </summary>
+        private void ToggleSwitchSeewoPincoSideBarFloating_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoPincoSideBarFloating, ToggleSwitchSeewoPincoSideBarFloating.IsOn);
+        }
+
+        /// <summary>
+        /// 希沃品课画笔拦截开关
+        /// </summary>
+        private void ToggleSwitchSeewoPincoDrawingFloating_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoPincoDrawingFloating, ToggleSwitchSeewoPincoDrawingFloating.IsOn);
+        }
+
+        /// <summary>
+        /// 希沃PPT小工具拦截开关
+        /// </summary>
+        private void ToggleSwitchSeewoPPTFloating_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoPPTFloating, ToggleSwitchSeewoPPTFloating.IsOn);
+        }
+
+        /// <summary>
+        /// AiClass拦截开关
+        /// </summary>
+        private void ToggleSwitchAiClassFloating_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            SetInterceptRule(FloatingWindowInterceptor.InterceptType.AiClassFloating, ToggleSwitchAiClassFloating.IsOn);
+        }
+
+        /// <summary>
+        /// 鸿合屏幕书写拦截开关
+        /// </summary>
+        private void ToggleSwitchHiteAnnotationFloating_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            SetInterceptRule(FloatingWindowInterceptor.InterceptType.HiteAnnotationFloating, ToggleSwitchHiteAnnotationFloating.IsOn);
+        }
+
+        /// <summary>
+        /// 畅言智慧课堂拦截开关
+        /// </summary>
+        private void ToggleSwitchChangYanFloating_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            SetInterceptRule(FloatingWindowInterceptor.InterceptType.ChangYanFloating, ToggleSwitchChangYanFloating.IsOn);
+        }
+
+        /// <summary>
+        /// 畅言PPT拦截开关
+        /// </summary>
+        private void ToggleSwitchChangYanPptFloating_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            SetInterceptRule(FloatingWindowInterceptor.InterceptType.ChangYanPptFloating, ToggleSwitchChangYanPptFloating.IsOn);
+        }
+
+        /// <summary>
+        /// 天喻教育云拦截开关
+        /// </summary>
+        private void ToggleSwitchIntelligentClassFloating_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            SetInterceptRule(FloatingWindowInterceptor.InterceptType.IntelligentClassFloating, ToggleSwitchIntelligentClassFloating.IsOn);
+        }
+
+        /// <summary>
+        /// 希沃桌面画笔拦截开关
+        /// </summary>
+        private void ToggleSwitchSeewoDesktopAnnotationFloating_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoDesktopAnnotationFloating, ToggleSwitchSeewoDesktopAnnotationFloating.IsOn);
+        }
+
+        /// <summary>
+        /// 希沃桌面侧栏拦截开关
+        /// </summary>
+        private void ToggleSwitchSeewoDesktopSideBarFloating_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoDesktopSideBarFloating, ToggleSwitchSeewoDesktopSideBarFloating.IsOn);
+        }
+
+        /// <summary>
+        /// 设置拦截规则
+        /// </summary>
+        /// <param name="type">拦截类型</param>
+        /// <param name="enabled">是否启用拦截</param>
+        private void SetInterceptRule(FloatingWindowInterceptor.InterceptType type, bool enabled)
+        {
+            try
+            {
+                if (_floatingWindowInterceptorManager != null)
+                {
+                    _floatingWindowInterceptorManager.SetInterceptRule(type, enabled);
+                }
+
+                // 更新设置
+                var ruleName = type.ToString();
+                if (Settings.Automation.FloatingWindowInterceptor.InterceptRules.ContainsKey(ruleName))
+                {
+                    Settings.Automation.FloatingWindowInterceptor.InterceptRules[ruleName] = enabled;
+                }
+
+                // 获取规则信息以处理父子关系
+                var rule = _floatingWindowInterceptorManager?.GetInterceptRule(type);
+                if (rule != null)
+                {
+                    // 如果是父规则，更新所有子规则的设置
+                    if (rule.ChildTypes.Count > 0)
+                    {
+                        foreach (var childType in rule.ChildTypes)
+                        {
+                            var childRuleName = childType.ToString();
+                            if (Settings.Automation.FloatingWindowInterceptor.InterceptRules.ContainsKey(childRuleName))
+                            {
+                                Settings.Automation.FloatingWindowInterceptor.InterceptRules[childRuleName] = enabled;
+                            }
+                        }
+                    }
+                    // 如果是子规则，更新父规则的设置
+                    else if (rule.ParentType.HasValue)
+                    {
+                        var parentRule = _floatingWindowInterceptorManager?.GetInterceptRule(rule.ParentType.Value);
+                        if (parentRule != null)
+                        {
+                            var parentRuleName = rule.ParentType.Value.ToString();
+                            if (Settings.Automation.FloatingWindowInterceptor.InterceptRules.ContainsKey(parentRuleName))
+                            {
+                                Settings.Automation.FloatingWindowInterceptor.InterceptRules[parentRuleName] = parentRule.IsEnabled;
+                            }
+                        }
+                    }
+                }
+
+                // 更新UI显示
+                UpdateFloatingWindowInterceptorUI();
+
+                SaveSettingsToFile();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"设置拦截规则失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+        #endregion
+    }
+}

Ink Canvas/MainWindow_cs/MW_Hotkeys.cs

@@ -1,90 +1,117 @@
-using System.Windows;
+using System;
+using System.Windows;
 using System.Windows.Input;
 
 namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
+        /// <summary>
+        /// 鼠标滚轮事件处理，用于PPT翻页
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">鼠标滚轮事件参数</param>
         private void Window_MouseWheel(object sender, MouseWheelEventArgs e)
         {
-            // 只有在PPT放映模式下才响应鼠标滚轮翻页
-            if (StackPanelPPTControls.Visibility != Visibility.Visible || 
-                currentMode != 0 || 
-                BtnPPTSlideShowEnd.Visibility != Visibility.Visible ||
-                PPTManager?.IsInSlideShow != true) return;
-
-            // 直接发送翻页请求到PPT放映软件，不通过软件处理
+            if (BtnPPTSlideShowEnd.Visibility != Visibility.Visible || currentMode != 0) return;
             if (e.Delta >= 120)
             {
-                // 上一页 - 发送PageUp键到PPT放映窗口
-                SendKeyToPPTSlideShow(true);
+                BtnPPTSlidesUp_Click(null, null);
             }
             else if (e.Delta <= -120)
             {
-                // 下一页 - 发送PageDown键到PPT放映窗口
-                SendKeyToPPTSlideShow(false);
+                BtnPPTSlidesDown_Click(null, null);
             }
         }
 
+        /// <summary>
+        /// 键盘按键预览事件处理，用于PPT翻页
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">键盘事件参数</param>
         private void Main_Grid_PreviewKeyDown(object sender, KeyEventArgs e)
         {
-            // 只有在PPT放映模式下才响应键盘翻页快捷键
-            if (StackPanelPPTControls.Visibility != Visibility.Visible || 
-                currentMode != 0 || 
-                BtnPPTSlideShowEnd.Visibility != Visibility.Visible ||
-                PPTManager?.IsInSlideShow != true) return;
+            if (BtnPPTSlideShowEnd.Visibility != Visibility.Visible || currentMode != 0) return;
 
-            // 直接发送翻页请求到PPT放映软件，不通过软件处理
-            if (e.Key == Key.Down || e.Key == Key.PageDown || e.Key == Key.Right || e.Key == Key.N ||
-                e.Key == Key.Space)
+            if (e.Key == Key.Down || e.Key == Key.PageDown || e.Key == Key.Right || e.Key == Key.N || e.Key == Key.Space)
             {
-                e.Handled = true; // 阻止事件继续传播
-                SendKeyToPPTSlideShow(false); // 下一页
+                BtnPPTSlidesDown_Click(null, null);
             }
-            else if (e.Key == Key.Up || e.Key == Key.PageUp || e.Key == Key.Left || e.Key == Key.P)
+            if (e.Key == Key.Up || e.Key == Key.PageUp || e.Key == Key.Left || e.Key == Key.P)
             {
-                e.Handled = true; // 阻止事件继续传播
-                SendKeyToPPTSlideShow(true); // 上一页
+                BtnPPTSlidesUp_Click(null, null);
             }
         }
 
-        // 保留PPT翻页快捷键处理
-        // 以下方法保留供全局快捷键调用
 
+        /// <summary>
+        /// 撤销操作热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
         private void HotKey_Undo(object sender, ExecutedRoutedEventArgs e)
         {
             try
             {
                 SymbolIconUndo_MouseUp(lastBorderMouseDownObject, null);
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
 
+        /// <summary>
+        /// 重做操作热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
         private void HotKey_Redo(object sender, ExecutedRoutedEventArgs e)
         {
             try
             {
                 SymbolIconRedo_MouseUp(lastBorderMouseDownObject, null);
             }
-            catch { }
+            catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
 
+        /// <summary>
+        /// 清空画布热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
         private void HotKey_Clear(object sender, ExecutedRoutedEventArgs e)
         {
             SymbolIconDelete_MouseUp(lastBorderMouseDownObject, null);
         }
 
 
+        /// <summary>
+        /// 退出PPT放映热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
         internal void KeyExit(object sender, ExecutedRoutedEventArgs e)
         {
             if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible) BtnPPTSlideShowEnd_Click(BtnPPTSlideShowEnd, null);
         }
 
+        /// <summary>
+        /// 切换到绘图工具热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
         private void KeyChangeToDrawTool(object sender, ExecutedRoutedEventArgs e)
         {
             PenIcon_Click(lastBorderMouseDownObject, null);
         }
 
+        /// <summary>
+        /// 退出绘图工具热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
+        /// <remarks>
+        /// 在白板模式下，alt+q 退出白板模式
+        /// 在非白板模式下，alt+q 切换到鼠标模式
+        /// </remarks>
         internal void KeyChangeToQuitDrawTool(object sender, ExecutedRoutedEventArgs e)
         {
             if (currentMode != 0)
@@ -99,12 +126,24 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 切换到选择工具热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
+        /// <remarks>仅当画布控件面板可见时生效</remarks>
         private void KeyChangeToSelect(object sender, ExecutedRoutedEventArgs e)
         {
             if (StackPanelCanvasControls.Visibility == Visibility.Visible)
                 SymbolIconSelect_MouseUp(lastBorderMouseDownObject, null);
         }
 
+        /// <summary>
+        /// 切换到橡皮擦工具热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
+        /// <remarks>仅当画布控件面板可见时生效，根据当前橡皮擦状态选择相应的橡皮擦模式</remarks>
         private void KeyChangeToEraser(object sender, ExecutedRoutedEventArgs e)
         {
             if (StackPanelCanvasControls.Visibility == Visibility.Visible)
@@ -116,21 +155,42 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 切换到白板模式热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
         private void KeyChangeToBoard(object sender, ExecutedRoutedEventArgs e)
         {
             ImageBlackboard_MouseUp(lastBorderMouseDownObject, null);
         }
 
+        /// <summary>
+        /// 屏幕截图热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
         private void KeyCapture(object sender, ExecutedRoutedEventArgs e)
         {
             SaveScreenShotToDesktop();
         }
 
+        /// <summary>
+        /// 绘制直线热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
+        /// <remarks>仅当画布控件面板可见时生效</remarks>
         private void KeyDrawLine(object sender, ExecutedRoutedEventArgs e)
         {
             if (StackPanelCanvasControls.Visibility == Visibility.Visible) BtnDrawLine_Click(lastMouseDownSender, null);
         }
 
+        /// <summary>
+        /// 隐藏工具栏热键处理
+        /// </summary>
+        /// <param name="sender">发送者</param>
+        /// <param name="e">执行路由事件参数</param>
         private void KeyHide(object sender, ExecutedRoutedEventArgs e)
         {
             SymbolIconEmoji_MouseUp(null, null);

Ink Canvas/MainWindow_cs/MW_Icons.cs

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

Ink Canvas/MainWindow_cs/MW_ImageInsert.cs

@@ -27,17 +27,35 @@ namespace Ink_Canvas
     {
         public Rectangle Area;
         public List<Point> Path;
+        public Bitmap CameraImage;
+        public BitmapSource CameraBitmapSource;
+        public bool AddToWhiteboard;
 
-        public ScreenshotResult(Rectangle area, List<Point> path = null)
+        public ScreenshotResult(Rectangle area, List<Point> path = null, Bitmap cameraImage = null,
+            BitmapSource cameraBitmapSource = null, bool addToWhiteboard = false)
         {
             Area = area;
             Path = path;
+            CameraImage = cameraImage;
+            CameraBitmapSource = cameraBitmapSource;
+            AddToWhiteboard = addToWhiteboard;
         }
     }
 
     public partial class MainWindow : Window
     {
-        // 截图并插入到画布
+        /// <summary>
+        /// 截图并插入到画布
+        /// </summary>
+        /// <returns>异步任务</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 隐藏主窗口以避免截图包含窗口本身
+        /// 2. 启动区域选择截图
+        /// 3. 恢复窗口显示
+        /// 4. 处理截图结果并插入到画布
+        /// 5. 支持摄像头截图和区域截图
+        /// </remarks>
         private async Task CaptureScreenshotAndInsert()
         {
             try
@@ -55,34 +73,54 @@ namespace Ink_Canvas
                 // 恢复窗口显示
                 Visibility = originalVisibility;
 
-                if (screenshotResult.HasValue && screenshotResult.Value.Area.Width > 0 && screenshotResult.Value.Area.Height > 0)
+                if (screenshotResult.HasValue)
                 {
-                    // 截取选定区域
-                    using (var originalBitmap = CaptureScreenArea(screenshotResult.Value.Area))
+                    if (screenshotResult.Value.AddToWhiteboard)
                     {
-                        if (originalBitmap != null)
+                        await AddScreenshotToNewWhiteboardPage(screenshotResult.Value);
+                        return;
+                    }
+
+                    // 检查是否是摄像头截图
+                    if (screenshotResult.Value.CameraBitmapSource != null)
+                    {
+                        // 摄像头截图（使用BitmapSource）
+                        await InsertBitmapSourceToCanvas(screenshotResult.Value.CameraBitmapSource, "摄像头截图已插入到画布", "插入摄像头截图失败");
+                    }
+                    else if (screenshotResult.Value.CameraImage != null)
+                    {
+                        // 摄像头截图（使用Bitmap）
+                        await InsertScreenshotToCanvas(screenshotResult.Value.CameraImage);
+                    }
+                    else if (screenshotResult.Value.Area.Width > 0 && screenshotResult.Value.Area.Height > 0)
+                    {
+                        // 屏幕截图
+                        using (var originalBitmap = CaptureScreenArea(screenshotResult.Value.Area))
                         {
-                            Bitmap finalBitmap = originalBitmap;
-                            bool needDisposeFinalBitmap = false;
-
-                            try
+                            if (originalBitmap != null)
                             {
-                                // 如果有路径信息，应用形状遮罩
-                                if (screenshotResult.Value.Path != null && screenshotResult.Value.Path.Count > 0)
+                                Bitmap finalBitmap = originalBitmap;
+                                bool needDisposeFinalBitmap = false;
+
+                                try
                                 {
-                                    finalBitmap = ApplyShapeMask(originalBitmap, screenshotResult.Value.Path, screenshotResult.Value.Area);
-                                    needDisposeFinalBitmap = true; // 标记需要释放新创建的位图
+                                    // 如果有路径信息，应用形状遮罩
+                                    if (screenshotResult.Value.Path != null && screenshotResult.Value.Path.Count > 0)
+                                    {
+                                        finalBitmap = ApplyShapeMask(originalBitmap, screenshotResult.Value.Path, screenshotResult.Value.Area);
+                                        needDisposeFinalBitmap = true; // 标记需要释放新创建的位图
+                                    }
+
+                                    // 将截图转换为WPF Image并插入到画布
+                                    await InsertScreenshotToCanvas(finalBitmap);
                                 }
-
-                                // 将截图转换为WPF Image并插入到画布
-                                await InsertScreenshotToCanvas(finalBitmap);
-                            }
-                            finally
-                            {
-                                // 如果创建了新的位图，需要释放它
-                                if (needDisposeFinalBitmap && finalBitmap != originalBitmap)
+                                finally
                                 {
-                                    finalBitmap.Dispose();
+                                    // 如果创建了新的位图，需要释放它
+                                    if (needDisposeFinalBitmap && finalBitmap != originalBitmap)
+                                    {
+                                        finalBitmap.Dispose();
+                                    }
                                 }
                             }
                         }
@@ -100,7 +138,67 @@ namespace Ink_Canvas
             }
         }
 
-        // 显示截图区域选择器
+        /// <summary>
+        /// 直接全屏截图并插入到画布
+        /// </summary>
+        /// <returns>异步任务</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 隐藏主窗口以避免截图包含窗口本身
+        /// 2. 获取虚拟屏幕边界
+        /// 3. 截取全屏
+        /// 4. 将截图转换为WPF Image并插入到画布
+        /// 5. 恢复窗口显示
+        /// </remarks>
+        private async Task CaptureFullScreenAndInsert()
+        {
+            try
+            {
+                // 隐藏主窗口以避免截图包含窗口本身
+                var originalVisibility = Visibility;
+                Visibility = Visibility.Hidden;
+
+                // 等待窗口隐藏
+                await Task.Delay(200);
+
+                // 获取虚拟屏幕边界
+                var virtualScreen = SystemInformation.VirtualScreen;
+                var fullScreenArea = new Rectangle(virtualScreen.X, virtualScreen.Y, virtualScreen.Width, virtualScreen.Height);
+
+                // 截取全屏
+                using (var fullScreenBitmap = CaptureScreenArea(fullScreenArea))
+                {
+                    if (fullScreenBitmap != null)
+                    {
+                        // 将截图转换为WPF Image并插入到画布
+                        await InsertScreenshotToCanvas(fullScreenBitmap);
+                    }
+                    else
+                    {
+                        ShowNotification("全屏截图失败");
+                    }
+                }
+
+                // 恢复窗口显示
+                Visibility = originalVisibility;
+            }
+            catch (Exception ex)
+            {
+                ShowNotification($"全屏截图失败: {ex.Message}");
+                Visibility = Visibility.Visible;
+            }
+        }
+
+        /// <summary>
+        /// 显示截图区域选择器
+        /// </summary>
+        /// <returns>截图结果，包含区域、路径和摄像头截图信息</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 显示截图选择器窗口
+        /// 2. 获取用户选择的区域或摄像头截图
+        /// 3. 返回截图结果
+        /// </remarks>
         private async Task<ScreenshotResult?> ShowScreenshotSelector()
         {
             ScreenshotResult? result = null;
@@ -112,10 +210,37 @@ namespace Ink_Canvas
                     var selectorWindow = new ScreenshotSelectorWindow();
                     if (selectorWindow.ShowDialog() == true)
                     {
-                        result = new ScreenshotResult(
-                            selectorWindow.SelectedArea.Value,
-                            selectorWindow.SelectedPath
-                        );
+                        // 检查是否是摄像头截图
+                        if (selectorWindow.CameraBitmapSource != null)
+                        {
+                            result = new ScreenshotResult(
+                                Rectangle.Empty, // 摄像头截图不需要区域
+                                null, // 摄像头截图不需要路径
+                                null, // 不再使用Bitmap
+                                selectorWindow.CameraBitmapSource, // 摄像头BitmapSource
+                                selectorWindow.ShouldAddToWhiteboard
+                            );
+                        }
+                        else if (selectorWindow.CameraImage != null)
+                        {
+                            result = new ScreenshotResult(
+                                Rectangle.Empty, // 摄像头截图不需要区域
+                                null, // 摄像头截图不需要路径
+                                selectorWindow.CameraImage, // 摄像头图像
+                                null,
+                                selectorWindow.ShouldAddToWhiteboard
+                            );
+                        }
+                        else
+                        {
+                            result = new ScreenshotResult(
+                                selectorWindow.SelectedArea.Value,
+                                selectorWindow.SelectedPath,
+                                null,
+                                null,
+                                selectorWindow.ShouldAddToWhiteboard
+                            );
+                        }
                     }
                 });
             }
@@ -127,7 +252,19 @@ namespace Ink_Canvas
             return result;
         }
 
-        // 截取指定屏幕区域
+        /// <summary>
+        /// 截取指定屏幕区域
+        /// </summary>
+        /// <param name="area">要截取的屏幕区域</param>
+        /// <returns>截取的位图</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 确保区域在有效范围内
+        /// 2. 调整区域边界，确保不超出屏幕范围
+        /// 3. 创建支持透明度的位图
+        /// 4. 设置高质量渲染
+        /// 5. 截取屏幕区域
+        /// </remarks>
         private Bitmap CaptureScreenArea(Rectangle area)
         {
             try
@@ -158,7 +295,6 @@ namespace Ink_Canvas
                     graphics.CopyFromScreen(x, y, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy);
                 }
 
-                LogHelper.WriteLogToFile($"成功截取区域: X={x}, Y={y}, Width={width}, Height={height}");
                 return bitmap;
             }
             catch (Exception ex)
@@ -168,14 +304,45 @@ namespace Ink_Canvas
             }
         }
 
-        // 将截图插入到画布
+        /// <summary>
+        /// 将截图插入到画布
+        /// </summary>
+        /// <param name="bitmap">要插入的位图</param>
+        /// <returns>异步任务</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 验证位图有效性
+        /// 2. 将Bitmap转换为WPF BitmapSource
+        /// 3. 创建WPF Image控件
+        /// 4. 生成唯一名称
+        /// 5. 初始化TransformGroup
+        /// 6. 设置截图属性，避免被InkCanvas选择系统处理
+        /// 7. 初始化InkCanvas选择设置
+        /// 8. 等待图片加载完成后进行居中处理
+        /// 9. 添加到画布
+        /// 10. 提交历史记录
+        /// 11. 插入图片后切换到选择模式并刷新浮动栏高光显示
+        /// </remarks>
         private async Task InsertScreenshotToCanvas(Bitmap bitmap)
         {
             try
             {
+                // 验证位图有效性
+                if (bitmap == null || bitmap.Width <= 0 || bitmap.Height <= 0)
+                {
+                    ShowNotification("无效的截图");
+                    return;
+                }
+
                 // 将Bitmap转换为WPF BitmapSource
                 var bitmapSource = ConvertBitmapToBitmapSource(bitmap);
 
+                if (bitmapSource == null)
+                {
+                    ShowNotification("转换截图失败");
+                    return;
+                }
+
                 // 创建WPF Image控件
                 var image = new Image
                 {
@@ -216,6 +383,11 @@ namespace Ink_Canvas
                 // 提交历史记录
                 timeMachine.CommitElementInsertHistory(image);
 
+                // 插入图片后切换到选择模式并刷新浮动栏高光显示
+                SetCurrentToolMode(InkCanvasEditingMode.Select);
+                UpdateCurrentToolMode("select");
+                HideSubPanels("select");
+
                 ShowNotification("截图已插入到画布");
             }
             catch (Exception ex)
@@ -223,9 +395,94 @@ namespace Ink_Canvas
                 ShowNotification($"插入截图失败: {ex.Message}");
                 LogHelper.WriteLogToFile($"插入截图失败: {ex.Message}", LogHelper.LogType.Error);
             }
+            finally
+            {
+                bitmap?.Dispose();
+            }
         }
 
-        // 初始化截图的TransformGroup
+        /// <summary>
+        /// 将BitmapSource插入到画布（用于摄像头截图）
+        /// </summary>
+        /// <param name="bitmapSource">要插入的BitmapSource</param>
+        /// <returns>异步任务</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 创建WPF Image控件
+        /// 2. 生成唯一名称
+        /// 3. 初始化TransformGroup
+        /// 4. 设置截图属性，避免被InkCanvas选择系统处理
+        /// 5. 初始化InkCanvas选择设置
+        /// 6. 等待图片加载完成后进行居中处理
+        /// 7. 添加到画布
+        /// 8. 提交历史记录
+        /// 9. 插入图片后切换到选择模式并刷新浮动栏高光显示
+        /// </remarks>
+        private async Task InsertBitmapSourceToCanvas(BitmapSource bitmapSource, string successMessage = "截图已插入到画布", string failureMessagePrefix = "插入截图失败")
+        {
+            try
+            {
+                // 创建WPF Image控件
+                var image = new Image
+                {
+                    Source = bitmapSource,
+                    Stretch = Stretch.Uniform
+                };
+                RenderOptions.SetBitmapScalingMode(image, BitmapScalingMode.HighQuality);
+
+                // 生成唯一名称
+                string timestamp = "camera_" + DateTime.Now.ToString("yyyyMMdd_HH_mm_ss_fff");
+                image.Name = timestamp;
+
+                // 初始化TransformGroup
+                InitializeScreenshotTransform(image);
+
+                // 设置截图属性，避免被InkCanvas选择系统处理
+                image.IsHitTestVisible = true;
+                image.Focusable = false;
+
+                // 初始化InkCanvas选择设置
+                InitializeInkCanvasSelectionSettings();
+
+                // 等待图片加载完成后再进行居中处理
+                image.Loaded += (sender, e) =>
+                {
+                    // 确保在UI线程中执行
+                    Dispatcher.BeginInvoke(new Action(() =>
+                    {
+                        CenterAndScaleScreenshot(image);
+                        // 绑定事件处理器
+                        BindScreenshotEvents(image);
+                    }), DispatcherPriority.Loaded);
+                };
+
+                // 添加到画布
+                inkCanvas.Children.Add(image);
+
+                // 提交历史记录
+                timeMachine.CommitElementInsertHistory(image);
+
+                // 插入图片后切换到选择模式并刷新浮动栏高光显示
+                SetCurrentToolMode(InkCanvasEditingMode.Select);
+                UpdateCurrentToolMode("select");
+                HideSubPanels("select");
+
+                ShowNotification(successMessage);
+            }
+            catch (Exception ex)
+            {
+                ShowNotification($"{failureMessagePrefix}: {ex.Message}");
+                LogHelper.WriteLogToFile($"插入摄像头截图失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 初始化截图的TransformGroup
+        /// </summary>
+        /// <param name="image">要初始化的Image控件</param>
+        /// <remarks>
+        /// 该方法会为截图创建一个包含缩放、平移和旋转变换的TransformGroup。
+        /// </remarks>
         private void InitializeScreenshotTransform(Image image)
         {
             var transformGroup = new TransformGroup();
@@ -235,7 +492,17 @@ namespace Ink_Canvas
             image.RenderTransform = transformGroup;
         }
 
-        // 绑定截图事件处理器
+        /// <summary>
+        /// 绑定截图事件处理器
+        /// </summary>
+        /// <param name="image">要绑定事件的Image控件</param>
+        /// <remarks>
+        /// 该方法会为截图绑定以下事件：
+        /// 1. 鼠标事件（按下、释放、移动、滚轮）
+        /// 2. 触摸事件（按下、释放、操作）
+        /// 3. 设置光标为手形
+        /// 4. 禁用InkCanvas对截图的选择处理
+        /// </remarks>
         private void BindScreenshotEvents(Image image)
         {
             // 鼠标事件
@@ -245,6 +512,8 @@ namespace Ink_Canvas
             image.MouseWheel += Element_MouseWheel;
 
             // 触摸事件
+            image.TouchDown += Element_TouchDown;
+            image.TouchUp += Element_TouchUp;
             image.IsManipulationEnabled = true;
             image.ManipulationDelta += Element_ManipulationDelta;
             image.ManipulationCompleted += Element_ManipulationCompleted;
@@ -257,7 +526,27 @@ namespace Ink_Canvas
             image.Focusable = false;
         }
 
-        // 专门为截图优化的居中缩放方法
+        /// <summary>
+        /// 专门为截图优化的居中缩放方法
+        /// </summary>
+        /// <param name="image">要居中缩放的Image控件</param>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 确保图片已加载
+        /// 2. 获取画布的实际尺寸
+        /// 3. 如果画布尺寸为0，使用窗口尺寸作为备选
+        /// 4. 如果仍然为0，使用屏幕尺寸
+        /// 5. 计算最大允许尺寸（画布的80%）
+        /// 6. 获取图片的原始尺寸
+        /// 7. 计算缩放比例
+        /// 8. 如果图片本身比最大尺寸小，不进行缩放
+        /// 9. 计算新的尺寸
+        /// 10. 设置图片尺寸
+        /// 11. 计算居中位置
+        /// 12. 确保位置不为负数
+        /// 13. 设置位置
+        /// 14. 保持滚轮缩放和拖动功能
+        /// </remarks>
         private void CenterAndScaleScreenshot(Image image)
         {
             try
@@ -332,7 +621,6 @@ namespace Ink_Canvas
                     InitializeScreenshotTransform(image);
                 }
 
-                LogHelper.WriteLogToFile($"截图居中完成: 位置({centerX}, {centerY}), 尺寸({newWidth}x{newHeight})");
             }
             catch (Exception ex)
             {
@@ -342,7 +630,27 @@ namespace Ink_Canvas
             }
         }
 
-        // 应用形状遮罩到截图
+        /// <summary>
+        /// 应用形状遮罩到截图
+        /// </summary>
+        /// <param name="bitmap">要应用遮罩的位图</param>
+        /// <param name="path">遮罩路径</param>
+        /// <param name="area">截图区域</param>
+        /// <returns>应用遮罩后的位图</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 验证路径参数
+        /// 2. 获取DPI缩放比例
+        /// 3. 创建结果位图，确保支持透明度
+        /// 4. 首先将整个位图设置为透明
+        /// 5. 创建路径
+        /// 6. 转换WPF坐标到GDI+坐标，考虑DPI缩放和屏幕偏移
+        /// 7. 添加路径
+        /// 8. 验证路径是否有效
+        /// 9. 设置裁剪区域为路径内部
+        /// 10. 在裁剪区域内绘制原始图像
+        /// 11. 重置裁剪区域，确保后续操作不受影响
+        /// </remarks>
         private Bitmap ApplyShapeMask(Bitmap bitmap, List<Point> path, Rectangle area)
         {
             try
@@ -428,34 +736,227 @@ namespace Ink_Canvas
             }
         }
 
-        // 将System.Drawing.Bitmap转换为WPF BitmapSource
+        /// <summary>
+        /// 将System.Drawing.Bitmap转换为WPF BitmapSource
+        /// </summary>
+        /// <param name="bitmap">要转换的位图</param>
+        /// <returns>转换后的BitmapSource</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 验证位图有效性
+        /// 2. 验证位图尺寸
+        /// 3. 使用更安全的方法转换位图
+        /// 4. 根据像素格式选择合适的WPF像素格式
+        /// 5. 创建BitmapSource
+        /// 6. 冻结BitmapSource以提高性能
+        /// 7. 如果转换失败，尝试使用备用方法
+        /// </remarks>
         private BitmapSource ConvertBitmapToBitmapSource(Bitmap bitmap)
         {
             try
             {
-                using (var memory = new MemoryStream())
+                // 验证位图有效性
+                if (bitmap == null)
+                    return null;
+
+                // 验证位图尺寸
+                if (bitmap.Width <= 0 || bitmap.Height <= 0)
+                    return null;
+
+                // 使用更安全的方法转换位图
+                var bitmapData = bitmap.LockBits(
+                    new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+                    ImageLockMode.ReadOnly,
+                    bitmap.PixelFormat);
+
+                try
                 {
-                    bitmap.Save(memory, ImageFormat.Png);
-                    memory.Position = 0;
+                    // 根据像素格式选择合适的WPF像素格式
+                    System.Windows.Media.PixelFormat wpfPixelFormat;
+                    switch (bitmap.PixelFormat)
+                    {
+                        case PixelFormat.Format24bppRgb:
+                            wpfPixelFormat = PixelFormats.Bgr24;
+                            break;
+                        case PixelFormat.Format32bppArgb:
+                            wpfPixelFormat = PixelFormats.Bgra32;
+                            break;
+                        case PixelFormat.Format32bppRgb:
+                            wpfPixelFormat = PixelFormats.Bgr32;
+                            break;
+                        default:
+                            wpfPixelFormat = PixelFormats.Bgr24;
+                            break;
+                    }
 
-                    var bitmapImage = new BitmapImage();
-                    bitmapImage.BeginInit();
-                    bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
-                    bitmapImage.StreamSource = memory;
-                    bitmapImage.EndInit();
-                    bitmapImage.Freeze();
+                    var bitmapSource = BitmapSource.Create(
+                        bitmapData.Width,
+                        bitmapData.Height,
+                        bitmap.HorizontalResolution,
+                        bitmap.VerticalResolution,
+                        wpfPixelFormat,
+                        null,
+                        bitmapData.Scan0,
+                        bitmapData.Stride * bitmapData.Height,
+                        bitmapData.Stride);
 
-                    return bitmapImage;
+                    bitmapSource.Freeze();
+                    return bitmapSource;
+                }
+                finally
+                {
+                    bitmap.UnlockBits(bitmapData);
                 }
             }
             catch (Exception ex)
             {
                 LogHelper.WriteLogToFile($"转换位图失败: {ex.Message}", LogHelper.LogType.Error);
+
+                // 尝试使用备用方法：内存流转换
+                try
+                {
+                    return ConvertBitmapToBitmapSourceFallback(bitmap);
+                }
+                catch (Exception fallbackEx)
+                {
+                    LogHelper.WriteLogToFile($"备用转换方法也失败: {fallbackEx.Message}", LogHelper.LogType.Error);
+
+                    // 最后尝试：使用最简单的转换方法
+                    try
+                    {
+                        return ConvertBitmapToBitmapSourceSimple(bitmap);
+                    }
+                    catch (Exception simpleEx)
+                    {
+                        LogHelper.WriteLogToFile($"简单转换方法也失败: {simpleEx.Message}", LogHelper.LogType.Error);
+                        throw;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 备用的位图转换方法（使用内存流）
+        /// </summary>
+        /// <param name="bitmap">要转换的位图</param>
+        /// <returns>转换后的BitmapSource</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 验证位图有效性
+        /// 2. 创建一个新的位图，确保格式正确
+        /// 3. 在内存流中保存为PNG格式
+        /// 4. 创建BitmapImage并加载内存流中的数据
+        /// 5. 冻结BitmapImage以提高性能
+        /// </remarks>
+        private BitmapSource ConvertBitmapToBitmapSourceFallback(Bitmap bitmap)
+        {
+            try
+            {
+                // 验证位图有效性
+                if (bitmap == null || bitmap.Width <= 0 || bitmap.Height <= 0)
+                    return null;
+
+                // 创建一个新的位图，确保保留Alpha通道
+                using (var convertedBitmap = new Bitmap(bitmap.Width, bitmap.Height, PixelFormat.Format32bppArgb))
+                {
+                    using (var graphics = Graphics.FromImage(convertedBitmap))
+                    {
+                        graphics.CompositingMode = CompositingMode.SourceCopy;
+                        graphics.DrawImage(bitmap, 0, 0);
+                    }
+
+                    using (var memory = new MemoryStream())
+                    {
+                        convertedBitmap.Save(memory, ImageFormat.Png);
+                        memory.Position = 0;
+
+                        var bitmapImage = new BitmapImage();
+                        bitmapImage.BeginInit();
+                        bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
+                        bitmapImage.StreamSource = memory;
+                        bitmapImage.EndInit();
+                        bitmapImage.Freeze();
+
+                        return bitmapImage;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"备用转换方法失败: {ex.Message}", LogHelper.LogType.Error);
                 throw;
             }
         }
 
-        // 获取DPI缩放比例
+        /// <summary>
+        /// 最简单的位图转换方法
+        /// </summary>
+        /// <param name="bitmap">要转换的位图</param>
+        /// <returns>转换后的BitmapSource</returns>
+        /// <remarks>
+        /// 该方法会：
+        /// 1. 验证位图有效性
+        /// 2. 使用最基础的方法：直接保存为PNG然后加载
+        /// 3. 创建临时文件
+        /// 4. 将位图保存为PNG格式到临时文件
+        /// 5. 创建BitmapImage并加载临时文件
+        /// 6. 冻结BitmapImage以提高性能
+        /// 7. 清理临时文件
+        /// </remarks>
+        private BitmapSource ConvertBitmapToBitmapSourceSimple(Bitmap bitmap)
+        {
+            try
+            {
+                if (bitmap == null)
+                    return null;
+
+                // 使用最基础的方法：直接保存为PNG然后加载
+                var tempFile = Path.GetTempFileName() + ".png";
+
+                try
+                {
+                    bitmap.Save(tempFile, ImageFormat.Png);
+
+                    var bitmapImage = new BitmapImage();
+                    bitmapImage.BeginInit();
+                    bitmapImage.UriSource = new Uri(tempFile);
+                    bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
+                    bitmapImage.EndInit();
+                    bitmapImage.Freeze();
+
+                    return bitmapImage;
+                }
+                finally
+                {
+                    // 清理临时文件
+                    try
+                    {
+                        if (File.Exists(tempFile))
+                        {
+                            File.Delete(tempFile);
+                        }
+                    }
+                    catch (Exception deleteEx)
+                    {
+                        LogHelper.WriteLogToFile($"删除临时文件失败: {deleteEx.Message}", LogHelper.LogType.Warning);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"简单转换方法失败: {ex.Message}", LogHelper.LogType.Error);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// 获取DPI缩放比例
+        /// </summary>
+        /// <returns>DPI缩放比例</returns>
+        /// <remarks>
+        /// 该方法会从当前窗口的PresentationSource获取DPI缩放比例。
+        /// 如果无法获取，则返回默认值1.0。
+        /// </remarks>
         private double GetDpiScale()
         {
             var source = PresentationSource.FromVisual(this);
@@ -466,4 +967,4 @@ namespace Ink_Canvas
             return 1.0; // 默认DPI
         }
     }
-}
+}

Ink Canvas/MainWindow_cs/MW_Notification.cs

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

Ink Canvas/MainWindow_cs/MW_PageListView.cs

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

Ink Canvas/MainWindow_cs/MW_Save&OpenStrokes.cs

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

Ink Canvas/MainWindow_cs/MW_Screenshot.cs

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

Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs

@@ -1,8 +1,10 @@
-using Hardcodet.Wpf.TaskbarNotification;
+using Hardcodet.Wpf.TaskbarNotification;
 using Ink_Canvas.Helpers;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using OSVersionExtension;
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
@@ -10,14 +12,30 @@ using System.Windows.Ink;
 using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using System.Windows.Threading;
 using File = System.IO.File;
 using OperatingSystem = OSVersionExtension.OperatingSystem;
+using WinForms = System.Windows.Forms;
 
 namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
-        private void LoadSettings(bool isStartup = false)
+        /// <summary>
+        /// 从配置文件加载用户设置并将其应用到主窗口和相关控件的状态（包括启动、外观、画布、手势、PPT、自动化等各项配置）。
+        /// </summary>
+        /// <param name="isStartup">指示当前为应用启动阶段；为 true 时按启动流程应用启动相关设置（例如触发启动专用动作和启动时的行为）。</param>
+        /// <summary>
+        /// 从当前配置文件重新加载设置并应用到界面（热重载），不触发启动逻辑与自动更新检查。
+        /// 用于配置文件切换后立即生效。
+        /// </summary>
+        public void ReloadSettingsFromFile()
+        {
+            LoadSettings(false, skipAutoUpdateCheck: true);
+        }
+
+        /// <param name="skipAutoUpdateCheck">指示是否跳过自动更新检查；为 true 时不会在加载设置后执行自动更新检测。</param>
+        private void LoadSettings(bool isStartup = false, bool skipAutoUpdateCheck = false)
         {
             AppVersionTextBlock.Text = Assembly.GetExecutingAssembly().GetName().Version.ToString();
             try
@@ -28,12 +46,103 @@ namespace Ink_Canvas
                     {
                         string text = File.ReadAllText(App.RootPath + settingsFileName);
                         Settings = JsonConvert.DeserializeObject<Settings>(text);
+
+                        if (Settings != null)
+                        {
+                            CleanupObsoleteSettings(text);
+                        }
+
+                        // 验证设置是否成功加载
+                        if (Settings == null)
+                        {
+                            LogHelper.WriteLogToFile("配置文件解析失败，尝试从备份恢复", LogHelper.LogType.Warning);
+                            if (AutoBackupManager.TryRestoreFromBackup())
+                            {
+                                // 重新尝试加载
+                                text = File.ReadAllText(App.RootPath + settingsFileName);
+                                Settings = JsonConvert.DeserializeObject<Settings>(text);
+                                if (Settings != null)
+                                {
+                                    // 清理过期配置项
+                                    CleanupObsoleteSettings(text);
+                                }
+                            }
+
+                            // 如果仍然失败，使用默认设置
+                            if (Settings == null)
+                            {
+                                LogHelper.WriteLogToFile("从备份恢复失败，使用默认设置", LogHelper.LogType.Warning);
+                                BtnResetToSuggestion_Click(null, null);
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"配置文件加载失败: {ex.Message}", LogHelper.LogType.Error);
+
+                        // 尝试从备份恢复
+                        LogHelper.WriteLogToFile("尝试从备份恢复配置文件", LogHelper.LogType.Warning);
+                        if (AutoBackupManager.TryRestoreFromBackup())
+                        {
+                            try
+                            {
+                                string text = File.ReadAllText(App.RootPath + settingsFileName);
+                                Settings = JsonConvert.DeserializeObject<Settings>(text);
+                                if (Settings != null)
+                                {
+                                    // 清理过期配置项
+                                    CleanupObsoleteSettings(text);
+                                }
+                            }
+                            catch (Exception restoreEx)
+                            {
+                                LogHelper.WriteLogToFile($"从备份恢复后重新加载失败: {restoreEx.Message}", LogHelper.LogType.Error);
+                                BtnResetToSuggestion_Click(null, null);
+                            }
+                        }
+
+                        // 如果仍然失败，使用默认设置
+                        if (Settings == null)
+                        {
+                            LogHelper.WriteLogToFile("从备份恢复失败，使用默认设置", LogHelper.LogType.Warning);
+                            BtnResetToSuggestion_Click(null, null);
+                        }
                     }
-                    catch { }
                 }
                 else
                 {
-                    BtnResetToSuggestion_Click(null, null);
+                    LogHelper.WriteLogToFile("配置文件不存在，尝试从备份恢复", LogHelper.LogType.Warning);
+                    if (AutoBackupManager.TryRestoreFromBackup())
+                    {
+                        try
+                        {
+                            string text = File.ReadAllText(App.RootPath + settingsFileName);
+                            Settings = JsonConvert.DeserializeObject<Settings>(text);
+                            if (Settings != null)
+                            {
+                                // 清理过期配置项
+                                CleanupObsoleteSettings(text);
+                            }
+                        }
+                        catch (Exception restoreEx)
+                        {
+                            LogHelper.WriteLogToFile($"从备份恢复后加载失败: {restoreEx.Message}", LogHelper.LogType.Error);
+                            BtnResetToSuggestion_Click(null, null);
+                        }
+                    }
+                    else
+                    {
+                        // 备份恢复失败（备份目录不存在等），使用默认设置
+                        LogHelper.WriteLogToFile("备份恢复失败，使用默认设置", LogHelper.LogType.Warning);
+                        BtnResetToSuggestion_Click(null, null);
+                    }
+
+                    // 如果仍然失败，使用默认设置
+                    if (Settings == null)
+                    {
+                        LogHelper.WriteLogToFile("从备份恢复失败，使用默认设置", LogHelper.LogType.Warning);
+                        BtnResetToSuggestion_Click(null, null);
+                    }
                 }
             }
             catch (Exception ex)
@@ -41,12 +150,72 @@ namespace Ink_Canvas
                 LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
             }
 
+            try
+            {
+                if (Settings?.Appearance != null)
+                {
+                    var preferredLanguage = Settings.Appearance.Language ?? string.Empty;
+                    if (!string.IsNullOrWhiteSpace(preferredLanguage))
+                    {
+                        LocalizationHelper.TrySetCulture(preferredLanguage);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"从配置应用界面语言失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+
+            try
+            {
+                ProcessProtectionManager.ApplyFromSettings();
+            }
+            catch
+            {
+            }
+
             // Startup
             if (isStartup)
             {
                 CursorIcon_Click(null, null);
             }
 
+            try
+            {
+                if (Settings?.Startup != null)
+                {
+                    if (ComboBoxTelemetryUploadLevel != null)
+                    {
+                        int idx = 0;
+                        switch (Settings.Startup.TelemetryUploadLevel)
+                        {
+                            case TelemetryUploadLevel.None:
+                                idx = 0;
+                                break;
+                            case TelemetryUploadLevel.Basic:
+                                idx = 1;
+                                break;
+                            case TelemetryUploadLevel.Extended:
+                                idx = 2;
+                                break;
+                            default:
+                                idx = 0;
+                                break;
+                        }
+
+                        ComboBoxTelemetryUploadLevel.SelectedIndex = idx;
+                    }
+
+                    if (CheckBoxTelemetryPrivacyAccepted != null)
+                    {
+                        CheckBoxTelemetryPrivacyAccepted.IsChecked = Settings.Startup.HasAcceptedTelemetryPrivacy;
+                    }
+                }
+            }
+            catch
+            {
+            }
+
             try
             {
                 if (File.Exists(Environment.GetFolderPath(Environment.SpecialFolder.Startup) +
@@ -75,7 +244,7 @@ namespace Ink_Canvas
                             Settings.Automation.AutoDelSavedFilesDaysThreshold);
                     }
 
-                    if (Settings.Startup.IsFoldAtStartup)
+                    if (Settings.Startup.IsFoldAtStartup && !App.StartWithBoardMode)
                     {
                         FoldFloatingBar_MouseUp(Fold_Icon, null);
                     }
@@ -98,7 +267,7 @@ namespace Ink_Canvas
                 ToggleSwitchIsAutoUpdate.IsOn = Settings.Startup.IsAutoUpdate;
 
                 // 只有在启用了自动更新功能时才检查更新
-                if (Settings.Startup.IsAutoUpdate)
+                if (Settings.Startup.IsAutoUpdate && !skipAutoUpdateCheck)
                 {
                     if (isStartup)
                     {
@@ -113,7 +282,7 @@ namespace Ink_Canvas
                     }
                 }
 
-                // ToggleSwitchIsAutoUpdateWithSilence.Visibility = Settings.Startup.IsAutoUpdate ? Visibility.Visible : Visibility.Collapsed;
+                ToggleSwitchIsAutoUpdateWithSilence.Visibility = Settings.Startup.IsAutoUpdate ? Visibility.Visible : Visibility.Collapsed;
                 if (Settings.Startup.IsAutoUpdateWithSilence)
                 {
                     ToggleSwitchIsAutoUpdateWithSilence.IsOn = true;
@@ -245,10 +414,31 @@ namespace Ink_Canvas
                         break;
                 }
 
+                // 设置主题下拉框
+                ComboBoxTheme.SelectedIndex = Settings.Appearance.Theme;
+
                 ComboBoxChickenSoupSource.SelectedIndex = Settings.Appearance.ChickenSoupSource;
 
+                // 初始化自定义按钮的可见性（仅在选择API时显示）
+                if (BtnHitokotoCustomize != null)
+                {
+                    BtnHitokotoCustomize.Visibility = Settings.Appearance.ChickenSoupSource == 3
+                        ? Visibility.Visible
+                        : Visibility.Collapsed;
+                }
+
+                // 初始化HitokotoCategories，如果为空则默认全选
+                if (Settings.Appearance.HitokotoCategories == null || Settings.Appearance.HitokotoCategories.Count == 0)
+                {
+                    Settings.Appearance.HitokotoCategories = new List<string> { "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l" };
+                }
+
                 ToggleSwitchEnableQuickPanel.IsOn = Settings.Appearance.IsShowQuickPanel;
 
+                ToggleSwitchEnableSplashScreen.IsOn = Settings.Appearance.EnableSplashScreen;
+
+                ComboBoxSplashScreenStyle.SelectedIndex = Settings.Appearance.SplashScreenStyle;
+
                 ToggleSwitchEnableTrayIcon.IsOn = Settings.Appearance.EnableTrayIcon;
                 ICCTrayIconExampleImage.Visibility =
                     Settings.Appearance.EnableTrayIcon ? Visibility.Visible : Visibility.Collapsed;
@@ -256,7 +446,7 @@ namespace Ink_Canvas
                 _taskbar.Visibility = Settings.Appearance.EnableTrayIcon ? Visibility.Visible : Visibility.Collapsed;
 
                 ViewboxFloatingBar.Opacity = Settings.Appearance.ViewboxFloatingBarOpacityValue;
-                
+
                 // 初始化浮动栏透明度滑块值
                 ViewboxFloatingBarOpacityValueSlider.Value = Settings.Appearance.ViewboxFloatingBarOpacityValue;
                 ViewboxFloatingBarOpacityInPPTValueSlider.Value = Settings.Appearance.ViewboxFloatingBarOpacityInPPTValue;
@@ -320,6 +510,7 @@ namespace Ink_Canvas
                     Settings.Appearance.EnableChickenSoupInWhiteboardMode;
 
                 // 浮动栏按钮显示控制开关初始化
+                CheckBoxUseLegacyFloatingBarUI.IsChecked = Settings.Appearance.UseLegacyFloatingBarUI;
                 CheckBoxShowShapeButton.IsChecked = Settings.Appearance.IsShowShapeButton;
                 CheckBoxShowUndoButton.IsChecked = Settings.Appearance.IsShowUndoButton;
                 CheckBoxShowRedoButton.IsChecked = Settings.Appearance.IsShowRedoButton;
@@ -338,6 +529,9 @@ namespace Ink_Canvas
                 // 应用浮动栏按钮可见性设置
                 UpdateFloatingBarButtonsVisibility();
 
+                // 更新浮动栏图标
+                UpdateFloatingBarIcons();
+
                 SystemEvents_UserPreferenceChanged(null, null);
             }
             else
@@ -363,6 +557,11 @@ namespace Ink_Canvas
 
                 ToggleSwitchShowCanvasAtNewSlideShow.IsOn = Settings.PowerPointSettings.IsShowCanvasAtNewSlideShow;
 
+                if (ToggleSwitchUseRotPptLink != null)
+                {
+                    ToggleSwitchUseRotPptLink.IsOn = Settings.PowerPointSettings.UseRotPptLink;
+                }
+
                 ToggleSwitchEnableTwoFingerGestureInPresentationMode.IsOn =
                     Settings.PowerPointSettings.IsEnableTwoFingerGestureInPresentationMode;
 
@@ -374,6 +573,25 @@ namespace Ink_Canvas
 
                 ToggleSwitchNotifyPreviousPage.IsOn = Settings.PowerPointSettings.IsNotifyPreviousPage;
 
+                // PPT时间显示胶囊设置
+                if (ToggleSwitchEnablePPTTimeCapsule != null)
+                {
+                    ToggleSwitchEnablePPTTimeCapsule.IsOn = Settings.PowerPointSettings.EnablePPTTimeCapsule;
+                }
+                if (ComboBoxPPTTimeCapsulePosition != null)
+                {
+                    int position = Settings.PowerPointSettings.PPTTimeCapsulePosition;
+                    if (position < 0 || position > 2)
+                    {
+                        position = 1; // 默认右上角
+                    }
+                    ComboBoxPPTTimeCapsulePosition.SelectedIndex = position;
+                }
+                if (ToggleSwitchShowPPTSidebarByDefault != null)
+                {
+                    ToggleSwitchShowPPTSidebarByDefault.IsOn = Settings.PowerPointSettings.ShowPPTSidebarByDefault;
+                }
+
                 // -- new --
                 ToggleSwitchShowPPTButton.IsOn = Settings.PowerPointSettings.ShowPPTButton;
 
@@ -447,6 +665,38 @@ namespace Ink_Canvas
 
                 PPTButtonRBPositionValueSlider.Value = Settings.PowerPointSettings.PPTRBButtonPosition;
 
+                // 初始化PPT翻页按钮透明度滑块值，根据半透明选项设置默认值
+                // 重用之前定义的sopsc和bopsc变量
+                bool isSideHalfOpacity = sopsc.Length >= 2 && sopsc[1] == '2';
+                // 如果透明度为0或未设置，根据半透明选项设置默认值
+                if (Settings.PowerPointSettings.PPTLSButtonOpacity == 0.0 ||
+                    (Settings.PowerPointSettings.PPTLSButtonOpacity == 1.0 && isSideHalfOpacity))
+                {
+                    Settings.PowerPointSettings.PPTLSButtonOpacity = isSideHalfOpacity ? 0.5 : 1.0;
+                }
+                if (Settings.PowerPointSettings.PPTRSButtonOpacity == 0.0 ||
+                    (Settings.PowerPointSettings.PPTRSButtonOpacity == 1.0 && isSideHalfOpacity))
+                {
+                    Settings.PowerPointSettings.PPTRSButtonOpacity = isSideHalfOpacity ? 0.5 : 1.0;
+                }
+                PPTLSButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTLSButtonOpacity;
+                PPTRSButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTRSButtonOpacity;
+
+                bool isBottomHalfOpacity = bopsc.Length >= 2 && bopsc[1] == '2';
+                // 如果透明度为0或未设置，根据半透明选项设置默认值
+                if (Settings.PowerPointSettings.PPTLBButtonOpacity == 0.0 ||
+                    (Settings.PowerPointSettings.PPTLBButtonOpacity == 1.0 && isBottomHalfOpacity))
+                {
+                    Settings.PowerPointSettings.PPTLBButtonOpacity = isBottomHalfOpacity ? 0.5 : 1.0;
+                }
+                if (Settings.PowerPointSettings.PPTRBButtonOpacity == 0.0 ||
+                    (Settings.PowerPointSettings.PPTRBButtonOpacity == 1.0 && isBottomHalfOpacity))
+                {
+                    Settings.PowerPointSettings.PPTRBButtonOpacity = isBottomHalfOpacity ? 0.5 : 1.0;
+                }
+                PPTLBButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTLBButtonOpacity;
+                PPTRBButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTRBButtonOpacity;
+
                 UpdatePPTBtnSlidersStatus();
 
                 UpdatePPTBtnPreview();
@@ -459,6 +709,8 @@ namespace Ink_Canvas
 
                 ToggleSwitchSupportWPS.IsOn = Settings.PowerPointSettings.IsSupportWPS;
 
+                ToggleSwitchSkipAnimationsWhenGoNext.IsOn = Settings.PowerPointSettings.SkipAnimationsWhenGoNext;
+
                 ToggleSwitchPowerPointEnhancement.IsOn = Settings.PowerPointSettings.EnablePowerPointEnhancement;
 
                 ToggleSwitchAutoSaveScreenShotInPowerPoint.IsOn =
@@ -499,7 +751,7 @@ namespace Ink_Canvas
                         ToggleSwitchEnableTwoFingerTranslate.IsOn = false;
                         BoardToggleSwitchEnableTwoFingerTranslate.IsOn = false;
                         Settings.Gesture.IsEnableTwoFingerTranslate = false;
-                        if (!isInMultiTouchMode) ToggleSwitchEnableMultiTouchMode.IsOn = true;
+                        // if (!isInMultiTouchMode) ToggleSwitchEnableMultiTouchMode.IsOn = true;
                     }
                     else
                     {
@@ -526,6 +778,15 @@ namespace Ink_Canvas
                 InkWidthSlider.Value = Settings.Canvas.InkWidth * 2;
                 HighlighterWidthSlider.Value = Settings.Canvas.HighlighterWidth;
 
+                int alpha = (int)Settings.Canvas.InkAlpha;
+                if (alpha < 0) alpha = 0; if (alpha > 255) alpha = 255;
+                var inkColor = drawingAttributes.Color;
+                drawingAttributes.Color = Color.FromArgb((byte)alpha, inkColor.R, inkColor.G, inkColor.B);
+                inkCanvas.DefaultDrawingAttributes.Color = drawingAttributes.Color;
+                if (InkAlphaSlider != null) InkAlphaSlider.Value = alpha;
+                if (BoardInkAlphaSlider != null) BoardInkAlphaSlider.Value = alpha;
+
+
                 ComboBoxHyperbolaAsymptoteOption.SelectedIndex = (int)Settings.Canvas.HyperbolaAsymptoteOption;
 
                 if (Settings.Canvas.UsingWhiteboard)
@@ -561,6 +822,7 @@ namespace Ink_Canvas
 
                 // 初始化屏蔽压感开关状态
                 ToggleSwitchDisablePressure.IsOn = Settings.Canvas.DisablePressure;
+                inkCanvas.DefaultDrawingAttributes.IgnorePressure = Settings.Canvas.DisablePressure;
 
                 ComboBoxPenStyle.SelectedIndex = Settings.Canvas.InkStyle;
                 BoardComboBoxPenStyle.SelectedIndex = Settings.Canvas.InkStyle;
@@ -701,7 +963,9 @@ namespace Ink_Canvas
                 ToggleSwitchIsLogEnabled.IsOn = Settings.Advanced.IsLogEnabled;
                 ToggleSwitchIsSaveLogByDate.IsOn = Settings.Advanced.IsSaveLogByDate;
                 ToggleSwitchIsSecondConfimeWhenShutdownApp.IsOn = Settings.Advanced.IsSecondConfirmWhenShutdownApp;
+                ToggleSwitchWindowMode.IsOn = Settings.Advanced.WindowMode;
                 ToggleSwitchIsSpecialScreen.IsOn = Settings.Advanced.IsSpecialScreen;
+                ToggleSwitchIsEnableUriScheme.IsOn = Settings.Advanced.IsEnableUriScheme;
                 ToggleSwitchIsQuadIR.IsOn = Settings.Advanced.IsQuadIR;
                 ToggleSwitchEraserBindTouchMultiplier.IsOn = Settings.Advanced.EraserBindTouchMultiplier;
                 ToggleSwitchIsEnableFullScreenHelper.IsOn = Settings.Advanced.IsEnableFullScreenHelper;
@@ -711,6 +975,17 @@ namespace Ink_Canvas
                 ToggleSwitchIsEnableDPIChangeDetection.IsOn = Settings.Advanced.IsEnableDPIChangeDetection;
                 ToggleSwitchIsEnableAvoidFullScreenHelper.IsOn = Settings.Advanced.IsEnableAvoidFullScreenHelper;
                 ToggleSwitchIsAutoBackupBeforeUpdate.IsOn = Settings.Advanced.IsAutoBackupBeforeUpdate;
+                ToggleSwitchIsAutoBackupEnabled.IsOn = Settings.Advanced.IsAutoBackupEnabled;
+
+                // 设置备份间隔下拉框
+                foreach (ComboBoxItem item in ComboBoxAutoBackupInterval.Items)
+                {
+                    if (item.Tag != null && int.TryParse(item.Tag.ToString(), out int interval) && interval == Settings.Advanced.AutoBackupIntervalDays)
+                    {
+                        ComboBoxAutoBackupInterval.SelectedItem = item;
+                        break;
+                    }
+                }
                 if (Settings.Advanced.IsEnableFullScreenHelper)
                 {
                     FullScreenHelper.MarkFullscreenWindowTaskbarList(new WindowInteropHelper(this).Handle, true);
@@ -718,6 +993,14 @@ namespace Ink_Canvas
                 if (Settings.Advanced.IsEnableAvoidFullScreenHelper)
                 {
                     AvoidFullScreenHelper.StartAvoidFullScreen(this);
+                    Dispatcher.BeginInvoke(new Action(() =>
+                    {
+                        if (isLoaded)
+                        {
+                            MoveWindow(new WindowInteropHelper(this).Handle, 0, 0,
+                                WinForms.Screen.PrimaryScreen.Bounds.Width, WinForms.Screen.PrimaryScreen.Bounds.Height, true);
+                        }
+                    }), DispatcherPriority.ApplicationIdle);
                 }
                 if (Settings.Advanced.IsEnableEdgeGestureUtil)
                 {
@@ -763,10 +1046,36 @@ namespace Ink_Canvas
                 RandWindowOnceCloseLatencySlider.Value = Settings.RandSettings.RandWindowOnceCloseLatency;
                 RandWindowOnceMaxStudentsSlider.Value = Settings.RandSettings.RandWindowOnceMaxStudents;
                 ToggleSwitchShowRandomAndSingleDraw.IsOn = Settings.RandSettings.ShowRandomAndSingleDraw;
-                ToggleSwitchDirectCallCiRand.IsOn = Settings.RandSettings.DirectCallCiRand;
+                ToggleSwitchEnableQuickDraw.IsOn = Settings.RandSettings.EnableQuickDraw;
+                ToggleSwitchExternalCaller.IsOn = Settings.RandSettings.DirectCallCiRand;
+                ComboBoxExternalCallerType.SelectedIndex = Settings.RandSettings.ExternalCallerType;
                 RandomDrawPanel.Visibility = Settings.RandSettings.ShowRandomAndSingleDraw ? Visibility.Visible : Visibility.Collapsed;
                 SingleDrawPanel.Visibility = Settings.RandSettings.ShowRandomAndSingleDraw ? Visibility.Visible : Visibility.Collapsed;
 
+                // 计时器设置
+                ToggleSwitchUseLegacyTimerUI.IsOn = Settings.RandSettings.UseLegacyTimerUI;
+                ToggleSwitchUseNewStyleUI.IsOn = Settings.RandSettings.UseNewStyleUI;
+                ToggleSwitchEnableOvertimeCountUp.IsOn = Settings.RandSettings.EnableOvertimeCountUp;
+
+                // 新点名UI设置
+                ToggleSwitchUseNewRollCallUI.IsOn = Settings.RandSettings.UseNewRollCallUI;
+                ToggleSwitchEnableMLAvoidance.IsOn = Settings.RandSettings.EnableMLAvoidance;
+                MLAvoidanceHistorySlider.Value = Settings.RandSettings.MLAvoidanceHistoryCount;
+                MLAvoidanceWeightSlider.Value = Settings.RandSettings.MLAvoidanceWeight;
+
+                bool canEnableRedText = Settings.RandSettings.EnableOvertimeCountUp && Settings.RandSettings.EnableOvertimeRedText;
+                ToggleSwitchEnableOvertimeRedText.IsOn = canEnableRedText;
+                if (!canEnableRedText)
+                {
+                    Settings.RandSettings.EnableOvertimeRedText = false;
+                }
+
+                TimerVolumeSlider.Value = Settings.RandSettings.TimerVolume;
+
+                // 渐进提醒设置
+                ToggleSwitchEnableProgressiveReminder.IsOn = Settings.RandSettings.EnableProgressiveReminder;
+                ProgressiveReminderVolumeSlider.Value = Settings.RandSettings.ProgressiveReminderVolume;
+
                 // 加载自定义点名背景
                 UpdatePickNameBackgroundsInComboBox();
 
@@ -783,13 +1092,39 @@ namespace Ink_Canvas
                 ToggleSwitchDisplayRandWindowNamesInputBtn.IsOn = Settings.RandSettings.DisplayRandWindowNamesInputBtn;
                 RandWindowOnceCloseLatencySlider.Value = Settings.RandSettings.RandWindowOnceCloseLatency;
                 RandWindowOnceMaxStudentsSlider.Value = Settings.RandSettings.RandWindowOnceMaxStudents;
-                ToggleSwitchDirectCallCiRand.IsOn = Settings.RandSettings.DirectCallCiRand;
+                ToggleSwitchEnableQuickDraw.IsOn = Settings.RandSettings.EnableQuickDraw;
+                ToggleSwitchExternalCaller.IsOn = Settings.RandSettings.DirectCallCiRand;
+                ComboBoxExternalCallerType.SelectedIndex = Settings.RandSettings.ExternalCallerType;
+                ToggleSwitchUseLegacyTimerUI.IsOn = Settings.RandSettings.UseLegacyTimerUI;
+                ToggleSwitchUseNewStyleUI.IsOn = Settings.RandSettings.UseNewStyleUI;
+                ToggleSwitchEnableOvertimeCountUp.IsOn = Settings.RandSettings.EnableOvertimeCountUp;
+
+                bool canEnableRedText = Settings.RandSettings.EnableOvertimeCountUp && Settings.RandSettings.EnableOvertimeRedText;
+                ToggleSwitchEnableOvertimeRedText.IsOn = canEnableRedText;
+                if (!canEnableRedText)
+                {
+                    Settings.RandSettings.EnableOvertimeRedText = false;
+                }
+
+                TimerVolumeSlider.Value = Settings.RandSettings.TimerVolume;
+
+                // 渐进提醒设置
+                ToggleSwitchEnableProgressiveReminder.IsOn = Settings.RandSettings.EnableProgressiveReminder;
+                ProgressiveReminderVolumeSlider.Value = Settings.RandSettings.ProgressiveReminderVolume;
             }
 
             // ModeSettings
             if (Settings.ModeSettings != null)
             {
                 ToggleSwitchMode.IsOn = Settings.ModeSettings.IsPPTOnlyMode;
+
+                // 根据加载的配置状态执行相应的窗口显示/隐藏逻辑
+                if (isStartup && Settings.ModeSettings.IsPPTOnlyMode)
+                {
+                    // 启动时如果是仅PPT模式，隐藏主窗口
+                    Hide();
+                    LogHelper.WriteLogToFile("启动时检测到仅PPT模式，主窗口已隐藏", LogHelper.LogType.Event);
+                }
             }
             else
             {
@@ -848,6 +1183,8 @@ namespace Ink_Canvas
 
                 ToggleSwitchAutoFoldAfterPPTSlideShow.IsOn = Settings.Automation.IsAutoFoldAfterPPTSlideShow;
 
+                ToggleSwitchKeepFoldAfterSoftwareExit.IsOn = Settings.Automation.KeepFoldAfterSoftwareExit;
+
                 if (Settings.Automation.IsAutoKillEasiNote || Settings.Automation.IsAutoKillPptService ||
                     Settings.Automation.IsAutoKillHiteAnnotation || Settings.Automation.IsAutoKillInkCanvas
                     || Settings.Automation.IsAutoKillICA || Settings.Automation.IsAutoKillIDT ||
@@ -886,6 +1223,25 @@ namespace Ink_Canvas
 
                 ToggleSwitchSaveFullPageStrokes.IsOn = Settings.Automation.IsSaveFullPageStrokes;
 
+                ToggleSwitchSaveStrokesAsXML.IsOn = Settings.Automation.IsSaveStrokesAsXML;
+
+                // 加载定时保存墨迹设置
+                ToggleSwitchEnableAutoSaveStrokes.IsOn = Settings.Automation.IsEnableAutoSaveStrokes;
+                // 初始化保存间隔下拉框
+                if (ComboBoxAutoSaveStrokesInterval != null)
+                {
+                    int intervalMinutes = Settings.Automation.AutoSaveStrokesIntervalMinutes;
+                    if (intervalMinutes < 1) intervalMinutes = 5; // 默认5分钟
+                    foreach (System.Windows.Controls.ComboBoxItem item in ComboBoxAutoSaveStrokesInterval.Items)
+                    {
+                        if (item.Tag != null && int.TryParse(item.Tag.ToString(), out int tagValue) && tagValue == intervalMinutes)
+                        {
+                            ComboBoxAutoSaveStrokesInterval.SelectedItem = item;
+                            break;
+                        }
+                    }
+                }
+
                 SideControlMinimumAutomationSlider.Value = Settings.Automation.MinimumAutomationStrokeNumber;
 
                 AutoSavedStrokesLocation.Text = Settings.Automation.AutoSavedStrokesLocation;
@@ -895,6 +1251,9 @@ namespace Ink_Canvas
 
                 // 加载退出收纳模式自动切换至批注模式设置
                 ToggleSwitchAutoEnterAnnotationModeWhenExitFoldMode.IsOn = Settings.Automation.IsAutoEnterAnnotationModeWhenExitFoldMode;
+
+                // 加载退出白板时自动收纳设置
+                ToggleSwitchAutoFoldWhenExitWhiteboard.IsOn = Settings.Automation.IsAutoFoldWhenExitWhiteboard;
             }
             else
             {
@@ -913,6 +1272,105 @@ namespace Ink_Canvas
 
             // 加载墨迹渐隐设置
             LoadInkFadeSettings();
+
+            // 加载画笔自动恢复设置
+            LoadBrushAutoRestoreSettings();
+
+            // 刷新配置文件列表
+            try { RefreshConfigProfileList(); } catch (Exception ex) { LogHelper.WriteLogToFile($"刷新配置文件列表失败: {ex.Message}", LogHelper.LogType.Warning); }
+        }
+
+        /// <summary>
+        /// 将画笔自动恢复相关的设置应用到界面控件并在启用时初始化自动恢复定时器。
+        /// </summary>
+        /// <remarks>
+        /// 会将 Settings.Canvas 中的 BrushAutoRestore 配置同步到对应的切换开关、时间文本框、颜色下拉框、宽度和透明度滑块；当颜色缺失时会使用默认值 `#FFFF0000`，当宽度无效时使用默认值 `5`。若功能被启用，会初始化并启动定时器以执行自动恢复任务。方法执行过程中会记录加载结果或错误信息到日志。
+        /// </remarks>
+        private void LoadBrushAutoRestoreSettings()
+        {
+            try
+            {
+                // 同步设置面板中的开关状态
+                if (ToggleSwitchBrushAutoRestore != null)
+                {
+                    ToggleSwitchBrushAutoRestore.IsOn = Settings.Canvas.EnableBrushAutoRestore;
+                }
+
+                // 同步时间点输入框
+                if (BrushAutoRestoreTimesTextBox != null)
+                {
+                    BrushAutoRestoreTimesTextBox.Text = Settings.Canvas.BrushAutoRestoreTimes ?? string.Empty;
+                }
+
+                // 同步颜色下拉框
+                if (ComboBoxBrushAutoRestoreColor != null)
+                {
+                    if (string.IsNullOrWhiteSpace(Settings.Canvas.BrushAutoRestoreColor))
+                    {
+                        Settings.Canvas.BrushAutoRestoreColor = "#FFFF0000";
+                    }
+
+                    bool found = false;
+                    foreach (ComboBoxItem item in ComboBoxBrushAutoRestoreColor.Items)
+                    {
+                        if (item.Tag != null && item.Tag.ToString() == Settings.Canvas.BrushAutoRestoreColor)
+                        {
+                            ComboBoxBrushAutoRestoreColor.SelectionChanged -= ComboBoxBrushAutoRestoreColor_SelectionChanged;
+                            try
+                            {
+                                ComboBoxBrushAutoRestoreColor.SelectedItem = item;
+                            }
+                            finally
+                            {
+                                ComboBoxBrushAutoRestoreColor.SelectionChanged += ComboBoxBrushAutoRestoreColor_SelectionChanged;
+                            }
+                            found = true;
+                            break;
+                        }
+                    }
+
+                    if (!found && ComboBoxBrushAutoRestoreColor.Items.Count > 0)
+                    {
+                        ComboBoxBrushAutoRestoreColor.SelectionChanged -= ComboBoxBrushAutoRestoreColor_SelectionChanged;
+                        try
+                        {
+                            ComboBoxBrushAutoRestoreColor.SelectedIndex = 0;
+                            Settings.Canvas.BrushAutoRestoreColor = "#FFFF0000";
+                        }
+                        finally
+                        {
+                            ComboBoxBrushAutoRestoreColor.SelectionChanged += ComboBoxBrushAutoRestoreColor_SelectionChanged;
+                        }
+                    }
+                }
+
+                // 同步粗细滑块
+                if (BrushAutoRestoreWidthSlider != null)
+                {
+                    BrushAutoRestoreWidthSlider.Value = Settings.Canvas.BrushAutoRestoreWidth > 0
+                        ? Settings.Canvas.BrushAutoRestoreWidth
+                        : 5;
+                }
+
+                // 同步透明度滑块
+                if (BrushAutoRestoreAlphaSlider != null)
+                {
+                    BrushAutoRestoreAlphaSlider.Value = Settings.Canvas.BrushAutoRestoreAlpha;
+                }
+
+                // 如果功能已启用，初始化并启动定时器
+                if (Settings.Canvas.EnableBrushAutoRestore)
+                {
+                    InitBrushAutoRestoreTimer();
+                    ScheduleBrushAutoRestore();
+                }
+
+                LogHelper.WriteLogToFile("画笔自动恢复设置已加载", LogHelper.LogType.Event);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"加载画笔自动恢复设置时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
         }
 
         /// <summary>
@@ -955,6 +1413,15 @@ namespace Ink_Canvas
                     _inkFadeManager.UpdateFadeTime(Settings.Canvas.InkFadeTime);
                 }
 
+                // 同步在笔工具菜单中隐藏墨迹渐隐控制开关的设置
+                if (ToggleSwitchHideInkFadeControlInPenMenu != null)
+                {
+                    ToggleSwitchHideInkFadeControlInPenMenu.IsOn = Settings.Canvas.HideInkFadeControlInPenMenu;
+                }
+
+                // 根据设置更新墨迹渐隐控制开关的可见性
+                UpdateInkFadeControlVisibility();
+
                 LogHelper.WriteLogToFile("墨迹渐隐设置已加载", LogHelper.LogType.Event);
             }
             catch (Exception ex)
@@ -962,5 +1429,127 @@ namespace Ink_Canvas
                 LogHelper.WriteLogToFile($"加载墨迹渐隐设置时出错: {ex.Message}", LogHelper.LogType.Error);
             }
         }
+
+        /// <summary>
+        /// 清理配置文件中的过期设置
+        /// </summary>
+        /// <param name="userConfigJson">用户配置的JSON字符串</param>
+        /// <remarks>
+        /// 清理过期设置时：
+        /// 1. 创建默认配置对象
+        /// 2. 将默认配置和用户配置都序列化为JObject
+        /// 3. 递归比较并删除用户配置中多余的键
+        /// 4. 如果有清理操作，重新反序列化并保存
+        /// 5. 记录清理结果到日志
+        /// </remarks>
+        private void CleanupObsoleteSettings(string userConfigJson)
+        {
+            try
+            {
+                // 创建默认配置对象
+                Settings defaultSettings = new Settings();
+
+                // 将默认配置和用户配置都序列化为JObject
+                JObject defaultConfigObj = JObject.FromObject(defaultSettings);
+                JObject userConfigObj = JObject.Parse(userConfigJson);
+
+                // 记录是否有清理操作
+                bool hasChanges = false;
+
+                // 递归比较并删除用户配置中多余的键
+                RemoveObsoleteProperties(userConfigObj, defaultConfigObj, ref hasChanges);
+
+                // 如果有清理操作，重新反序列化并保存
+                if (hasChanges)
+                {
+                    string cleanedJson = userConfigObj.ToString(Formatting.Indented);
+                    Settings = JsonConvert.DeserializeObject<Settings>(cleanedJson);
+                    SaveSettingsToFile();
+                    LogHelper.WriteLogToFile("已清理过期配置项", LogHelper.LogType.Event);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"清理过期配置时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 递归删除用户配置中多余的属性
+        /// </summary>
+        /// <param name="userObj">用户配置的JObject</param>
+        /// <param name="defaultObj">默认配置的JObject</param>
+        /// <param name="hasChanges">是否有变更的引用标志</param>
+        /// <remarks>
+        /// 递归删除多余属性时：
+        /// 1. 检查用户配置和默认配置是否为空
+        /// 2. 获取需要删除的键列表
+        /// 3. 遍历用户配置的所有属性
+        /// 4. 如果默认配置中不存在该属性，标记为删除
+        /// 5. 如果两个属性都是对象类型，递归比较
+        /// 6. 处理数组中的对象（如自定义图标列表等）
+        /// 7. 删除标记的键
+        /// 8. 设置变更标志
+        /// </remarks>
+        private void RemoveObsoleteProperties(JObject userObj, JObject defaultObj, ref bool hasChanges)
+        {
+            if (userObj == null || defaultObj == null)
+                return;
+
+            // 获取需要删除的键列表（避免在遍历时修改集合）
+            List<string> keysToRemove = new List<string>();
+
+            foreach (var property in userObj.Properties())
+            {
+                string propertyName = property.Name;
+
+                // 如果默认配置中不存在该属性，标记为删除
+                if (!defaultObj.ContainsKey(propertyName))
+                {
+                    keysToRemove.Add(propertyName);
+                    continue;
+                }
+
+                // 如果两个属性都是对象类型，递归比较
+                JToken userValue = property.Value;
+                JToken defaultValue = defaultObj[propertyName];
+
+                if (userValue != null && defaultValue != null)
+                {
+                    if (userValue.Type == JTokenType.Object && defaultValue.Type == JTokenType.Object)
+                    {
+                        RemoveObsoleteProperties(userValue as JObject, defaultValue as JObject, ref hasChanges);
+                    }
+                    // 处理数组中的对象（如自定义图标列表等）
+                    else if (userValue.Type == JTokenType.Array && defaultValue.Type == JTokenType.Array)
+                    {
+                        JArray userArray = userValue as JArray;
+                        JArray defaultArray = defaultValue as JArray;
+
+                        if (userArray != null && defaultArray != null && userArray.Count > 0 && defaultArray.Count > 0)
+                        {
+                            // 如果数组元素是对象，比较第一个元素的属性结构
+                            if (userArray[0].Type == JTokenType.Object && defaultArray[0].Type == JTokenType.Object)
+                            {
+                                for (int i = 0; i < userArray.Count; i++)
+                                {
+                                    if (userArray[i] is JObject userItemObj && defaultArray[0] is JObject defaultItemObj)
+                                    {
+                                        RemoveObsoleteProperties(userItemObj, defaultItemObj, ref hasChanges);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            // 删除标记的键
+            foreach (string key in keysToRemove)
+            {
+                userObj.Remove(key);
+                hasChanges = true;
+            }
+        }
     }
 }