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

更新版本号

Browse Source
This commit is contained in:
CJKmkp
2025-09-21 08:28:32 +08:00
parent e9c20255a6
commit dd16b4f5a1
7 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/AssemblyInfo.cs
+2 -2
View File
@@ -49,5 +49,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.7.11.2")]
[assembly: AssemblyFileVersion("1.7.11.2")]
[assembly: AssemblyVersion("1.7.11.3")]
[assembly: AssemblyFileVersion("1.7.11.3")]
Ink Canvas/Helpers/MultiPPTInkManager.cs
-1
View File
@@ -590,7 +590,6 @@ namespace Ink_Canvas.Helpers
// 创建新的备份
_strokeBackups[presentationId][slideIndex] = strokes.Clone();
LogHelper.WriteLogToFile($"已创建第{slideIndex}页墨迹备份", LogHelper.LogType.Trace);
}
catch (Exception ex)
{
Ink Canvas/Helpers/PPTInkManager.cs
-2
View File
@@ -124,7 +124,6 @@ namespace Ink_Canvas.Helpers
{
if (DateTime.Now < _inkLockUntil)
{
LogHelper.WriteLogToFile($"墨迹写入被锁定，当前页:{slideIndex}，锁定页:{_lockedSlideIndex}", LogHelper.LogType.Warning);
}
return;
}
@@ -149,7 +148,6 @@ namespace Ink_Canvas.Helpers
if (ms.Length > 0)
{
LogHelper.WriteLogToFile($"已保存第{slideIndex}页墨迹，大小: {ms.Length} bytes", LogHelper.LogType.Trace);
}
// 检查内存使用情况
Ink Canvas/Helpers/PPTManager.cs
-4
View File
@@ -93,7 +93,6 @@ namespace Ink_Canvas.Helpers
// COM对象已失效，触发断开连接
DisconnectFromPPT();
}
LogHelper.WriteLogToFile($"验证PPT放映窗口失败: {comEx.Message} (HR: 0x{hr:X8})", LogHelper.LogType.Warning);
return false;
}
}
@@ -863,7 +862,6 @@ namespace Ink_Canvas.Helpers
var hr = (uint)comEx.HResult;
if (hr == 0x80048240) // Integer out of range
{
LogHelper.WriteLogToFile($"验证PPT放映窗口失败: {comEx.Message}", LogHelper.LogType.Warning);
// 放映窗口已不存在，返回null
return null;
}
@@ -940,12 +938,10 @@ namespace Ink_Canvas.Helpers
// COM对象已失效，触发断开连接
DisconnectFromPPT();
}
LogHelper.WriteLogToFile($"获取当前幻灯片编号失败: {comEx.Message}", LogHelper.LogType.Warning);
return 0;
}
catch (Exception ex)
{
LogHelper.WriteLogToFile($"获取当前幻灯片编号失败: {ex}", LogHelper.LogType.Error);
return 0;
}
}
Ink Canvas/Helpers/PPTUIManager.cs
-2
View File
@@ -92,7 +92,6 @@ namespace Ink_Canvas.Helpers
// 页数无效时清空页码显示
_mainWindow.PPTBtnPageNow.Text = "?";
_mainWindow.PPTBtnPageTotal.Text = "/ ?";
LogHelper.WriteLogToFile($"PPT页数无效，清空页码显示: 当前页={currentSlide}, 总页数={totalSlides}", LogHelper.LogType.Warning);
}
UpdateNavigationPanelsVisibility();
@@ -132,7 +131,6 @@ namespace Ink_Canvas.Helpers
// 页数无效时清空页码显示
_mainWindow.PPTBtnPageNow.Text = "?";
_mainWindow.PPTBtnPageTotal.Text = "/ ?";
LogHelper.WriteLogToFile($"PPT页数无效，清空页码显示: 当前页={currentSlide}, 总页数={totalSlides}", LogHelper.LogType.Warning);
}
}
catch (Exception ex)
Ink Canvas/MainWindow_cs/MW_PPT.cs
-7
View File
@@ -1124,14 +1124,12 @@ namespace Ink_Canvas
// 检查PPT连接状态
if (_pptManager?.IsConnected != true || _pptManager?.IsInSlideShow != true)
{
LogHelper.WriteLogToFile($"PPT未连接或未在放映状态，跳过页面切换: IsConnected={_pptManager?.IsConnected}, IsInSlideShow={_pptManager?.IsInSlideShow}", LogHelper.LogType.Warning);
return;
}
// 获取当前页面索引
var currentSlideIndex = _pptManager?.GetCurrentSlideNumber() ?? 0;
LogHelper.WriteLogToFile($"开始切换页面墨迹: 从第{currentSlideIndex}页到第{newSlideIndex}页", LogHelper.LogType.Trace);
// 验证页面索引的有效性
if (newSlideIndex <= 0)
@@ -1145,24 +1143,20 @@ namespace Ink_Canvas
{
// 检查是否可以写入墨迹
bool canWrite = _multiPPTInkManager?.CanWriteInk(currentSlideIndex) == true;
LogHelper.WriteLogToFile($"第{currentSlideIndex}页墨迹写入权限: {canWrite}", LogHelper.LogType.Trace);
if (canWrite)
{
// 正常保存
_multiPPTInkManager?.SaveCurrentSlideStrokes(currentSlideIndex, inkCanvas.Strokes);
LogHelper.WriteLogToFile($"正常保存第{currentSlideIndex}页墨迹，墨迹数量: {inkCanvas.Strokes.Count}", LogHelper.LogType.Trace);
}
else
{
// 墨迹被锁定，跳过保存以避免墨迹错页
LogHelper.WriteLogToFile($"第{currentSlideIndex}页墨迹被锁定，跳过保存以避免墨迹错页", LogHelper.LogType.Warning);
}
}
else if (inkCanvas.Strokes.Count > 0 && currentSlideIndex <= 0)
{
// 无法获取当前页面索引时，不保存墨迹，直接清空
LogHelper.WriteLogToFile($"无法获取当前页面索引({currentSlideIndex})，跳过墨迹保存", LogHelper.LogType.Warning);
}
// 切换到新页面并加载墨迹
@@ -1171,7 +1165,6 @@ namespace Ink_Canvas
{
inkCanvas.Strokes.Clear();
inkCanvas.Strokes.Add(newStrokes);
LogHelper.WriteLogToFile($"已切换到第{newSlideIndex}页，加载墨迹数量: {newStrokes.Count}", LogHelper.LogType.Trace);
}
// 注意：LockInkForSlide已经在SwitchToSlide中调用，这里不需要重复调用
Ink Canvas/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -49,5 +49,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.7.11.2")]
[assembly: AssemblyFileVersion("1.7.11.2")]
[assembly: AssemblyVersion("1.7.11.3")]
[assembly: AssemblyFileVersion("1.7.11.3")]