Merge pull request #28 from awesome-iwb/beta

ICC CE 1.5.2 （Beta 1.5.14）

Ink Canvas/App.xaml.cs

@@ -1,13 +1,20 @@
-using Hardcodet.Wpf.TaskbarNotification;
+using Hardcodet.Wpf.TaskbarNotification;
 using Ink_Canvas.Helpers;
 using iNKORE.UI.WPF.Modern.Controls;
 using System;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Win32;
+using System.Security;  // 添加SecurityException所需命名空间
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Windows;
+using System.Windows.Threading;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 using MessageBox = System.Windows.MessageBox;
 using Window = System.Windows.Window;
+using System.Collections.Generic;
 
 namespace Ink_Canvas
 {
@@ -21,23 +28,50 @@ namespace Ink_Canvas
         public static string[] StartArgs = null;
         public static string RootPath = Environment.GetEnvironmentVariable("APPDATA") + "\\Ink Canvas\\";
 
+        // 新增：保存看门狗进程对象
+        private static Process watchdogProcess = null;
+        // 新增：标记是否为软件内主动退出
+        public static bool IsAppExitByUser = false;
+        // 新增：退出信号文件路径
+        private static string watchdogExitSignalFile = Path.Combine(Path.GetTempPath(), "icc_watchdog_exit_" + System.Diagnostics.Process.GetCurrentProcess().Id + ".flag");
+
         public App()
         {
             this.Startup += new StartupEventHandler(App_Startup);
             this.DispatcherUnhandledException += App_DispatcherUnhandledException;
+            StartHeartbeatMonitor();
+            StartWatchdogIfNeeded();
+            this.Exit += App_Exit; // 注册退出事件
         }
 
+        // 增加字段保存崩溃后操作设置
+        public static CrashActionType CrashAction = CrashActionType.SilentRestart;
+
         private void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
         {
             Ink_Canvas.MainWindow.ShowNewMessage("抱歉，出现未预期的异常，可能导致 InkCanvasForClass 运行不稳定。\n建议保存墨迹后重启应用。", true);
             LogHelper.NewLog(e.Exception.ToString());
             e.Handled = true;
+
+            // 修改：仅当非用户主动退出时才触发自动重启
+            if (CrashAction == CrashActionType.SilentRestart && !IsAppExitByUser)
+            {
+                try
+                {
+                    string exePath = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName;
+                    System.Diagnostics.Process.Start(exePath);
+                }
+                catch { }
+                Environment.Exit(1);
+            }
+            // CrashActionType.NoAction 时不做处理
         }
 
         private TaskbarIcon _taskbar;
 
         void App_Startup(object sender, StartupEventArgs e)
         {
+            RunWatchdogIfNeeded();
             /*if (!StoreHelper.IsStoreApp) */RootPath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
 
             LogHelper.NewLog(string.Format("Ink Canvas Starting (Version: {0})", Assembly.GetExecutingAssembly().GetName().Version.ToString()));
@@ -56,6 +90,127 @@ namespace Ink_Canvas
             _taskbar = (TaskbarIcon)FindResource("TaskbarTrayIcon");
 
             StartArgs = e.Args;
+
+            // 新增：Office注册表检测
+            try
+            {
+                LogHelper.WriteLogToFile("开始Office注册表检测");
+                
+                // 检查Office安装
+                if (!IsOfficeInstalled())
+                {
+                    LogHelper.WriteLogToFile("未检测到Office安装", LogHelper.LogType.Warning);
+                    return;
+                }
+
+                // 尝试获取所有可能的Office版本路径
+                var officeVersions = GetOfficeVersions();
+                if (officeVersions.Count == 0)
+                {
+                    LogHelper.WriteLogToFile("未找到任何Office版本", LogHelper.LogType.Warning);
+                    return;
+                }
+
+                foreach (var version in officeVersions)
+                {
+                    string regPath = $"Software\\Microsoft\\Office\\{version}\\Common\\Security";
+                    LogHelper.WriteLogToFile($"正在处理Office版本 {version}, 注册表路径: {regPath}");
+
+                    try
+                    {
+                        using (Microsoft.Win32.RegistryKey baseKey = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(regPath))
+                        {
+                            if (baseKey == null)
+                            {
+                                LogHelper.WriteLogToFile($"注册表路径不存在: {regPath}", LogHelper.LogType.Warning);
+                                // 尝试创建路径
+                                try 
+                                {
+                                    using (Microsoft.Win32.RegistryKey createKey = Microsoft.Win32.Registry.CurrentUser.CreateSubKey(regPath, true))
+                                    {
+                                        if (createKey != null)
+                                        {
+                                            createKey.SetValue("DisableProtectedView", 1, Microsoft.Win32.RegistryValueKind.DWord);
+                                            LogHelper.WriteLogToFile($"创建并设置注册表路径: {regPath}", LogHelper.LogType.Info);
+                                        }
+                                    }
+                                }
+                                catch (Exception createEx)
+                                {
+                                    LogHelper.WriteLogToFile($"创建注册表路径失败: {createEx.Message}", LogHelper.LogType.Error);
+                                }
+                                continue;
+                            }
+
+                            // 备份路径更改为软件根目录下的saves/RegistryBackups文件夹
+                            string backupPath = Path.Combine(RootPath, "saves", "RegistryBackups");
+                            LogHelper.WriteLogToFile($"备份路径: {backupPath}");
+                            
+                            if (!Directory.Exists(backupPath)) 
+                            {
+                                Directory.CreateDirectory(backupPath);
+                                LogHelper.WriteLogToFile($"创建备份目录: {backupPath}");
+                            }
+                            
+                            string backupFile = Path.Combine(backupPath, $"SecurityBackup_{version}_{DateTime.Now:yyyyMMddHHmmss}.reg");
+                            LogHelper.WriteLogToFile($"创建备份文件: {backupFile}");
+                            
+                            // 使用UTF8编码写入注册表文件
+                            using (StreamWriter sw = new StreamWriter(backupFile, false, System.Text.Encoding.UTF8))
+                            {
+                                sw.WriteLine("Windows Registry Editor Version 5.00\n");
+                                sw.WriteLine();
+                                sw.WriteLine($"[{Microsoft.Win32.Registry.CurrentUser.Name}\\{regPath}]");
+                                
+                                foreach (string valueName in baseKey.GetValueNames())
+                                {
+                                    object value = baseKey.GetValue(valueName);
+                                    sw.WriteLine($"\"{valueName}\"=dword:{((int)value):x8}");
+                                    LogHelper.WriteLogToFile($"备份注册表值: {valueName} = {value}");
+                                }
+                            }
+
+                            using (Microsoft.Win32.RegistryKey key = Microsoft.Win32.Registry.CurrentUser.CreateSubKey(regPath, true))
+                            {
+                                // 仅在值不存在或不等于1时更新
+                                object currentValue = key.GetValue("DisableProtectedView");
+                                if (currentValue == null || (int)currentValue != 1)
+                                {
+                                    key.SetValue("DisableProtectedView", 1, Microsoft.Win32.RegistryValueKind.DWord);
+                                    LogHelper.WriteLogToFile($"Office {version} 注册表值已设置: DisableProtectedView = 1");
+                                }
+                                else
+                                {
+                                    LogHelper.WriteLogToFile($"Office {version} 注册表值已存在且无需更改: DisableProtectedView = 1");
+                                }
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"处理Office版本 {version} 时出错: {ex.Message}", LogHelper.LogType.Error);
+                        continue;
+                    }
+                }
+
+                // 处理Office 365的特殊路径
+                TryModifyOffice365Registry();
+            }
+            catch (SecurityException secEx)
+            {
+                LogHelper.WriteLogToFile($"安全异常: {secEx.Message}", LogHelper.LogType.Error);
+                ShowPermissionError();
+            }
+            catch (UnauthorizedAccessException authEx)
+            {
+                LogHelper.WriteLogToFile($"访问被拒绝: {authEx.Message}", LogHelper.LogType.Error);
+                ShowPermissionError();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"未知错误: {ex.GetType().FullName} - {ex.Message}", LogHelper.LogType.Error);
+                LogHelper.WriteLogToFile(ex.StackTrace, LogHelper.LogType.Info);
+            }
         }
 
         private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
@@ -75,5 +230,552 @@ namespace Ink_Canvas
             }
             catch {  }
         }
+
+        // 新增：用于设置崩溃后操作类型
+        public enum CrashActionType
+        {
+            SilentRestart,
+            NoAction
+        }
+
+        // 心跳相关
+        private static Timer heartbeatTimer;
+        private static DateTime lastHeartbeat = DateTime.Now;
+        private static Timer watchdogTimer;
+
+        private void StartHeartbeatMonitor()
+        {
+            // 主线程定时更新心跳
+            heartbeatTimer = new Timer(_ => lastHeartbeat = DateTime.Now, null, 0, 1000);
+            // 辅助线程检测心跳超时
+            watchdogTimer = new Timer(_ =>
+            {
+                if ((DateTime.Now - lastHeartbeat).TotalSeconds > 10)
+                {
+                    LogHelper.NewLog("检测到主线程无响应，自动重启。");
+                    if (CrashAction == CrashActionType.SilentRestart)
+                    {
+                        try
+                        {
+                            string exePath = Process.GetCurrentProcess().MainModule.FileName;
+                            Process.Start(exePath);
+                        }
+                        catch { }
+                        Environment.Exit(1);
+                    }
+                }
+            }, null, 0, 3000);
+        }
+
+        // 看门狗进程
+        private void StartWatchdogIfNeeded()
+        {
+            // 避免递归启动
+            if (Environment.GetCommandLineArgs().Contains("--watchdog")) return;
+            // 启动看门狗进程
+            string exePath = Process.GetCurrentProcess().MainModule.FileName;
+            var psi = new ProcessStartInfo
+            {
+                FileName = exePath,
+                Arguments = "--watchdog " + Process.GetCurrentProcess().Id + " \"" + watchdogExitSignalFile + "\"",
+                CreateNoWindow = true,
+                UseShellExecute = false,
+                WindowStyle = ProcessWindowStyle.Hidden
+            };
+            watchdogProcess = Process.Start(psi);
+        }
+
+        // 看门狗主逻辑（在 Main 函数或 App_Startup 入口前加判断）
+        public static void RunWatchdogIfNeeded()
+        {
+            var args = Environment.GetCommandLineArgs();
+            if (args.Length >= 4 && args[1] == "--watchdog")
+            {
+                int pid = int.Parse(args[2]);
+                string exitSignalFile = args[3];
+                try
+                {
+                    var proc = Process.GetProcessById(pid);
+                    while (!proc.HasExited)
+                    {
+                        // 检查退出信号文件
+                        if (File.Exists(exitSignalFile))
+                        {
+                            try { File.Delete(exitSignalFile); } catch { }
+                            Environment.Exit(0);
+                        }
+                        Thread.Sleep(2000);
+                    }
+                    // 主进程异常退出，自动重启
+                    string exePath = Process.GetCurrentProcess().MainModule.FileName;
+                    Process.Start(exePath);
+                }
+                catch { }
+                Environment.Exit(0);
+            }
+        }
+
+        private void App_Exit(object sender, ExitEventArgs e)
+        {
+            // 仅在软件内主动退出时关闭看门狗，并写入退出信号
+            try
+            {
+                if (IsAppExitByUser)
+                {
+                    // 写入退出信号文件，通知看门狗正常退出
+                    File.WriteAllText(watchdogExitSignalFile, "exit");
+                    if (watchdogProcess != null && !watchdogProcess.HasExited)
+                    {
+                        watchdogProcess.Kill();
+                    }
+                }
+            }
+            catch { }
+        }
+
+        /// <summary>
+        /// 检查Office是否安装
+        /// </summary>
+        private bool IsOfficeInstalled()
+        {
+            try
+            {
+                // 检查多个可能的注册表路径
+                // 1. 检查传统的Office版本
+                using (Microsoft.Win32.RegistryKey key = Microsoft.Win32.Registry.LocalMachine.OpenSubKey("Software\\Microsoft\\Office"))
+                {
+                    if (key != null && key.GetSubKeyNames().Any(name => name.Contains(".0")))
+                    {
+                        LogHelper.WriteLogToFile("检测到传统Office安装", LogHelper.LogType.Info);
+                        return true;
+                    }
+                }
+                
+                // 2. 检查64位注册表中的Office
+                using (Microsoft.Win32.RegistryKey key = Microsoft.Win32.Registry.LocalMachine.OpenSubKey("Software\\Wow6432Node\\Microsoft\\Office"))
+                {
+                    if (key != null && key.GetSubKeyNames().Any(name => name.Contains(".0")))
+                    {
+                        LogHelper.WriteLogToFile("检测到64位注册表中的Office安装", LogHelper.LogType.Info);
+                        return true;
+                    }
+                }
+                
+                // 3. 检查Office 365/Click-to-Run安装
+                using (Microsoft.Win32.RegistryKey key = Microsoft.Win32.Registry.LocalMachine.OpenSubKey("Software\\Microsoft\\Office\\ClickToRun"))
+                {
+                    if (key != null)
+                    {
+                        LogHelper.WriteLogToFile("检测到Office 365 Click-to-Run", LogHelper.LogType.Info);
+                        return true;
+                    }
+                }
+                
+                // 4. 检查Office 365部署配置
+                using (Microsoft.Win32.RegistryKey key = Microsoft.Win32.Registry.LocalMachine.OpenSubKey("Software\\Microsoft\\Office\\15.0\\ClickToRun"))
+                {
+                    if (key != null)
+                    {
+                        LogHelper.WriteLogToFile("检测到Office 365 (15.0)", LogHelper.LogType.Info);
+                        return true;
+                    }
+                }
+                
+                using (Microsoft.Win32.RegistryKey key = Microsoft.Win32.Registry.LocalMachine.OpenSubKey("Software\\Microsoft\\Office\\16.0\\ClickToRun"))
+                {
+                    if (key != null)
+                    {
+                        LogHelper.WriteLogToFile("检测到Office 365 (16.0)", LogHelper.LogType.Info);
+                        return true;
+                    }
+                }
+
+                // 5. 检查Office 365零售订阅信息
+                using (Microsoft.Win32.RegistryKey key = Microsoft.Win32.Registry.LocalMachine.OpenSubKey("Software\\Microsoft\\Office\\ClickToRun\\Configuration"))
+                {
+                    if (key != null)
+                    {
+                        LogHelper.WriteLogToFile("检测到Office 365配置", LogHelper.LogType.Info);
+                        return true;
+                    }
+                }
+
+                LogHelper.WriteLogToFile("未检测到任何Office安装", LogHelper.LogType.Warning);
+                return false;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"检查Office安装时出错: {ex.Message}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+        
+        /// <summary>
+        /// 显示权限不足的错误提示
+        /// </summary>
+        private void ShowPermissionError()
+        {
+            const string message = "需要管理员权限才能完成此操作\n请以管理员身份重新启动应用程序";
+            LogHelper.WriteLogToFile(message, LogHelper.LogType.Error);
+            System.Windows.MessageBox.Show(message, "权限错误", MessageBoxButton.OK, MessageBoxImage.Error);
+        }
+
+        /// <summary>
+        /// 获取所有已安装的Office版本
+        /// </summary>
+        private List<string> GetOfficeVersions()
+        {
+            var versions = new List<string>();
+            try
+            {
+                // 检查HKLM
+                using (var key = Registry.LocalMachine.OpenSubKey("Software\\Microsoft\\Office"))
+                {
+                    if (key != null)
+                    {
+                        foreach (var subKeyName in key.GetSubKeyNames())
+                        {
+                            if (subKeyName.Contains(".0"))
+                            {
+                                versions.Add(subKeyName);
+                                LogHelper.WriteLogToFile($"在HKLM中找到Office版本: {subKeyName}");
+                            }
+                        }
+                    }
+                }
+
+                // 检查HKCU
+                using (var key = Registry.CurrentUser.OpenSubKey("Software\\Microsoft\\Office"))
+                {
+                    if (key != null)
+                    {
+                        foreach (var subKeyName in key.GetSubKeyNames())
+                        {
+                            if (subKeyName.Contains(".0") && !versions.Contains(subKeyName))
+                            {
+                                versions.Add(subKeyName);
+                                LogHelper.WriteLogToFile($"在HKCU中找到Office版本: {subKeyName}");
+                            }
+                        }
+                    }
+                }
+
+                // 检查64位注册表
+                using (var key = Registry.LocalMachine.OpenSubKey("Software\\Wow6432Node\\Microsoft\\Office"))
+                {
+                    if (key != null)
+                    {
+                        foreach (var subKeyName in key.GetSubKeyNames())
+                        {
+                            if (subKeyName.Contains(".0") && !versions.Contains(subKeyName))
+                            {
+                                versions.Add(subKeyName);
+                                LogHelper.WriteLogToFile($"在64位注册表中找到Office版本: {subKeyName}");
+                            }
+                        }
+                    }
+                }
+
+                // 检查Office 365的特殊路径
+                CheckOffice365Versions(versions);
+
+                // 如果没有找到任何版本，添加默认的Office 365版本号
+                if (versions.Count == 0 && IsOffice365Installed())
+                {
+                    versions.Add("16.0");
+                    LogHelper.WriteLogToFile("未找到具体版本，添加默认Office 365版本: 16.0");
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"获取Office版本时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+
+            // 按版本号排序
+            versions.Sort((a, b) =>
+            {
+                try
+                {
+                    double va = double.Parse(a.Replace(".0", ""));
+                    double vb = double.Parse(b.Replace(".0", ""));
+                    return vb.CompareTo(va); // 降序排列，最新版本在前
+                }
+                catch
+                {
+                    return 0;
+                }
+            });
+
+            return versions;
+        }
+
+        /// <summary>
+        /// 检测Office 365是否已安装
+        /// </summary>
+        private bool IsOffice365Installed()
+        {
+            try
+            {
+                // 检查多个Office 365特定路径
+                using (var key = Registry.LocalMachine.OpenSubKey("Software\\Microsoft\\Office\\ClickToRun"))
+                {
+                    if (key != null)
+                        return true;
+                }
+
+                using (var key = Registry.LocalMachine.OpenSubKey("Software\\Microsoft\\Office\\15.0\\ClickToRun"))
+                {
+                    if (key != null)
+                        return true;
+                }
+
+                using (var key = Registry.LocalMachine.OpenSubKey("Software\\Microsoft\\Office\\16.0\\ClickToRun"))
+                {
+                    if (key != null)
+                        return true;
+                }
+
+                using (var key = Registry.LocalMachine.OpenSubKey("Software\\Microsoft\\Office\\ClickToRun\\Configuration"))
+                {
+                    if (key != null)
+                        return true;
+                }
+
+                return false;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 检查Office 365特有的版本信息
+        /// </summary>
+        private void CheckOffice365Versions(List<string> versions)
+        {
+            try
+            {
+                // 检查Click-to-Run版本路径
+                using (var key = Registry.LocalMachine.OpenSubKey("Software\\Microsoft\\Office\\ClickToRun\\Configuration"))
+                {
+                    if (key != null)
+                    {
+                        var platformVersion = key.GetValue("Platform") as string;
+                        var clickToRunVersion = key.GetValue("VersionToReport") as string;
+                        
+                        if (!string.IsNullOrEmpty(platformVersion))
+                        {
+                            var majorVersion = platformVersion.Split('.').FirstOrDefault();
+                            if (!string.IsNullOrEmpty(majorVersion) && !versions.Contains($"{majorVersion}.0"))
+                            {
+                                versions.Add($"{majorVersion}.0");
+                                LogHelper.WriteLogToFile($"在Office 365配置中找到平台版本: {majorVersion}.0");
+                            }
+                        }
+
+                        if (!string.IsNullOrEmpty(clickToRunVersion))
+                        {
+                            var majorVersion = clickToRunVersion.Split('.').FirstOrDefault();
+                            if (!string.IsNullOrEmpty(majorVersion) && !versions.Contains($"{majorVersion}.0"))
+                            {
+                                versions.Add($"{majorVersion}.0");
+                                LogHelper.WriteLogToFile($"在Office 365配置中找到报告版本: {majorVersion}.0");
+                            }
+                        }
+                    }
+                }
+
+                // 检查安装路径来确认版本
+                var possibleVersions = new[] { "15.0", "16.0" }; // Office 2013 (15.0) 和 Office 2016/2019/365 (16.0)
+                foreach (var version in possibleVersions)
+                {
+                    using (var key = Registry.LocalMachine.OpenSubKey($"Software\\Microsoft\\Office\\{version}\\Common\\InstallRoot"))
+                    {
+                        if (key != null && key.GetValue("Path") != null && !versions.Contains(version))
+                        {
+                            versions.Add(version);
+                            LogHelper.WriteLogToFile($"在InstallRoot中找到Office版本: {version}");
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"检查Office 365版本时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 尝试修改Office 365的特殊注册表路径
+        /// </summary>
+        private void TryModifyOffice365Registry()
+        {
+            try
+            {
+                // 准备备份目录
+                string backupPath = Path.Combine(RootPath, "saves", "RegistryBackups");
+                if (!Directory.Exists(backupPath))
+                {
+                    Directory.CreateDirectory(backupPath);
+                    LogHelper.WriteLogToFile($"创建Office 365备份目录: {backupPath}");
+                }
+
+                // 检查Office 365 Outlook和PowerPoint的特定路径
+                string[] apps = { "outlook", "powerpoint" };
+                
+                foreach (var app in apps)
+                {
+                    // 检查用户级别的注册表
+                    string regPath = $"Software\\Microsoft\\Office\\16.0\\{app}\\Security";
+                    LogHelper.WriteLogToFile($"检查Office 365特定应用注册表: {regPath}");
+                    
+                    try
+                    {
+                        // 先检查是否存在该路径
+                        using (var baseKey = Registry.CurrentUser.OpenSubKey(regPath))
+                        {
+                            // 如果路径存在，先备份
+                            if (baseKey != null)
+                            {
+                                string backupFile = Path.Combine(backupPath, $"SecurityBackup_365_{app}_{DateTime.Now:yyyyMMddHHmmss}.reg");
+                                LogHelper.WriteLogToFile($"创建Office 365 {app}备份文件: {backupFile}");
+                                
+                                // 使用UTF8编码写入注册表文件
+                                using (StreamWriter sw = new StreamWriter(backupFile, false, System.Text.Encoding.UTF8))
+                                {
+                                    sw.WriteLine("Windows Registry Editor Version 5.00\n");
+                                    sw.WriteLine();
+                                    sw.WriteLine($"[{Microsoft.Win32.Registry.CurrentUser.Name}\\{regPath}]");
+                                    
+                                    foreach (string valueName in baseKey.GetValueNames())
+                                    {
+                                        object value = baseKey.GetValue(valueName);
+                                        sw.WriteLine($"\"{valueName}\"=dword:{((int)value):x8}");
+                                        LogHelper.WriteLogToFile($"备份Office 365 {app}注册表值: {valueName} = {value}");
+                                    }
+                                }
+                            }
+                        }
+
+                        // 修改或创建注册表项
+                        using (var key = Registry.CurrentUser.CreateSubKey(regPath, true))
+                        {
+                            if (key != null)
+                            {
+                                object currentValue = key.GetValue("DisableProtectedView");
+                                if (currentValue == null || (int)currentValue != 1)
+                                {
+                                    key.SetValue("DisableProtectedView", 1, RegistryValueKind.DWord);
+                                    LogHelper.WriteLogToFile($"Office 365 {app} 注册表值已设置: DisableProtectedView = 1");
+                                }
+                                else
+                                {
+                                    LogHelper.WriteLogToFile($"Office 365 {app} 注册表值已存在且无需更改");
+                                }
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"修改 {app} 注册表时出错: {ex.Message}", LogHelper.LogType.Error);
+                    }
+                }
+                
+                // 尝试通过Office信任中心路径修改
+                string trustCenterPath = "Software\\Microsoft\\Office\\16.0\\Common\\Security\\FileValidation";
+                LogHelper.WriteLogToFile($"检查信任中心路径: {trustCenterPath}");
+                
+                try
+                {
+                    // 先检查是否存在该路径
+                    using (var baseKey = Registry.CurrentUser.OpenSubKey(trustCenterPath))
+                    {
+                        // 如果路径存在，先备份
+                        if (baseKey != null)
+                        {
+                            string backupFile = Path.Combine(backupPath, $"SecurityBackup_365_TrustCenter_{DateTime.Now:yyyyMMddHHmmss}.reg");
+                            LogHelper.WriteLogToFile($"创建信任中心备份文件: {backupFile}");
+                            
+                            // 使用UTF8编码写入注册表文件
+                            using (StreamWriter sw = new StreamWriter(backupFile, false, System.Text.Encoding.UTF8))
+                            {
+                                sw.WriteLine("Windows Registry Editor Version 5.00\n");
+                                sw.WriteLine();
+                                sw.WriteLine($"[{Microsoft.Win32.Registry.CurrentUser.Name}\\{trustCenterPath}]");
+                                
+                                foreach (string valueName in baseKey.GetValueNames())
+                                {
+                                    object value = baseKey.GetValue(valueName);
+                                    sw.WriteLine($"\"{valueName}\"=dword:{((int)value):x8}");
+                                    LogHelper.WriteLogToFile($"备份信任中心注册表值: {valueName} = {value}");
+                                }
+                            }
+                        }
+                    }
+
+                    using (var key = Registry.CurrentUser.CreateSubKey(trustCenterPath, true))
+                    {
+                        if (key != null)
+                        {
+                            key.SetValue("DisableEditFromPV", 1, RegistryValueKind.DWord);
+                            LogHelper.WriteLogToFile("已禁用受保护视图中的编辑");
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"修改信任中心路径时出错: {ex.Message}", LogHelper.LogType.Error);
+                }
+                
+                // 尝试修改EnableEditWhileViewingPolicy
+                string policyPath = "Software\\Policies\\Microsoft\\Office\\16.0\\Common\\Security";
+                try
+                {
+                    // 先检查是否存在该路径
+                    using (var baseKey = Registry.CurrentUser.OpenSubKey(policyPath))
+                    {
+                        // 如果路径存在，先备份
+                        if (baseKey != null)
+                        {
+                            string backupFile = Path.Combine(backupPath, $"SecurityBackup_365_Policy_{DateTime.Now:yyyyMMddHHmmss}.reg");
+                            LogHelper.WriteLogToFile($"创建策略备份文件: {backupFile}");
+                            
+                            // 使用UTF8编码写入注册表文件
+                            using (StreamWriter sw = new StreamWriter(backupFile, false, System.Text.Encoding.UTF8))
+                            {
+                                sw.WriteLine("Windows Registry Editor Version 5.00\n");
+                                sw.WriteLine();
+                                sw.WriteLine($"[{Microsoft.Win32.Registry.CurrentUser.Name}\\{policyPath}]");
+                                
+                                foreach (string valueName in baseKey.GetValueNames())
+                                {
+                                    object value = baseKey.GetValue(valueName);
+                                    sw.WriteLine($"\"{valueName}\"=dword:{((int)value):x8}");
+                                    LogHelper.WriteLogToFile($"备份策略注册表值: {valueName} = {value}");
+                                }
+                            }
+                        }
+                    }
+
+                    using (var key = Registry.CurrentUser.CreateSubKey(policyPath, true))
+                    {
+                        if (key != null)
+                        {
+                            key.SetValue("EnableEditWhileViewingPolicy", 1, RegistryValueKind.DWord);
+                            LogHelper.WriteLogToFile("已启用查看时编辑策略");
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"修改策略路径时出错: {ex.Message}", LogHelper.LogType.Error);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"修改Office 365注册表时发生未知错误: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
     }
 }

Ink Canvas/Helpers/EdgeGestureUtil.cs

@@ -1,17 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.VisualBasic;
-using System.Collections;
-using System.Data;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
 

Ink Canvas/Helpers/ForegroundWindowInfo.cs

@@ -23,6 +23,44 @@ namespace Ink_Canvas.Helpers
         [DllImport("user32.dll")]
         private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
 
+        [DllImport("shell32.dll")]
+        private static extern IntPtr SHAppBarMessage(uint dwMessage, ref APPBARDATA pData);
+
+        [DllImport("user32.dll")]
+        private static extern int SystemParametersInfo(uint uiAction, uint uiParam, IntPtr pvParam, uint fWinIni);
+
+        [DllImport("user32.dll")]
+        private static extern bool GetMonitorInfo(IntPtr hMonitor, ref MONITORINFO lpmi);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr MonitorFromWindow(IntPtr hwnd, uint dwFlags);
+
+        private const uint ABM_GETTASKBARPOS = 0x00000005;
+        private const uint ABM_GETSTATE = 0x00000004;
+        private const int SPI_GETWORKAREA = 0x0030;
+        private const uint MONITOR_DEFAULTTOPRIMARY = 1;
+        private const int ABS_AUTOHIDE = 0x0000001;
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct MONITORINFO
+        {
+            public int cbSize;
+            public RECT rcMonitor;
+            public RECT rcWork;
+            public uint dwFlags;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct APPBARDATA
+        {
+            public int cbSize;
+            public IntPtr hWnd;
+            public uint uCallbackMessage;
+            public uint uEdge;
+            public RECT rc;
+            public IntPtr lParam;
+        }
+
         [StructLayout(LayoutKind.Sequential)]
         public struct RECT {
             public int Left;
@@ -34,6 +72,72 @@ namespace Ink_Canvas.Helpers
             public int Height => Bottom - Top;
         }
 
+        /// <summary>
+        /// 获取Windows任务栏的高度（仅计算任务栏，不包括其他应用的停靠栏）
+        /// </summary>
+        /// <param name="screen">当前屏幕</param>
+        /// <param name="dpiScaleY">DPI缩放Y值</param>
+        /// <returns>任务栏高度</returns>
+        public static double GetTaskbarHeight(System.Windows.Forms.Screen screen, double dpiScaleY)
+        {
+            try
+            {
+                // 创建APPBARDATA结构
+                var abd = new APPBARDATA();
+                abd.cbSize = Marshal.SizeOf(abd);
+
+                // 获取任务栏状态
+                IntPtr state = SHAppBarMessage(ABM_GETSTATE, ref abd);
+                bool isAutoHide = (state.ToInt32() & ABS_AUTOHIDE) == ABS_AUTOHIDE;
+
+                // 如果任务栏是自动隐藏的,返回0
+                if (isAutoHide)
+                {
+                    LogHelper.WriteLogToFile("任务栏处于自动隐藏状态", LogHelper.LogType.Info);
+                    return 0;
+                }
+
+                // 获取任务栏信息
+                IntPtr result = SHAppBarMessage(ABM_GETTASKBARPOS, ref abd);
+                if (result != IntPtr.Zero)
+                {
+                    // 获取当前屏幕的工作区
+                    RECT workArea = new RECT();
+                    SystemParametersInfo(SPI_GETWORKAREA, 0, Marshal.AllocHGlobal(Marshal.SizeOf(workArea)), 0);
+
+                    // 根据任务栏位置计算高度
+                    int taskbarHeight = 0;
+
+                    // 任务栏的uEdge: 0=左, 1=上, 2=右, 3=下
+                    switch (abd.uEdge)
+                    {
+                        case 1: // 上
+                            taskbarHeight = abd.rc.Height;
+                            break;
+                        case 3: // 下
+                            taskbarHeight = abd.rc.Height;
+                            break;
+                        case 0: // 左
+                        case 2: // 右
+                            // 水平任务栏不影响高度
+                            taskbarHeight = 0;
+                            break;
+                    }
+
+                    // 考虑DPI缩放
+                    return taskbarHeight / dpiScaleY;
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"获取任务栏高度出错: {ex.Message}");
+                LogHelper.WriteLogToFile($"获取任务栏高度出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+
+            // 如果获取失败，回退到通用方法
+            return (screen.Bounds.Height - screen.WorkingArea.Height) / dpiScaleY;
+        }
+
         public static string WindowTitle() {
             IntPtr foregroundWindowHandle = GetForegroundWindow();
 

Ink Canvas/MainWindow.xaml

@@ -221,6 +221,80 @@
                                     </ui:SimpleStackPanel>
                                 </ui:SimpleStackPanel>
                             </Border>
+                            <Border Margin="0,0,0,10" Height="100" CornerRadius="5" BorderBrush="#a1a1aa"
+                                    BorderThickness="1">
+                                <ui:SimpleStackPanel VerticalAlignment="Center">
+                                    <TextBlock Foreground="#fafafa" HorizontalAlignment="Center"
+                                               VerticalAlignment="Center" FontSize="15" Margin="0,0,0,10"
+                                               Text="开发中...请不要点击，可能会导致ICC异常崩溃" />
+                                    <ui:SimpleStackPanel Spacing="5">
+                                        <ui:SimpleStackPanel Spacing="5" Orientation="Horizontal"
+                                                             HorizontalAlignment="Center">
+                                            <Button Width="116" Height="45" FontFamily="Microsoft YaHei UI"
+                                                    Click="BtnRestart_Click">
+                                                <Button.Resources>
+                                                </Button.Resources>
+                                                <ui:SimpleStackPanel Orientation="Horizontal"
+                                                                     VerticalAlignment="Center"
+                                                                     HorizontalAlignment="Center" Spacing="0">
+                                                    <Image RenderOptions.BitmapScalingMode="HighQuality"
+                                                           Margin="0,0,6,0" Height="20" Width="20">
+                                                        <Image.Source>
+                                                            <DrawingImage>
+                                                                <DrawingImage.Drawing>
+                                                                    <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                                                        <GeometryDrawing Brush="White"
+                                                                            Geometry="F1 M24,24z M0,0z M6.34315,6.34315C7.84299,4.8433 9.87707,4.0005 11.9981,4 14.2527,4.00897 16.4167,4.88785 18.039,6.45324L18.5858,7 16,7C15.4477,7 15,7.44772 15,8 15,8.55228 15.4477,9 16,9L21,9C21.1356,9 21.2649,8.97301 21.3828,8.92412 21.5007,8.87532 21.6112,8.80298 21.7071,8.70711 21.8902,8.52405 21.9874,8.28768 21.9989,8.04797 21.9996,8.03199 22,8.016 22,8L22,3C22,2.44772 21.5523,2 21,2 20.4477,2 20,2.44772 20,3L20,5.58579 19.4471,5.03289 19.435,5.02103C17.4405,3.09289,14.7779,2.01044,12.0038,2L12,2C9.34784,2 6.8043,3.05357 4.92893,4.92893 3.05357,6.8043 2,9.34784 2,12 2,12.5523 2.44772,13 3,13 3.55228,13 4,12.5523 4,12 4,9.87827 4.84285,7.84344 6.34315,6.34315z" />
+                                                                        <GeometryDrawing Brush="White"
+                                                                            Geometry="F1 M24,24z M0,0z M22,12C22,14.6522 20.9464,17.1957 19.0711,19.0711 17.1957,20.9464 14.6522,22 12,22L11.9962,22C9.22213,21.9896,6.55946,20.9071,4.56496,18.979L4.55289,18.9671 4,18.4142 4,21C4,21.5523 3.55228,22 3,22 2.44772,22 2,21.5523 2,21L2,16.0002C2,15.8646 2.02699,15.7351 2.07588,15.6172 2.12432,15.5001 2.19595,15.3904 2.29078,15.295 2.29219,15.2936 2.2936,15.2922 2.29502,15.2908 2.48924,15.0977 2.74301,15.0008 2.997,15 2.998,15 2.999,15 3,15L8,15C8.55228,15 9,15.4477 9,16 9,16.5523 8.55228,17 8,17L5.41421,17 5.96095,17.5467C7.5833,19.1122 9.74736,19.9911 12.002,20 14.123,19.9995 16.157,19.1567 17.6569,17.6569 19.1571,16.1566 20,14.1217 20,12 20,11.4477 20.4477,11 21,11 21.5523,11 22,11.4477 22,12z" />
+                                                                    </DrawingGroup>
+                                                                </DrawingImage.Drawing>
+                                                            </DrawingImage>
+                                                        </Image.Source>
+                                                    </Image>
+                                                    <Label FontSize="16" Foreground="#fafafa"
+                                                           VerticalAlignment="Center" FontFamily="Microsoft YaHei UI"
+                                                           FontWeight="Bold">
+                                                        测试
+                                                    </Label>
+                                                </ui:SimpleStackPanel>
+                                            </Button>
+                                            <Button Width="116" Height="45" FontFamily="Microsoft YaHei UI"
+                                                    Click="BtnResetToSuggestion_Click"
+                                                    Margin="0,0,0,0">
+                                                <ui:SimpleStackPanel Orientation="Horizontal"
+                                                                     VerticalAlignment="Center"
+                                                                     HorizontalAlignment="Center" Spacing="0">
+                                                    <Image
+                                                        Margin="0,0,4,0" RenderOptions.BitmapScalingMode="HighQuality"
+                                                        Height="20" Width="20">
+                                                        <Image.Source>
+                                                            <DrawingImage>
+                                                                <DrawingImage.Drawing>
+                                                                    <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                                                        <GeometryDrawing Brush="White"
+                                                                            Geometry="F1 M24,24z M0,0z M2,6C2,5.44772,2.44772,5,3,5L21,5C21.5523,5 22,5.44772 22,6 22,6.55228 21.5523,7 21,7L3,7C2.44772,7,2,6.55228,2,6z" />
+                                                                        <GeometryDrawing Brush="White"
+                                                                            Geometry="F1 M24,24z M0,0z M2,12C2,11.4477,2.44772,11,3,11L7,11C7.55228,11 8,11.4477 8,12 8,12.5523 7.55228,13 7,13L3,13C2.44772,13,2,12.5523,2,12z" />
+                                                                        <GeometryDrawing Brush="White"
+                                                                            Geometry="F1 M24,24z M0,0z M3,17C2.44772,17 2,17.4477 2,18 2,18.5523 2.44772,19 3,19L7,19C7.55228,19 8,18.5523 8,18 8,17.4477 7.55228,17 7,17L3,17z" />
+                                                                        <GeometryDrawing Brush="White"
+                                                                            Geometry="F1 M24,24z M0,0z M12.3829,11.2029C13.4335,10.1522 14.8952,9.5 16.5,9.5 17.9587,9.5 19.3576,10.0795 20.3891,11.1109 21.4205,12.1424 22,13.5413 22,15 22,16.2593 21.6038,17.4867 20.8675,18.5083 20.1311,19.5299 19.092,20.2939 17.8974,20.6921 16.7027,21.0903 15.413,21.1026 14.211,20.7271 13.009,20.3516 11.9556,19.6074 11.2,18.6 10.8686,18.1582 10.9582,17.5314 11.4,17.2 11.8418,16.8686 12.4686,16.9582 12.8,17.4 13.3037,18.0716 14.006,18.5677 14.8073,18.8181 15.6087,19.0684 16.4685,19.0602 17.2649,18.7947 18.0614,18.5292 18.7541,18.0199 19.245,17.3388 19.7359,16.6578 20,15.8395 20,15 20,14.0717 19.6313,13.1815 18.9749,12.5251 18.3185,11.8687 17.4283,11.5 16.5,11.5 15.4448,11.5 14.4865,11.9278 13.7971,12.6171L13.4142,13 15,13C15.5523,13 16,13.4477 16,14 16,14.5523 15.5523,15 15,15L11.0007,15C10.9997,15 10.998,15 10.997,15 10.8625,14.9996 10.7343,14.9727 10.6172,14.9241 10.5001,14.8757 10.3904,14.804 10.295,14.7092 10.2936,14.7078 10.2922,14.7064 10.2908,14.705 10.196,14.6096 10.1243,14.4999 10.0759,14.3828 10.027,14.2649 10,14.1356 10,14L10,10C10,9.44772 10.4477,9 11,9 11.5523,9 12,9.44772 12,10L12,11.5858 12.3829,11.2029z" />
+                                                                    </DrawingGroup>
+                                                                </DrawingImage.Drawing>
+                                                            </DrawingImage>
+                                                        </Image.Source>
+                                                    </Image>
+                                                    <Label Margin="2,0,0,0" FontSize="16" VerticalAlignment="Center"
+                                                           FontFamily="Microsoft YaHei UI">
+                                                        测试
+                                                    </Label>
+                                                </ui:SimpleStackPanel>
+                                            </Button>
+                                        </ui:SimpleStackPanel>
+                                    </ui:SimpleStackPanel>
+                                </ui:SimpleStackPanel>
+                            </Border>
                             <GroupBox>
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="启动" FontWeight="Bold" Foreground="#fafafa"
@@ -361,6 +435,25 @@
                                     </ui:SimpleStackPanel>
                                 </ui:SimpleStackPanel>
                             </GroupBox>
+                            <!-- 新增：崩溃后操作设置 -->
+                            <GroupBox>
+                                <GroupBox.Header>
+                                    <TextBlock Margin="0,12,0,0" Text="崩溃后操作" FontWeight="Bold" Foreground="#fafafa"
+                                               FontSize="26" />
+                                </GroupBox.Header>
+                                <ui:SimpleStackPanel Spacing="6">
+                                    <TextBlock Text="请选择软件发生未处理异常时的自动操作：" Foreground="#a1a1aa" />
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,4,0,0">
+                                        <RadioButton x:Name="RadioCrashSilentRestart" GroupName="CrashAction"
+                                                     Content="静默重启软件" FontSize="14" Margin="0,0,24,0"
+                                                     Checked="RadioCrashAction_Checked"/>
+                                        <RadioButton x:Name="RadioCrashNoAction" GroupName="CrashAction"
+                                                     Content="无操作" FontSize="14"
+                                                     Checked="RadioCrashAction_Checked"/>
+                                    </StackPanel>
+                                    <TextBlock Text="# 静默重启：崩溃后自动重启软件，无提示。无操作：崩溃后仅记录日志，不自动重启。" Foreground="#a1a1aa" />
+                                </ui:SimpleStackPanel>
+                            </GroupBox>
                             <GroupBox>
                                 <GroupBox.Header>
                                     <TextBlock Margin="0,12,0,0" Text="手势" FontWeight="Bold" Foreground="#fafafa"
@@ -1872,6 +1965,15 @@
                                                          FontWeight="Bold"
                                                          Toggled="ToggleSwitchDisplayRandWindowNamesInputBtn_OnToggled" />
                                     </ui:SimpleStackPanel>
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                        <TextBlock Foreground="#fafafa" Text="启用随机抽和单次抽按钮"
+                                                   VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
+                                        <ui:ToggleSwitch OnContent="" OffContent=""
+                                                         Name="ToggleSwitchShowRandomAndSingleDraw"
+                                                         IsOn="True" FontFamily="Microsoft YaHei UI" 
+                                                         FontWeight="Bold" 
+                                                         Toggled="ToggleSwitchShowRandomAndSingleDraw_Toggled" />
+                                    </ui:SimpleStackPanel>
                                     <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0"
                                           Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4" />
                                     <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
@@ -2288,7 +2390,7 @@
         <Grid Name="GridTransparencyFakeBackground" Opacity="0" />
         <Label Name="Label" Visibility="Collapsed" Foreground="Gray" Content="0" />
         <Grid Name="InkCanvasGridForInkReplay">
-            <InkCanvas x:Name="inkCanvas" ForceCursor="False"
+            <InkCanvas x:Name="inkCanvas" ForceCursor="True" UseCustomCursor="True"
                        TouchUp="Main_Grid_TouchUp" TouchDown="Main_Grid_TouchDown"
                        TouchMove="inkCanvas_TouchMove"
                        ManipulationDelta="Main_Grid_ManipulationDelta"
@@ -4293,7 +4395,7 @@
                                                                 <Label Content="计时器" FontSize="8"
                                                                        HorizontalAlignment="Center" />
                                                             </ui:SimpleStackPanel>
-                                                            <ui:SimpleStackPanel MouseDown="Border_MouseDown"
+                                                            <ui:SimpleStackPanel x:Name="RandomDrawPanel" Visibility="Collapsed" MouseDown="Border_MouseDown"
                                                                 MouseUp="SymbolIconRand_MouseUp"
                                                                 Margin="0,0,0,0" Height="38" Width="32"
                                                                 Orientation="Vertical">
@@ -4313,7 +4415,7 @@
                                                                 <Label Content="随机抽" FontSize="8"
                                                                        HorizontalAlignment="Center" />
                                                             </ui:SimpleStackPanel>
-                                                            <ui:SimpleStackPanel MouseDown="Border_MouseDown"
+                                                            <ui:SimpleStackPanel x:Name="SingleDrawPanel" Visibility="Collapsed" MouseDown="Border_MouseDown"
                                                                 MouseUp="SymbolIconRandOne_MouseUp"
                                                                 Margin="0,0,0,0" Height="38" Width="32"
                                                                 Orientation="Vertical">

Ink Canvas/MainWindow.xaml.cs

@@ -17,6 +17,7 @@ using System.Drawing;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Win32;
+using System.Windows.Input;
 
 namespace Ink_Canvas {
     public partial class MainWindow : Window {
@@ -98,6 +99,12 @@ namespace Ink_Canvas {
 
             CheckColorTheme(true);
             CheckPenTypeUIState();
+
+            // 注册输入事件
+            inkCanvas.PreviewMouseDown += inkCanvas_PreviewMouseDown;
+            inkCanvas.StylusDown += inkCanvas_StylusDown;
+            inkCanvas.TouchDown += inkCanvas_TouchDown;
+            inkCanvas.TouchUp += inkCanvas_TouchUp;
         }
 
         #endregion
@@ -147,12 +154,13 @@ namespace Ink_Canvas {
         private void inkCanvas_EditingModeChanged(object sender, RoutedEventArgs e) {
             var inkCanvas1 = sender as InkCanvas;
             if (inkCanvas1 == null) return;
+            // 修复"显示画笔光标"选项不可用的问题
             if (Settings.Canvas.IsShowCursor) {
-                if (inkCanvas1.EditingMode == InkCanvasEditingMode.Ink || drawingShapeMode != 0)
-                    inkCanvas1.ForceCursor = true;
-                else
-                    inkCanvas1.ForceCursor = false;
+                inkCanvas1.UseCustomCursor = true;
+                // 修复触屏和数位笔时光标不显示：强制显示光标，不再依赖鼠标或触控状态
+                inkCanvas1.ForceCursor = true;
             } else {
+                inkCanvas1.UseCustomCursor = false;
                 inkCanvas1.ForceCursor = false;
             }
 
@@ -207,6 +215,12 @@ namespace Ink_Canvas {
             {
                 FoldFloatingBar_MouseUp(null, null);
             }
+
+            // 恢复崩溃后操作设置
+            if (App.CrashAction == App.CrashActionType.SilentRestart)
+                RadioCrashSilentRestart.IsChecked = true;
+            else
+                RadioCrashNoAction.IsChecked = true;
         }
 
         private void SystemEventsOnDisplaySettingsChanged(object sender, EventArgs e) {
@@ -273,8 +287,8 @@ namespace Ink_Canvas {
 
         [DllImport("user32.dll", SetLastError = true)]
         public static extern bool MoveWindow(IntPtr hWnd, int X, int Y, int nWidth, int nHeight, bool bRepaint);
-
-                private void MainWindow_OnSizeChanged(object sender, SizeChangedEventArgs e) {
+        
+        private void MainWindow_OnSizeChanged(object sender, SizeChangedEventArgs e) {
             if (Settings.Advanced.IsEnableForceFullScreen) {
                 if (isLoaded) ShowNotification(
                     $"检测到窗口大小变化，已自动恢复到全屏：{System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width}x{System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height}（缩放比例为{System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width / SystemParameters.PrimaryScreenWidth}x{System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height / SystemParameters.PrimaryScreenHeight}）");
@@ -314,6 +328,68 @@ namespace Ink_Canvas {
             }
         }
 
+        // 新增：崩溃后操作设置按钮事件
+        private void RadioCrashAction_Checked(object sender, RoutedEventArgs e)
+        {
+            if (RadioCrashSilentRestart != null && RadioCrashSilentRestart.IsChecked == true)
+            {
+                App.CrashAction = App.CrashActionType.SilentRestart;
+            }
+            else if (RadioCrashNoAction != null && RadioCrashNoAction.IsChecked == true)
+            {
+                App.CrashAction = App.CrashActionType.NoAction;
+            }
+            SaveSettingsToFile();
+        }
+
+        // 鼠标输入
+        private void inkCanvas_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            inkCanvas.Cursor = Cursors.Arrow;
+        }
+
+        // 手写笔输入
+        private void inkCanvas_StylusDown(object sender, StylusDownEventArgs e)
+        {
+            var sri = Application.GetResourceStream(new Uri("Resources/Cursors/Pen.cur", UriKind.Relative));
+            if (sri != null)
+                inkCanvas.Cursor = new Cursor(sri.Stream);
+        }
+
+        // 触摸输入，不隐藏光标
+        private void inkCanvas_TouchDown(object sender, TouchEventArgs e)
+        {
+            // 修改：根据用户设置决定是否强制显示自定义光标
+            if (Settings.Canvas.IsShowCursor)
+            {
+                inkCanvas.ForceCursor = true;
+                // 确保鼠标光标对触摸可见
+                System.Windows.Forms.Cursor.Show();
+                // 新增：当处于套索选择模式时保持光标可见
+                if (inkCanvas.EditingMode == InkCanvasEditingMode.Select)
+                    inkCanvas.Cursor = Cursors.Cross;
+            }
+            else
+            {
+                inkCanvas.ForceCursor = false;
+                System.Windows.Forms.Cursor.Show();
+            }
+        }
+
+        // 触摸结束，恢复光标
+        private void inkCanvas_TouchUp(object sender, TouchEventArgs e)
+        {
+            // 修改：根据当前模式和设置恢复光标状态
+            if (Settings.Canvas.IsShowCursor) {
+                inkCanvas.ForceCursor = true;
+                // 确保鼠标光标对触摸可见
+                System.Windows.Forms.Cursor.Show();
+            } else {
+                inkCanvas.ForceCursor = false;
+                System.Windows.Forms.Cursor.Show();
+            }
+        }
+
         #endregion Definations and Loading
     }
 }

Ink Canvas/MainWindow_cs/MW_BoardControls.cs

@@ -107,6 +107,7 @@ namespace Ink_Canvas {
             if (Settings.Automation.IsAutoSaveStrokesAtClear &&
                 inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber) SaveScreenShot(true);
             if (CurrentWhiteboardIndex >= WhiteboardTotalCount) {
+                // 在最后一页时，点击“新页面”按钮直接新增一页
                 BtnWhiteBoardAdd_Click(sender, e);
                 return;
             }
@@ -166,64 +167,35 @@ namespace Ink_Canvas {
             TextBlockWhiteBoardIndexInfo.Text =
                 $"{CurrentWhiteboardIndex}/{WhiteboardTotalCount}";
 
-            if (CurrentWhiteboardIndex == WhiteboardTotalCount) {
-                var newImageSource = new BitmapImage();
-                newImageSource.BeginInit();
-                newImageSource.UriSource = new Uri("/Resources/Icons-Fluent/ic_fluent_add_circle_24_regular.png",
-                    UriKind.RelativeOrAbsolute);
-                newImageSource.EndInit();
-                //BoardLeftPannelNextPage.Source = newImageSource;
-                //BoardRightPannelNextPage.Source = newImageSource;
-                //BoardRightPannelNextPageTextBlock.Text = "加页";
-                //BoardLeftPannelNextPageTextBlock.Text = "加页";
-            } else {
-                var newImageSource = new BitmapImage();
-                newImageSource.BeginInit();
-                newImageSource.UriSource =
-                    new Uri("/Resources/Icons-Fluent/ic_fluent_arrow_circle_right_24_regular.png",
-                        UriKind.RelativeOrAbsolute);
-                newImageSource.EndInit();
-                //BoardLeftPannelNextPage.Source = newImageSource;
-                //BoardRightPannelNextPage.Source = newImageSource;
-                //BoardRightPannelNextPageTextBlock.Text = "下一页";
-                //BoardLeftPannelNextPageTextBlock.Text = "下一页";
-            }
+            bool isLastPage = CurrentWhiteboardIndex == WhiteboardTotalCount;
+            bool isMaxPage = WhiteboardTotalCount >= 99;
+
+            // 设置按钮文本
+            BtnLeftWhiteBoardSwitchNextLabel.Text = isLastPage ? "新页面" : "下一页";
+            BtnRightWhiteBoardSwitchNextLabel.Text = isLastPage ? "新页面" : "下一页";
+
+            // 始终允许点击“下一页/新页面”按钮（除非已达最大页数）
+            BtnWhiteBoardSwitchNext.IsEnabled = !isMaxPage;
+
+            // 保持按钮常亮（高亮）
+            BtnLeftWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
+            BtnLeftWhiteBoardSwitchNextLabel.Opacity = 1;
+            BtnRightWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
+            BtnRightWhiteBoardSwitchNextLabel.Opacity = 1;
 
             BtnWhiteBoardSwitchPrevious.IsEnabled = true;
-            BtnWhiteBoardSwitchNext.IsEnabled = true;
 
             if (CurrentWhiteboardIndex == 1) {
                 BtnWhiteBoardSwitchPrevious.IsEnabled = false;
                 BtnLeftWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27));
                 BtnLeftWhiteBoardSwitchPreviousLabel.Opacity = 0.5;
-                BtnLeftWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
-                BtnLeftWhiteBoardSwitchNextLabel.Opacity = 1;
-
                 BtnRightWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27));
                 BtnRightWhiteBoardSwitchPreviousLabel.Opacity = 0.5;
-                BtnRightWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
-                BtnRightWhiteBoardSwitchNextLabel.Opacity = 1;
             } else {
                 BtnLeftWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
                 BtnLeftWhiteBoardSwitchPreviousLabel.Opacity = 1;
-
                 BtnRightWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
                 BtnRightWhiteBoardSwitchPreviousLabel.Opacity = 1;
-
-                if (CurrentWhiteboardIndex == WhiteboardTotalCount) {
-                    BtnLeftWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27));
-                    BtnLeftWhiteBoardSwitchNextLabel.Opacity = 0.5;
-
-                    BtnRightWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27));
-                    BtnRightWhiteBoardSwitchNextLabel.Opacity = 0.5;
-                    BtnWhiteBoardSwitchNext.IsEnabled = false;
-                } else {
-                    BtnLeftWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
-                    BtnLeftWhiteBoardSwitchNextLabel.Opacity = 1;
-
-                    BtnRightWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
-                    BtnRightWhiteBoardSwitchNextLabel.Opacity = 1;
-                }
             }
 
             BtnWhiteBoardDelete.IsEnabled = WhiteboardTotalCount != 1;

Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs

@@ -740,9 +740,11 @@ namespace Ink_Canvas {
         }
 
         private void SymbolIconRand_MouseUp(object sender, MouseButtonEventArgs e) {
+            // 如果控件被隐藏，不处理事件
+            if (RandomDrawPanel.Visibility != Visibility.Visible) return;
+
             LeftUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
             RightUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
-            //if (lastBorderMouseDownObject != sender) return;
 
             AnimationsHelper.HideWithSlideAndFade(BorderTools);
             AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
@@ -808,14 +810,16 @@ namespace Ink_Canvas {
         }
 
         private void SymbolIconRandOne_MouseUp(object sender, MouseButtonEventArgs e) {
+            // 如果控件被隐藏，不处理事件
+            if (SingleDrawPanel.Visibility != Visibility.Visible) return;
+
             LeftUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
             RightUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
-            //if (lastBorderMouseDownObject != sender) return;
 
             AnimationsHelper.HideWithSlideAndFade(BorderTools);
             AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
 
-            new RandWindow(Settings,true).ShowDialog();
+            new RandWindow(Settings, true).ShowDialog();
         }
 
         private void GridInkReplayButton_MouseUp(object sender, MouseButtonEventArgs e) {
@@ -1074,15 +1078,38 @@ namespace Ink_Canvas {
                 var windowHandle = new WindowInteropHelper(this).Handle;
                 var screen = System.Windows.Forms.Screen.FromHandle(windowHandle);
                 double screenWidth = screen.Bounds.Width / dpiScaleX, screenHeight = screen.Bounds.Height / dpiScaleY;
-                var toolbarHeight = SystemParameters.PrimaryScreenHeight - SystemParameters.FullPrimaryScreenHeight -
-                                    SystemParameters.WindowCaptionHeight;
+                // 仅计算Windows任务栏高度，不考虑其他程序对工作区的影响
+                var toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY);
                 pos.X = (screenWidth - ViewboxFloatingBar.ActualWidth * ViewboxFloatingBarScaleTransform.ScaleX) / 2;
 
                 if (PosXCaculatedWithTaskbarHeight == false)
-                    pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
+                {
+                    // 如果任务栏高度为0(隐藏状态),则使用固定边距
+                    if (toolbarHeight == 0)
+                    {
+                        pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
+                        LogHelper.WriteLogToFile($"任务栏隐藏,使用固定边距: {MarginFromEdge}", LogHelper.LogType.Info);
+                    }
+                    else
+                    {
+                        pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
+                    }
+                }
                 else if (PosXCaculatedWithTaskbarHeight == true)
-                    pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
-                            toolbarHeight - ViewboxFloatingBarScaleTransform.ScaleY * 3;
+                {
+                    // 如果任务栏高度为0(隐藏状态),则使用固定高度
+                    if (toolbarHeight == 0)
+                    {
+                        pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY - 
+                               3 * ViewboxFloatingBarScaleTransform.ScaleY;
+                        LogHelper.WriteLogToFile($"任务栏隐藏,使用固定高度: {ViewboxFloatingBar.ActualHeight}", LogHelper.LogType.Info);
+                    }
+                    else
+                    {
+                        pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
+                               toolbarHeight - ViewboxFloatingBarScaleTransform.ScaleY * 3;
+                    }
+                }
 
                 if (MarginFromEdge != -60) {
                     if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible) {
@@ -1137,12 +1164,22 @@ namespace Ink_Canvas {
                 var windowHandle = new WindowInteropHelper(this).Handle;
                 var screen = System.Windows.Forms.Screen.FromHandle(windowHandle);
                 double screenWidth = screen.Bounds.Width / dpiScaleX, screenHeight = screen.Bounds.Height / dpiScaleY;
-                var toolbarHeight = SystemParameters.PrimaryScreenHeight - SystemParameters.FullPrimaryScreenHeight -
-                                    SystemParameters.WindowCaptionHeight;
+                // 仅计算Windows任务栏高度，不考虑其他程序对工作区的影响
+                var toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY);
                 pos.X = (screenWidth - ViewboxFloatingBar.ActualWidth * ViewboxFloatingBarScaleTransform.ScaleX) / 2;
 
-                pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
-                        toolbarHeight - ViewboxFloatingBarScaleTransform.ScaleY * 3;
+                // 如果任务栏高度为0(隐藏状态),则使用固定边距
+                if (toolbarHeight == 0)
+                {
+                    pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY - 
+                           3 * ViewboxFloatingBarScaleTransform.ScaleY;
+                    LogHelper.WriteLogToFile($"任务栏隐藏,使用固定高度: {ViewboxFloatingBar.ActualHeight}", LogHelper.LogType.Info);
+                }
+                else
+                {
+                    pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
+                           toolbarHeight - ViewboxFloatingBarScaleTransform.ScaleY * 3;
+                }
 
                 if (pointDesktop.X != -1 || pointDesktop.Y != -1) pointDesktop = pos;
 
@@ -1180,8 +1217,8 @@ namespace Ink_Canvas {
                 var windowHandle = new WindowInteropHelper(this).Handle;
                 var screen = System.Windows.Forms.Screen.FromHandle(windowHandle);
                 double screenWidth = screen.Bounds.Width / dpiScaleX, screenHeight = screen.Bounds.Height / dpiScaleY;
-                var toolbarHeight = SystemParameters.PrimaryScreenHeight - SystemParameters.FullPrimaryScreenHeight -
-                                    SystemParameters.WindowCaptionHeight;
+                // 仅计算Windows任务栏高度，不考虑其他程序对工作区的影响
+                var toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY);
                 pos.X = (screenWidth - ViewboxFloatingBar.ActualWidth * ViewboxFloatingBarScaleTransform.ScaleX) / 2;
 
                 pos.Y = screenHeight - 55 * ViewboxFloatingBarScaleTransform.ScaleY;
@@ -1577,13 +1614,15 @@ namespace Ink_Canvas {
         public static bool CloseIsFromButton = false;
 
         public void BtnExit_Click(object sender, RoutedEventArgs e) {
-            CloseIsFromButton = true;
-            Close();
+            App.IsAppExitByUser = true;
+            Application.Current.Shutdown();
+            // CloseIsFromButton = true;
+            // Close();
         }
 
         public void BtnRestart_Click(object sender, RoutedEventArgs e) {
             Process.Start(System.Windows.Forms.Application.ExecutablePath, "-m");
-
+            App.IsAppExitByUser = true;
             CloseIsFromButton = true;
             Application.Current.Shutdown();
         }

Ink Canvas/MainWindow_cs/MW_PPT.cs

@@ -15,6 +15,7 @@ using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Threading;
+using Microsoft.Win32;
 using Application = System.Windows.Application;
 using File = System.IO.File;
 using MessageBox = System.Windows.MessageBox;
@@ -29,19 +30,26 @@ namespace Ink_Canvas {
 
         private void BtnCheckPPT_Click(object sender, RoutedEventArgs e) {
             try {
-                pptApplication = null;
-                // 优先检测WPS（wpp.Application），获取不到再尝试PowerPoint
-                try {
-                    pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("wpp.Application");
-                } catch { }
-                if (pptApplication == null) {
-                    try {
-                        pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
-                    } catch { }
-                }
                 if (pptApplication != null) {
                     //获得演示文稿对象
-                    presentation = pptApplication.ActivePresentation;
+                    try {
+                        presentation = pptApplication.ActivePresentation;
+                    }
+                    catch (COMException) {
+                        // ActivePresentation 可能因只读等原因抛异常，遍历 Presentations
+                        presentation = null;
+                        foreach (Presentation pres in pptApplication.Presentations) {
+                            try {
+                                if (pres.ReadOnly == MsoTriState.msoFalse) {
+                                    presentation = pres;
+                                    break;
+                                }
+                            } catch { }
+                        }
+                        // 如果没有可编辑的，选择第一个只读的
+                        if (presentation == null && pptApplication.Presentations.Count > 0)
+                            presentation = pptApplication.Presentations[1];
+                    }
                     pptApplication.SlideShowBegin += PptApplication_SlideShowBegin;
                     pptApplication.SlideShowNextSlide += PptApplication_SlideShowNextSlide;
                     pptApplication.SlideShowEnd += PptApplication_SlideShowEnd;
@@ -79,6 +87,61 @@ namespace Ink_Canvas {
 
             Settings.PowerPointSettings.IsSupportWPS = ToggleSwitchSupportWPS.IsOn;
             SaveSettingsToFile();
+            
+            // 重置PowerPoint/WPS实例状态
+            ResetPresentationObjects();
+            isPowerPointInitialized = false;
+        }
+        
+        /// <summary>
+        /// 重置所有演示相关的COM对象
+        /// </summary>
+        private void ResetPresentationObjects()
+        {
+            try 
+            {
+                // 清理对象引用
+                if (pptApplication != null)
+                {
+                    try 
+                    {
+                        // 尝试解除事件绑定
+                        pptApplication.PresentationOpen -= PptApplication_PresentationOpen;
+                        pptApplication.PresentationClose -= PptApplication_PresentationClose;
+                        pptApplication.SlideShowBegin -= PptApplication_SlideShowBegin;
+                        pptApplication.SlideShowNextSlide -= PptApplication_SlideShowNextSlide;
+                        pptApplication.SlideShowEnd -= PptApplication_SlideShowEnd;
+                    }
+                    catch { }
+                    
+                    try { Marshal.ReleaseComObject(pptApplication); } catch { }
+                    pptApplication = null;
+                }
+                
+                if (presentation != null)
+                {
+                    try { Marshal.ReleaseComObject(presentation); } catch { }
+                    presentation = null;
+                }
+                
+                if (slides != null)
+                {
+                    try { Marshal.ReleaseComObject(slides); } catch { }
+                    slides = null;
+                }
+                
+                slide = null;
+                
+                // 强制GC回收
+                GC.Collect();
+                GC.WaitForPendingFinalizers();
+                
+                LogHelper.WriteLogToFile("成功重置所有演示对象", LogHelper.LogType.Info);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"重置演示对象时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
         }
 
         private static bool isWPSSupportOn => Settings.PowerPointSettings.IsSupportWPS;
@@ -86,8 +149,32 @@ namespace Ink_Canvas {
         public static bool IsShowingRestoreHiddenSlidesWindow = false;
         private static bool IsShowingAutoplaySlidesWindow = false;
         private bool isPowerPointInitialized = false;
+        private bool isWPSMode = false;
         
-
+        /// <summary>
+        /// 获取所有可能的WPS进程名
+        /// </summary>
+        private string[] GetPossibleWPSProcessNames()
+        {
+            return new[] { "wpp", "wppmain", "wps", "et" };
+        }
+        
+        /// <summary>
+        /// 检查WPS进程是否正在运行
+        /// </summary>
+        private bool IsWPSRunning()
+        {
+            foreach (var processName in GetPossibleWPSProcessNames())
+            {
+                var processes = Process.GetProcessesByName(processName);
+                if (processes.Length > 0)
+                {
+                    LogHelper.WriteLogToFile($"检测到WPS进程: {processName}", LogHelper.LogType.Info);
+                    return true;
+                }
+            }
+            return false;
+        }
 
         private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e)
         {
@@ -100,118 +187,117 @@ namespace Ink_Canvas {
                 // 检查是否已有初始化的 PowerPoint 实例
                 if (!isPowerPointInitialized)
                 {
-                    // 检查 WPS 进程（如果不支持则返回）
-                    var wpsProcesses = Process.GetProcessesByName("wpp");
-                    if (wpsProcesses.Length > 0 && !isWPSSupportOn)
-                        return;
+                    // 检测WPS和PowerPoint进程
+                    bool wpsRunning = IsWPSRunning();
+                    var pptProcesses = Process.GetProcessesByName("POWERPNT");
+                    
+                    // 根据设置和进程状态决定模式
+                    isWPSMode = isWPSSupportOn && wpsRunning;
+                    
+                    LogHelper.WriteLogToFile($"初始化模式: {(isWPSMode ? "WPS" : "PowerPoint")}", LogHelper.LogType.Info);
 
-                    try
-                    {
-                        if (isWPSSupportOn && wpsProcesses.Length > 0)
-                        {
-                            // 优先获取WPS实例
-                            try
-                            {
-                                pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("wpp.Application");
-                            }
-                            catch (COMException)
-                            {
-                                // WPS未启动或未注册
-                                pptApplication = null;
-                            }
-                        }
-                        if (pptApplication == null)
-                        {
-                            // 获取PowerPoint实例
-                            try
-                            {
-                                pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
-                            }
-                            catch (COMException)
-                            {
-                                pptApplication = null;
-                            }
-                        }
-                    }
-                    catch (Exception)
-                    {
-                        pptApplication = null;
-                    }
-
-                    // 如果没有找到运行中的实例，则创建新实例
-                    if (pptApplication == null)
+                    // 优先获取WPS实例
+                    if (isWPSMode)
                     {
                         try
                         {
-                            pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(
-                                Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B")));
-                        }
-                        catch
-                        {
-                            // 如果WPS支持开启，尝试创建WPS实例
-                            if (isWPSSupportOn)
+                            // 尝试多种可能的ProgID
+                            string[] possibleProgIds = { "wpp.Application", "WPS.Application" };
+                            
+                            foreach (var progId in possibleProgIds)
                             {
                                 try
                                 {
-                                    pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(
-                                        Type.GetTypeFromProgID("wpp.Application"));
+                                    LogHelper.WriteLogToFile($"尝试获取COM对象: {progId}", LogHelper.LogType.Info);
+                                    pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject(progId);
+                                    if (pptApplication != null)
+                                    {
+                                        LogHelper.WriteLogToFile($"成功连接到WPS: {progId}", LogHelper.LogType.Info);
+                                        break;
+                                    }
                                 }
-                                catch
+                                catch 
                                 {
-                                    pptApplication = null;
+                                    continue;
                                 }
                             }
                         }
+                        catch (COMException ex)
+                        {
+                            LogHelper.WriteLogToFile($"获取WPS实例失败: {ex.Message}", LogHelper.LogType.Error);
+                            pptApplication = null;
+                        }
                     }
+
+                    // 如果未获取到WPS实例，尝试获取PowerPoint实例
+                    if (pptApplication == null && pptProcesses.Length > 0)
+                    {
+                        try
+                        {
+                            LogHelper.WriteLogToFile("尝试获取PowerPoint实例", LogHelper.LogType.Info);
+                            pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
+                            if (pptApplication != null)
+                                LogHelper.WriteLogToFile("成功连接到PowerPoint", LogHelper.LogType.Info);
+                        }
+                        catch (COMException ex)
+                        {
+                            LogHelper.WriteLogToFile($"获取PowerPoint实例失败: {ex.Message}", LogHelper.LogType.Error);
+                            pptApplication = null;
+                        }
+                    }
+
+                    // 如果都没有找到，且未启用WPS支持，则自动创建PowerPoint进程
+                    if (pptApplication == null && !isWPSMode && pptProcesses.Length == 0)
+                    {
+                        try
+                        {
+                            LogHelper.WriteLogToFile("尝试创建新的PowerPoint实例", LogHelper.LogType.Info);
+                            pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(
+                                Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B")));
+                            if (pptApplication != null)
+                                LogHelper.WriteLogToFile("成功创建PowerPoint实例", LogHelper.LogType.Info);
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"创建PowerPoint实例失败: {ex.Message}", LogHelper.LogType.Error);
+                            pptApplication = null;
+                        }
+                    }
+                    
                     isPowerPointInitialized = true;
                     return;
                 }
+
+                // 检查进程是否还在
+                bool currentWpsRunning = IsWPSRunning();
+                var currentPptProcesses = Process.GetProcessesByName("POWERPNT");
                 
-                // 检查 PowerPoint 进程是否还在
-                var pptProcesses = Process.GetProcessesByName("POWERPNT");
-                var wpsProcessesCheck = Process.GetProcessesByName("wpp");
-                bool isWpsMode = isWPSSupportOn && wpsProcessesCheck.Length > 0;
-                if ((isWpsMode && wpsProcessesCheck.Length == 0) || (!isWpsMode && pptProcesses.Length == 0))
+                // 检测应用程序是否关闭
+                bool applicationClosed = isWPSMode ? !currentWpsRunning : currentPptProcesses.Length == 0;
+
+                if (applicationClosed)
                 {
-                    // 进程已关闭，清理对象
-                    if (pptApplication != null)
-                    {
-                        try { Marshal.ReleaseComObject(pptApplication); } catch { }
-                        pptApplication = null;
-                    }
-                    if (presentation != null)
-                    {
-                        try { Marshal.ReleaseComObject(presentation); } catch { }
-                        presentation = null;
-                    }
-                    if (slides != null)
-                    {
-                        try { Marshal.ReleaseComObject(slides); } catch { }
-                        slides = null;
-                    }
-                    slide = null;
+                    LogHelper.WriteLogToFile($"{(isWPSMode ? "WPS" : "PowerPoint")}进程已关闭，清理对象", LogHelper.LogType.Info);
+                    
+                    // 进程已关闭，调用重置方法清理对象
+                    ResetPresentationObjects();
                     isPowerPointInitialized = false;
-                    // 这里可以选择自动重启 PowerPoint 或 WPS 或等待用户操作
-                    try
+
+                    // PowerPoint进程守护：自动重启PowerPoint进程（仅在未启用WPS支持时）
+                    if (!isWPSSupportOn && !isWPSMode)
                     {
-                        if (isWpsMode)
-                        {
-                            // 自动重启WPS
-                            Process.Start("wpp.exe");
-                            Thread.Sleep(2000); // 等待WPS启动
-                            pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(
-                                Type.GetTypeFromProgID("wpp.Application"));
-                        }
-                        else
+                        try
                         {
+                            LogHelper.WriteLogToFile("尝试重启PowerPoint进程", LogHelper.LogType.Info);
                             pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(
                                 Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B")));
+                            isPowerPointInitialized = true;
+                            LogHelper.WriteLogToFile("PowerPoint进程重启成功", LogHelper.LogType.Info);
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"PowerPoint守护重启失败: {ex.Message}", LogHelper.LogType.Error);
                         }
-                        isPowerPointInitialized = true;
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.WriteLogToFile("PowerPoint/WPS 守护重启失败: " + ex.ToString(), LogHelper.LogType.Error);
                     }
                     return;
                 }
@@ -391,8 +477,6 @@ namespace Ink_Canvas {
                 pptApplication.SlideShowNextSlide -= PptApplication_SlideShowNextSlide;
                 pptApplication.SlideShowEnd -= PptApplication_SlideShowEnd;
                 
-                // 释放COM对象
-                ReleasePptResources();
                 
                 timerCheckPPT.Start();
                 
@@ -786,7 +870,7 @@ namespace Ink_Canvas {
 
                 await Task.Delay(150);
 
-                Application.Current.Dispatcher.InvokeAsync(() => {
+                await Application.Current.Dispatcher.InvokeAsync(() => {
                     ViewboxFloatingBarMarginAnimation(100, true);
                 });
             }
@@ -842,389 +926,306 @@ namespace Ink_Canvas {
 
         private bool _isPptClickingBtnTurned = false;
 
-        private void BtnPPTSlidesUp_Click(object sender, RoutedEventArgs e) {
+       private void BtnPPTSlidesUp_Click(object sender, RoutedEventArgs e) {
+            if (currentMode == 1) {
+                GridBackgroundCover.Visibility = Visibility.Collapsed;
+                AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
+                AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide);
+                AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide);
+                currentMode = 0;
+            }
+
+            _isPptClickingBtnTurned = true;
+
+            if (inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber &&
+                Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint)
+                SaveScreenShot(true,
+                    pptApplication.SlideShowWindows[1].Presentation.Name + "/" +
+                    pptApplication.SlideShowWindows[1].View.CurrentShowPosition);
+
             try {
-                if (currentMode == 1) {
-                    GridBackgroundCover.Visibility = Visibility.Collapsed;
-                    AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
-                    AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide);
-                    AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide);
-                    currentMode = 0;
-                }
-
-                _isPptClickingBtnTurned = true;
-
-                if (inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber &&
-                    Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint)
-                    SaveScreenShot(true,
-                        pptApplication.SlideShowWindows[1].Presentation.Name + "/" +
-                        pptApplication.SlideShowWindows[1].View.CurrentShowPosition);
-
                 new Thread(new ThreadStart(() => {
                     try {
                         pptApplication.SlideShowWindows[1].Activate();
+                    }
+                    catch {
+                        // ignored
+                    }
+
+                    try {
                         pptApplication.SlideShowWindows[1].View.Previous();
                     }
-                    catch (Exception ex) {
-                        LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-                        Application.Current.Dispatcher.Invoke(() => {
-                            StackPanelPPTControls.Visibility = Visibility.Collapsed;
-                            LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                            RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                            LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                            RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                        });
-                    }
+                    catch {
+                        // ignored
+                    } // Without this catch{}, app will crash when click the pre-page button in the fir page in some special env.
                 })).Start();
             }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            catch {
+                StackPanelPPTControls.Visibility = Visibility.Collapsed;
+                LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
             }
         }
 
         private void BtnPPTSlidesDown_Click(object sender, RoutedEventArgs e) {
-            try {
-                if (currentMode == 1) {
-                    GridBackgroundCover.Visibility = Visibility.Collapsed;
-                    AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
-                    AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide);
-                    AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide);
-                    currentMode = 0;
-                }
+            if (currentMode == 1) {
+                GridBackgroundCover.Visibility = Visibility.Collapsed;
+                AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
+                AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide);
+                AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide);
+                currentMode = 0;
+            }
 
-                _isPptClickingBtnTurned = true;
-                if (inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber &&
-                    Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint)
-                    SaveScreenShot(true,
-                        pptApplication.SlideShowWindows[1].Presentation.Name + "/" +
-                        pptApplication.SlideShowWindows[1].View.CurrentShowPosition);
-                
+            _isPptClickingBtnTurned = true;
+            if (inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber &&
+                Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint)
+                SaveScreenShot(true,
+                    pptApplication.SlideShowWindows[1].Presentation.Name + "/" +
+                    pptApplication.SlideShowWindows[1].View.CurrentShowPosition);
+            try {
                 new Thread(new ThreadStart(() => {
                     try {
                         pptApplication.SlideShowWindows[1].Activate();
+                    }
+                    catch {
+                        // ignored
+                    }
+
+                    try {
                         pptApplication.SlideShowWindows[1].View.Next();
                     }
-                    catch (Exception ex) {
-                        LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-                        Application.Current.Dispatcher.Invoke(() => {
-                            StackPanelPPTControls.Visibility = Visibility.Collapsed;
-                            LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                            RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                            LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                            RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                        });
+                    catch {
+                        // ignored
                     }
                 })).Start();
             }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            catch {
+                StackPanelPPTControls.Visibility = Visibility.Collapsed;
+                LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
             }
         }
 
-        private void PPTNavigationBtn_MouseDown(object sender, MouseButtonEventArgs e)
+        private async void PPTNavigationBtn_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            try
+            lastBorderMouseDownObject = sender;
+            if (!Settings.PowerPointSettings.EnablePPTButtonPageClickable) return;
+            if (sender == PPTLSPageButton)
             {
-                lastBorderMouseDownObject = sender;
-                if (!Settings.PowerPointSettings.EnablePPTButtonPageClickable) return;
-
-                if (sender == PPTLSPageButton)
-                {
-                    PPTLSPageButtonFeedbackBorder.Opacity = 0.15;
-                }
-                else if (sender == PPTRSPageButton)
-                {
-                    PPTRSPageButtonFeedbackBorder.Opacity = 0.15;
-                }
-                else if (sender == PPTLBPageButton)
-                {
-                    PPTLBPageButtonFeedbackBorder.Opacity = 0.15;
-                }
-                else if (sender == PPTRBPageButton)
-                {
-                    PPTRBPageButtonFeedbackBorder.Opacity = 0.15;
-                }
+                PPTLSPageButtonFeedbackBorder.Opacity = 0.15;
             }
-            catch (Exception ex)
+            else if (sender == PPTRSPageButton)
             {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+                PPTRSPageButtonFeedbackBorder.Opacity = 0.15;
+            }
+            else if (sender == PPTLBPageButton)
+            {
+                PPTLBPageButtonFeedbackBorder.Opacity = 0.15;
+            }
+            else if (sender == PPTRBPageButton)
+            {
+                PPTRBPageButtonFeedbackBorder.Opacity = 0.15;
             }
         }
 
-        private void PPTNavigationBtn_MouseLeave(object sender, MouseEventArgs e)
+        private async void PPTNavigationBtn_MouseLeave(object sender, MouseEventArgs e)
         {
-            try
+            lastBorderMouseDownObject = null;
+            if (sender == PPTLSPageButton)
             {
-                lastBorderMouseDownObject = null;
-                if (sender == PPTLSPageButton)
-                {
-                    PPTLSPageButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTRSPageButton)
-                {
-                    PPTRSPageButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTLBPageButton)
-                {
-                    PPTLBPageButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTRBPageButton)
-                {
-                    PPTRBPageButtonFeedbackBorder.Opacity = 0;
-                }
+                PPTLSPageButtonFeedbackBorder.Opacity = 0;
             }
-            catch (Exception ex)
+            else if (sender == PPTRSPageButton)
             {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+                PPTRSPageButtonFeedbackBorder.Opacity = 0;
+            }
+            else if (sender == PPTLBPageButton)
+            {
+                PPTLBPageButtonFeedbackBorder.Opacity = 0;
+            }
+            else if (sender == PPTRBPageButton)
+            {
+                PPTRBPageButtonFeedbackBorder.Opacity = 0;
             }
         }
 
         private async void PPTNavigationBtn_MouseUp(object sender, MouseButtonEventArgs e) {
-            try {
-                if (lastBorderMouseDownObject != sender) return;
+            if (lastBorderMouseDownObject != sender) return;
 
-                if (sender == PPTLSPageButton)
-                {
-                    PPTLSPageButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTRSPageButton)
-                {
-                    PPTRSPageButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTLBPageButton)
-                {
-                    PPTLBPageButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTRBPageButton)
-                {
-                    PPTRBPageButtonFeedbackBorder.Opacity = 0;
-                }
-
-                if (!Settings.PowerPointSettings.EnablePPTButtonPageClickable) return;
-
-                GridTransparencyFakeBackground.Opacity = 1;
-                GridTransparencyFakeBackground.Background = new SolidColorBrush(StringToColor("#01FFFFFF"));
-                CursorIcon_Click(null, null);
-                
-                try {
-                    pptApplication.SlideShowWindows[1].SlideNavigation.Visible = true;
-                }
-                catch (Exception ex) {
-                    LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-                }
-
-                // 控制居中
-                if (!isFloatingBarFolded) {
-                    await Task.Delay(100);
-                    ViewboxFloatingBarMarginAnimation(60);
-                }
+            if (sender == PPTLSPageButton)
+            {
+                PPTLSPageButtonFeedbackBorder.Opacity = 0;
             }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            else if (sender == PPTRSPageButton)
+            {
+                PPTRSPageButtonFeedbackBorder.Opacity = 0;
+            }
+            else if (sender == PPTLBPageButton)
+            {
+                PPTLBPageButtonFeedbackBorder.Opacity = 0;
+            }
+            else if (sender == PPTRBPageButton)
+            {
+                PPTRBPageButtonFeedbackBorder.Opacity = 0;
+            }
+
+            if (!Settings.PowerPointSettings.EnablePPTButtonPageClickable) return;
+
+            GridTransparencyFakeBackground.Opacity = 1;
+            GridTransparencyFakeBackground.Background = new SolidColorBrush(StringToColor("#01FFFFFF"));
+            CursorIcon_Click(null, null);
+            try {
+                pptApplication.SlideShowWindows[1].SlideNavigation.Visible = true;
+            }
+            catch { }
+
+            // 控制居中
+            if (!isFloatingBarFolded) {
+                await Task.Delay(100);
+                ViewboxFloatingBarMarginAnimation(60);
             }
         }
 
         private void BtnPPTSlideShow_Click(object sender, RoutedEventArgs e) {
-            try {
-                new Thread(new ThreadStart(() => {
-                    try {
-                        presentation.SlideShowSettings.Run();
-                    }
-                    catch (Exception ex) {
-                        LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-                    }
-                })).Start();
-            }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-            }
+            new Thread(new ThreadStart(() => {
+                try {
+                    presentation.SlideShowSettings.Run();
+                }
+                catch { }
+            })).Start();
         }
 
         private async void BtnPPTSlideShowEnd_Click(object sender, RoutedEventArgs e) {
-            try {
-                Application.Current.Dispatcher.Invoke(() => {
-                    try {
-                        var ms = new MemoryStream();
-                        inkCanvas.Strokes.Save(ms);
-                        ms.Position = 0;
-                        memoryStreams[pptApplication.SlideShowWindows[1].View.CurrentShowPosition] = ms;
-                        timeMachine.ClearStrokeHistory();
-                    }
-                    catch (Exception ex) {
-                        LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-                    }
-                });
-                
-                new Thread(new ThreadStart(() => {
-                    try {
-                        pptApplication.SlideShowWindows[1].View.Exit();
-                    }
-                    catch (Exception ex) {
-                        LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-                    }
-                })).Start();
+            Application.Current.Dispatcher.Invoke(() => {
+                try {
+                    var ms = new MemoryStream();
+                    inkCanvas.Strokes.Save(ms);
+                    ms.Position = 0;
+                    memoryStreams[pptApplication.SlideShowWindows[1].View.CurrentShowPosition] = ms;
+                    timeMachine.ClearStrokeHistory();
+                }
+                catch {
+                    // ignored
+                }
+            });
+            new Thread(new ThreadStart(() => {
+                try {
+                    pptApplication.SlideShowWindows[1].View.Exit();
+                }
+                catch {
+                    // ignored
+                }
+            })).Start();
 
-                HideSubPanels("cursor");
-                await Task.Delay(150);
-                ViewboxFloatingBarMarginAnimation(100, true);
-            }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-            }
+            HideSubPanels("cursor");
+            await Task.Delay(150);
+            ViewboxFloatingBarMarginAnimation(100, true);
         }
 
         private void GridPPTControlPrevious_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            try {
-                lastBorderMouseDownObject = sender;
-                if (sender == PPTLSPreviousButtonBorder) {
-                    PPTLSPreviousButtonFeedbackBorder.Opacity = 0.15;
-                } else if (sender == PPTRSPreviousButtonBorder) {
-                    PPTRSPreviousButtonFeedbackBorder.Opacity = 0.15;
-                } else if (sender == PPTLBPreviousButtonBorder)
-                {
-                    PPTLBPreviousButtonFeedbackBorder.Opacity = 0.15;
-                }
-                else if (sender == PPTRBPreviousButtonBorder)
-                {
-                    PPTRBPreviousButtonFeedbackBorder.Opacity = 0.15;
-                }
+            lastBorderMouseDownObject = sender;
+            if (sender == PPTLSPreviousButtonBorder) {
+                PPTLSPreviousButtonFeedbackBorder.Opacity = 0.15;
+            } else if (sender == PPTRSPreviousButtonBorder) {
+                PPTRSPreviousButtonFeedbackBorder.Opacity = 0.15;
+            } else if (sender == PPTLBPreviousButtonBorder)
+            {
+                PPTLBPreviousButtonFeedbackBorder.Opacity = 0.15;
             }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            else if (sender == PPTRBPreviousButtonBorder)
+            {
+                PPTRBPreviousButtonFeedbackBorder.Opacity = 0.15;
             }
         }
-        
         private void GridPPTControlPrevious_MouseLeave(object sender, MouseEventArgs e)
         {
-            try {
-                lastBorderMouseDownObject = null;
-                if (sender == PPTLSPreviousButtonBorder) {
-                    PPTLSPreviousButtonFeedbackBorder.Opacity = 0;
-                } else if (sender == PPTRSPreviousButtonBorder) {
-                    PPTRSPreviousButtonFeedbackBorder.Opacity = 0;
-                } else if (sender == PPTLBPreviousButtonBorder)
-                {
-                    PPTLBPreviousButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTRBPreviousButtonBorder)
-                {
-                    PPTRBPreviousButtonFeedbackBorder.Opacity = 0;
-                }
+            lastBorderMouseDownObject = null;
+            if (sender == PPTLSPreviousButtonBorder) {
+                PPTLSPreviousButtonFeedbackBorder.Opacity = 0;
+            } else if (sender == PPTRSPreviousButtonBorder) {
+                PPTRSPreviousButtonFeedbackBorder.Opacity = 0;
+            } else if (sender == PPTLBPreviousButtonBorder)
+            {
+                PPTLBPreviousButtonFeedbackBorder.Opacity = 0;
             }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            else if (sender == PPTRBPreviousButtonBorder)
+            {
+                PPTRBPreviousButtonFeedbackBorder.Opacity = 0;
             }
         }
-        
         private void GridPPTControlPrevious_MouseUp(object sender, MouseButtonEventArgs e) {
-            try {
-                if (lastBorderMouseDownObject != sender) return;
-                if (sender == PPTLSPreviousButtonBorder) {
-                    PPTLSPreviousButtonFeedbackBorder.Opacity = 0;
-                } else if (sender == PPTRSPreviousButtonBorder) {
-                    PPTRSPreviousButtonFeedbackBorder.Opacity = 0;
-                } else if (sender == PPTLBPreviousButtonBorder)
-                {
-                    PPTLBPreviousButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTRBPreviousButtonBorder)
-                {
-                    PPTRBPreviousButtonFeedbackBorder.Opacity = 0;
-                }
-                BtnPPTSlidesUp_Click(BtnPPTSlidesUp, null);
+            if (lastBorderMouseDownObject != sender) return;
+            if (sender == PPTLSPreviousButtonBorder) {
+                PPTLSPreviousButtonFeedbackBorder.Opacity = 0;
+            } else if (sender == PPTRSPreviousButtonBorder) {
+                PPTRSPreviousButtonFeedbackBorder.Opacity = 0;
+            } else if (sender == PPTLBPreviousButtonBorder)
+            {
+                PPTLBPreviousButtonFeedbackBorder.Opacity = 0;
             }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            else if (sender == PPTRBPreviousButtonBorder)
+            {
+                PPTRBPreviousButtonFeedbackBorder.Opacity = 0;
             }
+            BtnPPTSlidesUp_Click(BtnPPTSlidesUp, null);
         }
 
 
         private void GridPPTControlNext_MouseDown(object sender, MouseButtonEventArgs e) {
-            try {
-                lastBorderMouseDownObject = sender;
-                if (sender == PPTLSNextButtonBorder) {
-                    PPTLSNextButtonFeedbackBorder.Opacity = 0.15;
-                } else if (sender == PPTRSNextButtonBorder) {
-                    PPTRSNextButtonFeedbackBorder.Opacity = 0.15;
-                } else if (sender == PPTLBNextButtonBorder)
-                {
-                    PPTLBNextButtonFeedbackBorder.Opacity = 0.15;
-                }
-                else if (sender == PPTRBNextButtonBorder)
-                {
-                    PPTRBNextButtonFeedbackBorder.Opacity = 0.15;
-                }
+            lastBorderMouseDownObject = sender;
+            if (sender == PPTLSNextButtonBorder) {
+                PPTLSNextButtonFeedbackBorder.Opacity = 0.15;
+            } else if (sender == PPTRSNextButtonBorder) {
+                PPTRSNextButtonFeedbackBorder.Opacity = 0.15;
+            } else if (sender == PPTLBNextButtonBorder)
+            {
+                PPTLBNextButtonFeedbackBorder.Opacity = 0.15;
             }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            else if (sender == PPTRBNextButtonBorder)
+            {
+                PPTRBNextButtonFeedbackBorder.Opacity = 0.15;
             }
         }
-        
         private void GridPPTControlNext_MouseLeave(object sender, MouseEventArgs e)
         {
-            try {
-                lastBorderMouseDownObject = null;
-                if (sender == PPTLSNextButtonBorder) {
-                    PPTLSNextButtonFeedbackBorder.Opacity = 0;
-                } else if (sender == PPTRSNextButtonBorder) {
-                    PPTRSNextButtonFeedbackBorder.Opacity = 0;
-                } else if (sender == PPTLBNextButtonBorder)
-                {
-                    PPTLBNextButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTRBNextButtonBorder)
-                {
-                    PPTRBNextButtonFeedbackBorder.Opacity = 0;
-                }
+            lastBorderMouseDownObject = null;
+            if (sender == PPTLSNextButtonBorder) {
+                PPTLSNextButtonFeedbackBorder.Opacity = 0;
+            } else if (sender == PPTRSNextButtonBorder) {
+                PPTRSNextButtonFeedbackBorder.Opacity = 0;
+            } else if (sender == PPTLBNextButtonBorder)
+            {
+                PPTLBNextButtonFeedbackBorder.Opacity = 0;
             }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            else if (sender == PPTRBNextButtonBorder)
+            {
+                PPTRBNextButtonFeedbackBorder.Opacity = 0;
             }
         }
-        
         private void GridPPTControlNext_MouseUp(object sender, MouseButtonEventArgs e) {
-            try {
-                if (lastBorderMouseDownObject != sender) return;
-                if (sender == PPTLSNextButtonBorder) {
-                    PPTLSNextButtonFeedbackBorder.Opacity = 0;
-                } else if (sender == PPTRSNextButtonBorder) {
-                    PPTRSNextButtonFeedbackBorder.Opacity = 0;
-                } else if (sender == PPTLBNextButtonBorder)
-                {
-                    PPTLBNextButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTRBNextButtonBorder)
-                {
-                    PPTRBNextButtonFeedbackBorder.Opacity = 0;
-                }
-                BtnPPTSlidesDown_Click(BtnPPTSlidesDown, null);
+            if (lastBorderMouseDownObject != sender) return;
+            if (sender == PPTLSNextButtonBorder) {
+                PPTLSNextButtonFeedbackBorder.Opacity = 0;
+            } else if (sender == PPTRSNextButtonBorder) {
+                PPTRSNextButtonFeedbackBorder.Opacity = 0;
+            } else if (sender == PPTLBNextButtonBorder)
+            {
+                PPTLBNextButtonFeedbackBorder.Opacity = 0;
             }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            else if (sender == PPTRBNextButtonBorder)
+            {
+                PPTRBNextButtonFeedbackBorder.Opacity = 0;
             }
+            BtnPPTSlidesDown_Click(BtnPPTSlidesDown, null);
         }
 
         private void ImagePPTControlEnd_MouseUp(object sender, MouseButtonEventArgs e) {
-            try {
-                BtnPPTSlideShowEnd_Click(BtnPPTSlideShowEnd, null);
-            }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-            }
-        }
-
-        // 统一释放PPT相关COM对象，防止内存泄漏
-        private void ReleasePptResources()
-        {
-            try { if (slide != null) Marshal.ReleaseComObject(slide); } catch { }
-            slide = null;
-            try { if (slides != null) Marshal.ReleaseComObject(slides); } catch { }
-            slides = null;
-            try { if (presentation != null) Marshal.ReleaseComObject(presentation); } catch { }
-            presentation = null;
-            try { if (pptApplication != null) Marshal.ReleaseComObject(pptApplication); } catch { }
-            pptApplication = null;
+            BtnPPTSlideShowEnd_Click(BtnPPTSlideShowEnd, null);
         }
     }
 }

Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs

@@ -1,4 +1,4 @@
-using iNKORE.UI.WPF.Modern.Controls;
+using iNKORE.UI.WPF.Modern.Controls;
 using System;
 using System.Collections.Generic;
 using System.Windows;
@@ -17,6 +17,13 @@ namespace Ink_Canvas {
         private object lastBorderMouseDownObject;
 
         private void Border_MouseDown(object sender, MouseButtonEventArgs e) {
+            // 如果发送者是 RandomDrawPanel 或 SingleDrawPanel，且它们被隐藏，则不处理事件
+            if (sender is SimpleStackPanel panel) {
+                if ((panel == RandomDrawPanel || panel == SingleDrawPanel) && 
+                    panel.Visibility != Visibility.Visible) {
+                    return;
+                }
+            }
             lastBorderMouseDownObject = sender;
         }
 
@@ -380,6 +387,11 @@ namespace Ink_Canvas {
                     isProgramChangeStrokeSelection = false;
                     inkCanvas.Strokes.Add(StrokesSelectionClone);
                 }
+                else {
+                    // 新增：启动套索选择模式
+                    inkCanvas.EditingMode = InkCanvasEditingMode.Select;
+                    inkCanvas.Select(new StrokeCollection());
+                }
             }
         }
 

Ink Canvas/MainWindow_cs/MW_Settings.cs

@@ -1690,6 +1690,21 @@ namespace Ink_Canvas {
             SaveSettingsToFile();
         }
 
+        private void ToggleSwitchShowRandomAndSingleDraw_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+
+            // 获取开关状态并保存到设置中
+            bool isToggled = ToggleSwitchShowRandomAndSingleDraw.IsOn;
+            Settings.RandSettings.ShowRandomAndSingleDraw = isToggled;
+
+            // 更新UI显示
+            RandomDrawPanel.Visibility = isToggled ? Visibility.Visible : Visibility.Collapsed;
+            SingleDrawPanel.Visibility = isToggled ? Visibility.Visible : Visibility.Collapsed;
+
+            // 保存设置到文件
+            SaveSettingsToFile();
+        }
+
         #endregion
 
         public static void SaveSettingsToFile() {

Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs

@@ -569,7 +569,14 @@ namespace Ink_Canvas {
             }
 
             // RandSettings
-            if (Settings.RandSettings != null) { } else {
+            if (Settings.RandSettings != null) {
+                ToggleSwitchDisplayRandWindowNamesInputBtn.IsOn = Settings.RandSettings.DisplayRandWindowNamesInputBtn;
+                RandWindowOnceCloseLatencySlider.Value = Settings.RandSettings.RandWindowOnceCloseLatency;
+                RandWindowOnceMaxStudentsSlider.Value = Settings.RandSettings.RandWindowOnceMaxStudents;
+                ToggleSwitchShowRandomAndSingleDraw.IsOn = Settings.RandSettings.ShowRandomAndSingleDraw;
+                RandomDrawPanel.Visibility = Settings.RandSettings.ShowRandomAndSingleDraw ? Visibility.Visible : Visibility.Collapsed;
+                SingleDrawPanel.Visibility = Settings.RandSettings.ShowRandomAndSingleDraw ? Visibility.Visible : Visibility.Collapsed;
+            } else {
                 Settings.RandSettings = new RandSettings();
                 ToggleSwitchDisplayRandWindowNamesInputBtn.IsOn = Settings.RandSettings.DisplayRandWindowNamesInputBtn;
                 RandWindowOnceCloseLatencySlider.Value = Settings.RandSettings.RandWindowOnceCloseLatency;

Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs

@@ -56,7 +56,7 @@ namespace Ink_Canvas {
         #endregion Floating Bar Control
 
         private int drawingShapeMode = 0;
-        private bool isLongPressSelected = false; // 用于存是否是“选中”状态，便于后期抬笔后不做切换到笔的处理
+        private bool isLongPressSelected = false; // 用于存是否是"选中"状态，便于后期抬笔后不做切换到笔的处理
 
         #region Buttons
 
@@ -429,6 +429,8 @@ namespace Ink_Canvas {
 
         private void inkCanvas_TouchMove(object sender, TouchEventArgs e) {
             if (isSingleFingerDragMode) return;
+
+            // 处理形状绘制模式
             if (drawingShapeMode != 0) {
                 if (isLastTouchEraser) return;
                 //EraserContainer.Background = null;
@@ -443,15 +445,75 @@ namespace Ink_Canvas {
                     catch {
                         Trace.WriteLine("lastTempStrokeCollection failed.");
                     }
-
                     return;
                 }
-
-                if (inkCanvas.EditingMode != InkCanvasEditingMode.None)
-                    inkCanvas.EditingMode = InkCanvasEditingMode.None;
             }
 
-            MouseTouchMove(e.GetTouchPoint(inkCanvas).Position);
+            // 触摸移动时保持自定义光标显示
+            if (Settings.Canvas.IsShowCursor) {
+                inkCanvas.ForceCursor = true;
+                System.Windows.Forms.Cursor.Show();
+            }
+
+            if (NeedUpdateIniP()) iniP = e.GetTouchPoint(inkCanvas).Position;
+            if (drawingShapeMode == 9 && isFirstTouchCuboid == false) MouseTouchMove(iniP);
+            inkCanvas.Opacity = 1;
+            double boundsWidth = GetTouchBoundWidth(e), eraserMultiplier = 1.0;
+            if (!Settings.Advanced.EraserBindTouchMultiplier && Settings.Advanced.IsSpecialScreen)
+                eraserMultiplier = 1 / Settings.Advanced.TouchMultiplier;
+            if (boundsWidth > BoundsWidth) {
+                isLastTouchEraser = true;
+                if (drawingShapeMode == 0 && forceEraser) return;
+                if (boundsWidth > BoundsWidth * 2.5) {
+                    double k = 1;
+                    switch (Settings.Canvas.EraserSize) {
+                        case 0:
+                            k = 0.5;
+                            break;
+                        case 1:
+                            k = 0.8;
+                            break;
+                        case 3:
+                            k = 1.25;
+                            break;
+                        case 4:
+                            k = 1.8;
+                            break;
+                    }
+
+                    inkCanvas.EraserShape = new EllipseStylusShape(boundsWidth * k * eraserMultiplier,
+                        boundsWidth * k * eraserMultiplier);
+                    inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
+                }
+                else {
+                    if (StackPanelPPTControls.Visibility == Visibility.Visible && inkCanvas.Strokes.Count == 0 &&
+                        Settings.PowerPointSettings.IsEnableFingerGestureSlideShowControl) {
+                        isLastTouchEraser = false;
+                        inkCanvas.EditingMode = InkCanvasEditingMode.GestureOnly;
+                        inkCanvas.Opacity = 0.1;
+                    }
+                    else {
+                        inkCanvas.EraserShape = new EllipseStylusShape(5, 5);
+                        inkCanvas.EditingMode = InkCanvasEditingMode.EraseByStroke;
+                    }
+                }
+            }
+            else {
+                isLastTouchEraser = false;
+                // 修复面积擦时不显示橡皮形状：无论 forcePointEraser 状态，均显示 50x50 橡皮
+                inkCanvas.EraserShape = new EllipseStylusShape(50, 50);
+                if (forceEraser) return;
+                inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+            }
+
+            if (inkCanvas.EditingMode != InkCanvasEditingMode.None)
+                return;
+
+            if (e.TouchDevice == null) {
+                System.Windows.Forms.Cursor.Show();
+            } else {
+                System.Windows.Forms.Cursor.Hide();
+            }
         }
 
         private int drawMultiStepShapeCurrentStep = 0; //多笔完成的图形 当前所处在的笔画

Ink Canvas/MainWindow_cs/MW_TouchEvents.cs

@@ -79,6 +79,8 @@ namespace Ink_Canvas {
             }
             else {
                 TouchDownPointsList[e.TouchDevice.Id] = InkCanvasEditingMode.None;
+                // 修复面积擦时不显示橡皮形状：无论 forcePointEraser 状态，均显示 50x50 橡皮
+                inkCanvas.EraserShape = new EllipseStylusShape(50, 50);
                 inkCanvas.EditingMode = InkCanvasEditingMode.None;
             }
         }
@@ -181,6 +183,11 @@ namespace Ink_Canvas {
         private bool forcePointEraser = true;
 
         private void Main_Grid_TouchDown(object sender, TouchEventArgs e) {
+            // 确保触摸时显示自定义光标
+            if (Settings.Canvas.IsShowCursor) {
+                inkCanvas.ForceCursor = true;
+                System.Windows.Forms.Cursor.Show();
+            }
 
             inkCanvas.CaptureTouch(e.TouchDevice);
             ViewboxFloatingBar.IsHitTestVisible = false;
@@ -236,8 +243,8 @@ namespace Ink_Canvas {
             }
             else {
                 isLastTouchEraser = false;
-                inkCanvas.EraserShape =
-                    forcePointEraser ? new EllipseStylusShape(50, 50) : new EllipseStylusShape(5, 5);
+                // 修复面积擦时不显示橡皮形状：无论 forcePointEraser 状态，均显示 50x50 橡皮
+                inkCanvas.EraserShape = new EllipseStylusShape(50, 50);
                 if (forceEraser) return;
                 inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
             }

Ink Canvas/MainWindow_cs/MW_TrayIcon.cs

@@ -54,12 +54,20 @@ namespace Ink_Canvas
 
         private void CloseAppTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e) {
             var mainWin = (MainWindow)Application.Current.MainWindow;
-            if (mainWin.IsLoaded) mainWin.BtnExit_Click(null,null);
+            if (mainWin.IsLoaded) {
+                App.IsAppExitByUser = true;
+                Application.Current.Shutdown();
+                // mainWin.BtnExit_Click(null,null);
+            }
         }
 
         private void RestartAppTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e) {
             var mainWin = (MainWindow)Application.Current.MainWindow;
-            if (mainWin.IsLoaded) mainWin.BtnRestart_Click(null,null);
+            if (mainWin.IsLoaded) {
+                App.IsAppExitByUser = true;
+                Application.Current.Shutdown();
+                // mainWin.BtnExit_Click(null,null);
+            }
         }
 
         private void ForceFullScreenTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e) {

Ink Canvas/Resources/Settings.cs

@@ -406,5 +406,7 @@ namespace Ink_Canvas
         public double RandWindowOnceCloseLatency { get; set; } = 2.5;
         [JsonProperty("randWindowOnceMaxStudents")]
         public int RandWindowOnceMaxStudents { get; set; } = 10;
+        [JsonProperty("showRandomAndSingleDraw")]
+        public bool ShowRandomAndSingleDraw { get; set; } = true;
     }
 }

Ink Canvas/obj/Debug/net472/App.g.cs

@@ -65,7 +65,7 @@ namespace Ink_Canvas {
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public void InitializeComponent() {
             if (_contentLoaded) {
                 return;
@@ -87,7 +87,7 @@ namespace Ink_Canvas {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -162,7 +162,7 @@ namespace Ink_Canvas {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
@@ -190,7 +190,7 @@ namespace Ink_Canvas {
         /// </summary>
         [System.STAThreadAttribute()]
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public static void Main() {
             Ink_Canvas.App app = new Ink_Canvas.App();
             app.InitializeComponent();

Ink Canvas/obj/Debug/net472/App.g.i.cs

@@ -65,7 +65,7 @@ namespace Ink_Canvas {
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public void InitializeComponent() {
             if (_contentLoaded) {
                 return;
@@ -87,7 +87,7 @@ namespace Ink_Canvas {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -162,7 +162,7 @@ namespace Ink_Canvas {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
@@ -190,7 +190,7 @@ namespace Ink_Canvas {
         /// </summary>
         [System.STAThreadAttribute()]
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public static void Main() {
             Ink_Canvas.App app = new Ink_Canvas.App();
             app.InitializeComponent();

Ink Canvas/obj/Debug/net472/GeneratedInternalTypeHelper.g.cs

@@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace {
     /// GeneratedInternalTypeHelper
     /// </summary>
     [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
     [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
     public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
         

Ink Canvas/obj/Debug/net472/GeneratedInternalTypeHelper.g.i.cs

@@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace {
     /// GeneratedInternalTypeHelper
     /// </summary>
     [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
     [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
     public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
         

Ink Canvas/obj/Debug/net472/Windows/CountdownTimerWindow.g.cs

@@ -249,7 +249,7 @@ namespace Ink_Canvas {
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public void InitializeComponent() {
             if (_contentLoaded) {
                 return;
@@ -265,14 +265,14 @@ namespace Ink_Canvas {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
             return System.Delegate.CreateDelegate(delegateType, this, handler);
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]

Ink Canvas/obj/Debug/net472/Windows/CountdownTimerWindow.g.i.cs

@@ -249,7 +249,7 @@ namespace Ink_Canvas {
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public void InitializeComponent() {
             if (_contentLoaded) {
                 return;
@@ -265,14 +265,14 @@ namespace Ink_Canvas {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
             return System.Delegate.CreateDelegate(delegateType, this, handler);
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]

Ink Canvas/obj/Debug/net472/Windows/CycleProcessBar.g.cs

@@ -65,7 +65,7 @@ namespace Ink_Canvas.ProcessBars {
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public void InitializeComponent() {
             if (_contentLoaded) {
                 return;
@@ -81,7 +81,7 @@ namespace Ink_Canvas.ProcessBars {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]

Ink Canvas/obj/Debug/net472/Windows/CycleProcessBar.g.i.cs

@@ -65,7 +65,7 @@ namespace Ink_Canvas.ProcessBars {
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public void InitializeComponent() {
             if (_contentLoaded) {
                 return;
@@ -81,7 +81,7 @@ namespace Ink_Canvas.ProcessBars {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]

Ink Canvas/obj/Debug/net472/Windows/HasNewUpdateWindow.g.cs

@@ -65,7 +65,7 @@ namespace Ink_Canvas {
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public void InitializeComponent() {
             if (_contentLoaded) {
                 return;
@@ -81,7 +81,7 @@ namespace Ink_Canvas {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]

Ink Canvas/obj/Debug/net472/Windows/HasNewUpdateWindow.g.i.cs

@@ -65,7 +65,7 @@ namespace Ink_Canvas {
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public void InitializeComponent() {
             if (_contentLoaded) {
                 return;
@@ -81,7 +81,7 @@ namespace Ink_Canvas {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]

Ink Canvas/obj/Debug/net472/Windows/NamesInputWindow.g.cs

@@ -72,7 +72,7 @@ namespace Ink_Canvas {
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public void InitializeComponent() {
             if (_contentLoaded) {
                 return;
@@ -88,7 +88,7 @@ namespace Ink_Canvas {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]

Ink Canvas/obj/Debug/net472/Windows/NamesInputWindow.g.i.cs

@@ -72,7 +72,7 @@ namespace Ink_Canvas {
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public void InitializeComponent() {
             if (_contentLoaded) {
                 return;
@@ -88,7 +88,7 @@ namespace Ink_Canvas {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]

Ink Canvas/obj/Debug/net472/Windows/OperatingGuideWindow.g.cs

@@ -88,7 +88,7 @@ namespace Ink_Canvas {
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public void InitializeComponent() {
             if (_contentLoaded) {
                 return;
@@ -104,7 +104,7 @@ namespace Ink_Canvas {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]

Ink Canvas/obj/Debug/net472/Windows/OperatingGuideWindow.g.i.cs

@@ -88,7 +88,7 @@ namespace Ink_Canvas {
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public void InitializeComponent() {
             if (_contentLoaded) {
                 return;
@@ -104,7 +104,7 @@ namespace Ink_Canvas {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]

Ink Canvas/obj/Debug/net472/Windows/RandWindow.g.cs

@@ -192,7 +192,7 @@ namespace Ink_Canvas {
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public void InitializeComponent() {
             if (_contentLoaded) {
                 return;
@@ -208,7 +208,7 @@ namespace Ink_Canvas {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]

Ink Canvas/obj/Debug/net472/Windows/RandWindow.g.i.cs

@@ -192,7 +192,7 @@ namespace Ink_Canvas {
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public void InitializeComponent() {
             if (_contentLoaded) {
                 return;
@@ -208,7 +208,7 @@ namespace Ink_Canvas {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]

Ink Canvas/obj/Debug/net472/Windows/YesOrNoNotificationWindow.g.cs

@@ -72,7 +72,7 @@ namespace Ink_Canvas {
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public void InitializeComponent() {
             if (_contentLoaded) {
                 return;
@@ -88,7 +88,7 @@ namespace Ink_Canvas {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]

Ink Canvas/obj/Debug/net472/Windows/YesOrNoNotificationWindow.g.i.cs

@@ -72,7 +72,7 @@ namespace Ink_Canvas {
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         public void InitializeComponent() {
             if (_contentLoaded) {
                 return;
@@ -88,7 +88,7 @@ namespace Ink_Canvas {
         }
         
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]

Ink Canvas/obj/InkCanvasForClass.csproj.nuget.dgspec.json

@@ -83,7 +83,7 @@
               "version": "[0.9.27, )"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.301\\RuntimeIdentifierGraph.json"
         }
       },
       "runtimes": {

Ink Canvas/obj/InkCanvasForClass.csproj.nuget.g.props

@@ -7,7 +7,7 @@
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;E:\Program Files\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.13.2</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.14.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />

Ink Canvas/obj/project.assets.json

@@ -1201,7 +1201,7 @@
             "version": "[0.9.27, )"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.301\\RuntimeIdentifierGraph.json"
       }
     },
     "runtimes": {

Ink Canvas/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "asCIyEp3RNM=",
+  "dgSpecHash": "aYvBApY9Dj0=",
   "success": true,
   "projectFilePath": "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj",
   "expectedPackageFiles": [

README.md

@@ -21,6 +21,11 @@ ICC CE创立的初衷是因为作者使用ICC的过程中一些小BUG，于是
 说白了，我比较懒README懒得改了，就直接用之前ICC的了
 高中生，更新不定期/doge
 
+## 相关信息
+ICC CE交流群：QQ群1054377349
+
+智教联盟 InkCanvasForClass Community Edition 板块:https://forum.smart-teach.cn/t/icc-ce
+
 ### 项目特点
 由初学者结合AI技术实现代码(说白了就是不会)