CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve:PPT联动

Browse Source
This commit is contained in:
CJKmkp
2026-02-12 22:18:05 +08:00
parent 6de2e49047
commit 7226187ac6
4 changed files with 2157 additions and 4796 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/Helpers/COMPPTManager.cs
-1256
View File
File diff suppressed because it is too large Load Diff
Ink Canvas/Helpers/PPTManager.cs
+2093
View File
File diff suppressed because it is too large Load Diff
Ink Canvas/Helpers/ROTPPTManager.cs
-3456
View File
File diff suppressed because it is too large Load Diff
Ink Canvas/MainWindow_cs/MW_ROTPPT.cs → Ink Canvas/MainWindow_cs/MW_PPT.cs
+64 -84
View File
@@ -70,9 +70,9 @@ namespace Ink_Canvas
#region PPT Application Variables #region PPT Application Variables
public static Microsoft.Office.Interop.PowerPoint.Application pptApplication; public static Microsoft.Office.Interop.PowerPoint.Application pptApplication;
public static dynamic presentation; public static Presentation presentation;
public static dynamic slides; public static Slides slides;
public static dynamic slide; public static Slide slide;
public static int slidescount; public static int slidescount;
#endregion #endregion
@@ -105,13 +105,14 @@ namespace Ink_Canvas
#endregion #endregion
#region PPT Managers #region PPT Managers
private IPPTLinkManager _pptManager; private PPTManager _pptManager;
private PPTInkManager _singlePPTInkManager; private PPTInkManager _singlePPTInkManager;
private PPTUIManager _pptUIManager; private PPTUIManager _pptUIManager;
private bool IsUsingRotPptLink => Settings.PowerPointSettings.UseRotPptLink; /// <summary>
/// 获取PPT管理器实例
public IPPTLinkManager PPTManager => _pptManager; /// </summary>
public PPTManager PPTManager => _pptManager;
#endregion #endregion
#region PPT Manager Initialization #region PPT Manager Initialization
@@ -119,25 +120,11 @@ namespace Ink_Canvas
{ {
try try
{ {
try
{
_pptManager?.StopMonitoring();
}
catch
{
}
// 初始化长按定时器 // 初始化长按定时器
InitializeLongPressTimer(); InitializeLongPressTimer();
if (IsUsingRotPptLink) // 初始化PPT管理器
{ _pptManager = new PPTManager();
_pptManager = new PPTManager();
}
else
{
_pptManager = new ComPPTManager();
}
_pptManager.IsSupportWPS = Settings.PowerPointSettings.IsSupportWPS; _pptManager.IsSupportWPS = Settings.PowerPointSettings.IsSupportWPS;
// 注册事件 // 注册事件
@@ -146,6 +133,7 @@ namespace Ink_Canvas
_pptManager.SlideShowNextSlide += OnPPTSlideShowNextSlide; _pptManager.SlideShowNextSlide += OnPPTSlideShowNextSlide;
_pptManager.SlideShowEnd += OnPPTSlideShowEnd; _pptManager.SlideShowEnd += OnPPTSlideShowEnd;
_pptManager.PresentationOpen += OnPPTPresentationOpen; _pptManager.PresentationOpen += OnPPTPresentationOpen;
_pptManager.PresentationClose += OnPPTPresentationClose;
_pptManager.SlideShowStateChanged += OnPPTSlideShowStateChanged; _pptManager.SlideShowStateChanged += OnPPTSlideShowStateChanged;
_singlePPTInkManager = new PPTInkManager(); _singlePPTInkManager = new PPTInkManager();
@@ -184,17 +172,8 @@ namespace Ink_Canvas
private void StopPPTMonitoring() private void StopPPTMonitoring()
{ {
try _pptManager?.StopMonitoring();
{ LogHelper.WriteLogToFile("PPT监控已停止", LogHelper.LogType.Event);
_pptManager?.StopMonitoring();
_pptManager?.Dispose();
_pptManager = null;
LogHelper.WriteLogToFile("PPT监控已停止并释放当前 PPT 管理器实例", LogHelper.LogType.Event);
}
catch (Exception ex)
{
LogHelper.WriteLogToFile($"停止PPT监控或释放PPT管理器失败: {ex}", LogHelper.LogType.Error);
}
} }
#region PowerPoint Application Management #region PowerPoint Application Management
@@ -541,11 +520,10 @@ namespace Ink_Canvas
} }
} }
private void OnPPTPresentationOpen(object pres) private void OnPPTPresentationOpen(Presentation pres)
{ {
try try
{ {
dynamic presObj = pres;
Application.Current.Dispatcher.InvokeAsync(() => Application.Current.Dispatcher.InvokeAsync(() =>
{ {
// 在初始化墨迹管理器之前，先清理画布上的所有墨迹 // 在初始化墨迹管理器之前，先清理画布上的所有墨迹
@@ -557,26 +535,26 @@ namespace Ink_Canvas
TimeMachineHistories[0] = null; TimeMachineHistories[0] = null;
} }
_singlePPTInkManager?.InitializePresentation(presObj as Presentation); _singlePPTInkManager?.InitializePresentation(pres);
// 处理跳转到首页或上次播放页的逻辑 // 处理跳转到首页或上次播放页的逻辑
HandlePresentationOpenNavigation(presObj); HandlePresentationOpenNavigation(pres);
// 检查隐藏幻灯片 // 检查隐藏幻灯片
if (Settings.PowerPointSettings.IsNotifyHiddenPage) if (Settings.PowerPointSettings.IsNotifyHiddenPage)
{ {
CheckAndNotifyHiddenSlides(presObj); CheckAndNotifyHiddenSlides(pres);
} }
// 检查自动播放设置 // 检查自动播放设置
if (Settings.PowerPointSettings.IsNotifyAutoPlayPresentation) if (Settings.PowerPointSettings.IsNotifyAutoPlayPresentation)
{ {
CheckAndNotifyAutoPlaySettings(presObj); CheckAndNotifyAutoPlaySettings(pres);
} }
_pptUIManager?.UpdateConnectionStatus(true); _pptUIManager?.UpdateConnectionStatus(true);
LogHelper.WriteLogToFile($"已打开新演示文稿: {presObj.Name}，墨迹状态已清理", LogHelper.LogType.Event); LogHelper.WriteLogToFile($"已打开新演示文稿: {pres.Name}，墨迹状态已清理", LogHelper.LogType.Event);
}); });
} }
catch (Exception ex) catch (Exception ex)
@@ -632,11 +610,10 @@ namespace Ink_Canvas
} }
} }
private async void OnPPTSlideShowBegin(object wn) private async void OnPPTSlideShowBegin(SlideShowWindow wn)
{ {
try try
{ {
dynamic wnObj = wn;
if (Settings.Automation.IsAutoFoldInPPTSlideShow) if (Settings.Automation.IsAutoFoldInPPTSlideShow)
{ {
if (!isFloatingBarFolded) if (!isFloatingBarFolded)
@@ -654,14 +631,14 @@ namespace Ink_Canvas
await Application.Current.Dispatcher.InvokeAsync(async () => await Application.Current.Dispatcher.InvokeAsync(async () =>
{ {
dynamic activePresentation = null; Presentation activePresentation = null;
int currentSlide = 0; int currentSlide = 0;
int totalSlides = 0; int totalSlides = 0;
if (wnObj?.View != null && wnObj.Presentation != null) if (wn?.View != null && wn.Presentation != null)
{ {
activePresentation = wnObj.Presentation; activePresentation = wn.Presentation;
currentSlide = wnObj.View.CurrentShowPosition; currentSlide = wn.View.CurrentShowPosition;
totalSlides = activePresentation.Slides.Count; totalSlides = activePresentation.Slides.Count;
// 初始化当前播放页码跟踪 // 初始化当前播放页码跟踪
_currentSlideShowPosition = currentSlide; _currentSlideShowPosition = currentSlide;
@@ -681,7 +658,7 @@ namespace Ink_Canvas
{ {
try try
{ {
_singlePPTInkManager.InitializePresentation(activePresentation as Presentation); _singlePPTInkManager.InitializePresentation(activePresentation);
} }
catch (Exception) catch (Exception)
{ {
@@ -807,20 +784,19 @@ namespace Ink_Canvas
} }
} }
private void OnPPTSlideShowNextSlide(object wn) private void OnPPTSlideShowNextSlide(SlideShowWindow wn)
{ {
try try
{ {
dynamic wnObj = wn;
Application.Current.Dispatcher.InvokeAsync(() => Application.Current.Dispatcher.InvokeAsync(() =>
{ {
if (wnObj?.View == null || wnObj.Presentation == null) if (wn?.View == null || wn.Presentation == null)
{ {
return; return;
} }
var currentSlide = wnObj.View.CurrentShowPosition; var currentSlide = wn.View.CurrentShowPosition;
dynamic activePresentation = wnObj.Presentation; var activePresentation = wn.Presentation;
var totalSlides = activePresentation.Slides.Count; var totalSlides = activePresentation.Slides.Count;
// 更新当前播放页码 // 更新当前播放页码
@@ -837,11 +813,10 @@ namespace Ink_Canvas
} }
} }
private async void OnPPTSlideShowEnd(object pres) private async void OnPPTSlideShowEnd(Presentation pres)
{ {
try try
{ {
dynamic presObj = pres;
if (Settings.Automation.IsAutoFoldAfterPPTSlideShow && !isFloatingBarFolded) if (Settings.Automation.IsAutoFoldAfterPPTSlideShow && !isFloatingBarFolded)
{ {
FoldFloatingBar_MouseUp(new object(), null); FoldFloatingBar_MouseUp(new object(), null);
@@ -863,9 +838,9 @@ namespace Ink_Canvas
// 如果无法获取，尝试从演示文稿的SlideShowWindow获取 // 如果无法获取，尝试从演示文稿的SlideShowWindow获取
try try
{ {
if (presObj.SlideShowWindow != null && presObj.SlideShowWindow.View != null) if (pres.SlideShowWindow != null && pres.SlideShowWindow.View != null)
{ {
currentPage = presObj.SlideShowWindow.View.CurrentShowPosition; currentPage = pres.SlideShowWindow.View.CurrentShowPosition;
} }
} }
catch { } catch { }
@@ -873,7 +848,7 @@ namespace Ink_Canvas
} }
// 保存墨迹和位置信息 // 保存墨迹和位置信息
_singlePPTInkManager?.SaveAllStrokesToFile(presObj as Presentation, currentPage); _singlePPTInkManager?.SaveAllStrokesToFile(pres, currentPage);
await Application.Current.Dispatcher.InvokeAsync(() => await Application.Current.Dispatcher.InvokeAsync(() =>
{ {
@@ -973,7 +948,7 @@ namespace Ink_Canvas
#endregion #endregion
#region Helper Methods #region Helper Methods
private void HandlePresentationOpenNavigation(dynamic pres) private void HandlePresentationOpenNavigation(Presentation pres)
{ {
try try
{ {
@@ -992,7 +967,7 @@ namespace Ink_Canvas
} }
} }
private void ShowPreviousPageNotification(dynamic pres) private void ShowPreviousPageNotification(Presentation pres)
{ {
try try
{ {
@@ -1006,7 +981,7 @@ namespace Ink_Canvas
if (!File.Exists(positionFile)) return; if (!File.Exists(positionFile)) return;
if (int.TryParse(File.ReadAllText(positionFile), out int page) && page > 0) if (int.TryParse(File.ReadAllText(positionFile), out var page) && page > 0)
{ {
_lastPlaybackPage = page; _lastPlaybackPage = page;
new YesOrNoNotificationWindow($"上次播放到了第 {page} 页, 是否立即跳转", () => new YesOrNoNotificationWindow($"上次播放到了第 {page} 页, 是否立即跳转", () =>
@@ -1015,8 +990,7 @@ namespace Ink_Canvas
{ {
if (_pptManager?.PPTApplication != null) if (_pptManager?.PPTApplication != null)
{ {
dynamic pptApp = _pptManager.PPTApplication; if (_pptManager.PPTApplication.SlideShowWindows.Count >= 1)
if (pptApp.SlideShowWindows.Count >= 1)
{ {
pres.SlideShowWindow.View.GotoSlide(page); pres.SlideShowWindow.View.GotoSlide(page);
} }
@@ -1039,14 +1013,14 @@ namespace Ink_Canvas
} }
} }
private void CheckAndNotifyHiddenSlides(dynamic pres) private void CheckAndNotifyHiddenSlides(Presentation pres)
{ {
try try
{ {
bool hasHiddenSlides = false; bool hasHiddenSlides = false;
if (pres?.Slides != null) if (pres?.Slides != null)
{ {
foreach (dynamic slide in pres.Slides) foreach (Slide slide in pres.Slides)
{ {
if (slide.SlideShowTransition.Hidden == MsoTriState.msoTrue) if (slide.SlideShowTransition.Hidden == MsoTriState.msoTrue)
{ {
@@ -1066,7 +1040,7 @@ namespace Ink_Canvas
{ {
if (pres?.Slides != null) if (pres?.Slides != null)
{ {
foreach (dynamic slide in pres.Slides) foreach (Slide slide in pres.Slides)
{ {
if (slide.SlideShowTransition.Hidden == MsoTriState.msoTrue) if (slide.SlideShowTransition.Hidden == MsoTriState.msoTrue)
slide.SlideShowTransition.Hidden = MsoTriState.msoFalse; slide.SlideShowTransition.Hidden = MsoTriState.msoFalse;
@@ -1092,7 +1066,7 @@ namespace Ink_Canvas
} }
} }
private void CheckAndNotifyAutoPlaySettings(dynamic pres) private void CheckAndNotifyAutoPlaySettings(Presentation pres)
{ {
try try
{ {
@@ -1101,7 +1075,7 @@ namespace Ink_Canvas
bool hasSlideTimings = false; bool hasSlideTimings = false;
if (pres?.Slides != null) if (pres?.Slides != null)
{ {
foreach (dynamic slide in pres.Slides) foreach (Slide slide in pres.Slides)
{ {
if (slide.SlideShowTransition.AdvanceOnTime == MsoTriState.msoTrue && if (slide.SlideShowTransition.AdvanceOnTime == MsoTriState.msoTrue &&
slide.SlideShowTransition.AdvanceTime > 0) slide.SlideShowTransition.AdvanceTime > 0)
@@ -1654,25 +1628,31 @@ namespace Ink_Canvas
}); });
} }
Application.Current.Dispatcher.Invoke(() => // 结束放映
if (_pptManager?.TryEndSlideShow() == true)
{ {
CursorIcon_Click(null, null); // 如果成功结束放映，等待OnPPTSlideShowEnd事件处理收纳状态恢复
}); }
else
await Task.Delay(100);
await Application.Current.Dispatcher.InvokeAsync(() => { }, System.Windows.Threading.DispatcherPriority.Background);
Application.Current.Dispatcher.BeginInvoke(new Action(() =>
{ {
try LogHelper.WriteLogToFile("结束幻灯片放映失败", LogHelper.LogType.Warning);
// 手动更新UI状态，防止事件未触发
await Application.Current.Dispatcher.InvokeAsync(() =>
{ {
_pptManager?.TryEndSlideShow(); _pptUIManager?.UpdateSlideShowStatus(false);
} _pptUIManager?.UpdateSidebarExitButtons(false);
catch (Exception ex) LogHelper.WriteLogToFile("手动更新放映结束UI状态", LogHelper.LogType.Trace);
{ });
LogHelper.WriteLogToFile($"结束放映时发生异常: {ex}", LogHelper.LogType.Error);
} // 手动处理自动收纳，因为OnPPTSlideShowEnd事件可能未触发
}), System.Windows.Threading.DispatcherPriority.Normal); await HandleManualSlideShowEnd();
}
HideSubPanels("cursor");
SetCurrentToolMode(InkCanvasEditingMode.None);
await Task.Delay(150);
if (!isFloatingBarFolded) if (!isFloatingBarFolded)
{ {
PureViewboxFloatingBarMarginAnimationInDesktopMode(); PureViewboxFloatingBarMarginAnimationInDesktopMode();