Merge pull request #195 from InkCanvasForClass/beta

ICC CE 1.7.11.0

.all-contributorsrc

@@ -19,15 +19,6 @@
         "code"
       ]
     },
-    {
-      "login": "Hydro11451",
-      "name": "Hydrogen",
-      "avatar_url": "https://avatars.githubusercontent.com/u/214308559?v=4",
-      "profile": "http://hydro11451.qzz.io",
-      "contributions": [
-        "code"
-      ]
-    },
     {
       "login": "CreeperAWA",
       "name": "CreeperAWA",

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -39,14 +39,14 @@ body:
         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:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -20,7 +20,7 @@ body:
       label: 需求动机 | Motivation
       description: 为什么需要这个功能？| Why do you need this feature?
     validations:
-      required: false
+      required: true
   - type: textarea
     id: design
     attributes:

AutomaticUpdateVersionControl.txt

@@ -1 +1 @@
-1.7.9.0
+1.7.11.0

Ink Canvas/App.xaml

@@ -10,7 +10,7 @@
             <Style TargetType="ui:ScrollViewerEx">
                 <EventSetter Event="PreviewMouseWheel" Handler="ScrollViewer_PreviewMouseWheel"/>
             </Style>
-            <ContextMenu Opened="SysTrayMenu_Opened" x:Shared="false" x:Key="SysTrayMenu" Padding="6" ui:ThemeManager.RequestedTheme="Light">
+            <ContextMenu Opened="SysTrayMenu_Opened" Closed="SysTrayMenu_Closed" x:Shared="false" x:Key="SysTrayMenu" Padding="6" ui:ThemeManager.RequestedTheme="Light">
                 <MenuItem IsCheckable="True" IsChecked="False" Checked="HideICCMainWindowTrayIconMenuItem_Checked" Unchecked="HideICCMainWindowTrayIconMenuItem_UnChecked" Name="HideICCMainWindowTrayIconMenuItem">
                     <MenuItem.Header>
                         <ui:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
@@ -32,7 +32,7 @@
                     </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">
                             <TextBlock FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="禁用所有快捷键" />

Ink Canvas/App.xaml.cs

@@ -1,3 +1,8 @@
+using Hardcodet.Wpf.TaskbarNotification;
+using Ink_Canvas.Helpers;
+using iNKORE.UI.WPF.Modern.Controls;
+using Microsoft.Win32;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -13,11 +18,6 @@ using System.Windows;
 using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Threading;
-using Hardcodet.Wpf.TaskbarNotification;
-using Ink_Canvas.Helpers;
-using iNKORE.UI.WPF.Modern.Controls;
-using Microsoft.Win32;
-using Newtonsoft.Json;
 using Application = System.Windows.Application;
 using MessageBox = System.Windows.MessageBox;
 using Timer = System.Threading.Timer;
@@ -33,7 +33,9 @@ namespace Ink_Canvas
 
         public static string[] StartArgs;
         public static string RootPath = Environment.GetEnvironmentVariable("APPDATA") + "\\Ink Canvas\\";
-
+        
+        // 新增：标记是否通过--board参数启动
+        public static bool StartWithBoardMode = false;
         // 新增：保存看门狗进程对象
         private static Process watchdogProcess;
         // 新增：标记是否为软件内主动退出
@@ -80,7 +82,7 @@ namespace Ink_Canvas
             args = Environment.GetCommandLineArgs();
             bool isUpdateMode = args.Contains("--update-mode");
             bool isFinalApp = args.Contains("--final-app");
-            
+
             if (CrashAction == CrashActionType.SilentRestart && !isUpdateMode && !isFinalApp)
             {
                 StartWatchdogIfNeeded();
@@ -292,6 +294,27 @@ namespace Ink_Canvas
         {
             string reason = e.Reason == SessionEndReasons.Logoff ? "用户注销" : "系统关机";
             WriteCrashLog($"系统会话即将结束: {reason}");
+            
+            // 清理PowerPoint进程守护
+            try
+            {
+                // 获取主窗口实例并清理PowerPoint进程守护
+                var mainWindow = Current.MainWindow as MainWindow;
+                if (mainWindow != null)
+                {
+                    // 通过反射调用StopPowerPointProcessMonitoring方法
+                    var method = mainWindow.GetType().GetMethod("StopPowerPointProcessMonitoring", 
+                        BindingFlags.NonPublic | BindingFlags.Instance);
+                    method?.Invoke(mainWindow, null);
+                    
+                    WriteCrashLog("PowerPoint进程守护已在系统关机时清理");
+                }
+            }
+            catch (Exception ex)
+            {
+                WriteCrashLog($"清理PowerPoint进程守护失败: {ex.Message}");
+            }
+            
             DeviceIdentifier.SaveUsageStatsOnShutdown();
         }
 
@@ -408,7 +431,7 @@ namespace Ink_Canvas
             try
             {
                 // 优先从 Settings.json 直接读取
-                var settingsPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Settings.json");
+                var settingsPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Configs", "Settings.json");
                 if (File.Exists(settingsPath))
                 {
                     var json = File.ReadAllText(settingsPath);
@@ -465,16 +488,24 @@ namespace Ink_Canvas
         {
             // 初始化应用启动时间
             appStartTime = DateTime.Now;
-            
+
             /*if (!StoreHelper.IsStoreApp) */
             RootPath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
 
             LogHelper.NewLog(string.Format("Ink Canvas Starting (Version: {0})", Assembly.GetExecutingAssembly().GetName().Version));
-            
+
             // 检查是否为最终应用启动（更新后的应用）
             bool isFinalApp = e.Args.Contains("--final-app");
             bool skipMutexCheck = e.Args.Contains("--skip-mutex-check");
             
+            // 检查是否通过--board参数启动
+            bool hasBoardArg = e.Args.Contains("--board");
+            if (hasBoardArg)
+            {
+                StartWithBoardMode = true;
+                LogHelper.WriteLogToFile("App | 检测到--board参数，将直接进入白板模式");
+            }
+
             // 记录最终应用启动状态
             if (isFinalApp)
             {
@@ -499,7 +530,7 @@ namespace Ink_Canvas
 
             // 处理更新模式启动
             bool isUpdateMode = AutoUpdateHelper.HandleUpdateModeStartup(e.Args);
-            
+
             // 如果是更新模式，不显示主窗口但保持应用运行
             if (isUpdateMode)
             {
@@ -510,10 +541,10 @@ namespace Ink_Canvas
             // 检查是否存在更新标记文件
             string updateMarkerFile = Path.Combine(RootPath, "update_in_progress.tmp");
             bool isUpdateInProgress = false;
-            
+
             // 检查是否以更新模式启动
             isUpdateMode = e.Args.Contains("--update-mode");
-            
+
             // 如果是最终应用启动，立即清理更新标记文件
             if (isFinalApp)
             {
@@ -530,7 +561,7 @@ namespace Ink_Canvas
                     LogHelper.WriteLogToFile($"App | 清理更新标记文件失败: {ex.Message}", LogHelper.LogType.Warning);
                 }
             }
-            
+
             // 如果不是最终应用启动，才检查更新标记文件
             if (!isFinalApp && File.Exists(updateMarkerFile))
             {
@@ -540,7 +571,7 @@ namespace Ink_Canvas
                     if (int.TryParse(updateProcessIdStr, out int updateProcessId))
                     {
                         LogHelper.WriteLogToFile($"App | 检测到更新标记文件，更新进程ID: {updateProcessId}");
-                        
+
                         // 检查更新进程是否还在运行
                         try
                         {
@@ -549,18 +580,18 @@ namespace Ink_Canvas
                             {
                                 LogHelper.WriteLogToFile("App | 更新进程仍在运行，等待更新完成");
                                 isUpdateInProgress = true;
-                                
+
                                 // 等待更新进程完成
                                 int waitCount = 0;
                                 const int maxWaitCount = 10; // 减少等待时间到10秒
-                                
+
                                 while (waitCount < maxWaitCount && !updateProcess.HasExited)
                                 {
                                     Thread.Sleep(500); // 减少等待间隔到500ms
                                     waitCount++;
                                     LogHelper.WriteLogToFile($"App | 等待更新进程完成... ({waitCount}/{maxWaitCount})");
                                 }
-                                
+
                                 if (updateProcess.HasExited)
                                 {
                                     LogHelper.WriteLogToFile("App | 更新进程已结束");
@@ -592,7 +623,7 @@ namespace Ink_Canvas
                         {
                             LogHelper.WriteLogToFile("App | 更新进程已不存在");
                         }
-                        
+
                         // 无论更新进程是否还在运行，都清理标记文件
                         try
                         {
@@ -633,7 +664,43 @@ namespace Ink_Canvas
                 if (!ret && !e.Args.Contains("-m")) //-m multiple
                 {
                     LogHelper.NewLog("Detected existing instance");
-                    MessageBox.Show("已有一个程序实例正在运行");
+
+                    // 检查是否有.icstk文件参数
+                    string icstkFile = FileAssociationManager.GetIcstkFileFromArgs(e.Args);
+                    if (!string.IsNullOrEmpty(icstkFile))
+                    {
+                        LogHelper.WriteLogToFile($"检测到已运行实例，尝试通过IPC发送文件: {icstkFile}", LogHelper.LogType.Event);
+
+                        // 尝试通过IPC发送文件路径给已运行实例
+                        if (FileAssociationManager.TrySendFileToExistingInstance(icstkFile))
+                        {
+                            LogHelper.WriteLogToFile("文件路径已通过IPC发送给已运行实例", LogHelper.LogType.Event);
+                        }
+                        else
+                        {
+                            LogHelper.WriteLogToFile("通过IPC发送文件路径失败", LogHelper.LogType.Warning);
+                        }
+                    }
+                    // 检查是否有--board参数
+                    else if (hasBoardArg)
+                    {
+                        LogHelper.WriteLogToFile("检测到已运行实例且有--board参数，尝试通过IPC发送白板模式命令", LogHelper.LogType.Event);
+
+                        // 尝试通过IPC发送白板模式命令给已运行实例
+                        if (FileAssociationManager.TrySendBoardModeCommandToExistingInstance())
+                        {
+                            LogHelper.WriteLogToFile("白板模式命令已通过IPC发送给已运行实例", LogHelper.LogType.Event);
+                        }
+                        else
+                        {
+                            LogHelper.WriteLogToFile("通过IPC发送白板模式命令失败", LogHelper.LogType.Warning);
+                        }
+                    }
+                    else
+                    {
+                        LogHelper.WriteLogToFile("检测到已运行实例，但无文件参数", LogHelper.LogType.Event);
+                    }
+
                     LogHelper.NewLog("Ink Canvas automatically closed");
                     IsAppExitByUser = true; // 多开时标记为用户主动退出
                     // 写入退出信号，确保看门狗不会重启
@@ -668,11 +735,11 @@ namespace Ink_Canvas
                 {
                     LogHelper.WriteLogToFile("App | 更新过程中，跳过重复运行检测");
                 }
-                
+
                 // 在特殊模式下，创建一个临时的Mutex以避免其他检查出错
                 string mutexName = isFinalApp ? "InkCanvasForClass CE Final" : "InkCanvasForClass CE Update";
                 mutex = new Mutex(true, mutexName, out bool tempRet);
-                
+
                 // 额外等待一小段时间确保更新进程完全退出
                 Thread.Sleep(1000);
                 LogHelper.WriteLogToFile("App | 特殊模式等待完成，继续启动");
@@ -681,12 +748,35 @@ namespace Ink_Canvas
             _taskbar = (TaskbarIcon)FindResource("TaskbarTrayIcon");
 
             StartArgs = e.Args;
-            
+
             // 在非更新模式下创建主窗口
             var mainWindow = new MainWindow();
             MainWindow = mainWindow;
             mainWindow.Show();
 
+            // 新增：注册.icstk文件关联
+            try
+            {
+                LogHelper.WriteLogToFile("开始注册.icstk文件关联");
+                FileAssociationManager.RegisterFileAssociation();
+                FileAssociationManager.ShowFileAssociationStatus();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"注册文件关联时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+
+            // 新增：启动IPC监听器
+            try
+            {
+                LogHelper.WriteLogToFile("启动IPC监听器");
+                FileAssociationManager.StartIpcListener();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"启动IPC监听器时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+
             // 新增：Office注册表检测
             try
             {
@@ -739,7 +829,7 @@ namespace Ink_Canvas
                             }
 
                             // 备份路径更改为软件根目录下的saves/RegistryBackups文件夹
-                            string backupPath = Path.Combine(RootPath, "saves", "RegistryBackups");
+                            string backupPath = Path.Combine(RootPath, "Saves", "RegistryBackups");
                             LogHelper.WriteLogToFile($"备份路径: {backupPath}");
 
                             if (!Directory.Exists(backupPath))
@@ -1253,7 +1343,7 @@ namespace Ink_Canvas
             try
             {
                 // 准备备份目录
-                string backupPath = Path.Combine(RootPath, "saves", "RegistryBackups");
+                string backupPath = Path.Combine(RootPath, "Saves", "RegistryBackups");
                 if (!Directory.Exists(backupPath))
                 {
                     Directory.CreateDirectory(backupPath);

Ink Canvas/AssemblyInfo.cs

@@ -49,5 +49,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.9.0")]
-[assembly: AssemblyFileVersion("1.7.9.0")]
+[assembly: AssemblyVersion("1.7.11.0")]
+[assembly: AssemblyFileVersion("1.7.11.0")]

Ink Canvas/FloatingWindowInterceptorManager.cs

@@ -0,0 +1,368 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using Ink_Canvas.Helpers;
+
+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;
+                }
+            }
+            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/AdvancedBezierSmoothing.cs

@@ -128,7 +128,7 @@ namespace Ink_Canvas.Helpers
             if (points.Length < 4) return points;
 
             var result = new List<StylusPoint>();
-            
+
             // 添加第一个点
             result.Add(points[0]);
 
@@ -142,9 +142,9 @@ namespace Ink_Canvas.Helpers
 
                 // 计算改进的控制点
                 var controlPoints = CalculateImprovedControlPoints(p0, p1, p2, p3);
-                
+
                 // 限制插值步数，避免点数爆炸
-                int steps = Math.Min(UseAdaptiveInterpolation ? 
+                int steps = Math.Min(UseAdaptiveInterpolation ?
                     CalculateAdaptiveSteps(p0, p1, p2, p3) : InterpolationSteps, 16);
 
                 // 生成贝塞尔曲线点，但跳过第一个点避免重复
@@ -179,7 +179,7 @@ namespace Ink_Canvas.Helpers
             // 计算控制点距离（基于点间距离）
             double dist1 = Math.Sqrt((p1.X - p0.X) * (p1.X - p0.X) + (p1.Y - p0.Y) * (p1.Y - p0.Y));
             double dist2 = Math.Sqrt((p3.X - p2.X) * (p3.X - p2.X) + (p3.Y - p2.Y) * (p3.Y - p2.Y));
-            
+
             double controlDist1 = dist1 * CurveTension;
             double controlDist2 = dist2 * CurveTension;
 
@@ -214,7 +214,7 @@ namespace Ink_Canvas.Helpers
             // 基于长度和曲率计算步数
             int baseSteps = Math.Max(8, Math.Min(20, (int)(totalLength / 10)));
             int curvatureSteps = (int)(curvature * 10);
-            
+
             return Math.Max(InterpolationSteps, Math.Min(24, baseSteps + curvatureSteps));
         }
 

Ink Canvas/Helpers/AutoUpdateHelper.cs

@@ -1,3 +1,5 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -15,8 +17,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Ink_Canvas.Helpers
 {
@@ -513,7 +513,7 @@ namespace Ink_Canvas.Helpers
                             // 尝试获取当前版本的发布时间
                             DateTime? currentVersionReleaseTime = await GetVersionReleaseTime(localVersion, channel);
 
-                            bool shouldPush = DeviceIdentifier.ShouldPushUpdate(apiVersion, releaseTime, true, currentVersionReleaseTime); // 明确标记为自动更新
+                            bool shouldPush = DeviceIdentifier.ShouldPushUpdate(apiVersion, releaseTime, true, currentVersionReleaseTime, localVersion); // 明确标记为自动更新
                             if (!shouldPush)
                             {
                                 var priority = DeviceIdentifier.GetUpdatePriority();
@@ -569,7 +569,7 @@ namespace Ink_Canvas.Helpers
                                 // 尝试获取当前版本的发布时间
                                 DateTime? currentVersionReleaseTime = await GetVersionReleaseTime(localVersion, channel);
 
-                                bool shouldPush = DeviceIdentifier.ShouldPushUpdate(remoteVersion, DateTime.Now, true, currentVersionReleaseTime); // 明确标记为自动更新
+                                bool shouldPush = DeviceIdentifier.ShouldPushUpdate(remoteVersion, DateTime.Now, true, currentVersionReleaseTime, localVersion); // 明确标记为自动更新
                                 if (!shouldPush)
                                 {
                                     var priority = DeviceIdentifier.GetUpdatePriority();
@@ -1238,7 +1238,7 @@ namespace Ink_Canvas.Helpers
                 // 查找解压后的主程序文件
                 string newAppPath = null;
                 string[] possibleExeNames = { "InkCanvasForClass.exe", "Ink Canvas.exe", "InkCanvas.exe" };
-                
+
                 foreach (string exeName in possibleExeNames)
                 {
                     string testPath = Path.Combine(extractPath, exeName);
@@ -1260,12 +1260,12 @@ namespace Ink_Canvas.Helpers
                 try
                 {
                     LogHelper.WriteLogToFile($"AutoUpdate | 准备启动新版本进程: {newAppPath}");
-                    
+
                     // 启动新版本进程（以更新模式）
                     string arguments = $"--update-mode --old-process-id={currentProcessId} --extract-path=\"{extractPath}\" --target-path=\"{currentAppDir}\" --is-silence={isInSilence}";
-                    
+
                     LogHelper.WriteLogToFile($"AutoUpdate | 启动新进程的命令行: {newAppPath} {arguments}");
-                    
+
                     ProcessStartInfo startInfo = new ProcessStartInfo
                     {
                         FileName = newAppPath,
@@ -1276,10 +1276,10 @@ namespace Ink_Canvas.Helpers
 
                     Process.Start(startInfo);
                     LogHelper.WriteLogToFile("AutoUpdate | 新版本进程启动命令已执行");
-                    
+
                     // 等待一小段时间确保新进程启动
                     Thread.Sleep(2000);
-                    
+
                     // 关闭当前旧软件进程
                     LogHelper.WriteLogToFile("AutoUpdate | 关闭当前旧软件进程");
                     App.IsAppExitByUser = true;
@@ -1312,7 +1312,7 @@ namespace Ink_Canvas.Helpers
                 if (args.Contains("--update-mode"))
                 {
                     LogHelper.WriteLogToFile("AutoUpdate | 检测到更新模式启动");
-                    
+
                     // 解析命令行参数
                     int oldProcessId = -1;
                     string extractPath = null;
@@ -1326,7 +1326,7 @@ namespace Ink_Canvas.Helpers
                     {
                         string arg = args[i];
                         LogHelper.WriteLogToFile($"AutoUpdate | 处理参数 {i}: {arg}");
-                        
+
                         if (arg.StartsWith("--old-process-id="))
                         {
                             string processIdStr = arg.Substring("--old-process-id=".Length);
@@ -1365,7 +1365,7 @@ namespace Ink_Canvas.Helpers
                         // 启动更新任务
                         Task.Run(async () => await PerformUpdate(oldProcessId, extractPath, targetPath, isSilence));
                         return true; // 返回true表示是更新模式
-                }
+                    }
 
                     LogHelper.WriteLogToFile($"AutoUpdate | 参数验证失败 - 老进程ID: {oldProcessId}, 解压路径: {extractPath}, 目标路径: {targetPath}", LogHelper.LogType.Error);
                     return false;
@@ -1437,7 +1437,7 @@ namespace Ink_Canvas.Helpers
 
                 // 复制文件到目标目录
                 LogHelper.WriteLogToFile($"AutoUpdate | 开始复制文件从 {extractPath} 到 {targetPath}");
-                
+
                 try
                 {
                     // 使用递归复制方法，支持重试机制
@@ -1445,11 +1445,11 @@ namespace Ink_Canvas.Helpers
                     if (copySuccess)
                     {
                         LogHelper.WriteLogToFile("AutoUpdate | 文件复制完成");
-                }
-                else
-                {
+                    }
+                    else
+                    {
                         LogHelper.WriteLogToFile("AutoUpdate | 文件复制失败，部分文件可能无法覆盖", LogHelper.LogType.Error);
-                        
+
                         if (!isSilence)
                         {
                             MessageBox.Show("更新失败：部分文件无法覆盖，可能是文件正在使用中。\n请关闭所有相关程序后重试。", "更新失败", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -1460,7 +1460,7 @@ namespace Ink_Canvas.Helpers
                 catch (Exception ex)
                 {
                     LogHelper.WriteLogToFile($"AutoUpdate | 文件复制失败: {ex.Message}", LogHelper.LogType.Error);
-                    
+
                     if (!isSilence)
                     {
                         MessageBox.Show($"更新失败：文件复制时出错\n{ex.Message}", "更新失败", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -1472,7 +1472,7 @@ namespace Ink_Canvas.Helpers
                 try
                 {
                     LogHelper.WriteLogToFile("AutoUpdate | 清理临时文件");
-                    
+
                     // 删除解压目录
                     if (Directory.Exists(extractPath))
                     {
@@ -1503,23 +1503,23 @@ namespace Ink_Canvas.Helpers
 
                 LogHelper.WriteLogToFile("AutoUpdate | 更新操作完成");
 
-                                // 启动更新后的应用程序
+                // 启动更新后的应用程序
                 string newAppPath = Path.Combine(targetPath, "InkCanvasForClass.exe");
                 if (File.Exists(newAppPath))
                 {
                     try
                     {
                         LogHelper.WriteLogToFile($"AutoUpdate | 准备启动更新后的应用程序: {newAppPath}");
-                        
+
                         // 获取当前更新进程ID
                         int currentUpdateProcessId = Process.GetCurrentProcess().Id;
                         LogHelper.WriteLogToFile($"AutoUpdate | 当前更新进程ID: {currentUpdateProcessId}");
-                        
+
                         // 创建一个临时标记文件，用于新进程检测更新状态
                         string updateMarkerFile = Path.Combine(targetPath, "update_in_progress.tmp");
                         File.WriteAllText(updateMarkerFile, currentUpdateProcessId.ToString());
                         LogHelper.WriteLogToFile($"AutoUpdate | 创建更新标记文件: {updateMarkerFile}");
-                        
+
                         // 启动更新后的应用程序（标记为最终应用，不受相同进程影响）
                         ProcessStartInfo startInfo = new ProcessStartInfo
                         {
@@ -1528,24 +1528,24 @@ namespace Ink_Canvas.Helpers
                             WorkingDirectory = targetPath,
                             UseShellExecute = false
                         };
-                        
+
                         Process newProcess = Process.Start(startInfo);
                         LogHelper.WriteLogToFile($"AutoUpdate | 最终应用程序启动成功，PID: {newProcess?.Id}，已标记为最终应用");
-                        
+
                         // 等待一小段时间确保最终应用程序启动
                         Thread.Sleep(2000);
-                        
+
                         // 结束当前更新进程
                         LogHelper.WriteLogToFile("AutoUpdate | 更新流程完成，结束更新进程");
-                        
+
                         // 强制结束当前更新进程
                         try
                         {
                             LogHelper.WriteLogToFile("AutoUpdate | 强制结束更新进程");
-                            
+
                             // 标记为应用主动退出，避免看门狗重启
                             App.IsAppExitByUser = true;
-                            
+
                             // 写入退出信号文件，确保看门狗不会重启
                             try
                             {
@@ -1557,7 +1557,7 @@ namespace Ink_Canvas.Helpers
                             {
                                 LogHelper.WriteLogToFile($"AutoUpdate | 写入看门狗退出信号文件失败: {ex.Message}", LogHelper.LogType.Warning);
                             }
- 
+
                             Environment.Exit(0);
                         }
                         catch (Exception ex)
@@ -1569,7 +1569,7 @@ namespace Ink_Canvas.Helpers
                     catch (Exception ex)
                     {
                         LogHelper.WriteLogToFile($"AutoUpdate | 启动更新后的应用程序失败: {ex.Message}", LogHelper.LogType.Error);
-                        
+
                         if (!isSilence)
                         {
                             MessageBox.Show($"更新完成，但启动应用程序失败：{ex.Message}\n请手动启动应用程序。", "启动失败", MessageBoxButton.OK, MessageBoxImage.Warning);
@@ -1579,7 +1579,7 @@ namespace Ink_Canvas.Helpers
                 else
                 {
                     LogHelper.WriteLogToFile($"AutoUpdate | 更新后的应用程序文件不存在: {newAppPath}", LogHelper.LogType.Error);
-                    
+
                     if (!isSilence)
                     {
                         MessageBox.Show($"更新完成，但未找到应用程序文件：{newAppPath}\n请检查更新是否成功。", "文件缺失", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -1589,7 +1589,7 @@ namespace Ink_Canvas.Helpers
             catch (Exception ex)
             {
                 LogHelper.WriteLogToFile($"AutoUpdate | 执行更新操作时出错: {ex.Message}", LogHelper.LogType.Error);
-                
+
                 if (!isSilence)
                 {
                     MessageBox.Show($"更新失败：{ex.Message}", "更新失败", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -1610,12 +1610,24 @@ namespace Ink_Canvas.Helpers
                 Directory.CreateDirectory(destinationDir);
             }
 
+            // 定义需要覆盖的文件列表（仅覆盖主程序和配置文件）
+            string[] filesToOverwrite = { "InkCanvasForClass.exe", "InkCanvasForClass.exe.config" };
+
             // 复制文件
             foreach (FileInfo file in dir.GetFiles())
             {
+                // 只覆盖指定的文件，跳过其他文件
+                if (!filesToOverwrite.Contains(file.Name))
+                {
+                    LogHelper.WriteLogToFile($"AutoUpdate | 跳过文件（不在覆盖列表中）: {file.Name}");
+                    continue;
+                }
+
                 string targetFilePath = Path.Combine(destinationDir, file.Name);
                 bool fileCopied = false;
-                
+
+                LogHelper.WriteLogToFile($"AutoUpdate | 开始覆盖文件: {file.Name}");
+
                 // 重试机制，最多重试3次
                 for (int retry = 0; retry < 3; retry++)
                 {
@@ -1638,22 +1650,23 @@ namespace Ink_Canvas.Helpers
                                 }
                             }
                         }
-                        
+
                         await Task.Run(() => file.CopyTo(targetFilePath));
                         fileCopied = true;
+                        LogHelper.WriteLogToFile($"AutoUpdate | 文件覆盖成功: {file.Name}");
                         break;
                     }
                     catch (Exception ex)
                     {
                         LogHelper.WriteLogToFile($"AutoUpdate | 复制文件失败 (重试 {retry + 1}/3) {file.FullName} -> {targetFilePath}: {ex.Message}", LogHelper.LogType.Warning);
-                        
+
                         if (retry < 2)
                         {
                             Thread.Sleep(1000); // 等待1秒后重试
                         }
                     }
                 }
-                
+
                 if (!fileCopied)
                 {
                     allFilesCopied = false;
@@ -1687,19 +1700,32 @@ namespace Ink_Canvas.Helpers
                 Directory.CreateDirectory(destinationDir);
             }
 
+            // 定义需要覆盖的文件列表（仅覆盖主程序和配置文件）
+            string[] filesToOverwrite = { "InkCanvasForClass.exe", "InkCanvasForClass.exe.config" };
+
             // 复制文件
             foreach (FileInfo file in dir.GetFiles())
             {
+                // 只覆盖指定的文件，跳过其他文件
+                if (!filesToOverwrite.Contains(file.Name))
+                {
+                    LogHelper.WriteLogToFile($"AutoUpdate | 跳过文件（不在覆盖列表中）: {file.Name}");
+                    continue;
+                }
+
                 string targetFilePath = Path.Combine(destinationDir, file.Name);
                 try
                 {
+                    LogHelper.WriteLogToFile($"AutoUpdate | 开始覆盖文件: {file.Name}");
+
                     // 如果目标文件存在且正在使用，先删除
                     if (File.Exists(targetFilePath))
                     {
                         File.Delete(targetFilePath);
                     }
-                    
+
                     await Task.Run(() => file.CopyTo(targetFilePath));
+                    LogHelper.WriteLogToFile($"AutoUpdate | 文件覆盖成功: {file.Name}");
                 }
                 catch (Exception ex)
                 {
@@ -1866,7 +1892,7 @@ namespace Ink_Canvas.Helpers
                 }
 
                 // 执行安装，静默模式
-                InstallNewVersionApp(remoteVersion, true);  
+                InstallNewVersionApp(remoteVersion, true);
                 App.IsAppExitByUser = true;
                 Application.Current.Dispatcher.Invoke(() =>
                 {
@@ -1996,7 +2022,7 @@ namespace Ink_Canvas.Helpers
                     return false;
                 }
                 LogHelper.WriteLogToFile($"AutoUpdate | 手动安装版本: {version}");
-                InstallNewVersionApp(version, true);  
+                InstallNewVersionApp(version, true);
                 App.IsAppExitByUser = true;
                 Application.Current.Dispatcher.Invoke(() =>
                 {

Ink Canvas/Helpers/CameraService.cs

@@ -0,0 +1,315 @@
+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;
+
+        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 CameraService()
+        {
+            _dispatcher = Dispatcher.CurrentDispatcher;
+            AvailableCameras = new List<FilterInfo>();
+            RefreshCameraList();
+        }
+
+        /// <summary>
+        /// 刷新可用摄像头列表
+        /// </summary>
+        public void RefreshCameraList()
+        {
+            try
+            {
+                AvailableCameras.Clear();
+                var videoDevices = new FilterInfoCollection(FilterCategory.VideoInputDevice);
+                
+                foreach (FilterInfo device in videoDevices)
+                {
+                    AvailableCameras.Add(device);
+                }
+
+                LogHelper.WriteLogToFile($"发现 {AvailableCameras.Count} 个摄像头设备");
+            }
+            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;
+                LogHelper.WriteLogToFile("摄像头预览已停止");
+            }
+            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)
+                            {
+                                _currentFrame = new Bitmap(width, height, PixelFormat.Format24bppRgb);
+                                using (var graphics = Graphics.FromImage(_currentFrame))
+                                {
+                                    graphics.DrawImage(sourceFrame, 0, 0);
+                                }
+                            }
+                            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;
+        }
+
+        public void Dispose()
+        {
+            StopPreview();
+            
+            lock (_frameLock)
+            {
+                _currentFrame?.Dispose();
+            }
+        }
+    }
+}

Ink Canvas/Helpers/DeviceIdentifier.cs

@@ -1,3 +1,4 @@
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -5,7 +6,6 @@ using System.Linq;
 using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
-using Newtonsoft.Json;
 
 namespace Ink_Canvas.Helpers
 {
@@ -17,7 +17,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();
@@ -758,26 +758,26 @@ namespace Ink_Canvas.Helpers
 
 
                 // 如果所有文件都不存在或损坏，返回新的统计对象
-            var newStats = new UsageStats
-            {
-                DeviceId = DeviceId,
-                LastLaunchTime = DateTime.Now,
-                LaunchCount = 0,
-                TotalUsageSeconds = 0,
-                AverageSessionSeconds = 0,
-                LastUpdateCheck = DateTime.MinValue,
-                UpdatePriority = UpdatePriority.Medium,
-                UsageFrequency = UsageFrequency.Medium
-            };
+                var newStats = new UsageStats
+                {
+                    DeviceId = DeviceId,
+                    LastLaunchTime = DateTime.Now,
+                    LaunchCount = 0,
+                    TotalUsageSeconds = 0,
+                    AverageSessionSeconds = 0,
+                    LastUpdateCheck = DateTime.MinValue,
+                    UpdatePriority = UpdatePriority.Medium,
+                    UsageFrequency = UsageFrequency.Medium
+                };
 
                 // 保存新统计到文件
                 SaveUsageStatsToFile(UsageStatsFilePath, newStats);
-            return newStats;
+                return newStats;
             }
             catch (Exception ex)
             {
                 LogHelper.WriteLogToFile($"DeviceIdentifier | 加载使用统计失败: {ex.Message}", LogHelper.LogType.Error);
-                
+
                 // 返回默认统计对象
                 return new UsageStats
                 {
@@ -800,7 +800,7 @@ namespace Ink_Canvas.Helpers
         {
             // 保存到主文件
             SaveUsageStatsToFile(UsageStatsFilePath, stats);
-            
+
             // 保存到备份文件
             SaveUsageStatsToFile(UsageStatsBackupPath, stats);
         }
@@ -822,7 +822,7 @@ namespace Ink_Canvas.Helpers
                     {
                         return stats;
                     }
-                    
+
 
                 }
             }
@@ -843,39 +843,39 @@ namespace Ink_Canvas.Helpers
                 if (File.Exists(filePath))
                 {
                     byte[] encryptedData = File.ReadAllBytes(filePath);
-                    
+
                     if (encryptedData.Length < 32) // SHA256校验和长度为32字节
                     {
                         LogHelper.WriteLogToFile($"DeviceIdentifier | 加密文件格式错误: {filePath}", LogHelper.LogType.Error);
                         return null;
                     }
-                    
+
                     // 提取校验和和加密数据
                     byte[] checksum = new byte[32];
                     byte[] data = new byte[encryptedData.Length - 32];
                     Array.Copy(encryptedData, 0, checksum, 0, 32);
                     Array.Copy(encryptedData, 32, data, 0, data.Length);
-                    
+
                     // 使用SHA256生成解密密钥
                     using (var sha256 = SHA256.Create())
                     {
                         byte[] keyBytes = sha256.ComputeHash(Encoding.UTF8.GetBytes(DeviceId + "ICC_Usage_Stats_Salt"));
-                        
+
                         // XOR解密
                         byte[] decryptedData = new byte[data.Length];
                         for (int i = 0; i < data.Length; i++)
                         {
                             decryptedData[i] = (byte)(data[i] ^ keyBytes[i % keyBytes.Length]);
                         }
-                        
-                        // 验证校验和
+
+                        // 验证校验
                         byte[] computedChecksum = sha256.ComputeHash(decryptedData);
                         if (!checksum.SequenceEqual(computedChecksum))
                         {
                             LogHelper.WriteLogToFile($"DeviceIdentifier | 加密文件校验和验证失败: {filePath}", LogHelper.LogType.Error);
                             return null;
                         }
-                        
+
                         string json = Encoding.UTF8.GetString(decryptedData);
                         var stats = JsonConvert.DeserializeObject<UsageStats>(json);
                         if (stats != null && !string.IsNullOrEmpty(stats.DeviceId))
@@ -893,8 +893,9 @@ namespace Ink_Canvas.Helpers
             return null;
         }
 
+
         /// <summary>
-        /// 保存使用统计到文件（加密）
+        /// 保存使用统计到文件
         /// </summary>
         private static void SaveUsageStatsToFile(string filePath, UsageStats stats)
         {
@@ -909,27 +910,27 @@ namespace Ink_Canvas.Helpers
 
                 string json = JsonConvert.SerializeObject(stats, Formatting.Indented);
                 byte[] data = Encoding.UTF8.GetBytes(json);
-                
+
                 // 使用SHA256生成加密密钥（基于设备ID）
                 using (var sha256 = SHA256.Create())
                 {
                     byte[] keyBytes = sha256.ComputeHash(Encoding.UTF8.GetBytes(DeviceId + "ICC_Usage_Stats_Salt"));
-                    
+
                     // 简单的XOR加密
                     byte[] encryptedData = new byte[data.Length];
                     for (int i = 0; i < data.Length; i++)
                     {
                         encryptedData[i] = (byte)(data[i] ^ keyBytes[i % keyBytes.Length]);
                     }
-                    
+
                     // 添加SHA256校验和
                     byte[] checksum = sha256.ComputeHash(data);
                     byte[] finalData = new byte[checksum.Length + encryptedData.Length];
                     checksum.CopyTo(finalData, 0);
                     encryptedData.CopyTo(finalData, checksum.Length);
-                    
+
                     File.WriteAllBytes(filePath, finalData);
-                    
+
                     LogHelper.WriteLogToFile($"DeviceIdentifier | 加密使用统计已保存到: {filePath}");
                 }
             }
@@ -958,7 +959,7 @@ namespace Ink_Canvas.Helpers
                 LogHelper.WriteLogToFile($"DeviceIdentifier | 记录更新检查失败: {ex.Message}", LogHelper.LogType.Error);
             }
         }
-        
+
 
         /// <summary>
         /// 从备份文件恢复使用统计数据
@@ -997,7 +998,7 @@ namespace Ink_Canvas.Helpers
             try
             {
                 var status = new List<string>();
-                
+
                 // 检查主文件
                 if (File.Exists(UsageStatsFilePath))
                 {
@@ -1054,7 +1055,7 @@ namespace Ink_Canvas.Helpers
         /// <param name="isAutoUpdate">是否为自动更新检查（默认true，false表示版本修复）</param>
         /// <param name="currentVersionReleaseTime">当前版本发布时间</param>
         /// <returns>是否应该推送更新</returns>
-        public static bool ShouldPushUpdate(string updateVersion, DateTime releaseTime, bool isAutoUpdate = true, DateTime? currentVersionReleaseTime = null)
+        public static bool ShouldPushUpdate(string updateVersion, DateTime releaseTime, bool isAutoUpdate = true, DateTime? currentVersionReleaseTime = null, string localVersion = null)
         {
             try
             {
@@ -1086,6 +1087,25 @@ namespace Ink_Canvas.Helpers
                     daysBetweenVersions = (DateTime.Now - releaseTime).TotalDays;
                 }
 
+                // 当无法获取版本发布时间时，判断版本号差异
+                if (!currentVersionReleaseTime.HasValue && !string.IsNullOrEmpty(localVersion))
+                {
+                    int versionDiff = CalculateVersionGenerationDifference(localVersion, updateVersion);
+                    LogHelper.WriteLogToFile($"DeviceIdentifier | 无法获取版本发布时间，使用版本号差异判断 - 本地版本: {localVersion}, 远程版本: {updateVersion}, 代数差异: {versionDiff}");
+
+                    // 当版本号代数差异大于3时自动更新
+                    if (versionDiff > 3)
+                    {
+                        LogHelper.WriteLogToFile($"DeviceIdentifier | 版本号代数差异({versionDiff})大于3，自动更新");
+                        return true;
+                    }
+                    else
+                    {
+                        LogHelper.WriteLogToFile($"DeviceIdentifier | 版本号代数差异({versionDiff})不大于3，暂不更新");
+                        return false;
+                    }
+                }
+
                 // 计算最近活跃度（最后一次使用距今的天数）
                 var daysSinceLastUse = (DateTime.Now - stats.LastLaunchTime).TotalDays;
 
@@ -1265,6 +1285,77 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        /// <summary>
+        /// 计算版本号代数差异
+        /// </summary>
+        /// <param name="localVersion">本地版本号</param>
+        /// <param name="remoteVersion">远程版本号</param>
+        /// <returns>版本号代数差异，如果无法计算则返回0</returns>
+        private static int CalculateVersionGenerationDifference(string localVersion, string remoteVersion)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(localVersion) || string.IsNullOrEmpty(remoteVersion))
+                    return 0;
+
+                // 移除可能的前缀（如 "v"）
+                var cleanLocal = localVersion.TrimStart('v', 'V');
+                var cleanRemote = remoteVersion.TrimStart('v', 'V');
+
+                // 解析版本号 (格式: X.X.X.X)
+                var localParts = cleanLocal.Split('.');
+                var remoteParts = cleanRemote.Split('.');
+
+                if (localParts.Length < 4 || remoteParts.Length < 4)
+                    return 0;
+
+                // 解析四个版本号部分
+                if (int.TryParse(localParts[0], out int localMajor) &&
+                    int.TryParse(localParts[1], out int localMinor) &&
+                    int.TryParse(localParts[2], out int localBuild) &&
+                    int.TryParse(localParts[3], out int localRevision) &&
+                    int.TryParse(remoteParts[0], out int remoteMajor) &&
+                    int.TryParse(remoteParts[1], out int remoteMinor) &&
+                    int.TryParse(remoteParts[2], out int remoteBuild) &&
+                    int.TryParse(remoteParts[3], out int remoteRevision))
+                {
+                    // 计算代数差异：主版本号差异 * 1000 + 次版本号差异 * 100 + 构建号差异 * 10 + 修订号差异
+                    int majorDiff = remoteMajor - localMajor;
+                    int minorDiff = remoteMinor - localMinor;
+                    int buildDiff = remoteBuild - localBuild;
+                    int revisionDiff = remoteRevision - localRevision;
+
+                    // 如果主版本号不同，则代数差异很大
+                    if (majorDiff != 0)
+                    {
+                        return majorDiff * 1000 + minorDiff * 100 + buildDiff * 10 + revisionDiff;
+                    }
+
+                    // 如果次版本号不同，则代数差异中等
+                    if (minorDiff != 0)
+                    {
+                        return minorDiff * 100 + buildDiff * 10 + revisionDiff;
+                    }
+
+                    // 如果构建号不同，则代数差异较小
+                    if (buildDiff != 0)
+                    {
+                        return buildDiff * 10 + revisionDiff;
+                    }
+
+                    // 只有修订号不同，代数差异最小
+                    return revisionDiff;
+                }
+
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"DeviceIdentifier | 计算版本号代数差异失败: {ex.Message}", LogHelper.LogType.Warning);
+                return 0;
+            }
+        }
+
         /// <summary>
         /// 根据更新类型获取紧急程度倍数（仅用于自动更新分级）
         /// </summary>
@@ -1339,7 +1430,7 @@ namespace Ink_Canvas.Helpers
 
             return descriptions.Count > 0 ? string.Join(", ", descriptions) : "普通用户";
         }
-        
+
         /// <summary>
         /// 关机时保存使用时间数据
         /// </summary>
@@ -1360,7 +1451,7 @@ namespace Ink_Canvas.Helpers
                 // 2. 计算本次会话时长（防止异常值）
                 TimeSpan sessionDuration = DateTime.Now - App.appStartTime;
                 long sessionSeconds = Math.Max(0, (long)sessionDuration.TotalSeconds);
-                
+
                 // 防止异常大的会话时长（超过24小时）
                 if (sessionSeconds > 86400)
                 {
@@ -1373,10 +1464,10 @@ namespace Ink_Canvas.Helpers
                 stats.LaunchCount++;
                 stats.AverageSessionSeconds = stats.TotalUsageSeconds / (double)Math.Max(1, stats.LaunchCount);
                 stats.LastLaunchTime = DateTime.Now;
-                
+
                 // 4. 保存数据
                 SaveUsageStats(stats);
-                
+
                 LogHelper.WriteLogToFile("DeviceIdentifier | 关机保存完成");
             }
             catch (Exception ex)

Ink Canvas/Helpers/FileAssociationManager.cs

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

Ink Canvas/Helpers/FloatingWindowInterceptor.cs

@@ -0,0 +1,762 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Threading;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 悬浮窗拦截器 - 检测和隐藏指定的悬浮窗
+    /// </summary>
+    public class FloatingWindowInterceptor : IDisposable
+    {
+        #region Windows API Declarations
+
+        [DllImport("user32.dll")]
+        private static extern bool EnumWindows(EnumWindowsProc enumProc, IntPtr lParam);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr GetWindowThreadProcessId(IntPtr hWnd, out uint processId);
+
+        [DllImport("user32.dll")]
+        private static extern bool IsWindowVisible(IntPtr hWnd);
+
+        [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")]
+        private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
+
+        [DllImport("user32.dll")]
+        private static extern bool IsIconic(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr GetWindow(IntPtr hWnd, uint uCmd);
+
+        [DllImport("user32.dll")]
+        private static extern uint GetWindowLong(IntPtr hWnd, int nIndex);
+
+        [DllImport("user32.dll")]
+        private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
+
+        [DllImport("user32.dll")]
+        private static extern bool IsWindow(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        private static extern bool GetWindowRect(IntPtr hWnd, out ForegroundWindowInfo.RECT lpRect);
+
+        [DllImport("kernel32.dll")]
+        private static extern IntPtr OpenProcess(uint dwDesiredAccess, bool bInheritHandle, uint dwProcessId);
+
+        [DllImport("kernel32.dll")]
+        private static extern bool CloseHandle(IntPtr hObject);
+
+        [DllImport("kernel32.dll")]
+        private static extern int GetProcessImageFileName(IntPtr hProcess, StringBuilder lpImageFileName, int nSize);
+
+        private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
+
+        private const int SW_HIDE = 0;
+        private const int SW_SHOW = 1;
+        private const int SW_MINIMIZE = 6;
+        private const int SW_RESTORE = 9;
+
+        private const int GWL_EXSTYLE = -20;
+        private const uint WS_EX_TOOLWINDOW = 0x00000080;
+        private const uint WS_EX_APPWINDOW = 0x00040000;
+
+        private const uint SWP_NOMOVE = 0x0002;
+        private const uint SWP_NOSIZE = 0x0001;
+        private const uint SWP_NOZORDER = 0x0004;
+        private const uint SWP_HIDEWINDOW = 0x0080;
+
+        private const uint PROCESS_QUERY_INFORMATION = 0x0400;
+        private const uint PROCESS_VM_READ = 0x0010;
+
+        #endregion
+
+        #region 拦截规则定义
+
+        /// <summary>
+        /// 拦截规则类型
+        /// </summary>
+        public enum InterceptType
+        {
+            /// <summary>
+            /// 希沃白板3 桌面悬浮窗
+            /// </summary>
+            SeewoWhiteboard3Floating,
+            /// <summary>
+            /// 希沃白板5 桌面悬浮窗
+            /// </summary>
+            SeewoWhiteboard5Floating,
+            /// <summary>
+            /// 希沃白板5C 桌面悬浮窗
+            /// </summary>
+            SeewoWhiteboard5CFloating,
+            /// <summary>
+            /// 希沃品课教师端 桌面悬浮窗
+            /// </summary>
+            SeewoPincoSideBarFloating,
+            /// <summary>
+            /// 希沃品课教师端 画笔悬浮窗（包括PPT控件）
+            /// </summary>
+            SeewoPincoDrawingFloating,
+            /// <summary>
+            /// 希沃PPT小工具
+            /// </summary>
+            SeewoPPTFloating,
+            /// <summary>
+            /// AiClass 桌面悬浮窗
+            /// </summary>
+            AiClassFloating,
+            /// <summary>
+            /// 鸿合屏幕书写
+            /// </summary>
+            HiteAnnotationFloating,
+            /// <summary>
+            /// 畅言智慧课堂 桌面悬浮窗
+            /// </summary>
+            ChangYanFloating,
+            /// <summary>
+            /// 畅言智慧课堂 PPT悬浮窗
+            /// </summary>
+            ChangYanPptFloating,
+            /// <summary>
+            /// 天喻教育云互动课堂 桌面悬浮窗（包括PPT控件）
+            /// </summary>
+            IntelligentClassFloating,
+            /// <summary>
+            /// 希沃桌面 画笔悬浮窗
+            /// </summary>
+            SeewoDesktopAnnotationFloating,
+            /// <summary>
+            /// 希沃桌面 侧栏悬浮窗
+            /// </summary>
+            SeewoDesktopSideBarFloating
+        }
+
+        /// <summary>
+        /// 拦截规则
+        /// </summary>
+        public class InterceptRule
+        {
+            public InterceptType Type { get; set; }
+            public string ProcessName { get; set; }
+            public string WindowTitlePattern { get; set; }
+            public string ClassNamePattern { get; set; }
+            public bool IsEnabled { get; set; }
+            public bool RequiresAdmin { get; set; }
+            public string Description { get; set; }
+        }
+
+        #endregion
+
+        #region 私有字段
+
+        private readonly Dictionary<InterceptType, InterceptRule> _interceptRules;
+        private readonly Dictionary<IntPtr, InterceptType> _interceptedWindows;
+        private readonly Timer _scanTimer;
+        private readonly Dispatcher _dispatcher;
+        private bool _isRunning;
+        private bool _disposed;
+
+        #endregion
+
+        #region 公共属性
+
+        public bool IsRunning => _isRunning;
+
+        #endregion
+
+        #region 事件
+
+        public event EventHandler<WindowInterceptedEventArgs> WindowIntercepted;
+        public event EventHandler<WindowRestoredEventArgs> WindowRestored;
+
+        #endregion
+
+        #region 构造函数
+
+        public FloatingWindowInterceptor()
+        {
+            _interceptRules = new Dictionary<InterceptType, InterceptRule>();
+            _interceptedWindows = new Dictionary<IntPtr, InterceptType>();
+            _dispatcher = Dispatcher.CurrentDispatcher;
+
+            InitializeRules();
+            _scanTimer = new Timer(ScanForWindows, null, Timeout.Infinite, Timeout.Infinite);
+        }
+
+        #endregion
+
+        #region 初始化
+
+        private void InitializeRules()
+        {
+            // 希沃白板3 桌面悬浮窗
+            _interceptRules[InterceptType.SeewoWhiteboard3Floating] = new InterceptRule
+            {
+                Type = InterceptType.SeewoWhiteboard3Floating,
+                ProcessName = "EasiNote",
+                WindowTitlePattern = "",
+                ClassNamePattern = "",
+                IsEnabled = true,
+                RequiresAdmin = false,
+                Description = "希沃白板3 桌面悬浮窗"
+            };
+
+            // 希沃白板5 桌面悬浮窗
+            _interceptRules[InterceptType.SeewoWhiteboard5Floating] = new InterceptRule
+            {
+                Type = InterceptType.SeewoWhiteboard5Floating,
+                ProcessName = "EasiNote",
+                WindowTitlePattern = "",
+                ClassNamePattern = "",
+                IsEnabled = true,
+                RequiresAdmin = false,
+                Description = "希沃白板5 桌面悬浮窗"
+            };
+
+            // 希沃白板5C 桌面悬浮窗
+            _interceptRules[InterceptType.SeewoWhiteboard5CFloating] = new InterceptRule
+            {
+                Type = InterceptType.SeewoWhiteboard5CFloating,
+                ProcessName = "EasiNote5C",
+                WindowTitlePattern = "",
+                ClassNamePattern = "",
+                IsEnabled = true,
+                RequiresAdmin = false,
+                Description = "希沃白板5C 桌面悬浮窗"
+            };
+
+            // 希沃品课教师端 桌面悬浮窗
+            _interceptRules[InterceptType.SeewoPincoSideBarFloating] = new InterceptRule
+            {
+                Type = InterceptType.SeewoPincoSideBarFloating,
+                ProcessName = "ClassIn",
+                WindowTitlePattern = "",
+                ClassNamePattern = "",
+                IsEnabled = true,
+                RequiresAdmin = false,
+                Description = "希沃品课教师端 桌面悬浮窗"
+            };
+
+            // 希沃品课教师端 画笔悬浮窗
+            _interceptRules[InterceptType.SeewoPincoDrawingFloating] = new InterceptRule
+            {
+                Type = InterceptType.SeewoPincoDrawingFloating,
+                ProcessName = "ClassIn",
+                WindowTitlePattern = "",
+                ClassNamePattern = "",
+                IsEnabled = true,
+                RequiresAdmin = false,
+                Description = "希沃品课教师端 画笔悬浮窗（包括PPT控件）"
+            };
+
+            // 希沃PPT小工具
+            _interceptRules[InterceptType.SeewoPPTFloating] = new InterceptRule
+            {
+                Type = InterceptType.SeewoPPTFloating,
+                ProcessName = "SeewoPPT",
+                WindowTitlePattern = "",
+                ClassNamePattern = "",
+                IsEnabled = true,
+                RequiresAdmin = false,
+                Description = "希沃PPT小工具"
+            };
+
+            // AiClass 桌面悬浮窗
+            _interceptRules[InterceptType.AiClassFloating] = new InterceptRule
+            {
+                Type = InterceptType.AiClassFloating,
+                ProcessName = "ClassIn",
+                WindowTitlePattern = "",
+                ClassNamePattern = "",
+                IsEnabled = true,
+                RequiresAdmin = false,
+                Description = "AiClass 桌面悬浮窗"
+            };
+
+            // 鸿合屏幕书写
+            _interceptRules[InterceptType.HiteAnnotationFloating] = new InterceptRule
+            {
+                Type = InterceptType.HiteAnnotationFloating,
+                ProcessName = "HiteVision",
+                WindowTitlePattern = "",
+                ClassNamePattern = "",
+                IsEnabled = true,
+                RequiresAdmin = false,
+                Description = "鸿合屏幕书写"
+            };
+
+            // 畅言智慧课堂 桌面悬浮窗
+            _interceptRules[InterceptType.ChangYanFloating] = new InterceptRule
+            {
+                Type = InterceptType.ChangYanFloating,
+                ProcessName = "ClassIn",
+                WindowTitlePattern = "",
+                ClassNamePattern = "",
+                IsEnabled = true,
+                RequiresAdmin = true,
+                Description = "畅言智慧课堂 桌面悬浮窗"
+            };
+
+            // 畅言智慧课堂 PPT悬浮窗
+            _interceptRules[InterceptType.ChangYanPptFloating] = new InterceptRule
+            {
+                Type = InterceptType.ChangYanPptFloating,
+                ProcessName = "ClassIn",
+                WindowTitlePattern = "",
+                ClassNamePattern = "",
+                IsEnabled = true,
+                RequiresAdmin = true,
+                Description = "畅言智慧课堂 PPT悬浮窗"
+            };
+
+            // 天喻教育云互动课堂 桌面悬浮窗
+            _interceptRules[InterceptType.IntelligentClassFloating] = new InterceptRule
+            {
+                Type = InterceptType.IntelligentClassFloating,
+                ProcessName = "ClassIn",
+                WindowTitlePattern = "",
+                ClassNamePattern = "",
+                IsEnabled = true,
+                RequiresAdmin = false,
+                Description = "天喻教育云互动课堂 桌面悬浮窗（包括PPT控件）"
+            };
+
+            // 希沃桌面 画笔悬浮窗
+            _interceptRules[InterceptType.SeewoDesktopAnnotationFloating] = new InterceptRule
+            {
+                Type = InterceptType.SeewoDesktopAnnotationFloating,
+                ProcessName = "Seewo",
+                WindowTitlePattern = "",
+                ClassNamePattern = "",
+                IsEnabled = true,
+                RequiresAdmin = false,
+                Description = "希沃桌面 画笔悬浮窗"
+            };
+
+            // 希沃桌面 侧栏悬浮窗
+            _interceptRules[InterceptType.SeewoDesktopSideBarFloating] = new InterceptRule
+            {
+                Type = InterceptType.SeewoDesktopSideBarFloating,
+                ProcessName = "Seewo",
+                WindowTitlePattern = "",
+                ClassNamePattern = "",
+                IsEnabled = true,
+                RequiresAdmin = true,
+                Description = "希沃桌面 侧栏悬浮窗"
+            };
+
+        }
+
+        #endregion
+
+        #region 公共方法
+
+        /// <summary>
+        /// 启动拦截器
+        /// </summary>
+        public void Start(int scanIntervalMs = 5000)
+        {
+            if (_isRunning) return;
+
+            _isRunning = true;
+            _scanTimer.Change(0, scanIntervalMs);
+        }
+
+        /// <summary>
+        /// 停止拦截器
+        /// </summary>
+        public void Stop()
+        {
+            if (!_isRunning) return;
+
+            _isRunning = false;
+            _scanTimer.Change(Timeout.Infinite, Timeout.Infinite);
+            
+            // 恢复所有被拦截的窗口
+            RestoreAllWindows();
+        }
+
+        /// <summary>
+        /// 设置拦截规则
+        /// </summary>
+        public void SetInterceptRule(InterceptType type, bool enabled)
+        {
+            if (_interceptRules.ContainsKey(type))
+            {
+                _interceptRules[type].IsEnabled = enabled;
+            }
+        }
+
+        /// <summary>
+        /// 获取拦截规则
+        /// </summary>
+        public InterceptRule GetInterceptRule(InterceptType type)
+        {
+            return _interceptRules.ContainsKey(type) ? _interceptRules[type] : null;
+        }
+
+        /// <summary>
+        /// 获取所有拦截规则
+        /// </summary>
+        public Dictionary<InterceptType, InterceptRule> GetAllRules()
+        {
+            return new Dictionary<InterceptType, InterceptRule>(_interceptRules);
+        }
+
+        /// <summary>
+        /// 手动扫描一次
+        /// </summary>
+        public void ScanOnce()
+        {
+            ScanForWindows(null);
+        }
+
+        /// <summary>
+        /// 恢复所有被拦截的窗口
+        /// </summary>
+        public void RestoreAllWindows()
+        {
+            var windowsToRestore = new List<IntPtr>(_interceptedWindows.Keys);
+            foreach (var hWnd in windowsToRestore)
+            {
+                RestoreWindow(hWnd);
+            }
+        }
+
+        /// <summary>
+        /// 恢复指定窗口
+        /// </summary>
+        public bool RestoreWindow(IntPtr hWnd)
+        {
+            if (!_interceptedWindows.ContainsKey(hWnd)) return false;
+
+            if (IsWindow(hWnd))
+            {
+                ShowWindow(hWnd, SW_RESTORE);
+                _interceptedWindows.Remove(hWnd);
+
+                WindowRestored?.Invoke(this, new WindowRestoredEventArgs
+                {
+                    WindowHandle = hWnd,
+                    InterceptType = _interceptedWindows[hWnd]
+                });
+
+                return true;
+            }
+
+            _interceptedWindows.Remove(hWnd);
+            return false;
+        }
+
+        #endregion
+
+        #region 私有方法
+
+        private void ScanForWindows(object state)
+        {
+            if (!_isRunning) return;
+
+            try
+            {
+                EnumWindows(EnumWindowsCallback, IntPtr.Zero);
+            }
+            catch (Exception ex)
+            {
+                // 记录错误但不中断扫描
+                LogHelper.WriteLogToFile($"扫描窗口时发生错误: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        private bool EnumWindowsCallback(IntPtr hWnd, IntPtr lParam)
+        {
+            try
+            {
+                // 基本检查
+                if (!IsWindow(hWnd) || !IsWindowVisible(hWnd)) return true;
+                
+                // 检查是否已经被拦截
+                if (_interceptedWindows.ContainsKey(hWnd)) return true;
+
+                // 获取窗口信息
+                var windowInfo = GetWindowInfo(hWnd);
+                if (windowInfo == null) return true;
+
+                // 检查窗口样式，过滤掉系统窗口和主窗口
+                var exStyle = GetWindowLong(hWnd, GWL_EXSTYLE);
+                var style = GetWindowLong(hWnd, -16); // GWL_STYLE
+
+                // 跳过工具窗口
+                if ((exStyle & WS_EX_TOOLWINDOW) != 0) 
+                {
+                    return true;
+                }
+
+                // 跳过主窗口（有标题栏和系统菜单的窗口）
+                const uint WS_CAPTION = 0x00C00000;
+                const uint WS_SYSMENU = 0x00080000;
+                if ((style & WS_CAPTION) != 0 && (style & WS_SYSMENU) != 0)
+                {
+                    return true;
+                }
+
+                // 检查窗口大小，跳过过大的窗口
+                var rect = new ForegroundWindowInfo.RECT();
+                GetWindowRect(hWnd, out rect);
+                var width = rect.Right - rect.Left;
+                var height = rect.Bottom - rect.Top;
+
+                if (width > 600 || height > 400)
+                {
+                    return true;
+                }
+
+                // 检查是否匹配拦截规则
+                foreach (var rule in _interceptRules.Values)
+                {
+                    if (!rule.IsEnabled) continue;
+
+                    if (MatchesRule(windowInfo, rule))
+                    {
+                        InterceptWindow(hWnd, rule);
+                        break;
+                    }
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"处理窗口时发生错误: {ex.Message}", LogHelper.LogType.Error);
+                return true;
+            }
+        }
+
+        private WindowInfo GetWindowInfo(IntPtr hWnd)
+        {
+            try
+            {
+                // 获取进程ID
+                GetWindowThreadProcessId(hWnd, out uint processId);
+                if (processId == 0) return null;
+
+                // 获取进程信息
+                var process = Process.GetProcessById((int)processId);
+                if (process == null) return null;
+
+                // 获取窗口标题
+                var titleBuilder = new StringBuilder(256);
+                GetWindowText(hWnd, titleBuilder, titleBuilder.Capacity);
+
+                // 获取窗口类名
+                var classBuilder = new StringBuilder(256);
+                GetClassName(hWnd, classBuilder, classBuilder.Capacity);
+
+                return new WindowInfo
+                {
+                    Handle = hWnd,
+                    ProcessId = processId,
+                    ProcessName = process.ProcessName,
+                    WindowTitle = titleBuilder.ToString(),
+                    ClassName = classBuilder.ToString(),
+                    Process = process
+                };
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        private bool MatchesRule(WindowInfo windowInfo, InterceptRule rule)
+        {
+            try
+            {
+                // 检查进程名（如果指定了进程名）
+                if (!string.IsNullOrEmpty(rule.ProcessName))
+                {
+                    if (!windowInfo.ProcessName.ToLower().Contains(rule.ProcessName.ToLower()))
+                    {
+                        return false;
+                    }
+                }
+
+                // 检查窗口标题（如果指定了模式）
+                if (!string.IsNullOrEmpty(rule.WindowTitlePattern))
+                {
+                    if (!windowInfo.WindowTitle.ToLower().Contains(rule.WindowTitlePattern.ToLower()))
+                    {
+                        return false;
+                    }
+                }
+
+                // 检查类名（如果指定了模式）
+                if (!string.IsNullOrEmpty(rule.ClassNamePattern))
+                {
+                    if (!windowInfo.ClassName.ToLower().Contains(rule.ClassNamePattern.ToLower()))
+                    {
+                        return false;
+                    }
+                }
+
+                // 如果所有检查都通过，就认为是目标窗口
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"匹配规则时发生错误: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        private void InterceptWindow(IntPtr hWnd, InterceptRule rule)
+        {
+            try
+            {
+                // 使用多种方法隐藏窗口
+                // 方法1：移动到屏幕外
+                SetWindowPos(hWnd, IntPtr.Zero, -2000, -2000, 0, 0, 
+                    SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_HIDEWINDOW);
+
+                // 方法2：最小化窗口
+                ShowWindow(hWnd, SW_MINIMIZE);
+
+                // 方法3：隐藏窗口
+                ShowWindow(hWnd, SW_HIDE);
+
+                // 记录拦截的窗口
+                _interceptedWindows[hWnd] = rule.Type;
+
+                // 触发事件
+                WindowIntercepted?.Invoke(this, new WindowInterceptedEventArgs
+                {
+                    WindowHandle = hWnd,
+                    InterceptType = rule.Type,
+                    Rule = rule,
+                    WindowTitle = GetWindowTitle(hWnd)
+                });
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"拦截窗口时发生错误: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        private string GetWindowTitle(IntPtr hWnd)
+        {
+            try
+            {
+                var titleBuilder = new StringBuilder(256);
+                GetWindowText(hWnd, titleBuilder, titleBuilder.Capacity);
+                return titleBuilder.ToString();
+            }
+            catch
+            {
+                return "Unknown";
+            }
+        }
+
+        private bool IsMainWindow(IntPtr hWnd)
+        {
+            try
+            {
+                // 检查是否有父窗口
+                var parent = GetWindow(hWnd, 4); // GW_OWNER
+                if (parent != IntPtr.Zero) return false;
+
+                // 检查窗口样式
+                var style = GetWindowLong(hWnd, -16); // GWL_STYLE
+                var exStyle = GetWindowLong(hWnd, GWL_EXSTYLE);
+
+                // 主窗口通常有 WS_CAPTION 和 WS_SYSMENU
+                const uint WS_CAPTION = 0x00C00000;
+                const uint WS_SYSMENU = 0x00080000;
+
+                if ((style & WS_CAPTION) != 0 && (style & WS_SYSMENU) != 0)
+                {
+                    return true; // 这可能是主窗口
+                }
+
+                // 检查窗口大小，主窗口通常比较大
+                var rect = new ForegroundWindowInfo.RECT();
+                GetWindowRect(hWnd, out rect);
+                var width = rect.Right - rect.Left;
+                var height = rect.Bottom - rect.Top;
+
+                // 如果窗口很大，可能是主窗口
+                if (width > 800 && height > 600)
+                {
+                    return true;
+                }
+
+                return false;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        #endregion
+
+        #region 辅助类
+
+        private class WindowInfo
+        {
+            public IntPtr Handle { get; set; }
+            public uint ProcessId { get; set; }
+            public string ProcessName { get; set; }
+            public string WindowTitle { get; set; }
+            public string ClassName { get; set; }
+            public Process Process { get; set; }
+        }
+
+        #endregion
+
+        #region 事件参数类
+
+        public class WindowInterceptedEventArgs : EventArgs
+        {
+            public IntPtr WindowHandle { get; set; }
+            public InterceptType InterceptType { get; set; }
+            public InterceptRule Rule { get; set; }
+            public string WindowTitle { get; set; }
+        }
+
+        public class WindowRestoredEventArgs : EventArgs
+        {
+            public IntPtr WindowHandle { get; set; }
+            public InterceptType InterceptType { get; set; }
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        public void Dispose()
+        {
+            if (_disposed) return;
+
+            Stop();
+            _scanTimer?.Dispose();
+
+            // 恢复所有被拦截的窗口
+            RestoreAllWindows();
+
+            _disposed = true;
+        }
+
+        #endregion
+    }
+}

Ink Canvas/Helpers/GlobalHotkeyManager.cs

@@ -1,11 +1,11 @@
+using Newtonsoft.Json;
+using NHotkey.Wpf;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text;
 using System.Windows.Input;
-using Newtonsoft.Json;
-using NHotkey.Wpf;
 
 namespace Ink_Canvas.Helpers
 {
@@ -19,9 +19,9 @@ namespace Ink_Canvas.Helpers
         private readonly MainWindow _mainWindow;
         private bool _isDisposed;
         private bool _hotkeysShouldBeRegistered = true; // 启动时注册热键
-        
+
         // 配置文件路径
-        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 +30,9 @@ namespace Ink_Canvas.Helpers
             _mainWindow = mainWindow ?? throw new ArgumentNullException(nameof(mainWindow));
             _registeredHotkeys = new Dictionary<string, HotkeyInfo>();
             _hotkeysShouldBeRegistered = true; // 启动时注册热键
+            
+            // 启动时确保配置文件存在
+            EnsureConfigFileExists();
         }
         #endregion
 
@@ -227,7 +230,7 @@ namespace Ink_Canvas.Helpers
             try
             {
                 // 开始注册默认快捷键集合
-                
+
                 // 基本操作快捷键
                 RegisterHotkey("Undo", Key.Z, ModifierKeys.Control, () => _mainWindow.SymbolIconUndo_MouseUp(null, null));
                 RegisterHotkey("Redo", Key.Y, ModifierKeys.Control, () => _mainWindow.SymbolIconRedo_MouseUp(null, null));
@@ -272,14 +275,25 @@ namespace Ink_Canvas.Helpers
             try
             {
                 // 开始从配置文件加载快捷键设置
-                
+
                 // 检查是否应该注册快捷键
                 if (!_hotkeysShouldBeRegistered)
                 {
                     // 当前状态不允许注册快捷键，跳过加载
                     return;
                 }
-                
+
+                // 如果配置文件不存在，先创建默认配置文件
+                if (!File.Exists(HotkeyConfigFile))
+                {
+                    LogHelper.WriteLogToFile($"快捷键配置文件不存在: {HotkeyConfigFile}", LogHelper.LogType.Warning);
+                    LogHelper.WriteLogToFile("配置文件不存在，创建默认配置文件并注册默认快捷键");
+                    CreateDefaultConfigFile();
+                    RegisterDefaultHotkeys();
+                    _hotkeysShouldBeRegistered = true;
+                    return;
+                }
+
                 // 尝试从配置文件加载
                 if (LoadHotkeysFromConfigFile())
                 {
@@ -289,19 +303,9 @@ namespace Ink_Canvas.Helpers
                 }
                 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)
@@ -319,7 +323,7 @@ namespace Ink_Canvas.Helpers
             try
             {
                 LogHelper.WriteLogToFile("开始保存快捷键配置到配置文件", LogHelper.LogType.Event);
-                
+
                 if (SaveHotkeysToConfigFile())
                 {
                     LogHelper.WriteLogToFile("快捷键配置已成功保存到配置文件", LogHelper.LogType.Event);
@@ -347,15 +351,12 @@ namespace Ink_Canvas.Helpers
                 {
                     _hotkeysShouldBeRegistered = true;
                     LogHelper.WriteLogToFile("启用快捷键注册功能");
-                    
+
                     // 立即加载快捷键设置
                     LoadHotkeysFromSettings();
                 }
                 else
                 {
-                    LogHelper.WriteLogToFile("快捷键注册功能已经启用，重新加载快捷键设置");
-                    // 即使已经启用，也要重新加载快捷键设置以确保快捷键正常工作
-                    LoadHotkeysFromSettings();
                 }
             }
             catch (Exception ex)
@@ -375,8 +376,7 @@ namespace Ink_Canvas.Helpers
                 if (_hotkeysShouldBeRegistered)
                 {
                     _hotkeysShouldBeRegistered = false;
-                    LogHelper.WriteLogToFile("禁用快捷键注册功能");
-                    
+
                     // 注销所有快捷键
                     UnregisterAllHotkeys();
                 }
@@ -402,15 +402,23 @@ namespace Ink_Canvas.Helpers
             {
                 if (isMouseMode)
                 {
-                    // 鼠标模式下禁用快捷键，让键盘操作放行
-                    DisableHotkeyRegistration();
-                    LogHelper.WriteLogToFile("切换到鼠标模式，禁用快捷键以放行键盘操作");
+                    // 检查设置中是否允许在鼠标模式下启用快捷键
+                    if (MainWindow.Settings.Appearance.EnableHotkeysInMouseMode)
+                    {
+                        // 如果设置允许，则在鼠标模式下也启用快捷键
+                        EnableHotkeyRegistration();
+                        LogHelper.WriteLogToFile("切换到鼠标模式，但根据设置保持快捷键启用");
+                    }
+                    else
+                    {
+                        // 鼠标模式下禁用快捷键，让键盘操作放行
+                        DisableHotkeyRegistration();
+                    }
                 }
                 else
                 {
                     // 非鼠标模式下启用快捷键
                     EnableHotkeyRegistration();
-                    LogHelper.WriteLogToFile("切换到非鼠标模式，启用快捷键");
                 }
             }
             catch (Exception ex)
@@ -438,20 +446,20 @@ namespace Ink_Canvas.Helpers
 
                 // 获取原有的动作
                 var originalAction = _registeredHotkeys[hotkeyName].Action;
-                
+
                 // 注销原有快捷键
                 UnregisterHotkey(hotkeyName);
-                
+
                 // 注册新的快捷键
                 var success = RegisterHotkey(hotkeyName, key, modifiers, originalAction);
-                
+
                 if (success)
                 {
                     LogHelper.WriteLogToFile($"成功更新快捷键 {hotkeyName}: {modifiers}+{key}", LogHelper.LogType.Event);
                     // 自动保存配置
                     SaveHotkeysToSettings();
                 }
-                
+
                 return success;
             }
             catch (Exception ex)
@@ -472,17 +480,17 @@ namespace Ink_Canvas.Helpers
             try
             {
                 // 通过反射访问主窗口的penType字段
-                var penTypeField = _mainWindow.GetType().GetField("penType", 
+                var penTypeField = _mainWindow.GetType().GetField("penType",
                     BindingFlags.NonPublic | BindingFlags.Instance);
-                
+
                 if (penTypeField != null)
                 {
                     penTypeField.SetValue(_mainWindow, penTypeIndex);
-                    
+
                     // 调用CheckPenTypeUIState方法更新UI状态
-                    var checkPenTypeMethod = _mainWindow.GetType().GetMethod("CheckPenTypeUIState", 
+                    var checkPenTypeMethod = _mainWindow.GetType().GetMethod("CheckPenTypeUIState",
                         BindingFlags.NonPublic | BindingFlags.Instance);
-                    
+
                     if (checkPenTypeMethod != null)
                     {
                         checkPenTypeMethod.Invoke(_mainWindow, null);
@@ -495,6 +503,90 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        /// <summary>
+        /// 确保配置文件存在，如果不存在则创建
+        /// </summary>
+        private void EnsureConfigFileExists()
+        {
+            try
+            {
+                // 如果配置文件不存在，创建默认配置文件
+                if (!File.Exists(HotkeyConfigFile))
+                {
+                    LogHelper.WriteLogToFile($"快捷键配置文件不存在，创建默认配置文件: {HotkeyConfigFile}", LogHelper.LogType.Event);
+                    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);
+
+                LogHelper.WriteLogToFile($"已创建默认快捷键配置文件: {HotkeyConfigFile}", LogHelper.LogType.Event);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"创建默认快捷键配置文件时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
         /// <summary>
         /// 从配置文件加载快捷键设置
         /// </summary>
@@ -604,7 +696,7 @@ namespace Ink_Canvas.Helpers
                 {
                     Formatting = Formatting.Indented
                 };
-                
+
                 string jsonContent = JsonConvert.SerializeObject(config, settings);
 
                 // 直接写入原文件，覆盖原有内容
@@ -688,9 +780,9 @@ namespace Ink_Canvas.Helpers
             try
             {
                 // 通过反射访问主窗口的FloatingbarSelectionBG字段
-                var floatingbarSelectionBGField = _mainWindow.GetType().GetField("FloatingbarSelectionBG", 
+                var floatingbarSelectionBGField = _mainWindow.GetType().GetField("FloatingbarSelectionBG",
                     BindingFlags.NonPublic | BindingFlags.Instance);
-                
+
                 if (floatingbarSelectionBGField != null)
                 {
                     var floatingbarSelectionBG = floatingbarSelectionBGField.GetValue(_mainWindow);
@@ -707,7 +799,7 @@ namespace Ink_Canvas.Helpers
                                 return true; // 返回true表示应该注销快捷键
                             }
                         }
-                        
+
                         // 通过反射访问Canvas.GetLeft方法来获取高光位置
                         var canvasType = Type.GetType("System.Windows.Controls.Canvas, PresentationFramework");
                         if (canvasType != null)
@@ -719,7 +811,7 @@ namespace Ink_Canvas.Helpers
                                 if (leftPosition != null)
                                 {
                                     var position = Convert.ToDouble(leftPosition);
-                                    
+
                                     // 根据高光位置判断当前选中的工具
                                     // 位置计算基于SetFloatingBarHighlightPosition方法中的逻辑
                                     bool isMouseMode;
@@ -739,20 +831,20 @@ namespace Ink_Canvas.Helpers
                                     {
                                         isMouseMode = false;
                                     }
-                                    
+
                                     return isMouseMode;
                                 }
                             }
                         }
                     }
                 }
-                
+
                 // 如果无法获取高光状态，则回退到inkCanvas.EditingMode判断
-                
+
                 // 通过反射访问主窗口的inkCanvas字段
-                var inkCanvasField = _mainWindow.GetType().GetField("inkCanvas", 
+                var inkCanvasField = _mainWindow.GetType().GetField("inkCanvas",
                     BindingFlags.NonPublic | BindingFlags.Instance);
-                
+
                 if (inkCanvasField != null)
                 {
                     var inkCanvas = inkCanvasField.GetValue(_mainWindow);
@@ -768,23 +860,23 @@ namespace Ink_Canvas.Helpers
                                 // 检查是否为批注模式
                                 var isInkMode = editingMode.ToString().Contains("Ink");
                                 var isSelectMode = editingMode.ToString().Contains("Select");
-                                
+
                                 // 如果是批注模式或选择模式，则应该注册快捷键（返回false）
                                 // 如果是橡皮擦模式或其他模式，则不应该注册快捷键（返回true）
                                 var shouldNotRegisterHotkeys = !isInkMode && !isSelectMode;
-                                
+
                                 return shouldNotRegisterHotkeys;
                             }
                         }
                     }
                 }
-                
+
                 // 如果无法获取任何状态信息，则回退到原来的判断逻辑
-                
+
                 // 通过反射访问主窗口的currentMode字段（作为最后的备用方案）
-                var currentModeField = _mainWindow.GetType().GetField("currentMode", 
+                var currentModeField = _mainWindow.GetType().GetField("currentMode",
                     BindingFlags.NonPublic | BindingFlags.Instance);
-                
+
                 if (currentModeField != null)
                 {
                     var currentMode = currentModeField.GetValue(_mainWindow);
@@ -798,7 +890,7 @@ namespace Ink_Canvas.Helpers
                         return isSelectMode;
                     }
                 }
-                
+
                 return false; // 默认允许快捷键
             }
             catch (Exception ex)
@@ -816,7 +908,7 @@ namespace Ink_Canvas.Helpers
         {
             if (!_isDisposed)
             {
-                
+
                 _isDisposed = true;
             }
         }
@@ -861,4 +953,4 @@ namespace Ink_Canvas.Helpers
         }
         #endregion
     }
-} 
+}

Ink Canvas/Helpers/ImprovedBezierSmoothing.cs

@@ -28,13 +28,13 @@ namespace Ink_Canvas.Helpers
                 return originalStroke;
 
             var originalPoints = originalStroke.StylusPoints.ToArray();
-            
+
             // 预处理：去除噪声点
             var cleanedPoints = RemoveNoisePoints(originalPoints);
-            
+
             // 使用改进的贝塞尔曲线拟合
             var smoothedPoints = ApplyCubicBezierSmoothing(cleanedPoints);
-            
+
             // 后处理：重采样和优化
             var finalPoints = PostProcessPoints(smoothedPoints);
 
@@ -61,7 +61,7 @@ namespace Ink_Canvas.Helpers
                 var next = points[i + 1];
 
                 // 计算到前一个点的距离
-                double distToPrev = Math.Sqrt((curr.X - prev.X) * (curr.X - prev.X) + 
+                double distToPrev = Math.Sqrt((curr.X - prev.X) * (curr.X - prev.X) +
                                             (curr.Y - prev.Y) * (curr.Y - prev.Y));
 
                 // 如果距离太近，跳过这个点
@@ -148,7 +148,7 @@ namespace Ink_Canvas.Helpers
             // 计算控制点距离
             double dist1 = CalculateDistance(p0, p1);
             double dist2 = CalculateDistance(p2, p3);
-            
+
             double controlDist1 = dist1 * _config.CurveTension;
             double controlDist2 = dist2 * _config.CurveTension;
 
@@ -322,4 +322,4 @@ namespace Ink_Canvas.Helpers
             return result.ToArray();
         }
     }
-} 
+}

Ink Canvas/Helpers/InkFadeManager.cs

@@ -6,6 +6,7 @@ using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
 using System.Windows.Shapes;
 using System.Windows.Threading;
 
@@ -63,7 +64,7 @@ namespace Ink_Canvas.Helpers
         /// <param name="endPoint">抬笔点</param>
         public void AddFadingStroke(Stroke stroke, Point startPoint, Point endPoint)
         {
-            if (!IsEnabled || stroke == null) 
+            if (!IsEnabled || stroke == null)
             {
                 return;
             }
@@ -238,12 +239,12 @@ namespace Ink_Canvas.Helpers
         public void UpdateFadeTime(int fadeTime)
         {
             FadeTime = fadeTime;
-            
+
             foreach (var kvp in _fadeTimers)
             {
                 var stroke = kvp.Key;
                 var timer = kvp.Value;
-                
+
                 timer.Stop();
                 timer.Interval = TimeSpan.FromMilliseconds(FadeTime);
                 timer.Start();
@@ -283,14 +284,14 @@ namespace Ink_Canvas.Helpers
             {
                 // 创建路径几何，使用墨迹的实际位置
                 var geometry = stroke.GetGeometry();
-                if (geometry == null) 
+                if (geometry == null)
                 {
                     return null;
                 }
 
                 // 获取绘画属性
                 var drawingAttribs = stroke.DrawingAttributes;
-                
+
                 // 创建路径元素，确保使用正确的绘画属性
                 var path = new Path
                 {
@@ -302,7 +303,7 @@ namespace Ink_Canvas.Helpers
                     StrokeLineJoin = PenLineJoin.Round,
                     Fill = drawingAttribs.IsHighlighter ? new SolidColorBrush(drawingAttribs.Color) : null, // 高亮笔需要填充
                     Opacity = 0.95, // 初始透明度更高，显得更自然
-                    
+
                     // 优化渲染质量
                     UseLayoutRounding = false,
                     SnapsToDevicePixels = false
@@ -312,19 +313,26 @@ namespace Ink_Canvas.Helpers
                 if (drawingAttribs.IsHighlighter)
                 {
                     path.Opacity = 0.4; // 高亮笔初始透明度更低，更符合荧光笔特性
-                    
+
                     // 为高亮笔添加特殊的混合效果
                     // 使用更柔和的笔触样式
                     path.StrokeStartLineCap = PenLineCap.Flat;
                     path.StrokeEndLineCap = PenLineCap.Flat;
                     path.StrokeLineJoin = PenLineJoin.Miter;
-                    
-                                         // 高亮笔通常需要更宽的笔触来覆盖下面的内容
-                     if (drawingAttribs.Width < 20)
-                     {
-                         path.StrokeThickness = Math.Max(drawingAttribs.Width * 1.5, 20);
-                     }
-                 }
+
+                    // 高亮笔通常需要更宽的笔触来覆盖下面的内容
+                    if (drawingAttribs.Width < 20)
+                    {
+                        path.StrokeThickness = Math.Max(drawingAttribs.Width * 1.5, 20);
+                    }
+
+                    // 为高亮笔添加轻微的模糊效果，使渐隐更加自然
+                    path.Effect = new BlurEffect
+                    {
+                        Radius = 0.5, // 轻微的模糊效果
+                        KernelType = KernelType.Gaussian
+                    };
+                }
 
                 // 不设置任何变换，保持墨迹原有粗细
                 var bounds = geometry.Bounds;
@@ -356,7 +364,7 @@ namespace Ink_Canvas.Helpers
                     // 获取当前透明度和判断是否为高亮笔
                     var currentOpacity = visual.Opacity;
                     var isHighlighter = stroke.DrawingAttributes.IsHighlighter;
-                    
+
                     // 根据墨迹类型选择不同的动画效果
                     if (isHighlighter)
                     {
@@ -389,6 +397,57 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        /// <summary>
+        /// 统一渐隐动画 - 整个墨迹作为一个整体进行渐隐，与擦除效果一致
+        /// </summary>
+        private void StartUnifiedFadeAnimation(UIElement visual, Stroke stroke, double currentOpacity, int duration)
+        {
+            try
+            {
+                // 创建透明度动画，模拟擦除时的效果
+                var fadeAnimation = new DoubleAnimation
+                {
+                    From = currentOpacity,
+                    To = 0.0,
+                    Duration = TimeSpan.FromMilliseconds(duration),
+                    EasingFunction = new CubicEase { EasingMode = EasingMode.EaseInOut }
+                };
+
+                // 如果是高亮笔，添加轻微的缩放效果，使渐隐更加自然
+                if (stroke.DrawingAttributes.IsHighlighter)
+                {
+                    // 创建轻微的缩放动画，模拟墨迹"蒸发"的效果
+                    var scaleAnimation = new DoubleAnimation
+                    {
+                        From = 1.0,
+                        To = 0.95, // 轻微缩小，增加自然感
+                        Duration = TimeSpan.FromMilliseconds(duration),
+                        EasingFunction = new QuadraticEase { EasingMode = EasingMode.EaseIn }
+                    };
+
+                    // 创建缩放变换
+                    var scaleTransform = new ScaleTransform();
+                    visual.RenderTransform = scaleTransform;
+                    visual.RenderTransformOrigin = new Point(0.5, 0.5);
+
+                    // 应用缩放动画
+                    scaleTransform.BeginAnimation(ScaleTransform.ScaleXProperty, scaleAnimation);
+                    scaleTransform.BeginAnimation(ScaleTransform.ScaleYProperty, scaleAnimation);
+                }
+
+                // 添加动画完成事件
+                fadeAnimation.Completed += (sender, e) => OnAnimationCompleted(visual, stroke);
+
+                // 应用透明度动画
+                visual.BeginAnimation(UIElement.OpacityProperty, fadeAnimation);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"统一渐隐动画失败: {ex}", LogHelper.LogType.Error);
+                OnAnimationCompleted(visual, stroke);
+            }
+        }
+
         /// <summary>
         /// 开始高亮笔的渐隐动画
         /// </summary>
@@ -396,7 +455,8 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                StartProgressiveFadeAnimation(visual, stroke, currentOpacity, (int)(AnimationDuration * 1.5));
+                // 高亮笔使用统一的渐隐动画，与擦除效果一致
+                StartUnifiedFadeAnimation(visual, stroke, currentOpacity, (int)(AnimationDuration * 1.2));
             }
             catch (Exception ex)
             {
@@ -439,19 +499,19 @@ namespace Ink_Canvas.Helpers
             {
                 var stylusPoints = stroke.StylusPoints;
                 var totalPoints = stylusPoints.Count;
-                
+
                 // 分段算法 - 确保所有墨迹都有足够的动画效果
                 var strokeLength = CalculateStrokeLength(stylusPoints);
                 var segmentCount = CalculateOptimalSegmentCount(totalPoints, strokeLength);
-                
+
                 // 强制最小分段数量，确保短墨迹也有动画效果
                 segmentCount = Math.Max(segmentCount, 4);
-                
+
                 var pointsPerSegment = Math.Max(1, totalPoints / segmentCount);
 
                 // 隐藏原始视觉元素
                 originalVisual.Visibility = Visibility.Hidden;
-                
+
                 var segments = new List<UIElement>();
                 var parent = _mainWindow.inkCanvas?.Parent as Panel;
                 if (parent == null)
@@ -465,7 +525,7 @@ namespace Ink_Canvas.Helpers
                 {
                     var startIndex = i * pointsPerSegment;
                     var endIndex = (i == segmentCount - 1) ? totalPoints - 1 : (i + 1) * pointsPerSegment;
-                    
+
                     // 确保有足够的点来创建分段，对于短墨迹特殊处理
                     if (endIndex <= startIndex && totalPoints > 1)
                     {
@@ -473,12 +533,12 @@ namespace Ink_Canvas.Helpers
                         startIndex = i;
                         endIndex = Math.Min(i + 1, totalPoints - 1);
                     }
-                    
+
                     // 为每个分段添加重叠，确保连接处平滑
                     var overlap = Math.Max(1, pointsPerSegment / 6); // 15%的重叠，平衡平滑与速度
                     var actualStartIndex = Math.Max(0, startIndex - overlap);
                     var actualEndIndex = Math.Min(totalPoints - 1, endIndex + overlap);
-                    
+
                     var segment = CreateStrokeSegment(stroke, actualStartIndex, actualEndIndex, opacity);
                     if (segment != null)
                     {
@@ -576,10 +636,10 @@ namespace Ink_Canvas.Helpers
                 for (int i = 0; i < segments.Count; i++)
                 {
                     var segment = segments[i];
-                    
+
                     // 使用预计算的动画曲线获取延迟时间
                     var delay = animationCurve[i];
-                    
+
                     // 使用定时器延迟启动每个分段的动画
                     var timer = new DispatcherTimer
                     {
@@ -595,7 +655,7 @@ namespace Ink_Canvas.Helpers
                             lock (completedSegments)
                             {
                                 completedSegments.Add(segment);
-                                
+
                                 // 检查是否所有分段都完成了
                                 if (completedSegments.Count >= totalSegments)
                                 {
@@ -676,7 +736,7 @@ namespace Ink_Canvas.Helpers
             {
                 // 移除所有分段
                 var parent = _mainWindow.inkCanvas?.Parent as Panel;
-                
+
                 foreach (var segment in segments)
                 {
                     if (parent != null && parent.Children.Contains(segment))
@@ -729,7 +789,7 @@ namespace Ink_Canvas.Helpers
         private double CalculateStrokeLength(StylusPointCollection points)
         {
             if (points.Count < 2) return 0;
-            
+
             double totalLength = 0;
             for (int i = 1; i < points.Count; i++)
             {
@@ -749,22 +809,22 @@ namespace Ink_Canvas.Helpers
             const double PIXELS_PER_SEGMENT = 12.0; // 每段适中长度，平衡效果与速度
             const int MIN_SEGMENTS = 5; // 适当的最小分段数，确保动画效果
             const int MAX_SEGMENTS = 100; // 适中的最大分段数，平衡性能与效果
-            
+
             // 根据长度计算基础分段数
             var lengthBasedSegments = Math.Max(MIN_SEGMENTS, (int)(strokeLength / PIXELS_PER_SEGMENT));
-            
+
             // 根据点密度调整，平衡效果与速度
             var density = pointCount > 0 ? strokeLength / pointCount : 1;
             var densityFactor = Math.Max(0.4, Math.Min(2.5, density / 1.8));
-            
+
             var finalSegments = (int)(lengthBasedSegments * densityFactor);
-            
+
             // 对于短墨迹，确保至少有4个分段
             if (pointCount <= 5)
             {
                 finalSegments = Math.Max(finalSegments, 4);
             }
-            
+
             // 限制在合理范围内
             return Math.Min(MAX_SEGMENTS, Math.Max(MIN_SEGMENTS, finalSegments));
         }
@@ -778,7 +838,7 @@ namespace Ink_Canvas.Helpers
             var baseDuration = totalDuration / Math.Max(segmentCount, 1);
             var minDuration = 150; // 每段最少150ms，确保动画完整显示
             var maxDuration = 500; // 每段最多500ms，平衡速度与完整性
-            
+
             return Math.Max(minDuration, Math.Min(maxDuration, baseDuration));
         }
 
@@ -788,17 +848,17 @@ namespace Ink_Canvas.Helpers
         private int[] CreateAppleStyleAnimationCurve(int segmentCount, int totalDuration)
         {
             var curve = new int[segmentCount];
-            
+
             // 平衡速度与完整性，确保动画有足够时间播放
             var availableTime = totalDuration * 0.6; // 使用60%的总时间，给动画留足够缓冲
             var delayBetweenSegments = Math.Max(60, availableTime / Math.Max(segmentCount, 1));
-            
+
             for (int i = 0; i < segmentCount; i++)
             {
                 // 线性延迟，确保每个分段都有足够时间
                 curve[i] = (int)(i * delayBetweenSegments);
             }
-            
+
             return curve;
         }
 
@@ -829,4 +889,4 @@ namespace Ink_Canvas.Helpers
         }
         #endregion
     }
-} 
+}

Ink Canvas/Helpers/InkSmoothingConfig.cs

@@ -12,22 +12,22 @@ namespace Ink_Canvas.Helpers
         public double SmoothingStrength { get; set; } = 0.4;
         public double ResampleInterval { get; set; } = 2.5;
         public int InterpolationSteps { get; set; } = 12;
-        
+
         // 贝塞尔曲线参数
         public bool UseAdaptiveInterpolation { get; set; } = true;
         public double CurveTension { get; set; } = 0.3;
         public double MinCurvatureThreshold { get; set; } = 0.1;
         public double MaxCurvatureThreshold { get; set; } = 0.8;
-        
+
         // 性能参数
         public bool UseHardwareAcceleration { get; set; } = true;
         public bool UseAsyncProcessing { get; set; } = true;
         public int MaxConcurrentTasks { get; set; } = Environment.ProcessorCount;
         public int MaxPointsPerStroke { get; set; } = 10000;
-        
+
         // 质量设置
         public SmoothingQuality Quality { get; set; } = SmoothingQuality.Balanced;
-        
+
         public enum SmoothingQuality
         {
             Performance,    // 性能优先
@@ -49,7 +49,7 @@ namespace Ink_Canvas.Helpers
         public static InkSmoothingConfig FromSettings()
         {
             var config = new InkSmoothingConfig();
-            
+
             try
             {
                 // 尝试从MainWindow.Settings加载配置（兼容性）
@@ -66,42 +66,48 @@ namespace Ink_Canvas.Helpers
             {
                 Debug.WriteLine($"加载平滑配置失败: {ex.Message}");
             }
-            
+
             return config;
         }
 
         /// <summary>
-        /// 应用质量设置
+        /// 应用质量设置 
         /// </summary>
         public void ApplyQualitySettings()
         {
             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 = true;      
                     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 = true;
                     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 = true;
                     break;
             }
         }
@@ -120,7 +126,7 @@ namespace Ink_Canvas.Helpers
                     MainWindow.Settings.Canvas.UseHardwareAcceleration = UseHardwareAcceleration;
                     MainWindow.Settings.Canvas.UseAsyncInkSmoothing = UseAsyncProcessing;
                     MainWindow.Settings.Canvas.MaxConcurrentSmoothingTasks = MaxConcurrentTasks;
-                    
+
                 }
             }
             catch (Exception ex)
@@ -152,4 +158,4 @@ namespace Ink_Canvas.Helpers
                    $"张力: {CurveTension:F2}, 硬件加速: {UseHardwareAcceleration}";
         }
     }
-} 
+}

Ink Canvas/Helpers/MultiPPTInkManager.cs

@@ -0,0 +1,666 @@
+using Microsoft.Office.Interop.PowerPoint;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Security.Cryptography;
+using System.Text;
+using System.Windows.Ink;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 多PPT墨迹管理器 - 支持多个PPT窗口分别管理墨迹
+    /// </summary>
+    public class MultiPPTInkManager : IDisposable
+    {
+        #region Properties
+        public bool IsAutoSaveEnabled { get; set; } = true;
+        public string AutoSaveLocation { get; set; } = "";
+        public PPTManager PPTManager { get; set; }
+        #endregion
+
+        #region Private Fields
+        private readonly Dictionary<string, PPTInkManager> _presentationManagers;
+        private readonly Dictionary<string, PresentationInfo> _presentationInfos;
+        private readonly object _lockObject = new object();
+        private bool _disposed;
+        private string _currentActivePresentationId = "";
+        #endregion
+
+        #region Constructor
+        public MultiPPTInkManager()
+        {
+            _presentationManagers = new Dictionary<string, PPTInkManager>();
+            _presentationInfos = new Dictionary<string, PresentationInfo>();
+        }
+        #endregion
+
+        #region Public Methods
+        /// <summary>
+        /// 初始化新的演示文稿
+        /// </summary>
+        public void InitializePresentation(Presentation presentation)
+        {
+            if (presentation == null) return;
+
+            lock (_lockObject)
+            {
+                try
+                {
+                    var presentationId = GeneratePresentationId(presentation);
+                    
+                    // 如果已存在该演示文稿的管理器，先清理
+                    if (_presentationManagers.ContainsKey(presentationId))
+                    {
+                        _presentationManagers[presentationId].Dispose();
+                        _presentationManagers.Remove(presentationId);
+                    }
+
+                    // 创建新的墨迹管理器
+                    var inkManager = new PPTInkManager();
+                    inkManager.IsAutoSaveEnabled = IsAutoSaveEnabled;
+                    inkManager.AutoSaveLocation = AutoSaveLocation;
+                    inkManager.InitializePresentation(presentation);
+
+                    // 保存管理器和演示文稿信息
+                    _presentationManagers[presentationId] = inkManager;
+                    _presentationInfos[presentationId] = new PresentationInfo
+                    {
+                        Id = presentationId,
+                        Name = presentation.Name,
+                        FullName = presentation.FullName,
+                        SlideCount = presentation.Slides.Count,
+                        CreatedTime = DateTime.Now,
+                        LastAccessTime = DateTime.Now
+                    };
+
+                    // 设置为当前活跃的演示文稿
+                    _currentActivePresentationId = presentationId;
+
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"初始化多PPT墨迹管理失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 切换到指定的演示文稿
+        /// </summary>
+        public bool SwitchToPresentation(Presentation presentation)
+        {
+            if (presentation == null) return false;
+
+            lock (_lockObject)
+            {
+                try
+                {
+                    var presentationId = GeneratePresentationId(presentation);
+                    
+                    if (_presentationManagers.ContainsKey(presentationId))
+                    {
+                        // 如果切换的是不同的演示文稿，先保存当前活跃演示文稿的墨迹
+                        if (!string.IsNullOrEmpty(_currentActivePresentationId) && 
+                            _currentActivePresentationId != presentationId)
+                        {
+                            var currentManager = GetCurrentManager();
+                            if (currentManager != null)
+                            {
+                                // 获取当前活跃的演示文稿并保存墨迹
+                                var currentPresentation = GetCurrentActivePresentation();
+                                if (currentPresentation != null)
+                                {
+                                    currentManager.SaveAllStrokesToFile(currentPresentation);
+                                    LogHelper.WriteLogToFile($"已保存当前演示文稿墨迹: {currentPresentation.Name}", LogHelper.LogType.Trace);
+                                }
+                            }
+                        }
+
+                        _currentActivePresentationId = presentationId;
+                        
+                        // 更新最后访问时间
+                        if (_presentationInfos.ContainsKey(presentationId))
+                        {
+                            _presentationInfos[presentationId].LastAccessTime = DateTime.Now;
+                        }
+
+                    if (_currentActivePresentationId != presentationId)
+                    {
+                        LogHelper.WriteLogToFile($"已切换到演示文稿: {presentation.Name}", LogHelper.LogType.Trace);
+                    }
+                        return true;
+                    }
+                    else
+                    {
+                        // 如果不存在，尝试初始化
+                        InitializePresentation(presentation);
+                        return true;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"切换到演示文稿失败: {ex}", LogHelper.LogType.Error);
+                    return false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存当前页面的墨迹
+        /// </summary>
+        public void SaveCurrentSlideStrokes(int slideIndex, StrokeCollection strokes)
+        {
+            if (slideIndex <= 0 || strokes == null) return;
+
+            lock (_lockObject)
+            {
+                try
+                {
+                    var manager = GetCurrentManager();
+                    if (manager != null)
+                    {
+                        manager.SaveCurrentSlideStrokes(slideIndex, strokes);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"保存当前页面墨迹失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 强制保存指定页面的墨迹（忽略锁定状态）
+        /// </summary>
+        public void ForceSaveSlideStrokes(int slideIndex, StrokeCollection strokes)
+        {
+            if (slideIndex <= 0 || strokes == null) return;
+
+            lock (_lockObject)
+            {
+                try
+                {
+                    var manager = GetCurrentManager();
+                    if (manager != null)
+                    {
+                        manager.ForceSaveSlideStrokes(slideIndex, strokes);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"强制保存页面墨迹失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 加载指定页面的墨迹
+        /// </summary>
+        public StrokeCollection LoadSlideStrokes(int slideIndex)
+        {
+            if (slideIndex <= 0) return new StrokeCollection();
+
+            lock (_lockObject)
+            {
+                try
+                {
+                    var manager = GetCurrentManager();
+                    if (manager != null)
+                    {
+                        return manager.LoadSlideStrokes(slideIndex);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"加载页面墨迹失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+
+            return new StrokeCollection();
+        }
+
+        /// <summary>
+        /// 切换到指定页面并加载墨迹
+        /// </summary>
+        public StrokeCollection SwitchToSlide(int slideIndex, StrokeCollection currentStrokes = null)
+        {
+            lock (_lockObject)
+            {
+                try
+                {
+                    var manager = GetCurrentManager();
+                    if (manager != null)
+                    {
+                        return manager.SwitchToSlide(slideIndex, currentStrokes);
+                    }
+                    else
+                    {
+                        LogHelper.WriteLogToFile($"无法获取当前墨迹管理器，页面切换失败: {slideIndex}", LogHelper.LogType.Warning);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"切换页面墨迹失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+
+            return new StrokeCollection();
+        }
+
+        /// <summary>
+        /// 保存所有墨迹到文件
+        /// </summary>
+        public void SaveAllStrokesToFile(Presentation presentation)
+        {
+            if (!IsAutoSaveEnabled || string.IsNullOrEmpty(AutoSaveLocation) || presentation == null) return;
+
+            lock (_lockObject)
+            {
+                try
+                {
+                    var presentationId = GeneratePresentationId(presentation);
+                    if (_presentationManagers.ContainsKey(presentationId))
+                    {
+                        _presentationManagers[presentationId].SaveAllStrokesToFile(presentation);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"保存所有墨迹到文件失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 从文件加载已保存的墨迹
+        /// </summary>
+        public void LoadSavedStrokes(Presentation presentation)
+        {
+            if (!IsAutoSaveEnabled || string.IsNullOrEmpty(AutoSaveLocation) || presentation == null) return;
+
+            lock (_lockObject)
+            {
+                try
+                {
+                    var presentationId = GeneratePresentationId(presentation);
+                    if (_presentationManagers.ContainsKey(presentationId))
+                    {
+                        _presentationManagers[presentationId].LoadSavedStrokes();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"从文件加载墨迹失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 清除指定演示文稿的所有墨迹
+        /// </summary>
+        public void ClearPresentationStrokes(Presentation presentation)
+        {
+            if (presentation == null) return;
+
+            lock (_lockObject)
+            {
+                try
+                {
+                    var presentationId = GeneratePresentationId(presentation);
+                    if (_presentationManagers.ContainsKey(presentationId))
+                    {
+                        _presentationManagers[presentationId].ClearAllStrokes();
+                        LogHelper.WriteLogToFile($"已清除演示文稿墨迹: {presentation.Name}", LogHelper.LogType.Trace);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"清除演示文稿墨迹失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 清除所有演示文稿的墨迹
+        /// </summary>
+        public void ClearAllStrokes()
+        {
+            lock (_lockObject)
+            {
+                try
+                {
+                    foreach (var manager in _presentationManagers.Values)
+                    {
+                        manager?.ClearAllStrokes();
+                    }
+                    LogHelper.WriteLogToFile("已清除所有演示文稿墨迹", LogHelper.LogType.Trace);
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"清除所有墨迹失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 翻页后锁定墨迹写入
+        /// </summary>
+        public void LockInkForSlide(int slideIndex)
+        {
+            lock (_lockObject)
+            {
+                try
+                {
+                    var manager = GetCurrentManager();
+                    if (manager != null)
+                    {
+                        manager.LockInkForSlide(slideIndex);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"锁定墨迹写入失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 检查是否可以写入墨迹
+        /// </summary>
+        public bool CanWriteInk(int currentSlideIndex)
+        {
+            lock (_lockObject)
+            {
+                try
+                {
+                    var manager = GetCurrentManager();
+                    if (manager != null)
+                    {
+                        return manager.CanWriteInk(currentSlideIndex);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"检查墨迹写入权限失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// 重置当前演示文稿的墨迹锁定状态
+        /// </summary>
+        public void ResetCurrentPresentationLockState()
+        {
+            lock (_lockObject)
+            {
+                try
+                {
+                    var manager = GetCurrentManager();
+                    if (manager != null)
+                    {
+                        manager.ResetLockState();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"重置墨迹锁定状态失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 移除演示文稿管理器
+        /// </summary>
+        public void RemovePresentation(Presentation presentation)
+        {
+            if (presentation == null) return;
+
+            lock (_lockObject)
+            {
+                try
+                {
+                    var presentationId = GeneratePresentationId(presentation);
+                    
+                    if (_presentationManagers.ContainsKey(presentationId))
+                    {
+                        // 保存墨迹到文件
+                        _presentationManagers[presentationId].SaveAllStrokesToFile(presentation);
+                        
+                        // 释放资源
+                        _presentationManagers[presentationId].Dispose();
+                        _presentationManagers.Remove(presentationId);
+                    }
+
+                    if (_presentationInfos.ContainsKey(presentationId))
+                    {
+                        _presentationInfos.Remove(presentationId);
+                    }
+
+                    // 如果移除的是当前活跃的演示文稿，重置活跃ID
+                    if (_currentActivePresentationId == presentationId)
+                    {
+                        _currentActivePresentationId = "";
+                    }
+
+                }
+                catch (COMException comEx)
+                {
+                    var hr = (uint)comEx.HResult;
+                    if (hr == 0x8001010E || hr == 0x80004005 || hr == 0x800706BA || hr == 0x800706BE || hr == 0x80048010)
+                    {
+                    }
+                }
+                catch (Exception)
+                {
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取当前管理的演示文稿数量
+        /// </summary>
+        public int GetPresentationCount()
+        {
+            lock (_lockObject)
+            {
+                return _presentationManagers.Count;
+            }
+        }
+
+        /// <summary>
+        /// 获取所有演示文稿信息
+        /// </summary>
+        public List<PresentationInfo> GetAllPresentationInfos()
+        {
+            lock (_lockObject)
+            {
+                return _presentationInfos.Values.ToList();
+            }
+        }
+
+        /// <summary>
+        /// 清理长时间未访问的演示文稿管理器
+        /// </summary>
+        public void CleanupInactivePresentations(TimeSpan inactiveThreshold)
+        {
+            lock (_lockObject)
+            {
+                try
+                {
+                    var inactiveIds = new List<string>();
+                    var cutoffTime = DateTime.Now - inactiveThreshold;
+
+                    foreach (var info in _presentationInfos.Values)
+                    {
+                        if (info.LastAccessTime < cutoffTime && info.Id != _currentActivePresentationId)
+                        {
+                            inactiveIds.Add(info.Id);
+                        }
+                    }
+
+                    foreach (var id in inactiveIds)
+                    {
+                        if (_presentationManagers.ContainsKey(id))
+                        {
+                            _presentationManagers[id].Dispose();
+                            _presentationManagers.Remove(id);
+                        }
+                        _presentationInfos.Remove(id);
+                        
+                        LogHelper.WriteLogToFile($"已清理非活跃演示文稿: {id}", LogHelper.LogType.Trace);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"清理非活跃演示文稿失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+        }
+        #endregion
+
+        #region Private Methods
+        private PPTInkManager GetCurrentManager()
+        {
+            if (string.IsNullOrEmpty(_currentActivePresentationId) || 
+                !_presentationManagers.ContainsKey(_currentActivePresentationId))
+            {
+                return null;
+            }
+
+            return _presentationManagers[_currentActivePresentationId];
+        }
+
+        private Presentation GetCurrentActivePresentation()
+        {
+            try
+            {
+                // 通过PPTManager获取当前活跃的演示文稿
+                return PPTManager?.GetCurrentActivePresentation();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"获取当前活跃演示文稿失败: {ex}", LogHelper.LogType.Error);
+                return null;
+            }
+        }
+
+        private string GeneratePresentationId(Presentation presentation)
+        {
+            try
+            {
+                // 检查COM对象是否仍然有效
+                if (presentation == null)
+                {
+                    return $"invalid_{DateTime.Now.Ticks}";
+                }
+
+                var presentationPath = presentation.FullName;
+                var fileHash = GetFileHash(presentationPath);
+                var processId = GetProcessId(presentation);
+                return $"{presentation.Name}_{fileHash}_{processId}";
+            }
+            catch (COMException comEx)
+            {
+                var hr = (uint)comEx.HResult;
+                if (hr == 0x8001010E || hr == 0x80004005 || hr == 0x800706BA || hr == 0x800706BE || hr == 0x80048010)
+                {
+                    return $"disconnected_{DateTime.Now.Ticks}";
+                }
+                return $"error_{DateTime.Now.Ticks}";
+            }
+            catch (Exception)
+            {
+                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)
+            {
+                // 所有异常都静默处理，避免日志噪音
+                return "error";
+            }
+        }
+
+        private string GetProcessId(Presentation presentation)
+        {
+            try
+            {
+                // 尝试获取PowerPoint应用程序的进程ID
+                if (presentation.Application != null)
+                {
+                    // 通过COM对象获取进程信息
+                    var hwnd = presentation.Application.HWND;
+                    if (hwnd != 0)
+                    {
+                        return hwnd.ToString();
+                    }
+                }
+                return "unknown";
+            }
+            catch (COMException comEx)
+            {
+                // COM对象已失效，这是正常情况，完全静默处理
+                var hr = (uint)comEx.HResult;
+                if (hr == 0x8001010E || hr == 0x80004005 || hr == 0x800706BA || hr == 0x800706BE || hr == 0x80048010)
+                {
+                    return "disconnected";
+                }
+                return "error";
+            }
+            catch (Exception)
+            {
+                return "error";
+            }
+        }
+        #endregion
+
+        #region Dispose
+        public void Dispose()
+        {
+            if (!_disposed)
+            {
+                lock (_lockObject)
+                {
+                    foreach (var manager in _presentationManagers.Values)
+                    {
+                        manager?.Dispose();
+                    }
+                    _presentationManagers.Clear();
+                    _presentationInfos.Clear();
+                }
+                _disposed = true;
+            }
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// 演示文稿信息
+    /// </summary>
+    public class PresentationInfo
+    {
+        public string Id { get; set; }
+        public string Name { get; set; }
+        public string FullName { get; set; }
+        public int SlideCount { get; set; }
+        public DateTime CreatedTime { get; set; }
+        public DateTime LastAccessTime { get; set; }
+    }
+}

Ink Canvas/Helpers/MultiTouchInput.cs

@@ -25,10 +25,14 @@ namespace Ink_Canvas.Helpers
     }
 
     /// <summary>
-    ///     用于显示笔迹的类
+    /// 用于显示笔迹的类 
     /// </summary>
     public class StrokeVisual : DrawingVisual
     {
+        private bool _needsRedraw = true;
+        private int _lastPointCount = 0;
+        private const int REDRAW_THRESHOLD = 3; 
+
         /// <summary>
         ///     创建显示笔迹的类
         /// </summary>
@@ -49,15 +53,20 @@ namespace Ink_Canvas.Helpers
         public StrokeVisual(DrawingAttributes drawingAttributes)
         {
             _drawingAttributes = drawingAttributes;
+            
+            // 启用硬件加速
+            RenderOptions.SetBitmapScalingMode(this, BitmapScalingMode.HighQuality);
+            RenderOptions.SetEdgeMode(this, EdgeMode.Aliased);
+            RenderOptions.SetCachingHint(this, CachingHint.Cache);
         }
 
         /// <summary>
-        ///     设置或获取显示的笔迹
+        /// 设置或获取显示的笔迹
         /// </summary>
         public Stroke Stroke { set; get; }
 
         /// <summary>
-        ///     在笔迹中添加点
+        /// 在笔迹中添加点
         /// </summary>
         /// <param name="point"></param>
         public void Add(StylusPoint point)
@@ -66,28 +75,50 @@ namespace Ink_Canvas.Helpers
             {
                 var collection = new StylusPointCollection { point };
                 Stroke = new Stroke(collection) { DrawingAttributes = _drawingAttributes };
+                _lastPointCount = 1;
             }
             else
             {
                 Stroke.StylusPoints.Add(point);
+                _lastPointCount++;
             }
+            
+            // 标记需要重绘
+            _needsRedraw = true;
         }
 
         /// <summary>
-        ///     重新画出笔迹
+        /// 重新画出笔迹
         /// </summary>
         public void Redraw()
         {
+            if (!_needsRedraw || Stroke == null) return;
+            
+            if (_lastPointCount % REDRAW_THRESHOLD != 0 && _lastPointCount > REDRAW_THRESHOLD)
+            {
+                return;
+            }
+
             try
             {
                 using (var dc = RenderOpen())
                 {
                     Stroke.Draw(dc);
                 }
+                _needsRedraw = false;
             }
             catch { }
         }
 
+        /// <summary>
+        /// 强制重绘
+        /// </summary>
+        public void ForceRedraw()
+        {
+            _needsRedraw = true;
+            Redraw();
+        }
+
         private readonly DrawingAttributes _drawingAttributes;
 
         public static implicit operator Stroke(StrokeVisual v)

Ink Canvas/Helpers/PPTInkManager.cs

@@ -1,9 +1,10 @@
-using System;
+using Microsoft.Office.Interop.PowerPoint;
+using System;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
 using System.Windows.Ink;
-using Microsoft.Office.Interop.PowerPoint;
 
 namespace Ink_Canvas.Helpers
 {
@@ -29,6 +30,11 @@ 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; // 最小切换间隔100毫秒
         #endregion
 
         #region Constructor
@@ -57,16 +63,29 @@ namespace Ink_Canvas.Helpers
                 {
                     // 完全清理之前的墨迹状态
                     ClearAllStrokes();
-                    
+
                     // 重置墨迹锁定状态
                     _inkLockUntil = DateTime.MinValue;
                     _lockedSlideIndex = -1;
-                    
+
                     // 生成演示文稿唯一标识符
                     _currentPresentationId = GeneratePresentationId(presentation);
 
                     // 重新初始化内存流数组
-                    var slideCount = presentation.Slides.Count;
+                    int slideCount = 0;
+                    try
+                    {
+                        slideCount = presentation.Slides.Count;
+                    }
+                    catch (COMException comEx)
+                    {
+                        var hr = (uint)comEx.HResult;
+                        if (hr == 0x80048010)
+                        {
+                            return;
+                        }
+                        throw; 
+                    }
                     _memoryStreams = new MemoryStream[slideCount + 2];
 
                     // 如果启用自动保存，尝试加载已保存的墨迹
@@ -75,7 +94,6 @@ namespace Ink_Canvas.Helpers
                         LoadSavedStrokes();
                     }
 
-                    LogHelper.WriteLogToFile($"已初始化演示文稿墨迹管理: {presentation.Name}, 幻灯片数量: {slideCount}", LogHelper.LogType.Trace);
                 }
                 catch (Exception ex)
                 {
@@ -95,10 +113,13 @@ namespace Ink_Canvas.Helpers
             {
                 try
                 {
-                    // 检查墨迹锁定
+                    // 检查墨迹锁定 
                     if (!CanWriteInk(slideIndex))
                     {
-                        LogHelper.WriteLogToFile($"墨迹写入被锁定，当前页:{slideIndex}，锁定页:{_lockedSlideIndex}", LogHelper.LogType.Warning);
+                        if (DateTime.Now < _inkLockUntil)
+                        {
+                            LogHelper.WriteLogToFile($"墨迹写入被锁定，当前页:{slideIndex}，锁定页:{_lockedSlideIndex}", LogHelper.LogType.Warning);
+                        }
                         return;
                     }
 
@@ -112,7 +133,9 @@ namespace Ink_Canvas.Helpers
                         _memoryStreams[slideIndex]?.Dispose();
                         _memoryStreams[slideIndex] = ms;
 
-                        LogHelper.WriteLogToFile($"已保存第{slideIndex}页墨迹，大小: {ms.Length} bytes", LogHelper.LogType.Trace);
+                        if (ms.Length > 0)
+                        {
+                        }
                     }
                 }
                 catch (Exception ex)
@@ -122,6 +145,37 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        /// <summary>
+        /// 强制保存指定页面的墨迹（忽略锁定状态）
+        /// </summary>
+        public void ForceSaveSlideStrokes(int slideIndex, StrokeCollection strokes)
+        {
+            if (slideIndex <= 0 || strokes == null) return;
+
+            lock (_lockObject)
+            {
+                try
+                {
+                    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);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"强制保存第{slideIndex}页墨迹失败: {ex}", LogHelper.LogType.Error);
+                }
+            }
+        }
+
         /// <summary>
         /// 加载指定页面的墨迹
         /// </summary>
@@ -137,7 +191,6 @@ namespace Ink_Canvas.Helpers
                     {
                         _memoryStreams[slideIndex].Position = 0;
                         var strokes = new StrokeCollection(_memoryStreams[slideIndex]);
-                        LogHelper.WriteLogToFile($"已加载第{slideIndex}页墨迹，笔画数量: {strokes.Count}", LogHelper.LogType.Trace);
                         return strokes;
                     }
                 }
@@ -159,27 +212,30 @@ namespace Ink_Canvas.Helpers
             {
                 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.Warning);
+                        return LoadSlideStrokes(slideIndex);
                     }
 
+
                     // 设置墨迹锁定
                     LockInkForSlide(slideIndex);
 
                     // 加载新页面的墨迹
                     var newStrokes = LoadSlideStrokes(slideIndex);
-                    LogHelper.WriteLogToFile($"已切换到第{slideIndex}页，加载墨迹数量: {newStrokes.Count}", LogHelper.LogType.Trace);
                     
+                    // 更新切换记录
+                    _lastSwitchTime = now;
+                    _lastSwitchSlideIndex = slideIndex;
+                    
+                    if (newStrokes.Count > 0)
+                    {
+                    }
+
                     return newStrokes;
                 }
                 catch (Exception ex)
@@ -219,7 +275,23 @@ namespace Ink_Canvas.Helpers
 
                     // 保存所有页面的墨迹
                     int savedCount = 0;
-                    for (int i = 1; i <= presentation.Slides.Count && i < _memoryStreams.Length; i++)
+                    int slideCount = 0;
+                    
+                    try
+                    {
+                        slideCount = presentation.Slides.Count;
+                    }
+                    catch (COMException comEx)
+                    {
+                        var hr = (uint)comEx.HResult;
+                        if (hr == 0x80048010) 
+                        {
+                            return;
+                        }
+                        throw; 
+                    }
+                    
+                    for (int i = 1; i <= slideCount && i < _memoryStreams.Length; i++)
                     {
                         if (_memoryStreams[i] != null)
                         {
@@ -235,7 +307,6 @@ namespace Ink_Canvas.Helpers
                                     File.WriteAllBytes(filePath, srcBuf);
                                     savedCount++;
 
-                                    LogHelper.WriteLogToFile($"已保存第{i}页墨迹，大小: {byteLength} bytes", LogHelper.LogType.Trace);
                                 }
                                 else
                                 {
@@ -254,7 +325,6 @@ namespace Ink_Canvas.Helpers
                         }
                     }
 
-                    LogHelper.WriteLogToFile($"已保存{savedCount}页墨迹到文件", LogHelper.LogType.Event);
                 }
                 catch (Exception ex)
                 {
@@ -301,7 +371,6 @@ namespace Ink_Canvas.Helpers
                         }
                     }
 
-                    LogHelper.WriteLogToFile($"已从文件加载{loadedCount}页墨迹", LogHelper.LogType.Event);
                 }
                 catch (Exception ex)
                 {
@@ -349,9 +418,34 @@ namespace Ink_Canvas.Helpers
         /// </summary>
         public bool CanWriteInk(int currentSlideIndex)
         {
-            if (DateTime.Now < _inkLockUntil) return false;
-            if (currentSlideIndex != _lockedSlideIndex && _lockedSlideIndex > 0) return false;
-            return true;
+            // 如果锁定时间已过，允许写入
+            if (DateTime.Now >= _inkLockUntil)
+            {
+                return true;
+            }
+            
+            // 如果当前页面与锁定页面相同，允许写入（用户在当前页面绘制）
+            if (currentSlideIndex == _lockedSlideIndex)
+            {
+                return true;
+            }
+            
+            // 只有在快速切换且页面不同时才锁定
+            return false;
+        }
+
+        /// <summary>
+        /// 重置墨迹锁定状态
+        /// </summary>
+        public void ResetLockState()
+        {
+            lock (_lockObject)
+            {
+                _inkLockUntil = DateTime.MinValue;
+                _lockedSlideIndex = -1;
+                _lastSwitchTime = DateTime.MinValue;
+                _lastSwitchSlideIndex = -1;
+            }
         }
         #endregion
 
@@ -362,7 +456,7 @@ namespace Ink_Canvas.Helpers
             {
                 var presentationPath = presentation.FullName;
                 var fileHash = GetFileHash(presentationPath);
-                return $"{presentation.Name}_{presentation.Slides.Count}_{fileHash}";
+                return $"{presentation.Name}_{fileHash}";
             }
             catch (Exception ex)
             {

Ink Canvas/Helpers/PPTManager.cs

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Office.Interop.PowerPoint;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -7,7 +8,6 @@ using System.Text;
 using System.Threading;
 using System.Timers;
 using System.Windows.Threading;
-using Microsoft.Office.Interop.PowerPoint;
 using Application = System.Windows.Application;
 using Timer = System.Timers.Timer;
 
@@ -70,7 +70,32 @@ namespace Ink_Canvas.Helpers
                 try
                 {
                     if (PPTApplication == null || !Marshal.IsComObject(PPTApplication)) return false;
-                    return PPTApplication.SlideShowWindows?.Count > 0;
+
+                    // 检查是否有放映窗口
+                    var slideShowWindows = PPTApplication.SlideShowWindows;
+                    if (slideShowWindows == null || slideShowWindows.Count == 0) return false;
+
+                    // 验证放映窗口是否真正有效
+                    try
+                    {
+                        var slideShowWindow = slideShowWindows[1];
+                        if (slideShowWindow == null) return false;
+
+                        // 尝试访问放映窗口的属性来验证其有效性
+                        var _ = slideShowWindow.View;
+                        return true;
+                    }
+                    catch (COMException comEx)
+                    {
+                        var hr = (uint)comEx.HResult;
+                        if (hr == 0x8001010E || hr == 0x80004005)
+                        {
+                            // COM对象已失效，触发断开连接
+                            DisconnectFromPPT();
+                        }
+                        LogHelper.WriteLogToFile($"验证PPT放映窗口失败: {comEx.Message} (HR: 0x{hr:X8})", LogHelper.LogType.Warning);
+                        return false;
+                    }
                 }
                 catch (COMException comEx)
                 {
@@ -80,10 +105,12 @@ namespace Ink_Canvas.Helpers
                         // COM对象已失效，触发断开连接
                         DisconnectFromPPT();
                     }
+                    LogHelper.WriteLogToFile($"检查PPT放映状态失败: {comEx.Message} (HR: 0x{hr:X8})", LogHelper.LogType.Warning);
                     return false;
                 }
-                catch
+                catch (Exception ex)
                 {
+                    LogHelper.WriteLogToFile($"检查PPT放映状态时发生意外错误: {ex}", LogHelper.LogType.Warning);
                     return false;
                 }
             }
@@ -219,10 +246,9 @@ namespace Ink_Canvas.Helpers
                 {
                     _lastSlideShowState = currentSlideShowState;
                     SlideShowStateChanged?.Invoke(currentSlideShowState);
-                    
+
                     if (!currentSlideShowState)
                     {
-                        LogHelper.WriteLogToFile("检测到PPT放映已结束", LogHelper.LogType.Trace);
                     }
                 }
             }
@@ -250,16 +276,6 @@ namespace Ink_Canvas.Helpers
             catch (COMException ex)
             {
                 var hr = (uint)ex.HResult;
-                // 忽略常见的PowerPoint连接错误：
-                // 0x800401E3: 操作无法使用
-                // 0x80004005: 未指定错误
-                // 0x800706B5: RPC服务器不可用
-                // 0x8001010E: 应用程序调用一个已为另一线程整理的接口
-                // 0x800401F3: 无效的类字符串（PowerPoint未安装或COM组件未注册）
-                if (hr != 0x800401E3 && hr != 0x80004005 && hr != 0x800706B5 && hr != 0x8001010E && hr != 0x800401F3)
-                {
-                    LogHelper.WriteLogToFile($"连接PowerPoint失败: {ex}", LogHelper.LogType.Warning);
-                }
                 return null;
             }
             catch (InvalidCastException)
@@ -267,9 +283,8 @@ namespace Ink_Canvas.Helpers
                 // COM对象类型转换失败
                 return null;
             }
-            catch (Exception ex)
+            catch (Exception)
             {
-                LogHelper.WriteLogToFile($"连接PowerPoint时发生意外错误: {ex}", LogHelper.LogType.Warning);
                 return null;
             }
         }
@@ -395,12 +410,7 @@ namespace Ink_Canvas.Helpers
                                 }
                                 catch (COMException comEx)
                                 {
-                                    // COM对象已经被释放或在错误的线程中，忽略这些错误
                                     var hr = (uint)comEx.HResult;
-                                    if (hr != 0x8001010E && hr != 0x80004005 && hr != 0x800706B5)
-                                    {
-                                        LogHelper.WriteLogToFile($"取消PPT事件注册COM异常: {comEx}", LogHelper.LogType.Warning);
-                                    }
                                 }
                                 catch (InvalidCastException)
                                 {
@@ -410,10 +420,53 @@ namespace Ink_Canvas.Helpers
                             }, DispatcherPriority.Normal, CancellationToken.None, TimeSpan.FromSeconds(1));
                         }
                     }
-                    catch (Exception ex)
+                    catch (Exception)
+                    {
+                    }
+
+                    // 释放COM对象
+                    try
+                    {
+                        if (Marshal.IsComObject(CurrentSlide))
+                        {
+                            Marshal.ReleaseComObject(CurrentSlide);
+                        }
+                    }
+                    catch (Exception)
+                    {
+                    }
+
+                    try
+                    {
+                        if (Marshal.IsComObject(CurrentSlides))
+                        {
+                            Marshal.ReleaseComObject(CurrentSlides);
+                        }
+                    }
+                    catch (Exception)
+                    {
+                    }
+
+                    try
+                    {
+                        if (Marshal.IsComObject(CurrentPresentation))
+                        {
+                            Marshal.ReleaseComObject(CurrentPresentation);
+                        }
+                    }
+                    catch (Exception)
+                    {
+                    }
+
+                    try
+                    {
+                        if (Marshal.IsComObject(PPTApplication))
+                        {
+                            Marshal.ReleaseComObject(PPTApplication);
+                        }
+                    }
+                    catch (Exception)
                     {
-                        // 记录但不抛出异常，确保清理过程能够继续
-                        LogHelper.WriteLogToFile($"取消PPT事件注册失败: {ex.GetType().Name} - {ex.Message}", LogHelper.LogType.Warning);
                     }
 
                     // 清理引用
@@ -452,7 +505,29 @@ namespace Ink_Canvas.Helpers
                         {
                             CurrentPresentation = activePresentation;
                             CurrentSlides = CurrentPresentation.Slides;
-                            SlidesCount = CurrentSlides.Count;
+
+                            // 验证页数读取是否成功
+                            try
+                            {
+                                var slideCount = CurrentSlides.Count;
+                                if (slideCount > 0)
+                                {
+                                    SlidesCount = slideCount;
+                                }
+                                else
+                                {
+                                    // 页数为0，可能是空演示文稿或读取失败
+                                    SlidesCount = 0;
+                                    LogHelper.WriteLogToFile("PPT演示文稿页数为0，可能为空演示文稿", LogHelper.LogType.Warning);
+                                }
+                            }
+                            catch (COMException comEx)
+                            {
+                                // 页数读取失败
+                                var hr = (uint)comEx.HResult;
+                                SlidesCount = 0;
+                                LogHelper.WriteLogToFile($"读取PPT页数失败: {comEx.Message} (HR: 0x{hr:X8})", LogHelper.LogType.Warning);
+                            }
 
                             // 获取当前幻灯片
                             try
@@ -553,7 +628,6 @@ namespace Ink_Canvas.Helpers
             try
             {
                 PresentationClose?.Invoke(pres);
-                LogHelper.WriteLogToFile($"演示文稿已关闭: {pres?.Name}", LogHelper.LogType.Event);
 
                 // 重新启动连接检查
                 _connectionCheckTimer?.Start();
@@ -570,7 +644,6 @@ namespace Ink_Canvas.Helpers
             {
                 UpdateCurrentPresentationInfo();
                 SlideShowBegin?.Invoke(wn);
-                LogHelper.WriteLogToFile("幻灯片放映开始", LogHelper.LogType.Event);
             }
             catch (Exception ex)
             {
@@ -584,7 +657,6 @@ namespace Ink_Canvas.Helpers
             {
                 UpdateCurrentPresentationInfo();
                 SlideShowNextSlide?.Invoke(wn);
-                LogHelper.WriteLogToFile($"幻灯片切换到第{wn?.View?.CurrentShowPosition}页", LogHelper.LogType.Trace);
             }
             catch (Exception ex)
             {
@@ -603,7 +675,6 @@ namespace Ink_Canvas.Helpers
                 }
 
                 SlideShowEnd?.Invoke(pres);
-                LogHelper.WriteLogToFile("幻灯片放映结束", LogHelper.LogType.Event);
             }
             catch (Exception ex)
             {
@@ -775,14 +846,86 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        /// <summary>
+        /// 获取当前活跃的演示文稿（用于多窗口墨迹分离）
+        /// </summary>
+        public Presentation GetCurrentActivePresentation()
+        {
+            try
+            {
+                if (!IsConnected || PPTApplication == null) return null;
+                if (!Marshal.IsComObject(PPTApplication)) return null;
+
+                // 如果在放映模式，获取放映窗口的演示文稿
+                if (IsInSlideShow && PPTApplication.SlideShowWindows.Count > 0)
+                {
+                    var slideShowWindow = PPTApplication.SlideShowWindows[1];
+                    if (slideShowWindow?.View != null)
+                    {
+                        return (Presentation)slideShowWindow.View.Slide.Parent;
+                    }
+                }
+
+                // 如果不在放映模式，获取活动窗口的演示文稿
+                if (PPTApplication.ActiveWindow?.Presentation != null)
+                {
+                    return PPTApplication.ActiveWindow.Presentation;
+                }
+
+                // 如果没有活动窗口，返回当前演示文稿
+                return CurrentPresentation;
+            }
+            catch (COMException comEx)
+            {
+                var hr = (uint)comEx.HResult;
+                if (hr == 0x8001010E || hr == 0x80004005)
+                {
+                    // COM对象已失效，触发断开连接
+                    DisconnectFromPPT();
+                }
+                LogHelper.WriteLogToFile($"获取当前活跃演示文稿失败: {comEx.Message}", LogHelper.LogType.Warning);
+                return CurrentPresentation;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"获取当前活跃演示文稿失败: {ex}", LogHelper.LogType.Error);
+                return CurrentPresentation;
+            }
+        }
+
+        /// <summary>
+        /// 获取当前幻灯片编号
+        /// </summary>
         public int GetCurrentSlideNumber()
         {
             try
             {
-                if (!IsConnected || !IsInSlideShow || PPTApplication == null) return 0;
+                if (!IsConnected || PPTApplication == null) return 0;
                 if (!Marshal.IsComObject(PPTApplication)) return 0;
 
-                return PPTApplication.SlideShowWindows[1]?.View?.CurrentShowPosition ?? 0;
+                // 如果在放映模式，获取放映窗口的当前幻灯片编号
+                if (IsInSlideShow && PPTApplication.SlideShowWindows.Count > 0)
+                {
+                    var slideShowWindow = PPTApplication.SlideShowWindows[1];
+                    if (slideShowWindow?.View != null)
+                    {
+                        return slideShowWindow.View.CurrentShowPosition;
+                    }
+                }
+
+                // 如果不在放映模式，获取活动窗口的当前幻灯片编号
+                if (PPTApplication.ActiveWindow?.Selection?.SlideRange?.SlideNumber > 0)
+                {
+                    return PPTApplication.ActiveWindow.Selection.SlideRange.SlideNumber;
+                }
+
+                // 如果CurrentSlide存在，尝试获取其编号
+                if (CurrentSlide != null && Marshal.IsComObject(CurrentSlide))
+                {
+                    return CurrentSlide.SlideNumber;
+                }
+
+                return 0;
             }
             catch (COMException comEx)
             {
@@ -992,7 +1135,7 @@ namespace Ink_Canvas.Helpers
                 _wpsProcessCheckTimer.Dispose();
             }
 
-            // 优化：增加检查间隔到2秒，减少性能开销
+            // 增加检查间隔到2秒，减少性能开销
             _wpsProcessCheckTimer = new Timer(2000);
             _wpsProcessCheckTimer.Elapsed += OnWpsProcessCheckTimerElapsed;
             _wpsProcessCheckTimer.Start();
@@ -1026,7 +1169,7 @@ namespace Ink_Canvas.Helpers
                 }
 
 
-                // 检查前台WPS窗口是否存在（优化版）
+                // 检查前台WPS窗口是否存在
                 bool isForegroundWpsWindowActive = IsForegroundWpsWindowStillActiveOptimized();
 
                 if (isForegroundWpsWindowActive)
@@ -1038,7 +1181,7 @@ namespace Ink_Canvas.Helpers
                     return;
                 }
 
-                // 优化：多重验证确保准确性
+                // 多重验证确保准确性
                 if (!PerformMultipleWpsWindowChecks())
                 {
                     LogHelper.WriteLogToFile("多重验证显示WPS窗口仍然存在，跳过查杀", LogHelper.LogType.Trace);
@@ -1059,7 +1202,7 @@ namespace Ink_Canvas.Helpers
         }
 
         /// <summary>
-        /// 优化版的前台WPS窗口检测，减少性能开销
+        /// 前台WPS窗口检测
         /// </summary>
         private bool IsForegroundWpsWindowStillActiveOptimized()
         {
@@ -1085,7 +1228,7 @@ namespace Ink_Canvas.Helpers
             }
             catch (Exception ex)
             {
-                LogHelper.WriteLogToFile($"优化版WPS窗口检测失败: {ex}", LogHelper.LogType.Error);
+                LogHelper.WriteLogToFile($"WPS窗口检测失败: {ex}", LogHelper.LogType.Error);
                 return false;
             }
         }

Ink Canvas/Helpers/PPTUIManager.cs

@@ -81,11 +81,19 @@ namespace Ink_Canvas.Helpers
                         _mainWindow.BtnPPTSlideShow.Visibility = Visibility.Collapsed;
                         _mainWindow.BtnPPTSlideShowEnd.Visibility = Visibility.Visible;
 
+                        // 只有在页数有效时才更新页码显示
                         if (currentSlide > 0 && totalSlides > 0)
                         {
                             _mainWindow.PPTBtnPageNow.Text = currentSlide.ToString();
                             _mainWindow.PPTBtnPageTotal.Text = $"/ {totalSlides}";
                         }
+                        else
+                        {
+                            // 页数无效时清空页码显示
+                            _mainWindow.PPTBtnPageNow.Text = "?";
+                            _mainWindow.PPTBtnPageTotal.Text = "/ ?";
+                            LogHelper.WriteLogToFile($"PPT页数无效，清空页码显示: 当前页={currentSlide}, 总页数={totalSlides}", LogHelper.LogType.Warning);
+                        }
 
                         UpdateNavigationPanelsVisibility();
                         UpdateNavigationButtonStyles();
@@ -113,8 +121,19 @@ namespace Ink_Canvas.Helpers
             {
                 try
                 {
-                    _mainWindow.PPTBtnPageNow.Text = currentSlide.ToString();
-                    _mainWindow.PPTBtnPageTotal.Text = $"/ {totalSlides}";
+                    // 只有在页数有效时才更新页码显示
+                    if (currentSlide > 0 && totalSlides > 0)
+                    {
+                        _mainWindow.PPTBtnPageNow.Text = currentSlide.ToString();
+                        _mainWindow.PPTBtnPageTotal.Text = $"/ {totalSlides}";
+                    }
+                    else
+                    {
+                        // 页数无效时清空页码显示
+                        _mainWindow.PPTBtnPageNow.Text = "?";
+                        _mainWindow.PPTBtnPageTotal.Text = "/ ?";
+                        LogHelper.WriteLogToFile($"PPT页数无效，清空页码显示: 当前页={currentSlide}, 总页数={totalSlides}", LogHelper.LogType.Warning);
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -136,7 +155,6 @@ namespace Ink_Canvas.Helpers
                     {
                         // 如果不在放映模式，隐藏所有导航面板
                         HideAllNavigationPanels();
-                        LogHelper.WriteLogToFile("PPT放映状态变化：隐藏导航面板", LogHelper.LogType.Trace);
                     }
                 }
                 catch (Exception ex)
@@ -156,10 +174,15 @@ namespace Ink_Canvas.Helpers
                 try
                 {
                     // 检查是否应该显示PPT按钮
-                    // 不仅要检查按钮设置，还要确保确实在PPT放映模式下
-                    bool shouldShowButtons = ShowPPTButton && 
+                    // 不仅要检查按钮设置，还要确保确实在PPT放映模式下且页数有效
+                    bool isInSlideShow = _mainWindow.PPTManager?.IsInSlideShow == true;
+                    int slidesCount = _mainWindow.PPTManager?.SlidesCount ?? 0;
+                    bool hasValidPageCount = slidesCount > 0;
+
+                    bool shouldShowButtons = ShowPPTButton &&
                                           _mainWindow.BtnPPTSlideShowEnd.Visibility == Visibility.Visible &&
-                                          _mainWindow.PPTManager?.IsInSlideShow == true;
+                                          isInSlideShow &&
+                                          hasValidPageCount;
 
                     if (!shouldShowButtons)
                     {

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

@@ -1,9 +1,9 @@
+using iNKORE.UI.WPF.Modern.Controls;
 using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using iNKORE.UI.WPF.Modern.Controls;
 
 namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
 {

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

@@ -1,3 +1,5 @@
+using Microsoft.Win32;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -8,8 +10,6 @@ using System.Windows;
 using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using Microsoft.Win32;
-using Newtonsoft.Json;
 
 namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
 {

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

@@ -1,10 +1,10 @@
+using Ink_Canvas.Windows;
+using Microsoft.Win32;
 using System;
 using System.ComponentModel;
 using System.IO;
 using System.Windows;
 using System.Windows.Controls;
-using Ink_Canvas.Windows;
-using Microsoft.Win32;
 
 namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
 {

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

@@ -1,3 +1,5 @@
+using Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -5,8 +7,6 @@ using System.IO;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
-using Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher;
-using Newtonsoft.Json;
 
 namespace Ink_Canvas.Helpers.Plugins.BuiltIn
 {

Ink Canvas/Helpers/Plugins/EnhancedPluginBase.cs

@@ -89,4 +89,4 @@ namespace Ink_Canvas.Helpers.Plugins
             base.Cleanup();
         }
     }
-} 
+}

Ink Canvas/Helpers/Plugins/EnhancedPluginBaseV2.cs

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

Ink Canvas/Helpers/Plugins/IActionService.cs

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

Ink Canvas/Helpers/Plugins/IEnhancedPlugin.cs

@@ -45,4 +45,4 @@ namespace Ink_Canvas.Helpers.Plugins
         /// </summary>
         void OnConfigurationChanged();
     }
-} 
+}

Ink Canvas/Helpers/Plugins/IGetService.cs

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

Ink Canvas/Helpers/Plugins/IPluginService.cs

@@ -1,532 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
 namespace Ink_Canvas.Helpers.Plugins
 {
     /// <summary>
     /// 插件服务接口，提供对软件内部功能的访问
+    /// 继承自三个专门的服务接口：获取服务、窗口服务、操作服务
     /// </summary>
-    public interface IPluginService
+    public interface IPluginService : IGetService, IWindowService, IActionService
     {
-        #region 窗口和UI访问
-
-        /// <summary>
-        /// 获取主窗口引用
-        /// </summary>
-        Window MainWindow { get; }
-
-        /// <summary>
-        /// 获取当前画布
-        /// </summary>
-        InkCanvas CurrentCanvas { get; }
-
-        /// <summary>
-        /// 获取所有画布页面
-        /// </summary>
-        List<Canvas> AllCanvasPages { get; }
-
-        /// <summary>
-        /// 获取当前页面索引
-        /// </summary>
-        int CurrentPageIndex { get; }
-
-        /// <summary>
-        /// 获取当前页面数量
-        /// </summary>
-        int TotalPageCount { get; }
-
-        /// <summary>
-        /// 获取浮动工具栏
-        /// </summary>
-        FrameworkElement FloatingToolBar { get; }
-
-        /// <summary>
-        /// 获取左侧面板
-        /// </summary>
-        FrameworkElement LeftPanel { get; }
-
-        /// <summary>
-        /// 获取右侧面板
-        /// </summary>
-        FrameworkElement RightPanel { get; }
-
-        /// <summary>
-        /// 获取顶部面板
-        /// </summary>
-        FrameworkElement TopPanel { get; }
-
-        /// <summary>
-        /// 获取底部面板
-        /// </summary>
-        FrameworkElement BottomPanel { get; }
-
-        #endregion
-
-        #region 绘制工具状态
-
-        /// <summary>
-        /// 获取当前绘制模式
-        /// </summary>
-        int CurrentDrawingMode { get; }
-
-        /// <summary>
-        /// 获取当前笔触宽度
-        /// </summary>
-        double CurrentInkWidth { get; }
-
-        /// <summary>
-        /// 获取当前笔触颜色
-        /// </summary>
-        Color CurrentInkColor { get; }
-
-        /// <summary>
-        /// 获取当前高亮笔宽度
-        /// </summary>
-        double CurrentHighlighterWidth { get; }
-
-        /// <summary>
-        /// 获取当前橡皮擦大小
-        /// </summary>
-        int CurrentEraserSize { get; }
-
-        /// <summary>
-        /// 获取当前橡皮擦类型
-        /// </summary>
-        int CurrentEraserType { get; }
-
-        /// <summary>
-        /// 获取当前橡皮擦形状
-        /// </summary>
-        int CurrentEraserShape { get; }
-
-        /// <summary>
-        /// 获取当前笔触透明度
-        /// </summary>
-        double CurrentInkAlpha { get; }
-
-        /// <summary>
-        /// 获取当前笔触样式
-        /// </summary>
-        int CurrentInkStyle { get; }
-
-        /// <summary>
-        /// 获取当前背景颜色
-        /// </summary>
-        string CurrentBackgroundColor { get; }
-
-        #endregion
-
-        #region 应用状态
-
-        /// <summary>
-        /// 获取当前主题模式
-        /// </summary>
-        bool IsDarkTheme { get; }
-
-        /// <summary>
-        /// 获取当前是否为白板模式
-        /// </summary>
-        bool IsWhiteboardMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为PPT模式
-        /// </summary>
-        bool IsPPTMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为全屏模式
-        /// </summary>
-        bool IsFullScreenMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为画板模式
-        /// </summary>
-        bool IsCanvasMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为选择模式
-        /// </summary>
-        bool IsSelectionMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为擦除模式
-        /// </summary>
-        bool IsEraserMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为形状绘制模式
-        /// </summary>
-        bool IsShapeDrawingMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为高亮模式
-        /// </summary>
-        bool IsHighlighterMode { get; }
-
-        #endregion
-
-        #region 画布操作
-
-        /// <summary>
-        /// 清除当前画布
-        /// </summary>
-        void ClearCanvas();
-
-        /// <summary>
-        /// 清除所有画布
-        /// </summary>
-        void ClearAllCanvases();
-
-        /// <summary>
-        /// 添加新页面
-        /// </summary>
-        void AddNewPage();
-
-        /// <summary>
-        /// 删除当前页面
-        /// </summary>
-        void DeleteCurrentPage();
-
-        /// <summary>
-        /// 切换到指定页面
-        /// </summary>
-        /// <param name="pageIndex">页面索引</param>
-        void SwitchToPage(int pageIndex);
-
-        /// <summary>
-        /// 切换到下一页
-        /// </summary>
-        void NextPage();
-
-        /// <summary>
-        /// 切换到上一页
-        /// </summary>
-        void PreviousPage();
-
-        #endregion
-
-        #region 绘制操作
-
-        /// <summary>
-        /// 设置绘制模式
-        /// </summary>
-        /// <param name="mode">绘制模式</param>
-        void SetDrawingMode(int mode);
-
-        /// <summary>
-        /// 设置笔触宽度
-        /// </summary>
-        /// <param name="width">宽度</param>
-        void SetInkWidth(double width);
-
-        /// <summary>
-        /// 设置笔触颜色
-        /// </summary>
-        /// <param name="color">颜色</param>
-        void SetInkColor(Color color);
-
-        /// <summary>
-        /// 设置高亮笔宽度
-        /// </summary>
-        /// <param name="width">宽度</param>
-        void SetHighlighterWidth(double width);
-
-        /// <summary>
-        /// 设置橡皮擦大小
-        /// </summary>
-        /// <param name="size">大小</param>
-        void SetEraserSize(int size);
-
-        /// <summary>
-        /// 设置橡皮擦类型
-        /// </summary>
-        /// <param name="type">类型</param>
-        void SetEraserType(int type);
-
-        /// <summary>
-        /// 设置橡皮擦形状
-        /// </summary>
-        /// <param name="shape">形状</param>
-        void SetEraserShape(int shape);
-
-        /// <summary>
-        /// 设置笔触透明度
-        /// </summary>
-        /// <param name="alpha">透明度</param>
-        void SetInkAlpha(double alpha);
-
-        /// <summary>
-        /// 设置笔触样式
-        /// </summary>
-        /// <param name="style">样式</param>
-        void SetInkStyle(int style);
-
-        /// <summary>
-        /// 设置背景颜色
-        /// </summary>
-        /// <param name="color">颜色</param>
-        void SetBackgroundColor(string color);
-
-        #endregion
-
-        #region 文件操作
-
-        /// <summary>
-        /// 保存画布内容
-        /// </summary>
-        /// <param name="filePath">文件路径</param>
-        void SaveCanvas(string filePath);
-
-        /// <summary>
-        /// 加载画布内容
-        /// </summary>
-        /// <param name="filePath">文件路径</param>
-        void LoadCanvas(string filePath);
-
-        /// <summary>
-        /// 导出为图片
-        /// </summary>
-        /// <param name="filePath">文件路径</param>
-        /// <param name="format">图片格式</param>
-        void ExportAsImage(string filePath, string format);
-
-        /// <summary>
-        /// 导出为PDF
-        /// </summary>
-        /// <param name="filePath">文件路径</param>
-        void ExportAsPDF(string filePath);
-
-        #endregion
-
-        #region 撤销重做
-
-        /// <summary>
-        /// 撤销操作
-        /// </summary>
-        void Undo();
-
-        /// <summary>
-        /// 重做操作
-        /// </summary>
-        void Redo();
-
-        /// <summary>
-        /// 是否可以撤销
-        /// </summary>
-        bool CanUndo { get; }
-
-        /// <summary>
-        /// 是否可以重做
-        /// </summary>
-        bool CanRedo { get; }
-
-        #endregion
-
-        #region 选择操作
-
-        /// <summary>
-        /// 全选
-        /// </summary>
-        void SelectAll();
-
-        /// <summary>
-        /// 取消选择
-        /// </summary>
-        void DeselectAll();
-
-        /// <summary>
-        /// 删除选中内容
-        /// </summary>
-        void DeleteSelected();
-
-        /// <summary>
-        /// 复制选中内容
-        /// </summary>
-        void CopySelected();
-
-        /// <summary>
-        /// 剪切选中内容
-        /// </summary>
-        void CutSelected();
-
-        /// <summary>
-        /// 粘贴内容
-        /// </summary>
-        void Paste();
-
-        #endregion
-
-        #region 窗口管理
-
-        /// <summary>
-        /// 显示设置窗口
-        /// </summary>
-        void ShowSettingsWindow();
-
-        /// <summary>
-        /// 隐藏设置窗口
-        /// </summary>
-        void HideSettingsWindow();
-
-        /// <summary>
-        /// 显示插件设置窗口
-        /// </summary>
-        void ShowPluginSettingsWindow();
-
-        /// <summary>
-        /// 隐藏插件设置窗口
-        /// </summary>
-        void HidePluginSettingsWindow();
-
-        /// <summary>
-        /// 显示帮助窗口
-        /// </summary>
-        void ShowHelpWindow();
-
-        /// <summary>
-        /// 隐藏帮助窗口
-        /// </summary>
-        void HideHelpWindow();
-
-        /// <summary>
-        /// 显示关于窗口
-        /// </summary>
-        void ShowAboutWindow();
-
-        /// <summary>
-        /// 隐藏关于窗口
-        /// </summary>
-        void HideAboutWindow();
-
-        #endregion
-
-        #region 通知和消息
-
-        /// <summary>
-        /// 显示通知消息
-        /// </summary>
-        /// <param name="message">消息内容</param>
-        /// <param name="type">消息类型</param>
-        void ShowNotification(string message, NotificationType type = NotificationType.Info);
-
-        /// <summary>
-        /// 显示确认对话框
-        /// </summary>
-        /// <param name="message">消息内容</param>
-        /// <param name="title">标题</param>
-        /// <returns>用户选择结果</returns>
-        bool ShowConfirmDialog(string message, string title = "确认");
-
-        /// <summary>
-        /// 显示输入对话框
-        /// </summary>
-        /// <param name="message">提示消息</param>
-        /// <param name="title">标题</param>
-        /// <param name="defaultValue">默认值</param>
-        /// <returns>用户输入内容</returns>
-        string ShowInputDialog(string message, string title = "输入", string defaultValue = "");
-
-        #endregion
-
-        #region 系统功能
-
-        /// <summary>
-        /// 获取系统设置
-        /// </summary>
-        /// <typeparam name="T">设置类型</typeparam>
-        /// <param name="key">设置键</param>
-        /// <param name="defaultValue">默认值</param>
-        /// <returns>设置值</returns>
-        T GetSetting<T>(string key, T defaultValue = default(T));
-
-        /// <summary>
-        /// 设置系统设置
-        /// </summary>
-        /// <typeparam name="T">设置类型</typeparam>
-        /// <param name="key">设置键</param>
-        /// <param name="value">设置值</param>
-        void SetSetting<T>(string key, T value);
-
-        /// <summary>
-        /// 保存设置到文件
-        /// </summary>
-        void SaveSettings();
-
-        /// <summary>
-        /// 从文件加载设置
-        /// </summary>
-        void LoadSettings();
-
-        /// <summary>
-        /// 重置设置为默认值
-        /// </summary>
-        void ResetSettings();
-
-        #endregion
-
-        #region 插件管理
-
-        /// <summary>
-        /// 获取所有已加载的插件
-        /// </summary>
-        /// <returns>插件列表</returns>
-        List<IPlugin> GetAllPlugins();
-
-        /// <summary>
-        /// 获取指定插件
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        /// <returns>插件实例</returns>
-        IPlugin GetPlugin(string pluginName);
-
-        /// <summary>
-        /// 启用插件
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        void EnablePlugin(string pluginName);
-
-        /// <summary>
-        /// 禁用插件
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        void DisablePlugin(string pluginName);
-
-        /// <summary>
-        /// 卸载插件
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        void UnloadPlugin(string pluginName);
-
-        #endregion
-
-        #region 事件系统
-
-        /// <summary>
-        /// 注册事件处理器
-        /// </summary>
-        /// <param name="eventName">事件名称</param>
-        /// <param name="handler">事件处理器</param>
-        void RegisterEventHandler(string eventName, EventHandler handler);
-
-        /// <summary>
-        /// 注销事件处理器
-        /// </summary>
-        /// <param name="eventName">事件名称</param>
-        /// <param name="handler">事件处理器</param>
-        void UnregisterEventHandler(string eventName, EventHandler handler);
-
-        /// <summary>
-        /// 触发事件
-        /// </summary>
-        /// <param name="eventName">事件名称</param>
-        /// <param name="sender">事件发送者</param>
-        /// <param name="args">事件参数</param>
-        void TriggerEvent(string eventName, object sender, EventArgs args);
-
-        #endregion
+        // 这个接口现在继承自三个专门的服务接口
+        // 所有方法都在子接口中定义，这里不需要重复定义
     }
 
     /// <summary>
@@ -554,4 +35,4 @@ namespace Ink_Canvas.Helpers.Plugins
         /// </summary>
         Error
     }
-} 
+}

Ink Canvas/Helpers/Plugins/IWindowService.cs

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

Ink Canvas/Helpers/Plugins/PluginConfigurationManager.cs

@@ -1,8 +1,8 @@
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 
 namespace Ink_Canvas.Helpers.Plugins
 {
@@ -270,4 +270,4 @@ namespace Ink_Canvas.Helpers.Plugins
             }
         }
     }
-} 
+}

Ink Canvas/Helpers/Plugins/PluginManager.cs

@@ -1,3 +1,5 @@
+using Ink_Canvas.Windows;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -8,8 +10,6 @@ using System.Security.Cryptography;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
-using Ink_Canvas.Windows;
-using Newtonsoft.Json;
 using Timer = System.Timers.Timer;
 
 namespace Ink_Canvas.Helpers.Plugins
@@ -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/Plugins/PluginServiceManager.cs

@@ -115,7 +115,149 @@ namespace Ink_Canvas.Helpers.Plugins
 
         #endregion
 
-        #region 画布操作
+        #region IGetService 实现
+
+        public bool CanUndo => false; // 暂时返回默认值
+
+        public bool CanRedo => false; // 暂时返回默认值
+
+        public T GetSetting<T>(string key, T defaultValue = default(T))
+        {
+            // 暂时不实现，避免访问权限问题
+            return defaultValue;
+        }
+
+        public List<IPlugin> GetAllPlugins()
+        {
+            return new List<IPlugin>(PluginManager.Instance.Plugins);
+        }
+
+        public IPlugin GetPlugin(string pluginName)
+        {
+            return PluginManager.Instance.Plugins.FirstOrDefault(p => p.Name == pluginName);
+        }
+
+        #endregion
+
+        #region IWindowService 实现
+
+        public void ShowSettingsWindow()
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void HideSettingsWindow()
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void ShowPluginSettingsWindow()
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void HidePluginSettingsWindow()
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void ShowHelpWindow()
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void HideHelpWindow()
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void ShowAboutWindow()
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void HideAboutWindow()
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void ShowNotification(string message, NotificationType type = NotificationType.Info)
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public bool ShowConfirmDialog(string message, string title = "确认")
+        {
+            // 暂时不实现，避免访问权限问题
+            return false;
+        }
+
+        public string ShowInputDialog(string message, string title = "输入", string defaultValue = "")
+        {
+            // 暂时不实现，避免访问权限问题
+            return defaultValue;
+        }
+
+        public void SetFullScreen(bool isFullScreen)
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void SetTopMost(bool isTopMost)
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void SetWindowVisibility(bool isVisible)
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void MinimizeWindow()
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void MaximizeWindow()
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void RestoreWindow()
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void CloseWindow()
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void SetWindowPosition(double x, double y)
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void SetWindowSize(double width, double height)
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public (double x, double y) GetWindowPosition()
+        {
+            // 暂时不实现，避免访问权限问题
+            return (0, 0);
+        }
+
+        public (double width, double height) GetWindowSize()
+        {
+            // 暂时不实现，避免访问权限问题
+            return (800, 600);
+        }
+
+        #endregion
+
+        #region IActionService 实现
 
         public void ClearCanvas()
         {
@@ -152,10 +294,6 @@ namespace Ink_Canvas.Helpers.Plugins
             // 暂时不实现，避免访问权限问题
         }
 
-        #endregion
-
-        #region 绘制操作
-
         public void SetDrawingMode(int mode)
         {
             // 暂时不实现，避免访问权限问题
@@ -206,10 +344,6 @@ namespace Ink_Canvas.Helpers.Plugins
             // 暂时不实现，避免访问权限问题
         }
 
-        #endregion
-
-        #region 文件操作
-
         public void SaveCanvas(string filePath)
         {
             // 暂时不实现，避免访问权限问题
@@ -230,10 +364,6 @@ namespace Ink_Canvas.Helpers.Plugins
             // 暂时不实现，避免访问权限问题
         }
 
-        #endregion
-
-        #region 撤销重做
-
         public void Undo()
         {
             // 暂时不实现，避免访问权限问题
@@ -244,14 +374,6 @@ namespace Ink_Canvas.Helpers.Plugins
             // 暂时不实现，避免访问权限问题
         }
 
-        public bool CanUndo => false; // 暂时返回默认值
-
-        public bool CanRedo => false; // 暂时返回默认值
-
-        #endregion
-
-        #region 选择操作
-
         public void SelectAll()
         {
             // 暂时不实现，避免访问权限问题
@@ -282,81 +404,6 @@ namespace Ink_Canvas.Helpers.Plugins
             // 暂时不实现，避免访问权限问题
         }
 
-        #endregion
-
-        #region 窗口管理
-
-        public void ShowSettingsWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void HideSettingsWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ShowPluginSettingsWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void HidePluginSettingsWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ShowHelpWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void HideHelpWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ShowAboutWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void HideAboutWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        #endregion
-
-        #region 通知和消息
-
-        public void ShowNotification(string message, NotificationType type = NotificationType.Info)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public bool ShowConfirmDialog(string message, string title = "确认")
-        {
-            // 暂时不实现，避免访问权限问题
-            return false;
-        }
-
-        public string ShowInputDialog(string message, string title = "输入", string defaultValue = "")
-        {
-            // 暂时不实现，避免访问权限问题
-            return defaultValue;
-        }
-
-        #endregion
-
-        #region 系统功能
-
-        public T GetSetting<T>(string key, T defaultValue = default(T))
-        {
-            // 暂时不实现，避免访问权限问题
-            return defaultValue;
-        }
-
         public void SetSetting<T>(string key, T value)
         {
             // 暂时不实现，避免访问权限问题
@@ -377,20 +424,6 @@ namespace Ink_Canvas.Helpers.Plugins
             // 暂时不实现，避免访问权限问题
         }
 
-        #endregion
-
-        #region 插件管理
-
-        public List<IPlugin> GetAllPlugins()
-        {
-            return new List<IPlugin>(PluginManager.Instance.Plugins);
-        }
-
-        public IPlugin GetPlugin(string pluginName)
-        {
-            return PluginManager.Instance.Plugins.FirstOrDefault(p => p.Name == pluginName);
-        }
-
         public void EnablePlugin(string pluginName)
         {
             var plugin = GetPlugin(pluginName);
@@ -418,10 +451,6 @@ namespace Ink_Canvas.Helpers.Plugins
             }
         }
 
-        #endregion
-
-        #region 事件系统
-
         public void RegisterEventHandler(string eventName, EventHandler handler)
         {
             if (!_eventHandlers.ContainsKey(eventName))
@@ -450,6 +479,31 @@ namespace Ink_Canvas.Helpers.Plugins
             }
         }
 
+        public void RestartApplication()
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void ExitApplication()
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void CheckForUpdates()
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void OpenHelpDocument()
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
+        public void OpenAboutPage()
+        {
+            // 暂时不实现，避免访问权限问题
+        }
+
         #endregion
     }
-} 
+}

Ink Canvas/Helpers/SoftwareLauncher.cs

@@ -1,8 +1,8 @@
-using System;
+using Microsoft.Win32;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
-using Microsoft.Win32;
 
 namespace Ink_Canvas.Helpers
 {

Ink Canvas/Helpers/WindowZOrderManager.cs

@@ -0,0 +1,263 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Interop;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 窗口Z-Order管理器，用于管理窗口的层级顺序
+    /// 在无焦点模式下，确保后打开的窗口能够置顶于先打开的窗口
+    /// </summary>
+    public static class WindowZOrderManager
+    {
+        #region Win32 API 声明
+        private const int GWL_EXSTYLE = -20;
+        private const int WS_EX_TOPMOST = 0x00000008;
+        private const int WS_EX_NOACTIVATE = 0x08000000;
+        private static readonly IntPtr HWND_TOPMOST = new IntPtr(-1);
+        private static readonly IntPtr HWND_NOTOPMOST = new IntPtr(-2);
+        private const uint SWP_NOMOVE = 0x0002;
+        private const uint SWP_NOSIZE = 0x0001;
+        private const uint SWP_NOACTIVATE = 0x0010;
+        private const uint SWP_SHOWWINDOW = 0x0040;
+        private const uint SWP_NOOWNERZORDER = 0x0200;
+
+        [DllImport("user32.dll")]
+        private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
+
+        [DllImport("user32.dll")]
+        private static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+
+        [DllImport("user32.dll")]
+        private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+
+        [DllImport("user32.dll")]
+        private static extern bool IsWindow(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        private static extern bool IsWindowVisible(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        private static extern bool IsIconic(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr GetForegroundWindow();
+
+        [DllImport("user32.dll")]
+        private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
+
+        [DllImport("kernel32.dll")]
+        private static extern uint GetCurrentProcessId();
+        #endregion
+
+        // 窗口层级管理
+        private static readonly List<WindowInfo> _windowStack = new List<WindowInfo>();
+        private static readonly object _lockObject = new object();
+
+        /// <summary>
+        /// 窗口信息类
+        /// </summary>
+        private class WindowInfo
+        {
+            public IntPtr Handle { get; set; }
+            public Window Window { get; set; }
+            public DateTime CreatedTime { get; set; }
+            public bool IsTopmost { get; set; }
+            public bool IsNoFocusMode { get; set; }
+        }
+
+        /// <summary>
+        /// 注册窗口到Z-Order管理器
+        /// </summary>
+        /// <param name="window">要注册的窗口</param>
+        /// <param name="isTopmost">是否置顶</param>
+        /// <param name="isNoFocusMode">是否无焦点模式</param>
+        public static void RegisterWindow(Window window, bool isTopmost = false, bool isNoFocusMode = false)
+        {
+            if (window == null) return;
+
+            lock (_lockObject)
+            {
+                var hwnd = new WindowInteropHelper(window).Handle;
+                if (hwnd == IntPtr.Zero) return;
+
+                // 移除已存在的记录
+                _windowStack.RemoveAll(w => w.Handle == hwnd);
+
+                // 添加新记录
+                var windowInfo = new WindowInfo
+                {
+                    Handle = hwnd,
+                    Window = window,
+                    CreatedTime = DateTime.Now,
+                    IsTopmost = isTopmost,
+                    IsNoFocusMode = isNoFocusMode
+                };
+
+                _windowStack.Add(windowInfo);
+
+                // 应用Z-Order
+                ApplyZOrder();
+            }
+        }
+
+        /// <summary>
+        /// 从Z-Order管理器中移除窗口
+        /// </summary>
+        /// <param name="window">要移除的窗口</param>
+        public static void UnregisterWindow(Window window)
+        {
+            if (window == null) return;
+
+            lock (_lockObject)
+            {
+                var hwnd = new WindowInteropHelper(window).Handle;
+                _windowStack.RemoveAll(w => w.Handle == hwnd);
+                ApplyZOrder();
+            }
+        }
+
+        /// <summary>
+        /// 设置窗口为置顶状态
+        /// </summary>
+        /// <param name="window">要置顶的窗口</param>
+        /// <param name="isTopmost">是否置顶</param>
+        public static void SetWindowTopmost(Window window, bool isTopmost)
+        {
+            if (window == null) return;
+
+            lock (_lockObject)
+            {
+                var windowInfo = _windowStack.FirstOrDefault(w => w.Window == window);
+                if (windowInfo != null)
+                {
+                    windowInfo.IsTopmost = isTopmost;
+                    ApplyZOrder();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 将窗口移到最顶层
+        /// </summary>
+        /// <param name="window">要移到最顶层的窗口</param>
+        public static void BringToTop(Window window)
+        {
+            if (window == null) return;
+
+            try
+            {
+                var hwnd = new WindowInteropHelper(window).Handle;
+                if (hwnd == IntPtr.Zero) return;
+
+                // 使用更直接的方法：先激活窗口，再置顶
+                window.Activate();
+                window.Focus();
+
+                // 设置窗口为置顶
+                SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0,
+                    SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW | SWP_NOOWNERZORDER);
+
+                // 确保窗口样式正确
+                int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
+                SetWindowLong(hwnd, GWL_EXSTYLE, exStyle | WS_EX_TOPMOST);
+
+                // 再次确保置顶
+                SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0,
+                    SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW | SWP_NOOWNERZORDER);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"BringToTop失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 应用Z-Order排序
+        /// </summary>
+        private static void ApplyZOrder()
+        {
+            // 简化逻辑：直接设置所有窗口为置顶，让Windows系统自然处理层级
+            foreach (var windowInfo in _windowStack.ToList())
+            {
+                if (windowInfo.IsTopmost && IsWindow(windowInfo.Handle) && IsWindowVisible(windowInfo.Handle) && !IsIconic(windowInfo.Handle))
+                {
+                    // 设置窗口为置顶
+                    SetWindowPos(windowInfo.Handle, HWND_TOPMOST, 0, 0, 0, 0,
+                        SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_SHOWWINDOW | SWP_NOOWNERZORDER);
+
+                    // 确保窗口样式正确
+                    int exStyle = GetWindowLong(windowInfo.Handle, GWL_EXSTYLE);
+                    if ((exStyle & WS_EX_TOPMOST) == 0)
+                    {
+                        SetWindowLong(windowInfo.Handle, GWL_EXSTYLE, exStyle | WS_EX_TOPMOST);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 检查是否有子窗口在前景
+        /// </summary>
+        /// <returns>如果有子窗口在前景返回true</returns>
+        public static bool HasChildWindowInForeground()
+        {
+            lock (_lockObject)
+            {
+                var foregroundWindow = GetForegroundWindow();
+                if (foregroundWindow == IntPtr.Zero) return false;
+
+                return _windowStack.Any(w => w.Handle == foregroundWindow);
+            }
+        }
+
+        /// <summary>
+        /// 清理无效的窗口记录
+        /// </summary>
+        public static void CleanupInvalidWindows()
+        {
+            lock (_lockObject)
+            {
+                _windowStack.RemoveAll(w => !IsWindow(w.Handle) || !IsWindowVisible(w.Handle));
+            }
+        }
+
+        /// <summary>
+        /// 获取当前注册的窗口数量
+        /// </summary>
+        /// <returns>窗口数量</returns>
+        public static int GetWindowCount()
+        {
+            lock (_lockObject)
+            {
+                return _windowStack.Count;
+            }
+        }
+
+        /// <summary>
+        /// 强制刷新所有窗口的置顶状态
+        /// </summary>
+        public static void ForceRefreshAllWindows()
+        {
+            lock (_lockObject)
+            {
+                foreach (var windowInfo in _windowStack.ToList())
+                {
+                    if (windowInfo.IsTopmost && IsWindow(windowInfo.Handle))
+                    {
+                        // 强制设置窗口为置顶
+                        SetWindowPos(windowInfo.Handle, HWND_TOPMOST, 0, 0, 0, 0,
+                            SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_SHOWWINDOW | SWP_NOOWNERZORDER);
+
+                        // 确保窗口样式正确
+                        int exStyle = GetWindowLong(windowInfo.Handle, GWL_EXSTYLE);
+                        SetWindowLong(windowInfo.Handle, GWL_EXSTYLE, exStyle | WS_EX_TOPMOST);
+                    }
+                }
+            }
+        }
+    }
+}

Ink Canvas/InkCanvasForClass.csproj

@@ -128,6 +128,7 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xaml" />
     <Reference Include="UIAutomationClient" />
@@ -157,6 +158,8 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NHotkey.Wpf" Version="3.0.0" />
     <PackageReference Include="OSVersionExt" Version="3.0.0" />
+  <PackageReference Include="AForge.Video" Version="2.2.5" />
+  <PackageReference Include="AForge.Video.DirectShow" Version="2.2.5" />
   </ItemGroup>
   <ItemGroup>
     <COMReference Include="IWshRuntimeLibrary">
@@ -251,6 +254,7 @@
     <Resource Include="Resources\DeveloperAvatars\kengwang.png" />
     <Resource Include="Resources\DeveloperAvatars\STBBRD.png" />
     <Resource Include="Resources\DeveloperAvatars\WXRIW.png" />
+    <Resource Include="Resources\DeveloperAvatars\PrefacedCorg.jpg" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Icons-png\down.png" />

Ink Canvas/MainWindow.xaml

@@ -291,7 +291,7 @@
                                         </Image>
                                     </Button>
                                     
-                                    <!-- 新增：个性化设置 -->
+                                    <!-- 个性化设置 -->
                                     <Button Width="40" Height="40" Margin="0,5,0,0" Style="{StaticResource NavButton}"
                                             Click="NavTheme_Click" Tag="theme" ToolTip="个性化设置">
                                         <Image Width="24" Height="24">
@@ -306,7 +306,7 @@
                                         </Image>
                                     </Button>
                                     
-                                    <!-- 新增：快捷键设置 -->
+                                    <!-- 快捷键设置 -->
                                     <Button Width="40" Height="40" Margin="0,5,0,0" Style="{StaticResource NavButton}"
                                             Click="NavShortcuts_Click" Tag="shortcuts" ToolTip="快捷键设置">
                                         <Image Width="24" Height="24">
@@ -531,6 +531,42 @@
                                     </ui:SimpleStackPanel>
                                 </ui:SimpleStackPanel>
                             </Border>
+                            <GroupBox Name="GroupBoxModeSettings">
+                                <GroupBox.Header>
+                                    <TextBlock Margin="0,12,0,0" Text="模式设置" FontWeight="Bold" Foreground="#fafafa"
+                                               FontSize="26" />
+                                </GroupBox.Header>
+                                <ui:SimpleStackPanel Spacing="6" Margin="0,10,0,0">
+                                    <TextBlock TextWrapping="Wrap" Margin="0,0,0,10" Foreground="#fafafa">
+                                        选择软件运行模式。仅PPT模式下，软件将完全隐藏，仅在PPT放映时出现。（实验性功能，可能不稳定。）
+                                    </TextBlock>
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,0">
+                                        <TextBlock Text="正常模式" VerticalAlignment="Center" Foreground="#fafafa" 
+                                                   FontSize="14" Margin="0,0,8,0"/>
+                                        <ui:ToggleSwitch x:Name="ToggleSwitchMode" 
+                                                         OnContent="仅PPT模式" OffContent="仅PPT模式"
+                                                         IsOn="False" 
+                                                         FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                         Toggled="ToggleSwitchMode_Toggled"/>
+                                    </ui:SimpleStackPanel>
+                                </ui:SimpleStackPanel>
+                            </GroupBox>
+                            
+                            <GroupBox Name="GroupBoxNewSettings">
+                                <GroupBox.Header>
+                                    <TextBlock Margin="0,12,0,0" Text="新设置窗口" FontWeight="Bold" Foreground="#fafafa"
+                                               FontSize="26" />
+                                </GroupBox.Header>
+                                <ui:SimpleStackPanel Spacing="6" Margin="0,10,0,0">
+                                    <TextBlock TextWrapping="Wrap" Margin="0,0,0,10" Foreground="#fafafa">
+                                        打开新的设置窗口，提供更丰富的设置选项和更好的用户体验。（开发中）
+                                    </TextBlock>
+                                    <Button x:Name="BtnOpenNewSettings" Content="打开新设置窗口" 
+                                            HorizontalAlignment="Left" Click="BtnOpenNewSettings_Click" 
+                                            Padding="15,5" Margin="0,10,0,0"/>
+                                </ui:SimpleStackPanel>
+                            </GroupBox>
+                            
                             <GroupBox Name="GroupBoxPlugins">
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="插件管理" FontWeight="Bold" Foreground="#fafafa"
@@ -785,7 +821,7 @@
 
                                 </ui:SimpleStackPanel>
                             </GroupBox>
-                            <!-- 新增：崩溃后操作设置 -->
+                            <!-- 崩溃后操作设置 -->
                             <GroupBox>
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="崩溃后操作" FontWeight="Bold" Foreground="#fafafa"
@@ -963,7 +999,7 @@
                                                          IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
                                                          Toggled="ToggleSwitchHighPrecisionLineStraighten_Toggled" />
                                     </ui:SimpleStackPanel>
-                                    <TextBlock Text="# 开启后，当绘制的直线超过设定长度阈值时，将自动调整为完美直线。灵敏度范围0.05-2.0，越小要求越严格，弯曲的线条越不容易被拉直；值越大越容易识别为直线。高精度模式下，每隔10像素取一个计数点，获取更准确的平均值用于判断。" TextWrapping="Wrap" Foreground="#a1a1aa" />
+                                    <TextBlock Text="# 开启后，当绘制的直线超过设定长度阈值时，将自动调整为完美直线。灵敏度范围0.05-2.0，越小要求越严格，越弯曲的线条越不容易被拉直；值越大越容易识别为直线。高精度模式下，每隔10像素取一个计数点，获取更准确的平均值用于判断。" TextWrapping="Wrap" Foreground="#a1a1aa" />
                                     <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0"
                                           Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4" />
                                     <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
@@ -1325,6 +1361,15 @@
                                                          FontFamily="Microsoft YaHei UI" FontWeight="Bold"
                                                          Toggled="ToggleSwitchSupportPowerPoint_Toggled" />
                                     </ui:SimpleStackPanel>
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                        <Image Source="/Resources/Icons-png/Powerpoint.png" Margin="0,0,6,0" Width="28"
+                                               Height="28" VerticalAlignment="Center" />
+                                        <TextBlock Foreground="#fafafa" Text="PowerPoint 联动增强" VerticalAlignment="Center"
+                                                   FontSize="14" Margin="0,0,16,0" />
+                                        <ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchPowerPointEnhancement"
+                                                         IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                         Toggled="ToggleSwitchPowerPointEnhancement_Toggled" />
+                                    </ui:SimpleStackPanel>
                                     <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                         <Image Source="/Resources/Icons-png/WPS.png" Margin="0,0,6,0" Width="28"
                                                Height="28" VerticalAlignment="Center" />
@@ -1871,6 +1916,16 @@
                                     <TextBlock
                                         Text="# 允许开启画板时使用手指手势进行幻灯片翻页（启用后，在幻灯片放映模式下，当画板无墨迹时，使用手指（笔尖或手掌无法识别）左右滑动即可控制幻灯片翻页。）"
                                         TextWrapping="Wrap" Foreground="#a1a1aa" />
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                        <TextBlock Foreground="#fafafa" Text="PPT 放映模式显示手势按钮" VerticalAlignment="Center"
+                                                   FontSize="14" Margin="0,0,16,0" />
+                                        <ui:ToggleSwitch OnContent="" OffContent=""
+                                                         Name="ToggleSwitchShowGestureButtonInSlideShow" IsOn="False"
+                                                         FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                         Toggled="ToggleSwitchShowGestureButtonInSlideShow_Toggled" />
+                                    </ui:SimpleStackPanel>
+                                    <TextBlock Text="# 开启后在 PPT 放映模式下也显示手势按钮" TextWrapping="Wrap"
+                                               Foreground="#a1a1aa" />
                                     <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
                                           StrokeThickness="1" Margin="0,4,0,4" />
                                     <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
@@ -1903,6 +1958,8 @@
                                                          FontFamily="Microsoft YaHei UI" FontWeight="Bold"
                                                          Toggled="ToggleSwitchNotifyPreviousPage_Toggled" />
                                     </ui:SimpleStackPanel>
+                                    <TextBlock Text="#开启后会记录上次播放的页数，点击“是”后会在进入放映状态时自动跳转"
+                                               TextWrapping="Wrap" Foreground="#a1a1aa" />
                                     <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                         <TextBlock Foreground="#fafafa" Text="进入放映时回到首页" VerticalAlignment="Center"
                                                    FontSize="14" Margin="0,0,16,0" />
@@ -2543,6 +2600,15 @@
                                                          FontFamily="Microsoft YaHei UI" FontWeight="Bold"
                                                          Toggled="ToggleSwitchAutoFoldInPPTSlideShow_Toggled" />
                                     </ui:SimpleStackPanel>
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                        <TextBlock Foreground="#fafafa" Text="软件退出后保持收纳模式"
+                                                   VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
+                                        <ui:ToggleSwitch OnContent="" OffContent=""
+                                                         Name="ToggleSwitchKeepFoldAfterSoftwareExit"
+                                                         IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                         Toggled="ToggleSwitchKeepFoldAfterSoftwareExit_Toggled" />
+                                    </ui:SimpleStackPanel>
+                                    <TextBlock Text="# 开启后，执行自动收纳的软件在软件退出后不退出收纳模式，保持收纳状态" TextWrapping="Wrap" Foreground="#a1a1aa" />
                                     <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
                                           StrokeThickness="1" Margin="0,4,0,4" />
                                     <TextBlock Margin="0,0,0,8" Text="自动查杀" FontWeight="Bold" Foreground="#fafafa"
@@ -2659,6 +2725,246 @@
                                     </ui:SimpleStackPanel>
                                     <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
                                           StrokeThickness="1" Margin="0,4,0,4" />
+                                    <TextBlock Text="文件关联管理" FontWeight="Bold" Foreground="#fafafa"
+                                               FontSize="16" Margin="0,8,0,8" />
+                                    <TextBlock Text="管理.icstk文件的关联设置，双击.icstk文件可直接在Ink Canvas中打开" 
+                                               TextWrapping="Wrap" Foreground="#a1a1aa" Margin="0,0,0,8" />
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,0,0,8">
+                                        <Button Name="BtnUnregisterFileAssociation" Content="取消文件关联" 
+                                                Padding="12,6" Margin="0,0,8,0" Click="BtnUnregisterFileAssociation_Click"
+                                                Background="#FFDC3545" Foreground="White" BorderBrush="#FFBD2130" 
+                                                FontFamily="Microsoft YaHei UI" FontSize="12" />
+                                        <Button Name="BtnCheckFileAssociation" Content="检查关联状态" 
+                                                Padding="12,6" Margin="0,0,8,0" Click="BtnCheckFileAssociation_Click"
+                                                Background="#FF17A2B8" Foreground="White" BorderBrush="#FF138496" 
+                                                FontFamily="Microsoft YaHei UI" FontSize="12" />
+                                        <Button Name="BtnRegisterFileAssociation" Content="重新注册关联" 
+                                                Padding="12,6" Click="BtnRegisterFileAssociation_Click"
+                                                Background="#FF28A745" Foreground="White" BorderBrush="#FF1E7E34" 
+                                                FontFamily="Microsoft YaHei UI" FontSize="12" />
+                                    </ui:SimpleStackPanel>
+                                    <TextBlock Name="TextBlockFileAssociationStatus" Text="" 
+                                               Foreground="#a1a1aa" FontSize="12" Margin="0,4,0,0" />
+                                    
+                                    <!-- 悬浮窗拦截功能 -->
+                                    <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
+                                          StrokeThickness="1" Margin="0,8,0,8" />
+                                    <TextBlock Text="悬浮窗拦截" FontWeight="Bold" Foreground="#fafafa"
+                                               FontSize="16" Margin="0,8,0,8" />
+                                    <TextBlock Text="自动检测并隐藏教育软件的悬浮窗，保持桌面整洁" 
+                                               TextWrapping="Wrap" Foreground="#a1a1aa" Margin="0,0,0,8" />
+                                    
+                                    <!-- 主控制开关 -->
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,0,0,8">
+                                        <TextBlock Foreground="#fafafa" Text="启用悬浮窗拦截" VerticalAlignment="Center"
+                                                   FontSize="14" Margin="0,0,16,0" />
+                                        <ui:ToggleSwitch OnContent="" OffContent=""
+                                                         Name="ToggleSwitchFloatingWindowInterceptorEnabled" IsOn="False"
+                                                         FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                         Toggled="ToggleSwitchFloatingWindowInterceptorEnabled_Toggled" />
+                                    </ui:SimpleStackPanel>
+                                    
+                                    <!-- 拦截规则网格 -->
+                                    <Grid Name="FloatingWindowInterceptorGrid" Margin="4,0" Visibility="Collapsed">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition />
+                                            <RowDefinition />
+                                            <RowDefinition />
+                                            <RowDefinition />
+                                        </Grid.RowDefinitions>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition />
+                                            <ColumnDefinition />
+                                            <ColumnDefinition />
+                                            <ColumnDefinition />
+                                        </Grid.ColumnDefinitions>
+                                        
+                                        <!-- 希沃白板3 -->
+                                        <ui:SimpleStackPanel Grid.Row="0" Grid.Column="0" Orientation="Vertical">
+                                            <Image Source="/Resources/Icons-png/EasiNote3.png" Margin="0,0,0,4"
+                                                   Width="42" Height="42" HorizontalAlignment="Center" />
+                                            <TextBlock Foreground="#fafafa" Text="希沃白板3" HorizontalAlignment="Center"
+                                                       FontSize="14" Margin="0,0,0,4" />
+                                            <ui:ToggleSwitch OnContent="" OffContent="" MinWidth="0"
+                                                             HorizontalAlignment="Center"
+                                                             Name="ToggleSwitchSeewoWhiteboard3Floating" IsOn="True"
+                                                             FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                             Toggled="ToggleSwitchSeewoWhiteboard3Floating_Toggled"
+                                                             Width="40" />
+                                        </ui:SimpleStackPanel>
+                                        
+                                        <!-- 希沃白板5 -->
+                                        <ui:SimpleStackPanel Grid.Row="0" Grid.Column="1" Orientation="Vertical">
+                                            <Image Source="/Resources/Icons-png/EasiNote.png" Margin="0,0,0,4"
+                                                   Width="42" Height="42" HorizontalAlignment="Center" />
+                                            <TextBlock Foreground="#fafafa" Text="希沃白板5" HorizontalAlignment="Center"
+                                                       FontSize="14" Margin="0,0,0,4" />
+                                            <ui:ToggleSwitch OnContent="" OffContent="" MinWidth="0"
+                                                             HorizontalAlignment="Center"
+                                                             Name="ToggleSwitchSeewoWhiteboard5Floating" IsOn="True"
+                                                             FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                             Toggled="ToggleSwitchSeewoWhiteboard5Floating_Toggled"
+                                                             Width="40" />
+                                        </ui:SimpleStackPanel>
+                                        
+                                        <!-- 希沃白板5C -->
+                                        <ui:SimpleStackPanel Grid.Row="0" Grid.Column="2" Orientation="Vertical">
+                                            <Image Source="/Resources/Icons-png/EasiNote5C.png" Margin="0,0,0,4"
+                                                   Width="42" Height="42" HorizontalAlignment="Center" />
+                                            <TextBlock Foreground="#fafafa" Text="希沃白板5C" HorizontalAlignment="Center"
+                                                       FontSize="14" Margin="0,0,0,4" />
+                                            <ui:ToggleSwitch OnContent="" OffContent="" MinWidth="0"
+                                                             HorizontalAlignment="Center"
+                                                             Name="ToggleSwitchSeewoWhiteboard5CFloating" IsOn="True"
+                                                             FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                             Toggled="ToggleSwitchSeewoWhiteboard5CFloating_Toggled"
+                                                             Width="40" />
+                                        </ui:SimpleStackPanel>
+                                        
+                                        <!-- 希沃品课 -->
+                                        <ui:SimpleStackPanel Grid.Row="0" Grid.Column="3" Orientation="Vertical">
+                                            <Image Source="/Resources/Icons-png/SeewoPinco.png" Margin="0,0,0,4"
+                                                   Width="42" Height="42" HorizontalAlignment="Center" />
+                                            <TextBlock Foreground="#fafafa" Text="希沃品课" HorizontalAlignment="Center"
+                                                       FontSize="14" Margin="0,0,0,4" />
+                                            <ui:ToggleSwitch OnContent="" OffContent="" MinWidth="0"
+                                                             HorizontalAlignment="Center"
+                                                             Name="ToggleSwitchSeewoPincoSideBarFloating" IsOn="True"
+                                                             FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                             Toggled="ToggleSwitchSeewoPincoSideBarFloating_Toggled"
+                                                             Width="40" />
+                                        </ui:SimpleStackPanel>
+                                        
+                                        <!-- 希沃品课画笔 -->
+                                        <ui:SimpleStackPanel Grid.Row="1" Grid.Column="0" Orientation="Vertical">
+                                            <Image Source="/Resources/Icons-png/SeewoPinco.png" Margin="0,0,0,4"
+                                                   Width="42" Height="42" HorizontalAlignment="Center" />
+                                            <TextBlock Foreground="#fafafa" Text="希沃品课画笔" HorizontalAlignment="Center"
+                                                       FontSize="14" Margin="0,0,0,4" />
+                                            <ui:ToggleSwitch OnContent="" OffContent="" MinWidth="0"
+                                                             HorizontalAlignment="Center"
+                                                             Name="ToggleSwitchSeewoPincoDrawingFloating" IsOn="True"
+                                                             FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                             Toggled="ToggleSwitchSeewoPincoDrawingFloating_Toggled"
+                                                             Width="40" />
+                                        </ui:SimpleStackPanel>
+                                        
+                                        <!-- 希沃PPT小工具 -->
+                                        <ui:SimpleStackPanel Grid.Row="1" Grid.Column="1" Orientation="Vertical">
+                                            <Image Source="/Resources/Icons-png/PPTTools.png" Margin="0,0,0,4"
+                                                   Width="42" Height="42" HorizontalAlignment="Center" />
+                                            <TextBlock Foreground="#fafafa" Text="希沃PPT小工具" HorizontalAlignment="Center"
+                                                       FontSize="14" Margin="0,0,0,4" />
+                                            <ui:ToggleSwitch OnContent="" OffContent="" MinWidth="0"
+                                                             HorizontalAlignment="Center"
+                                                             Name="ToggleSwitchSeewoPPTFloating" IsOn="True"
+                                                             FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                             Toggled="ToggleSwitchSeewoPPTFloating_Toggled"
+                                                             Width="40" />
+                                        </ui:SimpleStackPanel>
+                                        
+                                        <!-- AiClass -->
+                                        <ui:SimpleStackPanel Grid.Row="1" Grid.Column="2" Orientation="Vertical">
+                                            <Image Source="/Resources/Icons-png/AiClass.png" Margin="0,0,0,4"
+                                                   Width="42" Height="42" HorizontalAlignment="Center" />
+                                            <TextBlock Foreground="#fafafa" Text="AiClass" HorizontalAlignment="Center"
+                                                       FontSize="14" Margin="0,0,0,4" />
+                                            <ui:ToggleSwitch OnContent="" OffContent="" MinWidth="0"
+                                                             HorizontalAlignment="Center"
+                                                             Name="ToggleSwitchAiClassFloating" IsOn="True"
+                                                             FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                             Toggled="ToggleSwitchAiClassFloating_Toggled"
+                                                             Width="40" />
+                                        </ui:SimpleStackPanel>
+                                        
+                                        <!-- 鸿合屏幕书写 -->
+                                        <ui:SimpleStackPanel Grid.Row="1" Grid.Column="3" Orientation="Vertical">
+                                            <Image Source="/Resources/Icons-png/HiteAnnotation.png" Margin="0,0,0,4"
+                                                   Width="42" Height="42" HorizontalAlignment="Center" />
+                                            <TextBlock Foreground="#fafafa" Text="鸿合屏幕书写" HorizontalAlignment="Center"
+                                                       FontSize="14" Margin="0,0,0,4" />
+                                            <ui:ToggleSwitch OnContent="" OffContent="" MinWidth="0"
+                                                             HorizontalAlignment="Center"
+                                                             Name="ToggleSwitchHiteAnnotationFloating" IsOn="True"
+                                                             FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                             Toggled="ToggleSwitchHiteAnnotationFloating_Toggled"
+                                                             Width="40" />
+                                        </ui:SimpleStackPanel>
+                                        
+                                        <!-- 畅言智慧课堂 -->
+                                        <ui:SimpleStackPanel Grid.Row="2" Grid.Column="0" Orientation="Vertical">
+                                            <Image Source="/Resources/Icons-png/ChangYan.png" Margin="0,0,0,4"
+                                                   Width="42" Height="42" HorizontalAlignment="Center" />
+                                            <TextBlock Foreground="#fafafa" Text="畅言智慧课堂" HorizontalAlignment="Center"
+                                                       FontSize="14" Margin="0,0,0,4" />
+                                            <ui:ToggleSwitch OnContent="" OffContent="" MinWidth="0"
+                                                             HorizontalAlignment="Center"
+                                                             Name="ToggleSwitchChangYanFloating" IsOn="True"
+                                                             FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                             Toggled="ToggleSwitchChangYanFloating_Toggled"
+                                                             Width="40" />
+                                        </ui:SimpleStackPanel>
+                                        
+                                        <!-- 畅言PPT -->
+                                        <ui:SimpleStackPanel Grid.Row="2" Grid.Column="1" Orientation="Vertical">
+                                            <Image Source="/Resources/Icons-png/ChangYanPPT.png" Margin="0,0,0,4"
+                                                   Width="42" Height="42" HorizontalAlignment="Center" />
+                                            <TextBlock Foreground="#fafafa" Text="畅言PPT" HorizontalAlignment="Center"
+                                                       FontSize="14" Margin="0,0,0,4" />
+                                            <ui:ToggleSwitch OnContent="" OffContent="" MinWidth="0"
+                                                             HorizontalAlignment="Center"
+                                                             Name="ToggleSwitchChangYanPptFloating" IsOn="True"
+                                                             FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                             Toggled="ToggleSwitchChangYanPptFloating_Toggled"
+                                                             Width="40" />
+                                        </ui:SimpleStackPanel>
+                                        
+                                        <!-- 天喻教育云 -->
+                                        <ui:SimpleStackPanel Grid.Row="2" Grid.Column="2" Orientation="Vertical">
+                                            <Image Source="/Resources/Icons-png/IntelligentClass.png" Margin="0,0,0,4"
+                                                   Width="42" Height="42" HorizontalAlignment="Center" />
+                                            <TextBlock Foreground="#fafafa" Text="天喻教育云" HorizontalAlignment="Center"
+                                                       FontSize="14" Margin="0,0,0,4" />
+                                            <ui:ToggleSwitch OnContent="" OffContent="" MinWidth="0"
+                                                             HorizontalAlignment="Center"
+                                                             Name="ToggleSwitchIntelligentClassFloating" IsOn="True"
+                                                             FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                             Toggled="ToggleSwitchIntelligentClassFloating_Toggled"
+                                                             Width="40" />
+                                        </ui:SimpleStackPanel>
+                                        
+                                        <!-- 希沃桌面画笔 -->
+                                        <ui:SimpleStackPanel Grid.Row="2" Grid.Column="3" Orientation="Vertical">
+                                            <Image Source="/Resources/Icons-png/SeewoDesktop.png" Margin="0,0,0,4"
+                                                   Width="42" Height="42" HorizontalAlignment="Center" />
+                                            <TextBlock Foreground="#fafafa" Text="希沃桌面画笔" HorizontalAlignment="Center"
+                                                       FontSize="14" Margin="0,0,0,4" />
+                                            <ui:ToggleSwitch OnContent="" OffContent="" MinWidth="0"
+                                                             HorizontalAlignment="Center"
+                                                             Name="ToggleSwitchSeewoDesktopAnnotationFloating" IsOn="True"
+                                                             FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                             Toggled="ToggleSwitchSeewoDesktopAnnotationFloating_Toggled"
+                                                             Width="40" />
+                                        </ui:SimpleStackPanel>
+                                        
+                                        <!-- 希沃桌面侧栏 -->
+                                        <ui:SimpleStackPanel Grid.Row="3" Grid.Column="0" Orientation="Vertical">
+                                            <Image Source="/Resources/Icons-png/SeewoDesktop.png" Margin="0,0,0,4"
+                                                   Width="42" Height="42" HorizontalAlignment="Center" />
+                                            <TextBlock Foreground="#fafafa" Text="希沃桌面侧栏" HorizontalAlignment="Center"
+                                                       FontSize="14" Margin="0,0,0,4" />
+                                            <ui:ToggleSwitch OnContent="" OffContent="" MinWidth="0"
+                                                             HorizontalAlignment="Center"
+                                                             Name="ToggleSwitchSeewoDesktopSideBarFloating" IsOn="True"
+                                                             FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                             Toggled="ToggleSwitchSeewoDesktopSideBarFloating_Toggled"
+                                                             Width="40" />
+                                        </ui:SimpleStackPanel>
+                                    </Grid>
+                                    <!-- 状态信息 -->
+                                    <TextBlock Name="TextBlockFloatingWindowInterceptorStatus" Text="拦截器未启动" 
+                                               Foreground="#a1a1aa" FontSize="12" Margin="0,4,0,0" />
+                                    
                                     <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                         <TextBlock Foreground="#fafafa" Text="清屏时自动截图" VerticalAlignment="Center"
                                                    FontSize="14" Margin="0,0,16,0" />
@@ -2842,13 +3148,24 @@
                                                          Toggled="ToggleSwitchShowRandomAndSingleDraw_Toggled" />
                                     </ui:SimpleStackPanel>
                                     <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                        <TextBlock Foreground="#fafafa" Text="直接调用Ci点名"
+                                        <TextBlock Foreground="#fafafa" Text="直接调用外部点名"
                                                    VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
                                         <ui:ToggleSwitch OnContent="" OffContent=""
-                                                         Name="ToggleSwitchDirectCallCiRand"
+                                                         Name="ToggleSwitchExternalCaller"
                                                          IsOn="False" FontFamily="Microsoft YaHei UI" 
                                                          FontWeight="Bold" 
-                                                         Toggled="ToggleSwitchDirectCallCiRand_Toggled" />
+                                                         Toggled="ToggleSwitchExternalCaller_Toggled" />
+                                    </ui:SimpleStackPanel>
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,8,0,0">
+                                        <TextBlock Foreground="#fafafa" Text="点名类型"
+                                                   VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
+                                        <ComboBox Name="ComboBoxExternalCallerType" Width="150" Height="30" 
+                                                  IsEditable="False" IsReadOnly="True" SelectedIndex="0"
+                                                  SelectionChanged="ComboBoxExternalCallerType_SelectionChanged">
+                                            <ComboBoxItem>ClassIsland点名</ComboBoxItem>
+                                            <ComboBoxItem>SecRandom点名</ComboBoxItem>
+                                            <ComboBoxItem>NamePicker点名</ComboBoxItem>
+                                        </ComboBox>
                                     </ui:SimpleStackPanel>
                                     <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0"
                                           Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4" />
@@ -3220,6 +3537,21 @@
                                                 Alan-CRL
                                             </TextBlock>
                                         </ui:SimpleStackPanel>
+                                        <ui:SimpleStackPanel Grid.Column="3" Grid.Row="2" Orientation="Vertical"
+                                                             Margin="0,16,0,0">
+                                            <Image Source="/Resources/DeveloperAvatars/PrefacedCorg.jpg"
+                                                   VerticalAlignment="Center" HorizontalAlignment="Center"
+                                                   RenderOptions.BitmapScalingMode="HighQuality" Width="48"
+                                                   Margin="0,0,0,6" Height="48">
+                                                <Image.Clip>
+                                                    <EllipseGeometry Center="24,24" RadiusX="24" RadiusY="24" />
+                                                </Image.Clip>
+                                            </Image>
+                                            <TextBlock Margin="0,0,0,2" VerticalAlignment="Center"
+                                                       HorizontalAlignment="Center" FontSize="12" Foreground="White">
+                                                PrefacedCorg
+                                            </TextBlock>
+                                        </ui:SimpleStackPanel>
                                     </Grid>
                                     <ui:SimpleStackPanel Spacing="3" Orientation="Vertical">
                                         <TextBlock
@@ -3322,16 +3654,54 @@
         <Grid Visibility="{Binding ElementName=inkCanvas, Path=Visibility}">
             <Grid Name="GridInkCanvasSelectionCover"
                   MouseDown="GridInkCanvasSelectionCover_MouseDown"
+                  MouseMove="GridInkCanvasSelectionCover_MouseMove"
                   MouseUp="GridInkCanvasSelectionCover_MouseUp"
                   IsManipulationEnabled="True"
                   ManipulationStarting="GridInkCanvasSelectionCover_ManipulationStarting"
                   ManipulationCompleted="GridInkCanvasSelectionCover_ManipulationCompleted"
                   ManipulationDelta="GridInkCanvasSelectionCover_ManipulationDelta"
-                  PreviewTouchDown="GridInkCanvasSelectionCover_PreviewTouchDown"
-                  PreviewTouchUp="GridInkCanvasSelectionCover_PreviewTouchUp"
-                  TouchDown="GridInkCanvasSelectionCover_TouchDown"
-                  TouchUp="GridInkCanvasSelectionCover_TouchUp"
-                  Background="#01FFFFFF" Opacity="0.01" Visibility="Visible" Margin="1,0,-1,0" />
+            PreviewTouchDown="GridInkCanvasSelectionCover_PreviewTouchDown"
+            PreviewTouchUp="GridInkCanvasSelectionCover_PreviewTouchUp"
+            PreviewTouchMove="GridInkCanvasSelectionCover_PreviewTouchMove"
+            TouchDown="GridInkCanvasSelectionCover_TouchDown"
+            TouchUp="GridInkCanvasSelectionCover_TouchUp"
+            TouchMove="GridInkCanvasSelectionCover_TouchMove"
+                  Background="#01FFFFFF" Opacity="0.01" Visibility="Visible" Margin="1,0,-1,0">
+                
+                <!-- 选择框 -->
+                <Rectangle Name="SelectionRectangle"
+                           Stroke="Blue"
+                           StrokeThickness="2"
+                           StrokeDashArray="5,5"
+                           Fill="Transparent"
+                           Visibility="Collapsed"
+                           IsHitTestVisible="False"
+                           HorizontalAlignment="Left"
+                           VerticalAlignment="Top" />
+                
+                <!-- 选择点容器 -->
+                <Canvas Name="SelectionHandlesCanvas" Visibility="Collapsed">
+                    <!-- 四个角选择点 -->
+                    <Rectangle Name="TopLeftHandle" Width="8" Height="8" Fill="LightBlue" Stroke="Blue" StrokeThickness="1" 
+                               Cursor="SizeNWSE" MouseDown="SelectionHandle_MouseDown" MouseMove="SelectionHandle_MouseMove" MouseUp="SelectionHandle_MouseUp" />
+                    <Rectangle Name="TopRightHandle" Width="8" Height="8" Fill="LightBlue" Stroke="Blue" StrokeThickness="1" 
+                               Cursor="SizeNESW" MouseDown="SelectionHandle_MouseDown" MouseMove="SelectionHandle_MouseMove" MouseUp="SelectionHandle_MouseUp" />
+                    <Rectangle Name="BottomLeftHandle" Width="8" Height="8" Fill="LightBlue" Stroke="Blue" StrokeThickness="1" 
+                               Cursor="SizeNESW" MouseDown="SelectionHandle_MouseDown" MouseMove="SelectionHandle_MouseMove" MouseUp="SelectionHandle_MouseUp" />
+                    <Rectangle Name="BottomRightHandle" Width="8" Height="8" Fill="LightBlue" Stroke="Blue" StrokeThickness="1" 
+                               Cursor="SizeNWSE" MouseDown="SelectionHandle_MouseDown" MouseMove="SelectionHandle_MouseMove" MouseUp="SelectionHandle_MouseUp" />
+                    
+                    <!-- 四个边选择点 -->
+                    <Rectangle Name="TopHandle" Width="8" Height="8" Fill="LightBlue" Stroke="Blue" StrokeThickness="1" 
+                               Cursor="SizeNS" MouseDown="SelectionHandle_MouseDown" MouseMove="SelectionHandle_MouseMove" MouseUp="SelectionHandle_MouseUp" />
+                    <Rectangle Name="BottomHandle" Width="8" Height="8" Fill="LightBlue" Stroke="Blue" StrokeThickness="1" 
+                               Cursor="SizeNS" MouseDown="SelectionHandle_MouseDown" MouseMove="SelectionHandle_MouseMove" MouseUp="SelectionHandle_MouseUp" />
+                    <Rectangle Name="LeftHandle" Width="8" Height="8" Fill="LightBlue" Stroke="Blue" StrokeThickness="1" 
+                               Cursor="SizeWE" MouseDown="SelectionHandle_MouseDown" MouseMove="SelectionHandle_MouseMove" MouseUp="SelectionHandle_MouseUp" />
+                    <Rectangle Name="RightHandle" Width="8" Height="8" Fill="LightBlue" Stroke="Blue" StrokeThickness="1" 
+                               Cursor="SizeWE" MouseDown="SelectionHandle_MouseDown" MouseMove="SelectionHandle_MouseMove" MouseUp="SelectionHandle_MouseUp" />
+                </Canvas>
+            </Grid>
             <Border Name="BorderStrokeSelectionControl"
                     HorizontalAlignment="Left" VerticalAlignment="Top" Margin="800,900,0,0"
                     CornerRadius="5" Height="80"

Ink Canvas/MainWindow.xaml.cs

@@ -1,3 +1,9 @@
+using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers.Plugins;
+using Ink_Canvas.Windows;
+using iNKORE.UI.WPF.Modern;
+using iNKORE.UI.WPF.Modern.Controls;
+using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -10,18 +16,13 @@ using System.Threading;
 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.Threading;
-using Ink_Canvas.Helpers;
-using Ink_Canvas.Helpers.Plugins;
-using Ink_Canvas.Windows;
-using iNKORE.UI.WPF.Modern;
-using iNKORE.UI.WPF.Modern.Controls;
-using Microsoft.Win32;
 using Application = System.Windows.Application;
 using Brushes = System.Windows.Media.Brushes;
 using Button = System.Windows.Controls.Button;
@@ -30,25 +31,31 @@ using Cursors = System.Windows.Input.Cursors;
 using DpiChangedEventArgs = System.Windows.DpiChangedEventArgs;
 using File = System.IO.File;
 using GroupBox = System.Windows.Controls.GroupBox;
-using MessageBox = System.Windows.MessageBox;
+using MessageBox = iNKORE.UI.WPF.Modern.Controls.MessageBox;
 using Point = System.Windows.Point;
 
 namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
-        // 新增：每一页一个Canvas对象
+        // 每一页一个Canvas对象
         private List<System.Windows.Controls.Canvas> whiteboardPages = new List<System.Windows.Controls.Canvas>();
         private int currentPageIndex;
         private System.Windows.Controls.Canvas currentCanvas;
         private AutoUpdateHelper.UpdateLineGroup AvailableLatestLineGroup;
-        
+
         // 全局快捷键管理器
         private GlobalHotkeyManager _globalHotkeyManager;
 
         // 墨迹渐隐管理器
         private InkFadeManager _inkFadeManager;
 
+        // 悬浮窗拦截管理器
+        private FloatingWindowInterceptorManager _floatingWindowInterceptorManager;
+
+        // 设置面板相关状态
+        private bool userChangedNoFocusModeInSettings;
+
 
 
         #region Window Initialization
@@ -239,13 +246,16 @@ namespace Ink_Canvas
             // 初始化窗口置顶开关
             ToggleSwitchAlwaysOnTop.IsOn = Settings.Advanced.IsAlwaysOnTop;
             ApplyAlwaysOnTop();
-            
+
             // 添加窗口激活事件处理，确保置顶状态在窗口重新激活时得到保持
             Activated += Window_Activated;
             Deactivated += Window_Deactivated;
-            
+
             // 为浮动栏按钮添加触摸事件支持
             AddTouchSupportToFloatingBarButtons();
+
+            // 为滑块控件添加触摸事件支持
+            AddTouchSupportToSliders();
         }
 
 
@@ -296,7 +306,10 @@ namespace Ink_Canvas
             {
                 foreach (var gest in gestures)
                     //Trace.WriteLine(string.Format("Gesture: {0}, Confidence: {1}", gest.ApplicationGesture, gest.RecognitionConfidence));
-                    if (StackPanelPPTControls.Visibility == Visibility.Visible)
+                    // 只有在PPT放映模式下才响应翻页手势
+                    if (StackPanelPPTControls.Visibility == Visibility.Visible &&
+                        BtnPPTSlideShowEnd.Visibility == Visibility.Visible &&
+                        PPTManager?.IsInSlideShow == true)
                     {
                         if (gest.ApplicationGesture == ApplicationGesture.Left)
                         {
@@ -370,7 +383,7 @@ namespace Ink_Canvas
         #region Definations and Loading
 
         public static Settings Settings = new Settings();
-        public static string settingsFileName = "Settings.json";
+        public static string settingsFileName = Path.Combine("Configs", "Settings.json");
         private bool isLoaded;
         private bool forcePointEraser;
 
@@ -404,7 +417,7 @@ namespace Ink_Canvas
                 }
                 if (needFix)
                 {
-                    string newPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "saves");
+                    string newPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Saves");
                     Settings.Automation.AutoSavedStrokesLocation = newPath;
                     if (!Directory.Exists(newPath))
                         Directory.CreateDirectory(newPath);
@@ -435,6 +448,12 @@ namespace Ink_Canvas
                 StartPPTMonitoring();
             }
 
+            // 如果启用PowerPoint联动增强功能，启动进程守护
+            if (Settings.PowerPointSettings.EnablePowerPointEnhancement)
+            {
+                StartPowerPointProcessMonitoring();
+            }
+
             // HasNewUpdateWindow hasNewUpdateWindow = new HasNewUpdateWindow();
             if (Environment.Is64BitProcess) GroupBoxInkRecognition.Visibility = Visibility.Collapsed;
 
@@ -517,12 +536,35 @@ namespace Ink_Canvas
 
             // 初始化剪贴板监控
             InitializeClipboardMonitoring();
-            
+
+            // 初始化悬浮窗拦截管理器
+            InitializeFloatingWindowInterceptor();
+
             // 初始化全局快捷键管理器
             InitializeGlobalHotkeyManager();
 
             // 初始化墨迹渐隐管理器
             InitializeInkFadeManager();
+
+            // 处理命令行参数中的文件路径
+            HandleCommandLineFileOpen();
+
+            // 初始化文件关联状态显示
+            InitializeFileAssociationStatus();
+
+            // 检查模式设置并应用
+            CheckMainWindowVisibility();
+
+            // 检查是否通过--board参数启动，如果是则自动切换到白板模式
+            if (App.StartWithBoardMode)
+            {
+                LogHelper.WriteLogToFile("检测到--board参数，自动切换到白板模式", LogHelper.LogType.Event);
+                // 延迟执行，确保UI已完全加载
+                Dispatcher.BeginInvoke(new Action(() =>
+                {
+                    SwitchToBoardMode();
+                }), DispatcherPriority.Loaded);
+            }
         }
 
         private void SystemEventsOnDisplaySettingsChanged(object sender, EventArgs e)
@@ -651,7 +693,7 @@ namespace Ink_Canvas
             // 清理剪贴板监控
             CleanupClipboardMonitoring();
             ClipboardNotification.Stop();
-            
+
             // 清理全局快捷键管理器
             if (_globalHotkeyManager != null)
             {
@@ -669,6 +711,9 @@ namespace Ink_Canvas
             // 停止置顶维护定时器
             StopTopmostMaintenance();
 
+            // 从Z-Order管理器中移除主窗口
+            WindowZOrderManager.UnregisterWindow(this);
+
             LogHelper.WriteLogToFile("Ink Canvas closed", LogHelper.LogType.Event);
 
             // 检查是否有待安装的更新
@@ -1007,12 +1052,16 @@ namespace Ink_Canvas
                 // 如果当前有选中的元素，取消选中状态
                 if (currentSelectedElement != null)
                 {
-                    // 保存当前编辑模式
-                    var previousEditingMode = inkCanvas.EditingMode;
+                    // 取消选中元素
                     UnselectElement(currentSelectedElement);
-                    // 恢复编辑模式
-                    inkCanvas.EditingMode = previousEditingMode;
                     currentSelectedElement = null;
+
+                    // 重置为选择模式，确保用户可以继续选择其他元素
+                    SetCurrentToolMode(InkCanvasEditingMode.Select);
+                    // 更新模式缓存
+                    UpdateCurrentToolMode("select");
+                    // 刷新浮动栏高光显示
+                    SetFloatingBarHighlightPosition("select");
                 }
             }
         }
@@ -1586,6 +1635,22 @@ namespace Ink_Canvas
         }
         #endregion 插件???
 
+        #region 新设置窗口
+
+        // 添加打开新设置窗口按钮点击事件
+        private void BtnOpenNewSettings_Click(object sender, RoutedEventArgs e)
+        {
+            if (isOpeningOrHidingSettingsPane) return;
+            HideSubPanels();
+            {
+                var settingsWindow = new SettingsWindow();
+                settingsWindow.Owner = this;
+                settingsWindow.ShowDialog();
+            }
+        }
+
+        #endregion 新设置窗口
+
         // 在MainWindow类中添加：
         private void ApplyCurrentEraserShape()
         {
@@ -1679,7 +1744,7 @@ namespace Ink_Canvas
         [DllImport("kernel32.dll")]
         private static extern uint GetCurrentProcessId();
 
-        
+
         private const int GWL_EXSTYLE = -20;
         private const int WS_EX_NOACTIVATE = 0x08000000;
         private const int WS_EX_TOPMOST = 0x00000008;
@@ -1718,16 +1783,16 @@ namespace Ink_Canvas
                 {
                     // 先设置WPF的Topmost属性
                     Topmost = true;
-                    
+
                     // 使用更强的Win32 API调用来确保置顶
                     // 1. 设置窗口样式为置顶
                     int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
                     SetWindowLong(hwnd, GWL_EXSTYLE, exStyle | WS_EX_TOPMOST);
-                    
+
                     // 2. 使用SetWindowPos确保窗口在最顶层
-                    SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, 
+                    SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0,
                         SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_SHOWWINDOW | SWP_NOOWNERZORDER);
-                    
+
                     // 3. 如果启用了无焦点模式，需要特殊处理
                     if (Settings.Advanced.IsNoFocusMode)
                     {
@@ -1744,18 +1809,18 @@ namespace Ink_Canvas
                 {
                     // 取消置顶时
                     // 1. 先使用Win32 API取消置顶
-                    SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, 
+                    SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0,
                         SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_SHOWWINDOW | SWP_NOOWNERZORDER);
-                    
+
                     // 2. 移除置顶窗口样式
                     int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
                     SetWindowLong(hwnd, GWL_EXSTYLE, exStyle & ~WS_EX_TOPMOST);
-                    
+
                     // 3. 停止置顶维护定时器
                     StopTopmostMaintenance();
-                    
+
                     // 注意：这里不直接设置Topmost，让其他代码根据模式决定
-                    
+
                     // 添加调试日志
                     LogHelper.WriteLogToFile("应用窗口置顶: 取消置顶", LogHelper.LogType.Trace);
                 }
@@ -1772,14 +1837,14 @@ namespace Ink_Canvas
         private void StartTopmostMaintenance()
         {
             if (isTopmostMaintenanceEnabled) return;
-            
+
             if (topmostMaintenanceTimer == null)
             {
                 topmostMaintenanceTimer = new DispatcherTimer();
                 topmostMaintenanceTimer.Interval = TimeSpan.FromMilliseconds(500); // 每500ms检查一次
                 topmostMaintenanceTimer.Tick += TopmostMaintenanceTimer_Tick;
             }
-            
+
             topmostMaintenanceTimer.Start();
             isTopmostMaintenanceEnabled = true;
             LogHelper.WriteLogToFile("启动置顶维护定时器", LogHelper.LogType.Trace);
@@ -1820,24 +1885,24 @@ namespace Ink_Canvas
                     return;
                 }
 
-                // 检查是否有子窗口打开（模态对话框）
+                // 检查是否有子窗口在前景
                 var foregroundWindow = GetForegroundWindow();
                 if (foregroundWindow != hwnd)
                 {
                     // 检查前景窗口是否是当前应用程序的子窗口
                     var foregroundWindowProcessId = GetWindowThreadProcessId(foregroundWindow, out uint processId);
                     var currentProcessId = GetCurrentProcessId();
-                    
+
                     if (processId == currentProcessId)
                     {
                         // 如果有子窗口在前景，暂停置顶维护
                         return;
                     }
-                    
+
                     // 如果窗口不在最顶层且没有子窗口，重新设置置顶
-                    SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, 
+                    SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0,
                         SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_SHOWWINDOW | SWP_NOOWNERZORDER);
-                    
+
                     // 确保窗口样式正确
                     int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
                     if ((exStyle & WS_EX_TOPMOST) == 0)
@@ -1882,12 +1947,18 @@ namespace Ink_Canvas
             Settings.Advanced.IsNoFocusMode = toggle != null && toggle.IsOn;
             SaveSettingsToFile();
             ApplyNoFocusMode();
-            
+
             // 如果启用了窗口置顶，需要重新应用置顶设置以处理无焦点模式的变化
             if (Settings.Advanced.IsAlwaysOnTop)
             {
                 ApplyAlwaysOnTop();
             }
+
+            // 如果当前在设置面板中，标记用户已修改无焦点模式设置
+            if (BorderSettings.Visibility == Visibility.Visible)
+            {
+                userChangedNoFocusModeInSettings = true;
+            }
         }
 
         private void ToggleSwitchAlwaysOnTop_Toggled(object sender, RoutedEventArgs e)
@@ -1898,7 +1969,7 @@ namespace Ink_Canvas
             SaveSettingsToFile();
             ApplyAlwaysOnTop();
         }
-        
+
         private void Window_Activated(object sender, EventArgs e)
         {
             // 窗口激活时，如果启用了置顶功能，重新应用置顶设置
@@ -1911,7 +1982,7 @@ namespace Ink_Canvas
                 }), DispatcherPriority.Loaded);
             }
         }
-        
+
         /// <summary>
         /// 窗口失去焦点时的处理
         /// </summary>
@@ -1988,12 +2059,31 @@ namespace Ink_Canvas
                     MessageBox.Show("快捷键管理器尚未初始化，请稍后重试。", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
                     return;
                 }
+
+                // 暂时隐藏设置面板
+                BorderSettings.Visibility = Visibility.Hidden;
+                BorderSettingsMask.Visibility = Visibility.Hidden;
+
+                // 创建快捷键设置窗口
                 var hotkeySettingsWindow = new HotkeySettingsWindow(this, _globalHotkeyManager);
-                hotkeySettingsWindow.Owner = this;
+
+                // 设置窗口关闭事件，用于在快捷键设置窗口关闭后恢复设置面板
+                hotkeySettingsWindow.Closed += (s, e) =>
+                {
+                    // 恢复设置面板显示
+                    BorderSettings.Visibility = Visibility.Visible;
+                    BorderSettingsMask.Visibility = Visibility.Visible;
+                };
+
+                // 显示快捷键设置窗口
                 hotkeySettingsWindow.ShowDialog();
             }
             catch (Exception ex)
             {
+                // 确保在发生错误时也恢复设置面板显示
+                BorderSettings.Visibility = Visibility.Visible;
+                BorderSettingsMask.Visibility = Visibility.Visible;
+
                 LogHelper.WriteLogToFile($"打开快捷键设置窗口时出错: {ex.Message}", LogHelper.LogType.Error);
                 MessageBox.Show($"打开快捷键设置窗口时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
             }
@@ -2010,7 +2100,7 @@ namespace Ink_Canvas
             {
                 Settings.Canvas.EnableInkFade = ToggleSwitchEnableInkFade.IsOn;
                 _inkFadeManager.IsEnabled = Settings.Canvas.EnableInkFade;
-                
+
                 // 同步批注子面板中的开关状态
                 if (ToggleSwitchInkFadeInPanel != null)
                 {
@@ -2022,7 +2112,7 @@ namespace Ink_Canvas
                 {
                     ToggleSwitchInkFadeInPanel2.IsOn = Settings.Canvas.EnableInkFade;
                 }
-                
+
                 LogHelper.WriteLogToFile($"墨迹渐隐功能已{(Settings.Canvas.EnableInkFade ? "启用" : "禁用")}", LogHelper.LogType.Event);
             }
             catch (Exception ex)
@@ -2062,7 +2152,7 @@ namespace Ink_Canvas
             {
                 Settings.Canvas.EnableInkFade = ToggleSwitchInkFadeInPanel.IsOn;
                 _inkFadeManager.IsEnabled = Settings.Canvas.EnableInkFade;
-                
+
                 // 同步设置面板中的开关状态
                 if (ToggleSwitchEnableInkFade != null)
                 {
@@ -2074,7 +2164,7 @@ namespace Ink_Canvas
                 {
                     ToggleSwitchInkFadeInPanel2.IsOn = Settings.Canvas.EnableInkFade;
                 }
-                
+
                 LogHelper.WriteLogToFile($"批注子面板中墨迹渐隐功能已{(Settings.Canvas.EnableInkFade ? "启用" : "禁用")}", LogHelper.LogType.Event);
             }
             catch (Exception ex)
@@ -2082,6 +2172,56 @@ namespace Ink_Canvas
                 LogHelper.WriteLogToFile($"批注子面板中切换墨迹渐隐功能时出错: {ex.Message}", LogHelper.LogType.Error);
             }
         }
+
+        /// <summary>
+        /// PPT放映模式显示手势按钮开关切换事件处理
+        /// </summary>
+        private void ToggleSwitchShowGestureButtonInSlideShow_Toggled(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (!isLoaded) return;
+                var toggle = sender as ToggleSwitch;
+                Settings.PowerPointSettings.ShowGestureButtonInSlideShow = toggle != null && toggle.IsOn;
+                SaveSettingsToFile();
+
+                // 如果当前在PPT放映模式，需要立即更新手势按钮的显示状态
+                if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
+                {
+                    UpdateGestureButtonVisibilityInPPTMode();
+                }
+
+                LogHelper.WriteLogToFile($"PPT放映模式显示手势按钮已{(Settings.PowerPointSettings.ShowGestureButtonInSlideShow ? "启用" : "禁用")}", LogHelper.LogType.Event);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"切换PPT放映模式显示手势按钮时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 更新PPT模式下手势按钮的显示状态
+        /// </summary>
+        private void UpdateGestureButtonVisibilityInPPTMode()
+        {
+            try
+            {
+                if (Settings.PowerPointSettings.ShowGestureButtonInSlideShow)
+                {
+                    // 如果启用了PPT放映模式显示手势按钮，则检查是否在批注模式下显示手势按钮
+                    CheckEnableTwoFingerGestureBtnVisibility(true);
+                }
+                else
+                {
+                    // 如果禁用了PPT放映模式显示手势按钮，则隐藏手势按钮
+                    EnableTwoFingerGestureBorder.Visibility = Visibility.Collapsed;
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"更新PPT模式下手势按钮显示状态时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
         #endregion
 
         #region PPT翻页直接传递
@@ -2096,21 +2236,21 @@ namespace Ink_Canvas
                 // 查找PPT放映窗口并发送按键
                 var pptWindows = Process.GetProcessesByName("POWERPNT");
                 var wpsWindows = Process.GetProcessesByName("wpp");
-                
+
                 foreach (var process in pptWindows.Concat(wpsWindows))
                 {
                     if (process.MainWindowHandle != IntPtr.Zero)
                     {
                         // 激活PPT窗口
                         SetForegroundWindow(process.MainWindowHandle);
-                        
+
                         // 发送翻页按键消息
                         int keyCode = isPrevious ? 0x21 : 0x22; // VK_PRIOR : VK_NEXT
-                        
+
                         // 发送按键按下和释放消息
                         PostMessage(process.MainWindowHandle, 0x0100, (IntPtr)keyCode, IntPtr.Zero); // WM_KEYDOWN
                         PostMessage(process.MainWindowHandle, 0x0101, (IntPtr)keyCode, IntPtr.Zero); // WM_KEYUP
-                        
+
                         break;
                     }
                 }
@@ -2126,6 +2266,70 @@ namespace Ink_Canvas
         }
         #endregion
 
+        /// <summary>
+        /// 初始化文件关联状态显示
+        /// </summary>
+        private void InitializeFileAssociationStatus()
+        {
+            try
+            {
+                bool isRegistered = FileAssociationManager.IsFileAssociationRegistered();
+                if (isRegistered)
+                {
+                    TextBlockFileAssociationStatus.Text = "✓ .icstk文件关联已注册";
+                    TextBlockFileAssociationStatus.Foreground = new SolidColorBrush(Colors.LightGreen);
+                }
+                else
+                {
+                    TextBlockFileAssociationStatus.Text = "✗ .icstk文件关联未注册";
+                    TextBlockFileAssociationStatus.Foreground = new SolidColorBrush(Colors.LightCoral);
+                }
+            }
+            catch (Exception ex)
+            {
+                TextBlockFileAssociationStatus.Text = "✗ 检查文件关联状态时出错";
+                TextBlockFileAssociationStatus.Foreground = new SolidColorBrush(Colors.LightCoral);
+                LogHelper.WriteLogToFile($"初始化文件关联状态显示时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 处理命令行参数中的文件路径
+        /// </summary>
+        private void HandleCommandLineFileOpen()
+        {
+            try
+            {
+                // 检查启动参数中是否有.icstk文件
+                string icstkFile = FileAssociationManager.GetIcstkFileFromArgs(App.StartArgs);
+
+                if (!string.IsNullOrEmpty(icstkFile))
+                {
+                    LogHelper.WriteLogToFile($"检测到命令行参数中的.icstk文件: {icstkFile}", LogHelper.LogType.Event);
+
+                    // 延迟执行，确保UI已完全加载
+                    Dispatcher.BeginInvoke(new Action(() =>
+                    {
+                        try
+                        {
+                            // 打开文件
+                            OpenSingleStrokeFile(icstkFile);
+                            ShowNotification($"已加载墨迹文件: {Path.GetFileName(icstkFile)}");
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"打开命令行参数中的文件失败: {ex.Message}", LogHelper.LogType.Error);
+                            ShowNotification("打开墨迹文件失败");
+                        }
+                    }), DispatcherPriority.Loaded);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"处理命令行文件打开时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
         /// <summary>
         /// 集中管理工具模式切换和快捷键状态更新
         /// 避免在每个工具按钮点击时重复刷新快捷键状态
@@ -2138,25 +2342,404 @@ namespace Ink_Canvas
             {
                 // 执行模式切换
                 inkCanvas.EditingMode = newMode;
-                
+
                 // 根据模式确定是否为鼠标模式（无工具模式）
                 bool isMouseMode = newMode == InkCanvasEditingMode.None;
-                
+
                 // 更新快捷键状态
                 if (_globalHotkeyManager != null)
                 {
                     _globalHotkeyManager.UpdateHotkeyStateForToolMode(isMouseMode);
                 }
-                
+
+                // 在PPT放映模式下，工具模式切换时需要更新手势按钮的显示状态
+                if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
+                {
+                    UpdateGestureButtonVisibilityInPPTMode();
+                }
+
                 // 执行额外的操作（如果有）
                 additionalActions?.Invoke();
-                
-                LogHelper.WriteLogToFile($"工具模式已切换到: {newMode}, 鼠标模式: {isMouseMode}", LogHelper.LogType.Trace);
+
             }
             catch (Exception ex)
             {
                 LogHelper.WriteLogToFile($"设置工具模式时出错: {ex.Message}", LogHelper.LogType.Error);
             }
         }
+
+        #region 滑块触摸支持
+
+        /// <summary>
+        /// 为所有滑块控件添加触摸和手写笔事件支持
+        /// </summary>
+        private void AddTouchSupportToSliders()
+        {
+            try
+            {
+                // 获取所有滑块控件并添加触摸支持
+                var sliders = new List<Slider>
+                {
+                    InkFadeTimeSlider,
+                    AutoStraightenLineThresholdSlider,
+                    LineStraightenSensitivitySlider,
+                    LineEndpointSnappingThresholdSlider,
+                    ViewboxFloatingBarScaleTransformValueSlider,
+                    ViewboxFloatingBarOpacityValueSlider,
+                    ViewboxFloatingBarOpacityInPPTValueSlider,
+                    PPTButtonLeftPositionValueSlider,
+                    PPTButtonRightPositionValueSlider,
+                    PPTButtonLBPositionValueSlider,
+                    PPTButtonRBPositionValueSlider,
+                    TouchMultiplierSlider,
+                    NibModeBoundsWidthSlider,
+                    FingerModeBoundsWidthSlider,
+                    SideControlMinimumAutomationSlider,
+                    RandWindowOnceCloseLatencySlider,
+                    RandWindowOnceMaxStudentsSlider,
+                    BoardInkWidthSlider,
+                    BoardInkAlphaSlider,
+                    BoardHighlighterWidthSlider,
+                    InkWidthSlider,
+                    InkAlphaSlider,
+                    HighlighterWidthSlider
+                };
+
+                foreach (var slider in sliders)
+                {
+                    if (slider != null)
+                    {
+                        AddTouchSupportToSlider(slider);
+                    }
+                }
+
+                LogHelper.WriteLogToFile("已为所有滑块控件添加触摸支持", LogHelper.LogType.Trace);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"添加滑块触摸支持时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 为单个滑块控件添加触摸和手写笔事件支持
+        /// </summary>
+        /// <param name="slider">要添加触摸支持的滑块控件</param>
+        private void AddTouchSupportToSlider(Slider slider)
+        {
+            if (slider == null) return;
+
+            // 启用触摸和手写笔支持
+            slider.IsManipulationEnabled = true;
+
+            // 添加触摸事件 - 使用更简单直接的方法
+            slider.TouchDown += (s, e) => HandleSliderTouch(s, e, slider);
+            slider.TouchMove += (s, e) => HandleSliderTouch(s, e, slider);
+            slider.TouchUp += (s, e) => HandleSliderTouchEnd(s, e, slider);
+
+            // 添加手写笔事件
+            slider.StylusDown += (s, e) => HandleSliderStylus(s, e, slider);
+            slider.StylusMove += (s, e) => HandleSliderStylus(s, e, slider);
+            slider.StylusUp += (s, e) => HandleSliderStylusEnd(s, e, slider);
+        }
+
+        /// <summary>
+        /// 处理滑块触摸事件（按下和移动）
+        /// </summary>
+        private void HandleSliderTouch(object sender, TouchEventArgs e, Slider slider)
+        {
+            if (slider == null) return;
+
+            // 捕获触摸设备
+            if (e.RoutedEvent == TouchDownEvent)
+            {
+                slider.CaptureTouch(e.TouchDevice);
+            }
+
+            // 计算触摸位置对应的滑块值
+            var touchPoint = e.GetTouchPoint(slider);
+
+            // 使用更精确的位置计算方法
+            UpdateSliderValueFromPositionImproved(slider, touchPoint.Position);
+
+            e.Handled = true;
+        }
+
+        /// <summary>
+        /// 处理滑块触摸结束事件
+        /// </summary>
+        private void HandleSliderTouchEnd(object sender, TouchEventArgs e, Slider slider)
+        {
+            if (slider == null) return;
+
+            // 释放触摸捕获
+            slider.ReleaseTouchCapture(e.TouchDevice);
+
+            e.Handled = true;
+        }
+
+        /// <summary>
+        /// 处理滑块手写笔事件（按下和移动）
+        /// </summary>
+        private void HandleSliderStylus(object sender, StylusEventArgs e, Slider slider)
+        {
+            if (slider == null) return;
+
+            // 捕获手写笔设备
+            if (e.RoutedEvent == StylusDownEvent)
+            {
+                slider.CaptureStylus();
+            }
+
+            // 计算手写笔位置对应的滑块值
+            var stylusPoint = e.GetStylusPoints(slider);
+            if (stylusPoint.Count > 0)
+            {
+                UpdateSliderValueFromPositionImproved(slider, stylusPoint[0].ToPoint());
+            }
+
+            e.Handled = true;
+        }
+
+        /// <summary>
+        /// 处理滑块手写笔结束事件
+        /// </summary>
+        private void HandleSliderStylusEnd(object sender, StylusEventArgs e, Slider slider)
+        {
+            if (slider == null) return;
+
+            // 释放手写笔捕获
+            slider.ReleaseStylusCapture();
+
+            e.Handled = true;
+        }
+
+        /// <summary>
+        /// 根据触摸/手写笔位置更新滑块值（改进版本）
+        /// </summary>
+        /// <param name="slider">滑块控件</param>
+        /// <param name="position">触摸/手写笔位置</param>
+        private void UpdateSliderValueFromPositionImproved(Slider slider, Point position)
+        {
+            if (slider == null) return;
+
+            try
+            {
+                // 获取滑块的轨道元素
+                var track = slider.Template.FindName("PART_Track", slider) as Track;
+                if (track == null)
+                {
+                    // 如果找不到轨道，使用简单方法
+                    UpdateSliderValueFromPosition(slider, position);
+                    return;
+                }
+
+                // 获取轨道的实际边界
+                var trackBounds = track.TransformToAncestor(slider).TransformBounds(new Rect(0, 0, track.ActualWidth, track.ActualHeight));
+
+                double relativePosition = 0;
+
+                if (slider.Orientation == System.Windows.Controls.Orientation.Horizontal)
+                {
+                    // 水平滑块
+                    if (trackBounds.Width > 0)
+                    {
+                        // 计算相对于轨道的相对位置
+                        var relativeX = position.X - trackBounds.X;
+                        relativePosition = Math.Max(0, Math.Min(1, relativeX / trackBounds.Width));
+                    }
+                }
+                else
+                {
+                    // 垂直滑块
+                    if (trackBounds.Height > 0)
+                    {
+                        // 计算相对于轨道的相对位置
+                        var relativeY = position.Y - trackBounds.Y;
+                        relativePosition = Math.Max(0, Math.Min(1, relativeY / trackBounds.Height));
+                    }
+                }
+
+                // 计算新的滑块值
+                var newValue = slider.Minimum + relativePosition * (slider.Maximum - slider.Minimum);
+
+                // 如果启用了吸附到刻度，则调整到最近的刻度
+                if (slider.IsSnapToTickEnabled && slider.TickFrequency > 0)
+                {
+                    var tickCount = (int)((slider.Maximum - slider.Minimum) / slider.TickFrequency);
+                    var tickIndex = (int)Math.Round(relativePosition * tickCount);
+                    newValue = slider.Minimum + tickIndex * slider.TickFrequency;
+                }
+
+                // 更新滑块值
+                slider.Value = Math.Max(slider.Minimum, Math.Min(slider.Maximum, newValue));
+            }
+            catch (Exception ex)
+            {
+                // 如果改进方法失败，回退到简单方法
+                UpdateSliderValueFromPosition(slider, position);
+                LogHelper.WriteLogToFile($"更新滑块值时出错，使用回退方法: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 根据触摸/手写笔位置更新滑块值（简单版本）
+        /// </summary>
+        /// <param name="slider">滑块控件</param>
+        /// <param name="position">触摸/手写笔位置</param>
+        private void UpdateSliderValueFromPosition(Slider slider, Point position)
+        {
+            if (slider == null) return;
+
+            try
+            {
+                // 使用更简单直接的方法计算滑块值
+                double relativePosition = 0;
+
+                if (slider.Orientation == System.Windows.Controls.Orientation.Horizontal)
+                {
+                    // 水平滑块 - 使用滑块的实际宽度
+                    var sliderWidth = slider.ActualWidth;
+                    if (sliderWidth > 0)
+                    {
+                        // 考虑滑块的边距和拇指大小
+                        var thumbSize = 20; // 假设拇指大小约为20像素
+                        var effectiveWidth = sliderWidth - thumbSize;
+                        var adjustedX = position.X - thumbSize / 2;
+                        relativePosition = Math.Max(0, Math.Min(1, adjustedX / effectiveWidth));
+                    }
+                }
+                else
+                {
+                    // 垂直滑块 - 使用滑块的实际高度
+                    var sliderHeight = slider.ActualHeight;
+                    if (sliderHeight > 0)
+                    {
+                        // 考虑滑块的边距和拇指大小
+                        var thumbSize = 20; // 假设拇指大小约为20像素
+                        var effectiveHeight = sliderHeight - thumbSize;
+                        var adjustedY = position.Y - thumbSize / 2;
+                        relativePosition = Math.Max(0, Math.Min(1, adjustedY / effectiveHeight));
+                    }
+                }
+
+                // 计算新的滑块值
+                var newValue = slider.Minimum + relativePosition * (slider.Maximum - slider.Minimum);
+
+                // 如果启用了吸附到刻度，则调整到最近的刻度
+                if (slider.IsSnapToTickEnabled && slider.TickFrequency > 0)
+                {
+                    var tickCount = (int)((slider.Maximum - slider.Minimum) / slider.TickFrequency);
+                    var tickIndex = (int)Math.Round(relativePosition * tickCount);
+                    newValue = slider.Minimum + tickIndex * slider.TickFrequency;
+                }
+
+                // 更新滑块值
+                slider.Value = Math.Max(slider.Minimum, Math.Min(slider.Maximum, newValue));
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"更新滑块值时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        #endregion
+
+        #region 模式切换相关
+
+        /// <summary>
+        /// 模式切换开关事件处理
+        /// </summary>
+        private void ToggleSwitchMode_Toggled(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                var toggle = sender as ToggleSwitch;
+                if (toggle != null)
+                {
+                    Settings.ModeSettings.IsPPTOnlyMode = toggle.IsOn;
+                    
+                    // 保存设置到文件
+                    SaveSettingsToFile();
+
+                    // 如果切换到仅PPT模式，立即隐藏主窗口
+                    if (Settings.ModeSettings.IsPPTOnlyMode)
+                    {
+                        Hide();
+                        LogHelper.WriteLogToFile("已切换到仅PPT模式，主窗口已隐藏", LogHelper.LogType.Event);
+                    }
+                    else
+                    {
+                        // 如果切换到正常模式，显示主窗口
+                        Show();
+                        LogHelper.WriteLogToFile("已切换到正常模式，主窗口已显示", LogHelper.LogType.Event);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"切换模式时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 检查是否应该显示主窗口（基于PPT模式和PPT放映状态）
+        /// </summary>
+        private void CheckMainWindowVisibility()
+        {
+            try
+            {
+                if (Settings.ModeSettings.IsPPTOnlyMode)
+                {
+                    // 仅PPT模式下，只有在PPT放映时才显示
+                    bool isInSlideShow = BtnPPTSlideShowEnd.Visibility == Visibility.Visible;
+                    if (isInSlideShow && !IsVisible)
+                    {
+                        Show();
+                        LogHelper.WriteLogToFile("PPT放映开始，显示主窗口（仅PPT模式）", LogHelper.LogType.Trace);
+                    }
+                    else if (!isInSlideShow && IsVisible)
+                    {
+                        Hide();
+                        LogHelper.WriteLogToFile("PPT放映结束，隐藏主窗口（仅PPT模式）", LogHelper.LogType.Trace);
+                    }
+                }
+                else
+                {
+                    // 正常模式下，确保主窗口可见
+                    if (!IsVisible)
+                    {
+                        Show();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"检查主窗口可见性时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 切换到白板模式（用于--board参数和IPC命令）
+        /// 调用浮动栏上的白板功能
+        /// </summary>
+        public void SwitchToBoardMode()
+        {
+            try
+            {
+                LogHelper.WriteLogToFile("开始切换到白板模式", LogHelper.LogType.Event);
+
+                // 调用浮动栏上的白板功能
+                ImageBlackboard_MouseUp(null, null);
+
+                LogHelper.WriteLogToFile("已成功切换到白板模式", LogHelper.LogType.Event);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"切换到白板模式时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        #endregion
     }
 }

Ink Canvas/MainWindow_cs/MW_AutoFold.cs

@@ -1,4 +1,6 @@
-using System;
+using Ink_Canvas.Helpers;
+using iNKORE.UI.WPF.Modern;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -6,8 +8,6 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
-using Ink_Canvas.Helpers;
-using iNKORE.UI.WPF.Modern;
 
 namespace Ink_Canvas
 {
@@ -259,7 +259,11 @@ namespace Ink_Canvas
                     PenIcon_Click(null, null);
                 }
 
-                if (StackPanelPPTControls.Visibility == Visibility.Visible)
+                // 只有在PPT放映模式下且页数有效时才显示翻页按钮
+                if (StackPanelPPTControls.Visibility == Visibility.Visible &&
+                    BtnPPTSlideShowEnd.Visibility == Visibility.Visible &&
+                    PPTManager?.IsInSlideShow == true &&
+                    PPTManager?.SlidesCount > 0)
                 {
                     var dops = Settings.PowerPointSettings.PPTButtonsDisplayOption.ToString();
                     var dopsc = dops.ToCharArray();
@@ -267,11 +271,33 @@ 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
+                {
+                    // 如果条件不满足，确保隐藏翻页按钮
+                    LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                    RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                    LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                    RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                 }
 
-                // 新增：只在屏幕模式下显示浮动栏
+                // 新只在屏幕模式下显示浮动栏
                 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
@@ -280,6 +306,27 @@ namespace Ink_Canvas
                 SidePannelMarginAnimation(-50, !unfoldFloatingBarByUser);
             });
 
+            // 修复：在浮动栏展开后，重新设置按钮高亮状态
+            await Dispatcher.InvokeAsync(async () =>
+            {
+                try
+                {
+                    // 等待UI完全更新
+                    await Task.Delay(100);
+
+                    // 获取当前选中的模式并重新设置高光位置
+                    string selectedToolMode = GetCurrentSelectedMode();
+                    if (!string.IsNullOrEmpty(selectedToolMode))
+                    {
+                        SetFloatingBarHighlightPosition(selectedToolMode);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"浮动栏展开后重新设置按钮高亮状态失败: {ex.Message}", LogHelper.LogType.Error);
+                }
+            });
+
             isFloatingBarChangingHideMode = false;
         }
 

Ink Canvas/MainWindow_cs/MW_AutoStart.cs

@@ -1,6 +1,6 @@
-using System;
+using IWshRuntimeLibrary;
+using System;
 using System.Windows;
-using IWshRuntimeLibrary;
 using Application = System.Windows.Forms.Application;
 using File = System.IO.File;
 

Ink Canvas/MainWindow_cs/MW_AutoTheme.cs

@@ -1,8 +1,8 @@
-using System;
+using iNKORE.UI.WPF.Modern;
+using Microsoft.Win32;
+using System;
 using System.Windows;
 using System.Windows.Media;
-using iNKORE.UI.WPF.Modern;
-using Microsoft.Win32;
 using Application = System.Windows.Application;
 
 namespace Ink_Canvas

Ink Canvas/MainWindow_cs/MW_BoardControls.cs

@@ -1,4 +1,5 @@
-using System;
+using Ink_Canvas.Helpers;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading.Tasks;
@@ -6,7 +7,6 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Ink;
 using System.Windows.Media;
-using Ink_Canvas.Helpers;
 
 namespace Ink_Canvas
 {
@@ -140,7 +140,7 @@ namespace Ink_Canvas
                     inkCanvas.EditingMode = previousEditingMode;
                     currentSelectedElement = null;
                 }
-                
+
                 var targetIndex = isBackupMain ? 0 : CurrentWhiteboardIndex;
 
                 // 先清空当前画布的墨迹
@@ -253,7 +253,7 @@ namespace Ink_Canvas
                 BtnWhiteBoardAdd_Click(sender, e);
                 return;
             }
-            
+
             // 隐藏图片选择工具栏
             if (currentSelectedElement != null)
             {
@@ -280,7 +280,7 @@ namespace Ink_Canvas
             if (WhiteboardTotalCount >= 99) return;
             if (Settings.Automation.IsAutoSaveStrokesAtClear &&
                 inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber) SaveScreenShot(true);
-            
+
             // 隐藏图片选择工具栏
             if (currentSelectedElement != null)
             {
@@ -291,7 +291,7 @@ namespace Ink_Canvas
                 inkCanvas.EditingMode = previousEditingMode;
                 currentSelectedElement = null;
             }
-            
+
             SaveStrokes();
             ClearStrokes(true);
 
@@ -330,7 +330,7 @@ namespace Ink_Canvas
                 inkCanvas.EditingMode = previousEditingMode;
                 currentSelectedElement = null;
             }
-            
+
             ClearStrokes(true);
 
             if (CurrentWhiteboardIndex != WhiteboardTotalCount)

Ink Canvas/MainWindow_cs/MW_BoardIcons.cs

@@ -1,4 +1,5 @@
-using System;
+using Ink_Canvas.Helpers;
+using System;
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
@@ -6,7 +7,6 @@ using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using Ink_Canvas.Helpers;
 
 namespace Ink_Canvas
 {

Ink Canvas/MainWindow_cs/MW_ClipboardHandler.cs

@@ -1,4 +1,5 @@
-using System;
+using Ink_Canvas.Helpers;
+using System;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -9,7 +10,6 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
-using Ink_Canvas.Helpers;
 using Clipboard = System.Windows.Clipboard;
 using ContextMenu = System.Windows.Controls.ContextMenu;
 using Cursors = System.Windows.Input.Cursors;
@@ -151,7 +151,7 @@ namespace Ink_Canvas
                 // 设置图片属性，避免被InkCanvas选择系统处理
                 image.IsHitTestVisible = true;
                 image.Focusable = false;
-                
+
                 // 初始化InkCanvas选择设置
                 if (inkCanvas != null)
                 {
@@ -173,7 +173,7 @@ namespace Ink_Canvas
                     {
                         // 先进行缩放居中处理
                         CenterAndScaleElement(image);
-                        
+
                         // 如果有指定位置，调整到指定位置
                         if (position.HasValue)
                         {
@@ -181,7 +181,7 @@ namespace Ink_Canvas
                             InkCanvas.SetLeft(image, position.Value.X - image.Width / 2);
                             InkCanvas.SetTop(image, position.Value.Y - image.Height / 2);
                         }
-                        
+
                         // 绑定事件处理器
                         if (image is FrameworkElement elementForEvents)
                         {
@@ -205,6 +205,11 @@ namespace Ink_Canvas
                 // 提交到历史记录
                 timeMachine.CommitElementInsertHistory(image);
 
+                // 插入图片后切换到选择模式并刷新浮动栏高光显示
+                SetCurrentToolMode(InkCanvasEditingMode.Select);
+                UpdateCurrentToolMode("select");
+                HideSubPanels("select");
+
                 ShowNotification("图片已从剪贴板粘贴");
             }
             catch (Exception ex)

Ink Canvas/MainWindow_cs/MW_Colors.cs

@@ -1,4 +1,5 @@
-using System;
+using Ink_Canvas.Helpers;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows;
@@ -8,7 +9,6 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
-using Ink_Canvas.Helpers;
 
 namespace Ink_Canvas
 {
@@ -28,7 +28,7 @@ namespace Ink_Canvas
                     AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
                     AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide);
                     AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide);
-                    
+
                     // 在PPT模式下隐藏手势面板和手势按钮
                     AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
                     AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
@@ -423,7 +423,7 @@ namespace Ink_Canvas
             }
 
             // 更新快捷调色盘选择指示器
-            if (penType == 0) 
+            if (penType == 0)
             {
                 UpdateQuickColorPaletteIndicator(inkCanvas.DefaultDrawingAttributes.Color);
             }
@@ -601,7 +601,7 @@ namespace Ink_Canvas
             drawingAttributes.Height = Settings.Canvas.HighlighterWidth;
             drawingAttributes.StylusTip = StylusTip.Rectangle;
             drawingAttributes.IsHighlighter = true;
-            
+
             // 确保荧光笔模式切换后正确更新颜色和快捷调色板指示器
             ColorSwitchCheck();
         }

Ink Canvas/MainWindow_cs/MW_ElementsControls.cs

@@ -1,4 +1,6 @@
-using System;
+using Ink_Canvas.Helpers;
+using Microsoft.Win32;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -10,8 +12,6 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
-using Ink_Canvas.Helpers;
-using Microsoft.Win32;
 
 namespace Ink_Canvas
 {
@@ -42,10 +42,10 @@ namespace Ink_Canvas
                     // 设置图片属性，避免被InkCanvas选择系统处理
                     image.IsHitTestVisible = true;
                     image.Focusable = false;
-                    
+
                     // 初始化InkCanvas选择设置
                     InitializeInkCanvasSelectionSettings();
-                    
+
                     // 先添加到画布
                     inkCanvas.Children.Add(image);
 
@@ -62,12 +62,17 @@ namespace Ink_Canvas
 
                             // 最后绑定事件处理器
                             BindElementEvents(image);
-                            
+
                             LogHelper.WriteLogToFile($"图片插入完成: {image.Name}");
                         }), DispatcherPriority.Loaded);
                     };
 
                     timeMachine.CommitElementInsertHistory(image);
+
+                    // 插入图片后切换到选择模式并刷新浮动栏高光显示
+                    SetCurrentToolMode(InkCanvasEditingMode.Select);
+                    UpdateCurrentToolMode("select");
+                    HideSubPanels("select");
                 }
             }
         }
@@ -98,7 +103,7 @@ namespace Ink_Canvas
 
             // 设置光标
             element.Cursor = Cursors.Hand;
-            
+
             // 禁用InkCanvas对图片的选择处理
             element.IsHitTestVisible = true;
             element.Focusable = false;
@@ -121,7 +126,7 @@ namespace Ink_Canvas
 
                 // 选中当前元素
                 SelectElement(element);
-                
+
                 // 开始拖动
                 isDragging = true;
                 dragStartPoint = e.GetPosition(inkCanvas);
@@ -151,7 +156,7 @@ namespace Ink_Canvas
             if (sender is FrameworkElement element && isDragging && element.IsMouseCaptured)
             {
                 var currentPoint = e.GetPosition(inkCanvas);
-                
+
                 // 使用鼠标拖动的完整实现机制
                 ApplyMouseDragTransform(element, currentPoint, dragStartPoint);
 
@@ -172,7 +177,7 @@ namespace Ink_Canvas
             if (sender is FrameworkElement element)
             {
 
-                
+
                 // 使用滚轮缩放的核心机制
                 ApplyWheelScaleTransform(element, e);
 
@@ -191,7 +196,16 @@ namespace Ink_Canvas
         {
             if (sender is FrameworkElement element)
             {
-                // 使用触摸拖动的完整实现
+                // 检查是否是双指手势
+                if (e.Manipulators.Count() >= 2)
+                {
+                    // 双指手势时，不处理单个元素的手势，让画布级别的手势处理
+                    // 这样可以实现图片与墨迹的同步移动
+                    e.Handled = false;
+                    return;
+                }
+
+                // 单指手势时，使用触摸拖动的完整实现
                 ApplyTouchManipulationTransform(element, e);
 
                 // 如果是图片元素，更新工具栏位置
@@ -264,7 +278,7 @@ namespace Ink_Canvas
         private void SelectElement(FrameworkElement element)
         {
             currentSelectedElement = element;
-            
+
             // 根据元素类型显示不同的选择工具栏
             if (element is Image)
             {
@@ -275,41 +289,35 @@ namespace Ink_Canvas
                     UpdateImageSelectionToolbarPosition(element);
                     BorderImageSelectionControl.Visibility = Visibility.Visible;
                 }
-                
-                // 隐藏笔画选择工具栏
-                if (BorderStrokeSelectionControl != null)
-                {
-                    BorderStrokeSelectionControl.Visibility = Visibility.Collapsed;
-                }
+
+                // 墨迹选择工具栏通过GridInkCanvasSelectionCover的可见性来控制
+                // 不需要直接设置BorderStrokeSelectionControl.Visibility
             }
             else
             {
-                // 显示笔画选择工具栏
-                if (BorderStrokeSelectionControl != null)
-                {
-                    BorderStrokeSelectionControl.Visibility = Visibility.Visible;
-                }
-                
                 // 隐藏图片选择工具栏
                 if (BorderImageSelectionControl != null)
                 {
                     BorderImageSelectionControl.Visibility = Visibility.Collapsed;
                 }
+
+                // 墨迹选择工具栏通过GridInkCanvasSelectionCover的可见性来控制
+                // 不需要直接设置BorderStrokeSelectionControl.Visibility
             }
-            
+
             // 确保选择框不显示，避免蓝色边框
             if (GridInkCanvasSelectionCover != null)
             {
                 GridInkCanvasSelectionCover.Visibility = Visibility.Collapsed;
             }
-            
+
             // 禁用InkCanvas的选择功能，去除控制点
             if (inkCanvas != null)
             {
                 // 清除当前选择
                 inkCanvas.Select(new StrokeCollection());
-                // 设置编辑模式为非选择模式
-                inkCanvas.EditingMode = InkCanvasEditingMode.None;
+                // 保持选择模式，这样用户可以直接点击墨迹来选择
+                inkCanvas.EditingMode = InkCanvasEditingMode.Select;
             }
         }
 
@@ -317,25 +325,27 @@ namespace Ink_Canvas
         private void UnselectElement(FrameworkElement element)
         {
             // 去除选中效果
-            
-            // 隐藏所有选择工具栏
+
+            // 隐藏图片选择工具栏
             if (BorderImageSelectionControl != null)
             {
                 BorderImageSelectionControl.Visibility = Visibility.Collapsed;
             }
-            
-            if (BorderStrokeSelectionControl != null)
-            {
-                BorderStrokeSelectionControl.Visibility = Visibility.Collapsed;
-            }
-            
+
+            // 墨迹选择工具栏通过GridInkCanvasSelectionCover的可见性来控制
+            // 不需要直接设置BorderStrokeSelectionControl.Visibility
+
             // 确保选择框隐藏
             if (GridInkCanvasSelectionCover != null)
             {
                 GridInkCanvasSelectionCover.Visibility = Visibility.Collapsed;
             }
-            
 
+            // 确保InkCanvas处于选择模式，这样用户可以直接点击墨迹来选择
+            if (inkCanvas != null)
+            {
+                inkCanvas.EditingMode = InkCanvasEditingMode.Select;
+            }
         }
 
         // 应用矩阵变换到元素
@@ -345,7 +355,7 @@ namespace Ink_Canvas
             {
                 // 创建MatrixTransform
                 var matrixTransform = new MatrixTransform(matrix);
-                
+
                 // 将MatrixTransform添加到TransformGroup
                 transformGroup.Children.Add(matrixTransform);
             }
@@ -358,25 +368,25 @@ namespace Ink_Canvas
             {
                 // 根据滚轮方向确定缩放比例（向上1.1倍，向下0.9倍）
                 double scaleFactor = e.Delta > 0 ? 1.1 : 0.9;
-                
+
                 // 计算选中元素的中心点作为缩放中心
                 var elementCenter = new Point(element.ActualWidth / 2, element.ActualHeight / 2);
-                
+
                 // 创建 Matrix 对象并应用 ScaleAt 变换
                 var matrix = new Matrix();
                 matrix.ScaleAt(scaleFactor, scaleFactor, elementCenter.X, elementCenter.Y);
-                
+
                 // 对选中的图片元素调用 ApplyElementMatrixTransform
                 ApplyElementMatrixTransform(element, matrix);
-                
+
                 // 对选中的笔画应用 Transform 方法（如果有选中的笔画）
                 var selectedStrokes = inkCanvas.GetSelectedStrokes();
                 foreach (var stroke in selectedStrokes)
                 {
                     stroke.Transform(matrix, false);
                 }
-                
-                
+
+
             }
             catch (Exception ex)
             {
@@ -399,20 +409,20 @@ namespace Ink_Canvas
 
                 // 保存初始变换状态用于历史记录
                 var initialTransform = transformGroup.Clone();
-                
+
                 // 创建新的 TransformGroup 并添加 MatrixTransform
                 var newTransformGroup = new TransformGroup();
                 newTransformGroup.Children.Add(new MatrixTransform(matrix));
-                
+
                 // 将新的变换组添加到现有的变换组中
                 transformGroup.Children.Add(newTransformGroup);
-                
+
                 // 如果启用了历史记录，提交变换历史
                 if (saveHistory)
                 {
                     CommitTransformHistory(element, initialTransform, transformGroup);
                 }
-                
+
 
             }
             catch (Exception ex)
@@ -428,24 +438,24 @@ namespace Ink_Canvas
             {
                 // 计算鼠标移动的位移向量
                 var delta = currentPoint - startPoint;
-                
+
                 // 创建 Matrix 对象并应用 Translate 变换
                 var matrix = new Matrix();
                 matrix.Translate(delta.X, delta.Y);
-                
+
                 // 对选中的图片元素应用矩阵变换
                 ApplyMatrixTransformToElement(element, matrix, false);
-                
+
                 // 对选中的笔画应用变换
                 var selectedStrokes = inkCanvas.GetSelectedStrokes();
                 foreach (var stroke in selectedStrokes)
                 {
                     stroke.Transform(matrix, false);
                 }
-                
+
                 // 更新选择框的位置（如果有选择框）
                 UpdateSelectionBorderPosition(delta);
-                
+
 
             }
             catch (Exception ex)
@@ -503,7 +513,7 @@ namespace Ink_Canvas
 
                 // 支持单指拖动和多指手势
                 // 可以同时进行平移、旋转和缩放
-                
+
                 // 通过 ManipulationDelta 获取手势变化信息
                 var translation = md.Translation;
                 var rotation = md.Rotation;
@@ -519,13 +529,13 @@ namespace Ink_Canvas
                 if (e.Manipulators.Count() >= 2)
                 {
                     var center = e.ManipulationOrigin;
-                    
+
                     // 应用缩放
                     if (scale.X != 1.0 || scale.Y != 1.0)
                     {
                         matrix.ScaleAt(scale.X, scale.Y, center.X, center.Y);
                     }
-                    
+
                     // 应用旋转
                     if (rotation != 0)
                     {
@@ -535,15 +545,15 @@ namespace Ink_Canvas
 
                 // 应用变换到元素
                 ApplyMatrixTransformToElement(element, matrix, false);
-                
+
                 // 应用变换到选中的笔画
                 var selectedStrokes = inkCanvas.GetSelectedStrokes();
                 foreach (var stroke in selectedStrokes)
                 {
                     stroke.Transform(matrix, false);
                 }
-                
-                
+
+
             }
             catch (Exception ex)
             {
@@ -1087,19 +1097,19 @@ namespace Ink_Canvas
                 {
                     // 创建克隆图片
                     Image clonedImage = CloneImage(originalImage);
-                    
+
                     // 添加到画布
                     inkCanvas.Children.Add(clonedImage);
-                    
+
                     // 初始化变换
                     InitializeElementTransform(clonedImage);
-                    
+
                     // 绑定事件
                     BindElementEvents(clonedImage);
-                    
+
                     // 记录历史
                     timeMachine.CommitElementInsertHistory(clonedImage);
-                    
+
                     LogHelper.WriteLogToFile($"图片克隆完成: {clonedImage.Name}");
                 }
             }
@@ -1118,10 +1128,10 @@ namespace Ink_Canvas
                 {
                     // 创建新页面
                     BtnWhiteBoardAdd_Click(null, null);
-                    
+
                     // 创建克隆图片（不添加到当前画布，因为已经创建了新页面）
                     Image clonedImage = CreateClonedImage(originalImage);
-                    
+
                     if (clonedImage != null)
                     {
                         // 设置图片属性，避免被InkCanvas选择系统处理
@@ -1139,7 +1149,7 @@ namespace Ink_Canvas
 
                         // 记录历史
                         timeMachine.CommitElementInsertHistory(clonedImage);
-                        
+
                         LogHelper.WriteLogToFile($"图片克隆到新页面完成: {clonedImage.Name}");
                     }
                 }
@@ -1158,13 +1168,13 @@ namespace Ink_Canvas
                 if (currentSelectedElement != null)
                 {
                     ApplyRotateTransform(currentSelectedElement, -45);
-                    
+
                     // 更新工具栏位置
                     if (currentSelectedElement is Image && BorderImageSelectionControl?.Visibility == Visibility.Visible)
                     {
                         UpdateImageSelectionToolbarPosition(currentSelectedElement);
                     }
-                    
+
                     LogHelper.WriteLogToFile("图片左旋转完成");
                 }
             }
@@ -1182,13 +1192,13 @@ namespace Ink_Canvas
                 if (currentSelectedElement != null)
                 {
                     ApplyRotateTransform(currentSelectedElement, 45);
-                    
+
                     // 更新工具栏位置
                     if (currentSelectedElement is Image && BorderImageSelectionControl?.Visibility == Visibility.Visible)
                     {
                         UpdateImageSelectionToolbarPosition(currentSelectedElement);
                     }
-                    
+
                     LogHelper.WriteLogToFile("图片右旋转完成");
                 }
             }
@@ -1207,13 +1217,13 @@ namespace Ink_Canvas
                 {
                     var elementCenter = new Point(currentSelectedElement.ActualWidth / 2, currentSelectedElement.ActualHeight / 2);
                     ApplyScaleTransform(currentSelectedElement, 0.9, elementCenter);
-                    
+
                     // 更新工具栏位置
                     if (currentSelectedElement is Image && BorderImageSelectionControl?.Visibility == Visibility.Visible)
                     {
                         UpdateImageSelectionToolbarPosition(currentSelectedElement);
                     }
-                    
+
                     LogHelper.WriteLogToFile("图片缩放减小完成");
                 }
             }
@@ -1229,23 +1239,23 @@ namespace Ink_Canvas
             try
             {
                 if (currentSelectedElement != null)
-            {
-                var elementCenter = new Point(currentSelectedElement.ActualWidth / 2, currentSelectedElement.ActualHeight / 2);
-                ApplyScaleTransform(currentSelectedElement, 1.1, elementCenter);
-                
-                // 更新工具栏位置
-                if (currentSelectedElement is Image && BorderImageSelectionControl?.Visibility == Visibility.Visible)
                 {
-                    UpdateImageSelectionToolbarPosition(currentSelectedElement);
+                    var elementCenter = new Point(currentSelectedElement.ActualWidth / 2, currentSelectedElement.ActualHeight / 2);
+                    ApplyScaleTransform(currentSelectedElement, 1.1, elementCenter);
+
+                    // 更新工具栏位置
+                    if (currentSelectedElement is Image && BorderImageSelectionControl?.Visibility == Visibility.Visible)
+                    {
+                        UpdateImageSelectionToolbarPosition(currentSelectedElement);
+                    }
+
+                    LogHelper.WriteLogToFile("图片缩放增大完成");
                 }
-                
-                LogHelper.WriteLogToFile("图片缩放增大完成");
             }
-        }
-        catch (Exception ex)
-        {
-            LogHelper.WriteLogToFile($"图片缩放增大失败: {ex.Message}", LogHelper.LogType.Error);
-        }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"图片缩放增大失败: {ex.Message}", LogHelper.LogType.Error);
+            }
         }
 
         // 图片删除
@@ -1257,20 +1267,20 @@ namespace Ink_Canvas
                 {
                     // 保存删除前的编辑模式
                     var previousEditingMode = inkCanvas.EditingMode;
-                    
+
                     // 记录删除历史
                     timeMachine.CommitElementRemoveHistory(currentSelectedElement);
-                    
+
                     // 从画布中移除
                     inkCanvas.Children.Remove(currentSelectedElement);
-                    
+
                     // 清除选中状态
                     UnselectElement(currentSelectedElement);
                     currentSelectedElement = null;
-                    
+
                     // 恢复到删除前的编辑模式
                     inkCanvas.EditingMode = previousEditingMode;
-                    
+
                     LogHelper.WriteLogToFile($"图片删除完成，已恢复到编辑模式: {previousEditingMode}");
                 }
             }
@@ -1286,35 +1296,35 @@ namespace Ink_Canvas
             try
             {
                 Image clonedImage = new Image();
-                
+
                 // 复制图片源
                 if (originalImage.Source is BitmapSource bitmapSource)
                 {
                     clonedImage.Source = bitmapSource;
                 }
-                
+
                 // 复制属性
                 clonedImage.Width = originalImage.Width;
                 clonedImage.Height = originalImage.Height;
                 clonedImage.Stretch = originalImage.Stretch;
                 clonedImage.StretchDirection = originalImage.StretchDirection;
-                
+
                 // 复制位置（在新页面中居中显示）
                 double left = InkCanvas.GetLeft(originalImage);
                 double top = InkCanvas.GetTop(originalImage);
                 InkCanvas.SetLeft(clonedImage, left + 20); // 稍微偏移位置
                 InkCanvas.SetTop(clonedImage, top + 20);
-                
+
                 // 复制变换
                 if (originalImage.RenderTransform is TransformGroup originalTransformGroup)
                 {
                     clonedImage.RenderTransform = originalTransformGroup.Clone();
                 }
-                
+
                 // 设置名称
                 string timestamp = "img_" + DateTime.Now.ToString("yyyyMMdd_HH_mm_ss_fff");
                 clonedImage.Name = timestamp;
-                
+
                 return clonedImage;
             }
             catch (Exception ex)

Ink Canvas/MainWindow_cs/MW_Eraser.cs

@@ -1,4 +1,5 @@
-using System;
+using Ink_Canvas.Helpers;
+using System;
 using System.Diagnostics;
 using System.Linq;
 using System.Windows;
@@ -6,7 +7,6 @@ using System.Windows.Controls;
 using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
-using Ink_Canvas.Helpers;
 
 namespace Ink_Canvas
 {
@@ -750,6 +750,10 @@ namespace Ink_Canvas
                     {
                         overlay.CaptureMouse();
                         StartAdvancedEraserOperation(sender);
+
+                        // 处理单点擦除
+                        var position = e.GetPosition((UIElement)FindName("inkCanvas"));
+                        UpdateAdvancedEraserPosition(sender, position);
                     }
                 };
 
@@ -787,6 +791,10 @@ namespace Ink_Canvas
                             overlay.CaptureStylus();
                         }
                         StartAdvancedEraserOperation(sender);
+
+                        // 处理单点擦除
+                        var position = e.GetPosition((UIElement)FindName("inkCanvas"));
+                        UpdateAdvancedEraserPosition(sender, position);
                     }
                 };
 

Ink Canvas/MainWindow_cs/MW_FloatingWindowInterceptor.cs

@@ -0,0 +1,328 @@
+using Ink_Canvas.Helpers;
+using iNKORE.UI.WPF.Modern.Controls;
+using System;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+
+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>
+        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;
+                }
+                
+                // 更新UI显示
+                UpdateFloatingWindowInterceptorUI();
+                
+                SaveSettingsToFile();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"设置拦截规则失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+        #endregion
+    }
+}

Ink Canvas/MainWindow_cs/MW_Hotkeys.cs

@@ -7,8 +7,12 @@ namespace Ink_Canvas
     {
         private void Window_MouseWheel(object sender, MouseWheelEventArgs e)
         {
-            if (StackPanelPPTControls.Visibility != Visibility.Visible || currentMode != 0) return;
-            
+            // 只有在PPT放映模式下才响应鼠标滚轮翻页
+            if (StackPanelPPTControls.Visibility != Visibility.Visible ||
+                currentMode != 0 ||
+                BtnPPTSlideShowEnd.Visibility != Visibility.Visible ||
+                PPTManager?.IsInSlideShow != true) return;
+
             // 直接发送翻页请求到PPT放映软件，不通过软件处理
             if (e.Delta >= 120)
             {
@@ -24,7 +28,11 @@ namespace Ink_Canvas
 
         private void Main_Grid_PreviewKeyDown(object sender, KeyEventArgs e)
         {
-            if (StackPanelPPTControls.Visibility != Visibility.Visible || currentMode != 0) return;
+            // 只有在PPT放映模式下才响应键盘翻页快捷键
+            if (StackPanelPPTControls.Visibility != Visibility.Visible ||
+                currentMode != 0 ||
+                BtnPPTSlideShowEnd.Visibility != Visibility.Visible ||
+                PPTManager?.IsInSlideShow != true) return;
 
             // 直接发送翻页请求到PPT放映软件，不通过软件处理
             if (e.Key == Key.Down || e.Key == Key.PageDown || e.Key == Key.Right || e.Key == Key.N ||

Ink Canvas/MainWindow_cs/MW_ImageInsert.cs

@@ -1,3 +1,4 @@
+using Ink_Canvas.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -11,7 +12,6 @@ using System.Windows.Forms;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
-using Ink_Canvas.Helpers;
 using Application = System.Windows.Application;
 using Color = System.Drawing.Color;
 using Cursors = System.Windows.Input.Cursors;
@@ -27,11 +27,15 @@ namespace Ink_Canvas
     {
         public Rectangle Area;
         public List<Point> Path;
+        public Bitmap CameraImage;
+        public BitmapSource CameraBitmapSource;
 
-        public ScreenshotResult(Rectangle area, List<Point> path = null)
+        public ScreenshotResult(Rectangle area, List<Point> path = null, Bitmap cameraImage = null, BitmapSource cameraBitmapSource = null)
         {
             Area = area;
             Path = path;
+            CameraImage = cameraImage;
+            CameraBitmapSource = cameraBitmapSource;
         }
     }
 
@@ -55,34 +59,48 @@ 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.CameraBitmapSource != null)
                     {
-                        if (originalBitmap != 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,6 +118,46 @@ namespace Ink_Canvas
             }
         }
 
+        // 直接全屏截图并插入到画布
+        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;
+            }
+        }
+
         // 显示截图区域选择器
         private async Task<ScreenshotResult?> ShowScreenshotSelector()
         {
@@ -112,10 +170,31 @@ 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
+                            );
+                        }
+                        else if (selectorWindow.CameraImage != null)
+                        {
+                            result = new ScreenshotResult(
+                                Rectangle.Empty, // 摄像头截图不需要区域
+                                null, // 摄像头截图不需要路径
+                                selectorWindow.CameraImage // 摄像头图像
+                            );
+                        }
+                        else
+                        {
+                            result = new ScreenshotResult(
+                                selectorWindow.SelectedArea.Value,
+                                selectorWindow.SelectedPath
+                            );
+                        }
                     }
                 });
             }
@@ -173,8 +252,21 @@ namespace Ink_Canvas
         {
             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
@@ -190,11 +282,11 @@ namespace Ink_Canvas
 
                 // 初始化TransformGroup
                 InitializeScreenshotTransform(image);
-                
+
                 // 设置截图属性，避免被InkCanvas选择系统处理
                 image.IsHitTestVisible = true;
                 image.Focusable = false;
-                
+
                 // 初始化InkCanvas选择设置
                 InitializeInkCanvasSelectionSettings();
 
@@ -216,6 +308,11 @@ namespace Ink_Canvas
                 // 提交历史记录
                 timeMachine.CommitElementInsertHistory(image);
 
+                // 插入图片后切换到选择模式并刷新浮动栏高光显示
+                SetCurrentToolMode(InkCanvasEditingMode.Select);
+                UpdateCurrentToolMode("select");
+                HideSubPanels("select");
+
                 ShowNotification("截图已插入到画布");
             }
             catch (Exception ex)
@@ -223,6 +320,69 @@ namespace Ink_Canvas
                 ShowNotification($"插入截图失败: {ex.Message}");
                 LogHelper.WriteLogToFile($"插入截图失败: {ex.Message}", LogHelper.LogType.Error);
             }
+            finally
+            {
+                bitmap?.Dispose();
+            }
+        }
+
+        // 将BitmapSource插入到画布（用于摄像头截图）
+        private async Task InsertBitmapSourceToCanvas(BitmapSource bitmapSource)
+        {
+            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("摄像头截图已插入到画布");
+            }
+            catch (Exception ex)
+            {
+                ShowNotification($"插入摄像头截图失败: {ex.Message}");
+                LogHelper.WriteLogToFile($"插入摄像头截图失败: {ex.Message}", LogHelper.LogType.Error);
+            }
         }
 
         // 初始化截图的TransformGroup
@@ -251,7 +411,7 @@ namespace Ink_Canvas
 
             // 设置光标
             image.Cursor = Cursors.Hand;
-            
+
             // 禁用InkCanvas对截图的选择处理
             image.IsHitTestVisible = true;
             image.Focusable = false;
@@ -360,13 +520,13 @@ namespace Ink_Canvas
 
                 // 创建结果位图，确保支持透明度
                 var resultBitmap = new Bitmap(bitmap.Width, bitmap.Height, PixelFormat.Format32bppArgb);
-                
+
                 // 首先将整个位图设置为透明
                 using (var resultGraphics = Graphics.FromImage(resultBitmap))
                 {
                     // 清除位图，设置为完全透明
                     resultGraphics.Clear(Color.Transparent);
-                    
+
                     // 设置高质量渲染
                     resultGraphics.SmoothingMode = SmoothingMode.AntiAlias;
                     resultGraphics.CompositingQuality = CompositingQuality.HighQuality;
@@ -406,7 +566,7 @@ namespace Ink_Canvas
 
                             // 在裁剪区域内绘制原始图像
                             resultGraphics.DrawImage(bitmap, 0, 0);
-                            
+
                             // 重置裁剪区域，确保后续操作不受影响
                             resultGraphics.ResetClip();
                         }
@@ -433,24 +593,169 @@ namespace Ink_Canvas
         {
             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;
+                    }
+                }
+            }
+        }
+
+        // 备用的位图转换方法（使用内存流）
+        private BitmapSource ConvertBitmapToBitmapSourceFallback(Bitmap bitmap)
+        {
+            try
+            {
+                // 验证位图有效性
+                if (bitmap == null || bitmap.Width <= 0 || bitmap.Height <= 0)
+                    return null;
+
+                // 创建一个新的位图，确保格式正确
+                using (var convertedBitmap = new Bitmap(bitmap.Width, bitmap.Height, PixelFormat.Format24bppRgb))
+                {
+                    using (var graphics = Graphics.FromImage(convertedBitmap))
+                    {
+                        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;
+            }
+        }
+
+        // 最简单的位图转换方法
+        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;
             }
         }
@@ -466,4 +771,4 @@ namespace Ink_Canvas
             return 1.0; // 默认DPI
         }
     }
-} 
+}

Ink Canvas/MainWindow_cs/MW_Notification.cs

@@ -1,8 +1,8 @@
-using System;
+using Ink_Canvas.Helpers;
+using System;
 using System.Linq;
 using System.Threading;
 using System.Windows;
-using Ink_Canvas.Helpers;
 
 namespace Ink_Canvas
 {

Ink Canvas/MainWindow_cs/MW_PPT.cs

@@ -1,4 +1,8 @@
-using System;
+using Ink_Canvas.Helpers;
+using iNKORE.UI.WPF.Modern;
+using Microsoft.Office.Core;
+using Microsoft.Office.Interop.PowerPoint;
+using System;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
@@ -6,15 +10,12 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Threading;
-using Ink_Canvas.Helpers;
-using iNKORE.UI.WPF.Modern;
-using Microsoft.Office.Core;
-using Microsoft.Office.Interop.PowerPoint;
 using Application = System.Windows.Application;
 using File = System.IO.File;
-using MessageBox = System.Windows.MessageBox;
+using MessageBox = iNKORE.UI.WPF.Modern.Controls.MessageBox;
 using MouseButtonEventArgs = System.Windows.Input.MouseButtonEventArgs;
 using MouseEventArgs = System.Windows.Input.MouseEventArgs;
 
@@ -82,13 +83,27 @@ namespace Ink_Canvas
         // 长按翻页相关字段
         private DispatcherTimer _longPressTimer;
         private bool _isLongPressNext = true; // true为下一页，false为上一页
-        private const int LongPressDelay = 15; // 长按延迟时间（毫秒）
-        private const int LongPressInterval = 15; // 长按翻页间隔（毫秒）
+        private const int LongPressDelay = 500; // 长按延迟时间（毫秒）
+        private const int LongPressInterval = 50; // 长按翻页间隔（毫秒）
+
+        // PowerPoint应用程序守护相关字段
+        private DispatcherTimer _powerPointProcessMonitorTimer;
+        private const int ProcessMonitorInterval = 1000; // 应用程序监控间隔（毫秒）
+        
+        // 上次播放位置相关字段
+        private int _lastPlaybackPage = 0;
+        private bool _shouldNavigateToLastPage = false;
+        
+        // 页面切换防抖机制
+        private DateTime _lastSlideSwitchTime = DateTime.MinValue;
+        private int _pendingSlideIndex = -1;
+        private System.Timers.Timer _slideSwitchDebounceTimer;
+        private const int SlideSwitchDebounceMs = 150; // 防抖延迟150毫秒
         #endregion
 
         #region PPT Managers
         private PPTManager _pptManager;
-        private PPTInkManager _pptInkManager;
+        private MultiPPTInkManager _multiPPTInkManager;
         private PPTUIManager _pptUIManager;
 
         /// <summary>
@@ -118,10 +133,11 @@ namespace Ink_Canvas
                 _pptManager.PresentationClose += OnPPTPresentationClose;
                 _pptManager.SlideShowStateChanged += OnPPTSlideShowStateChanged;
 
-                // 初始化墨迹管理器
-                _pptInkManager = new PPTInkManager();
-                _pptInkManager.IsAutoSaveEnabled = Settings.PowerPointSettings.IsAutoSaveStrokesInPowerPoint;
-                _pptInkManager.AutoSaveLocation = Settings.Automation.AutoSavedStrokesLocation;
+                // 初始化多PPT墨迹管理器
+                _multiPPTInkManager = new MultiPPTInkManager();
+                _multiPPTInkManager.IsAutoSaveEnabled = Settings.PowerPointSettings.IsAutoSaveStrokesInPowerPoint;
+                _multiPPTInkManager.AutoSaveLocation = Settings.Automation.AutoSavedStrokesLocation;
+                _multiPPTInkManager.PPTManager = _pptManager;
 
                 // 初始化UI管理器
                 _pptUIManager = new PPTUIManager(this);
@@ -159,17 +175,262 @@ namespace Ink_Canvas
             LogHelper.WriteLogToFile("PPT监控已停止", LogHelper.LogType.Event);
         }
 
+        #region PowerPoint Application Management
+        /// <summary>
+        /// 启动PowerPoint应用程序守护
+        /// </summary>
+        private void StartPowerPointProcessMonitoring()
+        {
+            try
+            {
+                if (!Settings.PowerPointSettings.EnablePowerPointEnhancement) return;
+
+                // 创建PowerPoint应用程序实例
+                CreatePowerPointApplication();
+
+                // 启动应用程序监控定时器
+                if (_powerPointProcessMonitorTimer == null)
+                {
+                    _powerPointProcessMonitorTimer = new DispatcherTimer();
+                    _powerPointProcessMonitorTimer.Interval = TimeSpan.FromMilliseconds(ProcessMonitorInterval);
+                    _powerPointProcessMonitorTimer.Tick += OnPowerPointApplicationMonitorTick;
+                }
+                _powerPointProcessMonitorTimer.Start();
+
+                LogHelper.WriteLogToFile("PowerPoint应用程序守护已启动", LogHelper.LogType.Event);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"启动PowerPoint应用程序守护失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 停止PowerPoint应用程序守护
+        /// </summary>
+        private void StopPowerPointProcessMonitoring()
+        {
+            try
+            {
+                // 停止应用程序监控定时器
+                _powerPointProcessMonitorTimer?.Stop();
+
+                // 关闭PowerPoint应用程序
+                ClosePowerPointApplication();
+
+                LogHelper.WriteLogToFile("PowerPoint应用程序守护已停止", LogHelper.LogType.Event);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"停止PowerPoint应用程序守护失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 创建PowerPoint应用程序实例
+        /// </summary>
+        private void CreatePowerPointApplication()
+        {
+            try
+            {
+                // 如果应用程序已存在且有效，则不重复创建
+                if (pptApplication != null && IsPowerPointApplicationValid())
+                {
+                    return;
+                }
+
+                // 创建新的PowerPoint应用程序实例
+                pptApplication = new Microsoft.Office.Interop.PowerPoint.Application();
+
+                // 设置为不可见，作为后台进程
+                pptApplication.Visible = MsoTriState.msoFalse;
+
+                // 设置应用程序属性
+                pptApplication.WindowState = PpWindowState.ppWindowMinimized;
+
+                // 直接设置PPTManager的PPTApplication属性，绕过COM注册问题
+                Task.Delay(1000).ContinueWith(_ =>
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        try
+                        {
+                            // 直接设置PPTManager的PowerPoint应用程序实例
+                            if (_pptManager != null)
+                            {
+                                // 使用反射或直接访问来设置PPTManager的PPTApplication
+                                SetPPTManagerApplication(pptApplication);
+                                LogHelper.WriteLogToFile("已直接设置PPTManager的PowerPoint应用程序实例", LogHelper.LogType.Event);
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"设置PPTManager的PowerPoint应用程序实例失败: {ex}", LogHelper.LogType.Error);
+                        }
+                    });
+                });
+
+                LogHelper.WriteLogToFile("PowerPoint应用程序实例已创建", LogHelper.LogType.Event);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"创建PowerPoint应用程序实例失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 设置PPTManager的PowerPoint应用程序实例
+        /// </summary>
+        private void SetPPTManagerApplication(Microsoft.Office.Interop.PowerPoint.Application app)
+        {
+            try
+            {
+                if (_pptManager == null) return;
+
+                // 使用反射调用PPTManager的ConnectToPPT方法
+                var pptManagerType = _pptManager.GetType();
+                var connectMethod = pptManagerType.GetMethod("ConnectToPPT",
+                    System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+
+                if (connectMethod != null)
+                {
+                    connectMethod.Invoke(_pptManager, new object[] { app });
+                    LogHelper.WriteLogToFile("通过ConnectToPPT方法设置PowerPoint应用程序实例", LogHelper.LogType.Event);
+                }
+                else
+                {
+                    // 如果无法通过反射调用，尝试直接设置属性
+                    var pptApplicationProperty = pptManagerType.GetProperty("PPTApplication",
+                        System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance);
+
+                    if (pptApplicationProperty != null && pptApplicationProperty.CanWrite)
+                    {
+                        pptApplicationProperty.SetValue(_pptManager, app);
+                        LogHelper.WriteLogToFile("通过属性设置PPTManager的PowerPoint应用程序实例", LogHelper.LogType.Event);
+                    }
+                    else
+                    {
+                        LogHelper.WriteLogToFile("无法设置PPTManager的PowerPoint应用程序实例", LogHelper.LogType.Warning);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"设置PPTManager的PowerPoint应用程序实例失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 检查PowerPoint应用程序是否有效
+        /// </summary>
+        private bool IsPowerPointApplicationValid()
+        {
+            try
+            {
+                if (pptApplication == null) return false;
+                if (!Marshal.IsComObject(pptApplication)) return false;
+
+                // 尝试访问一个简单的属性来验证连接是否有效
+                var _ = pptApplication.Name;
+                return true;
+            }
+            catch (COMException comEx)
+            {
+                var hr = (uint)comEx.HResult;
+                // 如果COM对象已失效，返回false
+                if (hr == 0x8001010E || hr == 0x80004005 || hr == 0x800706B5)
+                {
+                    return false;
+                }
+                return false;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 关闭PowerPoint应用程序
+        /// </summary>
+        private void ClosePowerPointApplication()
+        {
+            try
+            {
+                if (pptApplication != null)
+                {
+                    // 关闭所有打开的演示文稿
+                    if (pptApplication.Presentations.Count > 0)
+                    {
+                        for (int i = pptApplication.Presentations.Count; i >= 1; i--)
+                        {
+                            try
+                            {
+                                pptApplication.Presentations[i].Close();
+                            }
+                            catch { }
+                        }
+                    }
+
+                    // 退出PowerPoint应用程序
+                    pptApplication.Quit();
+
+                    // 释放COM对象
+                    Marshal.ReleaseComObject(pptApplication);
+                    pptApplication = null;
+                }
+
+                LogHelper.WriteLogToFile("PowerPoint应用程序已关闭", LogHelper.LogType.Event);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"关闭PowerPoint应用程序失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// PowerPoint应用程序监控定时器事件
+        /// </summary>
+        private void OnPowerPointApplicationMonitorTick(object sender, EventArgs e)
+        {
+            try
+            {
+                if (!Settings.PowerPointSettings.EnablePowerPointEnhancement)
+                {
+                    StopPowerPointProcessMonitoring();
+                    return;
+                }
+
+                // 检查应用程序是否还在运行
+                if (!IsPowerPointApplicationValid())
+                {
+                    LogHelper.WriteLogToFile("检测到PowerPoint应用程序已失效，重新创建", LogHelper.LogType.Event);
+                    CreatePowerPointApplication();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"PowerPoint应用程序监控异常: {ex}", LogHelper.LogType.Error);
+            }
+        }
+        #endregion
+
         private void DisposePPTManagers()
         {
             try
             {
                 _pptManager?.Dispose();
-                _pptInkManager?.Dispose();
+                _multiPPTInkManager?.Dispose();
                 _longPressTimer?.Stop();
                 _longPressTimer = null;
                 _pptManager = null;
-                _pptInkManager = null;
+                _multiPPTInkManager = null;
                 _pptUIManager = null;
+
+                // 清理PowerPoint进程守护
+                StopPowerPointProcessMonitoring();
+                _powerPointProcessMonitorTimer = null;
+
                 LogHelper.WriteLogToFile("PPT管理器已释放", LogHelper.LogType.Event);
             }
             catch (Exception ex)
@@ -198,6 +459,8 @@ namespace Ink_Canvas
             if (!Settings.PowerPointSettings.EnablePPTButtonLongPressPageTurn) return;
 
             _isLongPressNext = isNext;
+            // 重置定时器间隔为初始延迟时间，确保每次长按检测都从正确的延迟开始
+            _longPressTimer.Interval = TimeSpan.FromMilliseconds(LongPressDelay);
             _longPressTimer?.Start();
         }
 
@@ -247,7 +510,7 @@ namespace Ink_Canvas
                     {
                         LogHelper.WriteLogToFile("PPT连接已断开", LogHelper.LogType.Event);
                         // 清理墨迹管理器
-                        _pptInkManager?.ClearAllStrokes();
+                        _multiPPTInkManager?.ClearAllStrokes();
                     }
                 });
             }
@@ -265,15 +528,15 @@ namespace Ink_Canvas
                 {
                     // 在初始化墨迹管理器之前，先清理画布上的所有墨迹
                     ClearStrokes(true);
-                    
+
                     // 清理备份历史记录，防止旧演示文稿的墨迹影响新演示文稿
                     if (TimeMachineHistories != null && TimeMachineHistories.Length > 0)
                     {
                         TimeMachineHistories[0] = null;
                     }
-                    
-                    // 初始化墨迹管理器
-                    _pptInkManager?.InitializePresentation(pres);
+
+                    // 初始化多PPT墨迹管理器
+                    _multiPPTInkManager?.InitializePresentation(pres);
 
                     // 处理跳转到首页或上次播放页的逻辑
                     HandlePresentationOpenNavigation(pres);
@@ -291,7 +554,7 @@ namespace Ink_Canvas
                     }
 
                     _pptUIManager?.UpdateConnectionStatus(true);
-                    
+
                     LogHelper.WriteLogToFile($"已打开新演示文稿: {pres.Name}，墨迹状态已清理", LogHelper.LogType.Event);
                 });
             }
@@ -308,17 +571,24 @@ namespace Ink_Canvas
                 Application.Current.Dispatcher.InvokeAsync(() =>
                 {
                     // 保存所有墨迹
-                    _pptInkManager?.SaveAllStrokesToFile(pres);
+                    _multiPPTInkManager?.SaveAllStrokesToFile(pres);
 
-                    // 清理墨迹管理器
-                    _pptInkManager?.ClearAllStrokes();
+                    // 移除演示文稿管理器
+                    _multiPPTInkManager?.RemovePresentation(pres);
 
                     _pptUIManager?.UpdateConnectionStatus(false);
                 });
             }
-            catch (Exception ex)
+            catch (COMException comEx)
+            {
+                // COM对象已失效，这是正常情况，完全静默处理
+                var hr = (uint)comEx.HResult;
+                if (hr == 0x8001010E || hr == 0x80004005 || hr == 0x800706BA || hr == 0x800706BE || hr == 0x80048010)
+                {
+                }
+            }
+            catch (Exception)
             {
-                LogHelper.WriteLogToFile($"处理演示文稿关闭事件失败: {ex}", LogHelper.LogType.Error);
             }
         }
 
@@ -333,8 +603,10 @@ namespace Ink_Canvas
 
                     if (!isInSlideShow)
                     {
-                        LogHelper.WriteLogToFile("PPT放映状态变化：退出放映模式", LogHelper.LogType.Trace);
                     }
+
+                    // 检查主窗口可见性（用于仅PPT模式）
+                    CheckMainWindowVisibility();
                 });
             }
             catch (Exception ex)
@@ -359,11 +631,23 @@ namespace Ink_Canvas
 
                 await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
-                    // 处理跳转到首页
+                    // 获取当前活跃的演示文稿并切换到对应的墨迹管理器
+                    var activePresentation = _pptManager?.GetCurrentActivePresentation();
+                    if (activePresentation != null)
+                    {
+                        _multiPPTInkManager?.SwitchToPresentation(activePresentation);
+                    }
+
+                    // 处理跳转到首页或上次播放位置
                     if (Settings.PowerPointSettings.IsAlwaysGoToFirstPageOnReenter)
                     {
                         _pptManager?.TryNavigateToSlide(1);
                     }
+                    else if (_shouldNavigateToLastPage && _lastPlaybackPage > 0)
+                    {
+                        _pptManager?.TryNavigateToSlide(_lastPlaybackPage);
+                        _shouldNavigateToLastPage = false; // 重置标志位
+                    }
 
                     // 更新UI状态
                     var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
@@ -393,14 +677,45 @@ namespace Ink_Canvas
 
                     BorderFloatingBarMainControls.Visibility = Visibility.Visible;
 
-                    // 在PPT模式下隐藏手势面板和手势按钮
+                    // 在PPT模式下根据设置决定是否隐藏手势面板和手势按钮
                     AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
                     AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
-                    EnableTwoFingerGestureBorder.Visibility = Visibility.Collapsed;
+
+                    // 根据设置决定是否在PPT放映模式下显示手势按钮
+                    if (Settings.PowerPointSettings.ShowGestureButtonInSlideShow)
+                    {
+                        // 如果启用了PPT放映模式显示手势按钮，则显示手势按钮
+                        if (Settings.Gesture.IsEnableTwoFingerGesture)
+                        {
+                            CheckEnableTwoFingerGestureBtnVisibility(true);
+                        }
+                    }
+                    else
+                    {
+                        // 如果禁用了PPT放映模式显示手势按钮，则隐藏手势按钮
+                        EnableTwoFingerGestureBorder.Visibility = Visibility.Collapsed;
+                    }
 
                     if (Settings.PowerPointSettings.IsShowCanvasAtNewSlideShow &&
                         !Settings.Automation.IsAutoFoldInPPTSlideShow)
+                    {
                         BtnColorRed_Click(null, null);
+                        Dispatcher.BeginInvoke(new Action(() =>
+                        {
+                            try
+                            {
+                                if (inkCanvas.EditingMode == InkCanvasEditingMode.Ink)
+                                {
+                                    UpdateCurrentToolMode("pen");
+                                    SetFloatingBarHighlightPosition("pen");
+                                }
+                            }
+                            catch (Exception ex)
+                            {
+                                LogHelper.WriteLogToFile($"PPT进入批注模式后同步浮动栏高光状态失败: {ex.Message}", LogHelper.LogType.Error);
+                            }
+                        }), DispatcherPriority.Loaded);
+                    }
 
                     isEnteredSlideShowEndEvent = false;
 
@@ -432,16 +747,19 @@ namespace Ink_Canvas
             {
                 Application.Current.Dispatcher.InvokeAsync(() =>
                 {
+                    // 获取当前活跃的演示文稿并确保切换到正确的墨迹管理器
+                    var activePresentation = _pptManager?.GetCurrentActivePresentation();
+                    if (activePresentation != null)
+                    {
+                        _multiPPTInkManager?.SwitchToPresentation(activePresentation);
+                    }
+
                     var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
                     var totalSlides = _pptManager?.SlidesCount ?? 0;
 
-                    // 保存上一页墨迹并加载当前页墨迹
-                    SwitchSlideInk(currentSlide);
+                    // 使用防抖机制处理页面切换
+                    HandleSlideSwitchWithDebounce(currentSlide, totalSlides);
 
-                    // 更新UI
-                    _pptUIManager?.UpdateCurrentSlideNumber(currentSlide, totalSlides);
-
-                    LogHelper.WriteLogToFile($"幻灯片切换到第{currentSlide}页", LogHelper.LogType.Trace);
                 });
             }
             catch (Exception ex)
@@ -468,7 +786,7 @@ namespace Ink_Canvas
                 isEnteredSlideShowEndEvent = true;
 
                 // 保存所有墨迹
-                _pptInkManager?.SaveAllStrokesToFile(pres);
+                    _multiPPTInkManager?.SaveAllStrokesToFile(pres);
 
                 await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
@@ -500,6 +818,9 @@ namespace Ink_Canvas
                         // 注意：这里只清空索引0的备份，不影响白板页面的墨迹（索引1及以上）
                         TimeMachineHistories[0] = null;
 
+                        // 重置墨迹管理器的锁定状态，防止下次放映时墨迹显示错误
+                        ResetInkManagerLockState();
+
                         // 退出PPT模式时恢复手势面板和手势按钮的显示状态
                         if (Settings.Gesture.IsEnableTwoFingerGesture && ToggleSwitchEnableMultiTouchMode.IsOn)
                         {
@@ -524,6 +845,7 @@ namespace Ink_Canvas
 
                         if (GridTransparencyFakeBackground.Background != Brushes.Transparent)
                             BtnHideInkCanvas_Click(BtnHideInkCanvas, null);
+                        SetCurrentToolMode(InkCanvasEditingMode.None);
                     }
                     catch (Exception ex)
                     {
@@ -531,7 +853,7 @@ namespace Ink_Canvas
                     }
                 });
 
-                await Task.Delay(150);
+                await Task.Delay(100);
                 await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
                     // 强制重新计算浮动栏位置，确保在退出PPT模式后正确复位
@@ -583,9 +905,10 @@ namespace Ink_Canvas
 
                 if (int.TryParse(File.ReadAllText(positionFile), out var page) && page > 0)
                 {
+                    _lastPlaybackPage = page;
                     new YesOrNoNotificationWindow($"上次播放到了第 {page} 页, 是否立即跳转", () =>
                     {
-                        _pptManager?.TryNavigateToSlide(page);
+                        _shouldNavigateToLastPage = true;
                     }).ShowDialog();
                 }
             }
@@ -704,7 +1027,7 @@ namespace Ink_Canvas
         {
             try
             {
-                var strokes = _pptInkManager?.LoadSlideStrokes(slideIndex);
+                var strokes = _multiPPTInkManager?.LoadSlideStrokes(slideIndex);
                 if (strokes != null)
                 {
                     inkCanvas.Strokes.Clear();
@@ -717,11 +1040,95 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 重置墨迹管理器的锁定状态，防止墨迹显示错误
+        /// </summary>
+        private void ResetInkManagerLockState()
+        {
+            try
+            {
+                // 获取当前活跃的演示文稿
+                var activePresentation = _pptManager?.GetCurrentActivePresentation();
+                if (activePresentation != null)
+                {
+                    // 切换到对应的墨迹管理器
+                    _multiPPTInkManager?.SwitchToPresentation(activePresentation);
+                    
+                    // 重置锁定状态
+                    _multiPPTInkManager?.ResetCurrentPresentationLockState();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"重置墨迹管理器锁定状态失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 使用防抖机制处理页面切换
+        /// </summary>
+        private void HandleSlideSwitchWithDebounce(int currentSlide, int totalSlides)
+        {
+            try
+            {
+                var now = DateTime.Now;
+                
+                // 如果距离上次切换时间太短，使用防抖机制
+                if (now - _lastSlideSwitchTime < TimeSpan.FromMilliseconds(SlideSwitchDebounceMs))
+                {
+                    _pendingSlideIndex = currentSlide;
+                    
+                    // 停止之前的定时器
+                    _slideSwitchDebounceTimer?.Stop();
+                    
+                    // 创建新的定时器
+                    _slideSwitchDebounceTimer = new System.Timers.Timer(SlideSwitchDebounceMs);
+                    _slideSwitchDebounceTimer.Elapsed += (sender, e) =>
+                    {
+                        Application.Current.Dispatcher.Invoke(() =>
+                        {
+                            if (_pendingSlideIndex > 0)
+                            {
+                                SwitchSlideInk(_pendingSlideIndex);
+                                _pptUIManager?.UpdateCurrentSlideNumber(_pendingSlideIndex, totalSlides);
+                                _pendingSlideIndex = -1;
+                            }
+                        });
+                        _slideSwitchDebounceTimer?.Stop();
+                    };
+                    _slideSwitchDebounceTimer.Start();
+                }
+                else
+                {
+                    // 直接处理页面切换
+                    SwitchSlideInk(currentSlide);
+                    _pptUIManager?.UpdateCurrentSlideNumber(currentSlide, totalSlides);
+                }
+                
+                _lastSlideSwitchTime = now;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"处理页面切换防抖失败: {ex}", LogHelper.LogType.Error);
+            }
+        }
+
         private void SwitchSlideInk(int newSlideIndex)
         {
             try
             {
-                var newStrokes = _pptInkManager?.SwitchToSlide(newSlideIndex, inkCanvas.Strokes);
+                // 获取当前页面索引
+                var currentSlideIndex = _pptManager?.GetCurrentSlideNumber() ?? 0;
+                
+                // 如果有当前墨迹且不是第一次切换，先保存到当前页面
+                if (inkCanvas.Strokes.Count > 0 && currentSlideIndex > 0 && currentSlideIndex != newSlideIndex)
+                {
+                    _multiPPTInkManager?.SaveCurrentSlideStrokes(currentSlideIndex, inkCanvas.Strokes);
+                    LogHelper.WriteLogToFile($"切换前保存第{currentSlideIndex}页墨迹，墨迹数量: {inkCanvas.Strokes.Count}", LogHelper.LogType.Trace);
+                }
+                
+                // 切换到新页面并加载墨迹
+                var newStrokes = _multiPPTInkManager?.SwitchToSlide(newSlideIndex, null);
                 if (newStrokes != null)
                 {
                     inkCanvas.Strokes.Clear();
@@ -729,7 +1136,7 @@ namespace Ink_Canvas
                 }
 
                 // 设置墨迹锁定
-                _pptInkManager?.LockInkForSlide(newSlideIndex);
+                _multiPPTInkManager?.LockInkForSlide(newSlideIndex);
             }
             catch (Exception ex)
             {
@@ -795,12 +1202,50 @@ namespace Ink_Canvas
             }
         }
 
+        private void ToggleSwitchPowerPointEnhancement_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+
+            Settings.PowerPointSettings.EnablePowerPointEnhancement = ToggleSwitchPowerPointEnhancement.IsOn;
+
+            if (Settings.PowerPointSettings.EnablePowerPointEnhancement)
+            {
+                Settings.PowerPointSettings.IsSupportWPS = false;
+                ToggleSwitchSupportWPS.IsOn = false;
+
+                // 更新PPT管理器的WPS支持设置
+                if (_pptManager != null)
+                {
+                    _pptManager.IsSupportWPS = false;
+                }
+            }
+
+            SaveSettingsToFile();
+
+            // 启动或停止PowerPoint进程守护
+            if (Settings.PowerPointSettings.EnablePowerPointEnhancement)
+            {
+                StartPowerPointProcessMonitoring();
+            }
+            else
+            {
+                StopPowerPointProcessMonitoring();
+            }
+        }
+
         private void ToggleSwitchSupportWPS_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
 
             Settings.PowerPointSettings.IsSupportWPS = ToggleSwitchSupportWPS.IsOn;
 
+            if (Settings.PowerPointSettings.IsSupportWPS)
+            {
+                Settings.PowerPointSettings.EnablePowerPointEnhancement = false;
+                ToggleSwitchPowerPointEnhancement.IsOn = false;
+                StopPowerPointProcessMonitoring();
+            }
+
             // 更新PPT管理器的WPS支持设置
             if (_pptManager != null)
             {
@@ -815,24 +1260,6 @@ namespace Ink_Canvas
         public static bool IsShowingRestoreHiddenSlidesWindow;
         private static bool IsShowingAutoplaySlidesWindow;
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
         private void BtnPPTSlidesUp_Click(object sender, RoutedEventArgs e)
         {
             Application.Current.Dispatcher.Invoke(() =>
@@ -843,7 +1270,7 @@ namespace Ink_Canvas
                     var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
                     if (currentSlide > 0)
                     {
-                        _pptInkManager?.SaveCurrentSlideStrokes(currentSlide, inkCanvas.Strokes);
+                        _multiPPTInkManager?.SaveCurrentSlideStrokes(currentSlide, inkCanvas.Strokes);
                     }
 
                     // 保存截图（如果启用）
@@ -858,7 +1285,6 @@ namespace Ink_Canvas
                     if (_pptManager?.TryNavigatePrevious() == true)
                     {
                         // 翻页成功，等待事件处理墨迹切换
-                        LogHelper.WriteLogToFile("成功切换到上一页", LogHelper.LogType.Trace);
                     }
                     else
                     {
@@ -884,7 +1310,7 @@ namespace Ink_Canvas
                     var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
                     if (currentSlide > 0)
                     {
-                        _pptInkManager?.SaveCurrentSlideStrokes(currentSlide, inkCanvas.Strokes);
+                        _multiPPTInkManager?.SaveCurrentSlideStrokes(currentSlide, inkCanvas.Strokes);
                     }
 
                     // 保存截图（如果启用）
@@ -899,7 +1325,6 @@ namespace Ink_Canvas
                     if (_pptManager?.TryNavigateNext() == true)
                     {
                         // 翻页成功，等待事件处理墨迹切换
-                        LogHelper.WriteLogToFile("成功切换到下一页", LogHelper.LogType.Trace);
                     }
                     else
                     {
@@ -1045,7 +1470,7 @@ namespace Ink_Canvas
                 {
                     Application.Current.Dispatcher.Invoke(() =>
                     {
-                        _pptInkManager?.SaveCurrentSlideStrokes(currentSlide, inkCanvas.Strokes);
+                        _multiPPTInkManager?.SaveCurrentSlideStrokes(currentSlide, inkCanvas.Strokes);
                         timeMachine.ClearStrokeHistory();
                     });
                 }
@@ -1053,7 +1478,6 @@ namespace Ink_Canvas
                 // 结束放映
                 if (_pptManager?.TryEndSlideShow() == true)
                 {
-                    LogHelper.WriteLogToFile("成功结束幻灯片放映", LogHelper.LogType.Event);
                 }
                 else
                 {
@@ -1069,6 +1493,8 @@ namespace Ink_Canvas
                 }
 
                 HideSubPanels("cursor");
+                SetCurrentToolMode(InkCanvasEditingMode.None);
+                
                 await Task.Delay(150);
                 ViewboxFloatingBarMarginAnimation(100, true);
             }

Ink Canvas/MainWindow_cs/MW_PageListView.cs

@@ -1,10 +1,10 @@
-using System.Collections.ObjectModel;
+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 Ink_Canvas.Helpers;
 
 namespace Ink_Canvas
 {
@@ -96,7 +96,7 @@ namespace Ink_Canvas
                         inkCanvas.EditingMode = previousEditingMode;
                         currentSelectedElement = null;
                     }
-                    
+
                     SaveStrokes();
                     ClearStrokes(true);
                     CurrentWhiteboardIndex = index + 1;
@@ -129,7 +129,7 @@ namespace Ink_Canvas
                         inkCanvas.EditingMode = previousEditingMode;
                         currentSelectedElement = null;
                     }
-                    
+
                     SaveStrokes();
                     ClearStrokes(true);
                     CurrentWhiteboardIndex = index + 1;

Ink Canvas/MainWindow_cs/MW_Save&OpenStrokes.cs

@@ -1,3 +1,5 @@
+using Ink_Canvas.Helpers;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -12,8 +14,6 @@ using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using Ink_Canvas.Helpers;
-using Newtonsoft.Json;
 using Color = System.Drawing.Color;
 using File = System.IO.File;
 using Image = System.Windows.Controls.Image;
@@ -78,7 +78,7 @@ namespace Ink_Canvas
 
                         for (int i = 1; i <= totalSlides; i++)
                         {
-                            var slideStrokes = _pptInkManager?.LoadSlideStrokes(i);
+                            var slideStrokes = _multiPPTInkManager?.LoadSlideStrokes(i);
                             if (slideStrokes != null && slideStrokes.Count > 0)
                             {
                                 allPageStrokes.Add(slideStrokes);
@@ -528,7 +528,7 @@ namespace Ink_Canvas
                 timeMachine.ClearStrokeHistory();
 
                 // 重置PPT墨迹存储
-                _pptInkManager?.ClearAllStrokes();
+                _multiPPTInkManager?.ClearAllStrokes();
 
                 // 读取所有页面的墨迹文件
                 var files = Directory.GetFiles(tempDir, "page_*.icstk");
@@ -542,7 +542,7 @@ namespace Ink_Canvas
                             var strokes = new StrokeCollection(fs);
                             if (strokes.Count > 0)
                             {
-                                _pptInkManager?.SaveCurrentSlideStrokes(pageNumber, strokes);
+                                _multiPPTInkManager?.ForceSaveSlideStrokes(pageNumber, strokes);
                             }
                         }
                     }
@@ -552,7 +552,7 @@ namespace Ink_Canvas
                 if (_pptManager?.IsInSlideShow == true)
                 {
                     int currentSlide = _pptManager.GetCurrentSlideNumber();
-                    var currentStrokes = _pptInkManager?.LoadSlideStrokes(currentSlide);
+                    var currentStrokes = _multiPPTInkManager?.LoadSlideStrokes(currentSlide);
                     if (currentStrokes != null && currentStrokes.Count > 0)
                     {
                         inkCanvas.Strokes.Add(currentStrokes);
@@ -643,7 +643,7 @@ namespace Ink_Canvas
         /// <summary>
         /// 打开单个墨迹文件
         /// </summary>
-        private void OpenSingleStrokeFile(string filePath)
+        public void OpenSingleStrokeFile(string filePath)
         {
             var fileStreamHasNoStroke = false;
             using (var fs = new FileStream(filePath, FileMode.Open, FileAccess.Read))

Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs

@@ -1,3 +1,5 @@
+using Ink_Canvas.Helpers;
+using iNKORE.UI.WPF.Modern.Controls;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -6,7 +8,7 @@ using System.Windows.Controls;
 using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
-using iNKORE.UI.WPF.Modern.Controls;
+using System.Windows.Shapes;
 using Point = System.Windows.Point;
 
 namespace Ink_Canvas
@@ -254,18 +256,101 @@ namespace Ink_Canvas
         #endregion
 
         private bool isGridInkCanvasSelectionCoverMouseDown;
+        private bool isStrokeDragging = false;
+        private Point strokeDragStartPoint;
         private StrokeCollection StrokesSelectionClone = new StrokeCollection();
 
+        // 选择框和选择点相关变量
+        private bool isResizing = false;
+        private string currentResizeHandle = "";
+        private Point resizeStartPoint;
+        private Rect originalSelectionBounds;
+
         private void GridInkCanvasSelectionCover_MouseDown(object sender, MouseButtonEventArgs e)
         {
             isGridInkCanvasSelectionCoverMouseDown = true;
+
+            // 检查是否有选中的墨迹
+            if (inkCanvas.GetSelectedStrokes().Count > 0)
+            {
+                // 获取鼠标点击位置
+                var clickPoint = e.GetPosition(inkCanvas);
+                var selectionBounds = inkCanvas.GetSelectionBounds();
+
+                // 检查点击位置是否在选择框边界内
+                if (clickPoint.X >= selectionBounds.Left &&
+                    clickPoint.X <= selectionBounds.Right &&
+                    clickPoint.Y >= selectionBounds.Top &&
+                    clickPoint.Y <= selectionBounds.Bottom)
+                {
+                    // 只有在选择框边界内才允许拖动
+                    isStrokeDragging = true;
+                    strokeDragStartPoint = clickPoint;
+                    GridInkCanvasSelectionCover.CaptureMouse();
+                    GridInkCanvasSelectionCover.Cursor = Cursors.SizeAll;
+                }
+                else
+                {
+                    // 点击在选择框外，取消选择
+                    inkCanvas.Select(new StrokeCollection());
+                    GridInkCanvasSelectionCover.Visibility = Visibility.Collapsed;
+                }
+            }
+        }
+
+        private void GridInkCanvasSelectionCover_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (!isGridInkCanvasSelectionCoverMouseDown) return;
+
+            // 如果正在拖动墨迹，执行拖动操作
+            if (isStrokeDragging && GridInkCanvasSelectionCover.IsMouseCaptured)
+            {
+                var currentPoint = e.GetPosition(inkCanvas);
+                var delta = currentPoint - strokeDragStartPoint;
+
+                // 创建变换矩阵
+                var matrix = new Matrix();
+                matrix.Translate(delta.X, delta.Y);
+
+                // 对选中的墨迹应用变换
+                var selectedStrokes = inkCanvas.GetSelectedStrokes();
+                foreach (var stroke in selectedStrokes)
+                {
+                    stroke.Transform(matrix, false);
+                }
+
+                // 更新选中栏位置
+                updateBorderStrokeSelectionControlLocation();
+
+                // 更新起始点
+                strokeDragStartPoint = currentPoint;
+            }
+            else if (inkCanvas.GetSelectedStrokes().Count > 0)
+            {
+                // 当鼠标在选中区域移动时，更新墨迹选中栏位置
+                updateBorderStrokeSelectionControlLocation();
+            }
         }
 
         private void GridInkCanvasSelectionCover_MouseUp(object sender, MouseButtonEventArgs e)
         {
             if (!isGridInkCanvasSelectionCoverMouseDown) return;
+
+            // 结束墨迹拖动
+            if (isStrokeDragging)
+            {
+                isStrokeDragging = false;
+                GridInkCanvasSelectionCover.ReleaseMouseCapture();
+                GridInkCanvasSelectionCover.Cursor = Cursors.Arrow;
+            }
+
             isGridInkCanvasSelectionCoverMouseDown = false;
-            GridInkCanvasSelectionCover.Visibility = Visibility.Collapsed;
+
+            // 只有在没有选中墨迹时才隐藏选中栏
+            if (inkCanvas.GetSelectedStrokes().Count == 0)
+            {
+                GridInkCanvasSelectionCover.Visibility = Visibility.Collapsed;
+            }
         }
 
         private void BtnSelect_Click(object sender, RoutedEventArgs e)
@@ -305,29 +390,53 @@ namespace Ink_Canvas
         private void inkCanvas_SelectionChanged(object sender, EventArgs e)
         {
             if (isProgramChangeStrokeSelection) return;
-            
-            // 检查是否有图片元素被选中
-            var selectedElements = inkCanvas.GetSelectedElements();
-            bool hasImageElement = selectedElements.Any(element => element is Image);
-            
-            // 如果有图片元素被选中，不显示选择框
-            if (hasImageElement)
-            {
-                GridInkCanvasSelectionCover.Visibility = Visibility.Collapsed;
-                return;
-            }
-            
-            if (inkCanvas.GetSelectedStrokes().Count == 0)
-            {
-                GridInkCanvasSelectionCover.Visibility = Visibility.Collapsed;
-            }
-            else
+
+            // 优先检查墨迹选择状态
+            if (inkCanvas.GetSelectedStrokes().Count > 0)
             {
+                // 有墨迹被选中，清除图片选择状态
+                if (currentSelectedElement != null)
+                {
+                    currentSelectedElement = null;
+                    // 隐藏图片选择工具栏
+                    if (BorderImageSelectionControl != null)
+                    {
+                        BorderImageSelectionControl.Visibility = Visibility.Collapsed;
+                    }
+                }
+
+                // 显示墨迹选择栏和选择框
                 GridInkCanvasSelectionCover.Visibility = Visibility.Visible;
                 BorderStrokeSelectionClone.Background = Brushes.Transparent;
                 isStrokeSelectionCloneOn = false;
                 updateBorderStrokeSelectionControlLocation();
+                UpdateSelectionDisplay();
+                return;
             }
+
+            // 检查是否有图片元素被选中（通过InkCanvas的选中元素）
+            var selectedElements = inkCanvas.GetSelectedElements();
+            bool hasImageElement = selectedElements.Any(element => element is Image);
+
+            // 如果有图片元素被选中，不显示选择框
+            if (hasImageElement)
+            {
+                GridInkCanvasSelectionCover.Visibility = Visibility.Collapsed;
+                HideSelectionDisplay();
+                return;
+            }
+
+            // 检查是否有图片元素被选中（通过currentSelectedElement）
+            if (currentSelectedElement != null && currentSelectedElement is Image)
+            {
+                GridInkCanvasSelectionCover.Visibility = Visibility.Collapsed;
+                HideSelectionDisplay();
+                return;
+            }
+
+            // 没有选中任何内容，隐藏选择框
+            GridInkCanvasSelectionCover.Visibility = Visibility.Collapsed;
+            HideSelectionDisplay();
         }
 
 
@@ -336,7 +445,7 @@ namespace Ink_Canvas
         {
             var borderLeft = (inkCanvas.GetSelectionBounds().Left + inkCanvas.GetSelectionBounds().Right -
                               BorderStrokeSelectionControlWidth) / 2;
-            var borderTop = inkCanvas.GetSelectionBounds().Bottom + 1;
+            var borderTop = inkCanvas.GetSelectionBounds().Bottom + 10; // 在墨迹下方10像素处显示
             if (borderLeft < 0) borderLeft = 0;
             if (borderTop < 0) borderTop = 0;
             if (Width - borderLeft < BorderStrokeSelectionControlWidth || double.IsNaN(borderLeft))
@@ -344,7 +453,14 @@ namespace Ink_Canvas
             if (Height - borderTop < BorderStrokeSelectionControlHeight || double.IsNaN(borderTop))
                 borderTop = Height - BorderStrokeSelectionControlHeight;
 
-            if (borderTop > 60) borderTop -= 60;
+            // 确保墨迹选中栏始终显示在墨迹下方
+            // 如果选中栏会超出屏幕底部，则显示在墨迹上方
+            if (borderTop + BorderStrokeSelectionControlHeight > Height)
+            {
+                borderTop = inkCanvas.GetSelectionBounds().Top - BorderStrokeSelectionControlHeight - 10;
+                if (borderTop < 0) borderTop = 10; // 如果上方也没有空间，则显示在顶部
+            }
+
             BorderStrokeSelectionControl.Margin = new Thickness(borderLeft, borderTop, 0, 0);
         }
 
@@ -408,25 +524,19 @@ namespace Ink_Canvas
                         strokes = StrokesSelectionClone;
                     else if (Settings.Gesture.IsEnableTwoFingerRotationOnSelection)
                         m.RotateAt(rotate, center.X, center.Y); // 旋转
+
+                    // 应用变换到选中的墨迹
                     foreach (var stroke in strokes)
                     {
                         stroke.Transform(m, false);
-
-                        try
-                        {
-                            stroke.DrawingAttributes.Width *= md.Scale.X;
-                            stroke.DrawingAttributes.Height *= md.Scale.Y;
-                        }
-                        catch
-                        {
-                        }
                     }
 
                     updateBorderStrokeSelectionControlLocation();
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                LogHelper.WriteLogToFile($"墨迹ManipulationDelta错误: {ex.Message}", LogHelper.LogType.Error);
             }
         }
 
@@ -438,6 +548,78 @@ namespace Ink_Canvas
         {
         }
 
+        private void GridInkCanvasSelectionCover_TouchMove(object sender, TouchEventArgs e)
+        {
+            // 处理触摸移动事件 - 用于拖动选中的墨迹
+            if (inkCanvas.GetSelectedStrokes().Count > 0 && dec.Count == 1)
+            {
+                var currentTouchPoint = e.GetTouchPoint(inkCanvas).Position;
+
+                // 检查是否有有效的起始触摸点
+                if (lastTouchPointOnGridInkCanvasCover != new Point(0, 0))
+                {
+                    var delta = currentTouchPoint - lastTouchPointOnGridInkCanvasCover;
+
+                    // 只有当移动距离足够大时才进行拖动（避免微小移动造成的抖动）
+                    if (Math.Abs(delta.X) > 1 || Math.Abs(delta.Y) > 1)
+                    {
+                        // 创建变换矩阵
+                        var matrix = new Matrix();
+                        matrix.Translate(delta.X, delta.Y);
+
+                        // 对选中的墨迹应用变换
+                        var selectedStrokes = inkCanvas.GetSelectedStrokes();
+                        foreach (var stroke in selectedStrokes)
+                        {
+                            stroke.Transform(matrix, false);
+                        }
+
+                        // 更新选中栏位置
+                        updateBorderStrokeSelectionControlLocation();
+
+                        // 更新最后触摸点
+                        lastTouchPointOnGridInkCanvasCover = currentTouchPoint;
+                    }
+                }
+            }
+        }
+
+        private void GridInkCanvasSelectionCover_PreviewTouchMove(object sender, TouchEventArgs e)
+        {
+            // 预览触摸移动事件 - 用于更精确的触摸处理
+            if (inkCanvas.GetSelectedStrokes().Count > 0 && dec.Count == 1)
+            {
+                var currentTouchPoint = e.GetTouchPoint(inkCanvas).Position;
+
+                // 检查是否有有效的起始触摸点
+                if (lastTouchPointOnGridInkCanvasCover != new Point(0, 0))
+                {
+                    var delta = currentTouchPoint - lastTouchPointOnGridInkCanvasCover;
+
+                    // 只有当移动距离足够大时才进行拖动（避免微小移动造成的抖动）
+                    if (Math.Abs(delta.X) > 1 || Math.Abs(delta.Y) > 1)
+                    {
+                        // 创建变换矩阵
+                        var matrix = new Matrix();
+                        matrix.Translate(delta.X, delta.Y);
+
+                        // 对选中的墨迹应用变换
+                        var selectedStrokes = inkCanvas.GetSelectedStrokes();
+                        foreach (var stroke in selectedStrokes)
+                        {
+                            stroke.Transform(matrix, false);
+                        }
+
+                        // 更新选中栏位置
+                        updateBorderStrokeSelectionControlLocation();
+
+                        // 更新最后触摸点
+                        lastTouchPointOnGridInkCanvasCover = currentTouchPoint;
+                    }
+                }
+            }
+        }
+
         private Point lastTouchPointOnGridInkCanvasCover = new Point(0, 0);
 
         private void GridInkCanvasSelectionCover_PreviewTouchDown(object sender, TouchEventArgs e)
@@ -448,7 +630,32 @@ namespace Ink_Canvas
             {
                 var touchPoint = e.GetTouchPoint(null);
                 centerPoint = touchPoint.Position;
-                lastTouchPointOnGridInkCanvasCover = touchPoint.Position;
+                lastTouchPointOnGridInkCanvasCover = e.GetTouchPoint(inkCanvas).Position;
+
+                // 检查是否有选中的墨迹
+                if (inkCanvas.GetSelectedStrokes().Count > 0)
+                {
+                    // 获取触摸点位置
+                    var touchPosition = e.GetTouchPoint(inkCanvas).Position;
+                    var selectionBounds = inkCanvas.GetSelectionBounds();
+
+                    // 检查触摸位置是否在选择框边界内
+                    if (touchPosition.X >= selectionBounds.Left &&
+                        touchPosition.X <= selectionBounds.Right &&
+                        touchPosition.Y >= selectionBounds.Top &&
+                        touchPosition.Y <= selectionBounds.Bottom)
+                    {
+                        // 只有在选择框边界内才允许拖动
+                        // 触摸拖动状态已通过TouchMove事件处理
+                    }
+                    else
+                    {
+                        // 触摸在选择框外，取消选择
+                        inkCanvas.Select(new StrokeCollection());
+                        GridInkCanvasSelectionCover.Visibility = Visibility.Collapsed;
+                        return;
+                    }
+                }
 
                 if (isStrokeSelectionCloneOn)
                 {
@@ -474,13 +681,32 @@ namespace Ink_Canvas
         {
             dec.Remove(e.TouchDevice.Id);
             if (dec.Count >= 1) return;
+
+            // 重置触摸状态
+            lastTouchPointOnGridInkCanvasCover = new Point(0, 0);
             isProgramChangeStrokeSelection = false;
-            if (lastTouchPointOnGridInkCanvasCover == e.GetTouchPoint(null).Position)
+
+            // 检查是否有点击（没有移动）
+            var currentTouchPoint = e.GetTouchPoint(null).Position;
+            if (Math.Abs(currentTouchPoint.X - centerPoint.X) < 5 && Math.Abs(currentTouchPoint.Y - centerPoint.Y) < 5)
             {
-                if (!(lastTouchPointOnGridInkCanvasCover.X < inkCanvas.GetSelectionBounds().Left) &&
-                    !(lastTouchPointOnGridInkCanvasCover.Y < inkCanvas.GetSelectionBounds().Top) &&
-                    !(lastTouchPointOnGridInkCanvasCover.X > inkCanvas.GetSelectionBounds().Right) &&
-                    !(lastTouchPointOnGridInkCanvasCover.Y > inkCanvas.GetSelectionBounds().Bottom)) return;
+                // 点击在选择框内，保持选择状态
+                if (inkCanvas.GetSelectedStrokes().Count > 0)
+                {
+                    var selectionBounds = inkCanvas.GetSelectionBounds();
+                    if (currentTouchPoint.X >= selectionBounds.Left &&
+                        currentTouchPoint.X <= selectionBounds.Right &&
+                        currentTouchPoint.Y >= selectionBounds.Top &&
+                        currentTouchPoint.Y <= selectionBounds.Bottom)
+                    {
+                        // 点击在选择框内，保持选择
+                        GridInkCanvasSelectionCover.Visibility = Visibility.Visible;
+                        StrokesSelectionClone = new StrokeCollection();
+                        return;
+                    }
+                }
+
+                // 点击在选择框外，取消选择
                 inkCanvas.Select(new StrokeCollection());
                 StrokesSelectionClone = new StrokeCollection();
             }
@@ -494,6 +720,7 @@ namespace Ink_Canvas
                 GridInkCanvasSelectionCover.Visibility = Visibility.Visible;
                 StrokesSelectionClone = new StrokeCollection();
             }
+
         }
 
         private void LassoSelect_Click(object sender, RoutedEventArgs e)
@@ -520,7 +747,7 @@ namespace Ink_Canvas
         }
 
         #region UIElement Selection and Resize
-        
+
         private Rect GetUIElementBounds(UIElement element)
         {
             if (element is FrameworkElement fe)
@@ -558,7 +785,177 @@ namespace Ink_Canvas
 
             return new Rect(0, 0, 0, 0);
         }
+
+        #endregion
+
+        #region Selection Display and Resize Handles
+
+        private void UpdateSelectionDisplay()
+        {
+            if (inkCanvas.GetSelectedStrokes().Count == 0)
+            {
+                HideSelectionDisplay();
+                return;
+            }
+
+            var selectionBounds = inkCanvas.GetSelectionBounds();
+
+            // 更新选择框
+            SelectionRectangle.Visibility = Visibility.Visible;
+            SelectionRectangle.Margin = new Thickness(selectionBounds.Left, selectionBounds.Top, 0, 0);
+            SelectionRectangle.Width = selectionBounds.Width;
+            SelectionRectangle.Height = selectionBounds.Height;
+
+            // 更新选择点位置
+            UpdateSelectionHandles(selectionBounds);
+            SelectionHandlesCanvas.Visibility = Visibility.Visible;
+        }
+
+        private void HideSelectionDisplay()
+        {
+            SelectionRectangle.Visibility = Visibility.Collapsed;
+            SelectionHandlesCanvas.Visibility = Visibility.Collapsed;
+        }
+
+        private void UpdateSelectionHandles(Rect bounds)
+        {
+            // 四个角选择点
+            TopLeftHandle.Margin = new Thickness(bounds.Left - 4, bounds.Top - 4, 0, 0);
+            TopRightHandle.Margin = new Thickness(bounds.Right - 4, bounds.Top - 4, 0, 0);
+            BottomLeftHandle.Margin = new Thickness(bounds.Left - 4, bounds.Bottom - 4, 0, 0);
+            BottomRightHandle.Margin = new Thickness(bounds.Right - 4, bounds.Bottom - 4, 0, 0);
+
+            // 四个边选择点
+            TopHandle.Margin = new Thickness(bounds.Left + bounds.Width / 2 - 4, bounds.Top - 4, 0, 0);
+            BottomHandle.Margin = new Thickness(bounds.Left + bounds.Width / 2 - 4, bounds.Bottom - 4, 0, 0);
+            LeftHandle.Margin = new Thickness(bounds.Left - 4, bounds.Top + bounds.Height / 2 - 4, 0, 0);
+            RightHandle.Margin = new Thickness(bounds.Right - 4, bounds.Top + bounds.Height / 2 - 4, 0, 0);
+        }
+
+        private void SelectionHandle_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (sender is Rectangle handle)
+            {
+                isResizing = true;
+                currentResizeHandle = handle.Name;
+                resizeStartPoint = e.GetPosition(inkCanvas);
+                originalSelectionBounds = inkCanvas.GetSelectionBounds();
+                handle.CaptureMouse();
+                e.Handled = true;
+            }
+        }
+
+        private void SelectionHandle_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (!isResizing || !(sender is Rectangle handle)) return;
+
+            var currentPoint = e.GetPosition(inkCanvas);
+            var delta = new Point(currentPoint.X - resizeStartPoint.X, currentPoint.Y - resizeStartPoint.Y);
+
+            var newBounds = CalculateNewBounds(originalSelectionBounds, delta, currentResizeHandle);
+
+            // 应用新的边界到选中的墨迹
+            ApplyBoundsToStrokes(newBounds);
+
+            // 更新选择框显示
+            UpdateSelectionDisplay();
+        }
+
+        private void SelectionHandle_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            if (sender is Rectangle handle)
+            {
+                isResizing = false;
+                currentResizeHandle = "";
+                handle.ReleaseMouseCapture();
+                e.Handled = true;
+            }
+        }
+
+        private Rect CalculateNewBounds(Rect originalBounds, Point delta, string handleName)
+        {
+            var newBounds = originalBounds;
+            double newWidth = originalBounds.Width;
+            double newHeight = originalBounds.Height;
+            double newX = originalBounds.X;
+            double newY = originalBounds.Y;
+
+            switch (handleName)
+            {
+                case "TopLeftHandle":
+                    newX = originalBounds.X + delta.X;
+                    newY = originalBounds.Y + delta.Y;
+                    newWidth = originalBounds.Width - delta.X;
+                    newHeight = originalBounds.Height - delta.Y;
+                    break;
+                case "TopRightHandle":
+                    newY = originalBounds.Y + delta.Y;
+                    newWidth = originalBounds.Width + delta.X;
+                    newHeight = originalBounds.Height - delta.Y;
+                    break;
+                case "BottomLeftHandle":
+                    newX = originalBounds.X + delta.X;
+                    newWidth = originalBounds.Width - delta.X;
+                    newHeight = originalBounds.Height + delta.Y;
+                    break;
+                case "BottomRightHandle":
+                    newWidth = originalBounds.Width + delta.X;
+                    newHeight = originalBounds.Height + delta.Y;
+                    break;
+                case "TopHandle":
+                    newY = originalBounds.Y + delta.Y;
+                    newHeight = originalBounds.Height - delta.Y;
+                    break;
+                case "BottomHandle":
+                    newHeight = originalBounds.Height + delta.Y;
+                    break;
+                case "LeftHandle":
+                    newX = originalBounds.X + delta.X;
+                    newWidth = originalBounds.Width - delta.X;
+                    break;
+                case "RightHandle":
+                    newWidth = originalBounds.Width + delta.X;
+                    break;
+            }
+
+            // 确保最小尺寸和正值
+            if (newWidth < 10) newWidth = 10;
+            if (newHeight < 10) newHeight = 10;
+
+            // 创建新的Rect，确保所有值都是有效的
+            newBounds = new Rect(newX, newY, newWidth, newHeight);
+
+            return newBounds;
+        }
+
+        private void ApplyBoundsToStrokes(Rect newBounds)
+        {
+            var selectedStrokes = inkCanvas.GetSelectedStrokes();
+            if (selectedStrokes.Count == 0) return;
+
+            var originalBounds = inkCanvas.GetSelectionBounds();
+
+            // 计算缩放比例
+            var scaleX = newBounds.Width / originalBounds.Width;
+            var scaleY = newBounds.Height / originalBounds.Height;
+
+            // 计算平移量
+            var translateX = newBounds.X - originalBounds.X;
+            var translateY = newBounds.Y - originalBounds.Y;
+
+            // 创建变换矩阵
+            var matrix = new Matrix();
+            matrix.Translate(translateX, translateY);
+            matrix.ScaleAt(scaleX, scaleY, originalBounds.X + originalBounds.Width / 2, originalBounds.Y + originalBounds.Height / 2);
+
+            // 应用变换到选中的墨迹
+            foreach (var stroke in selectedStrokes)
+            {
+                stroke.Transform(matrix, false);
+            }
+        }
+
+        #endregion
     }
 }
 
-#endregion

Ink Canvas/MainWindow_cs/MW_Settings.cs

@@ -1,3 +1,7 @@
+using Hardcodet.Wpf.TaskbarNotification;
+using Ink_Canvas.Helpers;
+using Newtonsoft.Json;
+using OSVersionExtension;
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -10,15 +14,11 @@ using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
-using Hardcodet.Wpf.TaskbarNotification;
-using Ink_Canvas.Helpers;
-using Newtonsoft.Json;
-using OSVersionExtension;
 using Application = System.Windows.Application;
 using CheckBox = System.Windows.Controls.CheckBox;
 using ComboBox = System.Windows.Controls.ComboBox;
 using File = System.IO.File;
-using MessageBox = System.Windows.MessageBox;
+using MessageBox = iNKORE.UI.WPF.Modern.Controls.MessageBox;
 using OpenFileDialog = Microsoft.Win32.OpenFileDialog;
 using OperatingSystem = OSVersionExtension.OperatingSystem;
 using RadioButton = System.Windows.Controls.RadioButton;
@@ -197,14 +197,32 @@ namespace Ink_Canvas
                 val > 0.5 && val < 1.25 ? val : val <= 0.5 ? 0.5 : val >= 1.25 ? 1.25 : 1;
             ViewboxFloatingBarScaleTransform.ScaleY =
                 val > 0.5 && val < 1.25 ? val : val <= 0.5 ? 0.5 : val >= 1.25 ? 1.25 : 1;
-            // auto align - 新增：只在屏幕模式下重新计算浮动栏位置
-            if (currentMode == 0)
+
+            // 等待UI更新后再重新计算浮动栏位置，确保居中计算准确
+            Dispatcher.BeginInvoke(new Action(async () =>
             {
-                if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
-                    ViewboxFloatingBarMarginAnimation(60);
-                else
-                    ViewboxFloatingBarMarginAnimation(100, true);
-            }
+                // 强制更新布局以确保ActualWidth正确
+                ViewboxFloatingBar.UpdateLayout();
+
+                // 等待一小段时间让布局完全更新
+                await Task.Delay(100);
+
+                // 再次强制更新布局
+                ViewboxFloatingBar.UpdateLayout();
+
+                // 强制重新测量和排列
+                ViewboxFloatingBar.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+                ViewboxFloatingBar.Arrange(new Rect(ViewboxFloatingBar.DesiredSize));
+
+                // auto align - 新增：只在屏幕模式下重新计算浮动栏位置
+                if (currentMode == 0)
+                {
+                    if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
+                        ViewboxFloatingBarMarginAnimation(60);
+                    else
+                        ViewboxFloatingBarMarginAnimation(100, true);
+                }
+            }), DispatcherPriority.Render);
         }
 
         private void ViewboxFloatingBarOpacityValueSlider_ValueChanged(object sender, RoutedEventArgs e)
@@ -984,7 +1002,7 @@ namespace Ink_Canvas
 
             PPTBtnPreviewRSTransform.Y = -(Settings.PowerPointSettings.PPTRSButtonPosition * 0.5);
             PPTBtnPreviewLSTransform.Y = -(Settings.PowerPointSettings.PPTLSButtonPosition * 0.5);
-            
+
             PPTBtnPreviewLBTransform.X = -(Settings.PowerPointSettings.PPTLBButtonPosition * 0.5);
             PPTBtnPreviewRBTransform.X = -(Settings.PowerPointSettings.PPTRBButtonPosition * 0.5);
         }
@@ -1796,7 +1814,11 @@ namespace Ink_Canvas
 
                     // 先设为None再设回原来的模式，避免可能的事件冲突
                     inkCanvas.EditingMode = InkCanvasEditingMode.None;
+                    // 保存非笔画元素（如图片）
+                    var preservedElements = PreserveNonStrokeElements();
                     inkCanvas.Children.Clear();
+                    // 恢复非笔画元素
+                    RestoreNonStrokeElements(preservedElements);
                     isInMultiTouchMode = true;
 
                     // 恢复到之前的编辑状态
@@ -1918,7 +1940,7 @@ namespace Ink_Canvas
             Settings.Appearance.ViewboxFloatingBarOpacityValue = 1.0;
             Settings.Appearance.ViewboxFloatingBarOpacityInPPTValue = 1.0;
             Settings.Appearance.EnableTrayIcon = true;
-        
+
             // 浮动栏按钮显示控制默认值
             Settings.Appearance.IsShowShapeButton = true;
             Settings.Appearance.IsShowUndoButton = true;
@@ -1929,8 +1951,8 @@ namespace Ink_Canvas
             Settings.Appearance.IsShowLassoSelectButton = true;
             Settings.Appearance.IsShowClearAndMouseButton = true;
             Settings.Appearance.IsShowQuickColorPalette = false;
-            Settings.Appearance.QuickColorPaletteDisplayMode = 1; 
-            Settings.Appearance.EraserDisplayOption = 0; 
+            Settings.Appearance.QuickColorPaletteDisplayMode = 1;
+            Settings.Appearance.EraserDisplayOption = 0;
 
             Settings.Automation.IsAutoFoldInEasiNote = true;
             Settings.Automation.IsAutoFoldInEasiNoteIgnoreDesktopAnno = true;
@@ -2032,7 +2054,7 @@ namespace Ink_Canvas
                 LoadSettings();
                 isLoaded = true;
 
-                ToggleSwitchRunAtStartup.IsOn = false; 
+                ToggleSwitchRunAtStartup.IsOn = false;
             }
             catch { }
 
@@ -2394,12 +2416,23 @@ namespace Ink_Canvas
             SaveSettingsToFile();
         }
 
-        private void ToggleSwitchDirectCallCiRand_Toggled(object sender, RoutedEventArgs e)
+        private void ToggleSwitchExternalCaller_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
 
             // 获取开关状态并保存到设置中
-            Settings.RandSettings.DirectCallCiRand = ToggleSwitchDirectCallCiRand.IsOn;
+            Settings.RandSettings.DirectCallCiRand = ToggleSwitchExternalCaller.IsOn;
+
+            // 保存设置到文件
+            SaveSettingsToFile();
+        }
+
+        private void ComboBoxExternalCallerType_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (!isLoaded) return;
+
+            // 获取下拉框选择并保存到设置中
+            Settings.RandSettings.ExternalCallerType = ComboBoxExternalCallerType.SelectedIndex;
 
             // 保存设置到文件
             SaveSettingsToFile();
@@ -2488,7 +2521,7 @@ namespace Ink_Canvas
             UpdateFloatingBarButtonsVisibility();
             SaveSettingsToFile();
         }
-        
+
         private void CheckBoxShowLassoSelectButton_Checked(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
@@ -2577,33 +2610,33 @@ namespace Ink_Canvas
                 // 形状按钮
                 if (ShapeDrawFloatingBarBtn != null)
                     ShapeDrawFloatingBarBtn.Visibility = Settings.Appearance.IsShowShapeButton ? Visibility.Visible : Visibility.Collapsed;
-                
+
                 // 撤销按钮
                 if (SymbolIconUndo != null)
                     SymbolIconUndo.Visibility = Settings.Appearance.IsShowUndoButton ? Visibility.Visible : Visibility.Collapsed;
-                
+
                 // 重做按钮
                 if (SymbolIconRedo != null)
                     SymbolIconRedo.Visibility = Settings.Appearance.IsShowRedoButton ? Visibility.Visible : Visibility.Collapsed;
-                
+
                 // 清空按钮
                 if (SymbolIconDelete != null)
                     SymbolIconDelete.Visibility = Settings.Appearance.IsShowClearButton ? Visibility.Visible : Visibility.Collapsed;
-                
+
                 // 白板按钮
                 if (WhiteboardFloatingBarBtn != null)
                     WhiteboardFloatingBarBtn.Visibility = Settings.Appearance.IsShowWhiteboardButton ? Visibility.Visible : Visibility.Collapsed;
-                
+
                 // 隐藏按钮
                 if (Fold_Icon != null)
                     Fold_Icon.Visibility = Settings.Appearance.IsShowHideButton ? Visibility.Visible : Visibility.Collapsed;
-                
-                                // 快捷调色盘
+
+                // 快捷调色盘
                 if (QuickColorPalettePanel != null && QuickColorPaletteSingleRowPanel != null)
                 {
                     bool shouldShow = Settings.Appearance.IsShowQuickColorPalette && inkCanvas.EditingMode == InkCanvasEditingMode.Ink;
                     bool wasVisible = QuickColorPalettePanel.Visibility == Visibility.Visible || QuickColorPaletteSingleRowPanel.Visibility == Visibility.Visible;
-                    
+
                     if (shouldShow)
                     {
                         // 根据显示模式选择显示哪个面板
@@ -2625,7 +2658,7 @@ namespace Ink_Canvas
                         QuickColorPalettePanel.Visibility = Visibility.Collapsed;
                         QuickColorPaletteSingleRowPanel.Visibility = Visibility.Collapsed;
                     }
-                    
+
                     // 如果快捷调色盘的可见性发生变化，重新计算浮动栏位置
                     if (wasVisible != shouldShow && !isFloatingBarFolded)
                     {
@@ -2647,15 +2680,15 @@ namespace Ink_Canvas
                         }
                     }
                 }
-                
+
                 // 套索选择按钮
                 if (SymbolIconSelect != null)
                     SymbolIconSelect.Visibility = Settings.Appearance.IsShowLassoSelectButton ? Visibility.Visible : Visibility.Collapsed;
-                
+
                 // 清并鼠按钮
                 if (CursorWithDelFloatingBarBtn != null)
                     CursorWithDelFloatingBarBtn.Visibility = Settings.Appearance.IsShowClearAndMouseButton ? Visibility.Visible : Visibility.Collapsed;
-                
+
                 // 橡皮按钮显示控制
                 if (Eraser_Icon != null && EraserByStrokes_Icon != null)
                 {
@@ -2679,7 +2712,7 @@ namespace Ink_Canvas
                             break;
                     }
                 }
-                
+
                 // 在按钮可见性更新后，重新计算当前高光位置
                 // 延迟执行以确保UI更新完成
                 Dispatcher.BeginInvoke(new Action(async () =>
@@ -2688,16 +2721,17 @@ namespace Ink_Canvas
                     {
                         // 等待UI完全更新
                         await Task.Delay(100);
-                        
+
                         // 获取当前选中的模式并重新设置高光位置
                         string selectedToolMode = GetCurrentSelectedMode();
                         if (!string.IsNullOrEmpty(selectedToolMode))
                         {
                             SetFloatingBarHighlightPosition(selectedToolMode);
                         }
-                        
+
                         // 重新计算浮动栏位置，因为按钮可见性变化会影响浮动栏宽度
-                        if (!isFloatingBarFolded && currentMode == 0) // 新增：只在屏幕模式下重新计算浮动栏位置
+                        // 修复：移除浮动栏收起状态检查，确保在收起状态下也能正确修正位置
+                        if (currentMode == 0) // 只在屏幕模式下重新计算浮动栏位置
                         {
                             if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
                             {
@@ -2728,6 +2762,12 @@ namespace Ink_Canvas
             var text = JsonConvert.SerializeObject(Settings, Formatting.Indented);
             try
             {
+                string configsDir = Path.Combine(App.RootPath, "Configs");
+                if (!Directory.Exists(configsDir))
+                {
+                    Directory.CreateDirectory(configsDir);
+                }
+                
                 File.WriteAllText(App.RootPath + settingsFileName, text);
             }
             catch { }
@@ -2942,6 +2982,13 @@ namespace Ink_Canvas
             SaveSettingsToFile();
         }
 
+        private void ToggleSwitchKeepFoldAfterSoftwareExit_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            Settings.Automation.KeepFoldAfterSoftwareExit = ToggleSwitchKeepFoldAfterSoftwareExit.IsOn;
+            SaveSettingsToFile();
+        }
+
         private void ToggleSwitchAlwaysGoToFirstPageOnReenter_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
@@ -3080,5 +3127,85 @@ namespace Ink_Canvas
             SaveSettingsToFile();
         }
 
+        #region 文件关联管理
+
+        private void BtnUnregisterFileAssociation_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                bool success = FileAssociationManager.UnregisterFileAssociation();
+                if (success)
+                {
+                    TextBlockFileAssociationStatus.Text = "✓ 文件关联已成功取消";
+                    TextBlockFileAssociationStatus.Foreground = new SolidColorBrush(Colors.LightGreen);
+                    ShowNotification("文件关联已取消");
+                }
+                else
+                {
+                    TextBlockFileAssociationStatus.Text = "✗ 取消文件关联失败，可能需要管理员权限";
+                    TextBlockFileAssociationStatus.Foreground = new SolidColorBrush(Colors.LightCoral);
+                    ShowNotification("取消文件关联失败");
+                }
+            }
+            catch (Exception ex)
+            {
+                TextBlockFileAssociationStatus.Text = $"✗ 取消文件关联时出错: {ex.Message}";
+                TextBlockFileAssociationStatus.Foreground = new SolidColorBrush(Colors.LightCoral);
+                LogHelper.WriteLogToFile($"取消文件关联时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        private void BtnCheckFileAssociation_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                bool isRegistered = FileAssociationManager.IsFileAssociationRegistered();
+                if (isRegistered)
+                {
+                    TextBlockFileAssociationStatus.Text = "✓ .icstk文件关联已注册";
+                    TextBlockFileAssociationStatus.Foreground = new SolidColorBrush(Colors.LightGreen);
+                }
+                else
+                {
+                    TextBlockFileAssociationStatus.Text = "✗ .icstk文件关联未注册";
+                    TextBlockFileAssociationStatus.Foreground = new SolidColorBrush(Colors.LightCoral);
+                }
+            }
+            catch (Exception ex)
+            {
+                TextBlockFileAssociationStatus.Text = $"✗ 检查文件关联状态时出错: {ex.Message}";
+                TextBlockFileAssociationStatus.Foreground = new SolidColorBrush(Colors.LightCoral);
+                LogHelper.WriteLogToFile($"检查文件关联状态时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        private void BtnRegisterFileAssociation_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                bool success = FileAssociationManager.RegisterFileAssociation();
+                if (success)
+                {
+                    TextBlockFileAssociationStatus.Text = "✓ 文件关联已成功注册";
+                    TextBlockFileAssociationStatus.Foreground = new SolidColorBrush(Colors.LightGreen);
+                    ShowNotification("文件关联已注册");
+                }
+                else
+                {
+                    TextBlockFileAssociationStatus.Text = "✗ 注册文件关联失败，可能需要管理员权限";
+                    TextBlockFileAssociationStatus.Foreground = new SolidColorBrush(Colors.LightCoral);
+                    ShowNotification("注册文件关联失败");
+                }
+            }
+            catch (Exception ex)
+            {
+                TextBlockFileAssociationStatus.Text = $"✗ 注册文件关联时出错: {ex.Message}";
+                TextBlockFileAssociationStatus.Foreground = new SolidColorBrush(Colors.LightCoral);
+                LogHelper.WriteLogToFile($"注册文件关联时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        #endregion
+
     }
 }

Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs

@@ -1,4 +1,8 @@
-using System;
+using Hardcodet.Wpf.TaskbarNotification;
+using Ink_Canvas.Helpers;
+using Newtonsoft.Json;
+using OSVersionExtension;
+using System;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
@@ -6,10 +10,6 @@ using System.Windows.Ink;
 using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using Hardcodet.Wpf.TaskbarNotification;
-using Ink_Canvas.Helpers;
-using Newtonsoft.Json;
-using OSVersionExtension;
 using File = System.IO.File;
 using OperatingSystem = OSVersionExtension.OperatingSystem;
 
@@ -257,6 +257,10 @@ namespace Ink_Canvas
 
                 ViewboxFloatingBar.Opacity = Settings.Appearance.ViewboxFloatingBarOpacityValue;
 
+                // 初始化浮动栏透明度滑块值
+                ViewboxFloatingBarOpacityValueSlider.Value = Settings.Appearance.ViewboxFloatingBarOpacityValue;
+                ViewboxFloatingBarOpacityInPPTValueSlider.Value = Settings.Appearance.ViewboxFloatingBarOpacityInPPTValue;
+
                 if (Settings.Appearance.EnableViewboxBlackBoardScaleTransform) // 画板 UI 缩放 80%
                 {
                     //ViewboxBlackboardLeftSideScaleTransform.ScaleX = 0.8;
@@ -327,10 +331,10 @@ namespace Ink_Canvas
                 CheckBoxShowClearAndMouseButton.IsChecked = Settings.Appearance.IsShowClearAndMouseButton;
                 ComboBoxEraserDisplayOption.SelectedIndex = Settings.Appearance.EraserDisplayOption;
                 ComboBoxQuickColorPaletteDisplayMode.SelectedIndex = Settings.Appearance.QuickColorPaletteDisplayMode;
-                
+
                 // 初始化快捷调色盘指示器
                 UpdateQuickColorPaletteIndicator(inkCanvas.DefaultDrawingAttributes.Color);
-                
+
                 // 应用浮动栏按钮可见性设置
                 UpdateFloatingBarButtonsVisibility();
 
@@ -455,6 +459,8 @@ namespace Ink_Canvas
 
                 ToggleSwitchSupportWPS.IsOn = Settings.PowerPointSettings.IsSupportWPS;
 
+                ToggleSwitchPowerPointEnhancement.IsOn = Settings.PowerPointSettings.EnablePowerPointEnhancement;
+
                 ToggleSwitchAutoSaveScreenShotInPowerPoint.IsOn =
                     Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint;
                 ToggleSwitchEnableWppProcessKill.IsOn = Settings.PowerPointSettings.EnableWppProcessKill;
@@ -757,7 +763,8 @@ namespace Ink_Canvas
                 RandWindowOnceCloseLatencySlider.Value = Settings.RandSettings.RandWindowOnceCloseLatency;
                 RandWindowOnceMaxStudentsSlider.Value = Settings.RandSettings.RandWindowOnceMaxStudents;
                 ToggleSwitchShowRandomAndSingleDraw.IsOn = Settings.RandSettings.ShowRandomAndSingleDraw;
-                ToggleSwitchDirectCallCiRand.IsOn = Settings.RandSettings.DirectCallCiRand;
+                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;
 
@@ -777,7 +784,27 @@ namespace Ink_Canvas
                 ToggleSwitchDisplayRandWindowNamesInputBtn.IsOn = Settings.RandSettings.DisplayRandWindowNamesInputBtn;
                 RandWindowOnceCloseLatencySlider.Value = Settings.RandSettings.RandWindowOnceCloseLatency;
                 RandWindowOnceMaxStudentsSlider.Value = Settings.RandSettings.RandWindowOnceMaxStudents;
-                ToggleSwitchDirectCallCiRand.IsOn = Settings.RandSettings.DirectCallCiRand;
+                ToggleSwitchExternalCaller.IsOn = Settings.RandSettings.DirectCallCiRand;
+                ComboBoxExternalCallerType.SelectedIndex = Settings.RandSettings.ExternalCallerType;
+            }
+
+            // ModeSettings
+            if (Settings.ModeSettings != null)
+            {
+                ToggleSwitchMode.IsOn = Settings.ModeSettings.IsPPTOnlyMode;
+                
+                // 根据加载的配置状态执行相应的窗口显示/隐藏逻辑
+                if (isStartup && Settings.ModeSettings.IsPPTOnlyMode)
+                {
+                    // 启动时如果是仅PPT模式，隐藏主窗口
+                    Hide();
+                    LogHelper.WriteLogToFile("启动时检测到仅PPT模式，主窗口已隐藏", LogHelper.LogType.Event);
+                }
+            }
+            else
+            {
+                Settings.ModeSettings = new ModeSettings();
+                ToggleSwitchMode.IsOn = false;
             }
 
             // Automation
@@ -831,6 +858,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 ||

Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs

@@ -1,4 +1,6 @@
-using System;
+using Ink_Canvas.Helpers;
+using iNKORE.UI.WPF.Modern.Controls;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading.Tasks;
@@ -8,9 +10,7 @@ using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
-using Ink_Canvas.Helpers;
-using iNKORE.UI.WPF.Modern.Controls;
-using MessageBox = System.Windows.MessageBox;
+using MessageBox = iNKORE.UI.WPF.Modern.Controls.MessageBox;
 using Point = System.Windows.Point;
 
 namespace Ink_Canvas
@@ -107,6 +107,10 @@ namespace Ink_Canvas
                 else if (sender == ImageDrawArrow || sender == BoardImageDrawArrow)
                     drawingShapeMode = 2;
                 else if (sender == ImageDrawParallelLine || sender == BoardImageDrawParallelLine) drawingShapeMode = 15;
+
+                // 更新模式缓存
+                UpdateCurrentToolMode("shape");
+
                 isLongPressSelected = true;
                 if (isSingleFingerDragMode) BtnFingerDragMode_Click(BtnFingerDragMode, null);
             }
@@ -114,6 +118,13 @@ namespace Ink_Canvas
 
         private void BtnPen_Click(object sender, RoutedEventArgs e)
         {
+            // 如果当前有选中的图片元素，先取消选中
+            if (currentSelectedElement != null)
+            {
+                UnselectElement(currentSelectedElement);
+                currentSelectedElement = null;
+            }
+
             // 禁用高级橡皮擦系统
             DisableAdvancedEraserSystem();
 
@@ -178,12 +189,12 @@ namespace Ink_Canvas
             await CheckIsDrawingShapesInMultiTouchMode();
             EnterShapeDrawingMode(1);
             lastMouseDownSender = null;
-            
+
             // 先保存长按状态，避免被CancelSingleFingerDragMode重置
             bool wasLongPressed = isLongPressSelected;
-            
+
             CancelSingleFingerDragMode();
-            
+
             if (wasLongPressed)
             {
                 if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();
@@ -200,12 +211,12 @@ namespace Ink_Canvas
             await CheckIsDrawingShapesInMultiTouchMode();
             EnterShapeDrawingMode(8);
             lastMouseDownSender = null;
-            
+
             // 先保存长按状态，避免被CancelSingleFingerDragMode重置
             bool wasLongPressed = isLongPressSelected;
-            
+
             CancelSingleFingerDragMode();
-            
+
             if (wasLongPressed)
             {
                 if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();
@@ -222,12 +233,12 @@ namespace Ink_Canvas
             await CheckIsDrawingShapesInMultiTouchMode();
             EnterShapeDrawingMode(18);
             lastMouseDownSender = null;
-            
+
             // 先保存长按状态，避免被CancelSingleFingerDragMode重置
             bool wasLongPressed = isLongPressSelected;
-            
+
             CancelSingleFingerDragMode();
-            
+
             if (wasLongPressed)
             {
                 if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();
@@ -244,12 +255,12 @@ namespace Ink_Canvas
             await CheckIsDrawingShapesInMultiTouchMode();
             EnterShapeDrawingMode(2);
             lastMouseDownSender = null;
-            
+
             // 先保存长按状态，避免被CancelSingleFingerDragMode重置
             bool wasLongPressed = isLongPressSelected;
-            
+
             CancelSingleFingerDragMode();
-            
+
             if (wasLongPressed)
             {
                 if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();
@@ -266,12 +277,12 @@ namespace Ink_Canvas
             await CheckIsDrawingShapesInMultiTouchMode();
             EnterShapeDrawingMode(15);
             lastMouseDownSender = null;
-            
+
             // 先保存长按状态，避免被CancelSingleFingerDragMode重置
             bool wasLongPressed = isLongPressSelected;
-            
+
             CancelSingleFingerDragMode();
-            
+
             if (wasLongPressed)
             {
                 if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();
@@ -484,7 +495,7 @@ namespace Ink_Canvas
             {
                 // 确保几何绘制模式下不切换到Ink模式，避免触摸轨迹被收集
                 inkCanvas.EditingMode = InkCanvasEditingMode.None;
-                
+
                 if (isWaitUntilNextTouchDown && dec.Count > 1) return;
                 if (dec.Count > 1)
                 {
@@ -512,7 +523,7 @@ namespace Ink_Canvas
                     }
                     return;
                 }
-                
+
                 // 修复：双曲线绘制时，第二笔应该基于第一笔的起点，而不是触摸实时位置
                 Point touchPoint = e.GetTouchPoint(inkCanvas).Position;
                 if ((drawingShapeMode == 24 || drawingShapeMode == 25) && drawMultiStepShapeCurrentStep == 1)
@@ -526,7 +537,7 @@ namespace Ink_Canvas
                     // 其他情况正常处理
                     MouseTouchMove(touchPoint);
                 }
-                
+
                 return; // 处理完几何绘制后直接返回，不执行后面的代码
             }
 
@@ -890,7 +901,7 @@ namespace Ink_Canvas
 
                     lastTempStroke = stroke;
                     inkCanvas.Strokes.Add(stroke);
-                    
+
                     // 如果启用了圆心标记功能，则绘制圆心
                     if (Settings.Canvas.ShowCircleCenter)
                     {
@@ -995,7 +1006,7 @@ namespace Ink_Canvas
 
                     lastTempStrokeCollection = strokes;
                     inkCanvas.Strokes.Add(strokes);
-                    
+
                     // 如果启用了圆心标记功能，则绘制圆心
                     if (Settings.Canvas.ShowCircleCenter)
                     {
@@ -1021,7 +1032,7 @@ namespace Ink_Canvas
                                 new Point(endP.X, 2 * iniP.Y - endP.Y)));
                         drawMultiStepShapeSpecialParameter3 = k;
                         drawMultiStepShapeSpecialStrokeCollection = strokes;
-                        
+
                         // 修复：第一笔绘制的辅助线应该立即显示在画布上
                         try
                         {
@@ -1120,10 +1131,10 @@ namespace Ink_Canvas
                     {
                         // 删除第二笔的临时笔画
                         inkCanvas.Strokes.Remove(lastTempStrokeCollection);
-                        
+
                         // 创建包含辅助线和双曲线的完整笔画集合
                         var completeStrokes = new StrokeCollection();
-                        
+
                         // 添加第一笔的辅助线
                         if (drawMultiStepShapeSpecialStrokeCollection != null && drawMultiStepShapeSpecialStrokeCollection.Count > 0)
                         {
@@ -1132,13 +1143,13 @@ namespace Ink_Canvas
                                 completeStrokes.Add(stroke1.Clone());
                             }
                         }
-                        
+
                         // 添加第二笔的双曲线
                         foreach (var stroke1 in strokes)
                         {
                             completeStrokes.Add(stroke1.Clone());
                         }
-                        
+
                         lastTempStrokeCollection = completeStrokes;
                         inkCanvas.Strokes.Add(completeStrokes);
                     }
@@ -1523,7 +1534,7 @@ namespace Ink_Canvas
 
             return pointList;
         }
-        
+
         private StrokeCollection GenerateDashedLineEllipseStrokeCollection(Point st, Point ed, bool isDrawTop = true,
             bool isDrawBottom = true)
         {
@@ -1671,14 +1682,14 @@ namespace Ink_Canvas
             var mousePoint = e.GetPosition(this);
             var floatingBarBounds = ViewboxFloatingBar.TransformToAncestor(this).TransformBounds(
                 new Rect(0, 0, ViewboxFloatingBar.ActualWidth, ViewboxFloatingBar.ActualHeight));
-            
+
             // 如果鼠标点击发生在浮动栏区域，不阻止事件传播，让浮动栏按钮能够接收鼠标事件
             if (floatingBarBounds.Contains(mousePoint))
             {
                 // 不设置 ViewboxFloatingBar.IsHitTestVisible = false，让浮动栏按钮能够接收鼠标事件
                 return;
             }
-            
+
             inkCanvas.CaptureMouse();
             ViewboxFloatingBar.IsHitTestVisible = false;
             BlackboardUIGridForInkReplay.IsHitTestVisible = false;
@@ -1968,7 +1979,7 @@ namespace Ink_Canvas
                 }
             }
         }
-        
+
         private void EnterShapeDrawingMode(int mode)
         {
             forceEraser = true;
@@ -1988,7 +1999,7 @@ namespace Ink_Canvas
             {
                 // 创建一个点作为圆心标记
                 var centerSize = 0.5; // 圆心标记的大小
-                
+
                 // 创建一个小圆作为圆心标记
                 var circlePoints = new List<Point>();
                 for (double angle = 0; angle <= 2 * Math.PI; angle += 0.1)
@@ -1998,18 +2009,18 @@ namespace Ink_Canvas
                         centerPoint.Y + centerSize * Math.Sin(angle)
                     ));
                 }
-                
+
                 // 绘制圆心点
                 var point = new StylusPointCollection(circlePoints);
                 var stroke = new Stroke(point)
                 {
                     DrawingAttributes = inkCanvas.DefaultDrawingAttributes.Clone()
                 };
-                
+
                 // 设置圆心点的样式
                 stroke.DrawingAttributes.Width = 2.0;
                 stroke.DrawingAttributes.Height = 2.0;
-                
+
                 // 添加到画布
                 inkCanvas.Strokes.Add(stroke);
             }

Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs

@@ -1,4 +1,5 @@
-using System;
+using Ink_Canvas.Helpers;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -8,7 +9,6 @@ using System.Windows.Controls;
 using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
-using Ink_Canvas.Helpers;
 using Point = System.Windows.Point;
 
 namespace Ink_Canvas
@@ -62,13 +62,13 @@ namespace Ink_Canvas
                 // 获取墨迹的起点和终点
                 var startPoint = e.Stroke.StylusPoints.Count > 0 ? e.Stroke.StylusPoints[0].ToPoint() : new Point();
                 var endPoint = e.Stroke.StylusPoints.Count > 0 ? e.Stroke.StylusPoints[e.Stroke.StylusPoints.Count - 1].ToPoint() : new Point();
-                
+
                 // 从InkCanvas中移除墨迹，因为我们要用渐隐管理器来管理它
                 if (inkCanvas.Strokes.Contains(e.Stroke))
                 {
                     inkCanvas.Strokes.Remove(e.Stroke);
                 }
-                
+
                 // 添加到墨迹渐隐管理器
                 if (_inkFadeManager != null)
                 {
@@ -78,11 +78,11 @@ namespace Ink_Canvas
                 {
                     LogHelper.WriteLogToFile("StrokeCollected: 墨迹渐隐管理器为空，无法添加墨迹", LogHelper.LogType.Error);
                 }
-                
+
                 // 墨迹渐隐模式下不参与墨迹纠正和其他处理，直接返回
                 return;
             }
-            
+
             // 标记是否进行了直线拉直
             bool wasStraightened = false;
 

Ink Canvas/MainWindow_cs/MW_TimeMachine.cs

@@ -1,4 +1,5 @@
-using System;
+using Ink_Canvas.Helpers;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Windows;
@@ -6,7 +7,6 @@ using System.Windows.Controls;
 using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
-using Ink_Canvas.Helpers;
 
 namespace Ink_Canvas
 {
@@ -193,13 +193,13 @@ namespace Ink_Canvas
                                 // 检查图片是否有位置信息，如果没有则应用居中
                                 double left = InkCanvas.GetLeft(img);
                                 double top = InkCanvas.GetTop(img);
-                                
+
                                 if (double.IsNaN(left) || double.IsNaN(top))
                                 {
                                     // 图片没有位置信息，应用居中
                                     CenterAndScaleElement(img);
                                 }
-                                
+
                                 // 重新绑定事件处理器
                                 BindElementEvents(img);
                             }
@@ -208,13 +208,13 @@ namespace Ink_Canvas
                                 // 检查媒体元素是否有位置信息，如果没有则应用居中
                                 double left = InkCanvas.GetLeft(media);
                                 double top = InkCanvas.GetTop(media);
-                                
+
                                 if (double.IsNaN(left) || double.IsNaN(top))
                                 {
                                     // 媒体元素没有位置信息，应用居中
                                     CenterAndScaleElement(media);
                                 }
-                                
+
                                 // 重新绑定事件处理器
                                 BindElementEvents(media);
                             }

Ink Canvas/MainWindow_cs/MW_Timer.cs

@@ -1,4 +1,5 @@
-using System;
+using Ink_Canvas.Helpers;
+using System;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
@@ -11,7 +12,6 @@ using System.Threading.Tasks;
 using System.Timers;
 using System.Windows;
 using System.Windows.Controls;
-using Ink_Canvas.Helpers;
 
 namespace Ink_Canvas
 {
@@ -65,8 +65,11 @@ namespace Ink_Canvas
 
         private Timer timerDisplayTime = new Timer();
         private Timer timerDisplayDate = new Timer();
+        private Timer timerNtpSync = new Timer();
 
         private TimeViewModel nowTimeVM = new TimeViewModel();
+        private DateTime cachedNetworkTime = DateTime.Now;
+        private DateTime lastNtpSyncTime = DateTime.MinValue;
 
         private async Task<DateTime> GetNetworkTimeAsync()
         {
@@ -117,19 +120,65 @@ namespace Ink_Canvas
             timerDisplayDate.Elapsed += TimerDisplayDate_Elapsed;
             timerDisplayDate.Interval = 1000 * 60 * 60 * 1;
             timerDisplayDate.Start();
+            timerNtpSync.Elapsed += async (s, e) => await TimerNtpSync_ElapsedAsync();
+            timerNtpSync.Interval = 1000 * 60 * 60 * 2; // 每2小时同步一次
+            timerNtpSync.Start();
             timerKillProcess.Start();
             nowTimeVM.nowDate = DateTime.Now.ToString("yyyy'年'MM'月'dd'日' dddd");
             nowTimeVM.nowTime = DateTime.Now.ToString("tt hh'时'mm'分'ss'秒'");
         }
 
-        // 修改TimerDisplayTime_ElapsedAsync方法中的时间格式
+        // NTP同步定时器事件处理
+        private async Task TimerNtpSync_ElapsedAsync()
+        {
+            try
+            {
+                DateTime networkTime = await GetNetworkTimeAsync();
+                cachedNetworkTime = networkTime;
+                lastNtpSyncTime = DateTime.Now;
+            }
+            catch
+            {
+                // NTP同步失败时，保持使用本地时间
+                cachedNetworkTime = DateTime.Now;
+            }
+        }
+
+        // 修改TimerDisplayTime_ElapsedAsync方法，使用缓存的网络时间
         private async Task TimerDisplayTime_ElapsedAsync()
         {
-            DateTime now = await GetNetworkTimeAsync();
+            DateTime localTime = DateTime.Now;
+            DateTime displayTime = localTime; // 默认使用本地时间
+
+            // 如果还没有进行过NTP同步，或者距离上次同步超过2小时，则进行一次同步
+            if (lastNtpSyncTime == DateTime.MinValue || 
+                (DateTime.Now - lastNtpSyncTime).TotalHours >= 2)
+            {
+                try
+                {
+                    DateTime networkTime = await GetNetworkTimeAsync();
+                    cachedNetworkTime = networkTime;
+                    lastNtpSyncTime = DateTime.Now;
+                }
+                catch
+                {
+                    // 网络时间获取失败时，使用本地时间
+                    cachedNetworkTime = localTime;
+                }
+            }
+
+            // 使用缓存的网络时间进行显示
+            TimeSpan timeDifference = cachedNetworkTime - localTime;
+            double timeDifferenceMinutes = Math.Abs(timeDifference.TotalMinutes);
+
+            // 如果网络时间与本地时间相差不超过3分钟，则使用本地时间
+            // 否则使用网络时间
+            displayTime = timeDifferenceMinutes <= 3.0 ? localTime : cachedNetworkTime;
+
             // 只更新时间，日期由原有逻辑定时更新即可
             Dispatcher.Invoke(() =>
             {
-                nowTimeVM.nowTime = now.ToString("tt hh'时'mm'分'ss'秒'");
+                nowTimeVM.nowTime = displayTime.ToString("tt hh'时'mm'分'ss'秒'");
             });
         }
 
@@ -220,8 +269,18 @@ namespace Ink_Canvas
                             ShowNotification("“鸿合屏幕书写”已自动关闭");
                             if (Settings.Automation.IsAutoKillHiteAnnotation && Settings.Automation.IsAutoEnterAnnotationAfterKillHite)
                             {
-                                // 自动进入批注状态
-                                PenIcon_Click(null, null);
+                                // 检查是否处于收纳状态，如果是则先展开浮动栏
+                                if (isFloatingBarFolded)
+                                {
+                                    // 先展开浮动栏，然后进入批注状态
+                                    // UnFoldFloatingBar 方法内部会根据设置自动进入批注模式
+                                    UnFoldFloatingBar(null);
+                                }
+                                else
+                                {
+                                    // 如果已经展开，直接进入批注状态
+                                    PenIcon_Click(null, null);
+                                }
                             }
                         });
                     }
@@ -274,6 +333,55 @@ namespace Ink_Canvas
         private bool foldFloatingBarByUser, // 保持收纳操作不受自动收纳的控制
             unfoldFloatingBarByUser; // 允许用户在希沃软件内进行展开操作
 
+        /// <summary>
+        /// 检测是否为批注窗口（窗口标题为空且高度小于500像素）
+        /// </summary>
+        /// <returns>如果是批注窗口返回true，否则返回false</returns>
+        private bool IsAnnotationWindow()
+        {
+            var windowTitle = ForegroundWindowInfo.WindowTitle();
+            var windowRect = ForegroundWindowInfo.WindowRect();
+            var windowProcessName = ForegroundWindowInfo.ProcessName();
+
+            // 检测希沃白板五的批注面板
+            // 希沃白板五的批注面板通常具有以下特征：
+            // 1. 窗口标题为空或包含特定关键词
+            // 2. 窗口高度较小（批注工具栏）
+            // 3. 窗口宽度适中（工具栏宽度）
+            if (windowProcessName == "BoardService" || windowProcessName == "seewoPincoTeacher")
+            {
+                // 检测希沃白板五的批注工具栏
+                // 批注工具栏通常高度在50-200像素之间，宽度在200-800像素之间
+                if (windowRect.Height >= 50 && windowRect.Height <= 200 &&
+                    windowRect.Width >= 200 && windowRect.Width <= 800)
+                {
+                    return true;
+                }
+
+                // 检测希沃白板五的二级菜单面板
+                // 二级菜单面板通常高度在100-400像素之间，宽度在150-400像素之间
+                if (windowRect.Height >= 100 && windowRect.Height <= 400 &&
+                    windowRect.Width >= 150 && windowRect.Width <= 400)
+                {
+                    return true;
+                }
+            }
+
+            // 检测鸿合软件的批注面板
+            if (windowProcessName == "HiteCamera" || windowProcessName == "HiteTouchPro" || windowProcessName == "HiteLightBoard")
+            {
+                // 鸿合软件的批注面板特征
+                if (windowRect.Height >= 50 && windowRect.Height <= 300 &&
+                    windowRect.Width >= 200 && windowRect.Width <= 600)
+                {
+                    return true;
+                }
+            }
+
+            // 原有的检测逻辑（保持向后兼容）
+            return windowTitle.Length == 0 && windowRect.Height < 500;
+        }
+
         private void timerCheckAutoFold_Elapsed(object sender, ElapsedEventArgs e)
         {
             if (isFloatingBarChangingHideMode) return;
@@ -316,7 +424,17 @@ namespace Ink_Canvas
                            ForegroundWindowInfo.WindowRect().Height >= SystemParameters.WorkArea.Height - 16 &&
                            ForegroundWindowInfo.WindowRect().Width >= SystemParameters.WorkArea.Width - 16)
                 {
-                    if (!unfoldFloatingBarByUser && !isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                    // 检测到批注窗口时保持收纳状态
+                    if (IsAnnotationWindow())
+                    {
+                        // 批注窗口打开时，如果当前是展开状态则收纳
+                        if (!isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                    }
+                    else
+                    {
+                        // 非批注窗口时正常处理
+                        if (!unfoldFloatingBarByUser && !isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                    }
                     // EasiNote5C
                 }
                 else if (Settings.Automation.IsAutoFoldInEasiNote5C && windowProcessName == "EasiNote5C" &&
@@ -328,21 +446,51 @@ namespace Ink_Canvas
                 }
                 else if (Settings.Automation.IsAutoFoldInSeewoPincoTeacher && (windowProcessName == "BoardService" || windowProcessName == "seewoPincoTeacher"))
                 {
-                    if (!unfoldFloatingBarByUser && !isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                    // 检测到希沃白板五的批注窗口时保持收纳状态
+                    if (IsAnnotationWindow())
+                    {
+                        // 批注窗口打开时，如果当前是展开状态则收纳
+                        if (!isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                    }
+                    else
+                    {
+                        // 非批注窗口时正常处理
+                        if (!unfoldFloatingBarByUser && !isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                    }
                     // HiteCamera
                 }
                 else if (Settings.Automation.IsAutoFoldInHiteCamera && windowProcessName == "HiteCamera" &&
                            ForegroundWindowInfo.WindowRect().Height >= SystemParameters.WorkArea.Height - 16 &&
                            ForegroundWindowInfo.WindowRect().Width >= SystemParameters.WorkArea.Width - 16)
                 {
-                    if (!unfoldFloatingBarByUser && !isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                    // 检测到批注窗口时保持收纳状态
+                    if (IsAnnotationWindow())
+                    {
+                        // 批注窗口打开时，如果当前是展开状态则收纳
+                        if (!isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                    }
+                    else
+                    {
+                        // 非批注窗口时正常处理
+                        if (!unfoldFloatingBarByUser && !isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                    }
                     // HiteTouchPro
                 }
                 else if (Settings.Automation.IsAutoFoldInHiteTouchPro && windowProcessName == "HiteTouchPro" &&
                            ForegroundWindowInfo.WindowRect().Height >= SystemParameters.WorkArea.Height - 16 &&
                            ForegroundWindowInfo.WindowRect().Width >= SystemParameters.WorkArea.Width - 16)
                 {
-                    if (!unfoldFloatingBarByUser && !isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                    // 检测到批注窗口时保持收纳状态
+                    if (IsAnnotationWindow())
+                    {
+                        // 批注窗口打开时，如果当前是展开状态则收纳
+                        if (!isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                    }
+                    else
+                    {
+                        // 非批注窗口时正常处理
+                        if (!unfoldFloatingBarByUser && !isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                    }
                     // WxBoardMain
                 }
                 else if (Settings.Automation.IsAutoFoldInWxBoardMain && windowProcessName == "WxBoardMain" &&
@@ -369,7 +517,17 @@ namespace Ink_Canvas
                            ForegroundWindowInfo.WindowRect().Height >= SystemParameters.WorkArea.Height - 16 &&
                            ForegroundWindowInfo.WindowRect().Width >= SystemParameters.WorkArea.Width - 16)
                 {
-                    if (!unfoldFloatingBarByUser && !isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                    // 检测到批注窗口时保持收纳状态
+                    if (IsAnnotationWindow())
+                    {
+                        // 批注窗口打开时，如果当前是展开状态则收纳
+                        if (!isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                    }
+                    else
+                    {
+                        // 非批注窗口时正常处理
+                        if (!unfoldFloatingBarByUser && !isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                    }
                     // AdmoxWhiteboard
                 }
                 else if (Settings.Automation.IsAutoFoldInAdmoxWhiteboard && windowProcessName == "Amdox.WhiteBoard" &&
@@ -420,8 +578,18 @@ namespace Ink_Canvas
                 }
                 else
                 {
-                    if (isFloatingBarFolded && !foldFloatingBarByUser) UnFoldFloatingBar_MouseUp(new object(), null);
-                    unfoldFloatingBarByUser = false;
+                    // 检查是否启用了软件退出后保持收纳模式
+                    if (Settings.Automation.KeepFoldAfterSoftwareExit)
+                    {
+                        // 如果启用了保持收纳模式，则不自动展开浮动栏
+                        unfoldFloatingBarByUser = false;
+                    }
+                    else
+                    {
+                        // 原有的逻辑：软件退出后自动展开浮动栏
+                        if (isFloatingBarFolded && !foldFloatingBarByUser) UnFoldFloatingBar_MouseUp(new object(), null);
+                        unfoldFloatingBarByUser = false;
+                    }
                 }
             }
             catch { }

Ink Canvas/MainWindow_cs/MW_TouchEvents.cs

@@ -1,3 +1,4 @@
+using Ink_Canvas.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,8 +8,8 @@ using System.Windows.Controls;
 using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
 using System.Windows.Threading;
-using Ink_Canvas.Helpers;
 using Point = System.Windows.Point;
 
 namespace Ink_Canvas
@@ -30,7 +31,7 @@ namespace Ink_Canvas
         {
             var preservedElements = new List<UIElement>();
 
-            // 遍历inkCanvas的所有子元素
+            // 遍历inkCanvas的所有子元素，创建副本而不是直接引用
             for (int i = inkCanvas.Children.Count - 1; i >= 0; i--)
             {
                 var child = inkCanvas.Children[i];
@@ -39,13 +40,118 @@ namespace Ink_Canvas
                 if (child is Image || child is MediaElement ||
                     (child is Border border && border.Name != "AdvancedEraserOverlay"))
                 {
-                    preservedElements.Add(child);
+                    // 创建元素的深拷贝，避免直接引用导致的问题
+                    var clonedElement = CloneUIElement(child);
+                    if (clonedElement != null)
+                    {
+                        preservedElements.Add(clonedElement);
+                    }
                 }
             }
 
             return preservedElements;
         }
 
+        /// <summary>
+        /// 克隆UI元素，创建深拷贝
+        /// </summary>
+        private UIElement CloneUIElement(UIElement originalElement)
+        {
+            try
+            {
+                if (originalElement is Image originalImage)
+                {
+                    var clonedImage = new Image();
+                    
+                    // 复制图片源
+                    if (originalImage.Source is BitmapSource bitmapSource)
+                    {
+                        clonedImage.Source = bitmapSource;
+                    }
+                    
+                    // 复制属性
+                    clonedImage.Width = originalImage.Width;
+                    clonedImage.Height = originalImage.Height;
+                    clonedImage.Stretch = originalImage.Stretch;
+                    clonedImage.StretchDirection = originalImage.StretchDirection;
+                    clonedImage.Name = originalImage.Name;
+                    clonedImage.IsHitTestVisible = originalImage.IsHitTestVisible;
+                    clonedImage.Focusable = originalImage.Focusable;
+                    clonedImage.Cursor = originalImage.Cursor;
+                    clonedImage.IsManipulationEnabled = originalImage.IsManipulationEnabled;
+                    
+                    // 复制位置
+                    InkCanvas.SetLeft(clonedImage, InkCanvas.GetLeft(originalImage));
+                    InkCanvas.SetTop(clonedImage, InkCanvas.GetTop(originalImage));
+                    
+                    // 复制变换
+                    if (originalImage.RenderTransform != null)
+                    {
+                        clonedImage.RenderTransform = originalImage.RenderTransform.Clone();
+                    }
+                    
+                    return clonedImage;
+                }
+                else if (originalElement is MediaElement originalMedia)
+                {
+                    var clonedMedia = new MediaElement();
+                    
+                    // 复制媒体属性
+                    clonedMedia.Source = originalMedia.Source;
+                    clonedMedia.Width = originalMedia.Width;
+                    clonedMedia.Height = originalMedia.Height;
+                    clonedMedia.Name = originalMedia.Name;
+                    clonedMedia.IsHitTestVisible = originalMedia.IsHitTestVisible;
+                    clonedMedia.Focusable = originalMedia.Focusable;
+                    
+                    // 复制位置
+                    InkCanvas.SetLeft(clonedMedia, InkCanvas.GetLeft(originalMedia));
+                    InkCanvas.SetTop(clonedMedia, InkCanvas.GetTop(originalMedia));
+                    
+                    // 复制变换
+                    if (originalMedia.RenderTransform != null)
+                    {
+                        clonedMedia.RenderTransform = originalMedia.RenderTransform.Clone();
+                    }
+                    
+                    return clonedMedia;
+                }
+                else if (originalElement is Border originalBorder)
+                {
+                    var clonedBorder = new Border();
+                    
+                    // 复制边框属性
+                    clonedBorder.Width = originalBorder.Width;
+                    clonedBorder.Height = originalBorder.Height;
+                    clonedBorder.Name = originalBorder.Name;
+                    clonedBorder.IsHitTestVisible = originalBorder.IsHitTestVisible;
+                    clonedBorder.Focusable = originalBorder.Focusable;
+                    clonedBorder.Background = originalBorder.Background;
+                    clonedBorder.BorderBrush = originalBorder.BorderBrush;
+                    clonedBorder.BorderThickness = originalBorder.BorderThickness;
+                    clonedBorder.CornerRadius = originalBorder.CornerRadius;
+                    
+                    // 复制位置
+                    InkCanvas.SetLeft(clonedBorder, InkCanvas.GetLeft(originalBorder));
+                    InkCanvas.SetTop(clonedBorder, InkCanvas.GetTop(originalBorder));
+                    
+                    // 复制变换
+                    if (originalBorder.RenderTransform != null)
+                    {
+                        clonedBorder.RenderTransform = originalBorder.RenderTransform.Clone();
+                    }
+                    
+                    return clonedBorder;
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"克隆UI元素失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+            
+            return null;
+        }
+
         /// <summary>
         /// 恢复之前保存的非笔画元素到画布
         /// </summary>
@@ -55,11 +161,15 @@ namespace Ink_Canvas
 
             foreach (var element in preservedElements)
             {
-                // 确保元素没有父容器再添加到inkCanvas
-                if (element is FrameworkElement fe && fe.Parent == null)
+                try
                 {
+                    // 由于现在使用的是克隆的元素，不需要检查Parent属性
                     inkCanvas.Children.Add(element);
                 }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"恢复非笔画元素失败: {ex.Message}", LogHelper.LogType.Error);
+                }
             }
         }
 
@@ -113,14 +223,14 @@ namespace Ink_Canvas
             var touchPoint = e.GetTouchPoint(this);
             var floatingBarBounds = ViewboxFloatingBar.TransformToAncestor(this).TransformBounds(
                 new Rect(0, 0, ViewboxFloatingBar.ActualWidth, ViewboxFloatingBar.ActualHeight));
-            
+
             // 如果触摸发生在浮动栏区域，不阻止事件传播，让浮动栏按钮能够接收触摸事件
             if (floatingBarBounds.Contains(touchPoint.Position))
             {
                 // 不设置 ViewboxFloatingBar.IsHitTestVisible = false，让浮动栏按钮能够接收触摸事件
                 return;
             }
-            
+
             if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint
                 || inkCanvas.EditingMode == InkCanvasEditingMode.EraseByStroke
                 || inkCanvas.EditingMode == InkCanvasEditingMode.Select) return;
@@ -142,7 +252,7 @@ namespace Ink_Canvas
             // 只保留普通橡皮逻辑
             TouchDownPointsList[e.TouchDevice.Id] = InkCanvasEditingMode.None;
             inkCanvas.EraserShape = new EllipseStylusShape(50, 50);
-            if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint 
+            if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint
                 && inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke)
             {
                 inkCanvas.EditingMode = InkCanvasEditingMode.None;
@@ -155,21 +265,19 @@ namespace Ink_Canvas
             var stylusPoint = e.GetPosition(this);
             var floatingBarBounds = ViewboxFloatingBar.TransformToAncestor(this).TransformBounds(
                 new Rect(0, 0, ViewboxFloatingBar.ActualWidth, ViewboxFloatingBar.ActualHeight));
-            
+
             // 如果手写笔点击发生在浮动栏区域，不阻止事件传播，让浮动栏按钮能够接收手写笔事件
             if (floatingBarBounds.Contains(stylusPoint))
             {
                 // 不设置 ViewboxFloatingBar.IsHitTestVisible = false，让浮动栏按钮能够接收手写笔事件
                 return;
             }
-            
-            LogHelper.WriteLogToFile($"MainWindow_StylusDown 被调用，笔尾状态: {e.StylusDevice.Inverted}, 当前 drawingShapeMode: {drawingShapeMode}, 当前 EditingMode: {inkCanvas.EditingMode}");
-            
+
+
             // 新增：根据是否为笔尾自动切换橡皮擦/画笔模式
             if (e.StylusDevice.Inverted)
             {
                 inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
-                LogHelper.WriteLogToFile("检测到笔尾，设置 EditingMode 为 EraseByPoint");
             }
             else
             {
@@ -178,14 +286,12 @@ namespace Ink_Canvas
                 {
                     // 确保几何绘制模式下不切换到Ink模式，避免触摸轨迹被收集
                     inkCanvas.EditingMode = InkCanvasEditingMode.None;
-                    LogHelper.WriteLogToFile("几何绘制模式，设置 EditingMode 为 None");
                     return;
                 }
                 // 修复：保持当前的线擦模式，不要强制切换到Ink模式
                 if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke)
                 {
                     inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
-                    LogHelper.WriteLogToFile("设置 EditingMode 为 Ink");
                 }
                 else
                 {
@@ -231,17 +337,11 @@ namespace Ink_Canvas
         {
             try
             {
-                LogHelper.WriteLogToFile($"MainWindow_StylusUp 被调用，EditingMode: {inkCanvas.EditingMode}, EnableInkFade: {Settings.Canvas.EnableInkFade}");
-                
                 var stroke = GetStrokeVisual(e.StylusDevice.Id).Stroke;
-                LogHelper.WriteLogToFile($"获取到墨迹，StylusPoints数量: {stroke.StylusPoints.Count}");
-                
+
                 // 正常模式：添加到画布并参与墨迹纠正
-                // 墨迹渐隐功能现在在 StrokeCollected 事件中统一处理所有输入方式
-                LogHelper.WriteLogToFile("StylusUp: 添加墨迹到画布");
-                
                 inkCanvas.Strokes.Add(stroke);
-                await Task.Delay(5); // 避免渲染墨迹完成前预览墨迹被删除导致墨迹闪烁
+                await Task.Delay(5); 
                 inkCanvas.Children.Remove(GetVisualCanvas(e.StylusDevice.Id));
 
                 inkCanvas_StrokeCollected(inkCanvas,
@@ -351,14 +451,14 @@ namespace Ink_Canvas
             var touchPoint = e.GetTouchPoint(this);
             var floatingBarBounds = ViewboxFloatingBar.TransformToAncestor(this).TransformBounds(
                 new Rect(0, 0, ViewboxFloatingBar.ActualWidth, ViewboxFloatingBar.ActualHeight));
-            
+
             // 如果触摸发生在浮动栏区域，不阻止事件传播，让浮动栏按钮能够接收触摸事件
             if (floatingBarBounds.Contains(touchPoint.Position))
             {
                 // 不设置 ViewboxFloatingBar.IsHitTestVisible = false，让浮动栏按钮能够接收触摸事件
                 return;
             }
-            
+
             SetCursorBasedOnEditingMode(inkCanvas);
             inkCanvas.CaptureTouch(e.TouchDevice);
 
@@ -369,7 +469,8 @@ namespace Ink_Canvas
             }
             if (inkCanvas.EditingMode == InkCanvasEditingMode.Select)
             {
-                // 套索选状态下只return，保证套索选可用
+                // 套索选状态下不直接return，允许触摸事件继续处理
+                dec.Add(e.TouchDevice.Id);
                 return;
             }
             // 修复：几何绘制模式下完全禁止触摸轨迹收集
@@ -411,14 +512,14 @@ namespace Ink_Canvas
             var touchPoint = e.GetTouchPoint(this);
             var floatingBarBounds = ViewboxFloatingBar.TransformToAncestor(this).TransformBounds(
                 new Rect(0, 0, ViewboxFloatingBar.ActualWidth, ViewboxFloatingBar.ActualHeight));
-            
+
             // 如果触摸发生在浮动栏区域，不阻止事件传播，让浮动栏按钮能够接收触摸事件
             if (floatingBarBounds.Contains(touchPoint.Position))
             {
                 // 不设置 ViewboxFloatingBar.IsHitTestVisible = false，让浮动栏按钮能够接收触摸事件
                 return;
             }
-            
+
             // 橡皮状态下不做任何切换，直接return，保证橡皮可持续
             if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint
                 || inkCanvas.EditingMode == InkCanvasEditingMode.EraseByStroke)
@@ -435,7 +536,7 @@ namespace Ink_Canvas
                 inkCanvas.CaptureTouch(e.TouchDevice);
                 ViewboxFloatingBar.IsHitTestVisible = false;
                 BlackboardUIGridForInkReplay.IsHitTestVisible = false;
-                
+
                 // 修复：几何绘制模式下，只记录几何绘制的起点，不记录触摸轨迹
                 if (dec.Count == 0)
                 {
@@ -460,108 +561,118 @@ namespace Ink_Canvas
                 dec.Add(e.TouchDevice.Id);
                 return;
             }
-        
+
             // 非几何绘制模式下的正常触摸处理
             SetCursorBasedOnEditingMode(inkCanvas);
             inkCanvas.CaptureTouch(e.TouchDevice);
             ViewboxFloatingBar.IsHitTestVisible = false;
             BlackboardUIGridForInkReplay.IsHitTestVisible = false;
             dec.Add(e.TouchDevice.Id);
-        
-        // Palm Eraser 逻辑 - 优化：改进手掌判定条件，提高精度
-        if (Settings.Canvas.EnablePalmEraser && dec.Count >= 2 && !isPalmEraserActive && !palmEraserTouchDownHandled)
-        {
-            var bounds = e.GetTouchPoint(inkCanvas).Bounds;
-            
-            // 根据敏感度设置调整判定参数
-            double palmThreshold;
-            double aspectRatioThreshold;
-            int minTouchPoints;
-            
-            switch (Settings.Canvas.PalmEraserSensitivity)
-            {
-                case 0: // 低敏感度 - 更严格的判定
-                    palmThreshold = 80;
-                    aspectRatioThreshold = 0.4;
-                    minTouchPoints = 4;
-                    break;
-                case 1: // 中敏感度 - 平衡的判定
-                    palmThreshold = 60;
-                    aspectRatioThreshold = 0.3;
-                    minTouchPoints = 3;
-                    break;
-                case 2: // 高敏感度 - 较宽松的判定
-                default:
-                    palmThreshold = 50;
-                    aspectRatioThreshold = 0.25;
-                    minTouchPoints = 2;
-                    break;
-            }
-            
-            // 计算宽高比
-            double aspectRatio = Math.Min(bounds.Width, bounds.Height) / Math.Max(bounds.Width, bounds.Height);
-            
-            // 更严格的手掌判定条件
-            bool isLargeTouch = bounds.Width >= palmThreshold && bounds.Height >= palmThreshold;
-            bool isPalmLikeShape = aspectRatio >= aspectRatioThreshold;
-            bool hasMultipleTouchPoints = dec.Count >= minTouchPoints;
-            
-            if (isLargeTouch && isPalmLikeShape && hasMultipleTouchPoints)
-            {
-                // 记录当前编辑模式和高光状态
-                palmEraserLastEditingMode = inkCanvas.EditingMode;
-                palmEraserLastIsHighlighter = drawingAttributes.IsHighlighter;
-                
-                // 记录参与手掌擦的触摸点ID
-                palmEraserTouchIds.Clear();
-                foreach (int touchId in dec)
-                {
-                    palmEraserTouchIds.Add(touchId);
-                }
-                
-                // 切换为橡皮擦
-                EraserIcon_Click(null, null);
-                isPalmEraserActive = true;
-                palmEraserActivationTime = DateTime.Now; // 记录激活时间
-                palmEraserTouchDownHandled = true; // 标记已处理
-                
-                // 启动恢复定时器，防止卡死
-                StartPalmEraserRecoveryTimer();
-                
-                // 记录日志
-                LogHelper.WriteLogToFile($"Palm eraser activated - Sensitivity: {Settings.Canvas.PalmEraserSensitivity}, Touch bounds: {bounds.Width}x{bounds.Height}, Aspect ratio: {aspectRatio:F2}, Touch points: {dec.Count}");
-            }
-        }
-        
-        // 设备1个的时候，记录中心点
-        if (dec.Count == 1)
-        {
-            touchPoint = e.GetTouchPoint(inkCanvas);
-            centerPoint = touchPoint.Position;
 
-            // 修复：只允许在此处赋值iniP，防止TouchMove等其他地方覆盖，保证几何绘制起点一致
-            if (drawingShapeMode != 0)
+            // Palm Eraser 逻辑 - 优化：改进手掌判定条件，使用设备提供的触摸面积信息
+            if (Settings.Canvas.EnablePalmEraser && dec.Count >= 2 && !isPalmEraserActive && !palmEraserTouchDownHandled)
             {
-                // 对于双曲线绘制，第一笔时记录起点，第二笔时不更新起点
-                if (drawingShapeMode == 24 || drawingShapeMode == 25)
+                touchPoint = e.GetTouchPoint(inkCanvas);
+                var size = touchPoint.Size; // 使用设备提供的触摸面积信息
+                var bounds = touchPoint.Bounds; // 保留bounds用于宽高比计算
+
+                // 根据敏感度设置调整判定参数
+                double palmAreaThreshold; // 改为面积阈值
+                double aspectRatioThreshold;
+                int minTouchPoints;
+
+                switch (Settings.Canvas.PalmEraserSensitivity)
                 {
-                    // 双曲线绘制：第一笔记录起点，第二笔保持第一笔的起点
-                    if (drawMultiStepShapeCurrentStep == 0)
+                    case 0: // 低敏感度 - 更严格的判定
+                        palmAreaThreshold = 6400; // 80*80的面积
+                        aspectRatioThreshold = 0.4;
+                        minTouchPoints = 4;
+                        break;
+                    case 1: // 中敏感度 - 平衡的判定
+                        palmAreaThreshold = 3600; // 60*60的面积
+                        aspectRatioThreshold = 0.3;
+                        minTouchPoints = 3;
+                        break;
+                    case 2: // 高敏感度 - 较宽松的判定
+                    default:
+                        palmAreaThreshold = 2500; // 50*50的面积
+                        aspectRatioThreshold = 0.25;
+                        minTouchPoints = 2;
+                        break;
+                }
+
+                // 计算触摸面积（使用设备提供的Size）
+                double touchArea = size.Width * size.Height;
+
+                // 计算宽高比（使用Bounds确保准确性）
+                double aspectRatio = Math.Min(bounds.Width, bounds.Height) / Math.Max(bounds.Width, bounds.Height);
+
+                // 改进的手掌判定条件：使用面积而不是单独的宽高
+                bool isLargeTouch = touchArea >= palmAreaThreshold;
+                bool isPalmLikeShape = aspectRatio >= aspectRatioThreshold;
+                bool hasMultipleTouchPoints = dec.Count >= minTouchPoints;
+
+                // 新增：额外的判定条件提高准确性
+                bool isReasonableSize = size.Width >= 20 && size.Height >= 20 && size.Width <= 200 && size.Height <= 200; // 合理的触摸尺寸范围
+                bool isNotTooElongated = aspectRatio >= 0.2; // 避免过于细长的触摸（可能是手指）
+                bool hasEnoughArea = touchArea >= 400; // 最小面积要求，避免小面积误判
+
+                if (isLargeTouch && isPalmLikeShape && hasMultipleTouchPoints && isReasonableSize && isNotTooElongated && hasEnoughArea)
+                {
+                    // 记录当前编辑模式和高光状态
+                    palmEraserLastEditingMode = inkCanvas.EditingMode;
+                    palmEraserLastIsHighlighter = drawingAttributes.IsHighlighter;
+
+                    // 记录参与手掌擦的触摸点ID
+                    palmEraserTouchIds.Clear();
+                    foreach (int touchId in dec)
                     {
+                        palmEraserTouchIds.Add(touchId);
+                    }
+
+                    // 切换为橡皮擦
+                    EraserIcon_Click(null, null);
+                    isPalmEraserActive = true;
+                    palmEraserActivationTime = DateTime.Now; // 记录激活时间
+                    palmEraserTouchDownHandled = true; // 标记已处理
+
+                    // 启动恢复定时器，防止卡死
+                    StartPalmEraserRecoveryTimer();
+
+                    // 记录日志
+                    LogHelper.WriteLogToFile($"Palm eraser activated - Sensitivity: {Settings.Canvas.PalmEraserSensitivity}, Touch area: {touchArea:F0}, Size: {size.Width}x{size.Height}, Bounds: {bounds.Width}x{bounds.Height}, Aspect ratio: {aspectRatio:F2}, Touch points: {dec.Count}, Reasonable size: {isReasonableSize}, Not elongated: {isNotTooElongated}, Enough area: {hasEnoughArea}");
+                }
+            }
+
+            // 设备1个的时候，记录中心点
+            if (dec.Count == 1)
+            {
+                touchPoint = e.GetTouchPoint(inkCanvas);
+                centerPoint = touchPoint.Position;
+
+                // 修复：只允许在此处赋值iniP，防止TouchMove等其他地方覆盖，保证几何绘制起点一致
+                if (drawingShapeMode != 0)
+                {
+                    // 对于双曲线绘制，第一笔时记录起点，第二笔时不更新起点
+                    if (drawingShapeMode == 24 || drawingShapeMode == 25)
+                    {
+                        // 双曲线绘制：第一笔记录起点，第二笔保持第一笔的起点
+                        if (drawMultiStepShapeCurrentStep == 0)
+                        {
+                            iniP = touchPoint.Position;
+                        }
+                        // 第二笔时不更新iniP，保持第一笔的起点
+                    }
+                    else
+                    {
+                        // 其他图形正常记录起点
                         iniP = touchPoint.Position;
                     }
-                    // 第二笔时不更新iniP，保持第一笔的起点
                 }
-                else
-                {
-                    // 其他图形正常记录起点
-                    iniP = touchPoint.Position;
-                }
-            }
 
-            // 记录第一根手指点击时的 StrokeCollection
-            lastTouchDownStrokeCollection = inkCanvas.Strokes.Clone();
-        }
+                // 记录第一根手指点击时的 StrokeCollection
+                lastTouchDownStrokeCollection = inkCanvas.Strokes.Clone();
+            }
             //设备两个及两个以上，将画笔功能关闭
             if (dec.Count > 1 || isSingleFingerDragMode || !Settings.Gesture.IsEnableTwoFingerGesture)
             {
@@ -571,7 +682,7 @@ namespace Ink_Canvas
                 lastInkCanvasEditingMode = inkCanvas.EditingMode;
                 // 修复：几何绘制模式下禁止切回Ink
                 if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint
-                    && inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke 
+                    && inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke
                     && drawingShapeMode == 0)
                 {
                     inkCanvas.EditingMode = InkCanvasEditingMode.None;
@@ -592,19 +703,21 @@ namespace Ink_Canvas
 
             // Palm Eraser 逻辑：优化状态恢复机制
             dec.Remove(e.TouchDevice.Id);
-            
+
             // 如果是手掌擦的触摸点，从记录中移除
             if (palmEraserTouchIds.Contains(e.TouchDevice.Id))
             {
                 palmEraserTouchIds.Remove(e.TouchDevice.Id);
             }
-            
+
             // 当所有手掌擦触摸点都抬起时，恢复原编辑模式
             if (isPalmEraserActive && palmEraserTouchIds.Count == 0)
             {
+                LogHelper.WriteLogToFile($"Palm eraser recovery triggered - Touch points remaining: {palmEraserTouchIds.Count}, dec.Count: {dec.Count}");
+
                 // 恢复高光状态
                 drawingAttributes.IsHighlighter = palmEraserLastIsHighlighter;
-                
+
                 // 恢复编辑模式 - 优化：改进状态恢复逻辑
                 try
                 {
@@ -623,7 +736,7 @@ namespace Ink_Canvas
                                 inkCanvas.EditingMode = palmEraserLastEditingMode;
                                 break;
                         }
-                        
+
                         LogHelper.WriteLogToFile($"Palm eraser recovered to mode: {palmEraserLastEditingMode}");
                     }
                 }
@@ -633,25 +746,25 @@ namespace Ink_Canvas
                     LogHelper.WriteLogToFile($"Palm eraser recovery failed: {ex.Message}, forcing to Ink mode", LogHelper.LogType.Error);
                     inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
                 }
-                
+
                 // 重置手掌擦状态
                 isPalmEraserActive = false;
                 palmEraserTouchDownHandled = false;
                 palmEraserTouchIds.Clear();
-                
+
                 // 停止恢复定时器
                 StopPalmEraserRecoveryTimer();
-                
+
                 // 确保触摸事件能正常响应
                 inkCanvas.IsHitTestVisible = true;
                 inkCanvas.IsManipulationEnabled = true;
-                
+
                 ViewboxFloatingBar.IsHitTestVisible = true;
                 BlackboardUIGridForInkReplay.IsHitTestVisible = true;
-                
+
                 LogHelper.WriteLogToFile("Palm eraser state reset completed");
             }
-            
+
             // 新增：超时检测 - 如果手掌擦激活时间过长，强制重置状态
             if (isPalmEraserActive)
             {
@@ -659,7 +772,7 @@ namespace Ink_Canvas
                 if (timeSinceActivation.TotalMilliseconds > PALM_ERASER_TIMEOUT_MS)
                 {
                     LogHelper.WriteLogToFile($"Palm eraser timeout detected ({timeSinceActivation.TotalMilliseconds}ms), forcing recovery", LogHelper.LogType.Warning);
-                    
+
                     // 强制恢复状态
                     try
                     {
@@ -684,20 +797,20 @@ namespace Ink_Canvas
                         LogHelper.WriteLogToFile($"Palm eraser timeout recovery failed: {ex.Message}, forcing to Ink mode", LogHelper.LogType.Error);
                         inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
                     }
-                    
+
                     // 重置所有手掌擦状态
                     isPalmEraserActive = false;
                     palmEraserTouchDownHandled = false;
                     palmEraserTouchIds.Clear();
                     inkCanvas.IsHitTestVisible = true;
                     inkCanvas.IsManipulationEnabled = true;
-                    
+
                     ViewboxFloatingBar.IsHitTestVisible = true;
                     BlackboardUIGridForInkReplay.IsHitTestVisible = true;
-                    
+
                     // 停止恢复定时器
                     StopPalmEraserRecoveryTimer();
-                    
+
                     LogHelper.WriteLogToFile("Palm eraser timeout recovery completed");
                 }
             }
@@ -760,19 +873,55 @@ namespace Ink_Canvas
                     {
                         inkCanvas.EditingMode = lastInkCanvasEditingMode;
                     }
-                    
+
                     // 修复：确保手掌擦除后触摸事件能正常响应
                     if (isPalmEraserActive)
                     {
+                        LogHelper.WriteLogToFile("Palm eraser force recovery - all touch points cleared");
+
+                        // 恢复高光状态
+                        drawingAttributes.IsHighlighter = palmEraserLastIsHighlighter;
+
+                        // 恢复编辑模式
+                        try
+                        {
+                            if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint)
+                            {
+                                switch (palmEraserLastEditingMode)
+                                {
+                                    case InkCanvasEditingMode.Ink:
+                                        PenIcon_Click(null, null);
+                                        break;
+                                    case InkCanvasEditingMode.Select:
+                                        SymbolIconSelect_MouseUp(null, null);
+                                        break;
+                                    default:
+                                        inkCanvas.EditingMode = palmEraserLastEditingMode;
+                                        break;
+                                }
+                                LogHelper.WriteLogToFile($"Palm eraser force recovered to mode: {palmEraserLastEditingMode}");
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"Palm eraser force recovery failed: {ex.Message}, forcing to Ink mode", LogHelper.LogType.Error);
+                            inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+                        }
+
                         // 如果手掌擦还在激活状态但触摸点已清空，强制重置状态
                         isPalmEraserActive = false;
                         palmEraserTouchDownHandled = false;
                         palmEraserTouchIds.Clear(); // 确保清空触摸点ID
                         inkCanvas.IsHitTestVisible = true;
                         inkCanvas.IsManipulationEnabled = true;
-                        
+
                         ViewboxFloatingBar.IsHitTestVisible = true;
                         BlackboardUIGridForInkReplay.IsHitTestVisible = true;
+
+                        // 停止恢复定时器
+                        StopPalmEraserRecoveryTimer();
+
+                        LogHelper.WriteLogToFile("Palm eraser force recovery completed");
                     }
                 }
             }
@@ -799,7 +948,7 @@ namespace Ink_Canvas
         {
             if (e.Manipulators.Count() != 0) return;
             // 修复：几何绘制模式下不自动切换到Ink模式，避免触摸轨迹被收集
-            if (drawingShapeMode == 0 
+            if (drawingShapeMode == 0
                 && inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint
                 && inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke)
             {
@@ -816,7 +965,34 @@ namespace Ink_Canvas
                 return;
             // 三指及以上禁止缩放
             bool disableScale = dec.Count >= 3;
-            if (isInMultiTouchMode || !Settings.Gesture.IsEnableTwoFingerGesture) return;
+
+            // 修复：允许单指拖动选中的墨迹，即使禁用了多指手势
+            if (isInMultiTouchMode) return;
+
+            // 如果是单指拖动选中的墨迹，允许处理
+            if (dec.Count == 1 && inkCanvas.GetSelectedStrokes().Count > 0)
+            {
+                var md = e.DeltaManipulation;
+                var trans = md.Translation; // 获得位移矢量
+
+                if (trans.X != 0 || trans.Y != 0)
+                {
+                    var m = new Matrix();
+                    m.Translate(trans.X, trans.Y); // 移动
+
+                    var strokes = inkCanvas.GetSelectedStrokes();
+                    foreach (var stroke in strokes)
+                    {
+                        stroke.Transform(m, false);
+                    }
+
+                    // 更新选择框位置
+                    updateBorderStrokeSelectionControlLocation();
+                }
+                return;
+            }
+
+            if (!Settings.Gesture.IsEnableTwoFingerGesture) return;
             if ((dec.Count >= 2 && (Settings.PowerPointSettings.IsEnableTwoFingerGestureInPresentationMode ||
                                     StackPanelPPTControls.Visibility != Visibility.Visible ||
                                     StackPanelPPTButtons.Visibility == Visibility.Collapsed)) ||
@@ -890,12 +1066,15 @@ namespace Ink_Canvas
                             catch { }
                         }
 
-                        ;
+                        // 同时变换画布上的图片元素
+                        TransformCanvasImages(m);
                     }
                     else
                     {
                         foreach (var stroke in inkCanvas.Strokes) stroke.Transform(m, false);
-                        ;
+                        
+                        // 同时变换画布上的图片元素
+                        TransformCanvasImages(m);
                     }
 
                     foreach (var circle in circles)
@@ -913,6 +1092,86 @@ namespace Ink_Canvas
             }
         }
 
+        /// <summary>
+        /// 变换画布上的图片元素，使其与墨迹同步移动
+        /// </summary>
+        private void TransformCanvasImages(Matrix matrix)
+        {
+            try
+            {
+                // 遍历inkCanvas的所有子元素，找到图片元素
+                for (int i = inkCanvas.Children.Count - 1; i >= 0; i--)
+                {
+                    var child = inkCanvas.Children[i];
+                    
+                    if (child is Image image)
+                    {
+                        // 应用矩阵变换到图片
+                        ApplyMatrixTransformToImage(image, matrix);
+                    }
+                    else if (child is MediaElement mediaElement)
+                    {
+                        // 对媒体元素也应用变换
+                        ApplyMatrixTransformToMediaElement(mediaElement, matrix);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"变换画布图片失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 对图片应用矩阵变换
+        /// </summary>
+        private void ApplyMatrixTransformToImage(Image image, Matrix matrix)
+        {
+            try
+            {
+                // 获取图片的RenderTransform，如果不存在则创建新的TransformGroup
+                TransformGroup transformGroup = image.RenderTransform as TransformGroup;
+                if (transformGroup == null)
+                {
+                    transformGroup = new TransformGroup();
+                    image.RenderTransform = transformGroup;
+                }
+
+                // 创建新的MatrixTransform并添加到变换组
+                var matrixTransform = new MatrixTransform(matrix);
+                transformGroup.Children.Add(matrixTransform);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"应用图片变换失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 对媒体元素应用矩阵变换
+        /// </summary>
+        private void ApplyMatrixTransformToMediaElement(MediaElement mediaElement, Matrix matrix)
+        {
+            try
+            {
+                // 获取媒体元素的RenderTransform，如果不存在则创建新的TransformGroup
+                TransformGroup transformGroup = mediaElement.RenderTransform as TransformGroup;
+                if (transformGroup == null)
+                {
+                    transformGroup = new TransformGroup();
+                    mediaElement.RenderTransform = transformGroup;
+                }
+
+                // 创建新的MatrixTransform并添加到变换组
+                var matrixTransform = new MatrixTransform(matrix);
+                transformGroup.Children.Add(matrixTransform);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"应用媒体元素变换失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
         // 退出多指书写模式，恢复InkCanvas的TouchDown事件绑定
         private void ExitMultiTouchModeIfNeeded()
         {
@@ -924,7 +1183,7 @@ namespace Ink_Canvas
                 inkCanvas.TouchDown -= MainWindow_TouchDown;
                 inkCanvas.TouchDown += Main_Grid_TouchDown;
                 // 修复：几何绘制模式下不自动切换到Ink模式，避免触摸轨迹被收集
-                if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint 
+                if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint
                     && inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke
                     && drawingShapeMode == 0)
                 {
@@ -958,7 +1217,7 @@ namespace Ink_Canvas
                 inkCanvas.TouchDown -= Main_Grid_TouchDown;
                 // 修复：几何绘制模式下不自动切换到Ink模式，避免触摸轨迹被收集
                 if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint
-                    && inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke 
+                    && inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke
                     && drawingShapeMode == 0)
                 {
                     inkCanvas.EditingMode = InkCanvasEditingMode.None;
@@ -976,7 +1235,7 @@ namespace Ink_Canvas
                     ToggleSwitchEnablePalmEraser.IsOn = false;
             }
         }
-        
+
         /// <summary>
         /// 启动手掌擦恢复定时器，防止卡死状态
         /// </summary>
@@ -988,10 +1247,10 @@ namespace Ink_Canvas
                 palmEraserRecoveryTimer.Interval = TimeSpan.FromMilliseconds(1000); // 每秒检查一次
                 palmEraserRecoveryTimer.Tick += PalmEraserRecoveryTimer_Tick;
             }
-            
+
             palmEraserRecoveryTimer.Start();
         }
-        
+
         /// <summary>
         /// 停止手掌擦恢复定时器
         /// </summary>
@@ -1002,20 +1261,20 @@ namespace Ink_Canvas
                 palmEraserRecoveryTimer.Stop();
             }
         }
-        
+
         /// <summary>
         /// 手掌擦恢复定时器事件处理
         /// </summary>
         private void PalmEraserRecoveryTimer_Tick(object sender, EventArgs e)
         {
             if (!isPalmEraserActive) return;
-            
+
             // 检查是否超时
             var timeSinceActivation = DateTime.Now - palmEraserActivationTime;
             if (timeSinceActivation.TotalMilliseconds > PALM_ERASER_TIMEOUT_MS)
             {
                 LogHelper.WriteLogToFile($"Palm eraser recovery timer triggered, forcing recovery after {timeSinceActivation.TotalMilliseconds}ms", LogHelper.LogType.Warning);
-                
+
                 // 强制恢复状态
                 try
                 {
@@ -1033,7 +1292,7 @@ namespace Ink_Canvas
                                 inkCanvas.EditingMode = palmEraserLastEditingMode;
                                 break;
                         }
-                        
+
                         LogHelper.WriteLogToFile($"Palm eraser timer recovery to mode: {palmEraserLastEditingMode}");
                     }
                 }
@@ -1042,20 +1301,20 @@ namespace Ink_Canvas
                     LogHelper.WriteLogToFile($"Palm eraser recovery timer failed: {ex.Message}, forcing to Ink mode", LogHelper.LogType.Error);
                     inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
                 }
-                
+
                 // 重置所有手掌擦状态
                 isPalmEraserActive = false;
                 palmEraserTouchDownHandled = false;
                 palmEraserTouchIds.Clear();
                 inkCanvas.IsHitTestVisible = true;
                 inkCanvas.IsManipulationEnabled = true;
-                
+
                 ViewboxFloatingBar.IsHitTestVisible = true;
                 BlackboardUIGridForInkReplay.IsHitTestVisible = true;
-                
+
                 // 停止定时器
                 StopPalmEraserRecoveryTimer();
-                
+
                 LogHelper.WriteLogToFile("Palm eraser timer recovery completed");
             }
         }

Ink Canvas/MainWindow_cs/MW_TrayIcon.cs

@@ -1,12 +1,12 @@
-using System;
+using Hardcodet.Wpf.TaskbarNotification;
+using Ink_Canvas.Helpers;
+using iNKORE.UI.WPF.Modern.Controls;
+using System;
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Forms;
 using System.Windows.Interop;
-using Hardcodet.Wpf.TaskbarNotification;
-using Ink_Canvas.Helpers;
-using iNKORE.UI.WPF.Modern.Controls;
 using Application = System.Windows.Application;
 using ContextMenu = System.Windows.Controls.ContextMenu;
 using MenuItem = System.Windows.Controls.MenuItem;
@@ -30,6 +30,12 @@ namespace Ink_Canvas
             var mainWin = (MainWindow)Current.MainWindow;
             if (mainWin.IsLoaded)
             {
+                // 在无焦点模式下，暂时取消主窗口置顶，让系统菜单能够正常显示
+                if (Ink_Canvas.MainWindow.Settings.Advanced.IsAlwaysOnTop && Ink_Canvas.MainWindow.Settings.Advanced.IsNoFocusMode)
+                {
+                    mainWin.Topmost = false;
+                }
+
                 // 判斷是否在收納模式中
                 if (mainWin.isFloatingBarFolded)
                 {
@@ -57,6 +63,19 @@ namespace Ink_Canvas
             }
         }
 
+        private void SysTrayMenu_Closed(object sender, RoutedEventArgs e)
+        {
+            var mainWin = (MainWindow)Current.MainWindow;
+            if (mainWin.IsLoaded)
+            {
+                // 菜单关闭后，恢复主窗口的置顶状态
+                if (Ink_Canvas.MainWindow.Settings.Advanced.IsAlwaysOnTop && Ink_Canvas.MainWindow.Settings.Advanced.IsNoFocusMode)
+                {
+                    mainWin.Topmost = true;
+                }
+            }
+        }
+
         private void CloseAppTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e)
         {
             var mainWin = (MainWindow)Current.MainWindow;
@@ -182,5 +201,60 @@ namespace Ink_Canvas
             }
         }
 
+        private void DisableAllHotkeysMenuItem_Clicked(object sender, RoutedEventArgs e)
+        {
+            var mainWin = (MainWindow)Current.MainWindow;
+            if (mainWin.IsLoaded)
+            {
+                try
+                {
+                    // 获取全局快捷键管理器
+                    var hotkeyManagerField = typeof(MainWindow).GetField("_globalHotkeyManager", 
+                        System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+                    var hotkeyManager = hotkeyManagerField?.GetValue(mainWin) as GlobalHotkeyManager;
+                    
+                    if (hotkeyManager != null)
+                    {
+                        // 禁用所有快捷键
+                        hotkeyManager.DisableHotkeyRegistration();
+                        
+                        // 更新菜单项文本和状态
+                        var menuItem = sender as MenuItem;
+                        if (menuItem != null)
+                        {
+                            var headerPanel = menuItem.Header as SimpleStackPanel;
+                            if (headerPanel != null)
+                            {
+                                var textBlock = headerPanel.Children[0] as TextBlock;
+                                if (textBlock != null)
+                                {
+                                    if (textBlock.Text == "禁用所有快捷键")
+                                    {
+                                        textBlock.Text = "启用所有快捷键";
+                                        LogHelper.WriteLogToFile("已禁用所有快捷键", LogHelper.LogType.Event);
+                                    }
+                                    else
+                                    {
+                                        textBlock.Text = "禁用所有快捷键";
+                                        // 重新启用快捷键
+                                        hotkeyManager.EnableHotkeyRegistration();
+                                        LogHelper.WriteLogToFile("已启用所有快捷键", LogHelper.LogType.Event);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        LogHelper.WriteLogToFile("无法获取全局快捷键管理器", LogHelper.LogType.Error);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"禁用/启用快捷键时出错: {ex.Message}", LogHelper.LogType.Error);
+                }
+            }
+        }
+
     }
 }

Ink Canvas/Properties/AssemblyInfo.cs

@@ -49,5 +49,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.9.0")]
-[assembly: AssemblyFileVersion("1.7.9.0")]
+[assembly: AssemblyVersion("1.7.11.0")]
+[assembly: AssemblyFileVersion("1.7.11.0")]

Ink Canvas/Resources/GeometryIcons.xaml

@@ -0,0 +1,101 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="IconBrush" Color="White"></SolidColorBrush>
+    <DrawingImage x:Key="CursorIconV2">
+        <DrawingImage.Drawing>
+            <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M22.7989,10.1653L1.14304,1.14304 10.1653,22.7989 12.8305,14.9518 19.6892,21.8105 21.8105,19.6892 14.9518,12.8305 22.7989,10.1653z" />
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+    <DrawingImage x:Key="PenIconV2">
+        <DrawingImage.Drawing>
+            <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M20.4786,1.42438C19.9985,1.23743 19.4847,1.15194 18.9698,1.17319 18.4549,1.19444 17.9499,1.32197 17.4869,1.54789 17.0368,1.76752 16.6358,2.07554 16.3083,2.45361L3.85516,14.9067 9.08243,20.134 21.5311,7.68529C21.9113,7.36382 22.223,6.96912 22.447,6.52438 22.6786,6.06462 22.8113,5.56167 22.8365,5.04763 22.8616,4.5336 22.7787,4.02012 22.593,3.54002 22.4073,3.05994 22.1232,2.62403 21.759,2.25988 21.3949,1.89574 20.9587,1.61132 20.4786,1.42438z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M7.28056,21.1605L2.8286,16.7086 1.15912,22.83 7.28056,21.1605z" />
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+    <DrawingImage x:Key="EraserIconV2">
+        <DrawingImage.Drawing>
+            <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M15.6314,20.7262L22.7921,13.5655C24.3494,12.141,24.2819,9.81776,22.8105,8.34633L16.7793,2.31508C15.3547,0.757753,13.0315,0.825236,11.5601,2.29666L4.38099,9.47574 15.6314,20.7262z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M14.2172,22.1404L2.96677,10.89 1.20761,12.6491C-0.34971,14.0737,-0.281711,16.3974,1.18971,17.8688L6.15089,22.83 13.5276,22.83 14.2172,22.1404z" />
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+    <DrawingImage x:Key="TrashBinIconV2">
+        <DrawingImage.Drawing>
+            <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M2.15454,7.07729L2.15454,5.1082 7.07727,5.1082 7.07727,4.12365C7.07727,3.30648 7.47109,2.57791 7.98305,2.0758 8.49501,1.56383 9.22358,1.17001 10.0309,1.17001L13.9691,1.17001C14.7863,1.17001 15.5148,1.56383 16.0169,2.0758 16.5289,2.58776 16.9227,3.31632 16.9227,4.12365L16.9227,5.1082 21.8454,5.1082 21.8454,7.07729 2.15454,7.07729z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F0 M24,24z M0,0z M4.12363,19.7779C4.12363,20.6148 4.51745,21.3729 5.02941,21.8947 5.54138,22.4165 6.26994,22.83 7.07727,22.83L16.9227,22.83C17.7399,22.83 18.4685,22.4165 18.9706,21.8947 19.4825,21.3729 19.8764,20.6148 19.8764,19.7779L19.8764,8.06183 4.12363,8.06183 4.12363,19.7779z M12.9845,11.0155L14.9536,11.0155 14.9536,18.8918 12.9845,18.8918 12.9845,11.0155z M9.04636,11.0155L11.0154,11.0155 11.0154,18.8918 9.04636,18.8918 9.04636,11.0155z" />
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+    <DrawingImage x:Key="LassoSelectIconV2">
+        <DrawingImage.Drawing>
+            <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M2.12162,2.12162C2.73093,1.51232,3.55732,1.17001,4.41901,1.17001L5.50201,1.17001 5.50201,3.33601 4.41901,3.33601C4.13178,3.33601 3.85632,3.45011 3.65321,3.65321 3.45011,3.85632 3.33601,4.13178 3.33601,4.41901L3.33601,5.50201 1.17001,5.50201 1.17001,4.41901C1.17001,3.55732,1.51232,2.73093,2.12162,2.12162z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M18.498,1.17001L19.581,1.17001C20.4427,1.17001 21.2691,1.51232 21.8784,2.12162 22.4877,2.73093 22.83,3.55732 22.83,4.41901L22.83,5.50201 20.664,5.50201 20.664,4.41901C20.664,4.13178 20.5499,3.85632 20.3468,3.65321 20.1437,3.45011 19.8682,3.33601 19.581,3.33601L18.498,3.33601 18.498,1.17001z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M3.33601,19.581L3.33601,18.498 1.17001,18.498 1.17001,19.581C1.17001,20.4427 1.51232,21.2691 2.12162,21.8784 2.73093,22.4877 3.55732,22.83 4.41901,22.83L5.50201,22.83 5.50201,20.664 4.41901,20.664C4.13178,20.664 3.85632,20.5499 3.65321,20.3468 3.45011,20.1437 3.33601,19.8682 3.33601,19.581z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M7.66801,1.17001L10.917,1.17001 10.917,3.33601 7.66801,3.33601 7.66801,1.17001z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M12,20.664L7.66801,20.664 7.66801,22.83 12,22.83 12,20.664z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M13.083,1.17001L16.332,1.17001 16.332,3.33601 13.083,3.33601 13.083,1.17001z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M3.33601,10.917L3.33601,7.66801 1.17001,7.66801 1.17001,10.917 3.33601,10.917z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M22.83,7.66801L22.83,12 20.664,12 20.664,7.66801 22.83,7.66801z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M3.33601,16.332L3.33601,13.083 1.17001,13.083 1.17001,16.332 3.33601,16.332z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M10.7469,10.747L22.83,15.781 18.4517,17.2681 22.2785,21.0949 21.0949,22.2785 17.2681,18.4517 15.781,22.83 10.7469,10.747z" />
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+    <DrawingImage x:Key="ShapesIconV2">
+        <DrawingImage.Drawing>
+            <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M17.8604,10.7597L12.0068,1.17001 6.13961,10.7597 17.8604,10.7597z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M10.9345,13.2403L1.34476,13.2403 1.34476,22.83 10.9345,22.83 10.9345,13.2403z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M17.8604,13.2403C15.2122,13.2403 13.0655,15.387 13.0655,18.0352 13.0655,20.6833 15.2122,22.83 17.8604,22.83 20.5085,22.83 22.6552,20.6833 22.6552,18.0352 22.6552,15.387 20.5085,13.2403 17.8604,13.2403z" />
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+    <DrawingImage x:Key="UndoIconV2">
+        <DrawingImage.Drawing>
+            <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M8.71408,16.8493L0.874451,9.00964 8.71408,1.17001 8.71408,7.42358 15.7239,7.42358C16.7074,7.42358 17.6791,7.62744 18.583,8.02124 19.4866,8.41493 20.3023,8.98966 20.9857,9.70849 21.6689,10.4271 22.2069,11.276 22.5726,12.2047 22.9383,13.1333 23.1256,14.126 23.1256,15.1268 23.1256,16.1276 22.9383,17.1203 22.5726,18.0489 22.2069,18.9776 21.6689,19.8264 20.9857,20.5451 20.3023,21.2639 19.4866,21.8387 18.583,22.2324 17.6791,22.6262 16.7074,22.83 15.7239,22.83L10.437,22.83 10.437,19.6579 15.7239,19.6579C16.2679,19.6579 16.8086,19.5453 17.3159,19.3243 17.8235,19.1031 18.29,18.7767 18.6867,18.3594 19.0835,17.942 19.4023,17.4422 19.6211,16.8866 19.8399,16.3308 19.9534,15.7326 19.9534,15.1268 19.9534,14.5209 19.8399,13.9227 19.6211,13.367 19.4023,12.8114 19.0835,12.3115 18.6867,11.8941 18.29,11.4769 17.8235,11.1505 17.3159,10.9293 16.8086,10.7083 16.2679,10.5957 15.7239,10.5957L8.71408,10.5957 8.71408,16.8493z" />
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+    <DrawingImage x:Key="RedoIconV2">
+        <DrawingImage.Drawing>
+            <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M15.2859,16.8493L23.1255,9.00964 15.2859,1.17001 15.2859,7.42358 8.27607,7.42358C7.29262,7.42358 6.32086,7.62744 5.41703,8.02124 4.51341,8.41493 3.69773,8.98966 3.01434,9.70849 2.33111,10.4271 1.79312,11.276 1.42741,12.2047 1.06174,13.1333 0.874422,14.126 0.874422,15.1268 0.874422,16.1276 1.06174,17.1203 1.42741,18.0489 1.79312,18.9776 2.33111,19.8264 3.01434,20.5451 3.69773,21.2639 4.51341,21.8387 5.41703,22.2324 6.32086,22.6262 7.29262,22.83 8.27607,22.83L13.563,22.83 13.563,19.6579 8.27607,19.6579C7.7321,19.6579 7.19139,19.5453 6.68406,19.3243 6.17652,19.1031 5.70999,18.7767 5.31333,18.3594 4.91651,17.942 4.59775,17.4422 4.37894,16.8866 4.1601,16.3308 4.04656,15.7326 4.04656,15.1268 4.04656,14.5209 4.1601,13.9227 4.37894,13.367 4.59775,12.8114 4.91651,12.3115 5.31333,11.8941 5.70999,11.4769 6.17652,11.1505 6.68406,10.9293 7.19139,10.7083 7.7321,10.5957 8.27607,10.5957L15.2859,10.5957 15.2859,16.8493z" />
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+    <DrawingImage x:Key="MoreToolsIconV2">
+        <DrawingImage.Drawing>
+            <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M3.336,1.17001C2.13975,1.17001,1.17,2.13976,1.17,3.33601L1.17,8.75101C1.17,9.94726,2.13975,10.917,3.336,10.917L8.751,10.917C9.94725,10.917,10.917,9.94726,10.917,8.75101L10.917,3.33601C10.917,2.13976,9.94725,1.17001,8.751,1.17001L3.336,1.17001z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M15.249,1.17001C14.0527,1.17001,13.083,2.13976,13.083,3.33601L13.083,8.75101C13.083,9.94726,14.0527,10.917,15.249,10.917L20.664,10.917C21.8602,10.917,22.83,9.94726,22.83,8.75101L22.83,3.33601C22.83,2.13976,21.8602,1.17001,20.664,1.17001L15.249,1.17001z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M3.336,13.083C2.13975,13.083,1.17,14.0528,1.17,15.249L1.17,20.664C1.17,21.8603,2.13975,22.83,3.336,22.83L8.751,22.83C9.94725,22.83,10.917,21.8603,10.917,20.664L10.917,15.249C10.917,14.0528,9.94725,13.083,8.751,13.083L3.336,13.083z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M15.249,13.083C14.0527,13.083,13.083,14.0528,13.083,15.249L13.083,20.664C13.083,21.8603,14.0527,22.83,15.249,22.83L20.664,22.83C21.8602,22.83,22.83,21.8603,22.83,20.664L22.83,15.249C22.83,14.0528,21.8602,13.083,20.664,13.083L15.249,13.083z" />
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+    <DrawingImage x:Key="GestureIconV2">
+        <DrawingImage.Drawing>
+            <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F0 M24,24z M0,0z M7.82154,10.0753L7.82154,3.74613C7.82154,3.06604 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.35738,17.6675 7.23419,15.7096 5.31756,12.2989 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" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z 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" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M18.2806,5.20935L19.1565,5.75549 20.259,4.01404 19.3832,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" />
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+    <DrawingImage x:Key="EyeOffIconV2">
+        <DrawingImage.Drawing>
+            <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F0 M24,24z M0,0z M22.8347,21.5006L2.50417,1.17001 1.16525,2.50893 5.45737,6.80104C3.85257,8.10197 2.53265,9.72576 1.64954,11.5964 1.53559,11.8433 1.52609,12.1282 1.63055,12.3751L1.63055,12.3941C1.63055,12.4131 1.64954,12.4321 1.65904,12.4606 1.68752,12.5175 1.72551,12.5935 1.77299,12.698 1.87744,12.8974 2.01988,13.1822 2.21929,13.5146 2.61812,14.1793 3.21635,15.0719 4.04249,15.9645 5.69477,17.7497 8.30612,19.5919 11.981,19.5919 13.7282,19.5919 15.4375,19.1551 16.9568,18.31L21.4768,22.83 22.8158,21.4911 22.8347,21.5006z M11.9905,15.8791C12.5033,15.8696 13.0066,15.7556 13.4719,15.5467 13.6428,15.4707 13.7852,15.3758 13.9372,15.2808L8.72394,10.0676C8.62898,10.2195 8.53402,10.3715 8.45805,10.5329 8.24915,10.9982 8.1257,11.5015 8.1257,12.0143 8.1162,12.527 8.21116,13.0303 8.40108,13.5051 8.591,13.9799 8.87587,14.4072 9.23671,14.768 9.59755,15.1289 10.0249,15.4138 10.4997,15.6037 10.9745,15.7936 11.4777,15.8791 11.9905,15.8791z" />
+                <GeometryDrawing Brush="{StaticResource IconBrush}" Geometry="F1 M24,24z M0,0z M10.9063,6.37657C11.2749,6.33269 11.6452,6.30726 12,6.30726 14.974,6.30726 17.1134,7.78595 18.5447,9.32737 19.2601,10.0978 19.7852,10.8712 20.1309,11.4519 20.2587,11.6665 20.3611,11.8535 20.4389,12.0025 20.0809,12.6966 19.6562,13.3505 19.1703,13.9543L18.5749,14.694 20.0544,15.8848 20.6498,15.145C21.3248,14.3064 21.8966,13.387 22.3556,12.4078 22.4706,12.1625 22.475,11.8789 22.3683,11.6299L22.3669,11.6266 22.364,11.6201 22.3551,11.5998C22.3477,11.5833 22.3375,11.5605 22.3243,11.5319 22.2979,11.4748 22.2598,11.3946 22.2098,11.2945 22.1097,11.0944 21.9615,10.8142 21.7628,10.4805 21.3666,9.81482 20.7641,8.92644 19.9364,8.03508 18.2816,6.25295 15.6731,4.4081 12,4.4081 11.5572,4.4081 11.1108,4.43965 10.6818,4.49072L9.73885,4.60297 9.96336,6.48883 10.9063,6.37657z" />
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+</ResourceDictionary>

Ink Canvas/Resources/ICCConfiguration.cs

@@ -0,0 +1,63 @@
+using System.Windows;
+using System.Windows.Media;
+
+namespace Ink_Canvas.Resources.ICCConfiguration
+{
+    public enum InitialPositionTypes
+    {
+        TopLeft, TopRight, BottomLeft, BottomRight, TopCenter, BottomCenter, Custom
+    }
+    public enum ElementCornerRadiusTypes
+    {
+        SuperEllipse, Circle, Custom, None
+    }
+    public class NearSnapAreaSize
+    {
+        public double[] TopLeft { get; set; } = { 24, 24 };
+        public double[] TopRight { get; set; } = { 24, 24 };
+        public double[] BottomLeft { get; set; } = { 24, 24 };
+        public double[] BottomRight { get; set; } = { 24, 24 };
+        public double TopCenter { get; set; } = 24;
+        public double BottomCenter { get; set; } = 24;
+    }
+    public class ICCFloatingBarConfiguration
+    {
+        public bool SemiTransparent { get; set; } = false;
+        public bool NearSnap { get; set; } = true;
+        public InitialPositionTypes InitialPosition { get; set; } = InitialPositionTypes.BottomCenter;
+        public Point InitialPositionPoint { get; set; } = new Point(0, 0);
+        public double ElementCornerRadiusValue = 0;
+        public ElementCornerRadiusTypes ElementCornerRadiusType { get; set; } = ElementCornerRadiusTypes.SuperEllipse;
+
+        public bool ParallaxEffect { get; set; } = true;
+        public bool MiniMode { get; set; } = false;
+        public Color ClearButtonColor { get; set; } = Color.FromRgb(224, 27, 36);
+        public Color ClearButtonPressColor { get; set; } = Color.FromRgb(254, 226, 226);
+        public Color ToolButtonSelectedBgColor { get; set; } = Color.FromRgb(37, 99, 235);
+        public double MovingLimitationNoSnap { get; set; } = 12;
+        public double MovingLimitationSnapped { get; set; } = 24;
+
+        public NearSnapAreaSize NearSnapAreaSize { get; set; } = new NearSnapAreaSize()
+        {
+            TopLeft = new double[] { 24, 24 },
+            TopRight = new double[] { 24, 24 },
+            BottomLeft = new double[] { 24, 24 },
+            BottomRight = new double[] { 24, 24 },
+        };
+
+        public string[] ToolBarItemsInCursorMode { get; set; } = new string[] {
+            "Cursor", "Pen", "Clear", "Separator", "Whiteboard", "Gesture", "Menu", "Fold"
+        };
+        public string[] ToolBarItemsInMiniMode { get; set; } = new string[] {
+            "Cursor", "Pen", "Clear"
+        };
+        public string[] ToolBarItemsInAnnotationMode { get; set; } = new string[] {
+            "Cursor", "Pen", "Clear", "Separator", "Eraser", "ShapeDrawing", "Select", "Separator", "Undo", "Redo", "Separator", "Whiteboard", "Gesture", "Menu", "Fold"
+        };
+    }
+
+    public class ICCConfiguration
+    {
+        public ICCFloatingBarConfiguration FloatingBar { get; set; } = new ICCFloatingBarConfiguration();
+    }
+}

Ink Canvas/Resources/Settings.cs

@@ -1,7 +1,7 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.IO;
-using Newtonsoft.Json;
 
 namespace Ink_Canvas
 {
@@ -25,6 +25,8 @@ namespace Ink_Canvas
         public Startup Startup { get; set; } = new Startup();
         [JsonProperty("randSettings")]
         public RandSettings RandSettings { get; set; } = new RandSettings();
+        [JsonProperty("modeSettings")]
+        public ModeSettings ModeSettings { get; set; } = new ModeSettings();
     }
 
     public class Canvas
@@ -89,18 +91,18 @@ namespace Ink_Canvas
         [JsonProperty("enablePalmEraser")]
         public bool EnablePalmEraser { get; set; } = true;
         [JsonProperty("palmEraserSensitivity")]
-        public int PalmEraserSensitivity { get; set; } = 2; // 0-低敏感度, 1-中敏感度, 2-高敏感度
+        public int PalmEraserSensitivity { get; set; } = 0; // 0-低敏感度, 1-中敏感度, 2-高敏感度
         [JsonProperty("clearCanvasAlsoClearImages")]
         public bool ClearCanvasAlsoClearImages { get; set; } = true;
         [JsonProperty("showCircleCenter")]
-        public bool ShowCircleCenter { get; set; } 
+        public bool ShowCircleCenter { get; set; }
 
         // 墨迹渐隐功能设置
         [JsonProperty("enableInkFade")]
         public bool EnableInkFade { get; set; } // 是否启用墨迹渐隐功能
         [JsonProperty("inkFadeTime")]
         public int InkFadeTime { get; set; } = 3000; // 墨迹渐隐时间（毫秒）
-        
+
     }
 
     public enum OptionalOperation
@@ -152,7 +154,7 @@ namespace Ink_Canvas
         [JsonProperty("skippedVersion")]
         public string SkippedVersion { get; set; } = "";
         [JsonProperty("isEnableNibMode")]
-        public bool IsEnableNibMode { get; set; } 
+        public bool IsEnableNibMode { get; set; }
         [JsonProperty("isFoldAtStartup")]
         public bool IsFoldAtStartup { get; set; }
         [JsonProperty("crashAction")]
@@ -205,7 +207,7 @@ namespace Ink_Canvas
         public bool IsShowModeFingerToggleSwitch { get; set; } = true;
         [JsonProperty("theme")]
         public int Theme { get; set; }
-        
+
         // 浮动栏按钮显示控制
         [JsonProperty("isShowShapeButton")]
         public bool IsShowShapeButton { get; set; } = true;
@@ -218,7 +220,7 @@ namespace Ink_Canvas
         [JsonProperty("isShowWhiteboardButton")]
         public bool IsShowWhiteboardButton { get; set; } = true;
         [JsonProperty("isShowHideButton")]
-        public bool IsShowHideButton { get; set; } = true;     
+        public bool IsShowHideButton { get; set; } = true;
         [JsonProperty("isShowLassoSelectButton")]
         public bool IsShowLassoSelectButton { get; set; } = true;
         [JsonProperty("isShowClearAndMouseButton")]
@@ -226,12 +228,15 @@ namespace Ink_Canvas
 
         [JsonProperty("eraserDisplayOption")]
         public int EraserDisplayOption { get; set; }
-        
+
         [JsonProperty("isShowQuickColorPalette")]
         public bool IsShowQuickColorPalette { get; set; }
-        
+
         [JsonProperty("quickColorPaletteDisplayMode")]
-        public int QuickColorPaletteDisplayMode { get; set; } = 1; 
+        public int QuickColorPaletteDisplayMode { get; set; } = 1;
+
+        [JsonProperty("enableHotkeysInMouseMode")]
+        public bool EnableHotkeysInMouseMode { get; set; } = false;
 
     }
 
@@ -304,6 +309,10 @@ namespace Ink_Canvas
         public bool EnableWppProcessKill { get; set; } = true;
         [JsonProperty("isAlwaysGoToFirstPageOnReenter")]
         public bool IsAlwaysGoToFirstPageOnReenter { get; set; }
+        [JsonProperty("enablePowerPointEnhancement")]
+        public bool EnablePowerPointEnhancement { get; set; } = false;
+        [JsonProperty("showGestureButtonInSlideShow")]
+        public bool ShowGestureButtonInSlideShow { get; set; } = false;
     }
 
     public class Automation
@@ -431,7 +440,7 @@ namespace Ink_Canvas
         public int MinimumAutomationStrokeNumber { get; set; }
 
         [JsonProperty("autoSavedStrokesLocation")]
-        public string AutoSavedStrokesLocation = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "saves");
+        public string AutoSavedStrokesLocation = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Saves");
 
         [JsonProperty("autoDelSavedFiles")]
         public bool AutoDelSavedFiles;
@@ -439,11 +448,50 @@ namespace Ink_Canvas
         [JsonProperty("autoDelSavedFilesDaysThreshold")]
         public int AutoDelSavedFilesDaysThreshold = 15;
 
+        [JsonProperty("keepFoldAfterSoftwareExit")]
+        public bool KeepFoldAfterSoftwareExit { get; set; } = false;
+
         [JsonProperty("isSaveFullPageStrokes")]
         public bool IsSaveFullPageStrokes;
 
         [JsonProperty("isAutoEnterAnnotationAfterKillHite")]
         public bool IsAutoEnterAnnotationAfterKillHite { get; set; }
+
+        [JsonProperty("floatingWindowInterceptor")]
+        public FloatingWindowInterceptorSettings FloatingWindowInterceptor { get; set; } = new FloatingWindowInterceptorSettings();
+    }
+
+    public class FloatingWindowInterceptorSettings
+    {
+        [JsonProperty("isEnabled")]
+        public bool IsEnabled { get; set; } = false;
+
+        [JsonProperty("scanIntervalMs")]
+        public int ScanIntervalMs { get; set; } = 1000;
+
+        [JsonProperty("interceptRules")]
+        public Dictionary<string, bool> InterceptRules { get; set; } = new Dictionary<string, bool>
+        {
+            { "SeewoWhiteboard3Floating", true },
+            { "SeewoWhiteboard5Floating", true },
+            { "SeewoWhiteboard5CFloating", true },
+            { "SeewoPincoSideBarFloating", true },
+            { "SeewoPincoDrawingFloating", true },
+            { "SeewoPPTFloating", true },
+            { "AiClassFloating", true },
+            { "HiteAnnotationFloating", true },
+            { "ChangYanFloating", true },
+            { "ChangYanPptFloating", true },
+            { "IntelligentClassFloating", true },
+            { "SeewoDesktopAnnotationFloating", true },
+            { "SeewoDesktopSideBarFloating", true }
+        };
+
+        [JsonProperty("autoStart")]
+        public bool AutoStart { get; set; } = false;
+
+        [JsonProperty("showNotifications")]
+        public bool ShowNotifications { get; set; } = true;
     }
 
     public class Advanced
@@ -536,6 +584,8 @@ namespace Ink_Canvas
         public bool ShowRandomAndSingleDraw { get; set; } = true;
         [JsonProperty("directCallCiRand")]
         public bool DirectCallCiRand { get; set; }
+        [JsonProperty("externalCallerType")]
+        public int ExternalCallerType { get; set; } = 0; 
         [JsonProperty("selectedBackgroundIndex")]
         public int SelectedBackgroundIndex { get; set; }
         [JsonProperty("customPickNameBackgrounds")]
@@ -577,4 +627,10 @@ namespace Ink_Canvas
         // 用于JSON序列化
         public CustomFloatingBarIcon() { }
     }
+
+    public class ModeSettings
+    {
+        [JsonProperty("isPPTOnlyMode")]
+        public bool IsPPTOnlyMode { get; set; } = false; // 是否为仅PPT模式，默认为false（正常模式）
+    }
 }

Ink Canvas/Windows/AddCustomIconWindow.xaml.cs

@@ -1,8 +1,8 @@
+using Microsoft.Win32;
 using System;
 using System.IO;
 using System.Windows;
 using System.Windows.Media.Imaging;
-using Microsoft.Win32;
 
 namespace Ink_Canvas
 {

Ink Canvas/Windows/AddPickNameBackgroundWindow.xaml.cs

@@ -1,8 +1,8 @@
+using Microsoft.Win32;
 using System;
 using System.IO;
 using System.Windows;
 using System.Windows.Media.Imaging;
-using Microsoft.Win32;
 
 namespace Ink_Canvas
 {

Ink Canvas/Windows/CountdownTimerWindow.xaml

@@ -179,12 +179,12 @@
                         <Grid>
                             <Border x:Name="BtnStart" MouseUp="BtnStart_MouseUp" Background="#0066BF" Height="20" Width="20" CornerRadius="100">
                                 <Viewbox Margin="5">
-                                    <ui:FontIcon Name="FontIconStart" Glyph="&#xE768;" Foreground="White"/>
+                                    <ui:SymbolIcon Name="SymbolIconStart" Symbol="Play" Foreground="White"/>
                                 </Viewbox>
                             </Border>
                             <Border x:Name="BtnStartCover" Visibility="Collapsed" Background="#BFBFBF" Height="20" Width="20" CornerRadius="100">
                                 <Viewbox Margin="5">
-                                    <ui:FontIcon Glyph="{Binding ElementName=FontIconStart, Path=Glyph}" Foreground="White"/>
+                                    <ui:SymbolIcon Symbol="{Binding ElementName=SymbolIconStart, Path=Symbol}" Foreground="White"/>
                                 </Viewbox>
                             </Border>
                         </Grid>
@@ -194,12 +194,12 @@
                                     <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.15" BlurRadius="3"/>
                                 </Border.Effect>
                                 <Viewbox Margin="5.5">
-                                    <ui:FontIcon Glyph="&#xE72C;" Foreground="Black"/>
+                                    <ui:SymbolIcon Symbol="Refresh" Foreground="Black"/>
                                 </Viewbox>
                             </Border>
                             <Border x:Name="BtnResetCover" Background="#F3F5F9" Height="20" Width="20" CornerRadius="100">
                                 <Viewbox Margin="5.5">
-                                    <ui:FontIcon Glyph="&#xE72C;" Foreground="#9D9D9E"/>
+                                    <ui:SymbolIcon Symbol="Refresh" Foreground="#9D9D9E"/>
                                 </Viewbox>
                             </Border>
                         </Grid>
@@ -215,7 +215,7 @@
                             <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.1" BlurRadius="3"/>
                         </Border.Effect>
                         <Viewbox Margin="5.5">
-                            <ui:FontIcon Name="FontIconMinimal" Glyph="&#xE7B3;" Foreground="Black"/>
+                            <ui:SymbolIcon Name="SymbolIconMinimal" Symbol="HideBcc" Foreground="Black"/>
                         </Viewbox>
                     </Border>
                     <Border x:Name="BtnFullscreen" MouseUp="BtnFullscreen_MouseUp" HorizontalAlignment="Right" VerticalAlignment="Bottom"
@@ -225,7 +225,7 @@
                             <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.1" BlurRadius="3"/>
                         </Border.Effect>
                         <Viewbox Margin="5.5">
-                            <ui:FontIcon Name="FontIconFullscreen" Glyph="&#xE740;" Foreground="Black"/>
+                            <ui:SymbolIcon Name="SymbolIconFullscreen" Symbol="FullScreen" Foreground="Black"/>
                         </Viewbox>
                     </Border>
                     <Border x:Name="BtnClose" MouseUp="BtnClose_MouseUp" HorizontalAlignment="Right" VerticalAlignment="Bottom"
@@ -235,7 +235,7 @@
                             <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.1" BlurRadius="3"/>
                         </Border.Effect>
                         <Viewbox Margin="5.5">
-                            <ui:FontIcon Glyph="&#xE8BB;" Foreground="White"/>
+                            <ui:SymbolIcon Symbol="Clear"  Foreground="White"/>
                         </Viewbox>
                     </Border>
                 </ui:SimpleStackPanel>