代码优化

This commit is contained in:
2026-02-21 16:51:34 +08:00
parent 469dbd1497
commit 99ec2d7609
31 changed files with 171 additions and 158 deletions
+6 -6
View File
@@ -1,4 +1,4 @@
using System;
using System;
using System.Windows;
using System.Windows.Media;
using System.Windows.Media.Animation;
@@ -73,7 +73,7 @@ namespace Ink_Canvas.Helpers
sb.Begin((FrameworkElement)element);
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
public static void ShowWithSlideFromLeftAndFade(UIElement element, double duration = 0.25)
@@ -113,7 +113,7 @@ namespace Ink_Canvas.Helpers
sb.Begin((FrameworkElement)element);
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
public static void ShowWithScaleFromLeft(UIElement element, double duration = 0.2)
@@ -156,7 +156,7 @@ namespace Ink_Canvas.Helpers
sb.Begin((FrameworkElement)element);
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
public static void ShowWithScaleFromRight(UIElement element, double duration = 0.2)
@@ -200,7 +200,7 @@ namespace Ink_Canvas.Helpers
sb.Begin((FrameworkElement)element);
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
public static void HideWithSlideAndFade(UIElement element, double duration = 0.15)
@@ -246,7 +246,7 @@ namespace Ink_Canvas.Helpers
element.RenderTransform = new TranslateTransform();
sb.Begin((FrameworkElement)element);
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
public static void HideWithFadeOut(UIElement element, double duration = 0.15)
+8 -8
View File
@@ -288,7 +288,7 @@ namespace Ink_Canvas.Helpers
}
}
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
return -1;
}
@@ -1130,7 +1130,7 @@ namespace Ink_Canvas.Helpers
// 清理可能损坏的分块文件
if (File.Exists(tempPath))
{
try { File.Delete(tempPath); } catch { }
try { File.Delete(tempPath); } catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
}
// 增加重试间隔,避免频繁重试
@@ -1316,7 +1316,7 @@ namespace Ink_Canvas.Helpers
return resp.Content.Headers.ContentLength.Value;
}
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
return -1;
}
@@ -1358,7 +1358,7 @@ namespace Ink_Canvas.Helpers
App.IsUpdateInstalling = true;
if (wasProcessProtectionEnabled)
{
try { ProcessProtectionManager.SetEnabled(false); } catch { }
try { ProcessProtectionManager.SetEnabled(false); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
// 在更新前备份设置文件
@@ -2086,16 +2086,16 @@ namespace Ink_Canvas.Helpers
{
foreach (string file in Directory.GetFiles(updatesFolderPath, "*", SearchOption.AllDirectories))
{
try { File.Delete(file); } catch { }
try { File.Delete(file); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
foreach (string dir in Directory.GetDirectories(updatesFolderPath))
{
try { Directory.Delete(dir, true); } catch { }
try { Directory.Delete(dir, true); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
try { Directory.Delete(updatesFolderPath, true); } catch { }
try { Directory.Delete(updatesFolderPath, true); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
// 版本修复方法,强制下载并安装指定通道的最新版本
+4 -4
View File
@@ -146,7 +146,7 @@ namespace Ink_Canvas.Helpers
var disposeMethod = searcher.GetType().GetMethod("Dispose");
disposeMethod?.Invoke(searcher, null);
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
// 主板序列号
try
@@ -170,7 +170,7 @@ namespace Ink_Canvas.Helpers
var disposeMethod = searcher.GetType().GetMethod("Dispose");
disposeMethod?.Invoke(searcher, null);
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
// BIOS序列号
try
@@ -194,7 +194,7 @@ namespace Ink_Canvas.Helpers
var disposeMethod = searcher.GetType().GetMethod("Dispose");
disposeMethod?.Invoke(searcher, null);
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
// 主硬盘序列号
try
@@ -218,7 +218,7 @@ namespace Ink_Canvas.Helpers
var disposeMethod = searcher.GetType().GetMethod("Dispose");
disposeMethod?.Invoke(searcher, null);
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
}
catch
+4 -4
View File
@@ -519,7 +519,7 @@ namespace Ink_Canvas.Helpers
File.Delete(ipcFile);
}
}
catch { }
catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
}
}
@@ -570,7 +570,7 @@ namespace Ink_Canvas.Helpers
File.Delete(ipcFile);
}
}
catch { }
catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
}
}
@@ -625,7 +625,7 @@ namespace Ink_Canvas.Helpers
File.Delete(ipcFile);
}
}
catch { }
catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
}
}
@@ -675,7 +675,7 @@ namespace Ink_Canvas.Helpers
File.Delete(ipcFile);
}
}
catch { }
catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
}
}
}
+12 -3
View File
@@ -86,7 +86,10 @@ namespace Ink_Canvas.Helpers
}
});
}
catch { }
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine($"[LogHelper] WriteLogToFile failed: {ex.Message}");
}
}
private static void CheckAndCleanLogsFolder(string logsPath)
@@ -114,7 +117,10 @@ namespace Ink_Canvas.Helpers
{
file.Delete();
}
catch { }
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine($"[LogHelper] Delete log file failed: {ex.Message}");
}
}
// 记录清理操作
@@ -129,7 +135,10 @@ namespace Ink_Canvas.Helpers
});
}
}
catch { }
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine($"[LogHelper] CheckAndCleanLogsFolder failed: {ex.Message}");
}
}
internal static void WriteLogToFile(string v, object warning)
+1 -1
View File
@@ -190,7 +190,7 @@ namespace Ink_Canvas.Helpers
_lastDrawnPointCount = currentPointCount;
}
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
}
+2 -2
View File
@@ -391,7 +391,7 @@ namespace Ink_Canvas.Helpers
string path = Path.Combine(folderPath, slideIndex.ToString("0000") + StrokeFileExtension);
if (File.Exists(path)) File.Delete(path);
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
private void CheckAndPerformMemoryCleanup()
@@ -433,7 +433,7 @@ namespace Ink_Canvas.Helpers
if (_memoryStreams[i] != null)
{
long len = _memoryStreams[i].Length;
try { _memoryStreams[i].Dispose(); freed += len; cleaned++; } catch { }
try { _memoryStreams[i].Dispose(); freed += len; cleaned++; } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
finally { _memoryStreams[i] = null; }
}
}
+8 -8
View File
@@ -451,7 +451,7 @@ namespace Ink_Canvas.Helpers
refCount = Marshal.ReleaseComObject(PPTApplication);
}
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
}
}
@@ -517,7 +517,7 @@ namespace Ink_Canvas.Helpers
Marshal.ReleaseComObject(comObject);
}
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
private void SafeReleaseComObject(object comObject, string objectName)
@@ -1559,7 +1559,7 @@ namespace Ink_Canvas.Helpers
}
}
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
return true;
}, IntPtr.Zero);
@@ -1697,19 +1697,19 @@ namespace Ink_Canvas.Helpers
// 确保清理状态
if (CurrentSlide != null && Marshal.IsComObject(CurrentSlide))
{
try { Marshal.ReleaseComObject(CurrentSlide); } catch { }
try { Marshal.ReleaseComObject(CurrentSlide); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
if (CurrentSlides != null && Marshal.IsComObject(CurrentSlides))
{
try { Marshal.ReleaseComObject(CurrentSlides); } catch { }
try { Marshal.ReleaseComObject(CurrentSlides); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
if (CurrentPresentation != null && Marshal.IsComObject(CurrentPresentation))
{
try { Marshal.ReleaseComObject(CurrentPresentation); } catch { }
try { Marshal.ReleaseComObject(CurrentPresentation); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
if (PPTApplication != null && Marshal.IsComObject(PPTApplication))
{
try { Marshal.ReleaseComObject(PPTApplication); } catch { }
try { Marshal.ReleaseComObject(PPTApplication); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
CurrentSlide = null;
@@ -1858,7 +1858,7 @@ namespace Ink_Canvas.Helpers
var proc = Process.GetProcessById((int)processId);
windowInfo.ProcessName = proc.ProcessName.ToLower();
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
return windowInfo;
}
+8 -8
View File
@@ -175,7 +175,7 @@ namespace Ink_Canvas.Helpers
object appObj = comObject.GetType().InvokeMember("Application", BindingFlags.GetProperty, null, comObject, null);
candidateApp = appObj;
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
}
bool isDuplicate = false;
@@ -213,7 +213,7 @@ namespace Ink_Canvas.Helpers
{
activePres = candidateApp.ActivePresentation;
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
if (activePres != null)
{
@@ -223,7 +223,7 @@ namespace Ink_Canvas.Helpers
{
ssWindow = activePres.SlideShowWindow;
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
if (ssWindow != null)
{
@@ -238,7 +238,7 @@ namespace Ink_Canvas.Helpers
if (val is int && (int)val == -1) isActive = true;
else if (val is bool && (bool)val == true) isActive = true;
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
if (isActive)
{
@@ -252,7 +252,7 @@ namespace Ink_Canvas.Helpers
}
}
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
}
}
@@ -397,7 +397,7 @@ namespace Ink_Canvas.Helpers
}
}
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
return false;
}
@@ -420,7 +420,7 @@ namespace Ink_Canvas.Helpers
hwnd = new IntPtr(hwndVal);
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
return hwnd;
}
@@ -435,7 +435,7 @@ namespace Ink_Canvas.Helpers
{
Marshal.ReleaseComObject(comObj);
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
}
@@ -207,7 +207,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
{
Dispatcher.BeginInvoke(new Action(() =>
{
try { Close(); } catch { }
try { Close(); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
// 启动应用程序任务
launchTask.Start();
@@ -224,7 +224,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
catch (Exception ex)
{
LogHelper.WriteLogToFile($"应用按钮点击事件出错: {ex.Message}", LogHelper.LogType.Error);
try { IsClosing = true; Close(); } catch { }
try { IsClosing = true; Close(); } catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
}
}
@@ -37,8 +37,9 @@ namespace Ink_Canvas.Helpers
var enabled = settings?.Security != null && settings.Security.EnableProcessProtection;
SetEnabled(enabled);
}
catch
catch (Exception ex)
{
LogHelper.WriteLogToFile($"ProcessProtectionManager.ApplyFromSettings 失败: {ex.Message}", LogHelper.LogType.Warning);
}
}
@@ -72,8 +73,9 @@ namespace Ink_Canvas.Helpers
LogHelper.WriteLogToFile($"ProcessProtectionManager.WithWriteAccess: 获取写入门闩超时({gateTimeoutMs}ms),将降级直接执行写入动作。目标: {targetPath}",
LogHelper.LogType.Warning);
}
catch
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine($"[ProcessProtectionManager] 写日志失败: {ex.Message}");
}
action();
@@ -113,14 +115,14 @@ namespace Ink_Canvas.Helpers
{
foreach (var kv in releasedFiles)
{
try { kv.Value.Dispose(); } catch { }
try { kv.Value.Dispose(); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
}
if (releasedDirs != null)
{
foreach (var kv in releasedDirs)
{
try { kv.Value.Dispose(); } catch { }
try { kv.Value.Dispose(); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
}
@@ -217,13 +219,13 @@ namespace Ink_Canvas.Helpers
{
foreach (var kv in _lockedFiles)
{
try { kv.Value.Dispose(); } catch { }
try { kv.Value.Dispose(); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
_lockedFiles.Clear();
foreach (var kv in _lockedDirs)
{
try { kv.Value.Dispose(); } catch { }
try { kv.Value.Dispose(); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
_lockedDirs.Clear();
}
+1 -1
View File
@@ -435,7 +435,7 @@ namespace Ink_Canvas.Helpers
refCount = Marshal.ReleaseComObject(appToRelease);
}
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
}
}
+4 -3
View File
@@ -1,3 +1,4 @@
using System;
using System.IO;
namespace Ink_Canvas.Helpers
@@ -18,7 +19,7 @@ namespace Ink_Canvas.Helpers
return count;
}
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
return 0;
}
@@ -31,7 +32,7 @@ namespace Ink_Canvas.Helpers
{
File.WriteAllText(CountFilePath, count.ToString());
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
}
@@ -44,7 +45,7 @@ namespace Ink_Canvas.Helpers
if (File.Exists(CountFilePath))
File.Delete(CountFilePath);
}
catch { }
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
}
}