From 8c07e9b8a3dcad90e021184564b2f13c97571fed Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sat, 13 Sep 2025 19:54:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/Helpers/GlobalHotkeyManager.cs | 3 ---
Ink Canvas/Helpers/MultiPPTInkManager.cs | 2 --
Ink Canvas/Helpers/PPTInkManager.cs | 6 ------
Ink Canvas/Helpers/PPTManager.cs | 14 +++++---------
Ink Canvas/Helpers/PPTUIManager.cs | 1 -
Ink Canvas/MainWindow_cs/MW_PPT.cs | 8 --------
...vasForClass.csproj.AssemblyReference.cache | Bin 38044 -> 38181 bytes
7 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/Ink Canvas/Helpers/GlobalHotkeyManager.cs b/Ink Canvas/Helpers/GlobalHotkeyManager.cs
index 884df9bf..999016a4 100644
--- a/Ink Canvas/Helpers/GlobalHotkeyManager.cs
+++ b/Ink Canvas/Helpers/GlobalHotkeyManager.cs
@@ -354,9 +354,6 @@ namespace Ink_Canvas.Helpers
}
else
{
- LogHelper.WriteLogToFile("快捷键注册功能已经启用，重新加载快捷键设置");
- // 即使已经启用，也要重新加载快捷键设置以确保快捷键正常工作
- LoadHotkeysFromSettings();
}
}
catch (Exception ex)
diff --git a/Ink Canvas/Helpers/MultiPPTInkManager.cs b/Ink Canvas/Helpers/MultiPPTInkManager.cs
index c151dcec..4d464107 100644
--- a/Ink Canvas/Helpers/MultiPPTInkManager.cs
+++ b/Ink Canvas/Helpers/MultiPPTInkManager.cs
@@ -79,7 +79,6 @@ namespace Ink_Canvas.Helpers
// 设置为当前活跃的演示文稿
_currentActivePresentationId = presentationId;
- LogHelper.WriteLogToFile($"已初始化多PPT墨迹管理: {presentation.Name}, 幻灯片数量: {presentation.Slides.Count}", LogHelper.LogType.Event);
}
catch (Exception ex)
{
@@ -405,7 +404,6 @@ namespace Ink_Canvas.Helpers
if (manager != null)
{
manager.ResetLockState();
- LogHelper.WriteLogToFile("已重置当前演示文稿的墨迹锁定状态", LogHelper.LogType.Trace);
}
}
catch (Exception ex)
diff --git a/Ink Canvas/Helpers/PPTInkManager.cs b/Ink Canvas/Helpers/PPTInkManager.cs
index c4821379..93b0a4dc 100644
--- a/Ink Canvas/Helpers/PPTInkManager.cs
+++ b/Ink Canvas/Helpers/PPTInkManager.cs
@@ -94,7 +94,6 @@ namespace Ink_Canvas.Helpers
LoadSavedStrokes();
}
- LogHelper.WriteLogToFile($"已初始化演示文稿墨迹管理: {presentation.Name}, 幻灯片数量: {slideCount}", LogHelper.LogType.Trace);
}
catch (Exception ex)
{
@@ -192,7 +191,6 @@ namespace Ink_Canvas.Helpers
{
_memoryStreams[slideIndex].Position = 0;
var strokes = new StrokeCollection(_memoryStreams[slideIndex]);
- LogHelper.WriteLogToFile($"已加载第{slideIndex}页墨迹，笔画数量: {strokes.Count}", LogHelper.LogType.Trace);
return strokes;
}
}
@@ -236,7 +234,6 @@ namespace Ink_Canvas.Helpers
if (newStrokes.Count > 0)
{
- LogHelper.WriteLogToFile($"已切换到第{slideIndex}页，加载墨迹数量: {newStrokes.Count}", LogHelper.LogType.Trace);
}
return newStrokes;
@@ -328,7 +325,6 @@ namespace Ink_Canvas.Helpers
}
}
- LogHelper.WriteLogToFile($"已保存{savedCount}页墨迹到文件", LogHelper.LogType.Event);
}
catch (Exception ex)
{
@@ -375,7 +371,6 @@ namespace Ink_Canvas.Helpers
}
}
- LogHelper.WriteLogToFile($"已从文件加载{loadedCount}页墨迹", LogHelper.LogType.Event);
}
catch (Exception ex)
{
@@ -450,7 +445,6 @@ namespace Ink_Canvas.Helpers
_lockedSlideIndex = -1;
_lastSwitchTime = DateTime.MinValue;
_lastSwitchSlideIndex = -1;
- LogHelper.WriteLogToFile("已重置墨迹锁定状态", LogHelper.LogType.Trace);
}
}
#endregion
diff --git a/Ink Canvas/Helpers/PPTManager.cs b/Ink Canvas/Helpers/PPTManager.cs
index 5753b477..ecca9519 100644
--- a/Ink Canvas/Helpers/PPTManager.cs
+++ b/Ink Canvas/Helpers/PPTManager.cs
@@ -249,7 +249,6 @@ namespace Ink_Canvas.Helpers
if (!currentSlideShowState)
{
- LogHelper.WriteLogToFile("检测到PPT放映已结束", LogHelper.LogType.Trace);
}
}
}
@@ -629,7 +628,6 @@ namespace Ink_Canvas.Helpers
try
{
PresentationClose?.Invoke(pres);
- LogHelper.WriteLogToFile($"演示文稿已关闭: {pres?.Name}", LogHelper.LogType.Event);
// 重新启动连接检查
_connectionCheckTimer?.Start();
@@ -646,7 +644,6 @@ namespace Ink_Canvas.Helpers
{
UpdateCurrentPresentationInfo();
SlideShowBegin?.Invoke(wn);
- LogHelper.WriteLogToFile("幻灯片放映开始", LogHelper.LogType.Event);
}
catch (Exception ex)
{
@@ -678,7 +675,6 @@ namespace Ink_Canvas.Helpers
}
SlideShowEnd?.Invoke(pres);
- LogHelper.WriteLogToFile("幻灯片放映结束", LogHelper.LogType.Event);
}
catch (Exception ex)
{
@@ -1139,7 +1135,7 @@ namespace Ink_Canvas.Helpers
_wpsProcessCheckTimer.Dispose();
}
- // 优化：增加检查间隔到2秒，减少性能开销
+ // 增加检查间隔到2秒，减少性能开销
_wpsProcessCheckTimer = new Timer(2000);
_wpsProcessCheckTimer.Elapsed += OnWpsProcessCheckTimerElapsed;
_wpsProcessCheckTimer.Start();
@@ -1173,7 +1169,7 @@ namespace Ink_Canvas.Helpers
}
- // 检查前台WPS窗口是否存在（优化版）
+ // 检查前台WPS窗口是否存在
bool isForegroundWpsWindowActive = IsForegroundWpsWindowStillActiveOptimized();
if (isForegroundWpsWindowActive)
@@ -1185,7 +1181,7 @@ namespace Ink_Canvas.Helpers
return;
}
- // 优化：多重验证确保准确性
+ // 多重验证确保准确性
if (!PerformMultipleWpsWindowChecks())
{
LogHelper.WriteLogToFile("多重验证显示WPS窗口仍然存在，跳过查杀", LogHelper.LogType.Trace);
@@ -1206,7 +1202,7 @@ namespace Ink_Canvas.Helpers
}
///
- /// 优化版的前台WPS窗口检测，减少性能开销
+ /// 前台WPS窗口检测
///
private bool IsForegroundWpsWindowStillActiveOptimized()
{
@@ -1232,7 +1228,7 @@ namespace Ink_Canvas.Helpers
}
catch (Exception ex)
{
- LogHelper.WriteLogToFile($"优化版WPS窗口检测失败: {ex}", LogHelper.LogType.Error);
+ LogHelper.WriteLogToFile($"WPS窗口检测失败: {ex}", LogHelper.LogType.Error);
return false;
}
}
diff --git a/Ink Canvas/Helpers/PPTUIManager.cs b/Ink Canvas/Helpers/PPTUIManager.cs
index 5ac2472d..fef41177 100644
--- a/Ink Canvas/Helpers/PPTUIManager.cs
+++ b/Ink Canvas/Helpers/PPTUIManager.cs
@@ -155,7 +155,6 @@ namespace Ink_Canvas.Helpers
{
// 如果不在放映模式，隐藏所有导航面板
HideAllNavigationPanels();
- LogHelper.WriteLogToFile("PPT放映状态变化：隐藏导航面板", LogHelper.LogType.Trace);
}
}
catch (Exception ex)
diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index c6e5e916..1683f163 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs
@@ -602,7 +602,6 @@ namespace Ink_Canvas
if (!isInSlideShow)
{
- LogHelper.WriteLogToFile("PPT放映状态变化：退出放映模式", LogHelper.LogType.Trace);
}
// 检查主窗口可见性（用于仅PPT模式）
@@ -636,7 +635,6 @@ namespace Ink_Canvas
if (activePresentation != null)
{
_multiPPTInkManager?.SwitchToPresentation(activePresentation);
- LogHelper.WriteLogToFile($"已切换到活跃演示文稿: {activePresentation.Name}", LogHelper.LogType.Trace);
}
// 处理跳转到首页或上次播放位置
@@ -1039,8 +1037,6 @@ namespace Ink_Canvas
// 重置锁定状态
_multiPPTInkManager?.ResetCurrentPresentationLockState();
-
- LogHelper.WriteLogToFile($"已重置墨迹管理器锁定状态", LogHelper.LogType.Trace);
}
}
catch (Exception ex)
@@ -1193,7 +1189,6 @@ namespace Ink_Canvas
Settings.PowerPointSettings.EnablePowerPointEnhancement = ToggleSwitchPowerPointEnhancement.IsOn;
- // 与WPS支持互斥
if (Settings.PowerPointSettings.EnablePowerPointEnhancement)
{
Settings.PowerPointSettings.IsSupportWPS = false;
@@ -1225,7 +1220,6 @@ namespace Ink_Canvas
Settings.PowerPointSettings.IsSupportWPS = ToggleSwitchSupportWPS.IsOn;
- // 与PowerPoint联动增强互斥
if (Settings.PowerPointSettings.IsSupportWPS)
{
Settings.PowerPointSettings.EnablePowerPointEnhancement = false;
@@ -1272,7 +1266,6 @@ namespace Ink_Canvas
if (_pptManager?.TryNavigatePrevious() == true)
{
// 翻页成功，等待事件处理墨迹切换
- LogHelper.WriteLogToFile("成功切换到上一页", LogHelper.LogType.Trace);
}
else
{
@@ -1466,7 +1459,6 @@ namespace Ink_Canvas
// 结束放映
if (_pptManager?.TryEndSlideShow() == true)
{
- LogHelper.WriteLogToFile("成功结束幻灯片放映", LogHelper.LogType.Event);
}
else
{
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
index c8c2dfbd497b829755ee6211820ad2e2d43c9d13..57d842b8b7d92d5308ee26301638a87ff9085d80 100644
GIT binary patch
delta 70
zcmbQUl4B~nPN5rP?War*kO`k`FUd8TkDE=&SuZ6ghmjGefZ>7T
XjqeIqIY4T;%1rbO^o$LR4J{b}mk1Gb
delta 23
fcmZ3wifPVDCJr`6Lk0#0#>B~nPN5rP?WX_$OSlGi