From b3e48504139fe3b5a6cffcc6572ae2be7e207863 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sat, 19 Jul 2025 22:01:02 +0800
Subject: [PATCH 01/32] =?UTF-8?q?improve:=E6=8F=92=E4=BB=B6=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 1b5bb979..f663fae4 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -210,8 +210,18 @@
                                     <!-- Plugins -->
                                     <Button Width="40" Height="40" Margin="0,5,0,0" Style="{StaticResource NavButton}"
                                             Click="NavPlugins_Click" Tag="plugins" ToolTip="插件">
-                                        <TextBlock Text="&#xE735;" FontFamily="Segoe MDL2 Assets" FontSize="18"/>
+                                        <Image Width="20" Height="20">
+                                            <Image.Source>
+                                                <DrawingImage>
+                                                    <DrawingImage.Drawing>
+                                                        <GeometryDrawing Brush="White"
+                                                                         Geometry="M4 24V12H13V10C13 6.68629 15.6863 4 19 4C22.3137 4 25 6.68629 25 10V12H34V24H38C41.3137 24 44 26.6863 44 30C44 33.3137 41.3137 36 38 36H34V44H4V36H8C11.3137 36 14 33.3137 14 30C14 26.6863 11.3137 24 8 24H4Z"/>
+                                                    </DrawingImage.Drawing>
+                                                </DrawingImage>
+                                            </Image.Source>
+                                        </Image>
                                     </Button>
+
                                     <!-- Startup -->
                                     <Button Width="40" Height="40" Margin="0,10,0,0" Style="{StaticResource NavButton}" 
                                             Click="NavStartup_Click" Tag="startup" ToolTip="启动设置">

From 4742600b86ce4293eed4f2b19ee642fc240c440b Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sat, 19 Jul 2025 23:42:43 +0800
Subject: [PATCH 02/32] =?UTF-8?q?improve:=E8=81=94=E5=8A=A8=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml.cs      |   3 -
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 528 ++++-------------------------
 2 files changed, 57 insertions(+), 474 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 6cdf9da0..29ada085 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -278,9 +278,6 @@ namespace Ink_Canvas {
                 RadioCrashSilentRestart.IsChecked = true;
             else
                 RadioCrashNoAction.IsChecked = true;
-                
-            // 注册系统关机事件处理
-            RegisterShutdownHandler();
             
             // 设置默认为黑板模式
             Settings.Canvas.UsingWhiteboard = false;
diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index 3f9c08ff..1cfdd349 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -1,9 +1,6 @@
-using Ink_Canvas.Helpers;
-using iNKORE.UI.WPF.Modern;
-using Microsoft.Office.Core;
+using Ink_Canvas.Helpers;
 using Microsoft.Office.Interop.PowerPoint;
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
@@ -15,10 +12,11 @@ using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Threading;
-using Microsoft.Win32;
 using Application = System.Windows.Application;
 using File = System.IO.File;
 using MessageBox = System.Windows.MessageBox;
+using iNKORE.UI.WPF.Modern;
+using Microsoft.Office.Core;
 
 namespace Ink_Canvas {
     public partial class MainWindow : Window {
@@ -30,26 +28,12 @@ namespace Ink_Canvas {
 
         private void BtnCheckPPT_Click(object sender, RoutedEventArgs e) {
             try {
+                pptApplication =
+                    (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("kwpp.Application");
+                //pptApplication.SlideShowWindows[1].View.Next();
                 if (pptApplication != null) {
                     //获得演示文稿对象
-                    try {
-                        presentation = pptApplication.ActivePresentation;
-                    }
-                    catch (COMException) {
-                        // ActivePresentation 可能因只读等原因抛异常，遍历 Presentations
-                        presentation = null;
-                        foreach (Presentation pres in pptApplication.Presentations) {
-                            try {
-                                if (pres.ReadOnly == MsoTriState.msoFalse) {
-                                    presentation = pres;
-                                    break;
-                                }
-                            } catch { }
-                        }
-                        // 如果没有可编辑的，选择第一个只读的
-                        if (presentation == null && pptApplication.Presentations.Count > 0)
-                            presentation = pptApplication.Presentations[1];
-                    }
+                    presentation = pptApplication.ActivePresentation;
                     pptApplication.SlideShowBegin += PptApplication_SlideShowBegin;
                     pptApplication.SlideShowNextSlide += PptApplication_SlideShowNextSlide;
                     pptApplication.SlideShowEnd += PptApplication_SlideShowEnd;
@@ -60,19 +44,22 @@ namespace Ink_Canvas {
                     memoryStreams = new MemoryStream[slidescount + 2];
                     // 获得当前选中的幻灯片
                     try {
+                        // 在普通视图下这种方式可以获得当前选中的幻灯片对象
+                        // 然而在阅读模式下，这种方式会出现异常
                         slide = slides[pptApplication.ActiveWindow.Selection.SlideRange.SlideNumber];
                     }
                     catch {
-                        try {
-                            slide = pptApplication.SlideShowWindows[1].View.Slide;
-                        } catch { }
+                        // 在阅读模式下出现异常时，通过下面的方式来获得当前选中的幻灯片对象
+                        slide = pptApplication.SlideShowWindows[1].View.Slide;
                     }
                 }
+
                 if (pptApplication == null) throw new Exception();
+                //BtnCheckPPT.Visibility = Visibility.Collapsed;
                 StackPanelPPTControls.Visibility = Visibility.Visible;
             }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            catch {
+                //BtnCheckPPT.Visibility = Visibility.Visible;
                 StackPanelPPTControls.Visibility = Visibility.Collapsed;
                 LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
                 RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
@@ -87,231 +74,31 @@ namespace Ink_Canvas {
 
             Settings.PowerPointSettings.IsSupportWPS = ToggleSwitchSupportWPS.IsOn;
             SaveSettingsToFile();
-            
-            // 重置PowerPoint/WPS实例状态
-            ResetPresentationObjects();
-            isPowerPointInitialized = false;
-        }
-        
-        /// <summary>
-        /// 重置所有演示相关的COM对象
-        /// </summary>
-        private void ResetPresentationObjects()
-        {
-            try 
-            {
-                // 清理对象引用
-                if (pptApplication != null)
-                {
-                    try 
-                    {
-                        // 尝试解除事件绑定
-                        pptApplication.PresentationOpen -= PptApplication_PresentationOpen;
-                        pptApplication.PresentationClose -= PptApplication_PresentationClose;
-                        pptApplication.SlideShowBegin -= PptApplication_SlideShowBegin;
-                        pptApplication.SlideShowNextSlide -= PptApplication_SlideShowNextSlide;
-                        pptApplication.SlideShowEnd -= PptApplication_SlideShowEnd;
-                    }
-                    catch { }
-                    
-                    try { Marshal.ReleaseComObject(pptApplication); } catch { }
-                    pptApplication = null;
-                }
-                
-                if (presentation != null)
-                {
-                    try { Marshal.ReleaseComObject(presentation); } catch { }
-                    presentation = null;
-                }
-                
-                if (slides != null)
-                {
-                    try { Marshal.ReleaseComObject(slides); } catch { }
-                    slides = null;
-                }
-                
-                slide = null;
-                
-                // 强制GC回收
-                GC.Collect();
-                GC.WaitForPendingFinalizers();
-                
-                LogHelper.WriteLogToFile("成功重置所有演示对象", LogHelper.LogType.Info);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"重置演示对象时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
         }
 
         private static bool isWPSSupportOn => Settings.PowerPointSettings.IsSupportWPS;
 
         public static bool IsShowingRestoreHiddenSlidesWindow = false;
         private static bool IsShowingAutoplaySlidesWindow = false;
-        private bool isPowerPointInitialized = false;
-        private bool isWPSMode = false;
-        
-        /// <summary>
-        /// 获取所有可能的WPS进程名
-        /// </summary>
-        private string[] GetPossibleWPSProcessNames()
-        {
-            return new[] { "wpp", "wppmain", "wps", "et" };
-        }
-        
-        /// <summary>
-        /// 检查WPS进程是否正在运行
-        /// </summary>
-        /// <param name="writeLog">是否记录日志，默认为true</param>
-        private bool IsWPSRunning(bool writeLog = true)
-        {
-            foreach (var processName in GetPossibleWPSProcessNames())
-            {
-                var processes = Process.GetProcessesByName(processName);
-                if (processes.Length > 0)
-                {
-                    if (writeLog)
-                        LogHelper.WriteLogToFile($"检测到WPS进程: {processName}", LogHelper.LogType.Info);
-                    return true;
-                }
-            }
-            return false;
-        }
 
-        private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e)
-        {
-            // 如果正在显示特定窗口，则跳过检查
-            if (IsShowingRestoreHiddenSlidesWindow || IsShowingAutoplaySlidesWindow) 
-                return;
 
-            try
-            {
-                // 检查是否已有初始化的 PowerPoint 实例
-                if (!isPowerPointInitialized)
-                {
-                    // 检测WPS和PowerPoint进程
-                    bool wpsRunning = IsWPSRunning(true);
-                    var pptProcesses = Process.GetProcessesByName("POWERPNT");
-                    
-                    // 根据设置和进程状态决定模式
-                    isWPSMode = isWPSSupportOn;
-                    
-                    LogHelper.WriteLogToFile($"初始化模式: {(isWPSMode ? "WPS" : "PowerPoint")}", LogHelper.LogType.Info);
+        private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e) {
+            if (IsShowingRestoreHiddenSlidesWindow || IsShowingAutoplaySlidesWindow) return;
+            try {
+                //var processes = Process.GetProcessesByName("wpp");
+                //if (processes.Length > 0 && !isWPSSupportOn) return;
 
-                    // 优先获取WPS实例
-                    if (isWPSMode)
-                    {
-                        try
-                        {
-                            // 尝试多种可能的ProgID
-                            string[] possibleProgIds = { "wpp.Application", "WPS.Application" };
-                            
-                            foreach (var progId in possibleProgIds)
-                            {
-                                try
-                                {
-                                    LogHelper.WriteLogToFile($"尝试获取COM对象: {progId}", LogHelper.LogType.Info);
-                                    pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject(progId);
-                                    if (pptApplication != null)
-                                    {
-                                        LogHelper.WriteLogToFile($"成功连接到WPS: {progId}", LogHelper.LogType.Info);
-                                        break;
-                                    }
-                                }
-                                catch 
-                                {
-                                    continue;
-                                }
-                            }
-                        }
-                        catch (COMException ex)
-                        {
-                            LogHelper.WriteLogToFile($"获取WPS实例失败: {ex.Message}", LogHelper.LogType.Error);
-                            pptApplication = null;
-                        }
-                    }
+                //使用下方提前创建 PowerPoint 实例，将导致 PowerPoint 不再有启动界面
+                //pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B")));
+                //new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowBegin").AddEventHandler(pptApplication, new EApplication_SlideShowBeginEventHandler(this.PptApplication_SlideShowBegin));
+                //new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowEnd").AddEventHandler(pptApplication, new EApplication_SlideShowEndEventHandler(this.PptApplication_SlideShowEnd));
+                //new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowNextSlide").AddEventHandler(pptApplication, new EApplication_SlideShowNextSlideEventHandler(this.PptApplication_SlideShowNextSlide));
+                //ConfigHelper.Instance.IsInitApplicationSuccessful = true;
 
-                    // 如果未获取到WPS实例，尝试获取PowerPoint实例
-                    if (pptApplication == null && pptProcesses.Length > 0)
-                    {
-                        try
-                        {
-                            LogHelper.WriteLogToFile("尝试获取PowerPoint实例", LogHelper.LogType.Info);
-                            pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
-                            if (pptApplication != null)
-                                LogHelper.WriteLogToFile("成功连接到PowerPoint", LogHelper.LogType.Info);
-                        }
-                        catch (COMException ex)
-                        {
-                            LogHelper.WriteLogToFile($"获取PowerPoint实例失败: {ex.Message}", LogHelper.LogType.Error);
-                            pptApplication = null;
-                        }
-                    }
-
-                    // 如果都没有找到，且未启用WPS支持，则自动创建PowerPoint进程
-                    if (pptApplication == null && !isWPSMode && pptProcesses.Length == 0)
-                    {
-                        try
-                        {
-                            LogHelper.WriteLogToFile("尝试创建新的PowerPoint实例", LogHelper.LogType.Info);
-                            pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(
-                                Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B")));
-                            if (pptApplication != null)
-                                LogHelper.WriteLogToFile("成功创建PowerPoint实例", LogHelper.LogType.Info);
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.WriteLogToFile($"创建PowerPoint实例失败: {ex.Message}", LogHelper.LogType.Error);
-                            pptApplication = null;
-                        }
-                    }
-                    
-                    isPowerPointInitialized = true;
-                    return;
-                }
-
-                // 检查进程是否还在
-                bool currentWpsRunning = IsWPSRunning(false); // 定期检查不输出日志
-                var currentPptProcesses = Process.GetProcessesByName("POWERPNT");
-                
-                // 检测应用程序是否关闭
-                bool applicationClosed = isWPSMode ? !currentWpsRunning : currentPptProcesses.Length == 0;
-
-                if (applicationClosed)
-                {
-                    LogHelper.WriteLogToFile($"{(isWPSMode ? "WPS" : "PowerPoint")}进程已关闭，清理对象", LogHelper.LogType.Info);
-                    
-                    // 进程已关闭，调用重置方法清理对象
-                    ResetPresentationObjects();
-                    isPowerPointInitialized = false;
-
-                    // PowerPoint进程守护：自动重启PowerPoint进程（仅在未启用WPS支持时）
-                    if (!isWPSSupportOn && !isWPSMode)
-                    {
-                        try
-                        {
-                            LogHelper.WriteLogToFile("尝试重启PowerPoint进程", LogHelper.LogType.Info);
-                            pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(
-                                Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B")));
-                            isPowerPointInitialized = true;
-                            LogHelper.WriteLogToFile("PowerPoint进程重启成功", LogHelper.LogType.Info);
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.WriteLogToFile($"PowerPoint守护重启失败: {ex.Message}", LogHelper.LogType.Error);
-                        }
-                    }
-                    return;
-                }
-                
-                
-                
+                pptApplication =
+                    (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
 
                 if (pptApplication != null) {
-                    // 检查是否有活动演示文稿
-                    if (pptApplication.Presentations.Count == 0 || pptApplication.ActivePresentation == null) 
-                        return; // 退出方法，避免后续代码执行
-                    isPowerPointInitialized = false;
                     timerCheckPPT.Stop();
                     //获得演示文稿对象
                     presentation = pptApplication.ActivePresentation;
@@ -330,12 +117,7 @@ namespace Ink_Canvas {
                     }
                     catch {
                         // 在阅读模式下出现异常时，通过下面的方式来获得当前选中的幻灯片对象
-                        try {
-                            slide = pptApplication.SlideShowWindows[1].View.Slide;
-                        }
-                        catch (Exception ex) {
-                            LogHelper.WriteLogToFile("Failed to get current slide: " + ex.ToString(), LogHelper.LogType.Error);
-                        }
+                        slide = pptApplication.SlideShowWindows[1].View.Slide;
                     }
 
                     pptApplication.PresentationOpen += PptApplication_PresentationOpen;
@@ -343,74 +125,48 @@ namespace Ink_Canvas {
                     pptApplication.SlideShowBegin += PptApplication_SlideShowBegin;
                     pptApplication.SlideShowNextSlide += PptApplication_SlideShowNextSlide;
                     pptApplication.SlideShowEnd += PptApplication_SlideShowEnd;
-
-                    // 检查是否在放映模式
-                    Application.Current.Dispatcher.Invoke(() => {
-                        try {
-                            if (pptApplication.SlideShowWindows.Count >= 1) {
-                                BtnPPTSlideShow.Visibility = Visibility.Collapsed;
-                                BtnPPTSlideShowEnd.Visibility = Visibility.Visible;
-                                UpdatePPTBtnDisplaySettingsStatus();
-                            } else {
-                                BtnPPTSlideShow.Visibility = Visibility.Visible;
-                                BtnPPTSlideShowEnd.Visibility = Visibility.Collapsed;
-                            }
-                        } catch (Exception ex) {
-                            LogHelper.WriteLogToFile("Failed to update button visibility: " + ex.ToString(), LogHelper.LogType.Error);
-                        }
-                    });
                 }
 
                 if (pptApplication == null) return;
-                
+                //BtnCheckPPT.Visibility = Visibility.Collapsed;
+
                 // 此处是已经开启了
-                Application.Current.Dispatcher.Invoke(() => {
-                    PptApplication_PresentationOpen(null);
-                });
-                
+                PptApplication_PresentationOpen(null);
 
                 //如果检测到已经开始放映，则立即进入画板模式
-                if (pptApplication.SlideShowWindows.Count >= 1) {
-                    Application.Current.Dispatcher.Invoke(() => {
-                        PptApplication_SlideShowBegin(pptApplication.SlideShowWindows[1]);
-                    });
-                }
+                if (pptApplication.SlideShowWindows.Count >= 1)
+                    PptApplication_SlideShowBegin(pptApplication.SlideShowWindows[1]);
             }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile($"TimerCheckPPT_Elapsed 异常: {ex.Message}", LogHelper.LogType.Error);
-                Application.Current.Dispatcher.Invoke(() => { 
-                    BtnPPTSlideShow.Visibility = Visibility.Collapsed; 
-                    timerCheckPPT.Start();
-                });
+            catch {
+                //StackPanelPPTControls.Visibility = Visibility.Collapsed;
+                Application.Current.Dispatcher.Invoke(() => { BtnPPTSlideShow.Visibility = Visibility.Collapsed; });
+                timerCheckPPT.Start();
             }
         }
 
         private void PptApplication_PresentationOpen(Presentation Pres) {
             // 跳转到上次播放页
-            Application.Current.Dispatcher.BeginInvoke(new Action(() => {
-                try {
-                    if (!Settings.PowerPointSettings.IsNotifyPreviousPage) return;
-                    
+            if (Settings.PowerPointSettings.IsNotifyPreviousPage)
+                Application.Current.Dispatcher.BeginInvoke(new Action(() => {
                     var folderPath = Settings.Automation.AutoSavedStrokesLocation +
                                      @"\Auto Saved - Presentations\" + presentation.Name + "_" +
                                      presentation.Slides.Count;
-                                     
-                    if (!File.Exists(folderPath + "/Position")) return;
-                    if (!int.TryParse(File.ReadAllText(folderPath + "/Position"), out var page)) return;
-                    if (page <= 0) return;
-                    
-                    new YesOrNoNotificationWindow($"上次播放到了第 {page} 页, 是否立即跳转", () => {
-                        if (pptApplication.SlideShowWindows.Count >= 1)
-                            // 如果已经播放了的话, 跳转
-                            presentation.SlideShowWindow.View.GotoSlide(page);
-                        else
-                            presentation.Windows[1].View.GotoSlide(page);
-                    }).ShowDialog();
-                }
-                catch (Exception ex) {
-                    LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-                }
-            }), DispatcherPriority.Normal);
+                    try {
+                        if (!File.Exists(folderPath + "/Position")) return;
+                        if (!int.TryParse(File.ReadAllText(folderPath + "/Position"), out var page)) return;
+                        if (page <= 0) return;
+                        new YesOrNoNotificationWindow($"上次播放到了第 {page} 页, 是否立即跳转", () => {
+                            if (pptApplication.SlideShowWindows.Count >= 1)
+                                // 如果已经播放了的话, 跳转
+                                presentation.SlideShowWindow.View.GotoSlide(page);
+                            else
+                                presentation.Windows[1].View.GotoSlide(page);
+                        }).ShowDialog();
+                    }
+                    catch (Exception ex) {
+                        LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+                    }
+                }), DispatcherPriority.Normal);
 
 
             //检查是否有隐藏幻灯片
@@ -443,6 +199,7 @@ namespace Ink_Canvas {
 
             //检测是否有自动播放
             if (Settings.PowerPointSettings.IsNotifyAutoPlayPresentation
+                // && presentation.SlideShowSettings.AdvanceMode == PpSlideShowAdvanceMode.ppSlideShowUseSlideTimings
                 && BtnPPTSlideShowEnd.Visibility != Visibility.Visible) {
                 bool hasSlideTimings = false;
                 foreach (Slide slide in presentation.Slides) {
@@ -490,18 +247,6 @@ namespace Ink_Canvas {
             catch (Exception ex) {
                 LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
             }
-            // ========== 新增：WPS进程清理调用 ==========
-            if (isWPSMode && pptApplication != null)
-            {
-                try
-                {
-                    if (pptApplication.Presentations.Count == 0)
-                    {
-                        TryCloseExtraWpsProcesses();
-                    }
-                }
-                catch { }
-            }
         }
 
         private bool isPresentationHaveBlackSpace = false;
@@ -884,18 +629,6 @@ namespace Ink_Canvas {
                 await Application.Current.Dispatcher.InvokeAsync(() => {
                     ViewboxFloatingBarMarginAnimation(100, true);
                 });
-            // ========== 新增：WPS进程清理调用 ==========
-            if (isWPSMode && pptApplication != null)
-            {
-                try
-                {
-                    if (pptApplication.Presentations.Count == 0)
-                    {
-                        TryCloseExtraWpsProcesses();
-                    }
-                }
-                catch { }
-            }
             }
             catch (Exception ex) {
                 LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
@@ -1250,152 +983,5 @@ namespace Ink_Canvas {
         private void ImagePPTControlEnd_MouseUp(object sender, MouseButtonEventArgs e) {
             BtnPPTSlideShowEnd_Click(BtnPPTSlideShowEnd, null);
         }
-
-        // 添加关机事件注册方法
-        private void RegisterShutdownHandler()
-        {
-            try
-            {
-                SystemEvents.SessionEnding += SystemEvents_SessionEnding;
-                LogHelper.WriteLogToFile("已注册系统关机事件处理", LogHelper.LogType.Info);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"注册系统关机事件处理失败: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        // 系统关机事件处理
-        private void SystemEvents_SessionEnding(object sender, SessionEndingEventArgs e)
-        {
-            LogHelper.WriteLogToFile("检测到系统关机事件，正在清理PowerPoint进程", LogHelper.LogType.Info);
-            
-            // 终止PowerPoint进程守护
-            try
-            {
-                // 停止计时器以终止进程守护
-                timerCheckPPT.Stop();
-                
-                // 清理COM对象
-                ResetPresentationObjects();
-                
-                // 强制结束所有PowerPoint进程
-                foreach (var process in Process.GetProcessesByName("POWERPNT"))
-                {
-                    try
-                    {
-                        process.Kill();
-                        LogHelper.WriteLogToFile($"已终止PowerPoint进程: {process.Id}", LogHelper.LogType.Info);
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.WriteLogToFile($"终止PowerPoint进程失败: {ex.Message}", LogHelper.LogType.Error);
-                    }
-                }
-                
-                // 强制结束所有WPS进程
-                foreach (var processName in GetPossibleWPSProcessNames())
-                {
-                    foreach (var process in Process.GetProcessesByName(processName))
-                    {
-                        try
-                        {
-                            process.Kill();
-                            LogHelper.WriteLogToFile($"已终止WPS进程: {process.ProcessName}({process.Id})", LogHelper.LogType.Info);
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.WriteLogToFile($"终止WPS进程失败: {ex.Message}", LogHelper.LogType.Error);
-                        }
-                    }
-                }
-                
-                // 强制GC回收
-                GC.Collect();
-                GC.WaitForPendingFinalizers();
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"系统关机清理过程中出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-        
-        // 在主窗口初始化方法中添加以下调用
-        // 在适当的初始化方法中调用 RegisterShutdownHandler();
-        
-        // 在主窗口关闭时取消注册关机事件
-        protected override void OnClosed(EventArgs e)
-        {
-            try
-            {
-                // 取消注册系统关机事件
-                SystemEvents.SessionEnding -= SystemEvents_SessionEnding;
-            }
-            catch { }
-            
-            base.OnClosed(e);
-        }
-
-        // ========== 新增：安全关闭多余WPS进程的方法 ==========
-        /// <summary>
-        /// 检查并安全关闭多余的WPS进程（仅当所有WPS都未打开PPT时）
-        /// </summary>
-        private void TryCloseExtraWpsProcesses()
-        {
-            try
-            {
-                // 检查所有WPS进程是否都没有打开PPT
-                bool allWpsNoPpt = true;
-                foreach (var processName in GetPossibleWPSProcessNames())
-                {
-                    foreach (var process in Process.GetProcessesByName(processName))
-                    {
-                        try
-                        {
-                            dynamic wpsApp = null;
-                            try
-                            {
-                                wpsApp = Marshal.GetActiveObject(processName + ".Application");
-                            }
-                            catch { }
-                            if (wpsApp != null)
-                            {
-                                if (wpsApp.Presentations.Count > 0)
-                                {
-                                    allWpsNoPpt = false;
-                                    break;
-                                }
-                            }
-                        }
-                        catch { }
-                    }
-                    if (!allWpsNoPpt) break;
-                }
-
-                if (allWpsNoPpt)
-                {
-                    // 所有WPS都没有打开PPT，可以安全关闭
-                    foreach (var processName in GetPossibleWPSProcessNames())
-                    {
-                        foreach (var process in Process.GetProcessesByName(processName))
-                        {
-                            try
-                            {
-                                process.Kill();
-                                LogHelper.WriteLogToFile($"已终止WPS进程: {process.ProcessName}({process.Id})", LogHelper.LogType.Info);
-                            }
-                            catch (Exception ex)
-                            {
-                                LogHelper.WriteLogToFile($"终止WPS进程失败: {ex.Message}", LogHelper.LogType.Error);
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"WPS进程清理异常: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
     }
 }

From 25e11fa9de3f39ddbac4cba3e4f1c7c4fa8381f6 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 00:09:48 +0800
Subject: [PATCH 03/32] =?UTF-8?q?improve:=E8=81=94=E5=8A=A8=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml         | 35 +++++++++++++++++++++++++++++-
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 22 ++++++++++---------
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index f663fae4..88eb0583 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -178,7 +178,40 @@
     </Window.CommandBindings>
 
     <Grid x:Name="Main_Grid">
-
+        <!-- 等待COM组件加载动画 -->
+        <Grid x:Name="LoadingMask" Background="#80000000" Visibility="Collapsed" Panel.ZIndex="10000">
+            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" >
+                <!-- 圆形旋转动画 -->
+                <Grid Width="60" Height="60">
+                    <Ellipse Width="60" Height="60" Stroke="#40FFFFFF" StrokeThickness="6"/>
+                    <Ellipse Width="60" Height="60" Stroke="White" StrokeThickness="6"
+                             StrokeDashArray="0,1.5"
+                             RenderTransformOrigin="0.5,0.5">
+                        <Ellipse.RenderTransform>
+                            <RotateTransform x:Name="SpinnerRotate"/>
+                        </Ellipse.RenderTransform>
+                        <Ellipse.Triggers>
+                            <EventTrigger RoutedEvent="FrameworkElement.Loaded">
+                                <BeginStoryboard>
+                                    <Storyboard RepeatBehavior="Forever">
+                                        <DoubleAnimation
+                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
+                                            From="0" To="360" Duration="0:0:1"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </EventTrigger>
+                        </Ellipse.Triggers>
+                    </Ellipse>
+                </Grid>
+                <TextBlock Text="正在连接 PowerPoint..." 
+                           Foreground="White" 
+                           Margin="0,20,0,0" 
+                           HorizontalAlignment="Center"
+                           FontSize="18"
+                           FontWeight="Bold"
+                           Opacity="0.9"/>
+            </StackPanel>
+        </Grid>
         <!--// 设置界面 //-->
         <Grid Panel.ZIndex="999" x:Name="BorderSettingsMask" MouseDown="SettingsOverlayClick" IsHitTestVisible="True"
               Margin="0,0,0,0">
diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index 1cfdd349..0086c86c 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -28,6 +28,8 @@ namespace Ink_Canvas {
 
         private void BtnCheckPPT_Click(object sender, RoutedEventArgs e) {
             try {
+                // 显示加载动画
+                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Visible; });
                 pptApplication =
                     (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("kwpp.Application");
                 //pptApplication.SlideShowWindows[1].View.Next();
@@ -67,6 +69,10 @@ namespace Ink_Canvas {
                 RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                 MessageBox.Show("未找到幻灯片");
             }
+            finally {
+                // 隐藏加载动画
+                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Collapsed; });
+            }
         }
 
         private void ToggleSwitchSupportWPS_Toggled(object sender, RoutedEventArgs e) {
@@ -85,16 +91,8 @@ namespace Ink_Canvas {
         private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e) {
             if (IsShowingRestoreHiddenSlidesWindow || IsShowingAutoplaySlidesWindow) return;
             try {
-                //var processes = Process.GetProcessesByName("wpp");
-                //if (processes.Length > 0 && !isWPSSupportOn) return;
-
-                //使用下方提前创建 PowerPoint 实例，将导致 PowerPoint 不再有启动界面
-                //pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B")));
-                //new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowBegin").AddEventHandler(pptApplication, new EApplication_SlideShowBeginEventHandler(this.PptApplication_SlideShowBegin));
-                //new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowEnd").AddEventHandler(pptApplication, new EApplication_SlideShowEndEventHandler(this.PptApplication_SlideShowEnd));
-                //new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowNextSlide").AddEventHandler(pptApplication, new EApplication_SlideShowNextSlideEventHandler(this.PptApplication_SlideShowNextSlide));
-                //ConfigHelper.Instance.IsInitApplicationSuccessful = true;
-
+                // 显示加载动画
+                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Visible; });
                 pptApplication =
                     (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
 
@@ -142,6 +140,10 @@ namespace Ink_Canvas {
                 Application.Current.Dispatcher.Invoke(() => { BtnPPTSlideShow.Visibility = Visibility.Collapsed; });
                 timerCheckPPT.Start();
             }
+            finally {
+                // 隐藏加载动画
+                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Collapsed; });
+            }
         }
 
         private void PptApplication_PresentationOpen(Presentation Pres) {

From eedd6cee1dcd7d69b29575cb5569da283114f306 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 00:13:21 +0800
Subject: [PATCH 04/32] =?UTF-8?q?improve:=E8=81=94=E5=8A=A8=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 88eb0583..d3b58e09 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -196,14 +196,14 @@
                                     <Storyboard RepeatBehavior="Forever">
                                         <DoubleAnimation
                                             Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
-                                            From="0" To="360" Duration="0:0:1"/>
+                                            From="0" To="360" Duration="0:0:0.2"/>
                                     </Storyboard>
                                 </BeginStoryboard>
                             </EventTrigger>
                         </Ellipse.Triggers>
                     </Ellipse>
                 </Grid>
-                <TextBlock Text="正在连接 PowerPoint..." 
+                <TextBlock Text="正在连接 PPT..." 
                            Foreground="White" 
                            Margin="0,20,0,0" 
                            HorizontalAlignment="Center"

From f2e7e17bd1e60ec1ee4450ee90b61c9a08689667 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 00:16:23 +0800
Subject: [PATCH 05/32] =?UTF-8?q?improve:=E8=81=94=E5=8A=A8=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index 0086c86c..ce3bc924 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -26,10 +26,22 @@ namespace Ink_Canvas {
         public static Slide slide = null;
         public static int slidescount = 0;
 
+        // 新增：安全切换LoadingMask可见性的方法，避免重复赋值导致动画闪动
+        private void SetLoadingMaskVisibility(Visibility visibility)
+        {
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                if (LoadingMask.Visibility != visibility)
+                {
+                    LoadingMask.Visibility = visibility;
+                }
+            });
+        }
+
         private void BtnCheckPPT_Click(object sender, RoutedEventArgs e) {
             try {
                 // 显示加载动画
-                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Visible; });
+                SetLoadingMaskVisibility(Visibility.Visible);
                 pptApplication =
                     (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("kwpp.Application");
                 //pptApplication.SlideShowWindows[1].View.Next();
@@ -71,7 +83,7 @@ namespace Ink_Canvas {
             }
             finally {
                 // 隐藏加载动画
-                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Collapsed; });
+                SetLoadingMaskVisibility(Visibility.Collapsed);
             }
         }
 
@@ -92,7 +104,7 @@ namespace Ink_Canvas {
             if (IsShowingRestoreHiddenSlidesWindow || IsShowingAutoplaySlidesWindow) return;
             try {
                 // 显示加载动画
-                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Visible; });
+                SetLoadingMaskVisibility(Visibility.Visible);
                 pptApplication =
                     (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
 
@@ -142,7 +154,7 @@ namespace Ink_Canvas {
             }
             finally {
                 // 隐藏加载动画
-                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Collapsed; });
+                SetLoadingMaskVisibility(Visibility.Collapsed);
             }
         }
 

From 6a97919f7a70e179a1ccddb0568863b9ab1e8af4 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 00:21:16 +0800
Subject: [PATCH 06/32] =?UTF-8?q?Revert=20"improve:=E8=81=94=E5=8A=A8?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f2e7e17bd1e60ec1ee4450ee90b61c9a08689667.
---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index ce3bc924..0086c86c 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -26,22 +26,10 @@ namespace Ink_Canvas {
         public static Slide slide = null;
         public static int slidescount = 0;
 
-        // 新增：安全切换LoadingMask可见性的方法，避免重复赋值导致动画闪动
-        private void SetLoadingMaskVisibility(Visibility visibility)
-        {
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                if (LoadingMask.Visibility != visibility)
-                {
-                    LoadingMask.Visibility = visibility;
-                }
-            });
-        }
-
         private void BtnCheckPPT_Click(object sender, RoutedEventArgs e) {
             try {
                 // 显示加载动画
-                SetLoadingMaskVisibility(Visibility.Visible);
+                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Visible; });
                 pptApplication =
                     (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("kwpp.Application");
                 //pptApplication.SlideShowWindows[1].View.Next();
@@ -83,7 +71,7 @@ namespace Ink_Canvas {
             }
             finally {
                 // 隐藏加载动画
-                SetLoadingMaskVisibility(Visibility.Collapsed);
+                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Collapsed; });
             }
         }
 
@@ -104,7 +92,7 @@ namespace Ink_Canvas {
             if (IsShowingRestoreHiddenSlidesWindow || IsShowingAutoplaySlidesWindow) return;
             try {
                 // 显示加载动画
-                SetLoadingMaskVisibility(Visibility.Visible);
+                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Visible; });
                 pptApplication =
                     (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
 
@@ -154,7 +142,7 @@ namespace Ink_Canvas {
             }
             finally {
                 // 隐藏加载动画
-                SetLoadingMaskVisibility(Visibility.Collapsed);
+                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Collapsed; });
             }
         }
 

From 86fbd0cebc6c090fa8d24f2c6ac36eb0a3b8daa8 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 00:25:33 +0800
Subject: [PATCH 07/32] =?UTF-8?q?=E6=92=A4=E5=9B=9E=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=94=B9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml         | 35 +-----------------------------
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 22 +++++++++----------
 2 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index d3b58e09..f663fae4 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -178,40 +178,7 @@
     </Window.CommandBindings>
 
     <Grid x:Name="Main_Grid">
-        <!-- 等待COM组件加载动画 -->
-        <Grid x:Name="LoadingMask" Background="#80000000" Visibility="Collapsed" Panel.ZIndex="10000">
-            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" >
-                <!-- 圆形旋转动画 -->
-                <Grid Width="60" Height="60">
-                    <Ellipse Width="60" Height="60" Stroke="#40FFFFFF" StrokeThickness="6"/>
-                    <Ellipse Width="60" Height="60" Stroke="White" StrokeThickness="6"
-                             StrokeDashArray="0,1.5"
-                             RenderTransformOrigin="0.5,0.5">
-                        <Ellipse.RenderTransform>
-                            <RotateTransform x:Name="SpinnerRotate"/>
-                        </Ellipse.RenderTransform>
-                        <Ellipse.Triggers>
-                            <EventTrigger RoutedEvent="FrameworkElement.Loaded">
-                                <BeginStoryboard>
-                                    <Storyboard RepeatBehavior="Forever">
-                                        <DoubleAnimation
-                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
-                                            From="0" To="360" Duration="0:0:0.2"/>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </EventTrigger>
-                        </Ellipse.Triggers>
-                    </Ellipse>
-                </Grid>
-                <TextBlock Text="正在连接 PPT..." 
-                           Foreground="White" 
-                           Margin="0,20,0,0" 
-                           HorizontalAlignment="Center"
-                           FontSize="18"
-                           FontWeight="Bold"
-                           Opacity="0.9"/>
-            </StackPanel>
-        </Grid>
+
         <!--// 设置界面 //-->
         <Grid Panel.ZIndex="999" x:Name="BorderSettingsMask" MouseDown="SettingsOverlayClick" IsHitTestVisible="True"
               Margin="0,0,0,0">
diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index 0086c86c..1cfdd349 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -28,8 +28,6 @@ namespace Ink_Canvas {
 
         private void BtnCheckPPT_Click(object sender, RoutedEventArgs e) {
             try {
-                // 显示加载动画
-                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Visible; });
                 pptApplication =
                     (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("kwpp.Application");
                 //pptApplication.SlideShowWindows[1].View.Next();
@@ -69,10 +67,6 @@ namespace Ink_Canvas {
                 RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                 MessageBox.Show("未找到幻灯片");
             }
-            finally {
-                // 隐藏加载动画
-                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Collapsed; });
-            }
         }
 
         private void ToggleSwitchSupportWPS_Toggled(object sender, RoutedEventArgs e) {
@@ -91,8 +85,16 @@ namespace Ink_Canvas {
         private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e) {
             if (IsShowingRestoreHiddenSlidesWindow || IsShowingAutoplaySlidesWindow) return;
             try {
-                // 显示加载动画
-                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Visible; });
+                //var processes = Process.GetProcessesByName("wpp");
+                //if (processes.Length > 0 && !isWPSSupportOn) return;
+
+                //使用下方提前创建 PowerPoint 实例，将导致 PowerPoint 不再有启动界面
+                //pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B")));
+                //new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowBegin").AddEventHandler(pptApplication, new EApplication_SlideShowBeginEventHandler(this.PptApplication_SlideShowBegin));
+                //new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowEnd").AddEventHandler(pptApplication, new EApplication_SlideShowEndEventHandler(this.PptApplication_SlideShowEnd));
+                //new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowNextSlide").AddEventHandler(pptApplication, new EApplication_SlideShowNextSlideEventHandler(this.PptApplication_SlideShowNextSlide));
+                //ConfigHelper.Instance.IsInitApplicationSuccessful = true;
+
                 pptApplication =
                     (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
 
@@ -140,10 +142,6 @@ namespace Ink_Canvas {
                 Application.Current.Dispatcher.Invoke(() => { BtnPPTSlideShow.Visibility = Visibility.Collapsed; });
                 timerCheckPPT.Start();
             }
-            finally {
-                // 隐藏加载动画
-                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Collapsed; });
-            }
         }
 
         private void PptApplication_PresentationOpen(Presentation Pres) {

From ecd276a3a05330597a53bb9d32f5f0f969acd27a Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 00:37:13 +0800
Subject: [PATCH 08/32] =?UTF-8?q?improve:=E8=81=94=E5=8A=A8=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 46 ++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index 1cfdd349..10d40c0e 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -983,5 +983,51 @@ namespace Ink_Canvas {
         private void ImagePPTControlEnd_MouseUp(object sender, MouseButtonEventArgs e) {
             BtnPPTSlideShowEnd_Click(BtnPPTSlideShowEnd, null);
         }
+
+        // 检查并安全关闭多余的WPS进程（仅当所有WPS都未打开PPT时）
+        private static void CloseExtraWpsProcessesIfNoPptOpen()
+        {
+            try
+            {
+                var wpsProcesses = System.Diagnostics.Process.GetProcessesByName("wpp");
+                if (wpsProcesses.Length == 0) return;
+
+                bool anyWpsHasPpt = false;
+
+                foreach (var proc in wpsProcesses)
+                {
+                    try
+                    {
+                        // 通过窗口标题判断是否有PPT文档（WPS窗口标题通常包含文档名）
+                        if (!string.IsNullOrEmpty(proc.MainWindowTitle) && proc.MainWindowTitle.Contains(".ppt"))
+                        {
+                            anyWpsHasPpt = true;
+                            break;
+                        }
+                    }
+                    catch { }
+                }
+
+                // 如果没有任何WPS打开PPT，则关闭所有WPS进程
+                if (!anyWpsHasPpt)
+                {
+                    foreach (var proc in wpsProcesses)
+                    {
+                        try
+                        {
+                            if (!proc.CloseMainWindow())
+                            {
+                                proc.Kill();
+                            }
+                        }
+                        catch { }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                System.Windows.MessageBox.Show("关闭多余WPS进程时出错：" + ex.Message);
+            }
+        }
     }
 }

From de6fc84fecfd561f74cb4a0870b7e1a1675c086a Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 09:09:39 +0800
Subject: [PATCH 09/32] =?UTF-8?q?Revert=20"improve:=E8=81=94=E5=8A=A8?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ecd276a3a05330597a53bb9d32f5f0f969acd27a.
---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 46 ------------------------------
 1 file changed, 46 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index 10d40c0e..1cfdd349 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -983,51 +983,5 @@ namespace Ink_Canvas {
         private void ImagePPTControlEnd_MouseUp(object sender, MouseButtonEventArgs e) {
             BtnPPTSlideShowEnd_Click(BtnPPTSlideShowEnd, null);
         }
-
-        // 检查并安全关闭多余的WPS进程（仅当所有WPS都未打开PPT时）
-        private static void CloseExtraWpsProcessesIfNoPptOpen()
-        {
-            try
-            {
-                var wpsProcesses = System.Diagnostics.Process.GetProcessesByName("wpp");
-                if (wpsProcesses.Length == 0) return;
-
-                bool anyWpsHasPpt = false;
-
-                foreach (var proc in wpsProcesses)
-                {
-                    try
-                    {
-                        // 通过窗口标题判断是否有PPT文档（WPS窗口标题通常包含文档名）
-                        if (!string.IsNullOrEmpty(proc.MainWindowTitle) && proc.MainWindowTitle.Contains(".ppt"))
-                        {
-                            anyWpsHasPpt = true;
-                            break;
-                        }
-                    }
-                    catch { }
-                }
-
-                // 如果没有任何WPS打开PPT，则关闭所有WPS进程
-                if (!anyWpsHasPpt)
-                {
-                    foreach (var proc in wpsProcesses)
-                    {
-                        try
-                        {
-                            if (!proc.CloseMainWindow())
-                            {
-                                proc.Kill();
-                            }
-                        }
-                        catch { }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                System.Windows.MessageBox.Show("关闭多余WPS进程时出错：" + ex.Message);
-            }
-        }
     }
 }

From 6b75fea813d8885c9fe10b219b877ae35ef5a529 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 12:01:30 +0800
Subject: [PATCH 10/32] improve:issue #5

---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index 1cfdd349..dca275f9 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -1,6 +1,7 @@
 using Ink_Canvas.Helpers;
 using Microsoft.Office.Interop.PowerPoint;
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
@@ -20,6 +21,9 @@ using Microsoft.Office.Core;
 
 namespace Ink_Canvas {
     public partial class MainWindow : Window {
+        [DllImport("user32.dll")]
+        private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
+
         public static Microsoft.Office.Interop.PowerPoint.Application pptApplication = null;
         public static Presentation presentation = null;
         public static Slides slides = null;
@@ -81,6 +85,11 @@ namespace Ink_Canvas {
         public static bool IsShowingRestoreHiddenSlidesWindow = false;
         private static bool IsShowingAutoplaySlidesWindow = false;
 
+        // WPS 相关变量
+        private static bool autoCloseWPS = false;
+        private static Process wpsProcess = null;
+        private static bool hasWpsProcessID = false;
+
 
         private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e) {
             if (IsShowingRestoreHiddenSlidesWindow || IsShowingAutoplaySlidesWindow) return;
@@ -541,6 +550,15 @@ namespace Ink_Canvas {
             try {
                 if (isFloatingBarFolded) await UnFoldFloatingBar(new object());
 
+                // 对于延迟未关闭的 WPP，先记录进程 ID，待所有结束事件处理完毕后强制关闭
+                if (autoCloseWPS && pptApplication != null && pptApplication.Path.Contains("Kingsoft\\WPS Office\\") && pptApplication.Presentations.Count <= 1)
+                {
+                    uint processId;
+                    GetWindowThreadProcessId((IntPtr)pptApplication.HWND, out processId);
+                    wpsProcess = Process.GetProcessById((int)processId);
+                    hasWpsProcessID = true;
+                }
+
                 LogHelper.WriteLogToFile(string.Format("PowerPoint Slide Show End"), LogHelper.LogType.Event);
                 if (isEnteredSlideShowEndEvent) {
                     LogHelper.WriteLogToFile("Detected previous entrance, returning");

From 38713108e020542db349f457fb3a77e411192283 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 12:19:32 +0800
Subject: [PATCH 11/32] improve:issue #5

---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index dca275f9..d386dbef 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -86,7 +86,6 @@ namespace Ink_Canvas {
         private static bool IsShowingAutoplaySlidesWindow = false;
 
         // WPS 相关变量
-        private static bool autoCloseWPS = false;
         private static Process wpsProcess = null;
         private static bool hasWpsProcessID = false;
 
@@ -551,13 +550,13 @@ namespace Ink_Canvas {
                 if (isFloatingBarFolded) await UnFoldFloatingBar(new object());
 
                 // 对于延迟未关闭的 WPP，先记录进程 ID，待所有结束事件处理完毕后强制关闭
-                if (autoCloseWPS && pptApplication != null && pptApplication.Path.Contains("Kingsoft\\WPS Office\\") && pptApplication.Presentations.Count <= 1)
+                if (pptApplication != null && pptApplication.Path.Contains("Kingsoft\\WPS Office\\") && pptApplication.Presentations.Count <= 1)
                 {
                     uint processId;
                     GetWindowThreadProcessId((IntPtr)pptApplication.HWND, out processId);
                     wpsProcess = Process.GetProcessById((int)processId);
                     hasWpsProcessID = true;
-                }
+                } 
 
                 LogHelper.WriteLogToFile(string.Format("PowerPoint Slide Show End"), LogHelper.LogType.Event);
                 if (isEnteredSlideShowEndEvent) {

From 6c075d80ba83c56c95688b9436682425dd34c0d1 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 12:36:21 +0800
Subject: [PATCH 12/32] improve:issue #5

---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 90 +++++++++++++++++++++++++++---
 1 file changed, 83 insertions(+), 7 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index d386dbef..bb1e4358 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -85,9 +85,10 @@ namespace Ink_Canvas {
         public static bool IsShowingRestoreHiddenSlidesWindow = false;
         private static bool IsShowingAutoplaySlidesWindow = false;
 
-        // WPS 相关变量
-        private static Process wpsProcess = null;
-        private static bool hasWpsProcessID = false;
+        // WPP 相关变量
+        private static Process wppProcess = null;
+        private static bool hasWppProcessID = false;
+        private static System.Timers.Timer wppProcessCheckTimer = null;
 
 
         private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e) {
@@ -549,13 +550,14 @@ namespace Ink_Canvas {
             try {
                 if (isFloatingBarFolded) await UnFoldFloatingBar(new object());
 
-                // 对于延迟未关闭的 WPP，先记录进程 ID，待所有结束事件处理完毕后强制关闭
-                if (pptApplication != null && pptApplication.Path.Contains("Kingsoft\\WPS Office\\") && pptApplication.Presentations.Count <= 1)
+                // 记录 WPP 进程 ID，用于后续检测未关闭的进程
+                if (pptApplication != null && pptApplication.Path.Contains("Kingsoft\\WPS Office\\"))
                 {
                     uint processId;
                     GetWindowThreadProcessId((IntPtr)pptApplication.HWND, out processId);
-                    wpsProcess = Process.GetProcessById((int)processId);
-                    hasWpsProcessID = true;
+                    wppProcess = Process.GetProcessById((int)processId);
+                    hasWppProcessID = true;
+                    LogHelper.WriteLogToFile($"记录 WPP 进程 ID: {processId}", LogHelper.LogType.Trace);
                 } 
 
                 LogHelper.WriteLogToFile(string.Format("PowerPoint Slide Show End"), LogHelper.LogType.Event);
@@ -646,6 +648,12 @@ namespace Ink_Canvas {
                 await Application.Current.Dispatcher.InvokeAsync(() => {
                     ViewboxFloatingBarMarginAnimation(100, true);
                 });
+
+                // 启动 WPP 进程检测定时器
+                if (hasWppProcessID && wppProcess != null)
+                {
+                    StartWppProcessCheckTimer();
+                }
             }
             catch (Exception ex) {
                 LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
@@ -1000,5 +1008,73 @@ namespace Ink_Canvas {
         private void ImagePPTControlEnd_MouseUp(object sender, MouseButtonEventArgs e) {
             BtnPPTSlideShowEnd_Click(BtnPPTSlideShowEnd, null);
         }
+
+        private void StartWppProcessCheckTimer()
+        {
+            if (wppProcessCheckTimer != null)
+            {
+                wppProcessCheckTimer.Stop();
+                wppProcessCheckTimer.Dispose();
+            }
+
+            wppProcessCheckTimer = new System.Timers.Timer(2000); // 2秒检查一次
+            wppProcessCheckTimer.Elapsed += WppProcessCheckTimer_Elapsed;
+            wppProcessCheckTimer.Start();
+            LogHelper.WriteLogToFile("启动 WPP 进程检测定时器", LogHelper.LogType.Trace);
+        }
+
+        private void WppProcessCheckTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            try
+            {
+                if (wppProcess == null || hasWppProcessID == false)
+                {
+                    StopWppProcessCheckTimer();
+                    return;
+                }
+
+                // 刷新进程状态
+                wppProcess.Refresh();
+
+                if (wppProcess.HasExited)
+                {
+                    LogHelper.WriteLogToFile("WPP 进程已正常关闭", LogHelper.LogType.Trace);
+                    StopWppProcessCheckTimer();
+                }
+                else
+                {
+                    // 检查是否超过 5 秒仍未关闭
+                    var processStartTime = wppProcess.StartTime;
+                    var timeSinceStart = DateTime.Now - processStartTime;
+                    
+                    if (timeSinceStart.TotalSeconds > 5)
+                    {
+                        LogHelper.WriteLogToFile("检测到长时间未关闭的 WPP 进程，开始强制关闭", LogHelper.LogType.Event);
+                        wppProcess.Kill();
+                        LogHelper.WriteLogToFile("强制关闭 WPP 进程成功", LogHelper.LogType.Event);
+                        StopWppProcessCheckTimer();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"WPP 进程检测失败: {ex.ToString()}", LogHelper.LogType.Error);
+                StopWppProcessCheckTimer();
+            }
+        }
+
+        private void StopWppProcessCheckTimer()
+        {
+            if (wppProcessCheckTimer != null)
+            {
+                wppProcessCheckTimer.Stop();
+                wppProcessCheckTimer.Dispose();
+                wppProcessCheckTimer = null;
+            }
+            
+            wppProcess = null;
+            hasWppProcessID = false;
+            LogHelper.WriteLogToFile("停止 WPP 进程检测定时器", LogHelper.LogType.Trace);
+        }
     }
 }

From 33c1e04934d61f9ab90bc37abbb12b05320b51c4 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 15:00:11 +0800
Subject: [PATCH 13/32] improve:issue #5

---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 172 ++++++++++++++++++++++++++---
 1 file changed, 157 insertions(+), 15 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index bb1e4358..52cb1f4a 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -24,6 +24,17 @@ namespace Ink_Canvas {
         [DllImport("user32.dll")]
         private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
 
+        [DllImport("user32.dll")]
+        private static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, IntPtr lParam);
+
+        [DllImport("user32.dll")]
+        private static extern int GetWindowText(IntPtr hWnd, System.Text.StringBuilder lpString, int nMaxCount);
+
+        [DllImport("user32.dll")]
+        private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId, out uint lpdwThreadId);
+
+        private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
+
         public static Microsoft.Office.Interop.PowerPoint.Application pptApplication = null;
         public static Presentation presentation = null;
         public static Slides slides = null;
@@ -89,21 +100,14 @@ namespace Ink_Canvas {
         private static Process wppProcess = null;
         private static bool hasWppProcessID = false;
         private static System.Timers.Timer wppProcessCheckTimer = null;
+        private static DateTime wppProcessRecordTime = DateTime.MinValue; // 记录进程时间
+        private static int wppProcessCheckCount = 0; // 检查次数计数器
 
 
         private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e) {
             if (IsShowingRestoreHiddenSlidesWindow || IsShowingAutoplaySlidesWindow) return;
             try {
-                //var processes = Process.GetProcessesByName("wpp");
-                //if (processes.Length > 0 && !isWPSSupportOn) return;
-
-                //使用下方提前创建 PowerPoint 实例，将导致 PowerPoint 不再有启动界面
-                //pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B")));
-                //new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowBegin").AddEventHandler(pptApplication, new EApplication_SlideShowBeginEventHandler(this.PptApplication_SlideShowBegin));
-                //new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowEnd").AddEventHandler(pptApplication, new EApplication_SlideShowEndEventHandler(this.PptApplication_SlideShowEnd));
-                //new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowNextSlide").AddEventHandler(pptApplication, new EApplication_SlideShowNextSlideEventHandler(this.PptApplication_SlideShowNextSlide));
-                //ConfigHelper.Instance.IsInitApplicationSuccessful = true;
-
+                
                 pptApplication =
                     (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
 
@@ -557,6 +561,8 @@ namespace Ink_Canvas {
                     GetWindowThreadProcessId((IntPtr)pptApplication.HWND, out processId);
                     wppProcess = Process.GetProcessById((int)processId);
                     hasWppProcessID = true;
+                    wppProcessRecordTime = DateTime.Now;
+                    wppProcessCheckCount = 0;
                     LogHelper.WriteLogToFile($"记录 WPP 进程 ID: {processId}", LogHelper.LogType.Trace);
                 } 
 
@@ -1035,6 +1041,7 @@ namespace Ink_Canvas {
 
                 // 刷新进程状态
                 wppProcess.Refresh();
+                wppProcessCheckCount++;
 
                 if (wppProcess.HasExited)
                 {
@@ -1043,17 +1050,31 @@ namespace Ink_Canvas {
                 }
                 else
                 {
-                    // 检查是否超过 5 秒仍未关闭
-                    var processStartTime = wppProcess.StartTime;
-                    var timeSinceStart = DateTime.Now - processStartTime;
+                    // 检查是否有其他WPS窗口打开
+                    bool hasOtherWpsWindows = CheckForOtherWpsWindows();
                     
-                    if (timeSinceStart.TotalSeconds > 5)
+                    if (hasOtherWpsWindows)
                     {
-                        LogHelper.WriteLogToFile("检测到长时间未关闭的 WPP 进程，开始强制关闭", LogHelper.LogType.Event);
+                        LogHelper.WriteLogToFile("检测到其他WPS窗口打开，停止强制关闭进程", LogHelper.LogType.Trace);
+                        StopWppProcessCheckTimer();
+                        return;
+                    }
+
+                    // 计算从记录进程开始的时间
+                    var timeSinceRecord = DateTime.Now - wppProcessRecordTime;
+                    
+                    // 更保守的关闭策略：只有在超过3秒且检查次数超过2次时才强制关闭
+                    if (timeSinceRecord.TotalSeconds > 3 && wppProcessCheckCount >= 2)
+                    {
+                        LogHelper.WriteLogToFile($"检测到长时间未关闭的 WPP 进程（已运行{timeSinceRecord.TotalSeconds:F1}秒，检查{wppProcessCheckCount}次），开始强制关闭", LogHelper.LogType.Event);
                         wppProcess.Kill();
                         LogHelper.WriteLogToFile("强制关闭 WPP 进程成功", LogHelper.LogType.Event);
                         StopWppProcessCheckTimer();
                     }
+                    else
+                    {
+                        LogHelper.WriteLogToFile($"WPP 进程仍在运行，已检查{wppProcessCheckCount}次，运行时间{timeSinceRecord.TotalSeconds:F1}秒", LogHelper.LogType.Trace);
+                    }
                 }
             }
             catch (Exception ex)
@@ -1063,6 +1084,125 @@ namespace Ink_Canvas {
             }
         }
 
+        private bool CheckForOtherWpsWindows()
+        {
+            try
+            {
+                // 检查是否有其他WPS窗口打开
+                var wpsProcesses = Process.GetProcessesByName("wpp");
+                if (wpsProcesses.Length > 1)
+                {
+                    LogHelper.WriteLogToFile($"检测到{wpsProcesses.Length}个WPP进程", LogHelper.LogType.Trace);
+                    return true;
+                }
+
+                // 检查是否有WPS相关的其他进程
+                var kingsoftProcesses = Process.GetProcessesByName("wps");
+                if (kingsoftProcesses.Length > 0)
+                {
+                    LogHelper.WriteLogToFile("检测到WPS主程序进程", LogHelper.LogType.Trace);
+                    return true;
+                }
+
+                // 检查是否有其他WPS相关进程
+                var etProcesses = Process.GetProcessesByName("et"); // WPS表格
+                var wpsProcesses2 = Process.GetProcessesByName("wps"); // WPS文字
+                if (etProcesses.Length > 0 || wpsProcesses2.Length > 0)
+                {
+                    LogHelper.WriteLogToFile($"检测到其他WPS组件进程：ET进程{etProcesses.Length}个，WPS进程{wpsProcesses2.Length}个", LogHelper.LogType.Trace);
+                    return true;
+                }
+
+                // 检查当前WPP进程是否有多个窗口
+                if (wppProcess != null)
+                {
+                    try
+                    {
+                        var windowCount = 0;
+                        foreach (ProcessThread thread in wppProcess.Threads)
+                        {
+                            // 简单检查是否有多个窗口句柄
+                            if (thread.ThreadState == System.Diagnostics.ThreadState.Running)
+                            {
+                                windowCount++;
+                            }
+                        }
+                        
+                        if (windowCount > 1)
+                        {
+                            LogHelper.WriteLogToFile($"当前WPP进程有{windowCount}个活动线程，可能存在多个窗口", LogHelper.LogType.Trace);
+                            return true;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"检查WPP进程窗口失败: {ex.ToString()}", LogHelper.LogType.Error);
+                    }
+                }
+
+                // 通过枚举窗口检查是否有其他WPS窗口
+                return CheckForWpsWindowsByEnumeration();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"检查其他WPS窗口失败: {ex.ToString()}", LogHelper.LogType.Error);
+                return false; // 出错时保守处理，不强制关闭
+            }
+        }
+
+        private bool CheckForWpsWindowsByEnumeration()
+        {
+            try
+            {
+                var wpsWindowCount = 0;
+                var currentProcessId = wppProcess?.Id ?? 0;
+
+                EnumWindows((IntPtr hWnd, IntPtr lParam) =>
+                {
+                    try
+                    {
+                        uint windowProcessId;
+                        GetWindowThreadProcessId(hWnd, out windowProcessId);
+                        
+                        // 检查是否是WPP进程的窗口
+                        if (windowProcessId == currentProcessId)
+                        {
+                            var windowTitle = new System.Text.StringBuilder(256);
+                            GetWindowText(hWnd, windowTitle, 256);
+                            var title = windowTitle.ToString().Trim();
+                            
+                            // 检查窗口标题是否包含WPS相关标识
+                            if (!string.IsNullOrEmpty(title) && 
+                                (title.Contains("WPS") || title.Contains("演示文稿") || title.Contains(".ppt") || title.Contains(".pptx")))
+                            {
+                                wpsWindowCount++;
+                                LogHelper.WriteLogToFile($"发现WPS窗口: {title}", LogHelper.LogType.Trace);
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"枚举窗口时出错: {ex.ToString()}", LogHelper.LogType.Error);
+                    }
+                    
+                    return true; // 继续枚举
+                }, IntPtr.Zero);
+
+                if (wpsWindowCount > 1)
+                {
+                    LogHelper.WriteLogToFile($"检测到{wpsWindowCount}个WPS窗口，可能存在多个文档", LogHelper.LogType.Trace);
+                    return true;
+                }
+
+                return false;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"通过枚举检查WPS窗口失败: {ex.ToString()}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
         private void StopWppProcessCheckTimer()
         {
             if (wppProcessCheckTimer != null)
@@ -1074,6 +1214,8 @@ namespace Ink_Canvas {
             
             wppProcess = null;
             hasWppProcessID = false;
+            wppProcessRecordTime = DateTime.MinValue;
+            wppProcessCheckCount = 0;
             LogHelper.WriteLogToFile("停止 WPP 进程检测定时器", LogHelper.LogType.Trace);
         }
     }

From 428b278c78a320e2bc6324fcabcfeb07237f9f10 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 15:02:03 +0800
Subject: [PATCH 14/32] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/AssemblyInfo.cs            | 4 ++--
 Ink Canvas/Properties/AssemblyInfo.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Ink Canvas/AssemblyInfo.cs b/Ink Canvas/AssemblyInfo.cs
index 0f179263..db4629d0 100644
--- a/Ink Canvas/AssemblyInfo.cs	
+++ b/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.1.3")]
-[assembly: AssemblyFileVersion("1.7.1.3")]
+[assembly: AssemblyVersion("1.7.1.4")]
+[assembly: AssemblyFileVersion("1.7.1.4")]
diff --git a/Ink Canvas/Properties/AssemblyInfo.cs b/Ink Canvas/Properties/AssemblyInfo.cs
index cd7e451f..808a6df7 100644
--- a/Ink Canvas/Properties/AssemblyInfo.cs	
+++ b/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.1.3")]
-[assembly: AssemblyFileVersion("1.7.1.3")]
+[assembly: AssemblyVersion("1.7.1.4")]
+[assembly: AssemblyFileVersion("1.7.1.4")]

From d5142ad82c8202f82884bb6d647605496fab55b3 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 15:21:59 +0800
Subject: [PATCH 15/32] =?UTF-8?q?improve:=E5=A2=A8=E8=BF=B9=E5=B9=B3?=
 =?UTF-8?q?=E6=BB=91=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/Helpers/AdvancedBezierSmoothing.cs | 291 ++++++++++++++++++
 Ink Canvas/MainWindow.xaml                    |  42 ++-
 Ink Canvas/MainWindow.xaml.cs                 |  10 +-
 Ink Canvas/MainWindow_cs/MW_Settings.cs       |  47 ++-
 Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs |  26 +-
 Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs   |  32 +-
 .../MW_SimulatePressure&InkToShape.cs         |  33 +-
 Ink Canvas/Resources/Settings.cs              |  10 +-
 8 files changed, 479 insertions(+), 12 deletions(-)
 create mode 100644 Ink Canvas/Helpers/AdvancedBezierSmoothing.cs

diff --git a/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs b/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs
new file mode 100644
index 00000000..c495af4d
--- /dev/null
+++ b/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs	
@@ -0,0 +1,291 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Media;
+using Point = System.Windows.Point;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 高级贝塞尔曲线平滑算法
+    /// 用于解决墨迹闪烁问题，提供更平滑的笔迹效果
+    /// </summary>
+    public class AdvancedBezierSmoothing
+    {
+        /// <summary>
+        /// 平滑强度 (0.0 - 1.0)
+        /// </summary>
+        public double SmoothingStrength { get; set; } = 0.6;
+
+        /// <summary>
+        /// 张力参数 (0.0 - 1.0)
+        /// </summary>
+        public double Tension { get; set; } = 0.5;
+
+        /// <summary>
+        /// 是否启用自适应平滑
+        /// </summary>
+        public bool EnableAdaptiveSmoothing { get; set; } = true;
+
+        /// <summary>
+        /// 最小点间距阈值
+        /// </summary>
+        public double MinPointDistance { get; set; } = 2.0;
+
+        /// <summary>
+        /// 最大点间距阈值
+        /// </summary>
+        public double MaxPointDistance { get; set; } = 50.0;
+
+        /// <summary>
+        /// 对笔画进行高级贝塞尔曲线平滑处理
+        /// </summary>
+        /// <param name="stroke">原始笔画</param>
+        /// <returns>平滑后的笔画</returns>
+        public Stroke SmoothStroke(Stroke stroke)
+        {
+            if (stroke == null || stroke.StylusPoints.Count < 3)
+                return stroke;
+
+            var originalPoints = stroke.StylusPoints.ToList();
+            var smoothedPoints = new List<StylusPoint>();
+
+            // 第一步：点过滤和重采样
+            var filteredPoints = FilterAndResamplePoints(originalPoints);
+
+            // 第二步：计算控制点
+            var controlPoints = CalculateControlPoints(filteredPoints);
+
+            // 第三步：生成平滑曲线点
+            var curvePoints = GenerateCurvePoints(filteredPoints, controlPoints);
+
+            // 第四步：创建新的笔画
+            var newStylusPoints = new StylusPointCollection(curvePoints);
+            var smoothedStroke = new Stroke(newStylusPoints)
+            {
+                DrawingAttributes = stroke.DrawingAttributes.Clone()
+            };
+
+            return smoothedStroke;
+        }
+
+        /// <summary>
+        /// 过滤和重采样点
+        /// </summary>
+        private List<StylusPoint> FilterAndResamplePoints(List<StylusPoint> points)
+        {
+            var filteredPoints = new List<StylusPoint>();
+            
+            if (points.Count == 0) return filteredPoints;
+
+            // 添加第一个点
+            filteredPoints.Add(points[0]);
+
+            for (int i = 1; i < points.Count; i++)
+            {
+                var currentPoint = points[i];
+                var lastPoint = filteredPoints[filteredPoints.Count - 1];
+
+                double distance = GetDistance(lastPoint.ToPoint(), currentPoint.ToPoint());
+
+                // 如果距离太近，跳过
+                if (distance < MinPointDistance)
+                    continue;
+
+                // 如果距离太远，插入中间点
+                if (distance > MaxPointDistance)
+                {
+                    int segments = (int)(distance / MaxPointDistance) + 1;
+                    for (int j = 1; j < segments; j++)
+                    {
+                        double ratio = (double)j / segments;
+                        var interpolatedPoint = InterpolatePoint(lastPoint, currentPoint, ratio);
+                        filteredPoints.Add(interpolatedPoint);
+                    }
+                }
+
+                filteredPoints.Add(currentPoint);
+            }
+
+            return filteredPoints;
+        }
+
+        /// <summary>
+        /// 计算贝塞尔曲线的控制点
+        /// </summary>
+        private List<Point> CalculateControlPoints(List<StylusPoint> points)
+        {
+            var controlPoints = new List<Point>();
+            
+            if (points.Count < 2) return controlPoints;
+
+            for (int i = 0; i < points.Count; i++)
+            {
+                Point currentPoint = points[i].ToPoint();
+                Point controlPoint;
+
+                if (i == 0)
+                {
+                    // 第一个点的控制点
+                    Point nextPoint = points[i + 1].ToPoint();
+                    controlPoint = new Point(
+                        currentPoint.X + (nextPoint.X - currentPoint.X) * Tension * 0.5,
+                        currentPoint.Y + (nextPoint.Y - currentPoint.Y) * Tension * 0.5
+                    );
+                }
+                else if (i == points.Count - 1)
+                {
+                    // 最后一个点的控制点
+                    Point prevPoint = points[i - 1].ToPoint();
+                    controlPoint = new Point(
+                        currentPoint.X + (currentPoint.X - prevPoint.X) * Tension * 0.5,
+                        currentPoint.Y + (currentPoint.Y - prevPoint.Y) * Tension * 0.5
+                    );
+                }
+                else
+                {
+                    // 中间点的控制点
+                    Point prevPoint = points[i - 1].ToPoint();
+                    Point nextPoint = points[i + 1].ToPoint();
+
+                    // 计算切线方向
+                    double tangentX = (nextPoint.X - prevPoint.X) * 0.5;
+                    double tangentY = (nextPoint.Y - prevPoint.Y) * 0.5;
+
+                    // 应用张力参数
+                    controlPoint = new Point(
+                        currentPoint.X + tangentX * Tension,
+                        currentPoint.Y + tangentY * Tension
+                    );
+                }
+
+                controlPoints.Add(controlPoint);
+            }
+
+            return controlPoints;
+        }
+
+        /// <summary>
+        /// 生成曲线点
+        /// </summary>
+        private List<StylusPoint> GenerateCurvePoints(List<StylusPoint> points, List<Point> controlPoints)
+        {
+            var curvePoints = new List<StylusPoint>();
+            
+            if (points.Count < 2) return curvePoints;
+
+            // 为每个线段生成贝塞尔曲线点
+            for (int i = 0; i < points.Count - 1; i++)
+            {
+                var startPoint = points[i];
+                var endPoint = points[i + 1];
+                var startControl = controlPoints[i];
+                var endControl = controlPoints[i + 1];
+
+                // 计算自适应步长
+                double distance = GetDistance(startPoint.ToPoint(), endPoint.ToPoint());
+                int steps = Math.Max(3, Math.Min(20, (int)(distance / 5.0)));
+
+                // 生成贝塞尔曲线点
+                for (int j = 0; j <= steps; j++)
+                {
+                    double t = (double)j / steps;
+                    var curvePoint = CalculateBezierPoint(startPoint.ToPoint(), startControl, endControl, endPoint.ToPoint(), t);
+                    
+                    // 插值压感值
+                    float pressure = InterpolatePressure(startPoint.PressureFactor, endPoint.PressureFactor, t);
+                    
+                    var stylusPoint = new StylusPoint(curvePoint.X, curvePoint.Y, pressure);
+                    curvePoints.Add(stylusPoint);
+                }
+            }
+
+            return curvePoints;
+        }
+
+        /// <summary>
+        /// 计算贝塞尔曲线上的点
+        /// </summary>
+        private Point CalculateBezierPoint(Point p0, Point p1, Point p2, Point p3, double t)
+        {
+            double u = 1 - t;
+            double tt = t * t;
+            double uu = u * u;
+            double uuu = uu * u;
+            double ttt = tt * t;
+
+            Point point = new Point();
+            point.X = uuu * p0.X + 3 * uu * t * p1.X + 3 * u * tt * p2.X + ttt * p3.X;
+            point.Y = uuu * p0.Y + 3 * uu * t * p1.Y + 3 * u * tt * p2.Y + ttt * p3.Y;
+
+            return point;
+        }
+
+        /// <summary>
+        /// 计算两点间距离
+        /// </summary>
+        private double GetDistance(Point p1, Point p2)
+        {
+            return Math.Sqrt((p1.X - p2.X) * (p1.X - p2.X) + (p1.Y - p2.Y) * (p1.Y - p2.Y));
+        }
+
+        /// <summary>
+        /// 插值两点间的点
+        /// </summary>
+        private StylusPoint InterpolatePoint(StylusPoint p1, StylusPoint p2, double ratio)
+        {
+            return new StylusPoint(
+                p1.X + (p2.X - p1.X) * ratio,
+                p1.Y + (p2.Y - p1.Y) * ratio,
+                InterpolatePressure(p1.PressureFactor, p2.PressureFactor, ratio)
+            );
+        }
+
+        /// <summary>
+        /// 插值压感值
+        /// </summary>
+        private float InterpolatePressure(float p1, float p2, double ratio)
+        {
+            return (float)(p1 + (p2 - p1) * ratio);
+        }
+
+        /// <summary>
+        /// 应用自适应平滑
+        /// </summary>
+        private void ApplyAdaptiveSmoothing(List<StylusPoint> points)
+        {
+            if (!EnableAdaptiveSmoothing || points.Count < 3)
+                return;
+
+            // 计算笔迹的速度变化
+            var speeds = new List<double>();
+            for (int i = 1; i < points.Count - 1; i++)
+            {
+                var prev = points[i - 1].ToPoint();
+                var curr = points[i].ToPoint();
+                var next = points[i + 1].ToPoint();
+
+                double speed1 = GetDistance(prev, curr);
+                double speed2 = GetDistance(curr, next);
+                double avgSpeed = (speed1 + speed2) / 2.0;
+
+                speeds.Add(avgSpeed);
+            }
+
+            // 根据速度调整平滑强度
+            if (speeds.Count > 0)
+            {
+                double avgSpeed = speeds.Average();
+                double maxSpeed = speeds.Max();
+                double minSpeed = speeds.Min();
+
+                // 速度变化越大，平滑强度越小
+                double speedVariation = (maxSpeed - minSpeed) / avgSpeed;
+                SmoothingStrength = Math.Max(0.1, Math.Min(0.9, SmoothingStrength * (1.0 - speedVariation * 0.3)));
+            }
+        }
+    }
+} 
\ No newline at end of file
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index f663fae4..6a165a37 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -781,12 +781,48 @@
                                     <TextBlock Text="# 请注意，若不保留双曲线渐近线可能会有遇到撤回相关的 BUG 影响用。" TextWrapping="Wrap"
                                                Foreground="#a1a1aa" />
                                     <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                        <TextBlock Foreground="#fafafa" Text="让墨迹使用贝塞尔曲线平滑处理"
-                                                   VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
+                                                                            <TextBlock Foreground="#fafafa" Text="使用WPF默认贝塞尔曲线平滑"
+                                               VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
                                         <ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchFitToCurve"
-                                                         IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                         IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
                                                          Toggled="ToggleSwitchFitToCurve_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="ToggleSwitchAdvancedBezierSmoothing"
+                                                         IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                         Toggled="ToggleSwitchAdvancedBezierSmoothing_Toggled" />
+                                    </ui:SimpleStackPanel>
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
+                                                         Visibility="{Binding ElementName=ToggleSwitchAdvancedBezierSmoothing, Path=IsOn, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <TextBlock Foreground="#fafafa" Text="平滑强度" VerticalAlignment="Center"
+                                                   FontSize="14" Margin="0,0,16,0" />
+                                        <Slider Name="AdvancedSmoothingStrengthSlider" Width="150" Minimum="0.1" Maximum="1.0" 
+                                                Value="0.6" TickFrequency="0.1" IsSnapToTickEnabled="True"
+                                                ValueChanged="AdvancedSmoothingStrengthSlider_ValueChanged" />
+                                        <TextBlock Foreground="#fafafa" Text="{Binding ElementName=AdvancedSmoothingStrengthSlider, Path=Value, StringFormat={}{0:F1}}" 
+                                                   VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
+                                    </ui:SimpleStackPanel>
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
+                                                         Visibility="{Binding ElementName=ToggleSwitchAdvancedBezierSmoothing, Path=IsOn, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <TextBlock Foreground="#fafafa" Text="张力参数" VerticalAlignment="Center"
+                                                   FontSize="14" Margin="0,0,16,0" />
+                                        <Slider Name="AdvancedSmoothingTensionSlider" Width="150" Minimum="0.1" Maximum="1.0" 
+                                                Value="0.5" TickFrequency="0.1" IsSnapToTickEnabled="True"
+                                                ValueChanged="AdvancedSmoothingTensionSlider_ValueChanged" />
+                                        <TextBlock Foreground="#fafafa" Text="{Binding ElementName=AdvancedSmoothingTensionSlider, Path=Value, StringFormat={}{0:F1}}" 
+                                                   VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
+                                    </ui:SimpleStackPanel>
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
+                                                         Visibility="{Binding ElementName=ToggleSwitchAdvancedBezierSmoothing, Path=IsOn, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <TextBlock Foreground="#fafafa" Text="启用自适应平滑" VerticalAlignment="Center"
+                                                   FontSize="14" Margin="0,0,16,0" />
+                                        <ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchEnableAdaptiveSmoothing"
+                                                         IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                         Toggled="ToggleSwitchEnableAdaptiveSmoothing_Toggled" />
+                                    </ui:SimpleStackPanel>
+                                    <TextBlock Text="# 高级贝塞尔曲线平滑（推荐）：使用自定义算法替代系统默认的FitToCurve，提供更平滑的笔迹效果并解决墨迹闪烁问题。启用高级平滑时会自动禁用系统默认平滑。平滑强度控制平滑程度，张力参数控制曲线的紧绷程度，自适应平滑会根据笔迹速度自动调整平滑参数。" TextWrapping="Wrap" Foreground="#a1a1aa" />
                                 </ui:SimpleStackPanel>
                             </GroupBox>
                             <!-- 新增：崩溃后操作设置 -->
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 29ada085..16e045e6 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -143,7 +143,15 @@ namespace Ink_Canvas {
                 drawingAttributes.Height = 2.5;
                 drawingAttributes.Width = 2.5;
                 drawingAttributes.IsHighlighter = false;
-                drawingAttributes.FitToCurve = Settings.Canvas.FitToCurve;
+                // 默认使用高级贝塞尔曲线平滑，如果未启用则使用原来的FitToCurve
+                if (Settings.Canvas.UseAdvancedBezierSmoothing)
+                {
+                    drawingAttributes.FitToCurve = false;
+                }
+                else
+                {
+                    drawingAttributes.FitToCurve = Settings.Canvas.FitToCurve;
+                }
 
                 inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
                 inkCanvas.Gesture += InkCanvas_Gesture;
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index 81084903..c330aff4 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs	
@@ -1285,6 +1285,47 @@ namespace Ink_Canvas {
             if (!isLoaded) return;
             drawingAttributes.FitToCurve = ToggleSwitchFitToCurve.IsOn;
             Settings.Canvas.FitToCurve = ToggleSwitchFitToCurve.IsOn;
+            
+            // 启用原来的FitToCurve时自动禁用高级贝塞尔平滑
+            if (ToggleSwitchFitToCurve.IsOn)
+            {
+                ToggleSwitchAdvancedBezierSmoothing.IsOn = false;
+                Settings.Canvas.UseAdvancedBezierSmoothing = false;
+            }
+            
+            SaveSettingsToFile();
+        }
+
+        private void ToggleSwitchAdvancedBezierSmoothing_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            Settings.Canvas.UseAdvancedBezierSmoothing = ToggleSwitchAdvancedBezierSmoothing.IsOn;
+            
+            // 启用高级贝塞尔平滑时自动禁用原来的FitToCurve
+            if (ToggleSwitchAdvancedBezierSmoothing.IsOn)
+            {
+                ToggleSwitchFitToCurve.IsOn = false;
+                Settings.Canvas.FitToCurve = false;
+                drawingAttributes.FitToCurve = false;
+            }
+            
+            SaveSettingsToFile();
+        }
+
+        private void AdvancedSmoothingStrengthSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) {
+            if (!isLoaded) return;
+            Settings.Canvas.AdvancedSmoothingStrength = AdvancedSmoothingStrengthSlider.Value;
+            SaveSettingsToFile();
+        }
+
+        private void AdvancedSmoothingTensionSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) {
+            if (!isLoaded) return;
+            Settings.Canvas.AdvancedSmoothingTension = AdvancedSmoothingTensionSlider.Value;
+            SaveSettingsToFile();
+        }
+
+        private void ToggleSwitchEnableAdaptiveSmoothing_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            Settings.Canvas.EnableAdaptiveSmoothing = ToggleSwitchEnableAdaptiveSmoothing.IsOn;
             SaveSettingsToFile();
         }
 
@@ -1588,7 +1629,11 @@ namespace Ink_Canvas {
             Settings.Canvas.EraserShapeType = 1;
             Settings.Canvas.HideStrokeWhenSelecting = false;
             Settings.Canvas.ClearCanvasAndClearTimeMachine = false;
-            Settings.Canvas.FitToCurve = true;
+            Settings.Canvas.FitToCurve = false;
+            Settings.Canvas.UseAdvancedBezierSmoothing = true;
+            Settings.Canvas.AdvancedSmoothingStrength = 0.6;
+            Settings.Canvas.AdvancedSmoothingTension = 0.5;
+            Settings.Canvas.EnableAdaptiveSmoothing = true;
             Settings.Canvas.EnablePressureTouchMode = false;
             Settings.Canvas.DisablePressure = false;
             Settings.Canvas.AutoStraightenLine = true;
diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
index cf2531a4..e1dd2960 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
@@ -515,13 +515,31 @@ namespace Ink_Canvas {
 
                 ToggleSwitchHideStrokeWhenSelecting.IsOn = Settings.Canvas.HideStrokeWhenSelecting;
 
-                if (Settings.Canvas.FitToCurve) {
-                    ToggleSwitchFitToCurve.IsOn = true;
-                    drawingAttributes.FitToCurve = true;
-                } else {
+                // 初始化贝塞尔曲线平滑设置
+                if (Settings.Canvas.UseAdvancedBezierSmoothing)
+                {
+                    // 如果启用高级贝塞尔平滑，则禁用原来的FitToCurve
+                    ToggleSwitchAdvancedBezierSmoothing.IsOn = true;
                     ToggleSwitchFitToCurve.IsOn = false;
                     drawingAttributes.FitToCurve = false;
                 }
+                else if (Settings.Canvas.FitToCurve)
+                {
+                    // 如果启用原来的FitToCurve，则禁用高级贝塞尔平滑
+                    ToggleSwitchFitToCurve.IsOn = true;
+                    ToggleSwitchAdvancedBezierSmoothing.IsOn = false;
+                    drawingAttributes.FitToCurve = true;
+                }
+                else
+                {
+                    // 两者都禁用
+                    ToggleSwitchFitToCurve.IsOn = false;
+                    ToggleSwitchAdvancedBezierSmoothing.IsOn = false;
+                    drawingAttributes.FitToCurve = false;
+                }
+                AdvancedSmoothingStrengthSlider.Value = Settings.Canvas.AdvancedSmoothingStrength;
+                AdvancedSmoothingTensionSlider.Value = Settings.Canvas.AdvancedSmoothingTension;
+                ToggleSwitchEnableAdaptiveSmoothing.IsOn = Settings.Canvas.EnableAdaptiveSmoothing;
                 
                 // 初始化直线自动拉直相关设置
                 ToggleSwitchAutoStraightenLine.IsOn = Settings.Canvas.AutoStraightenLine;
diff --git a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
index 35aba96f..46037236 100644
--- a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
@@ -433,6 +433,7 @@ namespace Ink_Canvas {
         #region 形状绘制主函数
 
         private void MouseTouchMove(Point endP) {
+            // 禁用原有的FitToCurve，使用新的高级贝塞尔曲线平滑
             if (Settings.Canvas.FitToCurve == true) drawingAttributes.FitToCurve = false;
             ViewboxFloatingBar.IsHitTestVisible = false;
             BlackboardUIGridForInkReplay.IsHitTestVisible = false;
@@ -1589,7 +1590,36 @@ namespace Ink_Canvas {
                 }
             }
 
-            if (Settings.Canvas.FitToCurve == true) drawingAttributes.FitToCurve = true;
+            // 应用高级贝塞尔曲线平滑
+            if (Settings.Canvas.UseAdvancedBezierSmoothing)
+            {
+                try
+                {
+                    var advancedSmoothing = new Helpers.AdvancedBezierSmoothing
+                    {
+                        SmoothingStrength = Settings.Canvas.AdvancedSmoothingStrength,
+                        Tension = Settings.Canvas.AdvancedSmoothingTension,
+                        EnableAdaptiveSmoothing = Settings.Canvas.EnableAdaptiveSmoothing
+                    };
+
+                    // 对临时笔画应用平滑
+                    if (lastTempStroke != null)
+                    {
+                        var smoothedStroke = advancedSmoothing.SmoothStroke(lastTempStroke);
+                        inkCanvas.Strokes.Remove(lastTempStroke);
+                        lastTempStroke = smoothedStroke;
+                        inkCanvas.Strokes.Add(smoothedStroke);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    System.Diagnostics.Debug.WriteLine($"形状绘制高级贝塞尔曲线平滑失败: {ex.Message}");
+                }
+            }
+            else if (Settings.Canvas.FitToCurve == true) 
+            {
+                drawingAttributes.FitToCurve = true;
+            }
         }
 
         private bool NeedUpdateIniP() {
diff --git a/Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs b/Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs
index f66ed808..9cc49768 100644
--- a/Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs	
@@ -16,6 +16,7 @@ namespace Ink_Canvas {
         private const double LINE_STRAIGHTEN_THRESHOLD = 0.20; // 默认灵敏度阈值，与UI默认值对应
 
         private void inkCanvas_StrokeCollected(object sender, InkCanvasStrokeCollectedEventArgs e) {
+            // 禁用原有的FitToCurve，使用新的高级贝塞尔曲线平滑
             if (Settings.Canvas.FitToCurve == true) drawingAttributes.FitToCurve = false;
 
             try {
@@ -572,7 +573,37 @@ namespace Ink_Canvas {
             }
             catch { }
 
-            if (Settings.Canvas.FitToCurve == true) drawingAttributes.FitToCurve = true;
+            // 应用高级贝塞尔曲线平滑
+            if (Settings.Canvas.UseAdvancedBezierSmoothing)
+            {
+                try
+                {
+                    var advancedSmoothing = new Helpers.AdvancedBezierSmoothing
+                    {
+                        SmoothingStrength = Settings.Canvas.AdvancedSmoothingStrength,
+                        Tension = Settings.Canvas.AdvancedSmoothingTension,
+                        EnableAdaptiveSmoothing = Settings.Canvas.EnableAdaptiveSmoothing
+                    };
+
+                    var smoothedStroke = advancedSmoothing.SmoothStroke(e.Stroke);
+                    
+                    // 替换原始笔画
+                    SetNewBackupOfStroke();
+                    _currentCommitType = CommitReason.ShapeRecognition;
+                    inkCanvas.Strokes.Remove(e.Stroke);
+                    inkCanvas.Strokes.Add(smoothedStroke);
+                    _currentCommitType = CommitReason.UserInput;
+                }
+                catch (Exception ex)
+                {
+                    // 如果高级平滑失败，回退到原始笔画
+                    System.Diagnostics.Debug.WriteLine($"高级贝塞尔曲线平滑失败: {ex.Message}");
+                }
+            }
+            else if (Settings.Canvas.FitToCurve == true) 
+            {
+                drawingAttributes.FitToCurve = true;
+            }
         }
 
         // New method: Checks if a stroke is potentially a straight line
diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs
index da490d31..01d44acb 100644
--- a/Ink Canvas/Resources/Settings.cs	
+++ b/Ink Canvas/Resources/Settings.cs	
@@ -47,7 +47,15 @@ namespace Ink_Canvas
         [JsonProperty("hideStrokeWhenSelecting")]
         public bool HideStrokeWhenSelecting { get; set; } = true;
         [JsonProperty("fitToCurve")]
-        public bool FitToCurve { get; set; } = true;
+        public bool FitToCurve { get; set; } = false; // 默认关闭原来的贝塞尔平滑
+        [JsonProperty("useAdvancedBezierSmoothing")]
+        public bool UseAdvancedBezierSmoothing { get; set; } = true; // 默认启用高级贝塞尔曲线平滑
+        [JsonProperty("advancedSmoothingStrength")]
+        public double AdvancedSmoothingStrength { get; set; } = 0.6; // 高级平滑强度 (0.0 - 1.0)
+        [JsonProperty("advancedSmoothingTension")]
+        public double AdvancedSmoothingTension { get; set; } = 0.5; // 高级平滑张力 (0.0 - 1.0)
+        [JsonProperty("enableAdaptiveSmoothing")]
+        public bool EnableAdaptiveSmoothing { get; set; } = true; // 是否启用自适应平滑
         [JsonProperty("clearCanvasAndClearTimeMachine")]
         public bool ClearCanvasAndClearTimeMachine { get; set; } = false;
         [JsonProperty("enablePressureTouchMode")]

From c5355d74976a743850de1d12ad350b7699bd5d1e Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 15:27:02 +0800
Subject: [PATCH 16/32] =?UTF-8?q?improve:=E5=A2=A8=E8=BF=B9=E5=B9=B3?=
 =?UTF-8?q?=E6=BB=91=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/Helpers/AdvancedBezierSmoothing.cs | 87 +++++++++++++++----
 Ink Canvas/MainWindow.xaml                    |  6 +-
 Ink Canvas/MainWindow_cs/MW_Settings.cs       |  4 +-
 Ink Canvas/Resources/Settings.cs              |  4 +-
 .../InkCanvasForClass_MarkupCompile.cache     |  2 +-
 5 files changed, 78 insertions(+), 25 deletions(-)

diff --git a/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs b/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs
index c495af4d..f05135dc 100644
--- a/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs	
+++ b/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs	
@@ -33,12 +33,12 @@ namespace Ink_Canvas.Helpers
         /// <summary>
         /// 最小点间距阈值
         /// </summary>
-        public double MinPointDistance { get; set; } = 2.0;
+        public double MinPointDistance { get; set; } = 3.0; // 增加最小间距，减少毛刺
 
         /// <summary>
         /// 最大点间距阈值
         /// </summary>
-        public double MaxPointDistance { get; set; } = 50.0;
+        public double MaxPointDistance { get; set; } = 30.0; // 减少最大间距，提高平滑度
 
         /// <summary>
         /// 对笔画进行高级贝塞尔曲线平滑处理
@@ -84,7 +84,11 @@ namespace Ink_Canvas.Helpers
             // 添加第一个点
             filteredPoints.Add(points[0]);
 
-            for (int i = 1; i < points.Count; i++)
+            // 使用移动平均来减少毛刺
+            var smoothedPoints = new List<StylusPoint>();
+            int windowSize = 3; // 移动平均窗口大小
+
+            for (int i = 0; i < points.Count; i++)
             {
                 var currentPoint = points[i];
                 var lastPoint = filteredPoints[filteredPoints.Count - 1];
@@ -95,6 +99,25 @@ namespace Ink_Canvas.Helpers
                 if (distance < MinPointDistance)
                     continue;
 
+                // 应用移动平均平滑
+                if (i >= windowSize - 1)
+                {
+                    double avgX = 0, avgY = 0, avgPressure = 0;
+                    for (int j = 0; j < windowSize; j++)
+                    {
+                        var point = points[i - j];
+                        avgX += point.X;
+                        avgY += point.Y;
+                        avgPressure += point.PressureFactor;
+                    }
+                    avgX /= windowSize;
+                    avgY /= windowSize;
+                    avgPressure /= windowSize;
+
+                    var smoothedPoint = new StylusPoint(avgX, avgY, (float)avgPressure);
+                    currentPoint = smoothedPoint;
+                }
+
                 // 如果距离太远，插入中间点
                 if (distance > MaxPointDistance)
                 {
@@ -132,8 +155,8 @@ namespace Ink_Canvas.Helpers
                     // 第一个点的控制点
                     Point nextPoint = points[i + 1].ToPoint();
                     controlPoint = new Point(
-                        currentPoint.X + (nextPoint.X - currentPoint.X) * Tension * 0.5,
-                        currentPoint.Y + (nextPoint.Y - currentPoint.Y) * Tension * 0.5
+                        currentPoint.X + (nextPoint.X - currentPoint.X) * Tension * 0.3, // 减少张力，减少毛刺
+                        currentPoint.Y + (nextPoint.Y - currentPoint.Y) * Tension * 0.3
                     );
                 }
                 else if (i == points.Count - 1)
@@ -141,8 +164,8 @@ namespace Ink_Canvas.Helpers
                     // 最后一个点的控制点
                     Point prevPoint = points[i - 1].ToPoint();
                     controlPoint = new Point(
-                        currentPoint.X + (currentPoint.X - prevPoint.X) * Tension * 0.5,
-                        currentPoint.Y + (currentPoint.Y - prevPoint.Y) * Tension * 0.5
+                        currentPoint.X + (currentPoint.X - prevPoint.X) * Tension * 0.3,
+                        currentPoint.Y + (currentPoint.Y - prevPoint.Y) * Tension * 0.3
                     );
                 }
                 else
@@ -151,14 +174,26 @@ namespace Ink_Canvas.Helpers
                     Point prevPoint = points[i - 1].ToPoint();
                     Point nextPoint = points[i + 1].ToPoint();
 
-                    // 计算切线方向
-                    double tangentX = (nextPoint.X - prevPoint.X) * 0.5;
-                    double tangentY = (nextPoint.Y - prevPoint.Y) * 0.5;
+                    // 计算切线方向，使用更保守的方法
+                    double tangentX = (nextPoint.X - prevPoint.X) * 0.3; // 减少切线强度
+                    double tangentY = (nextPoint.Y - prevPoint.Y) * 0.3;
+
+                    // 应用张力参数，但限制最大偏移
+                    double maxOffset = 10.0; // 限制控制点最大偏移距离
+                    double offsetX = tangentX * Tension;
+                    double offsetY = tangentY * Tension;
+                    
+                    // 限制偏移距离
+                    double offsetDistance = Math.Sqrt(offsetX * offsetX + offsetY * offsetY);
+                    if (offsetDistance > maxOffset)
+                    {
+                        offsetX = offsetX * maxOffset / offsetDistance;
+                        offsetY = offsetY * maxOffset / offsetDistance;
+                    }
 
-                    // 应用张力参数
                     controlPoint = new Point(
-                        currentPoint.X + tangentX * Tension,
-                        currentPoint.Y + tangentY * Tension
+                        currentPoint.X + offsetX,
+                        currentPoint.Y + offsetY
                     );
                 }
 
@@ -185,9 +220,9 @@ namespace Ink_Canvas.Helpers
                 var startControl = controlPoints[i];
                 var endControl = controlPoints[i + 1];
 
-                // 计算自适应步长
+                // 计算自适应步长，减少步数以避免毛刺
                 double distance = GetDistance(startPoint.ToPoint(), endPoint.ToPoint());
-                int steps = Math.Max(3, Math.Min(20, (int)(distance / 5.0)));
+                int steps = Math.Max(2, Math.Min(15, (int)(distance / 8.0))); // 减少步数，增加步长
 
                 // 生成贝塞尔曲线点
                 for (int j = 0; j <= steps; j++)
@@ -195,9 +230,16 @@ namespace Ink_Canvas.Helpers
                     double t = (double)j / steps;
                     var curvePoint = CalculateBezierPoint(startPoint.ToPoint(), startControl, endControl, endPoint.ToPoint(), t);
                     
-                    // 插值压感值
+                    // 插值压感值，使用更平滑的插值
                     float pressure = InterpolatePressure(startPoint.PressureFactor, endPoint.PressureFactor, t);
                     
+                    // 对压感值进行额外的平滑处理
+                    if (j > 0 && j < steps)
+                    {
+                        float prevPressure = curvePoints[curvePoints.Count - 1].PressureFactor;
+                        pressure = (prevPressure + pressure) * 0.5f; // 简单的移动平均
+                    }
+                    
                     var stylusPoint = new StylusPoint(curvePoint.X, curvePoint.Y, pressure);
                     curvePoints.Add(stylusPoint);
                 }
@@ -249,7 +291,18 @@ namespace Ink_Canvas.Helpers
         /// </summary>
         private float InterpolatePressure(float p1, float p2, double ratio)
         {
-            return (float)(p1 + (p2 - p1) * ratio);
+            // 使用平滑的插值函数来减少毛刺
+            double smoothRatio = SmoothStep(ratio);
+            return (float)(p1 + (p2 - p1) * smoothRatio);
+        }
+
+        /// <summary>
+        /// 平滑步进函数，用于减少插值时的毛刺
+        /// </summary>
+        private double SmoothStep(double t)
+        {
+            // 使用三次平滑函数
+            return t * t * (3.0 - 2.0 * t);
         }
 
         /// <summary>
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 6a165a37..5916c263 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -799,7 +799,7 @@
                                         <TextBlock Foreground="#fafafa" Text="平滑强度" VerticalAlignment="Center"
                                                    FontSize="14" Margin="0,0,16,0" />
                                         <Slider Name="AdvancedSmoothingStrengthSlider" Width="150" Minimum="0.1" Maximum="1.0" 
-                                                Value="0.6" TickFrequency="0.1" IsSnapToTickEnabled="True"
+                                                Value="0.4" TickFrequency="0.1" IsSnapToTickEnabled="True"
                                                 ValueChanged="AdvancedSmoothingStrengthSlider_ValueChanged" />
                                         <TextBlock Foreground="#fafafa" Text="{Binding ElementName=AdvancedSmoothingStrengthSlider, Path=Value, StringFormat={}{0:F1}}" 
                                                    VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
@@ -809,7 +809,7 @@
                                         <TextBlock Foreground="#fafafa" Text="张力参数" VerticalAlignment="Center"
                                                    FontSize="14" Margin="0,0,16,0" />
                                         <Slider Name="AdvancedSmoothingTensionSlider" Width="150" Minimum="0.1" Maximum="1.0" 
-                                                Value="0.5" TickFrequency="0.1" IsSnapToTickEnabled="True"
+                                                Value="0.3" TickFrequency="0.1" IsSnapToTickEnabled="True"
                                                 ValueChanged="AdvancedSmoothingTensionSlider_ValueChanged" />
                                         <TextBlock Foreground="#fafafa" Text="{Binding ElementName=AdvancedSmoothingTensionSlider, Path=Value, StringFormat={}{0:F1}}" 
                                                    VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
@@ -822,7 +822,7 @@
                                                          IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
                                                          Toggled="ToggleSwitchEnableAdaptiveSmoothing_Toggled" />
                                     </ui:SimpleStackPanel>
-                                    <TextBlock Text="# 高级贝塞尔曲线平滑（推荐）：使用自定义算法替代系统默认的FitToCurve，提供更平滑的笔迹效果并解决墨迹闪烁问题。启用高级平滑时会自动禁用系统默认平滑。平滑强度控制平滑程度，张力参数控制曲线的紧绷程度，自适应平滑会根据笔迹速度自动调整平滑参数。" TextWrapping="Wrap" Foreground="#a1a1aa" />
+                                    <TextBlock Text="# 高级贝塞尔曲线平滑（推荐）：使用自定义算法替代系统默认的FitToCurve，提供更平滑的笔迹效果并解决墨迹闪烁和毛刺问题。启用高级平滑时会自动禁用系统默认平滑。平滑强度控制平滑程度（较低值减少毛刺），张力参数控制曲线的紧绷程度（较低值减少毛刺），自适应平滑会根据笔迹速度自动调整平滑参数。" TextWrapping="Wrap" Foreground="#a1a1aa" />
                                 </ui:SimpleStackPanel>
                             </GroupBox>
                             <!-- 新增：崩溃后操作设置 -->
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index c330aff4..d93965a6 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs	
@@ -1631,8 +1631,8 @@ namespace Ink_Canvas {
             Settings.Canvas.ClearCanvasAndClearTimeMachine = false;
             Settings.Canvas.FitToCurve = false;
             Settings.Canvas.UseAdvancedBezierSmoothing = true;
-            Settings.Canvas.AdvancedSmoothingStrength = 0.6;
-            Settings.Canvas.AdvancedSmoothingTension = 0.5;
+            Settings.Canvas.AdvancedSmoothingStrength = 0.4;
+            Settings.Canvas.AdvancedSmoothingTension = 0.3;
             Settings.Canvas.EnableAdaptiveSmoothing = true;
             Settings.Canvas.EnablePressureTouchMode = false;
             Settings.Canvas.DisablePressure = false;
diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs
index 01d44acb..04bf5e92 100644
--- a/Ink Canvas/Resources/Settings.cs	
+++ b/Ink Canvas/Resources/Settings.cs	
@@ -51,9 +51,9 @@ namespace Ink_Canvas
         [JsonProperty("useAdvancedBezierSmoothing")]
         public bool UseAdvancedBezierSmoothing { get; set; } = true; // 默认启用高级贝塞尔曲线平滑
         [JsonProperty("advancedSmoothingStrength")]
-        public double AdvancedSmoothingStrength { get; set; } = 0.6; // 高级平滑强度 (0.0 - 1.0)
+        public double AdvancedSmoothingStrength { get; set; } = 0.4; // 高级平滑强度 (0.0 - 1.0)，降低以减少毛刺
         [JsonProperty("advancedSmoothingTension")]
-        public double AdvancedSmoothingTension { get; set; } = 0.5; // 高级平滑张力 (0.0 - 1.0)
+        public double AdvancedSmoothingTension { get; set; } = 0.3; // 高级平滑张力 (0.0 - 1.0)，降低以减少毛刺
         [JsonProperty("enableAdaptiveSmoothing")]
         public bool EnableAdaptiveSmoothing { get; set; } = true; // 是否启用自适应平滑
         [JsonProperty("clearCanvasAndClearTimeMachine")]
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache
index 9b3fbcb7..b463b3ac 100644
--- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache	
+++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache	
@@ -12,7 +12,7 @@ TRACE;DEBUG;NETFRAMEWORK;NET472;;NET30_OR_GREATER;NET35_OR_GREATER;NET40_OR_GREA
 E:\ICC CE\ICC CE main\community\Ink Canvas\App.xaml
 21348134359
 
-731095817143
+74373288771
 471037513499
 Helpers\Plugins\BuiltIn\SuperLauncher\LauncherSettingsControl.xaml;Helpers\Plugins\BuiltIn\SuperLauncher\LauncherWindow.xaml;MainWindow.xaml;MainWindow_cs\MW_Eraser.xaml;Resources\DrawShapeImageDictionary.xaml;Resources\IconImageDictionary.xaml;Resources\SeewoImageDictionary.xaml;Resources\Styles\Dark.xaml;Resources\Styles\Light.xaml;Windows\AddCustomIconWindow.xaml;Windows\AddPickNameBackgroundWindow.xaml;Windows\CountdownTimerWindow.xaml;Windows\CustomIconWindow.xaml;Windows\CycleProcessBar.xaml;Windows\HasNewUpdateWindow.xaml;Windows\ManagePickNameBackgroundsWindow.xaml;Windows\NamesInputWindow.xaml;Windows\OperatingGuideWindow.xaml;Windows\PluginSettingsWindow.xaml;Windows\RandWindow.xaml;Windows\YesOrNoNotificationWindow.xaml;
 

From 09f17caabe347fd82d39dbc0456273066ea89c20 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 15:42:11 +0800
Subject: [PATCH 17/32] =?UTF-8?q?fix:=E7=99=BD=E6=9D=BF=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 16e045e6..ec53312a 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -287,10 +287,7 @@ namespace Ink_Canvas {
             else
                 RadioCrashNoAction.IsChecked = true;
             
-            // 设置默认为黑板模式
-            Settings.Canvas.UsingWhiteboard = false;
-            Settings.Canvas.CustomBackgroundColor = "#162924"; // 黑板默认颜色 RGB(22, 41, 36)
-            SaveSettingsToFile();
+
             
             // 如果当前不是黑板模式，则切换到黑板模式
             if (currentMode == 0)

From 62d35127b18987353212fe427c469f4403c95b38 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 15:57:51 +0800
Subject: [PATCH 18/32] =?UTF-8?q?improve:=E5=A2=A8=E8=BF=B9=E5=B9=B3?=
 =?UTF-8?q?=E6=BB=91=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/Helpers/AdvancedBezierSmoothing.cs | 382 ++++++++++++++++--
 Ink Canvas/MainWindow.xaml                    |  34 +-
 Ink Canvas/MainWindow_cs/MW_Settings.cs       |  21 +
 Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs |   3 +
 Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs   |   5 +-
 .../MW_SimulatePressure&InkToShape.cs         |  49 ++-
 Ink Canvas/Resources/Settings.cs              |   6 +
 7 files changed, 446 insertions(+), 54 deletions(-)

diff --git a/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs b/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs
index f05135dc..35ea4088 100644
--- a/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs	
+++ b/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs	
@@ -40,6 +40,21 @@ namespace Ink_Canvas.Helpers
         /// </summary>
         public double MaxPointDistance { get; set; } = 30.0; // 减少最大间距，提高平滑度
 
+        /// <summary>
+        /// 手抖修正强度 (0.0 - 1.0)
+        /// </summary>
+        public double ShakeCorrectionStrength { get; set; } = 0.6;
+
+        /// <summary>
+        /// 速度加权平滑强度 (0.0 - 1.0)
+        /// </summary>
+        public double VelocityWeightedSmoothingStrength { get; set; } = 0.7;
+
+        /// <summary>
+        /// 时间加权平滑强度 (0.0 - 1.0)
+        /// </summary>
+        public double TimeWeightedSmoothingStrength { get; set; } = 0.5;
+
         /// <summary>
         /// 对笔画进行高级贝塞尔曲线平滑处理
         /// </summary>
@@ -53,18 +68,35 @@ namespace Ink_Canvas.Helpers
             var originalPoints = stroke.StylusPoints.ToList();
             var smoothedPoints = new List<StylusPoint>();
 
-            // 第一步：点过滤和重采样
-            var filteredPoints = FilterAndResamplePoints(originalPoints);
+            // 检查采样率，如果点太少则使用不同的处理策略
+            bool isLowSamplingRate = originalPoints.Count < 10; // 少于10个点认为是低采样率
 
-            // 第二步：计算控制点
+            if (isLowSamplingRate)
+            {
+                // 低采样率情况下的特殊处理
+                return HandleLowSamplingRateStroke(stroke);
+            }
+
+            // 第一步：手抖修正
+            var shakeCorrectedPoints = ApplyShakeCorrection(originalPoints);
+
+            // 第二步：基于速度和时间的加权平滑
+            var velocityTimeWeightedPoints = ApplyVelocityTimeWeightedSmoothing(shakeCorrectedPoints);
+
+            // 第三步：点过滤和重采样
+            var filteredPoints = FilterAndResamplePoints(velocityTimeWeightedPoints);
+
+            // 第四步：计算控制点
             var controlPoints = CalculateControlPoints(filteredPoints);
 
-            // 第三步：生成平滑曲线点
+            // 第五步：生成平滑曲线点
             var curvePoints = GenerateCurvePoints(filteredPoints, controlPoints);
 
-            // 第四步：创建新的笔画
-            var newStylusPoints = new StylusPointCollection(curvePoints);
-            var smoothedStroke = new Stroke(newStylusPoints)
+            // 第六步：修正收尾相连问题
+            var fixedStylusPoints = FixEndToEndConnection(new StylusPointCollection(curvePoints));
+            
+            // 第七步：创建新的笔画
+            var smoothedStroke = new Stroke(fixedStylusPoints)
             {
                 DrawingAttributes = stroke.DrawingAttributes.Clone()
             };
@@ -72,6 +104,39 @@ namespace Ink_Canvas.Helpers
             return smoothedStroke;
         }
 
+        /// <summary>
+        /// 检测并修正收尾相连问题
+        /// </summary>
+        private StylusPointCollection FixEndToEndConnection(StylusPointCollection points)
+        {
+            if (points.Count < 3) return points;
+
+            var resultPoints = new StylusPointCollection();
+            
+            // 复制所有点
+            foreach (var point in points)
+            {
+                resultPoints.Add(point);
+            }
+
+            // 检查首尾是否过于接近
+            var firstPoint = resultPoints[0];
+            var lastPoint = resultPoints[resultPoints.Count - 1];
+            double endToEndDistance = GetDistance(firstPoint.ToPoint(), lastPoint.ToPoint());
+
+            // 如果首尾距离太近，可能是收尾相连问题
+            if (endToEndDistance < 5.0)
+            {
+                // 移除最后一个点，避免收尾相连
+                if (resultPoints.Count > 1)
+                {
+                    resultPoints.RemoveAt(resultPoints.Count - 1);
+                }
+            }
+
+            return resultPoints;
+        }
+
         /// <summary>
         /// 过滤和重采样点
         /// </summary>
@@ -145,6 +210,11 @@ namespace Ink_Canvas.Helpers
             
             if (points.Count < 2) return controlPoints;
 
+            // 检查点密度，如果点太稀疏则使用更保守的控制点计算
+            bool isSparsePoints = points.Count < 5;
+            double tensionMultiplier = isSparsePoints ? 0.1 : 0.3; // 稀疏点时使用更小的张力
+            double maxOffset = isSparsePoints ? 5.0 : 10.0; // 稀疏点时使用更小的最大偏移
+
             for (int i = 0; i < points.Count; i++)
             {
                 Point currentPoint = points[i].ToPoint();
@@ -154,19 +224,39 @@ namespace Ink_Canvas.Helpers
                 {
                     // 第一个点的控制点
                     Point nextPoint = points[i + 1].ToPoint();
-                    controlPoint = new Point(
-                        currentPoint.X + (nextPoint.X - currentPoint.X) * Tension * 0.3, // 减少张力，减少毛刺
-                        currentPoint.Y + (nextPoint.Y - currentPoint.Y) * Tension * 0.3
-                    );
+                    double distance = GetDistance(currentPoint, nextPoint);
+                    
+                    // 如果距离太远，使用更保守的控制点
+                    if (distance > 50.0)
+                    {
+                        controlPoint = currentPoint; // 直接使用当前点作为控制点
+                    }
+                    else
+                    {
+                        controlPoint = new Point(
+                            currentPoint.X + (nextPoint.X - currentPoint.X) * Tension * tensionMultiplier,
+                            currentPoint.Y + (nextPoint.Y - currentPoint.Y) * Tension * tensionMultiplier
+                        );
+                    }
                 }
                 else if (i == points.Count - 1)
                 {
                     // 最后一个点的控制点
                     Point prevPoint = points[i - 1].ToPoint();
-                    controlPoint = new Point(
-                        currentPoint.X + (currentPoint.X - prevPoint.X) * Tension * 0.3,
-                        currentPoint.Y + (currentPoint.Y - prevPoint.Y) * Tension * 0.3
-                    );
+                    double distance = GetDistance(currentPoint, prevPoint);
+                    
+                    // 如果距离太远，使用更保守的控制点
+                    if (distance > 50.0)
+                    {
+                        controlPoint = currentPoint; // 直接使用当前点作为控制点
+                    }
+                    else
+                    {
+                        controlPoint = new Point(
+                            currentPoint.X + (currentPoint.X - prevPoint.X) * Tension * tensionMultiplier,
+                            currentPoint.Y + (currentPoint.Y - prevPoint.Y) * Tension * tensionMultiplier
+                        );
+                    }
                 }
                 else
                 {
@@ -174,27 +264,41 @@ namespace Ink_Canvas.Helpers
                     Point prevPoint = points[i - 1].ToPoint();
                     Point nextPoint = points[i + 1].ToPoint();
 
-                    // 计算切线方向，使用更保守的方法
-                    double tangentX = (nextPoint.X - prevPoint.X) * 0.3; // 减少切线强度
-                    double tangentY = (nextPoint.Y - prevPoint.Y) * 0.3;
-
-                    // 应用张力参数，但限制最大偏移
-                    double maxOffset = 10.0; // 限制控制点最大偏移距离
-                    double offsetX = tangentX * Tension;
-                    double offsetY = tangentY * Tension;
+                    // 检查前后点的距离，如果太远则使用更保守的方法
+                    double prevDistance = GetDistance(currentPoint, prevPoint);
+                    double nextDistance = GetDistance(currentPoint, nextPoint);
                     
-                    // 限制偏移距离
-                    double offsetDistance = Math.Sqrt(offsetX * offsetX + offsetY * offsetY);
-                    if (offsetDistance > maxOffset)
+                    if (prevDistance > 50.0 || nextDistance > 50.0)
                     {
-                        offsetX = offsetX * maxOffset / offsetDistance;
-                        offsetY = offsetY * maxOffset / offsetDistance;
+                        // 距离太远，使用线性插值作为控制点
+                        controlPoint = new Point(
+                            (prevPoint.X + nextPoint.X) / 2.0,
+                            (prevPoint.Y + nextPoint.Y) / 2.0
+                        );
                     }
+                    else
+                    {
+                        // 计算切线方向，使用更保守的方法
+                        double tangentX = (nextPoint.X - prevPoint.X) * tensionMultiplier;
+                        double tangentY = (nextPoint.Y - prevPoint.Y) * tensionMultiplier;
 
-                    controlPoint = new Point(
-                        currentPoint.X + offsetX,
-                        currentPoint.Y + offsetY
-                    );
+                        // 应用张力参数，但限制最大偏移
+                        double offsetX = tangentX * Tension;
+                        double offsetY = tangentY * Tension;
+                        
+                        // 限制偏移距离
+                        double offsetDistance = Math.Sqrt(offsetX * offsetX + offsetY * offsetY);
+                        if (offsetDistance > maxOffset)
+                        {
+                            offsetX = offsetX * maxOffset / offsetDistance;
+                            offsetY = offsetY * maxOffset / offsetDistance;
+                        }
+
+                        controlPoint = new Point(
+                            currentPoint.X + offsetX,
+                            currentPoint.Y + offsetY
+                        );
+                    }
                 }
 
                 controlPoints.Add(controlPoint);
@@ -222,7 +326,17 @@ namespace Ink_Canvas.Helpers
 
                 // 计算自适应步长，减少步数以避免毛刺
                 double distance = GetDistance(startPoint.ToPoint(), endPoint.ToPoint());
-                int steps = Math.Max(2, Math.Min(15, (int)(distance / 8.0))); // 减少步数，增加步长
+                
+                // 根据点密度调整步数
+                int steps;
+                if (points.Count < 5) // 低密度点
+                {
+                    steps = Math.Max(1, Math.Min(3, (int)(distance / 15.0))); // 更少的步数
+                }
+                else
+                {
+                    steps = Math.Max(2, Math.Min(15, (int)(distance / 8.0))); // 正常步数
+                }
 
                 // 生成贝塞尔曲线点
                 for (int j = 0; j <= steps; j++)
@@ -305,6 +419,208 @@ namespace Ink_Canvas.Helpers
             return t * t * (3.0 - 2.0 * t);
         }
 
+        /// <summary>
+        /// 应用手抖修正
+        /// </summary>
+        private List<StylusPoint> ApplyShakeCorrection(List<StylusPoint> points)
+        {
+            if (points.Count < 3) return points;
+
+            var correctedPoints = new List<StylusPoint>();
+            correctedPoints.Add(points[0]); // 添加第一个点
+
+            for (int i = 1; i < points.Count - 1; i++)
+            {
+                var prev = points[i - 1];
+                var curr = points[i];
+                var next = points[i + 1];
+
+                // 计算当前点的预期位置（基于前后点的线性插值）
+                double expectedX = (prev.X + next.X) / 2.0;
+                double expectedY = (prev.Y + next.Y) / 2.0;
+
+                // 计算当前点与预期位置的偏差
+                double deviationX = Math.Abs(curr.X - expectedX);
+                double deviationY = Math.Abs(curr.Y - expectedY);
+                double deviation = Math.Sqrt(deviationX * deviationX + deviationY * deviationY);
+
+                // 如果偏差超过阈值，认为是手抖
+                double shakeThreshold = 5.0; // 手抖检测阈值
+                if (deviation > shakeThreshold)
+                {
+                    // 应用手抖修正
+                    double correctionFactor = ShakeCorrectionStrength;
+                    double correctedX = curr.X + (expectedX - curr.X) * correctionFactor;
+                    double correctedY = curr.Y + (expectedY - curr.Y) * correctionFactor;
+
+                    // 保持压感值不变
+                    var correctedPoint = new StylusPoint(correctedX, correctedY, curr.PressureFactor);
+                    correctedPoints.Add(correctedPoint);
+                }
+                else
+                {
+                    correctedPoints.Add(curr);
+                }
+            }
+
+            correctedPoints.Add(points[points.Count - 1]); // 添加最后一个点
+            return correctedPoints;
+        }
+
+        /// <summary>
+        /// 应用基于速度和时间的加权平滑
+        /// </summary>
+        private List<StylusPoint> ApplyVelocityTimeWeightedSmoothing(List<StylusPoint> points)
+        {
+            if (points.Count < 3) return points;
+
+            var smoothedPoints = new List<StylusPoint>();
+            smoothedPoints.Add(points[0]); // 添加第一个点
+
+            // 计算每个点的速度和加速度
+            var velocities = new List<double>();
+            var accelerations = new List<double>();
+            var timeWeights = new List<double>();
+
+            for (int i = 1; i < points.Count; i++)
+            {
+                var prev = points[i - 1];
+                var curr = points[i];
+
+                // 计算速度（距离/时间，这里假设时间间隔为1）
+                double velocity = GetDistance(prev.ToPoint(), curr.ToPoint());
+                velocities.Add(velocity);
+
+                // 计算加速度
+                if (i > 1)
+                {
+                    double prevVelocity = velocities[velocities.Count - 2];
+                    double acceleration = velocity - prevVelocity;
+                    accelerations.Add(acceleration);
+                }
+
+                // 计算时间权重（基于点的密度）
+                double timeWeight = 1.0;
+                if (i > 1)
+                {
+                    // 如果点过于密集，增加时间权重
+                    double avgDistance = velocity;
+                    if (avgDistance < 2.0)
+                    {
+                        timeWeight = 1.5; // 增加权重
+                    }
+                    else if (avgDistance > 20.0)
+                    {
+                        timeWeight = 0.5; // 减少权重
+                    }
+                }
+                timeWeights.Add(timeWeight);
+            }
+
+            // 应用加权平滑
+            for (int i = 1; i < points.Count - 1; i++)
+            {
+                var prev = points[i - 1];
+                var curr = points[i];
+                var next = points[i + 1];
+
+                // 计算速度权重
+                double velocityWeight = 1.0;
+                if (i < velocities.Count)
+                {
+                    double velocity = velocities[i - 1];
+                    // 速度越快，权重越大（更平滑）
+                    velocityWeight = Math.Min(2.0, velocity / 10.0 + 0.5);
+                }
+
+                // 计算加速度权重
+                double accelerationWeight = 1.0;
+                if (i < accelerations.Count)
+                {
+                    double acceleration = Math.Abs(accelerations[i - 1]);
+                    // 加速度越大，权重越大（更平滑）
+                    accelerationWeight = Math.Min(2.0, acceleration / 5.0 + 0.5);
+                }
+
+                // 获取时间权重
+                double timeWeight = timeWeights[i];
+
+                // 综合权重
+                double totalWeight = (velocityWeight * VelocityWeightedSmoothingStrength + 
+                                   accelerationWeight * VelocityWeightedSmoothingStrength + 
+                                   timeWeight * TimeWeightedSmoothingStrength) / 3.0;
+
+                // 应用加权平滑
+                double smoothedX = curr.X;
+                double smoothedY = curr.Y;
+
+                if (totalWeight > 1.0)
+                {
+                    // 向相邻点加权平均
+                    double weight = (totalWeight - 1.0) * 0.3; // 限制最大影响
+                    smoothedX = curr.X * (1.0 - weight) + (prev.X + next.X) * 0.5 * weight;
+                    smoothedY = curr.Y * (1.0 - weight) + (prev.Y + next.Y) * 0.5 * weight;
+                }
+
+                var smoothedPoint = new StylusPoint(smoothedX, smoothedY, curr.PressureFactor);
+                smoothedPoints.Add(smoothedPoint);
+            }
+
+            smoothedPoints.Add(points[points.Count - 1]); // 添加最后一个点
+            return smoothedPoints;
+        }
+
+        /// <summary>
+        /// 处理低采样率笔画
+        /// </summary>
+        private Stroke HandleLowSamplingRateStroke(Stroke stroke)
+        {
+            var points = stroke.StylusPoints.ToList();
+            var resultPoints = new List<StylusPoint>();
+
+            // 对于低采样率，使用简单的线性插值而不是贝塞尔曲线
+            for (int i = 0; i < points.Count - 1; i++)
+            {
+                var currentPoint = points[i];
+                var nextPoint = points[i + 1];
+
+                // 添加当前点
+                resultPoints.Add(currentPoint);
+
+                // 计算两点间距离
+                double distance = GetDistance(currentPoint.ToPoint(), nextPoint.ToPoint());
+
+                // 如果距离太远，插入中间点
+                if (distance > 20.0) // 低采样率下使用更大的阈值
+                {
+                    int segments = Math.Max(2, Math.Min(5, (int)(distance / 10.0))); // 限制插值段数
+                    for (int j = 1; j < segments; j++)
+                    {
+                        double ratio = (double)j / segments;
+                        var interpolatedPoint = InterpolatePoint(currentPoint, nextPoint, ratio);
+                        resultPoints.Add(interpolatedPoint);
+                    }
+                }
+            }
+
+            // 添加最后一个点
+            resultPoints.Add(points[points.Count - 1]);
+
+            // 应用轻微的手抖修正
+            var shakeCorrectedPoints = ApplyShakeCorrection(resultPoints);
+
+            // 修正收尾相连问题
+            var fixedStylusPoints = FixEndToEndConnection(new StylusPointCollection(shakeCorrectedPoints));
+
+            // 创建新的笔画
+            var smoothedStroke = new Stroke(fixedStylusPoints)
+            {
+                DrawingAttributes = stroke.DrawingAttributes.Clone()
+            };
+
+            return smoothedStroke;
+        }
+
         /// <summary>
         /// 应用自适应平滑
         /// </summary>
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 5916c263..40878556 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -782,7 +782,7 @@
                                                Foreground="#a1a1aa" />
                                     <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                                                             <TextBlock Foreground="#fafafa" Text="使用WPF默认贝塞尔曲线平滑"
-                                               VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
+                                                   VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
                                         <ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchFitToCurve"
                                                          IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
                                                          Toggled="ToggleSwitchFitToCurve_Toggled" />
@@ -822,7 +822,37 @@
                                                          IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
                                                          Toggled="ToggleSwitchEnableAdaptiveSmoothing_Toggled" />
                                     </ui:SimpleStackPanel>
-                                    <TextBlock Text="# 高级贝塞尔曲线平滑（推荐）：使用自定义算法替代系统默认的FitToCurve，提供更平滑的笔迹效果并解决墨迹闪烁和毛刺问题。启用高级平滑时会自动禁用系统默认平滑。平滑强度控制平滑程度（较低值减少毛刺），张力参数控制曲线的紧绷程度（较低值减少毛刺），自适应平滑会根据笔迹速度自动调整平滑参数。" TextWrapping="Wrap" Foreground="#a1a1aa" />
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
+                                                         Visibility="{Binding ElementName=ToggleSwitchAdvancedBezierSmoothing, Path=IsOn, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <TextBlock Foreground="#fafafa" Text="手抖修正强度" VerticalAlignment="Center"
+                                                   FontSize="14" Margin="0,0,16,0" />
+                                        <Slider Name="ShakeCorrectionStrengthSlider" Width="150" Minimum="0.0" Maximum="1.0" 
+                                                Value="0.6" TickFrequency="0.1" IsSnapToTickEnabled="True"
+                                                ValueChanged="ShakeCorrectionStrengthSlider_ValueChanged" />
+                                        <TextBlock Foreground="#fafafa" Text="{Binding ElementName=ShakeCorrectionStrengthSlider, Path=Value, StringFormat={}{0:F1}}" 
+                                                   VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
+                                    </ui:SimpleStackPanel>
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
+                                                         Visibility="{Binding ElementName=ToggleSwitchAdvancedBezierSmoothing, Path=IsOn, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <TextBlock Foreground="#fafafa" Text="速度加权强度" VerticalAlignment="Center"
+                                                   FontSize="14" Margin="0,0,16,0" />
+                                        <Slider Name="VelocityWeightedSmoothingStrengthSlider" Width="150" Minimum="0.0" Maximum="1.0" 
+                                                Value="0.7" TickFrequency="0.1" IsSnapToTickEnabled="True"
+                                                ValueChanged="VelocityWeightedSmoothingStrengthSlider_ValueChanged" />
+                                        <TextBlock Foreground="#fafafa" Text="{Binding ElementName=VelocityWeightedSmoothingStrengthSlider, Path=Value, StringFormat={}{0:F1}}" 
+                                                   VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
+                                    </ui:SimpleStackPanel>
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
+                                                         Visibility="{Binding ElementName=ToggleSwitchAdvancedBezierSmoothing, Path=IsOn, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <TextBlock Foreground="#fafafa" Text="时间加权强度" VerticalAlignment="Center"
+                                                   FontSize="14" Margin="0,0,16,0" />
+                                        <Slider Name="TimeWeightedSmoothingStrengthSlider" Width="150" Minimum="0.0" Maximum="1.0" 
+                                                Value="0.5" TickFrequency="0.1" IsSnapToTickEnabled="True"
+                                                ValueChanged="TimeWeightedSmoothingStrengthSlider_ValueChanged" />
+                                        <TextBlock Foreground="#fafafa" Text="{Binding ElementName=TimeWeightedSmoothingStrengthSlider, Path=Value, StringFormat={}{0:F1}}" 
+                                                   VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
+                                    </ui:SimpleStackPanel>
+                                    <TextBlock Text="# 高级贝塞尔曲线平滑（推荐）：使用自定义算法替代系统默认的FitToCurve，提供更平滑的笔迹效果并解决墨迹闪烁、毛刺和低采样率收尾相连问题。启用高级平滑时会自动禁用系统默认平滑。手抖修正可自动检测并修正手抖造成的偏差，速度加权平滑根据笔迹速度调整平滑强度，时间加权平滑根据点密度调整平滑参数，自适应平滑会根据笔迹速度自动调整平滑参数。低采样率时自动使用线性插值避免收尾相连。" TextWrapping="Wrap" Foreground="#a1a1aa" />
                                 </ui:SimpleStackPanel>
                             </GroupBox>
                             <!-- 新增：崩溃后操作设置 -->
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index d93965a6..63a3b2c5 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs	
@@ -1329,6 +1329,24 @@ namespace Ink_Canvas {
             SaveSettingsToFile();
         }
 
+        private void ShakeCorrectionStrengthSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) {
+            if (!isLoaded) return;
+            Settings.Canvas.ShakeCorrectionStrength = ShakeCorrectionStrengthSlider.Value;
+            SaveSettingsToFile();
+        }
+
+        private void VelocityWeightedSmoothingStrengthSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) {
+            if (!isLoaded) return;
+            Settings.Canvas.VelocityWeightedSmoothingStrength = VelocityWeightedSmoothingStrengthSlider.Value;
+            SaveSettingsToFile();
+        }
+
+        private void TimeWeightedSmoothingStrengthSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) {
+            if (!isLoaded) return;
+            Settings.Canvas.TimeWeightedSmoothingStrength = TimeWeightedSmoothingStrengthSlider.Value;
+            SaveSettingsToFile();
+        }
+
         private void ToggleSwitchAutoSaveStrokesInPowerPoint_Toggled(object sender, RoutedEventArgs e) {
             if (!isLoaded) return;
             Settings.PowerPointSettings.IsAutoSaveStrokesInPowerPoint = ToggleSwitchAutoSaveStrokesInPowerPoint.IsOn;
@@ -1634,6 +1652,9 @@ namespace Ink_Canvas {
             Settings.Canvas.AdvancedSmoothingStrength = 0.4;
             Settings.Canvas.AdvancedSmoothingTension = 0.3;
             Settings.Canvas.EnableAdaptiveSmoothing = true;
+            Settings.Canvas.ShakeCorrectionStrength = 0.6;
+            Settings.Canvas.VelocityWeightedSmoothingStrength = 0.7;
+            Settings.Canvas.TimeWeightedSmoothingStrength = 0.5;
             Settings.Canvas.EnablePressureTouchMode = false;
             Settings.Canvas.DisablePressure = false;
             Settings.Canvas.AutoStraightenLine = true;
diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
index e1dd2960..81fb018a 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
@@ -540,6 +540,9 @@ namespace Ink_Canvas {
                 AdvancedSmoothingStrengthSlider.Value = Settings.Canvas.AdvancedSmoothingStrength;
                 AdvancedSmoothingTensionSlider.Value = Settings.Canvas.AdvancedSmoothingTension;
                 ToggleSwitchEnableAdaptiveSmoothing.IsOn = Settings.Canvas.EnableAdaptiveSmoothing;
+                ShakeCorrectionStrengthSlider.Value = Settings.Canvas.ShakeCorrectionStrength;
+                VelocityWeightedSmoothingStrengthSlider.Value = Settings.Canvas.VelocityWeightedSmoothingStrength;
+                TimeWeightedSmoothingStrengthSlider.Value = Settings.Canvas.TimeWeightedSmoothingStrength;
                 
                 // 初始化直线自动拉直相关设置
                 ToggleSwitchAutoStraightenLine.IsOn = Settings.Canvas.AutoStraightenLine;
diff --git a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
index 46037236..661bf3e0 100644
--- a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
@@ -1599,7 +1599,10 @@ namespace Ink_Canvas {
                     {
                         SmoothingStrength = Settings.Canvas.AdvancedSmoothingStrength,
                         Tension = Settings.Canvas.AdvancedSmoothingTension,
-                        EnableAdaptiveSmoothing = Settings.Canvas.EnableAdaptiveSmoothing
+                        EnableAdaptiveSmoothing = Settings.Canvas.EnableAdaptiveSmoothing,
+                        ShakeCorrectionStrength = Settings.Canvas.ShakeCorrectionStrength,
+                        VelocityWeightedSmoothingStrength = Settings.Canvas.VelocityWeightedSmoothingStrength,
+                        TimeWeightedSmoothingStrength = Settings.Canvas.TimeWeightedSmoothingStrength
                     };
 
                     // 对临时笔画应用平滑
diff --git a/Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs b/Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs
index 9cc49768..d6909954 100644
--- a/Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs	
@@ -16,6 +16,9 @@ namespace Ink_Canvas {
         private const double LINE_STRAIGHTEN_THRESHOLD = 0.20; // 默认灵敏度阈值，与UI默认值对应
 
         private void inkCanvas_StrokeCollected(object sender, InkCanvasStrokeCollectedEventArgs e) {
+            // 标记是否进行了直线拉直
+            bool wasStraightened = false;
+            
             // 禁用原有的FitToCurve，使用新的高级贝塞尔曲线平滑
             if (Settings.Canvas.FitToCurve == true) drawingAttributes.FitToCurve = false;
 
@@ -118,8 +121,9 @@ namespace Ink_Canvas {
                     }
                 }
                 
-                // Apply line straightening and endpoint snapping if ink-to-shape is enabled
-                if (Settings.InkToShape.IsInkToShapeEnabled) {
+                            // Apply line straightening and endpoint snapping if ink-to-shape is enabled
+            
+            if (Settings.InkToShape.IsInkToShapeEnabled) {
                     // 检查是否启用了直线自动拉直功能
                     if (Settings.Canvas.AutoStraightenLine && IsPotentialStraightLine(e.Stroke)) {
                         // Get start and end points of the stroke
@@ -169,6 +173,8 @@ namespace Ink_Canvas {
                                 newStrokes.Remove(e.Stroke);
                                 newStrokes.Add(straightStroke);
                             }
+                            
+                            wasStraightened = true; // 标记已进行直线拉直
                         }
                     }
                 }
@@ -573,26 +579,33 @@ namespace Ink_Canvas {
             }
             catch { }
 
-            // 应用高级贝塞尔曲线平滑
-            if (Settings.Canvas.UseAdvancedBezierSmoothing)
+            // 应用高级贝塞尔曲线平滑（仅在未进行直线拉直时）
+            if (Settings.Canvas.UseAdvancedBezierSmoothing && !wasStraightened)
             {
                 try
                 {
-                    var advancedSmoothing = new Helpers.AdvancedBezierSmoothing
+                    // 检查原始笔画是否仍然存在于画布中
+                    if (inkCanvas.Strokes.Contains(e.Stroke))
                     {
-                        SmoothingStrength = Settings.Canvas.AdvancedSmoothingStrength,
-                        Tension = Settings.Canvas.AdvancedSmoothingTension,
-                        EnableAdaptiveSmoothing = Settings.Canvas.EnableAdaptiveSmoothing
-                    };
+                        var advancedSmoothing = new Helpers.AdvancedBezierSmoothing
+                        {
+                            SmoothingStrength = Settings.Canvas.AdvancedSmoothingStrength,
+                            Tension = Settings.Canvas.AdvancedSmoothingTension,
+                            EnableAdaptiveSmoothing = Settings.Canvas.EnableAdaptiveSmoothing,
+                            ShakeCorrectionStrength = Settings.Canvas.ShakeCorrectionStrength,
+                            VelocityWeightedSmoothingStrength = Settings.Canvas.VelocityWeightedSmoothingStrength,
+                            TimeWeightedSmoothingStrength = Settings.Canvas.TimeWeightedSmoothingStrength
+                        };
 
-                    var smoothedStroke = advancedSmoothing.SmoothStroke(e.Stroke);
-                    
-                    // 替换原始笔画
-                    SetNewBackupOfStroke();
-                    _currentCommitType = CommitReason.ShapeRecognition;
-                    inkCanvas.Strokes.Remove(e.Stroke);
-                    inkCanvas.Strokes.Add(smoothedStroke);
-                    _currentCommitType = CommitReason.UserInput;
+                        var smoothedStroke = advancedSmoothing.SmoothStroke(e.Stroke);
+                        
+                        // 替换原始笔画
+                        SetNewBackupOfStroke();
+                        _currentCommitType = CommitReason.ShapeRecognition;
+                        inkCanvas.Strokes.Remove(e.Stroke);
+                        inkCanvas.Strokes.Add(smoothedStroke);
+                        _currentCommitType = CommitReason.UserInput;
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -600,7 +613,7 @@ namespace Ink_Canvas {
                     System.Diagnostics.Debug.WriteLine($"高级贝塞尔曲线平滑失败: {ex.Message}");
                 }
             }
-            else if (Settings.Canvas.FitToCurve == true) 
+            else if (Settings.Canvas.FitToCurve == true && !wasStraightened) 
             {
                 drawingAttributes.FitToCurve = true;
             }
diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs
index 04bf5e92..47e98dfe 100644
--- a/Ink Canvas/Resources/Settings.cs	
+++ b/Ink Canvas/Resources/Settings.cs	
@@ -56,6 +56,12 @@ namespace Ink_Canvas
         public double AdvancedSmoothingTension { get; set; } = 0.3; // 高级平滑张力 (0.0 - 1.0)，降低以减少毛刺
         [JsonProperty("enableAdaptiveSmoothing")]
         public bool EnableAdaptiveSmoothing { get; set; } = true; // 是否启用自适应平滑
+        [JsonProperty("shakeCorrectionStrength")]
+        public double ShakeCorrectionStrength { get; set; } = 0.6; // 手抖修正强度 (0.0 - 1.0)
+        [JsonProperty("velocityWeightedSmoothingStrength")]
+        public double VelocityWeightedSmoothingStrength { get; set; } = 0.7; // 速度加权平滑强度 (0.0 - 1.0)
+        [JsonProperty("timeWeightedSmoothingStrength")]
+        public double TimeWeightedSmoothingStrength { get; set; } = 0.5; // 时间加权平滑强度 (0.0 - 1.0)
         [JsonProperty("clearCanvasAndClearTimeMachine")]
         public bool ClearCanvasAndClearTimeMachine { get; set; } = false;
         [JsonProperty("enablePressureTouchMode")]

From c73a5c3a7e9786d60410b552016d237840cb469a Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 16:14:26 +0800
Subject: [PATCH 19/32] =?UTF-8?q?fix:=E7=BF=BB=E9=A1=B5=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E5=B4=A9=E6=BA=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 495 +++++++++++++++++++++--------
 1 file changed, 370 insertions(+), 125 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index 52cb1f4a..0c7c852d 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -65,7 +65,15 @@ namespace Ink_Canvas {
                     }
                     catch {
                         // 在阅读模式下出现异常时，通过下面的方式来获得当前选中的幻灯片对象
-                        slide = pptApplication.SlideShowWindows[1].View.Slide;
+                        try {
+                            if (pptApplication.SlideShowWindows != null && pptApplication.SlideShowWindows.Count >= 1)
+                            {
+                                slide = pptApplication.SlideShowWindows[1].View.Slide;
+                            }
+                        }
+                        catch (Exception ex) {
+                            LogHelper.WriteLogToFile($"获取当前幻灯片失败: {ex.ToString()}", LogHelper.LogType.Error);
+                        }
                     }
                 }
 
@@ -73,7 +81,8 @@ namespace Ink_Canvas {
                 //BtnCheckPPT.Visibility = Visibility.Collapsed;
                 StackPanelPPTControls.Visibility = Visibility.Visible;
             }
-            catch {
+            catch (Exception ex) {
+                LogHelper.WriteLogToFile($"检查PPT应用程序失败: {ex.ToString()}", LogHelper.LogType.Error);
                 //BtnCheckPPT.Visibility = Visibility.Visible;
                 StackPanelPPTControls.Visibility = Visibility.Collapsed;
                 LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
@@ -130,7 +139,15 @@ namespace Ink_Canvas {
                     }
                     catch {
                         // 在阅读模式下出现异常时，通过下面的方式来获得当前选中的幻灯片对象
-                        slide = pptApplication.SlideShowWindows[1].View.Slide;
+                        try {
+                            if (pptApplication.SlideShowWindows != null && pptApplication.SlideShowWindows.Count >= 1)
+                            {
+                                slide = pptApplication.SlideShowWindows[1].View.Slide;
+                            }
+                        }
+                        catch (Exception ex) {
+                            LogHelper.WriteLogToFile($"获取当前幻灯片失败: {ex.ToString()}", LogHelper.LogType.Error);
+                        }
                     }
 
                     pptApplication.PresentationOpen += PptApplication_PresentationOpen;
@@ -147,10 +164,18 @@ namespace Ink_Canvas {
                 PptApplication_PresentationOpen(null);
 
                 //如果检测到已经开始放映，则立即进入画板模式
-                if (pptApplication.SlideShowWindows.Count >= 1)
-                    PptApplication_SlideShowBegin(pptApplication.SlideShowWindows[1]);
+                if (pptApplication.SlideShowWindows != null && pptApplication.SlideShowWindows.Count >= 1)
+                {
+                    try {
+                        PptApplication_SlideShowBegin(pptApplication.SlideShowWindows[1]);
+                    }
+                    catch (Exception ex) {
+                        LogHelper.WriteLogToFile($"启动幻灯片放映失败: {ex.ToString()}", LogHelper.LogType.Error);
+                    }
+                }
             }
-            catch {
+            catch (Exception ex) {
+                LogHelper.WriteLogToFile($"检查PPT状态失败: {ex.ToString()}", LogHelper.LogType.Error);
                 //StackPanelPPTControls.Visibility = Visibility.Collapsed;
                 Application.Current.Dispatcher.Invoke(() => { BtnPPTSlideShow.Visibility = Visibility.Collapsed; });
                 timerCheckPPT.Start();
@@ -161,82 +186,143 @@ namespace Ink_Canvas {
             // 跳转到上次播放页
             if (Settings.PowerPointSettings.IsNotifyPreviousPage)
                 Application.Current.Dispatcher.BeginInvoke(new Action(() => {
-                    var folderPath = Settings.Automation.AutoSavedStrokesLocation +
-                                     @"\Auto Saved - Presentations\" + presentation.Name + "_" +
-                                     presentation.Slides.Count;
                     try {
-                        if (!File.Exists(folderPath + "/Position")) return;
-                        if (!int.TryParse(File.ReadAllText(folderPath + "/Position"), out var page)) return;
-                        if (page <= 0) return;
-                        new YesOrNoNotificationWindow($"上次播放到了第 {page} 页, 是否立即跳转", () => {
-                            if (pptApplication.SlideShowWindows.Count >= 1)
-                                // 如果已经播放了的话, 跳转
-                                presentation.SlideShowWindow.View.GotoSlide(page);
-                            else
-                                presentation.Windows[1].View.GotoSlide(page);
-                        }).ShowDialog();
+                        // 添加安全检查
+                        if (presentation == null)
+                        {
+                            LogHelper.WriteLogToFile("演示文稿为空，无法跳转到上次播放页", LogHelper.LogType.Warning);
+                            return;
+                        }
+
+                        var folderPath = Settings.Automation.AutoSavedStrokesLocation +
+                                         @"\Auto Saved - Presentations\" + presentation.Name + "_" +
+                                         presentation.Slides.Count;
+                        try {
+                            if (!File.Exists(folderPath + "/Position")) return;
+                            if (!int.TryParse(File.ReadAllText(folderPath + "/Position"), out var page)) return;
+                            if (page <= 0) return;
+                            new YesOrNoNotificationWindow($"上次播放到了第 {page} 页, 是否立即跳转", () => {
+                                try {
+                                    if (pptApplication != null && pptApplication.SlideShowWindows != null && pptApplication.SlideShowWindows.Count >= 1)
+                                        // 如果已经播放了的话, 跳转
+                                        presentation.SlideShowWindow.View.GotoSlide(page);
+                                    else if (presentation.Windows != null && presentation.Windows.Count >= 1)
+                                        presentation.Windows[1].View.GotoSlide(page);
+                                }
+                                catch (Exception ex) {
+                                    LogHelper.WriteLogToFile($"跳转到指定页面失败: {ex.ToString()}", LogHelper.LogType.Error);
+                                }
+                            }).ShowDialog();
+                        }
+                        catch (Exception ex) {
+                            LogHelper.WriteLogToFile($"读取上次播放位置失败: {ex.ToString()}", LogHelper.LogType.Error);
+                        }
                     }
                     catch (Exception ex) {
-                        LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+                        LogHelper.WriteLogToFile($"处理上次播放页跳转失败: {ex.ToString()}", LogHelper.LogType.Error);
                     }
                 }), DispatcherPriority.Normal);
 
 
             //检查是否有隐藏幻灯片
             if (Settings.PowerPointSettings.IsNotifyHiddenPage) {
-                var isHaveHiddenSlide = false;
-                foreach (Slide slide in slides)
-                    if (slide.SlideShowTransition.Hidden == Microsoft.Office.Core.MsoTriState.msoTrue) {
-                        isHaveHiddenSlide = true;
-                        break;
+                try {
+                    var isHaveHiddenSlide = false;
+                    if (slides != null)
+                    {
+                        foreach (Slide slide in slides)
+                            if (slide.SlideShowTransition.Hidden == Microsoft.Office.Core.MsoTriState.msoTrue) {
+                                isHaveHiddenSlide = true;
+                                break;
+                            }
                     }
 
-                Application.Current.Dispatcher.BeginInvoke(new Action(() => {
-                    if (isHaveHiddenSlide && !IsShowingRestoreHiddenSlidesWindow) {
-                        IsShowingRestoreHiddenSlidesWindow = true;
-                        new YesOrNoNotificationWindow("检测到此演示文档中包含隐藏的幻灯片，是否取消隐藏？",
-                            () => {
-                                foreach (Slide slide in slides)
-                                    if (slide.SlideShowTransition.Hidden ==
-                                        Microsoft.Office.Core.MsoTriState.msoTrue)
-                                        slide.SlideShowTransition.Hidden =
-                                            Microsoft.Office.Core.MsoTriState.msoFalse;
-                                IsShowingRestoreHiddenSlidesWindow = false;
-                            }, () => { IsShowingRestoreHiddenSlidesWindow = false; },
-                            () => { IsShowingRestoreHiddenSlidesWindow = false; }).ShowDialog();
-                    }
+                    Application.Current.Dispatcher.BeginInvoke(new Action(() => {
+                        if (isHaveHiddenSlide && !IsShowingRestoreHiddenSlidesWindow) {
+                            IsShowingRestoreHiddenSlidesWindow = true;
+                            new YesOrNoNotificationWindow("检测到此演示文档中包含隐藏的幻灯片，是否取消隐藏？",
+                                () => {
+                                    try {
+                                        if (slides != null)
+                                        {
+                                            foreach (Slide slide in slides)
+                                                if (slide.SlideShowTransition.Hidden ==
+                                                    Microsoft.Office.Core.MsoTriState.msoTrue)
+                                                    slide.SlideShowTransition.Hidden =
+                                                        Microsoft.Office.Core.MsoTriState.msoFalse;
+                                        }
+                                    }
+                                    catch (Exception ex) {
+                                        LogHelper.WriteLogToFile($"取消隐藏幻灯片失败: {ex.ToString()}", LogHelper.LogType.Error);
+                                    }
+                                    finally {
+                                        IsShowingRestoreHiddenSlidesWindow = false;
+                                    }
+                                }, () => { IsShowingRestoreHiddenSlidesWindow = false; },
+                                () => { IsShowingRestoreHiddenSlidesWindow = false; }).ShowDialog();
+                        }
 
-                    BtnPPTSlideShow.Visibility = Visibility.Visible;
-                }), DispatcherPriority.Normal);
+                        BtnPPTSlideShow.Visibility = Visibility.Visible;
+                    }), DispatcherPriority.Normal);
+                }
+                catch (Exception ex) {
+                    LogHelper.WriteLogToFile($"检查隐藏幻灯片失败: {ex.ToString()}", LogHelper.LogType.Error);
+                }
             }
 
             //检测是否有自动播放
             if (Settings.PowerPointSettings.IsNotifyAutoPlayPresentation
                 // && presentation.SlideShowSettings.AdvanceMode == PpSlideShowAdvanceMode.ppSlideShowUseSlideTimings
                 && BtnPPTSlideShowEnd.Visibility != Visibility.Visible) {
-                bool hasSlideTimings = false;
-                foreach (Slide slide in presentation.Slides) {
-                    if (slide.SlideShowTransition.AdvanceOnTime == MsoTriState.msoTrue &&
-                        slide.SlideShowTransition.AdvanceTime > 0) {
-                        hasSlideTimings = true;
-                        break;
+                try {
+                    bool hasSlideTimings = false;
+                    if (presentation != null && presentation.Slides != null)
+                    {
+                        foreach (Slide slide in presentation.Slides) {
+                            if (slide.SlideShowTransition.AdvanceOnTime == MsoTriState.msoTrue &&
+                                slide.SlideShowTransition.AdvanceTime > 0) {
+                                hasSlideTimings = true;
+                                break;
+                            }
+                        }
+                    }
+
+                    if (hasSlideTimings) {
+                        Application.Current.Dispatcher.BeginInvoke((Action)(() => {
+                            if (hasSlideTimings && !IsShowingAutoplaySlidesWindow) {
+                                IsShowingAutoplaySlidesWindow = true;
+                                new YesOrNoNotificationWindow("检测到此演示文档中自动播放或排练计时已经启用，可能导致幻灯片自动翻页，是否取消？",
+                                    () => {
+                                        try {
+                                            if (presentation != null)
+                                            {
+                                                presentation.SlideShowSettings.AdvanceMode =
+                                                    PpSlideShowAdvanceMode.ppSlideShowManualAdvance;
+                                            }
+                                        }
+                                        catch (Exception ex) {
+                                            LogHelper.WriteLogToFile($"设置手动播放模式失败: {ex.ToString()}", LogHelper.LogType.Error);
+                                        }
+                                        finally {
+                                            IsShowingAutoplaySlidesWindow = false;
+                                        }
+                                    }, () => { IsShowingAutoplaySlidesWindow = false; },
+                                    () => { IsShowingAutoplaySlidesWindow = false; }).ShowDialog();
+                            }
+                        }));
+                        try {
+                            if (presentation != null)
+                            {
+                                presentation.SlideShowSettings.AdvanceMode = PpSlideShowAdvanceMode.ppSlideShowManualAdvance;
+                            }
+                        }
+                        catch (Exception ex) {
+                            LogHelper.WriteLogToFile($"设置演示文稿播放模式失败: {ex.ToString()}", LogHelper.LogType.Error);
+                        }
                     }
                 }
-
-                if (hasSlideTimings) {
-                    Application.Current.Dispatcher.BeginInvoke((Action)(() => {
-                        if (hasSlideTimings && !IsShowingAutoplaySlidesWindow) {
-                            IsShowingAutoplaySlidesWindow = true;
-                            new YesOrNoNotificationWindow("检测到此演示文档中自动播放或排练计时已经启用，可能导致幻灯片自动翻页，是否取消？",
-                                () => {
-                                    presentation.SlideShowSettings.AdvanceMode =
-                                        PpSlideShowAdvanceMode.ppSlideShowManualAdvance;
-                                    IsShowingAutoplaySlidesWindow = false;
-                                }, () => { IsShowingAutoplaySlidesWindow = false; },
-                                () => { IsShowingAutoplaySlidesWindow = false; }).ShowDialog();
-                        }
-                    }));
-                    presentation.SlideShowSettings.AdvanceMode = PpSlideShowAdvanceMode.ppSlideShowManualAdvance;
+                catch (Exception ex) {
+                    LogHelper.WriteLogToFile($"检查自动播放设置失败: {ex.ToString()}", LogHelper.LogType.Error);
                 }
             }
         }
@@ -401,7 +487,7 @@ namespace Ink_Canvas {
                 // 检查是否应该显示PPT按钮
                 bool shouldShowButtons = Settings.PowerPointSettings.ShowPPTButton && 
                     (BtnPPTSlideShowEnd.Visibility == Visibility.Visible || 
-                    (pptApplication != null && pptApplication.SlideShowWindows.Count > 0));
+                    (pptApplication != null && pptApplication.SlideShowWindows != null && pptApplication.SlideShowWindows.Count > 0));
 
                 if (!shouldShowButtons)
                 {
@@ -429,7 +515,7 @@ namespace Ink_Canvas {
                 else RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
             }
             catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+                LogHelper.WriteLogToFile($"更新PPT按钮显示状态失败: {ex.ToString()}", LogHelper.LogType.Error);
             }
         }
 
@@ -671,6 +757,13 @@ namespace Ink_Canvas {
 
         private void PptApplication_SlideShowNextSlide(SlideShowWindow Wn) {
             try {
+                // 添加安全检查
+                if (Wn == null || Wn.View == null)
+                {
+                    LogHelper.WriteLogToFile("幻灯片放映窗口或视图为空", LogHelper.LogType.Warning);
+                    return;
+                }
+
                 LogHelper.WriteLogToFile($"PowerPoint Next Slide (Slide {Wn.View.CurrentShowPosition})",
                     LogHelper.LogType.Event);
                 if (Wn.View.CurrentShowPosition == previousSlideID) return;
@@ -700,14 +793,14 @@ namespace Ink_Canvas {
                         PPTBtnPageTotal.Text = $"/ {Wn.Presentation.Slides.Count}";
                     }
                     catch (Exception ex) {
-                        LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+                        LogHelper.WriteLogToFile($"处理幻灯片切换时出错: {ex.ToString()}", LogHelper.LogType.Error);
                     }
                 });
                 
                 previousSlideID = Wn.View.CurrentShowPosition;
             }
             catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+                LogHelper.WriteLogToFile($"幻灯片切换事件处理失败: {ex.ToString()}", LogHelper.LogType.Error);
             }
         }
 
@@ -724,30 +817,70 @@ namespace Ink_Canvas {
 
             _isPptClickingBtnTurned = true;
 
-            if (inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber &&
-                Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint)
-                SaveScreenShot(true,
-                    pptApplication.SlideShowWindows[1].Presentation.Name + "/" +
-                    pptApplication.SlideShowWindows[1].View.CurrentShowPosition);
+            // 添加安全检查
+            if (pptApplication == null)
+            {
+                LogHelper.WriteLogToFile("PPT应用程序为空，无法执行上一页操作", LogHelper.LogType.Warning);
+                return;
+            }
+
+            try
+            {
+                // 检查SlideShowWindows是否存在且有效
+                if (pptApplication.SlideShowWindows == null || pptApplication.SlideShowWindows.Count == 0)
+                {
+                    LogHelper.WriteLogToFile("PPT放映窗口不存在，无法执行上一页操作", LogHelper.LogType.Warning);
+                    return;
+                }
+
+                // 安全访问当前幻灯片信息
+                if (pptApplication.SlideShowWindows.Count >= 1)
+                {
+                    var slideShowWindow = pptApplication.SlideShowWindows[1];
+                    if (slideShowWindow != null && slideShowWindow.View != null)
+                    {
+                        if (inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber &&
+                            Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint)
+                            SaveScreenShot(true,
+                                slideShowWindow.Presentation.Name + "/" +
+                                slideShowWindow.View.CurrentShowPosition);
+                    }
+                }
 
-            try {
                 new Thread(new ThreadStart(() => {
                     try {
-                        pptApplication.SlideShowWindows[1].Activate();
+                        // 安全访问SlideShowWindows[1]
+                        if (pptApplication.SlideShowWindows.Count >= 1)
+                        {
+                            var slideShowWindow = pptApplication.SlideShowWindows[1];
+                            if (slideShowWindow != null)
+                            {
+                                slideShowWindow.Activate();
+                            }
+                        }
                     }
-                    catch {
-                        // ignored
+                    catch (Exception ex) {
+                        LogHelper.WriteLogToFile($"激活PPT放映窗口失败: {ex.ToString()}", LogHelper.LogType.Error);
                     }
 
                     try {
-                        pptApplication.SlideShowWindows[1].View.Previous();
+                        // 安全访问SlideShowWindows[1]
+                        if (pptApplication.SlideShowWindows.Count >= 1)
+                        {
+                            var slideShowWindow = pptApplication.SlideShowWindows[1];
+                            if (slideShowWindow != null && slideShowWindow.View != null)
+                            {
+                                slideShowWindow.View.Previous();
+                            }
+                        }
                     }
-                    catch {
-                        // ignored
+                    catch (Exception ex) {
+                        LogHelper.WriteLogToFile($"PPT上一页操作失败: {ex.ToString()}", LogHelper.LogType.Error);
                     } // Without this catch{}, app will crash when click the pre-page button in the fir page in some special env.
                 })).Start();
             }
-            catch {
+            catch (Exception ex) {
+                LogHelper.WriteLogToFile($"PPT上一页操作异常: {ex.ToString()}", LogHelper.LogType.Error);
                 StackPanelPPTControls.Visibility = Visibility.Collapsed;
                 LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
                 RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
@@ -766,29 +899,71 @@ namespace Ink_Canvas {
             }
 
             _isPptClickingBtnTurned = true;
-            if (inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber &&
-                Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint)
-                SaveScreenShot(true,
-                    pptApplication.SlideShowWindows[1].Presentation.Name + "/" +
-                    pptApplication.SlideShowWindows[1].View.CurrentShowPosition);
-            try {
+            
+            // 添加安全检查
+            if (pptApplication == null)
+            {
+                LogHelper.WriteLogToFile("PPT应用程序为空，无法执行下一页操作", LogHelper.LogType.Warning);
+                return;
+            }
+
+            try
+            {
+                // 检查SlideShowWindows是否存在且有效
+                if (pptApplication.SlideShowWindows == null || pptApplication.SlideShowWindows.Count == 0)
+                {
+                    LogHelper.WriteLogToFile("PPT放映窗口不存在，无法执行下一页操作", LogHelper.LogType.Warning);
+                    return;
+                }
+
+                // 安全访问当前幻灯片信息
+                if (pptApplication.SlideShowWindows.Count >= 1)
+                {
+                    var slideShowWindow = pptApplication.SlideShowWindows[1];
+                    if (slideShowWindow != null && slideShowWindow.View != null)
+                    {
+                        if (inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber &&
+                            Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint)
+                            SaveScreenShot(true,
+                                slideShowWindow.Presentation.Name + "/" +
+                                slideShowWindow.View.CurrentShowPosition);
+                    }
+                }
+                
                 new Thread(new ThreadStart(() => {
                     try {
-                        pptApplication.SlideShowWindows[1].Activate();
+                        // 安全访问SlideShowWindows[1]
+                        if (pptApplication.SlideShowWindows.Count >= 1)
+                        {
+                            var slideShowWindow = pptApplication.SlideShowWindows[1];
+                            if (slideShowWindow != null)
+                            {
+                                slideShowWindow.Activate();
+                            }
+                        }
                     }
-                    catch {
-                        // ignored
+                    catch (Exception ex) {
+                        LogHelper.WriteLogToFile($"激活PPT放映窗口失败: {ex.ToString()}", LogHelper.LogType.Error);
                     }
 
                     try {
-                        pptApplication.SlideShowWindows[1].View.Next();
+                        // 安全访问SlideShowWindows[1]
+                        if (pptApplication.SlideShowWindows.Count >= 1)
+                        {
+                            var slideShowWindow = pptApplication.SlideShowWindows[1];
+                            if (slideShowWindow != null && slideShowWindow.View != null)
+                            {
+                                slideShowWindow.View.Next();
+                            }
+                        }
                     }
-                    catch {
-                        // ignored
+                    catch (Exception ex) {
+                        LogHelper.WriteLogToFile($"PPT下一页操作失败: {ex.ToString()}", LogHelper.LogType.Error);
                     }
                 })).Start();
             }
-            catch {
+            catch (Exception ex) {
+                LogHelper.WriteLogToFile($"PPT下一页操作异常: {ex.ToString()}", LogHelper.LogType.Error);
                 StackPanelPPTControls.Visibility = Visibility.Collapsed;
                 LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
                 RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
@@ -862,18 +1037,50 @@ namespace Ink_Canvas {
 
             if (!Settings.PowerPointSettings.EnablePPTButtonPageClickable) return;
 
-            GridTransparencyFakeBackground.Opacity = 1;
-            GridTransparencyFakeBackground.Background = new SolidColorBrush(StringToColor("#01FFFFFF"));
-            CursorIcon_Click(null, null);
-            try {
-                pptApplication.SlideShowWindows[1].SlideNavigation.Visible = true;
+            // 添加安全检查
+            if (pptApplication == null)
+            {
+                LogHelper.WriteLogToFile("PPT应用程序为空，无法执行翻页操作", LogHelper.LogType.Warning);
+                return;
             }
-            catch { }
 
-            // 控制居中
-            if (!isFloatingBarFolded) {
-                await Task.Delay(100);
-                ViewboxFloatingBarMarginAnimation(60);
+            try
+            {
+                // 检查SlideShowWindows是否存在且有效
+                if (pptApplication.SlideShowWindows == null || pptApplication.SlideShowWindows.Count == 0)
+                {
+                    LogHelper.WriteLogToFile("PPT放映窗口不存在，无法执行翻页操作", LogHelper.LogType.Warning);
+                    return;
+                }
+
+                GridTransparencyFakeBackground.Opacity = 1;
+                GridTransparencyFakeBackground.Background = new SolidColorBrush(StringToColor("#01FFFFFF"));
+                CursorIcon_Click(null, null);
+                
+                try {
+                    // 安全访问SlideShowWindows[1]
+                    if (pptApplication.SlideShowWindows.Count >= 1)
+                    {
+                        var slideShowWindow = pptApplication.SlideShowWindows[1];
+                        if (slideShowWindow != null)
+                        {
+                            slideShowWindow.SlideNavigation.Visible = true;
+                        }
+                    }
+                }
+                catch (Exception ex) {
+                    LogHelper.WriteLogToFile($"设置PPT导航可见性失败: {ex.ToString()}", LogHelper.LogType.Error);
+                }
+
+                // 控制居中
+                if (!isFloatingBarFolded) {
+                    await Task.Delay(100);
+                    ViewboxFloatingBarMarginAnimation(60);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"PPT翻页控件操作失败: {ex.ToString()}", LogHelper.LogType.Error);
             }
         }
 
@@ -887,30 +1094,68 @@ namespace Ink_Canvas {
         }
 
         private async void BtnPPTSlideShowEnd_Click(object sender, RoutedEventArgs e) {
-            Application.Current.Dispatcher.Invoke(() => {
-                try {
-                    var ms = new MemoryStream();
-                    inkCanvas.Strokes.Save(ms);
-                    ms.Position = 0;
-                    memoryStreams[pptApplication.SlideShowWindows[1].View.CurrentShowPosition] = ms;
-                    timeMachine.ClearStrokeHistory();
-                }
-                catch {
-                    // ignored
-                }
-            });
-            new Thread(new ThreadStart(() => {
-                try {
-                    pptApplication.SlideShowWindows[1].View.Exit();
-                }
-                catch {
-                    // ignored
-                }
-            })).Start();
+            // 添加安全检查
+            if (pptApplication == null)
+            {
+                LogHelper.WriteLogToFile("PPT应用程序为空，无法结束放映", LogHelper.LogType.Warning);
+                return;
+            }
 
-            HideSubPanels("cursor");
-            await Task.Delay(150);
-            ViewboxFloatingBarMarginAnimation(100, true);
+            try
+            {
+                // 检查SlideShowWindows是否存在且有效
+                if (pptApplication.SlideShowWindows == null || pptApplication.SlideShowWindows.Count == 0)
+                {
+                    LogHelper.WriteLogToFile("PPT放映窗口不存在，无法结束放映", LogHelper.LogType.Warning);
+                    return;
+                }
+
+                Application.Current.Dispatcher.Invoke(() => {
+                    try {
+                        // 安全访问SlideShowWindows[1]
+                        if (pptApplication.SlideShowWindows.Count >= 1)
+                        {
+                            var slideShowWindow = pptApplication.SlideShowWindows[1];
+                            if (slideShowWindow != null && slideShowWindow.View != null)
+                            {
+                                var ms = new MemoryStream();
+                                inkCanvas.Strokes.Save(ms);
+                                ms.Position = 0;
+                                memoryStreams[slideShowWindow.View.CurrentShowPosition] = ms;
+                                timeMachine.ClearStrokeHistory();
+                            }
+                        }
+                    }
+                    catch (Exception ex) {
+                        LogHelper.WriteLogToFile($"保存当前页面墨迹失败: {ex.ToString()}", LogHelper.LogType.Error);
+                    }
+                });
+                
+                new Thread(new ThreadStart(() => {
+                    try {
+                        // 安全访问SlideShowWindows[1]
+                        if (pptApplication.SlideShowWindows.Count >= 1)
+                        {
+                            var slideShowWindow = pptApplication.SlideShowWindows[1];
+                            if (slideShowWindow != null && slideShowWindow.View != null)
+                            {
+                                slideShowWindow.View.Exit();
+                            }
+                        }
+                    }
+                    catch (Exception ex) {
+                        LogHelper.WriteLogToFile($"退出PPT放映失败: {ex.ToString()}", LogHelper.LogType.Error);
+                    }
+                })).Start();
+
+                HideSubPanels("cursor");
+                await Task.Delay(150);
+                ViewboxFloatingBarMarginAnimation(100, true);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"结束PPT放映操作异常: {ex.ToString()}", LogHelper.LogType.Error);
+            }
         }
 
         private void GridPPTControlPrevious_MouseDown(object sender, MouseButtonEventArgs e)

From 9ce9631135dff1e72860117ecff6855471c88b35 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 16:16:17 +0800
Subject: [PATCH 20/32] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/AssemblyInfo.cs            | 4 ++--
 Ink Canvas/Properties/AssemblyInfo.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Ink Canvas/AssemblyInfo.cs b/Ink Canvas/AssemblyInfo.cs
index db4629d0..8b9e8ae7 100644
--- a/Ink Canvas/AssemblyInfo.cs	
+++ b/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.1.4")]
-[assembly: AssemblyFileVersion("1.7.1.4")]
+[assembly: AssemblyVersion("1.7.1.5")]
+[assembly: AssemblyFileVersion("1.7.1.5")]
diff --git a/Ink Canvas/Properties/AssemblyInfo.cs b/Ink Canvas/Properties/AssemblyInfo.cs
index 808a6df7..615034c4 100644
--- a/Ink Canvas/Properties/AssemblyInfo.cs	
+++ b/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.1.4")]
-[assembly: AssemblyFileVersion("1.7.1.4")]
+[assembly: AssemblyVersion("1.7.1.5")]
+[assembly: AssemblyFileVersion("1.7.1.5")]

From 0f3b6c4cecdb2e4dbdf2bb0b35e38fa23de98a2f Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 16:48:16 +0800
Subject: [PATCH 21/32] =?UTF-8?q?improve:=E5=A2=A8=E8=BF=B9=E5=B9=B3?=
 =?UTF-8?q?=E6=BB=91=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/Helpers/AdvancedBezierSmoothing.cs | 221 ++++++++++++------
 Ink Canvas/MainWindow.xaml                    |  20 +-
 Ink Canvas/MainWindow_cs/MW_Settings.cs       |   6 +
 Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs |   1 +
 Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs   |   4 +-
 .../MW_SimulatePressure&InkToShape.cs         |   4 +-
 Ink Canvas/Resources/Settings.cs              |  14 +-
 7 files changed, 183 insertions(+), 87 deletions(-)

diff --git a/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs b/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs
index 35ea4088..8a476ec9 100644
--- a/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs	
+++ b/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs	
@@ -10,20 +10,24 @@ using Point = System.Windows.Point;
 namespace Ink_Canvas.Helpers
 {
     /// <summary>
-    /// 高级贝塞尔曲线平滑算法
+    /// 高级贝塞尔曲线平滑算法 - 优化版本
     /// 用于解决墨迹闪烁问题，提供更平滑的笔迹效果
+    /// 优化特性：
+    /// 1. 更平滑的墨迹：改进的贝塞尔曲线算法
+    /// 2. 更平滑的拐点：优化的控制点计算
+    /// 3. 1像素级别插点：精确到像素级别的曲线生成
     /// </summary>
     public class AdvancedBezierSmoothing
     {
         /// <summary>
-        /// 平滑强度 (0.0 - 1.0)
+        /// 平滑强度 (0.0 - 1.0) - 优化为更平滑的默认值
         /// </summary>
-        public double SmoothingStrength { get; set; } = 0.6;
+        public double SmoothingStrength { get; set; } = 0.7;
 
         /// <summary>
-        /// 张力参数 (0.0 - 1.0)
+        /// 张力参数 (0.0 - 1.0) - 优化为更平滑的默认值
         /// </summary>
-        public double Tension { get; set; } = 0.5;
+        public double Tension { get; set; } = 0.4;
 
         /// <summary>
         /// 是否启用自适应平滑
@@ -31,29 +35,39 @@ namespace Ink_Canvas.Helpers
         public bool EnableAdaptiveSmoothing { get; set; } = true;
 
         /// <summary>
-        /// 最小点间距阈值
+        /// 最小点间距阈值 - 优化为1像素级别
         /// </summary>
-        public double MinPointDistance { get; set; } = 3.0; // 增加最小间距，减少毛刺
+        public double MinPointDistance { get; set; } = 1.0; // 降低到1像素级别
 
         /// <summary>
-        /// 最大点间距阈值
+        /// 最大点间距阈值 - 优化为更精细的控制
         /// </summary>
-        public double MaxPointDistance { get; set; } = 30.0; // 减少最大间距，提高平滑度
+        public double MaxPointDistance { get; set; } = 15.0; // 进一步减少最大间距，提高平滑度
 
         /// <summary>
-        /// 手抖修正强度 (0.0 - 1.0)
+        /// 手抖修正强度 (0.0 - 1.0) - 优化为更平滑的默认值
         /// </summary>
-        public double ShakeCorrectionStrength { get; set; } = 0.6;
+        public double ShakeCorrectionStrength { get; set; } = 0.8;
 
         /// <summary>
-        /// 速度加权平滑强度 (0.0 - 1.0)
+        /// 速度加权平滑强度 (0.0 - 1.0) - 优化为更平滑的默认值
         /// </summary>
-        public double VelocityWeightedSmoothingStrength { get; set; } = 0.7;
+        public double VelocityWeightedSmoothingStrength { get; set; } = 0.8;
 
         /// <summary>
-        /// 时间加权平滑强度 (0.0 - 1.0)
+        /// 时间加权平滑强度 (0.0 - 1.0) - 优化为更平滑的默认值
         /// </summary>
-        public double TimeWeightedSmoothingStrength { get; set; } = 0.5;
+        public double TimeWeightedSmoothingStrength { get; set; } = 0.6;
+
+        /// <summary>
+        /// 拐点平滑强度 (0.0 - 1.0) - 新增参数，优化为更平滑的默认值
+        /// </summary>
+        public double CornerSmoothingStrength { get; set; } = 0.8;
+
+        /// <summary>
+        /// 1像素级别插点精度 - 新增参数
+        /// </summary>
+        public double PixelLevelPrecision { get; set; } = 1.0;
 
         /// <summary>
         /// 对笔画进行高级贝塞尔曲线平滑处理
@@ -83,19 +97,22 @@ namespace Ink_Canvas.Helpers
             // 第二步：基于速度和时间的加权平滑
             var velocityTimeWeightedPoints = ApplyVelocityTimeWeightedSmoothing(shakeCorrectedPoints);
 
-            // 第三步：点过滤和重采样
-            var filteredPoints = FilterAndResamplePoints(velocityTimeWeightedPoints);
+            // 第三步：拐点检测和平滑
+            var cornerSmoothedPoints = ApplyCornerSmoothing(velocityTimeWeightedPoints);
 
-            // 第四步：计算控制点
-            var controlPoints = CalculateControlPoints(filteredPoints);
+            // 第四步：点过滤和重采样（1像素级别）
+            var filteredPoints = FilterAndResamplePoints(cornerSmoothedPoints);
 
-            // 第五步：生成平滑曲线点
-            var curvePoints = GenerateCurvePoints(filteredPoints, controlPoints);
+            // 第五步：计算优化的控制点
+            var controlPoints = CalculateOptimizedControlPoints(filteredPoints);
 
-            // 第六步：修正收尾相连问题
+            // 第六步：生成1像素级别的平滑曲线点
+            var curvePoints = GeneratePixelLevelCurvePoints(filteredPoints, controlPoints);
+
+            // 第七步：修正收尾相连问题
             var fixedStylusPoints = FixEndToEndConnection(new StylusPointCollection(curvePoints));
             
-            // 第七步：创建新的笔画
+            // 第八步：创建新的笔画
             var smoothedStroke = new Stroke(fixedStylusPoints)
             {
                 DrawingAttributes = stroke.DrawingAttributes.Clone()
@@ -125,7 +142,7 @@ namespace Ink_Canvas.Helpers
             double endToEndDistance = GetDistance(firstPoint.ToPoint(), lastPoint.ToPoint());
 
             // 如果首尾距离太近，可能是收尾相连问题
-            if (endToEndDistance < 5.0)
+            if (endToEndDistance < 3.0) // 降低阈值到3像素
             {
                 // 移除最后一个点，避免收尾相连
                 if (resultPoints.Count > 1)
@@ -138,7 +155,7 @@ namespace Ink_Canvas.Helpers
         }
 
         /// <summary>
-        /// 过滤和重采样点
+        /// 过滤和重采样点（1像素级别优化）
         /// </summary>
         private List<StylusPoint> FilterAndResamplePoints(List<StylusPoint> points)
         {
@@ -149,9 +166,9 @@ namespace Ink_Canvas.Helpers
             // 添加第一个点
             filteredPoints.Add(points[0]);
 
-            // 使用移动平均来减少毛刺
+            // 使用改进的移动平均来减少毛刺
             var smoothedPoints = new List<StylusPoint>();
-            int windowSize = 3; // 移动平均窗口大小
+            int windowSize = 5; // 增加窗口大小以获得更平滑的效果
 
             for (int i = 0; i < points.Count; i++)
             {
@@ -160,33 +177,41 @@ namespace Ink_Canvas.Helpers
 
                 double distance = GetDistance(lastPoint.ToPoint(), currentPoint.ToPoint());
 
-                // 如果距离太近，跳过
+                // 如果距离太近，跳过（1像素级别）
                 if (distance < MinPointDistance)
                     continue;
 
-                // 应用移动平均平滑
+                // 应用改进的移动平均平滑
                 if (i >= windowSize - 1)
                 {
                     double avgX = 0, avgY = 0, avgPressure = 0;
+                    double totalWeight = 0;
+                    
+                    // 使用加权移动平均，中心点权重更高
                     for (int j = 0; j < windowSize; j++)
                     {
                         var point = points[i - j];
-                        avgX += point.X;
-                        avgY += point.Y;
-                        avgPressure += point.PressureFactor;
+                        double weight = 1.0 - Math.Abs(j - (windowSize - 1) / 2.0) / (windowSize / 2.0);
+                        weight = Math.Max(0.1, weight); // 确保最小权重
+                        
+                        avgX += point.X * weight;
+                        avgY += point.Y * weight;
+                        avgPressure += point.PressureFactor * weight;
+                        totalWeight += weight;
                     }
-                    avgX /= windowSize;
-                    avgY /= windowSize;
-                    avgPressure /= windowSize;
+                    
+                    avgX /= totalWeight;
+                    avgY /= totalWeight;
+                    avgPressure /= totalWeight;
 
                     var smoothedPoint = new StylusPoint(avgX, avgY, (float)avgPressure);
                     currentPoint = smoothedPoint;
                 }
 
-                // 如果距离太远，插入中间点
+                // 如果距离太远，插入中间点（1像素级别精度）
                 if (distance > MaxPointDistance)
                 {
-                    int segments = (int)(distance / MaxPointDistance) + 1;
+                    int segments = Math.Max(2, (int)(distance / PixelLevelPrecision));
                     for (int j = 1; j < segments; j++)
                     {
                         double ratio = (double)j / segments;
@@ -202,9 +227,9 @@ namespace Ink_Canvas.Helpers
         }
 
         /// <summary>
-        /// 计算贝塞尔曲线的控制点
+        /// 计算优化的控制点（改进拐点平滑）
         /// </summary>
-        private List<Point> CalculateControlPoints(List<StylusPoint> points)
+        private List<Point> CalculateOptimizedControlPoints(List<StylusPoint> points)
         {
             var controlPoints = new List<Point>();
             
@@ -212,8 +237,8 @@ namespace Ink_Canvas.Helpers
 
             // 检查点密度，如果点太稀疏则使用更保守的控制点计算
             bool isSparsePoints = points.Count < 5;
-            double tensionMultiplier = isSparsePoints ? 0.1 : 0.3; // 稀疏点时使用更小的张力
-            double maxOffset = isSparsePoints ? 5.0 : 10.0; // 稀疏点时使用更小的最大偏移
+            double tensionMultiplier = isSparsePoints ? 0.05 : 0.2; // 进一步减少张力
+            double maxOffset = isSparsePoints ? 3.0 : 8.0; // 减少最大偏移
 
             for (int i = 0; i < points.Count; i++)
             {
@@ -227,15 +252,17 @@ namespace Ink_Canvas.Helpers
                     double distance = GetDistance(currentPoint, nextPoint);
                     
                     // 如果距离太远，使用更保守的控制点
-                    if (distance > 50.0)
+                    if (distance > 30.0) // 降低阈值
                     {
                         controlPoint = currentPoint; // 直接使用当前点作为控制点
                     }
                     else
                     {
+                        // 使用更平滑的控制点计算
+                        double tension = Tension * tensionMultiplier * CornerSmoothingStrength;
                         controlPoint = new Point(
-                            currentPoint.X + (nextPoint.X - currentPoint.X) * Tension * tensionMultiplier,
-                            currentPoint.Y + (nextPoint.Y - currentPoint.Y) * Tension * tensionMultiplier
+                            currentPoint.X + (nextPoint.X - currentPoint.X) * tension,
+                            currentPoint.Y + (nextPoint.Y - currentPoint.Y) * tension
                         );
                     }
                 }
@@ -246,21 +273,23 @@ namespace Ink_Canvas.Helpers
                     double distance = GetDistance(currentPoint, prevPoint);
                     
                     // 如果距离太远，使用更保守的控制点
-                    if (distance > 50.0)
+                    if (distance > 30.0) // 降低阈值
                     {
                         controlPoint = currentPoint; // 直接使用当前点作为控制点
                     }
                     else
                     {
+                        // 使用更平滑的控制点计算
+                        double tension = Tension * tensionMultiplier * CornerSmoothingStrength;
                         controlPoint = new Point(
-                            currentPoint.X + (currentPoint.X - prevPoint.X) * Tension * tensionMultiplier,
-                            currentPoint.Y + (currentPoint.Y - prevPoint.Y) * Tension * tensionMultiplier
+                            currentPoint.X + (currentPoint.X - prevPoint.X) * tension,
+                            currentPoint.Y + (currentPoint.Y - prevPoint.Y) * tension
                         );
                     }
                 }
                 else
                 {
-                    // 中间点的控制点
+                    // 中间点的控制点（改进拐点平滑）
                     Point prevPoint = points[i - 1].ToPoint();
                     Point nextPoint = points[i + 1].ToPoint();
 
@@ -268,7 +297,7 @@ namespace Ink_Canvas.Helpers
                     double prevDistance = GetDistance(currentPoint, prevPoint);
                     double nextDistance = GetDistance(currentPoint, nextPoint);
                     
-                    if (prevDistance > 50.0 || nextDistance > 50.0)
+                    if (prevDistance > 30.0 || nextDistance > 30.0) // 降低阈值
                     {
                         // 距离太远，使用线性插值作为控制点
                         controlPoint = new Point(
@@ -278,13 +307,13 @@ namespace Ink_Canvas.Helpers
                     }
                     else
                     {
-                        // 计算切线方向，使用更保守的方法
+                        // 计算改进的切线方向，使用更平滑的方法
                         double tangentX = (nextPoint.X - prevPoint.X) * tensionMultiplier;
                         double tangentY = (nextPoint.Y - prevPoint.Y) * tensionMultiplier;
 
-                        // 应用张力参数，但限制最大偏移
-                        double offsetX = tangentX * Tension;
-                        double offsetY = tangentY * Tension;
+                        // 应用张力参数和拐点平滑，但限制最大偏移
+                        double offsetX = tangentX * Tension * CornerSmoothingStrength;
+                        double offsetY = tangentY * Tension * CornerSmoothingStrength;
                         
                         // 限制偏移距离
                         double offsetDistance = Math.Sqrt(offsetX * offsetX + offsetY * offsetY);
@@ -308,9 +337,9 @@ namespace Ink_Canvas.Helpers
         }
 
         /// <summary>
-        /// 生成曲线点
+        /// 生成1像素级别的平滑曲线点
         /// </summary>
-        private List<StylusPoint> GenerateCurvePoints(List<StylusPoint> points, List<Point> controlPoints)
+        private List<StylusPoint> GeneratePixelLevelCurvePoints(List<StylusPoint> points, List<Point> controlPoints)
         {
             var curvePoints = new List<StylusPoint>();
             
@@ -324,19 +353,14 @@ namespace Ink_Canvas.Helpers
                 var startControl = controlPoints[i];
                 var endControl = controlPoints[i + 1];
 
-                // 计算自适应步长，减少步数以避免毛刺
+                // 计算1像素级别的步长
                 double distance = GetDistance(startPoint.ToPoint(), endPoint.ToPoint());
                 
-                // 根据点密度调整步数
-                int steps;
-                if (points.Count < 5) // 低密度点
-                {
-                    steps = Math.Max(1, Math.Min(3, (int)(distance / 15.0))); // 更少的步数
-                }
-                else
-                {
-                    steps = Math.Max(2, Math.Min(15, (int)(distance / 8.0))); // 正常步数
-                }
+                // 根据距离计算精确的步数，确保1像素级别精度
+                int steps = Math.Max(1, (int)(distance / PixelLevelPrecision));
+                
+                // 限制最大步数以避免过度细分
+                steps = Math.Min(steps, 50);
 
                 // 生成贝塞尔曲线点
                 for (int j = 0; j <= steps; j++)
@@ -362,6 +386,53 @@ namespace Ink_Canvas.Helpers
             return curvePoints;
         }
 
+        /// <summary>
+        /// 应用拐点平滑
+        /// </summary>
+        private List<StylusPoint> ApplyCornerSmoothing(List<StylusPoint> points)
+        {
+            if (points.Count < 3) return points;
+
+            var smoothedPoints = new List<StylusPoint>();
+            smoothedPoints.Add(points[0]); // 添加第一个点
+
+            for (int i = 1; i < points.Count - 1; i++)
+            {
+                var prev = points[i - 1];
+                var curr = points[i];
+                var next = points[i + 1];
+
+                // 计算角度变化
+                double angle1 = Math.Atan2(curr.Y - prev.Y, curr.X - prev.X);
+                double angle2 = Math.Atan2(next.Y - curr.Y, next.X - curr.X);
+                double angleDiff = Math.Abs(angle2 - angle1);
+                
+                // 标准化角度差
+                if (angleDiff > Math.PI) angleDiff = 2 * Math.PI - angleDiff;
+
+                // 如果角度变化太大，认为是拐点
+                if (angleDiff > Math.PI / 4) // 45度阈值
+                {
+                    // 应用拐点平滑
+                    double smoothingFactor = CornerSmoothingStrength;
+                    double smoothedX = curr.X * (1.0 - smoothingFactor) + 
+                                     (prev.X + next.X) * 0.5 * smoothingFactor;
+                    double smoothedY = curr.Y * (1.0 - smoothingFactor) + 
+                                     (prev.Y + next.Y) * 0.5 * smoothingFactor;
+
+                    var smoothedPoint = new StylusPoint(smoothedX, smoothedY, curr.PressureFactor);
+                    smoothedPoints.Add(smoothedPoint);
+                }
+                else
+                {
+                    smoothedPoints.Add(curr);
+                }
+            }
+
+            smoothedPoints.Add(points[points.Count - 1]); // 添加最后一个点
+            return smoothedPoints;
+        }
+
         /// <summary>
         /// 计算贝塞尔曲线上的点
         /// </summary>
@@ -445,7 +516,7 @@ namespace Ink_Canvas.Helpers
                 double deviation = Math.Sqrt(deviationX * deviationX + deviationY * deviationY);
 
                 // 如果偏差超过阈值，认为是手抖
-                double shakeThreshold = 5.0; // 手抖检测阈值
+                double shakeThreshold = 3.0; // 降低手抖检测阈值
                 if (deviation > shakeThreshold)
                 {
                     // 应用手抖修正
@@ -505,11 +576,11 @@ namespace Ink_Canvas.Helpers
                 {
                     // 如果点过于密集，增加时间权重
                     double avgDistance = velocity;
-                    if (avgDistance < 2.0)
+                    if (avgDistance < 1.0) // 降低阈值
                     {
                         timeWeight = 1.5; // 增加权重
                     }
-                    else if (avgDistance > 20.0)
+                    else if (avgDistance > 15.0) // 降低阈值
                     {
                         timeWeight = 0.5; // 减少权重
                     }
@@ -530,7 +601,7 @@ namespace Ink_Canvas.Helpers
                 {
                     double velocity = velocities[i - 1];
                     // 速度越快，权重越大（更平滑）
-                    velocityWeight = Math.Min(2.0, velocity / 10.0 + 0.5);
+                    velocityWeight = Math.Min(2.0, velocity / 8.0 + 0.5); // 调整参数
                 }
 
                 // 计算加速度权重
@@ -539,7 +610,7 @@ namespace Ink_Canvas.Helpers
                 {
                     double acceleration = Math.Abs(accelerations[i - 1]);
                     // 加速度越大，权重越大（更平滑）
-                    accelerationWeight = Math.Min(2.0, acceleration / 5.0 + 0.5);
+                    accelerationWeight = Math.Min(2.0, acceleration / 3.0 + 0.5); // 调整参数
                 }
 
                 // 获取时间权重
@@ -557,7 +628,7 @@ namespace Ink_Canvas.Helpers
                 if (totalWeight > 1.0)
                 {
                     // 向相邻点加权平均
-                    double weight = (totalWeight - 1.0) * 0.3; // 限制最大影响
+                    double weight = (totalWeight - 1.0) * 0.2; // 减少最大影响
                     smoothedX = curr.X * (1.0 - weight) + (prev.X + next.X) * 0.5 * weight;
                     smoothedY = curr.Y * (1.0 - weight) + (prev.Y + next.Y) * 0.5 * weight;
                 }
@@ -590,10 +661,10 @@ namespace Ink_Canvas.Helpers
                 // 计算两点间距离
                 double distance = GetDistance(currentPoint.ToPoint(), nextPoint.ToPoint());
 
-                // 如果距离太远，插入中间点
-                if (distance > 20.0) // 低采样率下使用更大的阈值
+                // 如果距离太远，插入中间点（1像素级别）
+                if (distance > 15.0) // 降低阈值
                 {
-                    int segments = Math.Max(2, Math.Min(5, (int)(distance / 10.0))); // 限制插值段数
+                    int segments = Math.Max(2, Math.Min(8, (int)(distance / PixelLevelPrecision))); // 使用像素级别精度
                     for (int j = 1; j < segments; j++)
                     {
                         double ratio = (double)j / segments;
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 40878556..96c460bc 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -799,7 +799,7 @@
                                         <TextBlock Foreground="#fafafa" Text="平滑强度" VerticalAlignment="Center"
                                                    FontSize="14" Margin="0,0,16,0" />
                                         <Slider Name="AdvancedSmoothingStrengthSlider" Width="150" Minimum="0.1" Maximum="1.0" 
-                                                Value="0.4" TickFrequency="0.1" IsSnapToTickEnabled="True"
+                                                Value="0.7" TickFrequency="0.1" IsSnapToTickEnabled="True"
                                                 ValueChanged="AdvancedSmoothingStrengthSlider_ValueChanged" />
                                         <TextBlock Foreground="#fafafa" Text="{Binding ElementName=AdvancedSmoothingStrengthSlider, Path=Value, StringFormat={}{0:F1}}" 
                                                    VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
@@ -809,7 +809,7 @@
                                         <TextBlock Foreground="#fafafa" Text="张力参数" VerticalAlignment="Center"
                                                    FontSize="14" Margin="0,0,16,0" />
                                         <Slider Name="AdvancedSmoothingTensionSlider" Width="150" Minimum="0.1" Maximum="1.0" 
-                                                Value="0.3" TickFrequency="0.1" IsSnapToTickEnabled="True"
+                                                Value="0.4" TickFrequency="0.1" IsSnapToTickEnabled="True"
                                                 ValueChanged="AdvancedSmoothingTensionSlider_ValueChanged" />
                                         <TextBlock Foreground="#fafafa" Text="{Binding ElementName=AdvancedSmoothingTensionSlider, Path=Value, StringFormat={}{0:F1}}" 
                                                    VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
@@ -827,7 +827,7 @@
                                         <TextBlock Foreground="#fafafa" Text="手抖修正强度" VerticalAlignment="Center"
                                                    FontSize="14" Margin="0,0,16,0" />
                                         <Slider Name="ShakeCorrectionStrengthSlider" Width="150" Minimum="0.0" Maximum="1.0" 
-                                                Value="0.6" TickFrequency="0.1" IsSnapToTickEnabled="True"
+                                                Value="0.8" TickFrequency="0.1" IsSnapToTickEnabled="True"
                                                 ValueChanged="ShakeCorrectionStrengthSlider_ValueChanged" />
                                         <TextBlock Foreground="#fafafa" Text="{Binding ElementName=ShakeCorrectionStrengthSlider, Path=Value, StringFormat={}{0:F1}}" 
                                                    VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
@@ -837,7 +837,7 @@
                                         <TextBlock Foreground="#fafafa" Text="速度加权强度" VerticalAlignment="Center"
                                                    FontSize="14" Margin="0,0,16,0" />
                                         <Slider Name="VelocityWeightedSmoothingStrengthSlider" Width="150" Minimum="0.0" Maximum="1.0" 
-                                                Value="0.7" TickFrequency="0.1" IsSnapToTickEnabled="True"
+                                                Value="0.8" TickFrequency="0.1" IsSnapToTickEnabled="True"
                                                 ValueChanged="VelocityWeightedSmoothingStrengthSlider_ValueChanged" />
                                         <TextBlock Foreground="#fafafa" Text="{Binding ElementName=VelocityWeightedSmoothingStrengthSlider, Path=Value, StringFormat={}{0:F1}}" 
                                                    VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
@@ -847,11 +847,21 @@
                                         <TextBlock Foreground="#fafafa" Text="时间加权强度" VerticalAlignment="Center"
                                                    FontSize="14" Margin="0,0,16,0" />
                                         <Slider Name="TimeWeightedSmoothingStrengthSlider" Width="150" Minimum="0.0" Maximum="1.0" 
-                                                Value="0.5" TickFrequency="0.1" IsSnapToTickEnabled="True"
+                                                Value="0.6" TickFrequency="0.1" IsSnapToTickEnabled="True"
                                                 ValueChanged="TimeWeightedSmoothingStrengthSlider_ValueChanged" />
                                         <TextBlock Foreground="#fafafa" Text="{Binding ElementName=TimeWeightedSmoothingStrengthSlider, Path=Value, StringFormat={}{0:F1}}" 
                                                    VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
                                     </ui:SimpleStackPanel>
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
+                                                         Visibility="{Binding ElementName=ToggleSwitchAdvancedBezierSmoothing, Path=IsOn, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <TextBlock Foreground="#fafafa" Text="拐点平滑强度" VerticalAlignment="Center"
+                                                   FontSize="14" Margin="0,0,16,0" />
+                                        <Slider Name="CornerSmoothingStrengthSlider" Width="150" Minimum="0.0" Maximum="1.0" 
+                                                Value="0.8" TickFrequency="0.1" IsSnapToTickEnabled="True"
+                                                ValueChanged="CornerSmoothingStrengthSlider_ValueChanged" />
+                                        <TextBlock Foreground="#fafafa" Text="{Binding ElementName=CornerSmoothingStrengthSlider, Path=Value, StringFormat={}{0:F1}}" 
+                                                   VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
+                                    </ui:SimpleStackPanel>
                                     <TextBlock Text="# 高级贝塞尔曲线平滑（推荐）：使用自定义算法替代系统默认的FitToCurve，提供更平滑的笔迹效果并解决墨迹闪烁、毛刺和低采样率收尾相连问题。启用高级平滑时会自动禁用系统默认平滑。手抖修正可自动检测并修正手抖造成的偏差，速度加权平滑根据笔迹速度调整平滑强度，时间加权平滑根据点密度调整平滑参数，自适应平滑会根据笔迹速度自动调整平滑参数。低采样率时自动使用线性插值避免收尾相连。" TextWrapping="Wrap" Foreground="#a1a1aa" />
                                 </ui:SimpleStackPanel>
                             </GroupBox>
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index 63a3b2c5..241c34be 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs	
@@ -1347,6 +1347,12 @@ namespace Ink_Canvas {
             SaveSettingsToFile();
         }
 
+        private void CornerSmoothingStrengthSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) {
+            if (!isLoaded) return;
+            Settings.Canvas.CornerSmoothingStrength = CornerSmoothingStrengthSlider.Value;
+            SaveSettingsToFile();
+        }
+
         private void ToggleSwitchAutoSaveStrokesInPowerPoint_Toggled(object sender, RoutedEventArgs e) {
             if (!isLoaded) return;
             Settings.PowerPointSettings.IsAutoSaveStrokesInPowerPoint = ToggleSwitchAutoSaveStrokesInPowerPoint.IsOn;
diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
index 81fb018a..c23a553e 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
@@ -543,6 +543,7 @@ namespace Ink_Canvas {
                 ShakeCorrectionStrengthSlider.Value = Settings.Canvas.ShakeCorrectionStrength;
                 VelocityWeightedSmoothingStrengthSlider.Value = Settings.Canvas.VelocityWeightedSmoothingStrength;
                 TimeWeightedSmoothingStrengthSlider.Value = Settings.Canvas.TimeWeightedSmoothingStrength;
+                CornerSmoothingStrengthSlider.Value = Settings.Canvas.CornerSmoothingStrength;
                 
                 // 初始化直线自动拉直相关设置
                 ToggleSwitchAutoStraightenLine.IsOn = Settings.Canvas.AutoStraightenLine;
diff --git a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
index 661bf3e0..46e93c0a 100644
--- a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
@@ -1602,7 +1602,9 @@ namespace Ink_Canvas {
                         EnableAdaptiveSmoothing = Settings.Canvas.EnableAdaptiveSmoothing,
                         ShakeCorrectionStrength = Settings.Canvas.ShakeCorrectionStrength,
                         VelocityWeightedSmoothingStrength = Settings.Canvas.VelocityWeightedSmoothingStrength,
-                        TimeWeightedSmoothingStrength = Settings.Canvas.TimeWeightedSmoothingStrength
+                        TimeWeightedSmoothingStrength = Settings.Canvas.TimeWeightedSmoothingStrength,
+                        CornerSmoothingStrength = Settings.Canvas.CornerSmoothingStrength,
+                        PixelLevelPrecision = Settings.Canvas.PixelLevelPrecision
                     };
 
                     // 对临时笔画应用平滑
diff --git a/Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs b/Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs
index d6909954..e8a8d710 100644
--- a/Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs	
@@ -594,7 +594,9 @@ namespace Ink_Canvas {
                             EnableAdaptiveSmoothing = Settings.Canvas.EnableAdaptiveSmoothing,
                             ShakeCorrectionStrength = Settings.Canvas.ShakeCorrectionStrength,
                             VelocityWeightedSmoothingStrength = Settings.Canvas.VelocityWeightedSmoothingStrength,
-                            TimeWeightedSmoothingStrength = Settings.Canvas.TimeWeightedSmoothingStrength
+                            TimeWeightedSmoothingStrength = Settings.Canvas.TimeWeightedSmoothingStrength,
+                            CornerSmoothingStrength = Settings.Canvas.CornerSmoothingStrength,
+                            PixelLevelPrecision = Settings.Canvas.PixelLevelPrecision
                         };
 
                         var smoothedStroke = advancedSmoothing.SmoothStroke(e.Stroke);
diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs
index 47e98dfe..bf648ba5 100644
--- a/Ink Canvas/Resources/Settings.cs	
+++ b/Ink Canvas/Resources/Settings.cs	
@@ -51,17 +51,21 @@ namespace Ink_Canvas
         [JsonProperty("useAdvancedBezierSmoothing")]
         public bool UseAdvancedBezierSmoothing { get; set; } = true; // 默认启用高级贝塞尔曲线平滑
         [JsonProperty("advancedSmoothingStrength")]
-        public double AdvancedSmoothingStrength { get; set; } = 0.4; // 高级平滑强度 (0.0 - 1.0)，降低以减少毛刺
+        public double AdvancedSmoothingStrength { get; set; } = 0.7; // 高级平滑强度 (0.0 - 1.0)，提高以获得更平滑的效果
         [JsonProperty("advancedSmoothingTension")]
-        public double AdvancedSmoothingTension { get; set; } = 0.3; // 高级平滑张力 (0.0 - 1.0)，降低以减少毛刺
+        public double AdvancedSmoothingTension { get; set; } = 0.4; // 高级平滑张力 (0.0 - 1.0)，适度提高以获得更平滑的曲线
         [JsonProperty("enableAdaptiveSmoothing")]
         public bool EnableAdaptiveSmoothing { get; set; } = true; // 是否启用自适应平滑
         [JsonProperty("shakeCorrectionStrength")]
-        public double ShakeCorrectionStrength { get; set; } = 0.6; // 手抖修正强度 (0.0 - 1.0)
+        public double ShakeCorrectionStrength { get; set; } = 0.8; // 手抖修正强度 (0.0 - 1.0)，提高以减少手抖
         [JsonProperty("velocityWeightedSmoothingStrength")]
-        public double VelocityWeightedSmoothingStrength { get; set; } = 0.7; // 速度加权平滑强度 (0.0 - 1.0)
+        public double VelocityWeightedSmoothingStrength { get; set; } = 0.8; // 速度加权平滑强度 (0.0 - 1.0)，提高以获得更平滑的效果
         [JsonProperty("timeWeightedSmoothingStrength")]
-        public double TimeWeightedSmoothingStrength { get; set; } = 0.5; // 时间加权平滑强度 (0.0 - 1.0)
+        public double TimeWeightedSmoothingStrength { get; set; } = 0.6; // 时间加权平滑强度 (0.0 - 1.0)，提高以获得更平滑的效果
+        [JsonProperty("cornerSmoothingStrength")]
+        public double CornerSmoothingStrength { get; set; } = 0.8; // 拐点平滑强度 (0.0 - 1.0)，新增参数用于更平滑的拐点
+        [JsonProperty("pixelLevelPrecision")]
+        public double PixelLevelPrecision { get; set; } = 1.0; // 1像素级别插点精度，新增参数用于精确控制
         [JsonProperty("clearCanvasAndClearTimeMachine")]
         public bool ClearCanvasAndClearTimeMachine { get; set; } = false;
         [JsonProperty("enablePressureTouchMode")]

From 48e0ca887d83f31f8c1caae540dea94a0a484bb1 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 17:20:33 +0800
Subject: [PATCH 22/32] =?UTF-8?q?improve:PPT=E8=81=94=E5=8A=A8=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index 0c7c852d..2b02dccb 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -1308,8 +1308,8 @@ namespace Ink_Canvas {
                     // 计算从记录进程开始的时间
                     var timeSinceRecord = DateTime.Now - wppProcessRecordTime;
                     
-                    // 更保守的关闭策略：只有在超过3秒且检查次数超过2次时才强制关闭
-                    if (timeSinceRecord.TotalSeconds > 3 && wppProcessCheckCount >= 2)
+                    // 更保守的关闭策略：只有在超过0.5秒且检查次数超过2次时才强制关闭
+                    if (timeSinceRecord.TotalSeconds > 0.5 && wppProcessCheckCount >= 2)
                     {
                         LogHelper.WriteLogToFile($"检测到长时间未关闭的 WPP 进程（已运行{timeSinceRecord.TotalSeconds:F1}秒，检查{wppProcessCheckCount}次），开始强制关闭", LogHelper.LogType.Event);
                         wppProcess.Kill();

From da86f07cbe5447336eab8e3fb2e696d5d768481e Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 18:27:08 +0800
Subject: [PATCH 23/32] =?UTF-8?q?fix:PPT=E5=A2=A8=E8=BF=B9=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_PPT.cs            | 53 ++++++++++++++++---
 .../MainWindow_cs/MW_Save&OpenStrokes.cs      | 20 +++++++
 2 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index 2b02dccb..b845042c 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -194,9 +194,12 @@ namespace Ink_Canvas {
                             return;
                         }
 
+                        // 使用更精确的文件标识符：文件名_页数_文件路径哈希值
+                        string presentationPath = presentation.FullName;
+                        string fileHash = GetFileHash(presentationPath);
+                        string folderName = presentation.Name + "_" + presentation.Slides.Count + "_" + fileHash;
                         var folderPath = Settings.Automation.AutoSavedStrokesLocation +
-                                         @"\Auto Saved - Presentations\" + presentation.Name + "_" +
-                                         presentation.Slides.Count;
+                                         @"\Auto Saved - Presentations\" + folderName;
                         try {
                             if (!File.Exists(folderPath + "/Position")) return;
                             if (!int.TryParse(File.ReadAllText(folderPath + "/Position"), out var page)) return;
@@ -560,13 +563,17 @@ namespace Ink_Canvas {
 
                     //检查是否有已有墨迹，并加载
                     if (Settings.PowerPointSettings.IsAutoSaveStrokesInPowerPoint)
+                    {
+                        // 使用更精确的文件标识符：文件名_页数_文件路径哈希值
+                        string presentationPath = Wn.Presentation.FullName;
+                        string fileHash = GetFileHash(presentationPath);
+                        string folderName = Wn.Presentation.Name + "_" + Wn.Presentation.Slides.Count + "_" + fileHash;
+                        
                         if (Directory.Exists(Settings.Automation.AutoSavedStrokesLocation +
-                                             @"\Auto Saved - Presentations\" + Wn.Presentation.Name + "_" +
-                                             Wn.Presentation.Slides.Count)) {
+                                             @"\Auto Saved - Presentations\" + folderName)) {
                             LogHelper.WriteLogToFile("Found saved strokes", LogHelper.LogType.Trace);
                             var files = new DirectoryInfo(Settings.Automation.AutoSavedStrokesLocation +
-                                                          @"\Auto Saved - Presentations\" + Wn.Presentation.Name + "_" +
-                                                          Wn.Presentation.Slides.Count).GetFiles();
+                                                          @"\Auto Saved - Presentations\" + folderName).GetFiles();
                             var count = 0;
                             foreach (var file in files)
                                 if (file.Name != "Position") {
@@ -586,6 +593,7 @@ namespace Ink_Canvas {
 
                             LogHelper.WriteLogToFile($"Loaded {count.ToString()} saved strokes");
                         }
+                    }
 
                     StackPanelPPTControls.Visibility = Visibility.Visible;
                     UpdatePPTBtnDisplaySettingsStatus();
@@ -660,8 +668,11 @@ namespace Ink_Canvas {
 
                 isEnteredSlideShowEndEvent = true;
                 if (Settings.PowerPointSettings.IsAutoSaveStrokesInPowerPoint) {
-                   var folderPath = Settings.Automation.AutoSavedStrokesLocation + @"\Auto Saved - Presentations\" +
-                                     Pres.Name + "_" + Pres.Slides.Count;
+                   // 使用更精确的文件标识符：文件名_页数_文件路径哈希值
+                   string presentationPath = Pres.FullName;
+                   string fileHash = GetFileHash(presentationPath);
+                   string folderName = Pres.Name + "_" + Pres.Slides.Count + "_" + fileHash;
+                   var folderPath = Settings.Automation.AutoSavedStrokesLocation + @"\Auto Saved - Presentations\" + folderName;
                     if (!Directory.Exists(folderPath)) Directory.CreateDirectory(folderPath);
                     try {
                         File.WriteAllText(folderPath + "/Position", previousSlideID.ToString());
@@ -1463,5 +1474,31 @@ namespace Ink_Canvas {
             wppProcessCheckCount = 0;
             LogHelper.WriteLogToFile("停止 WPP 进程检测定时器", LogHelper.LogType.Trace);
         }
+
+        /// <summary>
+        /// 计算文件路径的哈希值，用于生成唯一的文件夹标识符
+        /// </summary>
+        /// <param name="filePath">文件路径</param>
+        /// <returns>文件路径的哈希值字符串</returns>
+        private string GetFileHash(string filePath)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(filePath))
+                    return "unknown";
+                
+                // 使用文件路径的哈希值作为唯一标识符
+                using (var md5 = System.Security.Cryptography.MD5.Create())
+                {
+                    byte[] hashBytes = md5.ComputeHash(System.Text.Encoding.UTF8.GetBytes(filePath));
+                    return BitConverter.ToString(hashBytes).Replace("-", "").Substring(0, 8);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"计算文件哈希值失败: {ex.ToString()}", LogHelper.LogType.Error);
+                return "error";
+            }
+        }
     }
 }
diff --git a/Ink Canvas/MainWindow_cs/MW_Save&OpenStrokes.cs b/Ink Canvas/MainWindow_cs/MW_Save&OpenStrokes.cs
index 7d3e2e57..6b5486f3 100644
--- a/Ink Canvas/MainWindow_cs/MW_Save&OpenStrokes.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Save&OpenStrokes.cs	
@@ -168,6 +168,7 @@ namespace Ink_Canvas {
                         {
                             writer.WriteLine($"PPT名称: {pptApplication.SlideShowWindows[1].Presentation.Name}");
                             writer.WriteLine($"PPT总页数: {pptApplication.SlideShowWindows[1].Presentation.Slides.Count}");
+                            writer.WriteLine($"PPT文件路径: {pptApplication.SlideShowWindows[1].Presentation.FullName}");
                         }
                         
                         for (int i = 0; i < allPageStrokes.Count; i++)
@@ -432,6 +433,25 @@ namespace Ink_Canvas {
                     throw new InvalidOperationException("当前不在PPT放映模式，无法恢复PPT墨迹");
                 }
                 
+                // 检查PPT文件路径是否匹配
+                if (metadata.ContainsKey("PPT文件路径"))
+                {
+                    string savedPptPath = metadata["PPT文件路径"];
+                    string currentPptPath = pptApplication.SlideShowWindows[1].Presentation.FullName;
+                    
+                    if (!string.IsNullOrEmpty(savedPptPath) && !string.IsNullOrEmpty(currentPptPath))
+                    {
+                        // 使用文件路径哈希值进行比较，避免路径格式差异
+                        string savedHash = GetFileHash(savedPptPath);
+                        string currentHash = GetFileHash(currentPptPath);
+                        
+                        if (savedHash != currentHash)
+                        {
+                            throw new InvalidOperationException($"墨迹文件与当前PPT文件不匹配。保存的PPT: {savedPptPath}，当前PPT: {currentPptPath}");
+                        }
+                    }
+                }
+                
                 // 清空当前墨迹
                 ClearStrokes(true);
                 timeMachine.ClearStrokeHistory();

From 4a776c1fe8f80b02301973ddfe0a1394c26da17b Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 19:17:32 +0800
Subject: [PATCH 24/32] =?UTF-8?q?improve:=E5=A2=A8=E8=BF=B9=E5=B9=B3?=
 =?UTF-8?q?=E6=BB=91=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/Helpers/AdvancedBezierSmoothing.cs | 748 ++----------------
 Ink Canvas/MainWindow.xaml                    |  73 +-
 Ink Canvas/MainWindow_cs/MW_Settings.cs       |  50 +-
 Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs |   7 -
 Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs   |   8 -
 .../MW_SimulatePressure&InkToShape.cs         |   8 -
 Ink Canvas/Resources/Settings.cs              |  16 -
 7 files changed, 85 insertions(+), 825 deletions(-)

diff --git a/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs b/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs
index 8a476ec9..16ac88c8 100644
--- a/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs	
+++ b/Ink Canvas/Helpers/AdvancedBezierSmoothing.cs	
@@ -10,722 +10,138 @@ using Point = System.Windows.Point;
 namespace Ink_Canvas.Helpers
 {
     /// <summary>
-    /// 高级贝塞尔曲线平滑算法 - 优化版本
-    /// 用于解决墨迹闪烁问题，提供更平滑的笔迹效果
-    /// 优化特性：
-    /// 1. 更平滑的墨迹：改进的贝塞尔曲线算法
-    /// 2. 更平滑的拐点：优化的控制点计算
-    /// 3. 1像素级别插点：精确到像素级别的曲线生成
+    /// 适合手写/触摸的墨迹平滑方案：指数平滑+等距重采样+Catmull-Rom样条插值，防止自交和异常填充
     /// </summary>
     public class AdvancedBezierSmoothing
     {
-        /// <summary>
-        /// 平滑强度 (0.0 - 1.0) - 优化为更平滑的默认值
-        /// </summary>
-        public double SmoothingStrength { get; set; } = 0.7;
+        public double SmoothingStrength { get; set; } = 0.8;
+        public double ResampleInterval { get; set; } = 0.8;
+        public int InterpolationSteps { get; set; } = 64;
 
-        /// <summary>
-        /// 张力参数 (0.0 - 1.0) - 优化为更平滑的默认值
-        /// </summary>
-        public double Tension { get; set; } = 0.4;
-
-        /// <summary>
-        /// 是否启用自适应平滑
-        /// </summary>
-        public bool EnableAdaptiveSmoothing { get; set; } = true;
-
-        /// <summary>
-        /// 最小点间距阈值 - 优化为1像素级别
-        /// </summary>
-        public double MinPointDistance { get; set; } = 1.0; // 降低到1像素级别
-
-        /// <summary>
-        /// 最大点间距阈值 - 优化为更精细的控制
-        /// </summary>
-        public double MaxPointDistance { get; set; } = 15.0; // 进一步减少最大间距，提高平滑度
-
-        /// <summary>
-        /// 手抖修正强度 (0.0 - 1.0) - 优化为更平滑的默认值
-        /// </summary>
-        public double ShakeCorrectionStrength { get; set; } = 0.8;
-
-        /// <summary>
-        /// 速度加权平滑强度 (0.0 - 1.0) - 优化为更平滑的默认值
-        /// </summary>
-        public double VelocityWeightedSmoothingStrength { get; set; } = 0.8;
-
-        /// <summary>
-        /// 时间加权平滑强度 (0.0 - 1.0) - 优化为更平滑的默认值
-        /// </summary>
-        public double TimeWeightedSmoothingStrength { get; set; } = 0.6;
-
-        /// <summary>
-        /// 拐点平滑强度 (0.0 - 1.0) - 新增参数，优化为更平滑的默认值
-        /// </summary>
-        public double CornerSmoothingStrength { get; set; } = 0.8;
-
-        /// <summary>
-        /// 1像素级别插点精度 - 新增参数
-        /// </summary>
-        public double PixelLevelPrecision { get; set; } = 1.0;
-
-        /// <summary>
-        /// 对笔画进行高级贝塞尔曲线平滑处理
-        /// </summary>
-        /// <param name="stroke">原始笔画</param>
-        /// <returns>平滑后的笔画</returns>
         public Stroke SmoothStroke(Stroke stroke)
         {
-            if (stroke == null || stroke.StylusPoints.Count < 3)
+            if (stroke == null || stroke.StylusPoints.Count < 2)
                 return stroke;
-
             var originalPoints = stroke.StylusPoints.ToList();
-            var smoothedPoints = new List<StylusPoint>();
-
-            // 检查采样率，如果点太少则使用不同的处理策略
-            bool isLowSamplingRate = originalPoints.Count < 10; // 少于10个点认为是低采样率
-
-            if (isLowSamplingRate)
-            {
-                // 低采样率情况下的特殊处理
-                return HandleLowSamplingRateStroke(stroke);
-            }
-
-            // 第一步：手抖修正
-            var shakeCorrectedPoints = ApplyShakeCorrection(originalPoints);
-
-            // 第二步：基于速度和时间的加权平滑
-            var velocityTimeWeightedPoints = ApplyVelocityTimeWeightedSmoothing(shakeCorrectedPoints);
-
-            // 第三步：拐点检测和平滑
-            var cornerSmoothedPoints = ApplyCornerSmoothing(velocityTimeWeightedPoints);
-
-            // 第四步：点过滤和重采样（1像素级别）
-            var filteredPoints = FilterAndResamplePoints(cornerSmoothedPoints);
-
-            // 第五步：计算优化的控制点
-            var controlPoints = CalculateOptimizedControlPoints(filteredPoints);
-
-            // 第六步：生成1像素级别的平滑曲线点
-            var curvePoints = GeneratePixelLevelCurvePoints(filteredPoints, controlPoints);
-
-            // 第七步：修正收尾相连问题
-            var fixedStylusPoints = FixEndToEndConnection(new StylusPointCollection(curvePoints));
-            
-            // 第八步：创建新的笔画
-            var smoothedStroke = new Stroke(fixedStylusPoints)
+            var smoothedPoints = ApplyExponentialSmoothing(originalPoints, SmoothingStrength);
+            var resampledPoints = ResampleEquidistant(smoothedPoints, ResampleInterval);
+            var interpolatedPoints = SlidingBezierFit(resampledPoints, 4, 24);
+            var finalPoints = ApplyExponentialSmoothing(interpolatedPoints, 0.5); // 二次平滑
+            var ultraSmoothPoints = SlidingWindowSmooth(finalPoints, 7); // 滑动窗口平滑
+            var smoothedStroke = new Stroke(new StylusPointCollection(ultraSmoothPoints))
             {
                 DrawingAttributes = stroke.DrawingAttributes.Clone()
             };
-
             return smoothedStroke;
         }
 
-        /// <summary>
-        /// 检测并修正收尾相连问题
-        /// </summary>
-        private StylusPointCollection FixEndToEndConnection(StylusPointCollection points)
+        private List<StylusPoint> ApplyExponentialSmoothing(List<StylusPoint> points, double alpha)
         {
-            if (points.Count < 3) return points;
-
-            var resultPoints = new StylusPointCollection();
-            
-            // 复制所有点
-            foreach (var point in points)
+            var result = new List<StylusPoint>();
+            if (points.Count == 0) return result;
+            result.Add(points[0]);
+            double lastX = points[0].X;
+            double lastY = points[0].Y;
+            float lastPressure = points[0].PressureFactor;
+            for (int i = 1; i < points.Count; i++)
             {
-                resultPoints.Add(point);
+                var p = points[i];
+                lastX = alpha * p.X + (1 - alpha) * lastX;
+                lastY = alpha * p.Y + (1 - alpha) * lastY;
+                lastPressure = (float)(alpha * p.PressureFactor + (1 - alpha) * lastPressure);
+                if (lastPressure < 0.1f) lastPressure = 0.1f;
+                result.Add(new StylusPoint(lastX, lastY, lastPressure));
             }
-
-            // 检查首尾是否过于接近
-            var firstPoint = resultPoints[0];
-            var lastPoint = resultPoints[resultPoints.Count - 1];
-            double endToEndDistance = GetDistance(firstPoint.ToPoint(), lastPoint.ToPoint());
-
-            // 如果首尾距离太近，可能是收尾相连问题
-            if (endToEndDistance < 3.0) // 降低阈值到3像素
-            {
-                // 移除最后一个点，避免收尾相连
-                if (resultPoints.Count > 1)
-                {
-                    resultPoints.RemoveAt(resultPoints.Count - 1);
-                }
-            }
-
-            return resultPoints;
+            return result;
         }
 
-        /// <summary>
-        /// 过滤和重采样点（1像素级别优化）
-        /// </summary>
-        private List<StylusPoint> FilterAndResamplePoints(List<StylusPoint> points)
+        private List<StylusPoint> ResampleEquidistant(List<StylusPoint> points, double interval = 2.0)
         {
-            var filteredPoints = new List<StylusPoint>();
-            
-            if (points.Count == 0) return filteredPoints;
-
-            // 添加第一个点
-            filteredPoints.Add(points[0]);
-
-            // 使用改进的移动平均来减少毛刺
-            var smoothedPoints = new List<StylusPoint>();
-            int windowSize = 5; // 增加窗口大小以获得更平滑的效果
-
-            for (int i = 0; i < points.Count; i++)
+            var result = new List<StylusPoint>();
+            if (points.Count == 0) return result;
+            result.Add(points[0]);
+            double accumulated = 0;
+            for (int i = 1; i < points.Count; i++)
             {
-                var currentPoint = points[i];
-                var lastPoint = filteredPoints[filteredPoints.Count - 1];
-
-                double distance = GetDistance(lastPoint.ToPoint(), currentPoint.ToPoint());
-
-                // 如果距离太近，跳过（1像素级别）
-                if (distance < MinPointDistance)
-                    continue;
-
-                // 应用改进的移动平均平滑
-                if (i >= windowSize - 1)
+                var prev = result.Last();
+                var curr = points[i];
+                double dx = curr.X - prev.X;
+                double dy = curr.Y - prev.Y;
+                double dist = Math.Sqrt(dx * dx + dy * dy);
+                if (dist + accumulated >= interval)
                 {
-                    double avgX = 0, avgY = 0, avgPressure = 0;
-                    double totalWeight = 0;
-                    
-                    // 使用加权移动平均，中心点权重更高
-                    for (int j = 0; j < windowSize; j++)
-                    {
-                        var point = points[i - j];
-                        double weight = 1.0 - Math.Abs(j - (windowSize - 1) / 2.0) / (windowSize / 2.0);
-                        weight = Math.Max(0.1, weight); // 确保最小权重
-                        
-                        avgX += point.X * weight;
-                        avgY += point.Y * weight;
-                        avgPressure += point.PressureFactor * weight;
-                        totalWeight += weight;
-                    }
-                    
-                    avgX /= totalWeight;
-                    avgY /= totalWeight;
-                    avgPressure /= totalWeight;
-
-                    var smoothedPoint = new StylusPoint(avgX, avgY, (float)avgPressure);
-                    currentPoint = smoothedPoint;
-                }
-
-                // 如果距离太远，插入中间点（1像素级别精度）
-                if (distance > MaxPointDistance)
-                {
-                    int segments = Math.Max(2, (int)(distance / PixelLevelPrecision));
-                    for (int j = 1; j < segments; j++)
-                    {
-                        double ratio = (double)j / segments;
-                        var interpolatedPoint = InterpolatePoint(lastPoint, currentPoint, ratio);
-                        filteredPoints.Add(interpolatedPoint);
-                    }
-                }
-
-                filteredPoints.Add(currentPoint);
-            }
-
-            return filteredPoints;
-        }
-
-        /// <summary>
-        /// 计算优化的控制点（改进拐点平滑）
-        /// </summary>
-        private List<Point> CalculateOptimizedControlPoints(List<StylusPoint> points)
-        {
-            var controlPoints = new List<Point>();
-            
-            if (points.Count < 2) return controlPoints;
-
-            // 检查点密度，如果点太稀疏则使用更保守的控制点计算
-            bool isSparsePoints = points.Count < 5;
-            double tensionMultiplier = isSparsePoints ? 0.05 : 0.2; // 进一步减少张力
-            double maxOffset = isSparsePoints ? 3.0 : 8.0; // 减少最大偏移
-
-            for (int i = 0; i < points.Count; i++)
-            {
-                Point currentPoint = points[i].ToPoint();
-                Point controlPoint;
-
-                if (i == 0)
-                {
-                    // 第一个点的控制点
-                    Point nextPoint = points[i + 1].ToPoint();
-                    double distance = GetDistance(currentPoint, nextPoint);
-                    
-                    // 如果距离太远，使用更保守的控制点
-                    if (distance > 30.0) // 降低阈值
-                    {
-                        controlPoint = currentPoint; // 直接使用当前点作为控制点
-                    }
-                    else
-                    {
-                        // 使用更平滑的控制点计算
-                        double tension = Tension * tensionMultiplier * CornerSmoothingStrength;
-                        controlPoint = new Point(
-                            currentPoint.X + (nextPoint.X - currentPoint.X) * tension,
-                            currentPoint.Y + (nextPoint.Y - currentPoint.Y) * tension
-                        );
-                    }
-                }
-                else if (i == points.Count - 1)
-                {
-                    // 最后一个点的控制点
-                    Point prevPoint = points[i - 1].ToPoint();
-                    double distance = GetDistance(currentPoint, prevPoint);
-                    
-                    // 如果距离太远，使用更保守的控制点
-                    if (distance > 30.0) // 降低阈值
-                    {
-                        controlPoint = currentPoint; // 直接使用当前点作为控制点
-                    }
-                    else
-                    {
-                        // 使用更平滑的控制点计算
-                        double tension = Tension * tensionMultiplier * CornerSmoothingStrength;
-                        controlPoint = new Point(
-                            currentPoint.X + (currentPoint.X - prevPoint.X) * tension,
-                            currentPoint.Y + (currentPoint.Y - prevPoint.Y) * tension
-                        );
-                    }
+                    double t = (interval - accumulated) / dist;
+                    double x = prev.X + t * dx;
+                    double y = prev.Y + t * dy;
+                    float pressure = (float)(prev.PressureFactor * (1 - t) + curr.PressureFactor * t);
+                    if (pressure < 0.1f) pressure = 0.1f;
+                    var newPoint = new StylusPoint(x, y, pressure);
+                    result.Add(newPoint);
+                    accumulated = 0;
+                    i--; // 重新处理当前点
                 }
                 else
                 {
-                    // 中间点的控制点（改进拐点平滑）
-                    Point prevPoint = points[i - 1].ToPoint();
-                    Point nextPoint = points[i + 1].ToPoint();
-
-                    // 检查前后点的距离，如果太远则使用更保守的方法
-                    double prevDistance = GetDistance(currentPoint, prevPoint);
-                    double nextDistance = GetDistance(currentPoint, nextPoint);
-                    
-                    if (prevDistance > 30.0 || nextDistance > 30.0) // 降低阈值
-                    {
-                        // 距离太远，使用线性插值作为控制点
-                        controlPoint = new Point(
-                            (prevPoint.X + nextPoint.X) / 2.0,
-                            (prevPoint.Y + nextPoint.Y) / 2.0
-                        );
-                    }
-                    else
-                    {
-                        // 计算改进的切线方向，使用更平滑的方法
-                        double tangentX = (nextPoint.X - prevPoint.X) * tensionMultiplier;
-                        double tangentY = (nextPoint.Y - prevPoint.Y) * tensionMultiplier;
-
-                        // 应用张力参数和拐点平滑，但限制最大偏移
-                        double offsetX = tangentX * Tension * CornerSmoothingStrength;
-                        double offsetY = tangentY * Tension * CornerSmoothingStrength;
-                        
-                        // 限制偏移距离
-                        double offsetDistance = Math.Sqrt(offsetX * offsetX + offsetY * offsetY);
-                        if (offsetDistance > maxOffset)
-                        {
-                            offsetX = offsetX * maxOffset / offsetDistance;
-                            offsetY = offsetY * maxOffset / offsetDistance;
-                        }
-
-                        controlPoint = new Point(
-                            currentPoint.X + offsetX,
-                            currentPoint.Y + offsetY
-                        );
-                    }
+                    accumulated += dist;
                 }
-
-                controlPoints.Add(controlPoint);
             }
-
-            return controlPoints;
+            return result;
         }
 
-        /// <summary>
-        /// 生成1像素级别的平滑曲线点
-        /// </summary>
-        private List<StylusPoint> GeneratePixelLevelCurvePoints(List<StylusPoint> points, List<Point> controlPoints)
+        private List<StylusPoint> SlidingBezierFit(List<StylusPoint> points, int window = 4, int steps = 24)
         {
-            var curvePoints = new List<StylusPoint>();
-            
-            if (points.Count < 2) return curvePoints;
-
-            // 为每个线段生成贝塞尔曲线点
-            for (int i = 0; i < points.Count - 1; i++)
+            var result = new List<StylusPoint>();
+            if (points.Count < window) return points;
+            for (int i = 0; i <= points.Count - window; i++)
             {
-                var startPoint = points[i];
-                var endPoint = points[i + 1];
-                var startControl = controlPoints[i];
-                var endControl = controlPoints[i + 1];
-
-                // 计算1像素级别的步长
-                double distance = GetDistance(startPoint.ToPoint(), endPoint.ToPoint());
-                
-                // 根据距离计算精确的步数，确保1像素级别精度
-                int steps = Math.Max(1, (int)(distance / PixelLevelPrecision));
-                
-                // 限制最大步数以避免过度细分
-                steps = Math.Min(steps, 50);
-
-                // 生成贝塞尔曲线点
-                for (int j = 0; j <= steps; j++)
+                var p0 = points[i];
+                var p1 = points[i + 1];
+                var p2 = points[i + 2];
+                var p3 = points[i + 3];
+                for (int j = 0; j < steps; j++)
                 {
                     double t = (double)j / steps;
-                    var curvePoint = CalculateBezierPoint(startPoint.ToPoint(), startControl, endControl, endPoint.ToPoint(), t);
-                    
-                    // 插值压感值，使用更平滑的插值
-                    float pressure = InterpolatePressure(startPoint.PressureFactor, endPoint.PressureFactor, t);
-                    
-                    // 对压感值进行额外的平滑处理
-                    if (j > 0 && j < steps)
-                    {
-                        float prevPressure = curvePoints[curvePoints.Count - 1].PressureFactor;
-                        pressure = (prevPressure + pressure) * 0.5f; // 简单的移动平均
-                    }
-                    
-                    var stylusPoint = new StylusPoint(curvePoint.X, curvePoint.Y, pressure);
-                    curvePoints.Add(stylusPoint);
+                    var pt = CubicBezier(p0, p1, p2, p3, t);
+                    result.Add(pt);
                 }
             }
-
-            return curvePoints;
+            // 保证最后一个点被包含
+            result.Add(points.Last());
+            return result;
         }
 
-        /// <summary>
-        /// 应用拐点平滑
-        /// </summary>
-        private List<StylusPoint> ApplyCornerSmoothing(List<StylusPoint> points)
-        {
-            if (points.Count < 3) return points;
-
-            var smoothedPoints = new List<StylusPoint>();
-            smoothedPoints.Add(points[0]); // 添加第一个点
-
-            for (int i = 1; i < points.Count - 1; i++)
-            {
-                var prev = points[i - 1];
-                var curr = points[i];
-                var next = points[i + 1];
-
-                // 计算角度变化
-                double angle1 = Math.Atan2(curr.Y - prev.Y, curr.X - prev.X);
-                double angle2 = Math.Atan2(next.Y - curr.Y, next.X - curr.X);
-                double angleDiff = Math.Abs(angle2 - angle1);
-                
-                // 标准化角度差
-                if (angleDiff > Math.PI) angleDiff = 2 * Math.PI - angleDiff;
-
-                // 如果角度变化太大，认为是拐点
-                if (angleDiff > Math.PI / 4) // 45度阈值
-                {
-                    // 应用拐点平滑
-                    double smoothingFactor = CornerSmoothingStrength;
-                    double smoothedX = curr.X * (1.0 - smoothingFactor) + 
-                                     (prev.X + next.X) * 0.5 * smoothingFactor;
-                    double smoothedY = curr.Y * (1.0 - smoothingFactor) + 
-                                     (prev.Y + next.Y) * 0.5 * smoothingFactor;
-
-                    var smoothedPoint = new StylusPoint(smoothedX, smoothedY, curr.PressureFactor);
-                    smoothedPoints.Add(smoothedPoint);
-                }
-                else
-                {
-                    smoothedPoints.Add(curr);
-                }
-            }
-
-            smoothedPoints.Add(points[points.Count - 1]); // 添加最后一个点
-            return smoothedPoints;
-        }
-
-        /// <summary>
-        /// 计算贝塞尔曲线上的点
-        /// </summary>
-        private Point CalculateBezierPoint(Point p0, Point p1, Point p2, Point p3, double t)
+        private StylusPoint CubicBezier(StylusPoint p0, StylusPoint p1, StylusPoint p2, StylusPoint p3, double t)
         {
             double u = 1 - t;
             double tt = t * t;
             double uu = u * u;
             double uuu = uu * u;
             double ttt = tt * t;
-
-            Point point = new Point();
-            point.X = uuu * p0.X + 3 * uu * t * p1.X + 3 * u * tt * p2.X + ttt * p3.X;
-            point.Y = uuu * p0.Y + 3 * uu * t * p1.Y + 3 * u * tt * p2.Y + ttt * p3.Y;
-
-            return point;
+            double x = uuu * p0.X + 3 * uu * t * p1.X + 3 * u * tt * p2.X + ttt * p3.X;
+            double y = uuu * p0.Y + 3 * uu * t * p1.Y + 3 * u * tt * p2.Y + ttt * p3.Y;
+            float pressure = (float)(p1.PressureFactor * (1 - t) + p2.PressureFactor * t);
+            if (pressure < 0.1f) pressure = 0.1f;
+            return new StylusPoint(x, y, pressure);
         }
 
-        /// <summary>
-        /// 计算两点间距离
-        /// </summary>
-        private double GetDistance(Point p1, Point p2)
+        private List<StylusPoint> SlidingWindowSmooth(List<StylusPoint> points, int window = 5)
         {
-            return Math.Sqrt((p1.X - p2.X) * (p1.X - p2.X) + (p1.Y - p2.Y) * (p1.Y - p2.Y));
-        }
-
-        /// <summary>
-        /// 插值两点间的点
-        /// </summary>
-        private StylusPoint InterpolatePoint(StylusPoint p1, StylusPoint p2, double ratio)
-        {
-            return new StylusPoint(
-                p1.X + (p2.X - p1.X) * ratio,
-                p1.Y + (p2.Y - p1.Y) * ratio,
-                InterpolatePressure(p1.PressureFactor, p2.PressureFactor, ratio)
-            );
-        }
-
-        /// <summary>
-        /// 插值压感值
-        /// </summary>
-        private float InterpolatePressure(float p1, float p2, double ratio)
-        {
-            // 使用平滑的插值函数来减少毛刺
-            double smoothRatio = SmoothStep(ratio);
-            return (float)(p1 + (p2 - p1) * smoothRatio);
-        }
-
-        /// <summary>
-        /// 平滑步进函数，用于减少插值时的毛刺
-        /// </summary>
-        private double SmoothStep(double t)
-        {
-            // 使用三次平滑函数
-            return t * t * (3.0 - 2.0 * t);
-        }
-
-        /// <summary>
-        /// 应用手抖修正
-        /// </summary>
-        private List<StylusPoint> ApplyShakeCorrection(List<StylusPoint> points)
-        {
-            if (points.Count < 3) return points;
-
-            var correctedPoints = new List<StylusPoint>();
-            correctedPoints.Add(points[0]); // 添加第一个点
-
-            for (int i = 1; i < points.Count - 1; i++)
+            var result = new List<StylusPoint>();
+            int half = window / 2;
+            for (int i = 0; i < points.Count; i++)
             {
-                var prev = points[i - 1];
-                var curr = points[i];
-                var next = points[i + 1];
-
-                // 计算当前点的预期位置（基于前后点的线性插值）
-                double expectedX = (prev.X + next.X) / 2.0;
-                double expectedY = (prev.Y + next.Y) / 2.0;
-
-                // 计算当前点与预期位置的偏差
-                double deviationX = Math.Abs(curr.X - expectedX);
-                double deviationY = Math.Abs(curr.Y - expectedY);
-                double deviation = Math.Sqrt(deviationX * deviationX + deviationY * deviationY);
-
-                // 如果偏差超过阈值，认为是手抖
-                double shakeThreshold = 3.0; // 降低手抖检测阈值
-                if (deviation > shakeThreshold)
+                double sumX = 0, sumY = 0, sumP = 0;
+                int count = 0;
+                for (int j = Math.Max(0, i - half); j <= Math.Min(points.Count - 1, i + half); j++)
                 {
-                    // 应用手抖修正
-                    double correctionFactor = ShakeCorrectionStrength;
-                    double correctedX = curr.X + (expectedX - curr.X) * correctionFactor;
-                    double correctedY = curr.Y + (expectedY - curr.Y) * correctionFactor;
-
-                    // 保持压感值不变
-                    var correctedPoint = new StylusPoint(correctedX, correctedY, curr.PressureFactor);
-                    correctedPoints.Add(correctedPoint);
-                }
-                else
-                {
-                    correctedPoints.Add(curr);
+                    sumX += points[j].X;
+                    sumY += points[j].Y;
+                    sumP += points[j].PressureFactor;
+                    count++;
                 }
+                result.Add(new StylusPoint(sumX / count, sumY / count, (float)(sumP / count)));
             }
-
-            correctedPoints.Add(points[points.Count - 1]); // 添加最后一个点
-            return correctedPoints;
-        }
-
-        /// <summary>
-        /// 应用基于速度和时间的加权平滑
-        /// </summary>
-        private List<StylusPoint> ApplyVelocityTimeWeightedSmoothing(List<StylusPoint> points)
-        {
-            if (points.Count < 3) return points;
-
-            var smoothedPoints = new List<StylusPoint>();
-            smoothedPoints.Add(points[0]); // 添加第一个点
-
-            // 计算每个点的速度和加速度
-            var velocities = new List<double>();
-            var accelerations = new List<double>();
-            var timeWeights = new List<double>();
-
-            for (int i = 1; i < points.Count; i++)
-            {
-                var prev = points[i - 1];
-                var curr = points[i];
-
-                // 计算速度（距离/时间，这里假设时间间隔为1）
-                double velocity = GetDistance(prev.ToPoint(), curr.ToPoint());
-                velocities.Add(velocity);
-
-                // 计算加速度
-                if (i > 1)
-                {
-                    double prevVelocity = velocities[velocities.Count - 2];
-                    double acceleration = velocity - prevVelocity;
-                    accelerations.Add(acceleration);
-                }
-
-                // 计算时间权重（基于点的密度）
-                double timeWeight = 1.0;
-                if (i > 1)
-                {
-                    // 如果点过于密集，增加时间权重
-                    double avgDistance = velocity;
-                    if (avgDistance < 1.0) // 降低阈值
-                    {
-                        timeWeight = 1.5; // 增加权重
-                    }
-                    else if (avgDistance > 15.0) // 降低阈值
-                    {
-                        timeWeight = 0.5; // 减少权重
-                    }
-                }
-                timeWeights.Add(timeWeight);
-            }
-
-            // 应用加权平滑
-            for (int i = 1; i < points.Count - 1; i++)
-            {
-                var prev = points[i - 1];
-                var curr = points[i];
-                var next = points[i + 1];
-
-                // 计算速度权重
-                double velocityWeight = 1.0;
-                if (i < velocities.Count)
-                {
-                    double velocity = velocities[i - 1];
-                    // 速度越快，权重越大（更平滑）
-                    velocityWeight = Math.Min(2.0, velocity / 8.0 + 0.5); // 调整参数
-                }
-
-                // 计算加速度权重
-                double accelerationWeight = 1.0;
-                if (i < accelerations.Count)
-                {
-                    double acceleration = Math.Abs(accelerations[i - 1]);
-                    // 加速度越大，权重越大（更平滑）
-                    accelerationWeight = Math.Min(2.0, acceleration / 3.0 + 0.5); // 调整参数
-                }
-
-                // 获取时间权重
-                double timeWeight = timeWeights[i];
-
-                // 综合权重
-                double totalWeight = (velocityWeight * VelocityWeightedSmoothingStrength + 
-                                   accelerationWeight * VelocityWeightedSmoothingStrength + 
-                                   timeWeight * TimeWeightedSmoothingStrength) / 3.0;
-
-                // 应用加权平滑
-                double smoothedX = curr.X;
-                double smoothedY = curr.Y;
-
-                if (totalWeight > 1.0)
-                {
-                    // 向相邻点加权平均
-                    double weight = (totalWeight - 1.0) * 0.2; // 减少最大影响
-                    smoothedX = curr.X * (1.0 - weight) + (prev.X + next.X) * 0.5 * weight;
-                    smoothedY = curr.Y * (1.0 - weight) + (prev.Y + next.Y) * 0.5 * weight;
-                }
-
-                var smoothedPoint = new StylusPoint(smoothedX, smoothedY, curr.PressureFactor);
-                smoothedPoints.Add(smoothedPoint);
-            }
-
-            smoothedPoints.Add(points[points.Count - 1]); // 添加最后一个点
-            return smoothedPoints;
-        }
-
-        /// <summary>
-        /// 处理低采样率笔画
-        /// </summary>
-        private Stroke HandleLowSamplingRateStroke(Stroke stroke)
-        {
-            var points = stroke.StylusPoints.ToList();
-            var resultPoints = new List<StylusPoint>();
-
-            // 对于低采样率，使用简单的线性插值而不是贝塞尔曲线
-            for (int i = 0; i < points.Count - 1; i++)
-            {
-                var currentPoint = points[i];
-                var nextPoint = points[i + 1];
-
-                // 添加当前点
-                resultPoints.Add(currentPoint);
-
-                // 计算两点间距离
-                double distance = GetDistance(currentPoint.ToPoint(), nextPoint.ToPoint());
-
-                // 如果距离太远，插入中间点（1像素级别）
-                if (distance > 15.0) // 降低阈值
-                {
-                    int segments = Math.Max(2, Math.Min(8, (int)(distance / PixelLevelPrecision))); // 使用像素级别精度
-                    for (int j = 1; j < segments; j++)
-                    {
-                        double ratio = (double)j / segments;
-                        var interpolatedPoint = InterpolatePoint(currentPoint, nextPoint, ratio);
-                        resultPoints.Add(interpolatedPoint);
-                    }
-                }
-            }
-
-            // 添加最后一个点
-            resultPoints.Add(points[points.Count - 1]);
-
-            // 应用轻微的手抖修正
-            var shakeCorrectedPoints = ApplyShakeCorrection(resultPoints);
-
-            // 修正收尾相连问题
-            var fixedStylusPoints = FixEndToEndConnection(new StylusPointCollection(shakeCorrectedPoints));
-
-            // 创建新的笔画
-            var smoothedStroke = new Stroke(fixedStylusPoints)
-            {
-                DrawingAttributes = stroke.DrawingAttributes.Clone()
-            };
-
-            return smoothedStroke;
-        }
-
-        /// <summary>
-        /// 应用自适应平滑
-        /// </summary>
-        private void ApplyAdaptiveSmoothing(List<StylusPoint> points)
-        {
-            if (!EnableAdaptiveSmoothing || points.Count < 3)
-                return;
-
-            // 计算笔迹的速度变化
-            var speeds = new List<double>();
-            for (int i = 1; i < points.Count - 1; i++)
-            {
-                var prev = points[i - 1].ToPoint();
-                var curr = points[i].ToPoint();
-                var next = points[i + 1].ToPoint();
-
-                double speed1 = GetDistance(prev, curr);
-                double speed2 = GetDistance(curr, next);
-                double avgSpeed = (speed1 + speed2) / 2.0;
-
-                speeds.Add(avgSpeed);
-            }
-
-            // 根据速度调整平滑强度
-            if (speeds.Count > 0)
-            {
-                double avgSpeed = speeds.Average();
-                double maxSpeed = speeds.Max();
-                double minSpeed = speeds.Min();
-
-                // 速度变化越大，平滑强度越小
-                double speedVariation = (maxSpeed - minSpeed) / avgSpeed;
-                SmoothingStrength = Math.Max(0.1, Math.Min(0.9, SmoothingStrength * (1.0 - speedVariation * 0.3)));
-            }
+            return result;
         }
     }
 } 
\ No newline at end of file
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 96c460bc..57795b2c 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -788,81 +788,12 @@
                                                          Toggled="ToggleSwitchFitToCurve_Toggled" />
                                     </ui:SimpleStackPanel>
                                     <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                                                            <TextBlock Foreground="#fafafa" Text="使用高级贝塞尔曲线平滑（推荐）"
-                                               VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
+                                        <TextBlock Foreground="#fafafa" Text="使用高级曲线平滑（推荐）"
+                                                   VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
                                         <ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchAdvancedBezierSmoothing"
                                                          IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
                                                          Toggled="ToggleSwitchAdvancedBezierSmoothing_Toggled" />
                                     </ui:SimpleStackPanel>
-                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
-                                                         Visibility="{Binding ElementName=ToggleSwitchAdvancedBezierSmoothing, Path=IsOn, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                        <TextBlock Foreground="#fafafa" Text="平滑强度" VerticalAlignment="Center"
-                                                   FontSize="14" Margin="0,0,16,0" />
-                                        <Slider Name="AdvancedSmoothingStrengthSlider" Width="150" Minimum="0.1" Maximum="1.0" 
-                                                Value="0.7" TickFrequency="0.1" IsSnapToTickEnabled="True"
-                                                ValueChanged="AdvancedSmoothingStrengthSlider_ValueChanged" />
-                                        <TextBlock Foreground="#fafafa" Text="{Binding ElementName=AdvancedSmoothingStrengthSlider, Path=Value, StringFormat={}{0:F1}}" 
-                                                   VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
-                                    </ui:SimpleStackPanel>
-                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
-                                                         Visibility="{Binding ElementName=ToggleSwitchAdvancedBezierSmoothing, Path=IsOn, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                        <TextBlock Foreground="#fafafa" Text="张力参数" VerticalAlignment="Center"
-                                                   FontSize="14" Margin="0,0,16,0" />
-                                        <Slider Name="AdvancedSmoothingTensionSlider" Width="150" Minimum="0.1" Maximum="1.0" 
-                                                Value="0.4" TickFrequency="0.1" IsSnapToTickEnabled="True"
-                                                ValueChanged="AdvancedSmoothingTensionSlider_ValueChanged" />
-                                        <TextBlock Foreground="#fafafa" Text="{Binding ElementName=AdvancedSmoothingTensionSlider, Path=Value, StringFormat={}{0:F1}}" 
-                                                   VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
-                                    </ui:SimpleStackPanel>
-                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
-                                                         Visibility="{Binding ElementName=ToggleSwitchAdvancedBezierSmoothing, Path=IsOn, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                        <TextBlock Foreground="#fafafa" Text="启用自适应平滑" VerticalAlignment="Center"
-                                                   FontSize="14" Margin="0,0,16,0" />
-                                        <ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchEnableAdaptiveSmoothing"
-                                                         IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
-                                                         Toggled="ToggleSwitchEnableAdaptiveSmoothing_Toggled" />
-                                    </ui:SimpleStackPanel>
-                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
-                                                         Visibility="{Binding ElementName=ToggleSwitchAdvancedBezierSmoothing, Path=IsOn, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                        <TextBlock Foreground="#fafafa" Text="手抖修正强度" VerticalAlignment="Center"
-                                                   FontSize="14" Margin="0,0,16,0" />
-                                        <Slider Name="ShakeCorrectionStrengthSlider" Width="150" Minimum="0.0" Maximum="1.0" 
-                                                Value="0.8" TickFrequency="0.1" IsSnapToTickEnabled="True"
-                                                ValueChanged="ShakeCorrectionStrengthSlider_ValueChanged" />
-                                        <TextBlock Foreground="#fafafa" Text="{Binding ElementName=ShakeCorrectionStrengthSlider, Path=Value, StringFormat={}{0:F1}}" 
-                                                   VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
-                                    </ui:SimpleStackPanel>
-                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
-                                                         Visibility="{Binding ElementName=ToggleSwitchAdvancedBezierSmoothing, Path=IsOn, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                        <TextBlock Foreground="#fafafa" Text="速度加权强度" VerticalAlignment="Center"
-                                                   FontSize="14" Margin="0,0,16,0" />
-                                        <Slider Name="VelocityWeightedSmoothingStrengthSlider" Width="150" Minimum="0.0" Maximum="1.0" 
-                                                Value="0.8" TickFrequency="0.1" IsSnapToTickEnabled="True"
-                                                ValueChanged="VelocityWeightedSmoothingStrengthSlider_ValueChanged" />
-                                        <TextBlock Foreground="#fafafa" Text="{Binding ElementName=VelocityWeightedSmoothingStrengthSlider, Path=Value, StringFormat={}{0:F1}}" 
-                                                   VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
-                                    </ui:SimpleStackPanel>
-                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
-                                                         Visibility="{Binding ElementName=ToggleSwitchAdvancedBezierSmoothing, Path=IsOn, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                        <TextBlock Foreground="#fafafa" Text="时间加权强度" VerticalAlignment="Center"
-                                                   FontSize="14" Margin="0,0,16,0" />
-                                        <Slider Name="TimeWeightedSmoothingStrengthSlider" Width="150" Minimum="0.0" Maximum="1.0" 
-                                                Value="0.6" TickFrequency="0.1" IsSnapToTickEnabled="True"
-                                                ValueChanged="TimeWeightedSmoothingStrengthSlider_ValueChanged" />
-                                        <TextBlock Foreground="#fafafa" Text="{Binding ElementName=TimeWeightedSmoothingStrengthSlider, Path=Value, StringFormat={}{0:F1}}" 
-                                                   VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
-                                    </ui:SimpleStackPanel>
-                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left"
-                                                         Visibility="{Binding ElementName=ToggleSwitchAdvancedBezierSmoothing, Path=IsOn, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                        <TextBlock Foreground="#fafafa" Text="拐点平滑强度" VerticalAlignment="Center"
-                                                   FontSize="14" Margin="0,0,16,0" />
-                                        <Slider Name="CornerSmoothingStrengthSlider" Width="150" Minimum="0.0" Maximum="1.0" 
-                                                Value="0.8" TickFrequency="0.1" IsSnapToTickEnabled="True"
-                                                ValueChanged="CornerSmoothingStrengthSlider_ValueChanged" />
-                                        <TextBlock Foreground="#fafafa" Text="{Binding ElementName=CornerSmoothingStrengthSlider, Path=Value, StringFormat={}{0:F1}}" 
-                                                   VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
-                                    </ui:SimpleStackPanel>
-                                    <TextBlock Text="# 高级贝塞尔曲线平滑（推荐）：使用自定义算法替代系统默认的FitToCurve，提供更平滑的笔迹效果并解决墨迹闪烁、毛刺和低采样率收尾相连问题。启用高级平滑时会自动禁用系统默认平滑。手抖修正可自动检测并修正手抖造成的偏差，速度加权平滑根据笔迹速度调整平滑强度，时间加权平滑根据点密度调整平滑参数，自适应平滑会根据笔迹速度自动调整平滑参数。低采样率时自动使用线性插值避免收尾相连。" TextWrapping="Wrap" Foreground="#a1a1aa" />
                                 </ui:SimpleStackPanel>
                             </GroupBox>
                             <!-- 新增：崩溃后操作设置 -->
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index 241c34be..494e1029 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs	
@@ -1310,49 +1310,7 @@ namespace Ink_Canvas {
             
             SaveSettingsToFile();
         }
-
-        private void AdvancedSmoothingStrengthSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) {
-            if (!isLoaded) return;
-            Settings.Canvas.AdvancedSmoothingStrength = AdvancedSmoothingStrengthSlider.Value;
-            SaveSettingsToFile();
-        }
-
-        private void AdvancedSmoothingTensionSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) {
-            if (!isLoaded) return;
-            Settings.Canvas.AdvancedSmoothingTension = AdvancedSmoothingTensionSlider.Value;
-            SaveSettingsToFile();
-        }
-
-        private void ToggleSwitchEnableAdaptiveSmoothing_Toggled(object sender, RoutedEventArgs e) {
-            if (!isLoaded) return;
-            Settings.Canvas.EnableAdaptiveSmoothing = ToggleSwitchEnableAdaptiveSmoothing.IsOn;
-            SaveSettingsToFile();
-        }
-
-        private void ShakeCorrectionStrengthSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) {
-            if (!isLoaded) return;
-            Settings.Canvas.ShakeCorrectionStrength = ShakeCorrectionStrengthSlider.Value;
-            SaveSettingsToFile();
-        }
-
-        private void VelocityWeightedSmoothingStrengthSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) {
-            if (!isLoaded) return;
-            Settings.Canvas.VelocityWeightedSmoothingStrength = VelocityWeightedSmoothingStrengthSlider.Value;
-            SaveSettingsToFile();
-        }
-
-        private void TimeWeightedSmoothingStrengthSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) {
-            if (!isLoaded) return;
-            Settings.Canvas.TimeWeightedSmoothingStrength = TimeWeightedSmoothingStrengthSlider.Value;
-            SaveSettingsToFile();
-        }
-
-        private void CornerSmoothingStrengthSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) {
-            if (!isLoaded) return;
-            Settings.Canvas.CornerSmoothingStrength = CornerSmoothingStrengthSlider.Value;
-            SaveSettingsToFile();
-        }
-
+        
         private void ToggleSwitchAutoSaveStrokesInPowerPoint_Toggled(object sender, RoutedEventArgs e) {
             if (!isLoaded) return;
             Settings.PowerPointSettings.IsAutoSaveStrokesInPowerPoint = ToggleSwitchAutoSaveStrokesInPowerPoint.IsOn;
@@ -1655,12 +1613,6 @@ namespace Ink_Canvas {
             Settings.Canvas.ClearCanvasAndClearTimeMachine = false;
             Settings.Canvas.FitToCurve = false;
             Settings.Canvas.UseAdvancedBezierSmoothing = true;
-            Settings.Canvas.AdvancedSmoothingStrength = 0.4;
-            Settings.Canvas.AdvancedSmoothingTension = 0.3;
-            Settings.Canvas.EnableAdaptiveSmoothing = true;
-            Settings.Canvas.ShakeCorrectionStrength = 0.6;
-            Settings.Canvas.VelocityWeightedSmoothingStrength = 0.7;
-            Settings.Canvas.TimeWeightedSmoothingStrength = 0.5;
             Settings.Canvas.EnablePressureTouchMode = false;
             Settings.Canvas.DisablePressure = false;
             Settings.Canvas.AutoStraightenLine = true;
diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
index c23a553e..5eb58242 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
@@ -537,13 +537,6 @@ namespace Ink_Canvas {
                     ToggleSwitchAdvancedBezierSmoothing.IsOn = false;
                     drawingAttributes.FitToCurve = false;
                 }
-                AdvancedSmoothingStrengthSlider.Value = Settings.Canvas.AdvancedSmoothingStrength;
-                AdvancedSmoothingTensionSlider.Value = Settings.Canvas.AdvancedSmoothingTension;
-                ToggleSwitchEnableAdaptiveSmoothing.IsOn = Settings.Canvas.EnableAdaptiveSmoothing;
-                ShakeCorrectionStrengthSlider.Value = Settings.Canvas.ShakeCorrectionStrength;
-                VelocityWeightedSmoothingStrengthSlider.Value = Settings.Canvas.VelocityWeightedSmoothingStrength;
-                TimeWeightedSmoothingStrengthSlider.Value = Settings.Canvas.TimeWeightedSmoothingStrength;
-                CornerSmoothingStrengthSlider.Value = Settings.Canvas.CornerSmoothingStrength;
                 
                 // 初始化直线自动拉直相关设置
                 ToggleSwitchAutoStraightenLine.IsOn = Settings.Canvas.AutoStraightenLine;
diff --git a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
index 46e93c0a..24bfc805 100644
--- a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
@@ -1597,14 +1597,6 @@ namespace Ink_Canvas {
                 {
                     var advancedSmoothing = new Helpers.AdvancedBezierSmoothing
                     {
-                        SmoothingStrength = Settings.Canvas.AdvancedSmoothingStrength,
-                        Tension = Settings.Canvas.AdvancedSmoothingTension,
-                        EnableAdaptiveSmoothing = Settings.Canvas.EnableAdaptiveSmoothing,
-                        ShakeCorrectionStrength = Settings.Canvas.ShakeCorrectionStrength,
-                        VelocityWeightedSmoothingStrength = Settings.Canvas.VelocityWeightedSmoothingStrength,
-                        TimeWeightedSmoothingStrength = Settings.Canvas.TimeWeightedSmoothingStrength,
-                        CornerSmoothingStrength = Settings.Canvas.CornerSmoothingStrength,
-                        PixelLevelPrecision = Settings.Canvas.PixelLevelPrecision
                     };
 
                     // 对临时笔画应用平滑
diff --git a/Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs b/Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs
index e8a8d710..648317a0 100644
--- a/Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs	
@@ -589,14 +589,6 @@ namespace Ink_Canvas {
                     {
                         var advancedSmoothing = new Helpers.AdvancedBezierSmoothing
                         {
-                            SmoothingStrength = Settings.Canvas.AdvancedSmoothingStrength,
-                            Tension = Settings.Canvas.AdvancedSmoothingTension,
-                            EnableAdaptiveSmoothing = Settings.Canvas.EnableAdaptiveSmoothing,
-                            ShakeCorrectionStrength = Settings.Canvas.ShakeCorrectionStrength,
-                            VelocityWeightedSmoothingStrength = Settings.Canvas.VelocityWeightedSmoothingStrength,
-                            TimeWeightedSmoothingStrength = Settings.Canvas.TimeWeightedSmoothingStrength,
-                            CornerSmoothingStrength = Settings.Canvas.CornerSmoothingStrength,
-                            PixelLevelPrecision = Settings.Canvas.PixelLevelPrecision
                         };
 
                         var smoothedStroke = advancedSmoothing.SmoothStroke(e.Stroke);
diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs
index bf648ba5..5a96a5c2 100644
--- a/Ink Canvas/Resources/Settings.cs	
+++ b/Ink Canvas/Resources/Settings.cs	
@@ -50,22 +50,6 @@ namespace Ink_Canvas
         public bool FitToCurve { get; set; } = false; // 默认关闭原来的贝塞尔平滑
         [JsonProperty("useAdvancedBezierSmoothing")]
         public bool UseAdvancedBezierSmoothing { get; set; } = true; // 默认启用高级贝塞尔曲线平滑
-        [JsonProperty("advancedSmoothingStrength")]
-        public double AdvancedSmoothingStrength { get; set; } = 0.7; // 高级平滑强度 (0.0 - 1.0)，提高以获得更平滑的效果
-        [JsonProperty("advancedSmoothingTension")]
-        public double AdvancedSmoothingTension { get; set; } = 0.4; // 高级平滑张力 (0.0 - 1.0)，适度提高以获得更平滑的曲线
-        [JsonProperty("enableAdaptiveSmoothing")]
-        public bool EnableAdaptiveSmoothing { get; set; } = true; // 是否启用自适应平滑
-        [JsonProperty("shakeCorrectionStrength")]
-        public double ShakeCorrectionStrength { get; set; } = 0.8; // 手抖修正强度 (0.0 - 1.0)，提高以减少手抖
-        [JsonProperty("velocityWeightedSmoothingStrength")]
-        public double VelocityWeightedSmoothingStrength { get; set; } = 0.8; // 速度加权平滑强度 (0.0 - 1.0)，提高以获得更平滑的效果
-        [JsonProperty("timeWeightedSmoothingStrength")]
-        public double TimeWeightedSmoothingStrength { get; set; } = 0.6; // 时间加权平滑强度 (0.0 - 1.0)，提高以获得更平滑的效果
-        [JsonProperty("cornerSmoothingStrength")]
-        public double CornerSmoothingStrength { get; set; } = 0.8; // 拐点平滑强度 (0.0 - 1.0)，新增参数用于更平滑的拐点
-        [JsonProperty("pixelLevelPrecision")]
-        public double PixelLevelPrecision { get; set; } = 1.0; // 1像素级别插点精度，新增参数用于精确控制
         [JsonProperty("clearCanvasAndClearTimeMachine")]
         public bool ClearCanvasAndClearTimeMachine { get; set; } = false;
         [JsonProperty("enablePressureTouchMode")]

From a714d312a81ace0223a5ecd2199938c5cf6ebeb2 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 19:23:43 +0800
Subject: [PATCH 25/32] =?UTF-8?q?improve:PPT=E6=97=A5=E5=BF=97=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index b845042c..b56b73df 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -175,7 +175,11 @@ namespace Ink_Canvas {
                 }
             }
             catch (Exception ex) {
-                LogHelper.WriteLogToFile($"检查PPT状态失败: {ex.ToString()}", LogHelper.LogType.Error);
+                // 只记录非“操作无法使用”异常
+                if (!(ex is System.Runtime.InteropServices.COMException comEx && (uint)comEx.HResult == 0x800401E3))
+                {
+                    LogHelper.WriteLogToFile($"检查PPT状态失败: {ex.ToString()}", LogHelper.LogType.Error);
+                }
                 //StackPanelPPTControls.Visibility = Visibility.Collapsed;
                 Application.Current.Dispatcher.Invoke(() => { BtnPPTSlideShow.Visibility = Visibility.Collapsed; });
                 timerCheckPPT.Start();

From e209af9c57c795ad8c33d19596f2e54cb6010ea4 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 19:31:01 +0800
Subject: [PATCH 26/32] =?UTF-8?q?improve:PPT=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 73 ++++++++++--------------------
 1 file changed, 25 insertions(+), 48 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index b56b73df..84c86eb9 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -1348,66 +1348,43 @@ namespace Ink_Canvas {
         {
             try
             {
-                // 检查是否有其他WPS窗口打开
-                var wpsProcesses = Process.GetProcessesByName("wpp");
-                if (wpsProcesses.Length > 1)
-                {
-                    LogHelper.WriteLogToFile($"检测到{wpsProcesses.Length}个WPP进程", LogHelper.LogType.Trace);
-                    return true;
-                }
-
-                // 检查是否有WPS相关的其他进程
-                var kingsoftProcesses = Process.GetProcessesByName("wps");
-                if (kingsoftProcesses.Length > 0)
-                {
-                    LogHelper.WriteLogToFile("检测到WPS主程序进程", LogHelper.LogType.Trace);
-                    return true;
-                }
-
-                // 检查是否有其他WPS相关进程
-                var etProcesses = Process.GetProcessesByName("et"); // WPS表格
-                var wpsProcesses2 = Process.GetProcessesByName("wps"); // WPS文字
-                if (etProcesses.Length > 0 || wpsProcesses2.Length > 0)
-                {
-                    LogHelper.WriteLogToFile($"检测到其他WPS组件进程：ET进程{etProcesses.Length}个，WPS进程{wpsProcesses2.Length}个", LogHelper.LogType.Trace);
-                    return true;
-                }
-
-                // 检查当前WPP进程是否有多个窗口
                 if (wppProcess != null)
                 {
-                    try
+                    int windowCount = 0;
+                    EnumWindows((hWnd, lParam) =>
                     {
-                        var windowCount = 0;
-                        foreach (ProcessThread thread in wppProcess.Threads)
+                        try
                         {
-                            // 简单检查是否有多个窗口句柄
-                            if (thread.ThreadState == System.Diagnostics.ThreadState.Running)
+                            uint windowProcessId;
+                            GetWindowThreadProcessId(hWnd, out windowProcessId);
+                            if (windowProcessId == wppProcess.Id)
                             {
-                                windowCount++;
+                                // 检查窗口标题是否为空，避免统计后台窗口
+                                var windowTitle = new System.Text.StringBuilder(256);
+                                GetWindowText(hWnd, windowTitle, 256);
+                                var title = windowTitle.ToString().Trim();
+                                if (!string.IsNullOrEmpty(title))
+                                {
+                                    windowCount++;
+                                }
                             }
                         }
-                        
-                        if (windowCount > 1)
-                        {
-                            LogHelper.WriteLogToFile($"当前WPP进程有{windowCount}个活动线程，可能存在多个窗口", LogHelper.LogType.Trace);
-                            return true;
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.WriteLogToFile($"检查WPP进程窗口失败: {ex.ToString()}", LogHelper.LogType.Error);
-                    }
-                }
+                        catch { }
+                        return true;
+                    }, IntPtr.Zero);
 
-                // 通过枚举窗口检查是否有其他WPS窗口
-                return CheckForWpsWindowsByEnumeration();
+                    // 只要不是多文档演示（即窗口数<=1），就允许Kill
+                    if (windowCount <= 1)
+                        return false; // 没有其他文档窗口，可以Kill
+                    else
+                        return true;  // 有多个窗口，说明是多文档演示，不Kill
+                }
             }
             catch (Exception ex)
             {
-                LogHelper.WriteLogToFile($"检查其他WPS窗口失败: {ex.ToString()}", LogHelper.LogType.Error);
-                return false; // 出错时保守处理，不强制关闭
+                LogHelper.WriteLogToFile($"检查WPP进程窗口失败: {ex.ToString()}", LogHelper.LogType.Error);
             }
+            return false; // 出错时，默认允许Kill
         }
 
         private bool CheckForWpsWindowsByEnumeration()

From 1f83c84a7ed54088ad7c33e7cc1a197c5322b3ae Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 19:36:58 +0800
Subject: [PATCH 27/32] =?UTF-8?q?improve:PPT=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 72 ++++++++++++++++++++----------
 1 file changed, 49 insertions(+), 23 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index 84c86eb9..c31affa7 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -33,6 +33,10 @@ namespace Ink_Canvas {
         [DllImport("user32.dll")]
         private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId, out uint lpdwThreadId);
 
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool IsWindowVisible(IntPtr hWnd);
+
         private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
 
         public static Microsoft.Office.Interop.PowerPoint.Application pptApplication = null;
@@ -174,12 +178,24 @@ namespace Ink_Canvas {
                     }
                 }
             }
-            catch (Exception ex) {
-                // 只记录非“操作无法使用”异常
-                if (!(ex is System.Runtime.InteropServices.COMException comEx && (uint)comEx.HResult == 0x800401E3))
+            catch (Exception ex)
+            {
+                // 忽略常见的COM对象失效错误
+                if (ex is System.Runtime.InteropServices.COMException comEx)
                 {
-                    LogHelper.WriteLogToFile($"检查PPT状态失败: {ex.ToString()}", LogHelper.LogType.Error);
+                    uint hr = (uint)comEx.HResult;
+                    // 0x800401E3: 操作无法使用
+                    // 0x80004005: 未指定错误（常见于PPT已关闭）
+                    // 0x800706B5: RPC服务器不可用
+                    if (hr == 0x800401E3 || hr == 0x80004005 || hr == 0x800706B5)
+                    {
+                        // 可选：LogHelper.WriteLogToFile($"忽略已知COM异常: {hr:X}", LogHelper.LogType.Trace);
+                        Application.Current.Dispatcher.Invoke(() => { BtnPPTSlideShow.Visibility = Visibility.Collapsed; });
+                        timerCheckPPT.Start();
+                        return;
+                    }
                 }
+                LogHelper.WriteLogToFile($"检查PPT状态失败: {ex.ToString()}", LogHelper.LogType.Error);
                 //StackPanelPPTControls.Visibility = Visibility.Collapsed;
                 Application.Current.Dispatcher.Invoke(() => { BtnPPTSlideShow.Visibility = Visibility.Collapsed; });
                 timerCheckPPT.Start();
@@ -1348,41 +1364,51 @@ namespace Ink_Canvas {
         {
             try
             {
-                if (wppProcess != null)
+                // 检查所有WPS相关进程（wpp、wps、et）是否有前台窗口
+                string[] wpsProcessNames = { "wpp", "wps", "et" };
+                var wpsPids = new System.Collections.Generic.HashSet<int>();
+                foreach (var name in wpsProcessNames)
                 {
-                    int windowCount = 0;
-                    EnumWindows((hWnd, lParam) =>
+                    foreach (var proc in System.Diagnostics.Process.GetProcessesByName(name))
                     {
-                        try
+                        wpsPids.Add(proc.Id);
+                    }
+                }
+
+                bool hasVisibleWpsWindow = false;
+                EnumWindows((hWnd, lParam) =>
+                {
+                    try
+                    {
+                        uint windowProcessId;
+                        GetWindowThreadProcessId(hWnd, out windowProcessId);
+                        if (wpsPids.Contains((int)windowProcessId))
                         {
-                            uint windowProcessId;
-                            GetWindowThreadProcessId(hWnd, out windowProcessId);
-                            if (windowProcessId == wppProcess.Id)
+                            // 检查窗口是否可见
+                            if (IsWindowVisible(hWnd))
                             {
-                                // 检查窗口标题是否为空，避免统计后台窗口
+                                // 检查窗口标题是否为空
                                 var windowTitle = new System.Text.StringBuilder(256);
                                 GetWindowText(hWnd, windowTitle, 256);
                                 var title = windowTitle.ToString().Trim();
                                 if (!string.IsNullOrEmpty(title))
                                 {
-                                    windowCount++;
+                                    hasVisibleWpsWindow = true;
+                                    return false; // 找到一个就停止枚举
                                 }
                             }
                         }
-                        catch { }
-                        return true;
-                    }, IntPtr.Zero);
+                    }
+                    catch { }
+                    return true;
+                }, IntPtr.Zero);
 
-                    // 只要不是多文档演示（即窗口数<=1），就允许Kill
-                    if (windowCount <= 1)
-                        return false; // 没有其他文档窗口，可以Kill
-                    else
-                        return true;  // 有多个窗口，说明是多文档演示，不Kill
-                }
+                // 只要没有任何WPS相关可见窗口，就允许Kill
+                return hasVisibleWpsWindow;
             }
             catch (Exception ex)
             {
-                LogHelper.WriteLogToFile($"检查WPP进程窗口失败: {ex.ToString()}", LogHelper.LogType.Error);
+                LogHelper.WriteLogToFile($"检查WPS前台窗口失败: {ex.ToString()}", LogHelper.LogType.Error);
             }
             return false; // 出错时，默认允许Kill
         }

From 1f0b5cebebf77cfc3772fff6d4e4a7b0b538a049 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 19:40:10 +0800
Subject: [PATCH 28/32] =?UTF-8?q?improve:PPT=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 56 ++++++++++++------------------
 1 file changed, 23 insertions(+), 33 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index c31affa7..8873c648 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -1364,51 +1364,41 @@ namespace Ink_Canvas {
         {
             try
             {
-                // 检查所有WPS相关进程（wpp、wps、et）是否有前台窗口
-                string[] wpsProcessNames = { "wpp", "wps", "et" };
-                var wpsPids = new System.Collections.Generic.HashSet<int>();
-                foreach (var name in wpsProcessNames)
+                if (wppProcess != null)
                 {
-                    foreach (var proc in System.Diagnostics.Process.GetProcessesByName(name))
+                    bool hasVisibleWppWindow = false;
+                    EnumWindows((hWnd, lParam) =>
                     {
-                        wpsPids.Add(proc.Id);
-                    }
-                }
-
-                bool hasVisibleWpsWindow = false;
-                EnumWindows((hWnd, lParam) =>
-                {
-                    try
-                    {
-                        uint windowProcessId;
-                        GetWindowThreadProcessId(hWnd, out windowProcessId);
-                        if (wpsPids.Contains((int)windowProcessId))
+                        try
                         {
-                            // 检查窗口是否可见
-                            if (IsWindowVisible(hWnd))
+                            uint windowProcessId;
+                            GetWindowThreadProcessId(hWnd, out windowProcessId);
+                            if ((int)windowProcessId == wppProcess.Id)
                             {
-                                // 检查窗口标题是否为空
-                                var windowTitle = new System.Text.StringBuilder(256);
-                                GetWindowText(hWnd, windowTitle, 256);
-                                var title = windowTitle.ToString().Trim();
-                                if (!string.IsNullOrEmpty(title))
+                                if (IsWindowVisible(hWnd))
                                 {
-                                    hasVisibleWpsWindow = true;
-                                    return false; // 找到一个就停止枚举
+                                    var windowTitle = new System.Text.StringBuilder(256);
+                                    GetWindowText(hWnd, windowTitle, 256);
+                                    var title = windowTitle.ToString().Trim();
+                                    if (!string.IsNullOrEmpty(title))
+                                    {
+                                        hasVisibleWppWindow = true;
+                                        return false; // 找到一个就停止枚举
+                                    }
                                 }
                             }
                         }
-                    }
-                    catch { }
-                    return true;
-                }, IntPtr.Zero);
+                        catch { }
+                        return true;
+                    }, IntPtr.Zero);
 
-                // 只要没有任何WPS相关可见窗口，就允许Kill
-                return hasVisibleWpsWindow;
+                    // 只要当前wpp进程没有可见窗口，就允许Kill
+                    return hasVisibleWppWindow;
+                }
             }
             catch (Exception ex)
             {
-                LogHelper.WriteLogToFile($"检查WPS前台窗口失败: {ex.ToString()}", LogHelper.LogType.Error);
+                LogHelper.WriteLogToFile($"检查WPP窗口失败: {ex.ToString()}", LogHelper.LogType.Error);
             }
             return false; // 出错时，默认允许Kill
         }

From 23432465ac2e13f1fdc137414839cc1da9327461 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 19:52:59 +0800
Subject: [PATCH 29/32] =?UTF-8?q?improve:PPT=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 40 ++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index 8873c648..f592c173 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -1342,6 +1342,46 @@ namespace Ink_Canvas {
                     // 更保守的关闭策略：只有在超过0.5秒且检查次数超过2次时才强制关闭
                     if (timeSinceRecord.TotalSeconds > 0.5 && wppProcessCheckCount >= 2)
                     {
+                        // 新增：检查所有WPS文档是否已保存
+                        bool allSaved = true;
+                        try
+                        {
+                            if (pptApplication != null)
+                            {
+                                foreach (Presentation pres in pptApplication.Presentations)
+                                {
+                                    if (pres.Saved == MsoTriState.msoFalse)
+                                    {
+                                        allSaved = false;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"检查WPS文档保存状态失败: {ex.ToString()}", LogHelper.LogType.Error);
+                            allSaved = false; // 出错时默认不安全
+                        }
+
+                        if (!allSaved)
+                        {
+                            // 弹窗提示用户
+                            bool userContinue = false;
+                            Application.Current.Dispatcher.Invoke(() =>
+                            {
+                                var result = MessageBox.Show(
+                                    "检测到有未保存的WPS文档，强制关闭可能导致数据丢失。是否继续？",
+                                    "警告", MessageBoxButton.YesNo, MessageBoxImage.Warning);
+                                userContinue = (result == MessageBoxResult.Yes);
+                            });
+                            if (!userContinue)
+                            {
+                                LogHelper.WriteLogToFile("用户取消了强制关闭WPS进程", LogHelper.LogType.Trace);
+                                StopWppProcessCheckTimer();
+                                return;
+                            }
+                        }
                         LogHelper.WriteLogToFile($"检测到长时间未关闭的 WPP 进程（已运行{timeSinceRecord.TotalSeconds:F1}秒，检查{wppProcessCheckCount}次），开始强制关闭", LogHelper.LogType.Event);
                         wppProcess.Kill();
                         LogHelper.WriteLogToFile("强制关闭 WPP 进程成功", LogHelper.LogType.Event);

From ba6303dca0946c1dbc2635ff5e6534b62cb5e10d Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 21:01:15 +0800
Subject: [PATCH 30/32] =?UTF-8?q?improve:=E7=AA=97=E5=8F=A3=E6=97=A0?=
 =?UTF-8?q?=E7=84=A6=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index ec53312a..7171b72f 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -34,6 +34,14 @@ namespace Ink_Canvas {
         private System.Windows.Controls.Canvas currentCanvas = null;
         private AutoUpdateHelper.UpdateLineGroup AvailableLatestLineGroup = null;
 
+        // Win32 API声明和常量（用于无焦点窗口）
+        [DllImport("user32.dll")]
+        private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+        [DllImport("user32.dll")]
+        private static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+        private const int GWL_EXSTYLE = -20;
+        private const int WS_EX_NOACTIVATE = 0x08000000;
+
         #region Window Initialization
 
         public MainWindow() {
@@ -310,6 +318,11 @@ namespace Ink_Canvas {
 
             // 初始化插件系统
             InitializePluginSystem();
+
+            // 设置窗口为无焦点（不会抢占焦点）
+            var hwnd = new WindowInteropHelper(this).Handle;
+            int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
+            SetWindowLong(hwnd, GWL_EXSTYLE, exStyle | WS_EX_NOACTIVATE);
         }
 
         private void SystemEventsOnDisplaySettingsChanged(object sender, EventArgs e) {

From 476503338f5363324173f4dc5b692b2820996d14 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 21:03:42 +0800
Subject: [PATCH 31/32] =?UTF-8?q?improve:=E7=AA=97=E5=8F=A3=E6=97=A0?=
 =?UTF-8?q?=E7=84=A6=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml.cs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 7171b72f..fd1a73bb 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -133,6 +133,15 @@ namespace Ink_Canvas {
             ShowPage(currentPageIndex);
         }
 
+        protected override void OnSourceInitialized(EventArgs e)
+        {
+            base.OnSourceInitialized(e);
+            // 设置窗口为无焦点（不会抢占焦点）
+            var hwnd = new WindowInteropHelper(this).Handle;
+            int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
+            SetWindowLong(hwnd, GWL_EXSTYLE, exStyle | WS_EX_NOACTIVATE);
+        }
+
         #endregion
 
         #region Ink Canvas Functions
@@ -318,11 +327,6 @@ namespace Ink_Canvas {
 
             // 初始化插件系统
             InitializePluginSystem();
-
-            // 设置窗口为无焦点（不会抢占焦点）
-            var hwnd = new WindowInteropHelper(this).Handle;
-            int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
-            SetWindowLong(hwnd, GWL_EXSTYLE, exStyle | WS_EX_NOACTIVATE);
         }
 
         private void SystemEventsOnDisplaySettingsChanged(object sender, EventArgs e) {

From 15198c32ea1b7976124a71b3581ae9c4cbe58208 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 21:14:59 +0800
Subject: [PATCH 32/32] =?UTF-8?q?improve:PPT=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/AssemblyInfo.cs                    |  4 ++--
 Ink Canvas/MainWindow.xaml                    | 10 ++++++++++
 Ink Canvas/MainWindow_cs/MW_PPT.cs            |  7 +++++++
 Ink Canvas/MainWindow_cs/MW_Settings.cs       |  6 ++++++
 Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs |  2 +-
 Ink Canvas/Properties/AssemblyInfo.cs         |  4 ++--
 Ink Canvas/Resources/Settings.cs              |  2 ++
 7 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/Ink Canvas/AssemblyInfo.cs b/Ink Canvas/AssemblyInfo.cs
index 8b9e8ae7..6b93c545 100644
--- a/Ink Canvas/AssemblyInfo.cs	
+++ b/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.1.5")]
-[assembly: AssemblyFileVersion("1.7.1.5")]
+[assembly: AssemblyVersion("1.7.1.6")]
+[assembly: AssemblyFileVersion("1.7.1.6")]
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 57795b2c..d4040534 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -1190,6 +1190,16 @@
                                                          IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
                                                          Toggled="ToggleSwitchSupportWPS_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" />
+                                        <TextBlock Foreground="#fafafa" Text="WPP进程查杀（防止WPP残留进程）" VerticalAlignment="Center"
+                                                   FontSize="14" Margin="0,0,16,0" />
+                                        <ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchEnableWppProcessKill"
+                                                         IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                         Toggled="ToggleSwitchEnableWppProcessKill_Toggled" />
+                                    </ui:SimpleStackPanel>
+                                    <TextBlock Text="# 关闭后将不会自动查杀WPP残留进程，可能导致WPP关闭卡顿或无法彻底退出。" TextWrapping="Wrap" Foreground="#a1a1aa" />
                                     <Border BorderBrush="#ef4444"
                                             BorderThickness="2" Padding="8" CornerRadius="6" Background="#991b1b">
                                         <ui:SimpleStackPanel Orientation="Horizontal" Spacing="4">
diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index f592c173..6ec9b909 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -1315,6 +1315,13 @@ namespace Ink_Canvas {
                     return;
                 }
 
+                if (!Settings.PowerPointSettings.EnableWppProcessKill)
+                {
+                    LogHelper.WriteLogToFile("WPP进程查杀功能已被关闭，跳过查杀", LogHelper.LogType.Trace);
+                    StopWppProcessCheckTimer();
+                    return;
+                }
+
                 // 刷新进程状态
                 wppProcess.Refresh();
                 wppProcessCheckCount++;
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index 494e1029..e888316f 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs	
@@ -2159,5 +2159,11 @@ namespace Ink_Canvas {
             dialog.Owner = this;
             dialog.ShowDialog();
         }
+
+        private void ToggleSwitchEnableWppProcessKill_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            Settings.PowerPointSettings.EnableWppProcessKill = ToggleSwitchEnableWppProcessKill.IsOn;
+            SaveSettingsToFile();
+        }
     }
 }
diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
index 5eb58242..3637ffbd 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
@@ -375,6 +375,7 @@ namespace Ink_Canvas {
 
                 ToggleSwitchAutoSaveScreenShotInPowerPoint.IsOn =
                     Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint;
+                ToggleSwitchEnableWppProcessKill.IsOn = Settings.PowerPointSettings.EnableWppProcessKill;
             } else {
                 Settings.PowerPointSettings = new PowerPointSettings();
             }
@@ -548,7 +549,6 @@ namespace Ink_Canvas {
                 
                 // 初始化直线端点吸附相关设置
                 ToggleSwitchLineEndpointSnapping.IsOn = Settings.Canvas.LineEndpointSnapping;
-                LineEndpointSnappingThresholdSlider.Value = Settings.Canvas.LineEndpointSnappingThreshold;
             } else {
                 Settings.Canvas = new Canvas();
             }
diff --git a/Ink Canvas/Properties/AssemblyInfo.cs b/Ink Canvas/Properties/AssemblyInfo.cs
index 615034c4..e1fed332 100644
--- a/Ink Canvas/Properties/AssemblyInfo.cs	
+++ b/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.1.5")]
-[assembly: AssemblyFileVersion("1.7.1.5")]
+[assembly: AssemblyVersion("1.7.1.6")]
+[assembly: AssemblyFileVersion("1.7.1.6")]
diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs
index 5a96a5c2..53976b30 100644
--- a/Ink Canvas/Resources/Settings.cs	
+++ b/Ink Canvas/Resources/Settings.cs	
@@ -235,6 +235,8 @@ namespace Ink_Canvas
         public bool IsEnableFingerGestureSlideShowControl { get; set; } = true;
         [JsonProperty("isSupportWPS")]
         public bool IsSupportWPS { get; set; } = true;
+        [JsonProperty("enableWppProcessKill")]
+        public bool EnableWppProcessKill { get; set; } = true;
     }
 
     public class Automation