优化代码

Ink Canvas/App.xaml.cs

@@ -1,8 +1,10 @@
 using Hardcodet.Wpf.TaskbarNotification;
 using Ink_Canvas.Helpers;
+using Ink_Canvas.Properties;
 using iNKORE.UI.WPF.Modern.Controls;
 using Microsoft.Win32;
 using Newtonsoft.Json;
+using Sentry;
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -18,10 +20,8 @@ using System.Windows.Input;
 using System.Windows.Threading;
 using Application = System.Windows.Application;
 using MessageBox = System.Windows.MessageBox;
-using Ink_Canvas.Properties;
 using SplashScreen = Ink_Canvas.Windows.SplashScreen;
 using Timer = System.Threading.Timer;
-using Sentry;
 
 namespace Ink_Canvas
 {

Ink Canvas/Helpers/BaseUploadQueue.cs

@@ -1,6 +1,5 @@
 using Newtonsoft.Json;
 using System;
-using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;

Ink Canvas/Helpers/ComPPTLinkManager.cs

@@ -1,5 +1,4 @@
 using System;
-using Microsoft.Office.Interop.PowerPoint;
 
 namespace Ink_Canvas.Helpers
 {

Ink Canvas/Helpers/IPPTLinkManager.cs

@@ -1,5 +1,4 @@
 using System;
-using Microsoft.Office.Interop.PowerPoint;
 
 namespace Ink_Canvas.Helpers
 {

Ink Canvas/Helpers/LocalizationHelper.cs

@@ -1,6 +1,6 @@
+using Ink_Canvas.Properties;
 using System.Globalization;
 using System.Threading;
-using Ink_Canvas.Properties;
 
 namespace Ink_Canvas.Helpers
 {

Ink Canvas/Helpers/PPTInkManager.cs

@@ -2,8 +2,6 @@ using Microsoft.Office.Interop.PowerPoint;
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
-using System.Security.Cryptography;
-using System.Text;
 using System.Windows.Ink;
 
 namespace Ink_Canvas.Helpers
@@ -455,7 +453,8 @@ namespace Ink_Canvas.Helpers
             {
                 for (int i = 0; i < _memoryStreams.Length; i++)
                 {
-                    try { _memoryStreams[i]?.Dispose(); } catch (Exception ex) { LogHelper.WriteLogToFile($"释放内存流 {i} 失败: {ex}", LogHelper.LogType.Warning); }
+                    try { _memoryStreams[i]?.Dispose(); }
+                    catch (Exception ex) { LogHelper.WriteLogToFile($"释放内存流 {i} 失败: {ex}", LogHelper.LogType.Warning); }
                     finally { _memoryStreams[i] = null; }
                 }
                 _memoryStreams = new MemoryStream[_maxSlides + 2];
@@ -544,7 +543,8 @@ namespace Ink_Canvas.Helpers
                 if (_memoryStreams[i] != null)
                 {
                     long len = _memoryStreams[i].Length;
-                    try { _memoryStreams[i].Dispose(); freed += len; cleaned++; } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
+                    try { _memoryStreams[i].Dispose(); freed += len; cleaned++; }
+                    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
                     finally { _memoryStreams[i] = null; }
                 }
             }

Ink Canvas/Helpers/PPTROTConnectionHelper.cs

@@ -1,13 +1,10 @@
-using Microsoft.Office.Interop.PowerPoint;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 using System.Text;
-using System.Threading;
 
 namespace Ink_Canvas.Helpers
 {

Ink Canvas/Helpers/ProcessProtectionManager.cs

@@ -2,7 +2,6 @@ using Microsoft.Win32.SafeHandles;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
 

Ink Canvas/Helpers/ROTPPTManager.cs

@@ -3,13 +3,10 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 using System.Timers;
-using System.Windows.Threading;
-using Application = System.Windows.Application;
 using Timer = System.Timers.Timer;
 
 namespace Ink_Canvas.Helpers

Ink Canvas/Helpers/SecurityManager.cs

@@ -1,12 +1,10 @@
+using iNKORE.UI.WPF.Modern.Controls;
 using System;
 using System.Security.Cryptography;
-using System.Text;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using Ink_Canvas.Windows;
+using MessageBox = iNKORE.UI.WPF.Modern.Controls.MessageBox;
-using iNKORE.UI.WPF.Modern.Controls;
-using MessageBox=iNKORE.UI.WPF.Modern.Controls.MessageBox;
-using System.Threading.Tasks;
 
 namespace Ink_Canvas.Helpers
 {

Ink Canvas/Helpers/TelemetryUploader.cs

@@ -1,10 +1,9 @@
+using Sentry;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Threading.Tasks;
-using Sentry;
-using Sentry.Protocol;
 
 namespace Ink_Canvas.Helpers
 {

Ink Canvas/Helpers/UploadHelper.cs

@@ -2,8 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace Ink_Canvas.Helpers
 {

Ink Canvas/Helpers/UploadQueueHelper.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Ink_Canvas.Helpers
 {

Ink Canvas/Helpers/UriSchemeHelper.cs

@@ -1,7 +1,6 @@
 using Microsoft.Win32;
 using System;
 using System.Diagnostics;
-using System.Security;
 
 namespace Ink_Canvas.Helpers
 {

Ink Canvas/Helpers/WindowOverviewModel.cs

@@ -5,8 +5,6 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
-using System.Windows;
 
 namespace Ink_Canvas.Helpers
 {

Ink Canvas/MainWindow_cs/MW_BoardControls.cs

@@ -1,7 +1,6 @@
 using Ink_Canvas.Helpers;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;

Ink Canvas/MainWindow_cs/MW_ClipboardHandler.cs

@@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using System.Windows.Forms;
 using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Interop;

Ink Canvas/MainWindow_cs/MW_Screenshot.cs

@@ -1,3 +1,4 @@
+using Ink_Canvas.Helpers;
 using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;
@@ -6,9 +7,8 @@ using System.IO;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Forms;
-using System.Windows.Media.Imaging;
 using System.Windows.Ink;
-using Ink_Canvas.Helpers;
+using System.Windows.Media.Imaging;
 
 namespace Ink_Canvas
 {

Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs

@@ -1025,8 +1025,8 @@ namespace Ink_Canvas
         {
             // 四个边选择点，向外扩展8像素
             TopHandle.Margin = new Thickness(bounds.Left + bounds.Width / 2 - 4, bounds.Top - 12, 0, 0);
-            BottomHandle.Margin = new Thickness(bounds.Left + bounds.Width / 2 - 4, bounds.Bottom + 4 , 0, 0);
+            BottomHandle.Margin = new Thickness(bounds.Left + bounds.Width / 2 - 4, bounds.Bottom + 4, 0, 0);
-            LeftHandle.Margin = new Thickness(bounds.Left - 12 , bounds.Top + bounds.Height / 2 - 4, 0, 0);
+            LeftHandle.Margin = new Thickness(bounds.Left - 12, bounds.Top + bounds.Height / 2 - 4, 0, 0);
             RightHandle.Margin = new Thickness(bounds.Right + 4, bounds.Top + bounds.Height / 2 - 4, 0, 0);
 
             // 四个角选择点，完全位于选择框外部

Ink Canvas/MainWindow_cs/MW_Timer.cs

@@ -1027,7 +1027,8 @@ namespace Ink_Canvas
                 var windowTitle = ForegroundWindowInfo.WindowTitle();
 
                 Thickness currentMargin = new Thickness();
-                Dispatcher.Invoke(() => {
+                Dispatcher.Invoke(() =>
+                {
                     currentMargin = ViewboxFloatingBar.Margin;
                 });
 

Ink Canvas/MainWindow_cs/MW_TouchEvents.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;

Ink Canvas/MainWindow_cs/MW_UriHandler.cs

@@ -1,9 +1,7 @@
 using Ink_Canvas.Helpers;
 using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Windows;
 
 namespace Ink_Canvas

Ink Canvas/MainWindow_cs/MW_VideoPresenter.cs

@@ -11,7 +11,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;

Ink Canvas/MarkupExtensions/I18nExtension.cs

@@ -1,6 +1,6 @@
+using Ink_Canvas.Properties;
 using System;
 using System.Windows.Markup;
-using Ink_Canvas.Properties;
 
 namespace Ink_Canvas.MarkupExtensions
 {

Ink Canvas/Resources/Settings.cs

@@ -136,7 +136,7 @@ namespace Ink_Canvas
         [JsonProperty("brushAutoRestoreColor")]
         public string BrushAutoRestoreColor { get; set; } = "#FFFF0000";
         [JsonProperty("brushAutoRestoreWidth")]
-        public double BrushAutoRestoreWidth { get; set; } =5;
+        public double BrushAutoRestoreWidth { get; set; } = 5;
         [JsonProperty("brushAutoRestoreAlpha")]
         public int BrushAutoRestoreAlpha { get; set; } = 255;
         [JsonProperty("enableEraserAutoSwitchBack")]

Ink Canvas/Windows/CloudStorageManagementWindow.xaml.cs

@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
 using MessageBox = iNKORE.UI.WPF.Modern.Controls.MessageBox;
-using ui = iNKORE.UI.WPF.Modern.Controls;
 
 namespace Ink_Canvas.Windows
 {

Ink Canvas/Windows/PPTQuickPanel.xaml.cs

@@ -1,4 +1,6 @@
 using Ink_Canvas.Helpers;
+using Microsoft.Win32;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -12,8 +14,6 @@ using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
-using Microsoft.Win32;
-using Newtonsoft.Json;
 using SystemEvents = Microsoft.Win32.SystemEvents;
 
 namespace Ink_Canvas.Windows

Ink Canvas/Windows/PPTTimeCapsule.xaml.cs

@@ -1,10 +1,6 @@
 using Ink_Canvas.Helpers;
 using Microsoft.Win32;
-using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Timers;
 using System.Windows;
 using System.Windows.Controls;
@@ -12,7 +8,6 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Threading;
-using File = System.IO.File;
 
 namespace Ink_Canvas.Windows
 {

Ink Canvas/Windows/SettingsViews/SettingsViews/AboutPanel.xaml.cs

@@ -1,5 +1,5 @@
-using iNKORE.UI.WPF.Helpers;
 using Ink_Canvas.Helpers;
+using iNKORE.UI.WPF.Helpers;
 using OSVersionExtension;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,6 @@ using System.IO;
 using System.Management;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
@@ -16,7 +15,6 @@ using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using Microsoft.Win32;
 
 namespace Ink_Canvas.Windows.SettingsViews
 {

Ink Canvas/Windows/SettingsViews/SettingsViews/AdvancedPanel.xaml.cs

@@ -1,4 +1,3 @@
-using Ink_Canvas;
 using iNKORE.UI.WPF.Helpers;
 using System;
 using System.Collections.Generic;

Ink Canvas/Windows/SettingsViews/SettingsViews/AutomationPanel.xaml.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
-using Ink_Canvas.Windows.SettingsViews;
 using System.Windows.Media;
 
 namespace Ink_Canvas.Windows.SettingsViews

Ink Canvas/Windows/SettingsViews/SettingsViews/CanvasAndInkPanel.xaml.cs

@@ -1,11 +1,7 @@
-using Ink_Canvas;
 using iNKORE.UI.WPF.Helpers;
 using System;
-using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
 using System.Windows.Media;
 
 namespace Ink_Canvas.Windows.SettingsViews

Ink Canvas/Windows/SettingsViews/SettingsViews/GesturesPanel.xaml.cs

@@ -1,4 +1,3 @@
-using Ink_Canvas;
 using iNKORE.UI.WPF.Helpers;
 using System;
 using System.Collections.Generic;

Ink Canvas/Windows/SettingsViews/SettingsViews/LuckyRandomPanel.xaml.cs

@@ -1,8 +1,6 @@
-using Ink_Canvas;
 using iNKORE.UI.WPF.Helpers;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;

Ink Canvas/Windows/SettingsViews/SettingsViews/MainWindowSettingsHelper.cs

@@ -1,4 +1,3 @@
-using Ink_Canvas;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Ink Canvas/Windows/SettingsViews/SettingsViews/PowerPointPanel.xaml.cs

@@ -1,8 +1,6 @@
-using Ink_Canvas;
 using iNKORE.UI.WPF.Helpers;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;

Ink Canvas/Windows/SettingsViews/SettingsViews/SearchPanel.xaml.cs

@@ -1,7 +1,7 @@
+using Microsoft.International.Converters.PinYinConverter;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -9,7 +9,6 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using Microsoft.International.Converters.PinYinConverter;
 
 namespace Ink_Canvas.Windows.SettingsViews
 {

Ink Canvas/Windows/SettingsViews/SettingsViews/SecurityPanel.xaml.cs

@@ -1,5 +1,4 @@
 using Ink_Canvas.Helpers;
-using iNKORE.UI.WPF.Helpers;
 using System;
 using System.Windows;
 using System.Windows.Controls;

Ink Canvas/Windows/SettingsViews/SettingsViews/SettingsPanelBase.cs

@@ -1,4 +1,3 @@
-using Ink_Canvas;
 using iNKORE.UI.WPF.Helpers;
 using System;
 using System.Windows;

Ink Canvas/Windows/SettingsViews/SettingsViews/SnapshotPanel.xaml.cs

@@ -1,4 +1,3 @@
-using Ink_Canvas;
 using iNKORE.UI.WPF.Helpers;
 using System;
 using System.IO;

Ink Canvas/Windows/SettingsViews/SettingsViews/StartupPanel.xaml.cs

@@ -1,7 +1,5 @@
-using Ink_Canvas;
 using iNKORE.UI.WPF.Helpers;
 using System;
-using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;

Ink Canvas/Windows/SettingsViews/SettingsViews/ThemeHelper.cs

@@ -1,5 +1,4 @@
 using System.Windows.Media;
-using Ink_Canvas;
 
 namespace Ink_Canvas.Windows.SettingsViews
 {

Ink Canvas/Windows/SettingsViews/SettingsViews/ThemePanel.xaml.cs

@@ -1,13 +1,10 @@
-using Ink_Canvas;
+using Hardcodet.Wpf.TaskbarNotification;
 using iNKORE.UI.WPF.Helpers;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
-using Hardcodet.Wpf.TaskbarNotification;
 
 namespace Ink_Canvas.Windows.SettingsViews
 {

Ink Canvas/Windows/SettingsViews/SettingsViews/UpdateCenterPanel.xaml.cs

@@ -1,6 +1,6 @@
+using Ink_Canvas.Helpers;
 using iNKORE.UI.WPF.Helpers;
 using iNKORE.UI.WPF.Modern.Controls;
-using Ink_Canvas.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,8 +9,8 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
-using MessageBox = iNKORE.UI.WPF.Modern.Controls.MessageBox;
 using static Ink_Canvas.Helpers.AutoUpdateHelper;
+using MessageBox = iNKORE.UI.WPF.Modern.Controls.MessageBox;
 
 namespace Ink_Canvas.Windows.SettingsViews
 {

Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs

@@ -1,5 +1,5 @@
-using iNKORE.UI.WPF.Helpers;
 using Ink_Canvas.Windows.SettingsViews;
+using iNKORE.UI.WPF.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;