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-03-21 16:57:14 +08:00
parent 68b588ee7b
commit e7c77b173d
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/Helpers/PPTManager.cs
+9 -9
View File
@@ -67,6 +67,7 @@ namespace Ink_Canvas.Helpers
private readonly object _lockObject = new object(); private readonly object _lockObject = new object();
private bool _disposed; private bool _disposed;
private static bool IsPptBusyHResult(uint hr) => hr == 0x80010001 || hr == 0x8001010A; private static bool IsPptBusyHResult(uint hr) => hr == 0x80010001 || hr == 0x8001010A;
private static bool IsNoActivePresentationHResult(uint hr) => hr == 0x80048240;
private const int ConnectionCheckIntervalTicks = 3; private const int ConnectionCheckIntervalTicks = 3;
private const int SlideShowCheckIntervalTicks = 2; private const int SlideShowCheckIntervalTicks = 2;
private const int WpsCheckIntervalTicks = 6; private const int WpsCheckIntervalTicks = 6;
@@ -328,7 +329,7 @@ namespace Ink_Canvas.Helpers
_cachedIsConnected = true; _cachedIsConnected = true;
// 在主线程中注册事件，确保COM对象在正确的线程中 // 在主线程中注册事件，确保COM对象在正确的线程中
Application.Current?.Dispatcher?.Invoke(() => Application.Current?.Dispatcher?.BeginInvoke(new Action(() =>
{ {
try try
{ {
@@ -343,9 +344,8 @@ namespace Ink_Canvas.Helpers
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.WriteLogToFile($"PPT事件注册失败: {ex}", LogHelper.LogType.Error); LogHelper.WriteLogToFile($"PPT事件注册失败: {ex}", LogHelper.LogType.Error);
throw; // 重新抛出异常，让外层处理
} }
}, DispatcherPriority.Normal, CancellationToken.None, TimeSpan.FromSeconds(2)); }), DispatcherPriority.Normal);
// 获取当前演示文稿信息 // 获取当前演示文稿信息
UpdateCurrentPresentationInfo(); UpdateCurrentPresentationInfo();
@@ -386,7 +386,7 @@ namespace Ink_Canvas.Helpers
if (Marshal.IsComObject(PPTApplication)) if (Marshal.IsComObject(PPTApplication))
{ {
// 尝试在主线程中取消事件注册 // 尝试在主线程中取消事件注册
Application.Current?.Dispatcher?.Invoke(() => Application.Current?.Dispatcher?.BeginInvoke(new Action(() =>
{ {
try try
{ {
@@ -410,7 +410,7 @@ namespace Ink_Canvas.Helpers
{ {
LogHelper.WriteLogToFile($"取消PPT事件注册时发生异常: {ex}", LogHelper.LogType.Warning); LogHelper.WriteLogToFile($"取消PPT事件注册时发生异常: {ex}", LogHelper.LogType.Warning);
} }
}, DispatcherPriority.Normal, CancellationToken.None, TimeSpan.FromSeconds(1)); }), DispatcherPriority.Normal);
} }
} }
catch (Exception ex) catch (Exception ex)
@@ -642,7 +642,7 @@ namespace Ink_Canvas.Helpers
catch (COMException comEx) catch (COMException comEx)
{ {
var hr = (uint)comEx.HResult; var hr = (uint)comEx.HResult;
if (hr != 0x8001010E && hr != 0x80004005) if (hr != 0x8001010E && hr != 0x80004005 && !IsNoActivePresentationHResult(hr))
{ {
LogHelper.WriteLogToFile($"获取当前幻灯片失败: {comEx.Message}", LogHelper.LogType.Warning); LogHelper.WriteLogToFile($"获取当前幻灯片失败: {comEx.Message}", LogHelper.LogType.Warning);
} }
@@ -664,7 +664,7 @@ namespace Ink_Canvas.Helpers
catch (COMException comEx) catch (COMException comEx)
{ {
var hr = (uint)comEx.HResult; var hr = (uint)comEx.HResult;
if (hr == 0x8001010E || hr == 0x80004005 || hr == 0x800706B5 || hr == 0x80048240) if (hr == 0x8001010E || hr == 0x80004005 || hr == 0x800706B5 || IsNoActivePresentationHResult(hr))
{ {
CurrentPresentation = null; CurrentPresentation = null;
CurrentSlides = null; CurrentSlides = null;
@@ -1076,7 +1076,7 @@ namespace Ink_Canvas.Helpers
catch (COMException comEx) catch (COMException comEx)
{ {
var hr = (uint)comEx.HResult; var hr = (uint)comEx.HResult;
if (hr == 0x80048240 || IsPptBusyHResult(hr)) if (IsNoActivePresentationHResult(hr) || IsPptBusyHResult(hr))
return null; return null;
throw; throw;
} }
@@ -1094,7 +1094,7 @@ namespace Ink_Canvas.Helpers
var hr = (uint)comEx.HResult; var hr = (uint)comEx.HResult;
if (!IsPptBusyHResult(hr) && (hr == 0x8001010E || hr == 0x80004005)) if (!IsPptBusyHResult(hr) && (hr == 0x8001010E || hr == 0x80004005))
DisconnectFromPPT(); DisconnectFromPPT();
if (!IsPptBusyHResult(hr) && hr != 0x80048240) if (!IsPptBusyHResult(hr) && !IsNoActivePresentationHResult(hr))
LogHelper.WriteLogToFile($"获取当前活跃演示文稿失败: {comEx.Message}", LogHelper.LogType.Warning); LogHelper.WriteLogToFile($"获取当前活跃演示文稿失败: {comEx.Message}", LogHelper.LogType.Warning);
return CurrentPresentation; return CurrentPresentation;
} }
Ink Canvas/MainWindow_cs/MW_Hotkeys.cs
+6
View File
@@ -90,6 +90,12 @@ namespace Ink_Canvas
/// <param name="e">执行路由事件参数</param> /// <param name="e">执行路由事件参数</param>
internal void KeyExit(object sender, ExecutedRoutedEventArgs e) internal void KeyExit(object sender, ExecutedRoutedEventArgs e)
{ {
if (currentMode != 0)
{
ImageBlackboard_MouseUp(lastBorderMouseDownObject, null);
return;
}
if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible) BtnPPTSlideShowEnd_Click(BtnPPTSlideShowEnd, null); if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible) BtnPPTSlideShowEnd_Click(BtnPPTSlideShowEnd, null);
} }