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-08-30 19:40:14 +08:00
parent 636769c0ef
commit 96c51cd7ff
18 changed files with 368 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/Helpers/AutoUpdateHelper.cs
-1
View File
@@ -12,7 +12,6 @@ using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
Ink Canvas/Helpers/GlobalHotkeyManager.cs
+2 -2
View File
@@ -472,7 +472,7 @@ namespace Ink_Canvas.Helpers
{
// 通过反射访问主窗口的penType字段
var penTypeField = _mainWindow.GetType().GetField("penType",
System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
BindingFlags.NonPublic | BindingFlags.Instance);
if (penTypeField != null)
{
@@ -480,7 +480,7 @@ namespace Ink_Canvas.Helpers
// 调用CheckPenTypeUIState方法更新UI状态
var checkPenTypeMethod = _mainWindow.GetType().GetMethod("CheckPenTypeUIState",
System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
BindingFlags.NonPublic | BindingFlags.Instance);
if (checkPenTypeMethod != null)
{
Ink Canvas/Helpers/InkFadeManager.cs
+6 -7
View File
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows;
using System.Windows.Media.Animation;
using System.Windows.Threading;
@@ -107,7 +106,7 @@ namespace Ink_Canvas.Helpers
{
// 将墨迹添加到 inkCanvas 的父容器中，而不是 inkCanvas.Children
// 这样可以避免坐标系统问题
var parent = _mainWindow.inkCanvas.Parent as System.Windows.Controls.Panel;
var parent = _mainWindow.inkCanvas.Parent as Panel;
if (parent != null)
{
parent.Children.Add(strokeVisual);
@@ -154,7 +153,7 @@ namespace Ink_Canvas.Helpers
try
{
// 从父容器中移除墨迹
var parent = _mainWindow.inkCanvas?.Parent as System.Windows.Controls.Panel;
var parent = _mainWindow.inkCanvas?.Parent as Panel;
if (parent != null && parent.Children.Contains(visual))
{
parent.Children.Remove(visual);
@@ -202,7 +201,7 @@ namespace Ink_Canvas.Helpers
{
if (_mainWindow.inkCanvas != null)
{
var parent = _mainWindow.inkCanvas.Parent as System.Windows.Controls.Panel;
var parent = _mainWindow.inkCanvas.Parent as Panel;
foreach (var visual in _strokeVisuals.Values)
{
if (parent != null && parent.Children.Contains(visual))
@@ -454,7 +453,7 @@ namespace Ink_Canvas.Helpers
originalVisual.Visibility = Visibility.Hidden;
var segments = new List<UIElement>();
var parent = _mainWindow.inkCanvas?.Parent as System.Windows.Controls.Panel;
var parent = _mainWindow.inkCanvas?.Parent as Panel;
if (parent == null)
{
// 如果父容器不是Panel，直接使用InkCanvas
@@ -676,7 +675,7 @@ namespace Ink_Canvas.Helpers
try
{
// 移除所有分段
var parent = _mainWindow.inkCanvas?.Parent as System.Windows.Controls.Panel;
var parent = _mainWindow.inkCanvas?.Parent as Panel;
foreach (var segment in segments)
{
@@ -811,7 +810,7 @@ namespace Ink_Canvas.Helpers
try
{
// 从父容器中移除墨迹
var parent = _mainWindow.inkCanvas?.Parent as System.Windows.Controls.Panel;
var parent = _mainWindow.inkCanvas?.Parent as Panel;
if (parent != null && parent.Children.Contains(visual))
{
parent.Children.Remove(visual);
Ink Canvas/Helpers/PPTManager.cs
+2 -2
View File
@@ -340,7 +340,7 @@ namespace Ink_Canvas.Helpers
LogHelper.WriteLogToFile($"PPT事件注册失败: {ex}", LogHelper.LogType.Error);
throw; // 重新抛出异常，让外层处理
}
}, DispatcherPriority.Normal, System.Threading.CancellationToken.None, TimeSpan.FromSeconds(2));
}, DispatcherPriority.Normal, CancellationToken.None, TimeSpan.FromSeconds(2));
// 获取当前演示文稿信息
UpdateCurrentPresentationInfo();
@@ -407,7 +407,7 @@ namespace Ink_Canvas.Helpers
// COM对象类型转换失败，通常是因为对象已经被释放
LogHelper.WriteLogToFile("PPT COM对象已被释放，跳过事件注册取消", LogHelper.LogType.Trace);
}
}, DispatcherPriority.Normal, System.Threading.CancellationToken.None, TimeSpan.FromSeconds(1));
}, DispatcherPriority.Normal, CancellationToken.None, TimeSpan.FromSeconds(1));
}
}
catch (Exception ex)
Ink Canvas/Helpers/Plugins/EnhancedPluginBase.cs
-1
View File
@@ -1,4 +1,3 @@
using System;
using System.Windows.Controls;
namespace Ink_Canvas.Helpers.Plugins
Ink Canvas/Helpers/Plugins/IEnhancedPlugin.cs
-1
View File
@@ -1,4 +1,3 @@
using System;
using System.Windows.Controls;
namespace Ink_Canvas.Helpers.Plugins
Ink Canvas/Helpers/Plugins/IPluginService.cs
-1
View File
@@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Ink;
using System.Windows.Media;
namespace Ink_Canvas.Helpers.Plugins
Ink Canvas/Helpers/Plugins/PluginConfigurationManager.cs
-1
View File
@@ -1,4 +1,3 @@
using Ink_Canvas.Helpers;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
Ink Canvas/Helpers/Plugins/PluginServiceManager.cs
-3
View File
@@ -1,10 +1,7 @@
using Ink_Canvas.Helpers;
using Ink_Canvas.Windows;
using System;
using System.Collections.Generic;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Ink;
using System.Windows.Media;
using System.Linq;