From b3cb53b48245ffcf578af349281429e4ab0615ef Mon Sep 17 00:00:00 2001 From: CJKmkp <2564608840@qq.com> Date: Sun, 18 Jan 2026 08:06:03 +0800 Subject: [PATCH] =?UTF-8?q?improve:PPT=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/Helpers/PPTManager.cs | 36 +++++------------------------- Ink Canvas/MainWindow_cs/MW_PPT.cs | 8 +++---- 2 files changed, 10 insertions(+), 34 deletions(-) diff --git a/Ink Canvas/Helpers/PPTManager.cs b/Ink Canvas/Helpers/PPTManager.cs index bf29da51..a3bd95b4 100644 --- a/Ink Canvas/Helpers/PPTManager.cs +++ b/Ink Canvas/Helpers/PPTManager.cs @@ -20,10 +20,10 @@ namespace Ink_Canvas.Helpers public class PPTManager : IDisposable { #region Events - public event Action SlideShowBegin; - public event Action SlideShowNextSlide; - public event Action SlideShowEnd; - public event Action PresentationOpen; + public event Action SlideShowBegin; + public event Action SlideShowNextSlide; + public event Action SlideShowEnd; + public event Action PresentationOpen; public event Action PPTConnectionChanged; public event Action SlideShowStateChanged; #endregion @@ -398,31 +398,7 @@ namespace Ink_Canvas.Helpers { try { - _updateTime = DateTime.Now; - _lastPolledSlideNumber = -1; - - if (_pptActivePresentation != null) - { - try - { - int currentPage = GetCurrentSlideIndex(_pptSlideShowWindow); - int totalPage = GetTotalSlideIndex(_pptActivePresentation); - - if (currentPage >= totalPage) _polling = 1; - else _polling = 0; - - SlidesCount = totalPage; - _lastPolledSlideNumber = currentPage; - } - catch - { - _polling = 1; - _lastPolledSlideNumber = -1; - } - } - - UpdateCurrentPresentationInfo(); - SlideShowBegin?.Invoke(_pptSlideShowWindow); + OnSlideShowBegin(_pptSlideShowWindow); } catch (Exception ex) { @@ -1500,7 +1476,7 @@ namespace Ink_Canvas.Helpers } } - private void OnSlideShowBegin(SlideShowWindow wn) + private void OnSlideShowBegin(object wn) { try { diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs index 88fd8915..d755c0a7 100644 --- a/Ink Canvas/MainWindow_cs/MW_PPT.cs +++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs @@ -519,7 +519,7 @@ namespace Ink_Canvas } } - private void OnPPTPresentationOpen(Presentation pres) + private void OnPPTPresentationOpen(object pres) { try { @@ -610,7 +610,7 @@ namespace Ink_Canvas } } - private async void OnPPTSlideShowBegin(SlideShowWindow wn) + private async void OnPPTSlideShowBegin(object wn) { try { @@ -785,7 +785,7 @@ namespace Ink_Canvas } } - private void OnPPTSlideShowNextSlide(SlideShowWindow wn) + private void OnPPTSlideShowNextSlide(object wn) { try { @@ -815,7 +815,7 @@ namespace Ink_Canvas } } - private async void OnPPTSlideShowEnd(Presentation pres) + private async void OnPPTSlideShowEnd(object pres) { try {