fix:issue # 262

Ink Canvas/MainWindow_cs/MW_PPT.cs

@@ -11,6 +11,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Ink;
 using System.Windows.Media;
 using System.Windows.Threading;
 using Application = System.Windows.Application;
@@ -104,6 +105,7 @@ namespace Ink_Canvas
         #region PPT Managers
         private PPTManager _pptManager;
         private MultiPPTInkManager _multiPPTInkManager;
+        private PPTInkManager _singlePPTInkManager;
         private PPTUIManager _pptUIManager;
 
         /// <summary>
@@ -133,11 +135,19 @@ namespace Ink_Canvas
                 _pptManager.PresentationClose += OnPPTPresentationClose;
                 _pptManager.SlideShowStateChanged += OnPPTSlideShowStateChanged;
 
-                // 初始化多PPT墨迹管理器
+                if (Settings.PowerPointSettings.IsSupportWPS)
+                {
+                    _singlePPTInkManager = new PPTInkManager();
+                    _singlePPTInkManager.IsAutoSaveEnabled = Settings.PowerPointSettings.IsAutoSaveStrokesInPowerPoint;
+                    _singlePPTInkManager.AutoSaveLocation = Settings.Automation.AutoSavedStrokesLocation;
+                }
+                else
+                {
                     _multiPPTInkManager = new MultiPPTInkManager();
                     _multiPPTInkManager.IsAutoSaveEnabled = Settings.PowerPointSettings.IsAutoSaveStrokesInPowerPoint;
                     _multiPPTInkManager.AutoSaveLocation = Settings.Automation.AutoSavedStrokesLocation;
                     _multiPPTInkManager.PPTManager = _pptManager;
+                }
 
                 // 初始化UI管理器
                 _pptUIManager = new PPTUIManager(this);
@@ -421,10 +431,12 @@ namespace Ink_Canvas
             {
                 _pptManager?.Dispose();
                 _multiPPTInkManager?.Dispose();
+                _singlePPTInkManager?.Dispose();
                 _longPressTimer?.Stop();
                 _longPressTimer = null;
                 _pptManager = null;
                 _multiPPTInkManager = null;
+                _singlePPTInkManager = null;
                 _pptUIManager = null;
 
                 // 清理PowerPoint进程守护
@@ -509,9 +521,15 @@ namespace Ink_Canvas
                     else
                     {
                         LogHelper.WriteLogToFile("PPT连接已断开", LogHelper.LogType.Event);
-                        // 清理墨迹管理器
+                        if (Settings.PowerPointSettings.IsSupportWPS)
+                        {
+                            _singlePPTInkManager?.ClearAllStrokes();
+                        }
+                        else
+                        {
                             _multiPPTInkManager?.ClearAllStrokes();
                         }
+                    }
                 });
             }
             catch (Exception ex)
@@ -535,8 +553,14 @@ namespace Ink_Canvas
                         TimeMachineHistories[0] = null;
                     }
 
-                    // 初始化多PPT墨迹管理器
+                    if (Settings.PowerPointSettings.IsSupportWPS)
+                    {
+                        _singlePPTInkManager?.InitializePresentation(pres);
+                    }
+                    else
+                    {
                         _multiPPTInkManager?.InitializePresentation(pres);
+                    }
 
                     // 处理跳转到首页或上次播放页的逻辑
                     HandlePresentationOpenNavigation(pres);
@@ -570,11 +594,15 @@ namespace Ink_Canvas
             {
                 Application.Current.Dispatcher.InvokeAsync(() =>
                 {
-                    // 保存所有墨迹
+                    if (Settings.PowerPointSettings.IsSupportWPS)
+                    {
+                        _singlePPTInkManager?.SaveAllStrokesToFile(pres);
+                    }
+                    else
+                    {
                         _multiPPTInkManager?.SaveAllStrokesToFile(pres);
-
-                    // 移除演示文稿管理器
                         _multiPPTInkManager?.RemovePresentation(pres);
+                    }
 
                     _pptUIManager?.UpdateConnectionStatus(false);
                 });
@@ -639,12 +667,17 @@ namespace Ink_Canvas
 
                 Application.Current.Dispatcher.Invoke(() =>
                 {
-                    // 获取当前活跃的演示文稿并切换到对应的墨迹管理器
                     var activePresentation = _pptManager?.GetCurrentActivePresentation();
                     if (activePresentation != null)
+                    {
+                        if (Settings.PowerPointSettings.IsSupportWPS)
+                        {
+                        }
+                        else
                         {
                             _multiPPTInkManager?.SwitchToPresentation(activePresentation);
                         }
+                    }
 
                     // 处理跳转到首页或上次播放位置
                     if (Settings.PowerPointSettings.IsAlwaysGoToFirstPageOnReenter)
@@ -767,12 +800,17 @@ namespace Ink_Canvas
             {
                 Application.Current.Dispatcher.InvokeAsync(() =>
                 {
-                    // 获取当前活跃的演示文稿并确保切换到正确的墨迹管理器
                     var activePresentation = _pptManager?.GetCurrentActivePresentation();
                     if (activePresentation != null)
+                    {
+                        if (Settings.PowerPointSettings.IsSupportWPS)
+                        {
+                        }
+                        else
                         {
                             _multiPPTInkManager?.SwitchToPresentation(activePresentation);
                         }
+                    }
 
                     var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
                     var totalSlides = _pptManager?.SlidesCount ?? 0;
@@ -824,8 +862,14 @@ namespace Ink_Canvas
                 if (isEnteredSlideShowEndEvent) return;
                 isEnteredSlideShowEndEvent = true;
 
-                // 保存所有墨迹
+                if (Settings.PowerPointSettings.IsSupportWPS)
+                {
+                    _singlePPTInkManager?.SaveAllStrokesToFile(pres);
+                }
+                else
+                {
                     _multiPPTInkManager?.SaveAllStrokesToFile(pres);
+                }
 
                 await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
@@ -1084,7 +1128,16 @@ namespace Ink_Canvas
         {
             try
             {
-                var strokes = _multiPPTInkManager?.LoadSlideStrokes(slideIndex);
+                StrokeCollection strokes = null;
+                if (Settings.PowerPointSettings.IsSupportWPS)
+                {
+                    strokes = _singlePPTInkManager?.LoadSlideStrokes(slideIndex);
+                }
+                else
+                {
+                    strokes = _multiPPTInkManager?.LoadSlideStrokes(slideIndex);
+                }
+
                 if (strokes != null)
                 {
                     inkCanvas.Strokes.Clear();
@@ -1104,17 +1157,20 @@ namespace Ink_Canvas
         {
             try
             {
-                // 获取当前活跃的演示文稿
+                if (Settings.PowerPointSettings.IsSupportWPS)
+                {
+                    _singlePPTInkManager?.ResetLockState();
+                }
+                else
+                {
                     var activePresentation = _pptManager?.GetCurrentActivePresentation();
                     if (activePresentation != null)
                     {
-                    // 切换到对应的墨迹管理器
                         _multiPPTInkManager?.SwitchToPresentation(activePresentation);
-
-                    // 重置锁定状态
                         _multiPPTInkManager?.ResetCurrentPresentationLockState();
                     }
                 }
+            }
             catch (Exception ex)
             {
                 LogHelper.WriteLogToFile($"重置墨迹管理器锁定状态失败: {ex}", LogHelper.LogType.Error);
@@ -1226,26 +1282,41 @@ namespace Ink_Canvas
                 // 如果有当前墨迹且不是第一次切换，先保存到当前页面
                 if (inkCanvas.Strokes.Count > 0 && currentSlideIndex > 0 && currentSlideIndex != newSlideIndex)
                 {
-                    // 检查是否可以写入墨迹
+                    bool canWrite = false;
-                    bool canWrite = _multiPPTInkManager?.CanWriteInk(currentSlideIndex) == true;
+                    if (Settings.PowerPointSettings.IsSupportWPS)
-
-                    if (canWrite)
                     {
-                        // 正常保存
+                        canWrite = _singlePPTInkManager?.CanWriteInk(currentSlideIndex) == true;
-                        _multiPPTInkManager?.SaveCurrentSlideStrokes(currentSlideIndex, inkCanvas.Strokes);
                     }
                     else
                     {
-                        // 墨迹被锁定，跳过保存以避免墨迹错页
+                        canWrite = _multiPPTInkManager?.CanWriteInk(currentSlideIndex) == true;
+                    }
+
+                    if (canWrite)
+                    {
+                        if (Settings.PowerPointSettings.IsSupportWPS)
+                        {
+                            _singlePPTInkManager?.SaveCurrentSlideStrokes(currentSlideIndex, inkCanvas.Strokes);
+                        }
+                        else
+                        {
+                            _multiPPTInkManager?.SaveCurrentSlideStrokes(currentSlideIndex, inkCanvas.Strokes);
+                        }
                     }
                 }
                 else if (inkCanvas.Strokes.Count > 0 && currentSlideIndex <= 0)
                 {
-                    // 无法获取当前页面索引时，不保存墨迹，直接清空
                 }
 
-                // 切换到新页面并加载墨迹
+                StrokeCollection newStrokes = null;
-                var newStrokes = _multiPPTInkManager?.SwitchToSlide(newSlideIndex, null);
+                if (Settings.PowerPointSettings.IsSupportWPS)
+                {
+                    newStrokes = _singlePPTInkManager?.SwitchToSlide(newSlideIndex, null);
+                }
+                else
+                {
+                    newStrokes = _multiPPTInkManager?.SwitchToSlide(newSlideIndex, null);
+                }
                 if (newStrokes != null)
                 {
                     inkCanvas.Strokes.Clear();
@@ -1385,9 +1456,16 @@ namespace Ink_Canvas
                     // 保存当前页墨迹
                     var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
                     if (currentSlide > 0)
+                    {
+                        if (Settings.PowerPointSettings.IsSupportWPS)
+                        {
+                            _singlePPTInkManager?.SaveCurrentSlideStrokes(currentSlide, inkCanvas.Strokes);
+                        }
+                        else
                         {
                             _multiPPTInkManager?.SaveCurrentSlideStrokes(currentSlide, inkCanvas.Strokes);
                         }
+                    }
 
                     // 保存截图（如果启用）
                     if (inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber &&
@@ -1425,9 +1503,16 @@ namespace Ink_Canvas
                     // 保存当前页墨迹
                     var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
                     if (currentSlide > 0)
+                    {
+                        if (Settings.PowerPointSettings.IsSupportWPS)
+                        {
+                            _singlePPTInkManager?.SaveCurrentSlideStrokes(currentSlide, inkCanvas.Strokes);
+                        }
+                        else
                         {
                             _multiPPTInkManager?.SaveCurrentSlideStrokes(currentSlide, inkCanvas.Strokes);
                         }
+                    }
 
                     // 保存截图（如果启用）
                     if (inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber &&
@@ -1584,8 +1669,15 @@ namespace Ink_Canvas
                 if (currentSlide > 0)
                 {
                     Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        if (Settings.PowerPointSettings.IsSupportWPS)
+                        {
+                            _singlePPTInkManager?.SaveCurrentSlideStrokes(currentSlide, inkCanvas.Strokes);
+                        }
+                        else
                         {
                             _multiPPTInkManager?.SaveCurrentSlideStrokes(currentSlide, inkCanvas.Strokes);
+                        }
                         timeMachine.ClearStrokeHistory();
                     });
                 }