优化代码

This commit is contained in:
2025-07-28 14:40:44 +08:00
parent f38313ff2c
commit f03733da04
66 changed files with 1333 additions and 1294 deletions
+151 -163
View File
@@ -1,16 +1,21 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.IO;
using System.Net.Http;
using System.Threading.Tasks;
using System.Reflection;
using System.Windows;
using System.Collections.ObjectModel;
using System.IO.Compression;
using System.Linq;
using System.Windows.Controls;
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Reflection;
using System.Text;
using System.Collections.Generic;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -21,7 +26,7 @@ namespace Ink_Canvas.Helpers
// 定义超时时间为10秒
private static readonly TimeSpan RequestTimeout = TimeSpan.FromSeconds(10);
private static readonly string updatesFolderPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "AutoUpdate");
private static string statusFilePath = null;
private static string statusFilePath;
// 线路组结构体(包含版本、下载、日志地址)
public class UpdateLineGroup
@@ -209,7 +214,7 @@ namespace Ink_Canvas.Helpers
if (zhiJiaoGroup != null)
{
orderedGroups.Insert(0, zhiJiaoGroup);
LogHelper.WriteLogToFile($"AutoUpdate | 智教联盟线路组已插入到首位");
LogHelper.WriteLogToFile("AutoUpdate | 智教联盟线路组已插入到首位");
}
// 将"inkeys"线路组插入到第二位(如果存在)
@@ -217,7 +222,7 @@ namespace Ink_Canvas.Helpers
if (inkeysGroup != null)
{
orderedGroups.Insert(1, inkeysGroup);
LogHelper.WriteLogToFile($"AutoUpdate | inkeys线路组已插入到第二位");
LogHelper.WriteLogToFile("AutoUpdate | inkeys线路组已插入到第二位");
}
if (orderedGroups.Count > 0)
@@ -278,7 +283,7 @@ namespace Ink_Canvas.Helpers
// 如果内容包含HTML(可能是GitHub页面而不是原始内容),尝试提取版本号
if (content.Contains("<html") || content.Contains("<!DOCTYPE"))
{
LogHelper.WriteLogToFile($"AutoUpdate | 收到HTML内容而不是原始版本号 - 尝试提取版本");
LogHelper.WriteLogToFile("AutoUpdate | 收到HTML内容而不是原始版本号 - 尝试提取版本");
int startPos = content.IndexOf("<table");
if (startPos > 0)
{
@@ -286,7 +291,7 @@ namespace Ink_Canvas.Helpers
if (endPos > startPos)
{
string tableContent = content.Substring(startPos, endPos - startPos);
var match = System.Text.RegularExpressions.Regex.Match(tableContent, @"(\d+\.\d+\.\d+(\.\d+)?)");
var match = Regex.Match(tableContent, @"(\d+\.\d+\.\d+(\.\d+)?)");
if (match.Success)
{
content = match.Groups[1].Value;
@@ -294,7 +299,7 @@ namespace Ink_Canvas.Helpers
}
else
{
LogHelper.WriteLogToFile($"AutoUpdate | 无法从HTML内容提取版本");
LogHelper.WriteLogToFile("AutoUpdate | 无法从HTML内容提取版本");
return null;
}
}
@@ -321,77 +326,75 @@ namespace Ink_Canvas.Helpers
return null;
}
}
else
{
// 其他Windows版本使用标准配置
using (HttpClient client = new HttpClient())
{
try
{
client.Timeout = RequestTimeout;
LogHelper.WriteLogToFile($"AutoUpdate | 发送HTTP请求到: {fileUrl}");
var downloadTask = client.GetAsync(fileUrl);
var timeoutTask = Task.Delay(RequestTimeout);
var completedTask = await Task.WhenAny(downloadTask, timeoutTask);
if (completedTask == timeoutTask)
{
LogHelper.WriteLogToFile($"AutoUpdate | 请求超时 ({RequestTimeout.TotalSeconds}秒)", LogHelper.LogType.Error);
return null;
}
HttpResponseMessage response = await downloadTask;
LogHelper.WriteLogToFile($"AutoUpdate | HTTP响应状态: {response.StatusCode}");
response.EnsureSuccessStatusCode();
string content = await response.Content.ReadAsStringAsync();
content = content.Trim();
// 其他Windows版本使用标准配置
using (HttpClient client = new HttpClient())
{
try
{
client.Timeout = RequestTimeout;
LogHelper.WriteLogToFile($"AutoUpdate | 发送HTTP请求到: {fileUrl}");
// 如果内容包含HTML(可能是GitHub页面而不是原始内容),尝试提取版本号
if (content.Contains("<html") || content.Contains("<!DOCTYPE"))
var downloadTask = client.GetAsync(fileUrl);
var timeoutTask = Task.Delay(RequestTimeout);
var completedTask = await Task.WhenAny(downloadTask, timeoutTask);
if (completedTask == timeoutTask)
{
LogHelper.WriteLogToFile($"AutoUpdate | 请求超时 ({RequestTimeout.TotalSeconds}秒)", LogHelper.LogType.Error);
return null;
}
HttpResponseMessage response = await downloadTask;
LogHelper.WriteLogToFile($"AutoUpdate | HTTP响应状态: {response.StatusCode}");
response.EnsureSuccessStatusCode();
string content = await response.Content.ReadAsStringAsync();
content = content.Trim();
// 如果内容包含HTML(可能是GitHub页面而不是原始内容),尝试提取版本号
if (content.Contains("<html") || content.Contains("<!DOCTYPE"))
{
LogHelper.WriteLogToFile("AutoUpdate | 收到HTML内容而不是原始版本号 - 尝试提取版本");
int startPos = content.IndexOf("<table");
if (startPos > 0)
{
LogHelper.WriteLogToFile($"AutoUpdate | 收到HTML内容而不是原始版本号 - 尝试提取版本");
int startPos = content.IndexOf("<table");
if (startPos > 0)
int endPos = content.IndexOf("</table>", startPos);
if (endPos > startPos)
{
int endPos = content.IndexOf("</table>", startPos);
if (endPos > startPos)
string tableContent = content.Substring(startPos, endPos - startPos);
var match = Regex.Match(tableContent, @"(\d+\.\d+\.\d+(\.\d+)?)");
if (match.Success)
{
string tableContent = content.Substring(startPos, endPos - startPos);
var match = System.Text.RegularExpressions.Regex.Match(tableContent, @"(\d+\.\d+\.\d+(\.\d+)?)");
if (match.Success)
{
content = match.Groups[1].Value;
LogHelper.WriteLogToFile($"AutoUpdate | 从HTML提取版本: {content}");
}
else
{
LogHelper.WriteLogToFile($"AutoUpdate | 无法从HTML内容提取版本");
return null;
}
content = match.Groups[1].Value;
LogHelper.WriteLogToFile($"AutoUpdate | 从HTML提取版本: {content}");
}
else
{
LogHelper.WriteLogToFile("AutoUpdate | 无法从HTML内容提取版本");
return null;
}
}
}
}
LogHelper.WriteLogToFile($"AutoUpdate | 响应内容: {content}");
return content;
}
catch (HttpRequestException ex)
{
LogHelper.WriteLogToFile($"AutoUpdate | HTTP请求错误: {ex.Message}", LogHelper.LogType.Error);
}
catch (TaskCanceledException ex)
{
LogHelper.WriteLogToFile($"AutoUpdate | 请求超时: {ex.Message}", LogHelper.LogType.Error);
}
catch (Exception ex)
{
LogHelper.WriteLogToFile($"AutoUpdate | 错误: {ex.Message}", LogHelper.LogType.Error);
}
return null;
LogHelper.WriteLogToFile($"AutoUpdate | 响应内容: {content}");
return content;
}
catch (HttpRequestException ex)
{
LogHelper.WriteLogToFile($"AutoUpdate | HTTP请求错误: {ex.Message}", LogHelper.LogType.Error);
}
catch (TaskCanceledException ex)
{
LogHelper.WriteLogToFile($"AutoUpdate | 请求超时: {ex.Message}", LogHelper.LogType.Error);
}
catch (Exception ex)
{
LogHelper.WriteLogToFile($"AutoUpdate | 错误: {ex.Message}", LogHelper.LogType.Error);
}
return null;
}
}
@@ -484,7 +487,7 @@ namespace Ink_Canvas.Helpers
LogHelper.WriteLogToFile($"AutoUpdate | 本地版本: {localVersion}");
LogHelper.WriteLogToFile($"AutoUpdate | 设备ID: {DeviceIdentifier.GetDeviceId()}");
LogHelper.WriteLogToFile($"AutoUpdate | 更新优先级: {DeviceIdentifier.GetUpdatePriority()}");
LogHelper.WriteLogToFile($"AutoUpdate | 优先通过GitHub Releases API检测...");
LogHelper.WriteLogToFile("AutoUpdate | 优先通过GitHub Releases API检测...");
// 1. 优先通过GitHub Releases API获取
var (apiVersion, _, apiReleaseNotes, apiReleaseTime) = await GetLatestGithubRelease(channel);
@@ -518,7 +521,7 @@ namespace Ink_Canvas.Helpers
}
else
{
LogHelper.WriteLogToFile($"AutoUpdate | 版本修复模式,跳过分级策略检查");
LogHelper.WriteLogToFile("AutoUpdate | 版本修复模式,跳过分级策略检查");
}
LogHelper.WriteLogToFile($"AutoUpdate | 根据用户优先级,推送更新 {apiVersion}");
@@ -528,13 +531,13 @@ namespace Ink_Canvas.Helpers
}
else
{
LogHelper.WriteLogToFile($"AutoUpdate | 当前版本已是最新 (GitHub Releases API)");
LogHelper.WriteLogToFile("AutoUpdate | 当前版本已是最新 (GitHub Releases API)");
var availableGroup = (await GetAvailableLineGroupsOrdered(channel)).FirstOrDefault();
return (null, availableGroup, apiReleaseNotes);
}
}
// 2. 回退到原有txt方案
LogHelper.WriteLogToFile($"AutoUpdate | GitHub Releases API获取失败,回退到txt方案...");
LogHelper.WriteLogToFile("AutoUpdate | GitHub Releases API获取失败,回退到txt方案...");
var availableGroups = await GetAvailableLineGroupsOrdered(channel);
if (availableGroups.Count == 0)
{
@@ -570,22 +573,18 @@ namespace Ink_Canvas.Helpers
}
else
{
LogHelper.WriteLogToFile($"AutoUpdate | 版本修复模式,跳过分级策略检查");
LogHelper.WriteLogToFile("AutoUpdate | 版本修复模式,跳过分级策略检查");
}
LogHelper.WriteLogToFile($"AutoUpdate | 根据用户优先级,推送更新 {remoteVersion}");
return (remoteVersion, group, null);
}
else
{
LogHelper.WriteLogToFile($"AutoUpdate | 当前版本已是最新");
return (null, group, null);
}
}
else
{
LogHelper.WriteLogToFile($"AutoUpdate | 线路组 {group.GroupName} 获取版本失败,尝试下一个线路组", LogHelper.LogType.Warning);
LogHelper.WriteLogToFile("AutoUpdate | 当前版本已是最新");
return (null, group, null);
}
LogHelper.WriteLogToFile($"AutoUpdate | 线路组 {group.GroupName} 获取版本失败,尝试下一个线路组", LogHelper.LogType.Warning);
}
LogHelper.WriteLogToFile("AutoUpdate | 所有线路组均无法获取版本信息", LogHelper.LogType.Error);
return (null, null, null);
@@ -614,7 +613,7 @@ namespace Ink_Canvas.Helpers
client.Timeout = RequestTimeout;
var resp = await client.GetAsync(url);
// 优先取Location头
if (resp.StatusCode == System.Net.HttpStatusCode.Found || resp.StatusCode == System.Net.HttpStatusCode.Redirect || resp.StatusCode == System.Net.HttpStatusCode.MovedPermanently)
if (resp.StatusCode == HttpStatusCode.Found || resp.StatusCode == HttpStatusCode.Redirect || resp.StatusCode == HttpStatusCode.MovedPermanently)
{
if (resp.Headers.Location != null)
{
@@ -675,12 +674,12 @@ namespace Ink_Canvas.Helpers
if (zhiJiaoGroup != null)
{
priorityGroups.Add(zhiJiaoGroup);
LogHelper.WriteLogToFile($"AutoUpdate | 下载时优先尝试智教联盟线路组");
LogHelper.WriteLogToFile("AutoUpdate | 下载时优先尝试智教联盟线路组");
}
if (inkeysGroup != null)
{
priorityGroups.Add(inkeysGroup);
LogHelper.WriteLogToFile($"AutoUpdate | 下载时优先尝试inkeys线路组");
LogHelper.WriteLogToFile("AutoUpdate | 下载时优先尝试inkeys线路组");
}
groups = priorityGroups.Concat(groups.Where(g => g.GroupName != "智教联盟" && g.GroupName != "inkeys")).ToList();
}
@@ -696,7 +695,7 @@ namespace Ink_Canvas.Helpers
var realUrl = await GetZhijiaoRealDownloadUrl(url);
if (string.IsNullOrEmpty(realUrl))
{
LogHelper.WriteLogToFile($"AutoUpdate | 智教联盟真实下载地址获取失败,跳过", LogHelper.LogType.Warning);
LogHelper.WriteLogToFile("AutoUpdate | 智教联盟真实下载地址获取失败,跳过", LogHelper.LogType.Warning);
progressCallback?.Invoke(0, "智教联盟真实下载地址获取失败,跳过");
continue;
}
@@ -719,10 +718,8 @@ namespace Ink_Canvas.Helpers
progressCallback?.Invoke(100, "下载完成");
return true;
}
else
{
LogHelper.WriteLogToFile($"AutoUpdate | 线路组 {group.GroupName} 下载失败,尝试下一个线路组", LogHelper.LogType.Warning);
}
LogHelper.WriteLogToFile($"AutoUpdate | 线路组 {group.GroupName} 下载失败,尝试下一个线路组", LogHelper.LogType.Warning);
}
LogHelper.WriteLogToFile("AutoUpdate | 所有线路组下载均失败", LogHelper.LogType.Error);
@@ -749,7 +746,7 @@ namespace Ink_Canvas.Helpers
LogHelper.WriteLogToFile($"AutoUpdate | 正在尝试多线程下载: {fileUrl}");
int maxRetry = 3;
// 降低并发数,减少网络压力
int[] threadOptions = new int[] { 32, 16, 8, 4, 1 };
int[] threadOptions = { 32, 16, 8, 4, 1 };
// 检查服务器是否支持Range分块下载
bool supportRange = false;
@@ -760,9 +757,9 @@ namespace Ink_Canvas.Helpers
{
client.DefaultRequestHeaders.UserAgent.ParseAdd("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36");
var req = new HttpRequestMessage(HttpMethod.Head, fileUrl);
req.Headers.Range = new System.Net.Http.Headers.RangeHeaderValue(0, 0);
req.Headers.Range = new RangeHeaderValue(0, 0);
var resp = await client.SendAsync(req);
if (resp.StatusCode == System.Net.HttpStatusCode.PartialContent)
if (resp.StatusCode == HttpStatusCode.PartialContent)
{
supportRange = true;
if (resp.Content.Headers.ContentRange != null && resp.Content.Headers.ContentRange.Length.HasValue)
@@ -774,7 +771,7 @@ namespace Ink_Canvas.Helpers
totalSize = resp.Content.Headers.ContentLength.Value;
}
}
else if (resp.StatusCode == System.Net.HttpStatusCode.OK)
else if (resp.StatusCode == HttpStatusCode.OK)
{
supportRange = false;
if (resp.Content.Headers.ContentLength.HasValue)
@@ -791,7 +788,7 @@ namespace Ink_Canvas.Helpers
if (!supportRange)
{
LogHelper.WriteLogToFile($"AutoUpdate | 服务器不支持分块下载,自动降级为单线程下载");
LogHelper.WriteLogToFile("AutoUpdate | 服务器不支持分块下载,自动降级为单线程下载");
progressCallback?.Invoke(0, "服务器不支持分块下载,自动降级为单线程下载");
return await DownloadSingleThread(fileUrl, destinationPath, totalSize, progressCallback);
}
@@ -818,8 +815,8 @@ namespace Ink_Canvas.Helpers
LogHelper.WriteLogToFile($"AutoUpdate | 文件大小: {totalSize}, 分块数: {blockCount}, 分块大小: {blockSize}");
var blockQueue = new System.Collections.Concurrent.ConcurrentQueue<BlockTask>();
var finishedBlocks = new System.Collections.Concurrent.ConcurrentDictionary<int, bool>();
var blockQueue = new ConcurrentQueue<BlockTask>();
var finishedBlocks = new ConcurrentDictionary<int, bool>();
long[] blockDownloaded = new long[blockCount];
for (int i = 0; i < blockCount; i++)
@@ -849,7 +846,7 @@ namespace Ink_Canvas.Helpers
{
client.DefaultRequestHeaders.UserAgent.ParseAdd("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36");
var req = new HttpRequestMessage(HttpMethod.Get, fileUrl);
req.Headers.Range = new System.Net.Http.Headers.RangeHeaderValue(block.Start, block.End);
req.Headers.Range = new RangeHeaderValue(block.Start, block.End);
// 增加连接超时设置
client.Timeout = TimeSpan.FromSeconds(30);
@@ -967,16 +964,14 @@ namespace Ink_Canvas.Helpers
if (threadCount == threadOptions.Last())
{
// 已经是最后一次尝试,降级为单线程
LogHelper.WriteLogToFile($"AutoUpdate | 所有多线程尝试失败,降级为单线程下载");
LogHelper.WriteLogToFile("AutoUpdate | 所有多线程尝试失败,降级为单线程下载");
progressCallback?.Invoke(0, "所有多线程尝试失败,降级为单线程下载");
return await DownloadSingleThread(fileUrl, destinationPath, totalSize, progressCallback);
}
else
{
LogHelper.WriteLogToFile($"AutoUpdate | {threadCount}线程下载失败,尝试降级为{threadOptions[Array.IndexOf(threadOptions, threadCount) + 1]}线程");
progressCallback?.Invoke(0, $"{threadCount}线程下载失败,尝试降级为{threadOptions[Array.IndexOf(threadOptions, threadCount) + 1]}线程");
continue;
}
LogHelper.WriteLogToFile($"AutoUpdate | {threadCount}线程下载失败,尝试降级为{threadOptions[Array.IndexOf(threadOptions, threadCount) + 1]}线程");
progressCallback?.Invoke(0, $"{threadCount}线程下载失败,尝试降级为{threadOptions[Array.IndexOf(threadOptions, threadCount) + 1]}线程");
continue;
}
// 合并所有块
@@ -1018,7 +1013,7 @@ namespace Ink_Canvas.Helpers
{
try
{
System.IO.Compression.ZipFile.OpenRead(destinationPath).Dispose();
ZipFile.OpenRead(destinationPath).Dispose();
}
catch
{
@@ -1086,7 +1081,7 @@ namespace Ink_Canvas.Helpers
}
progressCallback?.Invoke(100, "单线程下载完成");
LogHelper.WriteLogToFile($"AutoUpdate | 单线程下载完成");
LogHelper.WriteLogToFile("AutoUpdate | 单线程下载完成");
return true;
}
catch (Exception ex)
@@ -1149,7 +1144,7 @@ namespace Ink_Canvas.Helpers
if (!Directory.Exists(backupDir))
{
Directory.CreateDirectory(backupDir);
LogHelper.WriteLogToFile($"创建备份目录: {backupDir}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"创建备份目录: {backupDir}");
}
string backupFileName = $"Settings_BeforeUpdate_v{version}_{DateTime.Now:yyyyMMdd_HHmmss}.json";
@@ -1158,11 +1153,11 @@ namespace Ink_Canvas.Helpers
string settingsJson = JsonConvert.SerializeObject(MainWindow.Settings, Formatting.Indented);
File.WriteAllText(backupPath, settingsJson);
LogHelper.WriteLogToFile($"更新前自动备份设置成功: {backupPath}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"更新前自动备份设置成功: {backupPath}");
}
else
{
LogHelper.WriteLogToFile("更新前自动备份功能已禁用,跳过备份", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("更新前自动备份功能已禁用,跳过备份");
}
}
catch (Exception ex)
@@ -1182,7 +1177,7 @@ namespace Ink_Canvas.Helpers
FileInfo fileInfo = new FileInfo(zipFilePath);
if (fileInfo.Length == 0)
{
LogHelper.WriteLogToFile($"AutoUpdate | ZIP文件为空,无法继续", LogHelper.LogType.Error);
LogHelper.WriteLogToFile("AutoUpdate | ZIP文件为空,无法继续", LogHelper.LogType.Error);
return;
}
LogHelper.WriteLogToFile($"AutoUpdate | ZIP文件大小: {fileInfo.Length} 字节");
@@ -1203,7 +1198,7 @@ namespace Ink_Canvas.Helpers
batchContent.AppendLine("echo Set objShell = CreateObject(\"WScript.Shell\") > \"%temp%\\hideme.vbs\"");
batchContent.AppendLine("echo objShell.Run \"cmd /c \"\"\" ^& WScript.Arguments(0) ^& \"\"\"\", 0, True >> \"%temp%\\hideme.vbs\"");
batchContent.AppendLine($"echo Wscript.Sleep 100 >> \"%temp%\\hideme.vbs\"");
batchContent.AppendLine("echo Wscript.Sleep 100 >> \"%temp%\\hideme.vbs\"");
string updateBatPath = Path.Combine(Path.GetTempPath(), "ICCUpdate_" + Guid.NewGuid().ToString().Substring(0, 8) + ".bat");
batchContent.AppendLine($"echo @echo off > \"{updateBatPath}\"");
@@ -1283,7 +1278,7 @@ namespace Ink_Canvas.Helpers
batchContent.AppendLine("exit");
File.WriteAllText(batchFilePath, batchContent.ToString());
LogHelper.WriteLogToFile($"AutoUpdate | 创建更新批处理文件完成");
LogHelper.WriteLogToFile("AutoUpdate | 创建更新批处理文件完成");
Process.Start(new ProcessStartInfo
{
@@ -1293,7 +1288,7 @@ namespace Ink_Canvas.Helpers
WindowStyle = ProcessWindowStyle.Hidden
});
LogHelper.WriteLogToFile($"AutoUpdate | 启动更新批处理进程(隐藏窗口)");
LogHelper.WriteLogToFile("AutoUpdate | 启动更新批处理进程(隐藏窗口)");
}
catch (Exception ex)
{
@@ -1356,43 +1351,41 @@ namespace Ink_Canvas.Helpers
return null;
}
}
else
// 其他Windows版本使用标准配置
using (HttpClient client = new HttpClient())
{
// 其他Windows版本使用标准配置
using (HttpClient client = new HttpClient())
try
{
try
client.Timeout = RequestTimeout;
LogHelper.WriteLogToFile($"AutoUpdate | 发送HTTP请求到: {fileUrl}");
var downloadTask = client.GetAsync(fileUrl);
var timeoutTask = Task.Delay(RequestTimeout);
var completedTask = await Task.WhenAny(downloadTask, timeoutTask);
if (completedTask == timeoutTask)
{
client.Timeout = RequestTimeout;
LogHelper.WriteLogToFile($"AutoUpdate | 发送HTTP请求到: {fileUrl}");
var downloadTask = client.GetAsync(fileUrl);
var timeoutTask = Task.Delay(RequestTimeout);
var completedTask = await Task.WhenAny(downloadTask, timeoutTask);
if (completedTask == timeoutTask)
{
LogHelper.WriteLogToFile($"AutoUpdate | 请求超时 ({RequestTimeout.TotalSeconds}秒)", LogHelper.LogType.Error);
return null;
}
HttpResponseMessage response = await downloadTask;
LogHelper.WriteLogToFile($"AutoUpdate | HTTP响应状态: {response.StatusCode}");
response.EnsureSuccessStatusCode();
string content = await response.Content.ReadAsStringAsync();
return content;
LogHelper.WriteLogToFile($"AutoUpdate | 请求超时 ({RequestTimeout.TotalSeconds}秒)", LogHelper.LogType.Error);
return null;
}
catch (HttpRequestException ex)
{
LogHelper.WriteLogToFile($"AutoUpdate | HTTP请求错误: {ex.Message}", LogHelper.LogType.Error);
}
catch (TaskCanceledException ex)
{
LogHelper.WriteLogToFile($"AutoUpdate | 请求超时: {ex.Message}", LogHelper.LogType.Error);
}
catch (Exception ex)
{
LogHelper.WriteLogToFile($"AutoUpdate | 错误: {ex.Message}", LogHelper.LogType.Error);
}
return null;
HttpResponseMessage response = await downloadTask;
LogHelper.WriteLogToFile($"AutoUpdate | HTTP响应状态: {response.StatusCode}");
response.EnsureSuccessStatusCode();
string content = await response.Content.ReadAsStringAsync();
return content;
}
catch (HttpRequestException ex)
{
LogHelper.WriteLogToFile($"AutoUpdate | HTTP请求错误: {ex.Message}", LogHelper.LogType.Error);
}
catch (TaskCanceledException ex)
{
LogHelper.WriteLogToFile($"AutoUpdate | 请求超时: {ex.Message}", LogHelper.LogType.Error);
}
catch (Exception ex)
{
LogHelper.WriteLogToFile($"AutoUpdate | 错误: {ex.Message}", LogHelper.LogType.Error);
}
return null;
}
}
@@ -1513,7 +1506,7 @@ namespace Ink_Canvas.Helpers
if (!isWindows7)
{
LogHelper.WriteLogToFile("AutoUpdate | 当前系统不是Windows 7,跳过TLS连接测试", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("AutoUpdate | 当前系统不是Windows 7,跳过TLS连接测试");
return true; // 非Windows 7系统直接返回成功
}
@@ -1536,11 +1529,9 @@ namespace Ink_Canvas.Helpers
LogHelper.WriteLogToFile("AutoUpdate | Windows 7 TLS连接测试成功");
return true;
}
else
{
LogHelper.WriteLogToFile($"AutoUpdate | Windows 7 TLS连接测试失败,状态码: {response.StatusCode}", LogHelper.LogType.Error);
return false;
}
LogHelper.WriteLogToFile($"AutoUpdate | Windows 7 TLS连接测试失败,状态码: {response.StatusCode}", LogHelper.LogType.Error);
return false;
}
}
}
@@ -1632,11 +1623,8 @@ namespace Ink_Canvas.Helpers
if (StartTime <= EndTime)
{ // 单日时间段
return currentTime >= StartTime && currentTime <= EndTime;
}
else
{ // 跨越两天的时间段
return currentTime >= StartTime || currentTime <= EndTime;
}
} // 跨越两天的时间段
return currentTime >= StartTime || currentTime <= EndTime;
}
}
}
+6 -5
View File
@@ -1,6 +1,7 @@
using System;
using System.Runtime.InteropServices;
using System.Windows;
using System.Windows.Forms;
using System.Windows.Interop;
namespace Ink_Canvas.Helpers
@@ -8,7 +9,7 @@ namespace Ink_Canvas.Helpers
/// <summary>
/// 防止窗口进入全屏状态的辅助类
/// </summary>
public static partial class AvoidFullScreenHelper
public static class AvoidFullScreenHelper
{
private static readonly DependencyProperty IsAvoidFullScreenEnabledProperty =
DependencyProperty.RegisterAttached(
@@ -16,7 +17,7 @@ namespace Ink_Canvas.Helpers
typeof(bool),
typeof(AvoidFullScreenHelper));
private static bool _isBoardMode = false;
private static bool _isBoardMode;
public static void SetBoardMode(bool isBoardMode)
{
_isBoardMode = isBoardMode;
@@ -120,10 +121,10 @@ namespace Ink_Canvas.Helpers
private static Rect GetWorkingArea(Rect windowRect)
{
// 获取所有显示器
var screens = System.Windows.Forms.Screen.AllScreens;
var screens = Screen.AllScreens;
// 确定窗口主要位于哪个显示器上
System.Windows.Forms.Screen targetScreen = null;
Screen targetScreen = null;
double maxIntersection = 0;
foreach (var screen in screens)
@@ -144,7 +145,7 @@ namespace Ink_Canvas.Helpers
// 如果没找到,使用主显示器
if (targetScreen == null)
targetScreen = System.Windows.Forms.Screen.PrimaryScreen;
targetScreen = Screen.PrimaryScreen;
return new Rect(
targetScreen.WorkingArea.X,
+29 -47
View File
@@ -9,125 +9,107 @@ namespace Ink_Canvas.Converter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if ((bool)value == true)
if ((bool)value)
{
return Visibility.Visible;
}
else
{
return Visibility.Collapsed;
}
return Visibility.Collapsed;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
if ((bool)value == true)
if ((bool)value)
{
return Visibility.Visible;
}
else
{
return Visibility.Collapsed;
}
return Visibility.Collapsed;
}
}
public class VisibilityConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
Visibility visibility = (Visibility)value;
if (visibility == Visibility.Visible)
{
return Visibility.Collapsed;
}
else
{
return Visibility.Visible;
}
return Visibility.Visible;
}
public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
Visibility visibility = (Visibility)value;
if (visibility == Visibility.Visible)
{
return Visibility.Collapsed;
}
else
{
return Visibility.Visible;
}
return Visibility.Visible;
}
}
public class IntNumberToString : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if ((double)value == 0)
{
return "无限制";
}
else
{
return ((double)value).ToString() + "人";
}
return ((double)value) + "人";
}
public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
if ((double)value == 0)
{
return "无限制";
}
else
{
return ((double)value).ToString() + "人";
}
return ((double)value) + "人";
}
}
public class IntNumberToString2 : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if ((double)value == 0)
{
return "自动截图";
}
else
{
return ((double)value).ToString() + "条";
}
return ((double)value) + "条";
}
public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
if ((double)value == 0)
{
return "自动截图";
}
else
{
return ((double)value).ToString() + "条";
}
return ((double)value) + "条";
}
}
public class IsEnabledToOpacityConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
bool isChecked = (bool)value;
if (isChecked == true)
if (isChecked)
{
return 1d;
}
else
{
return 0.35;
}
return 0.35;
}
public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) { throw new NotImplementedException(); }
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { throw new NotImplementedException(); }
}
}
+2 -2
View File
@@ -26,14 +26,14 @@ namespace Ink_Canvas.Helpers {
}
}
} catch (Exception ex) {
LogHelper.WriteLogToFile("DelAutoSavedFiles | 处理文件时出错: " + ex.ToString(), LogHelper.LogType.Error);
LogHelper.WriteLogToFile("DelAutoSavedFiles | 处理文件时出错: " + ex, LogHelper.LogType.Error);
}
}
try { // 递归删除空文件夹
DeleteEmptyFolders(directoryPath);
} catch (Exception ex) {
LogHelper.WriteLogToFile("DelAutoSavedFiles | 处理文件时出错: " + ex.ToString(), LogHelper.LogType.Error);
LogHelper.WriteLogToFile("DelAutoSavedFiles | 处理文件时出错: " + ex, LogHelper.LogType.Error);
}
}
}
+37 -44
View File
@@ -1,11 +1,12 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Security.Cryptography;
using System.Text;
using System.Collections.Generic;
using System.Linq;
using Newtonsoft.Json;
using Microsoft.Win32;
using Newtonsoft.Json;
namespace Ink_Canvas.Helpers
{
@@ -35,7 +36,7 @@ namespace Ink_Canvas.Helpers
// 数据完整性验证密钥
private static readonly string DataIntegrityKey = "ICC_DEVICE_INTEGRITY_2024";
private static readonly string DeviceId = null;
private static readonly string DeviceId;
private static readonly object fileLock = new object();
static DeviceIdentifier()
@@ -132,7 +133,7 @@ namespace Ink_Canvas.Helpers
try
{
// 尝试加载System.Management程序集
var assembly = System.Reflection.Assembly.Load("System.Management");
var assembly = Assembly.Load("System.Management");
if (assembly != null)
{
// CPU信息
@@ -239,7 +240,7 @@ namespace Ink_Canvas.Helpers
{
hardwareInfo.Append(Environment.MachineName);
hardwareInfo.Append(Environment.UserName);
hardwareInfo.Append(Environment.OSVersion.ToString());
hardwareInfo.Append(Environment.OSVersion);
}
// 生成哈希
@@ -438,7 +439,7 @@ namespace Ink_Canvas.Helpers
key?.SetValue("DeviceId", deviceId);
key?.SetValue("LastUpdate", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
}
LogHelper.WriteLogToFile($"DeviceIdentifier | 设备ID已保存到注册表");
LogHelper.WriteLogToFile("DeviceIdentifier | 设备ID已保存到注册表");
}
catch (Exception ex)
{
@@ -675,7 +676,8 @@ namespace Ink_Canvas.Helpers
{
return $"{totalSeconds}秒";
}
else if (totalSeconds < 3600)
if (totalSeconds < 3600)
{
var minutes = totalSeconds / 60;
var seconds = totalSeconds % 60;
@@ -1015,13 +1017,13 @@ namespace Ink_Canvas.Helpers
}
}
LogHelper.WriteLogToFile($"DeviceIdentifier | 所有数据源都不可用,检查是否有部分可恢复数据", LogHelper.LogType.Warning);
LogHelper.WriteLogToFile("DeviceIdentifier | 所有数据源都不可用,检查是否有部分可恢复数据", LogHelper.LogType.Warning);
// 如果没有完全可信的数据,尝试从部分损坏的数据中恢复
var partiallyRecoveredData = AttemptPartialDataRecovery(allDataSources);
if (partiallyRecoveredData != null)
{
LogHelper.WriteLogToFile($"DeviceIdentifier | 从部分损坏数据中恢复使用统计");
LogHelper.WriteLogToFile("DeviceIdentifier | 从部分损坏数据中恢复使用统计");
// 执行数据迁移(如果需要)
partiallyRecoveredData.MigrateToSecondsPrecision();
@@ -1099,19 +1101,15 @@ namespace Ink_Canvas.Helpers
LogHelper.WriteLogToFile($"DeviceIdentifier | 数据完整性验证通过: {filePath}");
return stats;
}
else
{
LogHelper.WriteLogToFile($"DeviceIdentifier | 数据完整性验证失败,可能被篡改: {filePath}", LogHelper.LogType.Warning);
return null; // 数据被篡改,不使用
}
}
else
{
// 旧版本数据,没有哈希值,更新哈希后返回
LogHelper.WriteLogToFile($"DeviceIdentifier | 检测到旧版本数据,正在更新完整性哈希: {filePath}");
stats.UpdateDataHash();
return stats;
LogHelper.WriteLogToFile($"DeviceIdentifier | 数据完整性验证失败,可能被篡改: {filePath}", LogHelper.LogType.Warning);
return null; // 数据被篡改,不使用
}
// 旧版本数据,没有哈希值,更新哈希后返回
LogHelper.WriteLogToFile($"DeviceIdentifier | 检测到旧版本数据,正在更新完整性哈希: {filePath}");
stats.UpdateDataHash();
return stats;
}
}
}
@@ -1276,7 +1274,7 @@ namespace Ink_Canvas.Helpers
{
if (dataSources.Count == 0)
{
LogHelper.WriteLogToFile($"DeviceIdentifier | 没有可用数据源进行部分恢复");
LogHelper.WriteLogToFile("DeviceIdentifier | 没有可用数据源进行部分恢复");
return null;
}
@@ -1626,11 +1624,8 @@ namespace Ink_Canvas.Helpers
LogHelper.WriteLogToFile($"DeviceIdentifier | 从注册表位置恢复数据并验证完整性通过: {path}");
return stats;
}
else
{
LogHelper.WriteLogToFile($"DeviceIdentifier | 注册表位置数据完整性验证失败: {path}", LogHelper.LogType.Warning);
continue; // 尝试下一个位置
}
LogHelper.WriteLogToFile($"DeviceIdentifier | 注册表位置数据完整性验证失败: {path}", LogHelper.LogType.Warning);
}
else
{
@@ -1720,7 +1715,7 @@ namespace Ink_Canvas.Helpers
{
try
{
LogHelper.WriteLogToFile($"DeviceIdentifier | 开始保存使用统计到主注册表位置");
LogHelper.WriteLogToFile("DeviceIdentifier | 开始保存使用统计到主注册表位置");
using (var key = Registry.CurrentUser.CreateSubKey(@"Software\ICC\DeviceInfo"))
{
@@ -1760,7 +1755,7 @@ namespace Ink_Canvas.Helpers
}
else
{
LogHelper.WriteLogToFile($"DeviceIdentifier | 创建主注册表键失败", LogHelper.LogType.Error);
LogHelper.WriteLogToFile("DeviceIdentifier | 创建主注册表键失败", LogHelper.LogType.Error);
}
}
}
@@ -1876,7 +1871,7 @@ namespace Ink_Canvas.Helpers
{
lock (fileLock)
{
LogHelper.WriteLogToFile($"DeviceIdentifier | 开始使用频率数据保护检查");
LogHelper.WriteLogToFile("DeviceIdentifier | 开始使用频率数据保护检查");
var issues = new List<string>();
var repaired = new List<string>();
@@ -2323,7 +2318,7 @@ namespace Ink_Canvas.Helpers
{
lock (fileLock)
{
LogHelper.WriteLogToFile($"DeviceIdentifier | 开始数据完整性检查");
LogHelper.WriteLogToFile("DeviceIdentifier | 开始数据完整性检查");
var issues = new List<string>();
var repaired = new List<string>();
@@ -2549,7 +2544,7 @@ namespace Ink_Canvas.Helpers
{
lock (fileLock)
{
LogHelper.WriteLogToFile($"DeviceIdentifier | 开始强制重建使用频率数据备份");
LogHelper.WriteLogToFile("DeviceIdentifier | 开始强制重建使用频率数据备份");
var stats = LoadUsageStats();
if (stats == null)
@@ -2567,7 +2562,7 @@ namespace Ink_Canvas.Helpers
UsageFrequency = UsageFrequency.Medium
};
stats.UpdateDataHash();
LogHelper.WriteLogToFile($"DeviceIdentifier | 创建新的基础使用数据");
LogHelper.WriteLogToFile("DeviceIdentifier | 创建新的基础使用数据");
}
// 强制保存到所有位置
@@ -2608,7 +2603,7 @@ namespace Ink_Canvas.Helpers
{
lock (fileLock)
{
LogHelper.WriteLogToFile($"DeviceIdentifier | 开始强制完整数据保存");
LogHelper.WriteLogToFile("DeviceIdentifier | 开始强制完整数据保存");
// 保存设备ID到所有位置
SaveDeviceIdToAllLocations(DeviceId);
@@ -2624,14 +2619,12 @@ namespace Ink_Canvas.Helpers
var verificationResult = VerifyRegistryData();
LogHelper.WriteLogToFile($"DeviceIdentifier | 注册表数据验证结果: {verificationResult}");
LogHelper.WriteLogToFile($"DeviceIdentifier | 强制完整数据保存完成");
LogHelper.WriteLogToFile("DeviceIdentifier | 强制完整数据保存完成");
return true;
}
else
{
LogHelper.WriteLogToFile($"DeviceIdentifier | 强制完整数据保存失败: 无法加载使用统计", LogHelper.LogType.Error);
return false;
}
LogHelper.WriteLogToFile("DeviceIdentifier | 强制完整数据保存失败: 无法加载使用统计", LogHelper.LogType.Error);
return false;
}
}
catch (Exception ex)
@@ -2663,7 +2656,7 @@ namespace Ink_Canvas.Helpers
var totalMinutes = key.GetValue("TotalUsageMinutes");
var lastUpdate = key.GetValue("LastUpdate") as string;
results.AppendLine($"✓ 主注册表位置存在");
results.AppendLine("✓ 主注册表位置存在");
results.AppendLine($" 设备ID: {deviceId ?? ""}");
results.AppendLine($" 启动次数: {launchCount ?? ""}");
results.AppendLine($" 使用时长: {totalMinutes ?? ""}分钟");
@@ -2732,7 +2725,7 @@ namespace Ink_Canvas.Helpers
{
try
{
LogHelper.WriteLogToFile($"DeviceIdentifier | 开始保存并验证注册表数据");
LogHelper.WriteLogToFile("DeviceIdentifier | 开始保存并验证注册表数据");
// 强制保存数据
var saveSuccess = ForceCompleteDataSave();
@@ -2742,7 +2735,7 @@ namespace Ink_Canvas.Helpers
var result = $"保存操作: {(saveSuccess ? "" : "")}\n\n{verificationResult}";
LogHelper.WriteLogToFile($"DeviceIdentifier | 保存并验证注册表数据完成");
LogHelper.WriteLogToFile("DeviceIdentifier | 保存并验证注册表数据完成");
return result;
}
catch (Exception ex)
+9 -8
View File
@@ -1,6 +1,7 @@
using System;
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
namespace Ink_Canvas.Helpers
{
@@ -70,7 +71,7 @@ namespace Ink_Canvas.Helpers
[FieldOffset(8)]
private DateTime date;
[FieldOffset(8)]
private System.Runtime.InteropServices.ComTypes.FILETIME filetime;
private FILETIME filetime;
[FieldOffset(8)]
private Blob blobVal;
@@ -115,7 +116,7 @@ namespace Ink_Canvas.Helpers
case VarEnum.VT_BLOB:
return GetBlob();
}
throw new NotImplementedException("PropVariant " + ve.ToString());
throw new NotImplementedException("PropVariant " + ve);
}
}
}
@@ -144,17 +145,17 @@ namespace Ink_Canvas.Helpers
#region "Interfaces"
[ComImport(), Guid("886D8EEB-8CF2-4446-8D02-CDBA1DBDCF99"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
[ComImport, Guid("886D8EEB-8CF2-4446-8D02-CDBA1DBDCF99"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
public interface IPropertyStore
{
[MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
void GetCount([Out(), In()] ref uint cProps);
void GetCount([Out, In] ref uint cProps);
[MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
void GetAt([In()] uint iProp, ref PropertyKey pkey);
void GetAt([In] uint iProp, ref PropertyKey pkey);
[MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
void GetValue([In()] ref PropertyKey key, ref PropVariant pv);
void GetValue([In] ref PropertyKey key, ref PropVariant pv);
[MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
void SetValue([In()] ref PropertyKey key, [In()] ref PropVariant pv);
void SetValue([In] ref PropertyKey key, [In] ref PropVariant pv);
[MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
void Commit();
[MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+2 -1
View File
@@ -2,6 +2,7 @@
using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Text;
using System.Windows.Forms;
namespace Ink_Canvas.Helpers
{
@@ -94,7 +95,7 @@ namespace Ink_Canvas.Helpers
}
}
public static double GetTaskbarHeight(System.Windows.Forms.Screen screen, double dpiScaleY)
public static double GetTaskbarHeight(Screen screen, double dpiScaleY)
{
// 获取工作区和屏幕高度的差值
var workingArea = screen.WorkingArea;
+8 -8
View File
@@ -264,8 +264,8 @@ namespace Ink_Canvas.Helpers
/// </summary>
public int Width
{
get { return unchecked((int) (Right - Left)); }
set { Right = unchecked((int) (Left + value)); }
get { return unchecked(Right - Left); }
set { Right = unchecked(Left + value); }
}
/// <summary>
@@ -273,8 +273,8 @@ namespace Ink_Canvas.Helpers
/// </summary>
public int Height
{
get { return unchecked((int) (Bottom - Top)); }
set { Bottom = unchecked((int) (Top + value)); }
get { return unchecked(Bottom - Top); }
set { Bottom = unchecked(Top + value); }
}
public bool Equals(Rectangle other)
@@ -296,10 +296,10 @@ namespace Ink_Canvas.Helpers
{
unchecked
{
var hashCode = (int) Left;
hashCode = (hashCode * 397) ^ (int) Top;
hashCode = (hashCode * 397) ^ (int) Right;
hashCode = (hashCode * 397) ^ (int) Bottom;
var hashCode = Left;
hashCode = (hashCode * 397) ^ Top;
hashCode = (hashCode * 397) ^ Right;
hashCode = (hashCode * 397) ^ Bottom;
return hashCode;
}
}
+1 -4
View File
@@ -278,10 +278,7 @@ namespace Ink_Canvas.Helpers
window.Width = logicalSize.X;
window.Height = logicalSize.Y;
}
else
{
//这个hwnd是前面从Window来的,如果现在他不是Window...... 你信么
}
//这个hwnd是前面从Window来的,如果现在他不是Window...... 你信么
}
//将修改后的结构体拷贝回去
@@ -1,12 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
namespace Ink_Canvas.Helpers
@@ -19,7 +17,7 @@ namespace Ink_Canvas.Helpers
private readonly RenderTargetBitmap _renderTarget;
private readonly DrawingVisual _drawingVisual;
private readonly DrawingContext _drawingContext;
private bool _isInitialized = false;
private bool _isInitialized;
public HardwareAcceleratedInkProcessor(int width = 1920, int height = 1080)
{
+1 -1
View File
@@ -15,7 +15,7 @@ namespace Ink_Canvas.Helpers
var analyzer = new InkAnalyzer();
analyzer.AddStrokes(strokes);
analyzer.SetStrokesType(strokes, System.Windows.Ink.StrokeType.Drawing);
analyzer.SetStrokesType(strokes, StrokeType.Drawing);
AnalysisAlternate analysisAlternate = null;
int strokesCount = strokes.Count;
+5 -4
View File
@@ -3,6 +3,7 @@ using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Ink;
using System.Windows.Media;
using System.Windows.Threading;
namespace Ink_Canvas.Helpers
@@ -17,7 +18,7 @@ namespace Ink_Canvas.Helpers
private readonly InkSmoothingPerformanceMonitor _performanceMonitor;
private readonly InkSmoothingConfig _config;
private readonly Dispatcher _uiDispatcher;
private bool _disposed = false;
private bool _disposed;
public InkSmoothingManager(Dispatcher uiDispatcher)
{
@@ -81,7 +82,7 @@ namespace Ink_Canvas.Helpers
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine($"墨迹平滑失败: {ex.Message}");
Debug.WriteLine($"墨迹平滑失败: {ex.Message}");
result = originalStroke;
}
finally
@@ -122,7 +123,7 @@ namespace Ink_Canvas.Helpers
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine($"同步墨迹平滑失败: {ex.Message}");
Debug.WriteLine($"同步墨迹平滑失败: {ex.Message}");
result = originalStroke;
}
finally
@@ -174,7 +175,7 @@ namespace Ink_Canvas.Helpers
{
try
{
return System.Windows.Media.RenderCapability.Tier >= 0x00020000;
return RenderCapability.Tier >= 0x00020000;
}
catch
{
@@ -1,6 +1,9 @@
using System.Linq;
using System.Windows.Interop;
using System.Drawing;
using System.Linq;
using System.Windows;
using System.Windows.Forms;
using System.Windows.Interop;
using Point = System.Windows.Point;
namespace Ink_Canvas.Helpers {
internal class IsOutsideOfScreenHelper {
@@ -13,16 +16,16 @@ namespace Ink_Canvas.Helpers {
var hWnd = hwndSource.Handle;
var targetBounds = GetPixelBoundsToScreen(target);
var screens = System.Windows.Forms.Screen.AllScreens;
var screens = Screen.AllScreens;
return !screens.Any(x => x.Bounds.IntersectsWith(targetBounds));
System.Drawing.Rectangle GetPixelBoundsToScreen(FrameworkElement visual) {
Rectangle GetPixelBoundsToScreen(FrameworkElement visual) {
var pixelBoundsToScreen = Rect.Empty;
pixelBoundsToScreen.Union(visual.PointToScreen(new Point(0, 0)));
pixelBoundsToScreen.Union(visual.PointToScreen(new Point(visual.ActualWidth, 0)));
pixelBoundsToScreen.Union(visual.PointToScreen(new Point(0, visual.ActualHeight)));
pixelBoundsToScreen.Union(visual.PointToScreen(new Point(visual.ActualWidth, visual.ActualHeight)));
return new System.Drawing.Rectangle(
return new Rectangle(
(int)pixelBoundsToScreen.X, (int)pixelBoundsToScreen.Y,
(int)pixelBoundsToScreen.Width, (int)pixelBoundsToScreen.Height);
}
+1 -1
View File
@@ -14,7 +14,7 @@ namespace Ink_Canvas.Helpers
public static void NewLog(string str)
{
WriteLogToFile(str, LogType.Info);
WriteLogToFile(str);
}
public static void NewLog(Exception ex)
+1 -1
View File
@@ -32,7 +32,7 @@ namespace Ink_Canvas.Helpers
/// <summary>
/// 创建显示笔迹的类
/// </summary>
public StrokeVisual() : this(new DrawingAttributes()
public StrokeVisual() : this(new DrawingAttributes
{
Color = Colors.Red,
//FitToCurve = true,
@@ -36,7 +36,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
try
{
_plugin = plugin;
LogHelper.WriteLogToFile("开始创建启动台按钮", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("开始创建启动台按钮");
// 创建SimpleStackPanel
_panel = new SimpleStackPanel
@@ -49,7 +49,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
Background = Brushes.Transparent
};
LogHelper.WriteLogToFile("创建SimpleStackPanel完成", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("创建SimpleStackPanel完成");
// 添加图标
var image = CreateIconImage();
@@ -77,7 +77,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
// 设置工具提示
_panel.ToolTip = "启动台";
LogHelper.WriteLogToFile("启动台按钮创建完成", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("启动台按钮创建完成");
}
catch (Exception ex)
{
@@ -112,8 +112,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
// 保存配置
_plugin.SaveConfig();
LogHelper.WriteLogToFile($"通过右键菜单切换启动台按钮位置为: {_plugin.Config.ButtonPosition}",
LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"通过右键菜单切换启动台按钮位置为: {_plugin.Config.ButtonPosition}");
};
menu.Items.Add(positionMenuItem);
@@ -133,7 +132,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
if (method != null)
{
method.Invoke(mainWindow, null);
LogHelper.WriteLogToFile("已打开插件设置窗口", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("已打开插件设置窗口");
}
}
catch (Exception ex)
@@ -218,7 +217,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
{
// 提供反馈
_panel.Background = new SolidColorBrush(Color.FromArgb(40, 0, 0, 0));
LogHelper.WriteLogToFile("启动台按钮鼠标按下", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("启动台按钮鼠标按下");
}
catch (Exception ex)
{
@@ -241,7 +240,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
// 恢复背景
_panel.Background = Brushes.Transparent;
LogHelper.WriteLogToFile("启动台按钮鼠标抬起,准备显示启动台窗口", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("启动台按钮鼠标抬起,准备显示启动台窗口");
// 获取按钮在屏幕上的位置
Point buttonPosition = _panel.PointToScreen(new Point(_panel.ActualWidth / 2, 0));
@@ -1,12 +1,15 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Runtime.InteropServices;
using System.Windows;
using System.Windows.Interop;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using Microsoft.Win32;
using Newtonsoft.Json;
namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
{
@@ -75,13 +78,13 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
/// <summary>
/// 图标缓存
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[JsonIgnore]
private ImageSource _iconCache;
/// <summary>
/// 获取应用程序图标
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[JsonIgnore]
public ImageSource Icon
{
get
@@ -241,28 +244,28 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
}
// 检查文件是否存在
if (!System.IO.File.Exists(Path) && !Path.Contains(":\\"))
if (!File.Exists(Path) && !Path.Contains(":\\"))
{
// 可能是系统命令,如explorer.exe
System.Diagnostics.ProcessStartInfo psi = new System.Diagnostics.ProcessStartInfo
ProcessStartInfo psi = new ProcessStartInfo
{
FileName = Path,
UseShellExecute = true
};
System.Diagnostics.Process.Start(psi);
Process.Start(psi);
}
else
{
// 使用Process.Start启动应用程序
System.Diagnostics.ProcessStartInfo psi = new System.Diagnostics.ProcessStartInfo
ProcessStartInfo psi = new ProcessStartInfo
{
FileName = Path,
UseShellExecute = true
};
System.Diagnostics.Process.Start(psi);
Process.Start(psi);
}
LogHelper.WriteLogToFile($"已启动应用程序: {Path}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"已启动应用程序: {Path}");
}
catch (Exception ex)
{
@@ -315,15 +318,15 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
}
}
[System.Runtime.InteropServices.DllImport("Shell32.dll", EntryPoint = "ExtractIconEx")]
[DllImport("Shell32.dll", EntryPoint = "ExtractIconEx")]
private static extern int ExtractIconEx(
[System.Runtime.InteropServices.MarshalAs(System.Runtime.InteropServices.UnmanagedType.LPStr)] string lpszFile,
[MarshalAs(UnmanagedType.LPStr)] string lpszFile,
int nIconIndex,
out IntPtr phiconLarge,
out IntPtr phiconSmall,
int nIcons);
[System.Runtime.InteropServices.DllImport("User32.dll")]
[DllImport("User32.dll")]
private static extern int DestroyIcon(IntPtr hIcon);
}
}
@@ -1,9 +1,10 @@
using Microsoft.Win32;
using System;
using System.ComponentModel;
using System.IO;
using System.Windows;
using System.Windows.Controls;
using Ink_Canvas.Windows;
using Microsoft.Win32;
namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
{
@@ -77,7 +78,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
// 保存配置
_plugin.SaveConfig();
LogHelper.WriteLogToFile($"启动台按钮位置已更改为: {_plugin.Config.ButtonPosition}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"启动台按钮位置已更改为: {_plugin.Config.ButtonPosition}");
}
catch (Exception ex)
{
@@ -283,9 +284,9 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
pathTextBox.Text = dialog.FileName;
// 如果选择的是.exe文件,自动获取文件名填入名称字段
if (System.IO.Path.GetExtension(dialog.FileName).ToLower() == ".exe")
if (Path.GetExtension(dialog.FileName).ToLower() == ".exe")
{
string fileName = System.IO.Path.GetFileNameWithoutExtension(dialog.FileName);
string fileName = Path.GetFileNameWithoutExtension(dialog.FileName);
// 只有在名称字段为空或者是新建项目时才自动填入
if (string.IsNullOrWhiteSpace(nameTextBox.Text) || isNew)
{
@@ -1,10 +1,16 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Threading;
namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
{
@@ -21,7 +27,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
/// <summary>
/// 是否处于固定模式
/// </summary>
private bool _isFixMode = false;
private bool _isFixMode;
/// <summary>
/// 应用项按钮列表
@@ -51,11 +57,11 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
LoadLauncherItems();
// 添加鼠标按下事件(用于拖动窗口)
this.MouseDown += (s, e) =>
MouseDown += (s, e) =>
{
if (e.ChangedButton == MouseButton.Left && e.ButtonState == MouseButtonState.Pressed)
{
this.DragMove();
DragMove();
}
};
@@ -145,18 +151,18 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
string appPath = item.Path;
string appName = item.Name;
LogHelper.WriteLogToFile($"点击启动应用: {appName}, 路径: {appPath}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"点击启动应用: {appName}, 路径: {appPath}");
// 首先标记窗口正在关闭
IsClosing = true;
// 创建一个应用启动任务
var launchTask = new System.Threading.Tasks.Task(() =>
var launchTask = new Task(() =>
{
try
{
// 等待一段时间,确保窗口关闭流程已经开始
System.Threading.Thread.Sleep(200);
Thread.Sleep(200);
// 使用UI线程启动应用
Application.Current.Dispatcher.Invoke(() =>
@@ -164,18 +170,18 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
try
{
// 检查应用路径是否存在
if (System.IO.File.Exists(appPath) || !appPath.Contains(":\\"))
if (File.Exists(appPath) || !appPath.Contains(":\\"))
{
// 创建进程启动信息
var psi = new System.Diagnostics.ProcessStartInfo
var psi = new ProcessStartInfo
{
FileName = appPath,
UseShellExecute = true,
};
// 启动应用程序
var process = System.Diagnostics.Process.Start(psi);
LogHelper.WriteLogToFile($"应用程序 {appName} 已启动", LogHelper.LogType.Info);
var process = Process.Start(psi);
LogHelper.WriteLogToFile($"应用程序 {appName} 已启动");
}
else
{
@@ -205,7 +211,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
// 启动应用程序任务
launchTask.Start();
}), System.Windows.Threading.DispatcherPriority.Background);
}), DispatcherPriority.Background);
}
catch (Exception ex)
{
@@ -406,7 +412,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
{
LogHelper.WriteLogToFile($"延迟关闭窗口时出错: {ex.Message}", LogHelper.LogType.Error);
}
}), System.Windows.Threading.DispatcherPriority.Background);
}), DispatcherPriority.Background);
}
}
catch (Exception ex)
@@ -418,12 +424,12 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
/// <summary>
/// 窗口是否正在关闭
/// </summary>
private bool IsClosing { get; set; } = false;
private bool IsClosing { get; set; }
/// <summary>
/// 重写OnClosing方法,标记窗口正在关闭
/// </summary>
protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
protected override void OnClosing(CancelEventArgs e)
{
IsClosing = true;
base.OnClosing(e);
@@ -1,5 +1,3 @@
using Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -7,6 +5,8 @@ using System.IO;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher;
using Newtonsoft.Json;
namespace Ink_Canvas.Helpers.Plugins.BuiltIn
{
@@ -59,7 +59,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn
/// <summary>
/// 标记是否已添加到浮动栏
/// </summary>
private bool _isAddedToFloatingBar = false;
private bool _isAddedToFloatingBar;
#endregion
@@ -81,7 +81,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn
// 加载配置
LoadConfig();
LogHelper.WriteLogToFile("超级启动台插件已初始化", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("超级启动台插件已初始化");
}
catch (Exception ex)
{
@@ -100,7 +100,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn
if (_launcherButton == null)
{
_launcherButton = new LauncherButton(this);
LogHelper.WriteLogToFile("超级启动台按钮已创建", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("超级启动台按钮已创建");
}
// 添加启动台按钮到浮动栏
@@ -112,7 +112,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn
// 保存插件配置
SavePluginSettings();
LogHelper.WriteLogToFile("超级启动台插件已启用", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("超级启动台插件已启用");
}
catch (Exception ex)
{
@@ -143,7 +143,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn
// 保存插件配置
SavePluginSettings();
LogHelper.WriteLogToFile("超级启动台插件已禁用", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("超级启动台插件已禁用");
}
catch (Exception ex)
{
@@ -193,7 +193,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn
// 保存配置
SaveConfig();
LogHelper.WriteLogToFile($"超级启动台插件设置已保存", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("超级启动台插件设置已保存");
}
catch (Exception ex)
{
@@ -250,7 +250,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn
string json = JsonConvert.SerializeObject(Config, Formatting.Indented);
File.WriteAllText(_configPath, json);
LogHelper.WriteLogToFile("超级启动台配置已保存", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("超级启动台配置已保存");
}
catch (Exception ex)
{
@@ -332,12 +332,12 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn
if (Config.ButtonPosition == LauncherButtonPosition.Left)
{
floatingBar.Children.Insert(0, buttonElement);
LogHelper.WriteLogToFile("启动台按钮已添加到浮动栏左侧", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("启动台按钮已添加到浮动栏左侧");
}
else
{
floatingBar.Children.Add(buttonElement);
LogHelper.WriteLogToFile("启动台按钮已添加到浮动栏右侧", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("启动台按钮已添加到浮动栏右侧");
}
_isAddedToFloatingBar = true;
@@ -424,7 +424,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn
if (floatingBar.Children.Contains(buttonElement))
{
floatingBar.Children.Remove(buttonElement);
LogHelper.WriteLogToFile("启动台按钮已从浮动栏移除", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("启动台按钮已从浮动栏移除");
}
_isAddedToFloatingBar = false;
@@ -448,7 +448,7 @@ namespace Ink_Canvas.Helpers.Plugins.BuiltIn
{
RemoveLauncherButtonFromFloatingBar();
AddLauncherButtonToFloatingBar();
LogHelper.WriteLogToFile($"启动台按钮位置已更新为: {Config.ButtonPosition}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"启动台按钮位置已更新为: {Config.ButtonPosition}");
}
}
catch (Exception ex)
@@ -12,7 +12,7 @@ namespace Ink_Canvas.Helpers.Plugins
private readonly string _pluginPath;
private readonly string _pluginName;
private readonly Version _pluginVersion;
private bool _isInitialized = false;
private bool _isInitialized;
/// <summary>
/// 创建 ICCPP 插件适配器
@@ -104,7 +104,7 @@ namespace Ink_Canvas.Helpers.Plugins
// 这里可以添加 .iccpp 插件的初始化逻辑
// 例如,根据文件格式加载特定资源
LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已初始化", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已初始化");
_isInitialized = true;
}
catch (Exception ex)
@@ -126,7 +126,7 @@ namespace Ink_Canvas.Helpers.Plugins
// 例如,加载动态库、注册事件等
base.Enable(); // 设置启用状态并触发事件
LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已启用", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已启用");
}
catch (Exception ex)
{
@@ -147,7 +147,7 @@ namespace Ink_Canvas.Helpers.Plugins
// 例如,卸载动态库、注销事件等
base.Disable(); // 设置禁用状态并触发事件
LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已禁用", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已禁用");
}
catch (Exception ex)
{
@@ -165,7 +165,7 @@ namespace Ink_Canvas.Helpers.Plugins
// 这里可以添加 .iccpp 插件的清理逻辑
// 例如,释放资源等
LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已清理资源", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已清理资源");
}
catch (Exception ex)
{
+6 -6
View File
@@ -11,7 +11,7 @@ namespace Ink_Canvas.Helpers.Plugins
/// <summary>
/// 插件状态(私有字段)
/// </summary>
private bool _isEnabled = false;
private bool _isEnabled;
/// <summary>
/// 插件状态(公共属性)
@@ -80,7 +80,7 @@ namespace Ink_Canvas.Helpers.Plugins
try
{
string name = Name;
LogHelper.WriteLogToFile($"初始化插件: ID={Id}, 名称={name ?? ""}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"初始化插件: ID={Id}, 名称={name ?? ""}");
if (string.IsNullOrEmpty(name))
{
@@ -92,7 +92,7 @@ namespace Ink_Canvas.Helpers.Plugins
LogHelper.WriteLogToFile($"获取插件名称时出错: {ex.Message}", LogHelper.LogType.Error);
}
LogHelper.WriteLogToFile($"插件 {Name} 已初始化", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {Name} 已初始化");
}
/// <summary>
@@ -103,7 +103,7 @@ namespace Ink_Canvas.Helpers.Plugins
if (!IsEnabled)
{
IsEnabled = true;
LogHelper.WriteLogToFile($"插件 {Name} 已启用", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {Name} 已启用");
}
}
@@ -115,7 +115,7 @@ namespace Ink_Canvas.Helpers.Plugins
if (IsEnabled)
{
IsEnabled = false;
LogHelper.WriteLogToFile($"插件 {Name} 已禁用", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {Name} 已禁用");
}
}
@@ -134,7 +134,7 @@ namespace Ink_Canvas.Helpers.Plugins
/// </summary>
public virtual void Cleanup()
{
LogHelper.WriteLogToFile($"插件 {Name} 已卸载", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {Name} 已卸载");
}
/// <summary>
+69 -69
View File
@@ -8,6 +8,9 @@ using System.Security.Cryptography;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using Ink_Canvas.Windows;
using Newtonsoft.Json;
using Timer = System.Timers.Timer;
namespace Ink_Canvas.Helpers.Plugins
{
@@ -51,12 +54,12 @@ namespace Ink_Canvas.Helpers.Plugins
/// <summary>
/// 配置是否已更改但未保存
/// </summary>
private bool _configDirty = false;
private bool _configDirty;
/// <summary>
/// 配置自动保存计时器
/// </summary>
private System.Timers.Timer _autoSaveTimer;
private Timer _autoSaveTimer;
/// <summary>
/// 加载的程序集缓存
@@ -80,7 +83,7 @@ namespace Ink_Canvas.Helpers.Plugins
LoadConfig();
// 初始化自动保存计时器(3秒)
_autoSaveTimer = new System.Timers.Timer(3000);
_autoSaveTimer = new Timer(3000);
_autoSaveTimer.Elapsed += (s, e) =>
{
if (_configDirty)
@@ -108,22 +111,22 @@ namespace Ink_Canvas.Helpers.Plugins
{
try
{
LogHelper.WriteLogToFile("开始初始化插件系统", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("开始初始化插件系统");
// 加载配置
LoadConfig();
LogHelper.WriteLogToFile($"已从配置文件加载 {PluginStates.Count} 个插件状态记录", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"已从配置文件加载 {PluginStates.Count} 个插件状态记录");
// 加载内置插件
LogHelper.WriteLogToFile("正在加载内置插件...", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("正在加载内置插件...");
LoadBuiltInPlugins();
// 加载外部插件
LogHelper.WriteLogToFile("正在加载外部插件...", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("正在加载外部插件...");
LoadExternalPlugins();
// 启用已配置为启用的插件
LogHelper.WriteLogToFile("正在应用配置的插件状态...", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("正在应用配置的插件状态...");
EnableConfiguredPlugins();
// 设置定期检查热重载
@@ -132,7 +135,7 @@ namespace Ink_Canvas.Helpers.Plugins
// 保存初始化后的配置(可能有新插件)
SaveConfig();
LogHelper.WriteLogToFile($"插件系统初始化完成,共加载 {Plugins.Count} 个插件", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件系统初始化完成,共加载 {Plugins.Count} 个插件");
}
catch (Exception ex)
{
@@ -166,7 +169,7 @@ namespace Ink_Canvas.Helpers.Plugins
{
plugin.Initialize();
Plugins.Add(plugin);
LogHelper.WriteLogToFile($"已加载内置插件: {plugin.Name} v{plugin.Version}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"已加载内置插件: {plugin.Name} v{plugin.Version}");
}
}
catch (Exception ex)
@@ -200,7 +203,7 @@ namespace Ink_Canvas.Helpers.Plugins
.Concat(Directory.GetFiles(PluginsDirectory, "*.dll", SearchOption.TopDirectoryOnly))
.ToArray();
LogHelper.WriteLogToFile($"发现 {pluginFiles.Length} 个外部插件文件", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"发现 {pluginFiles.Length} 个外部插件文件");
foreach (var pluginFile in pluginFiles)
{
@@ -258,8 +261,7 @@ namespace Ink_Canvas.Helpers.Plugins
plugin.Initialize();
Plugins.Add(plugin);
LogHelper.WriteLogToFile($"已加载外部插件: {plugin.Name} v{plugin.Version} 来自 {Path.GetFileName(pluginPath)}",
LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"已加载外部插件: {plugin.Name} v{plugin.Version} 来自 {Path.GetFileName(pluginPath)}");
return plugin;
}
@@ -297,8 +299,7 @@ namespace Ink_Canvas.Helpers.Plugins
// 添加到插件列表
Plugins.Add(pluginAdapter);
LogHelper.WriteLogToFile($"已创建 ICCPP 插件适配器: {pluginAdapter.Name} 来自 {Path.GetFileName(pluginPath)}",
LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"已创建 ICCPP 插件适配器: {pluginAdapter.Name} 来自 {Path.GetFileName(pluginPath)}");
return pluginAdapter;
}
@@ -371,13 +372,13 @@ namespace Ink_Canvas.Helpers.Plugins
{
plugin.Enable();
enabledCount++;
LogHelper.WriteLogToFile($"根据配置启用插件: {plugin.Name}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"根据配置启用插件: {plugin.Name}");
}
else
{
plugin.Disable();
disabledCount++;
LogHelper.WriteLogToFile($"根据配置禁用插件: {plugin.Name}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"根据配置禁用插件: {plugin.Name}");
}
}
else
@@ -406,7 +407,7 @@ namespace Ink_Canvas.Helpers.Plugins
{
plugin.Disable();
disabledCount++;
LogHelper.WriteLogToFile($"插件不在配置中,默认禁用: {plugin.Name}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件不在配置中,默认禁用: {plugin.Name}");
}
}
}
@@ -423,7 +424,7 @@ namespace Ink_Canvas.Helpers.Plugins
TriggerAutoSave();
}
LogHelper.WriteLogToFile($"已应用插件配置: 启用 {enabledCount} 个,禁用 {disabledCount} 个,错误 {errorCount} 个", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"已应用插件配置: 启用 {enabledCount} 个,禁用 {disabledCount} 个,错误 {errorCount} 个");
}
/// <summary>
@@ -443,11 +444,11 @@ namespace Ink_Canvas.Helpers.Plugins
PluginStates[pluginTypeName] = isEnabled;
_configDirty = true;
LogHelper.WriteLogToFile($"插件状态变更: {plugin.Name} = {(isEnabled ? "" : "")}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件状态变更: {plugin.Name} = {(isEnabled ? "" : "")}");
// 立即同步保存配置(不再使用延迟自动保存)
SaveConfig();
LogHelper.WriteLogToFile($"插件 {plugin.Name} 状态已立即保存到配置文件", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {plugin.Name} 状态已立即保存到配置文件");
}
}
}
@@ -534,14 +535,14 @@ namespace Ink_Canvas.Helpers.Plugins
return;
}
LogHelper.WriteLogToFile($"开始热重载插件: {plugin.Name} ({Path.GetFileName(pluginPath)})", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"开始热重载插件: {plugin.Name} ({Path.GetFileName(pluginPath)})");
// 保存插件的当前状态
bool wasEnabled = plugin.IsEnabled;
string pluginTypeName = plugin.GetType().FullName;
// 卸载插件
UnloadPlugin(plugin, false);
UnloadPlugin(plugin);
// 从加载缓存中移除
if (_loadedAssemblies.ContainsKey(pluginPath))
@@ -575,7 +576,7 @@ namespace Ink_Canvas.Helpers.Plugins
SaveConfig();
}
LogHelper.WriteLogToFile($"插件 {newPlugin.Name} v{newPlugin.Version} 热重载成功", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {newPlugin.Name} v{newPlugin.Version} 热重载成功");
// 通知UI刷新
NotifyUIRefresh();
@@ -626,7 +627,7 @@ namespace Ink_Canvas.Helpers.Plugins
}
}
LogHelper.WriteLogToFile($"已卸载插件: {pluginName}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"已卸载插件: {pluginName}");
}
catch (Exception ex)
{
@@ -677,7 +678,7 @@ namespace Ink_Canvas.Helpers.Plugins
// 保存配置
SaveConfig();
LogHelper.WriteLogToFile($"已删除插件: {pluginName}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"已删除插件: {pluginName}");
return true;
}
catch (Exception ex)
@@ -701,7 +702,7 @@ namespace Ink_Canvas.Helpers.Plugins
if (currentState == enable)
{
// 已经是目标状态,无需操作
LogHelper.WriteLogToFile($"插件 {plugin.Name} 已经是 {(enable ? "" : "")} 状态,无需切换", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {plugin.Name} 已经是 {(enable ? "" : "")} 状态,无需切换");
return;
}
@@ -709,7 +710,7 @@ namespace Ink_Canvas.Helpers.Plugins
string pluginName = plugin.Name;
string pluginTypeName = plugin.GetType().FullName;
LogHelper.WriteLogToFile($"开始切换插件 {pluginName} 状态为: {(enable ? "" : "")}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"开始切换插件 {pluginName} 状态为: {(enable ? "" : "")}");
// 首先更新配置状态
PluginStates[pluginTypeName] = enable;
@@ -731,13 +732,13 @@ namespace Ink_Canvas.Helpers.Plugins
if (enable)
{
plugin.Enable();
LogHelper.WriteLogToFile($"插件 {pluginName} 已启用", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {pluginName} 已启用");
}
else
{
// 禁用前先记录是否为内置插件
bool isBuiltIn = plugin.IsBuiltIn;
LogHelper.WriteLogToFile($"尝试禁用{(isBuiltIn ? "" : "")}插件 {pluginName}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"尝试禁用{(isBuiltIn ? "" : "")}插件 {pluginName}");
// 禁用插件
plugin.Disable();
@@ -762,13 +763,13 @@ namespace Ink_Canvas.Helpers.Plugins
if (enabledProperty != null)
{
enabledProperty.SetValue(pb4, false);
LogHelper.WriteLogToFile($"已通过反射强制设置插件 {pluginName} 为禁用状态", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"已通过反射强制设置插件 {pluginName} 为禁用状态");
}
}
}
}
LogHelper.WriteLogToFile($"插件 {pluginName} 已禁用", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {pluginName} 已禁用");
}
}
catch (Exception ex)
@@ -785,7 +786,7 @@ namespace Ink_Canvas.Helpers.Plugins
// 对于内置插件,执行专门的处理
if (pluginInstance.IsBuiltIn)
{
LogHelper.WriteLogToFile($"处理内置插件 {pluginName} 状态变更", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"处理内置插件 {pluginName} 状态变更");
// 对于内置插件,我们需要确保状态正确应用
bool finalState = pluginInstance.IsEnabled;
@@ -811,7 +812,7 @@ namespace Ink_Canvas.Helpers.Plugins
if (enabledProperty != null)
{
enabledProperty.SetValue(pluginInstance, expectedState);
LogHelper.WriteLogToFile($"已通过反射强制设置内置插件 {pluginName} 状态为 {(expectedState ? "" : "")}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"已通过反射强制设置内置插件 {pluginName} 状态为 {(expectedState ? "" : "")}");
}
}
}
@@ -827,7 +828,7 @@ namespace Ink_Canvas.Helpers.Plugins
{
if (!string.IsNullOrEmpty(pluginInstance.PluginPath) && File.Exists(pluginInstance.PluginPath))
{
LogHelper.WriteLogToFile($"开始重载外部插件 {pluginName}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"开始重载外部插件 {pluginName}");
// 使用调度器确保在UI线程执行热重载
if (Application.Current != null && Application.Current.Dispatcher != null)
@@ -835,14 +836,14 @@ namespace Ink_Canvas.Helpers.Plugins
Application.Current.Dispatcher.BeginInvoke(new Action(() =>
{
ReloadPlugin(pluginInstance);
LogHelper.WriteLogToFile($"插件 {pluginName} 已重载以应用{(enable ? "" : "")}状态", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {pluginName} 已重载以应用{(enable ? "" : "")}状态");
}));
}
else
{
// 当前不在UI线程,直接重载
ReloadPlugin(pluginInstance);
LogHelper.WriteLogToFile($"插件 {pluginName} 已重载以应用{(enable ? "" : "")}状态", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {pluginName} 已重载以应用{(enable ? "" : "")}状态");
}
}
else
@@ -865,7 +866,7 @@ namespace Ink_Canvas.Helpers.Plugins
NotifyUIRefresh();
}
LogHelper.WriteLogToFile($"插件 {pluginName} 状态切换完成", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {pluginName} 状态切换完成");
}
catch (Exception ex)
{
@@ -889,12 +890,12 @@ namespace Ink_Canvas.Helpers.Plugins
if (enable)
{
plugin.Enable();
LogHelper.WriteLogToFile($"实时应用: 已启用插件 {plugin.Name}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"实时应用: 已启用插件 {plugin.Name}");
}
else
{
plugin.Disable();
LogHelper.WriteLogToFile($"实时应用: 已禁用插件 {plugin.Name}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"实时应用: 已禁用插件 {plugin.Name}");
}
// 同步状态到插件自身的配置
@@ -904,7 +905,7 @@ namespace Ink_Canvas.Helpers.Plugins
{
// 保存插件设置(与启用状态无关)
pluginSettings.SavePluginSettings();
LogHelper.WriteLogToFile($"实时应用: 已保存插件 {plugin.Name} 设置", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"实时应用: 已保存插件 {plugin.Name} 设置");
}
catch (Exception ex)
{
@@ -940,7 +941,7 @@ namespace Ink_Canvas.Helpers.Plugins
// 执行热重载
ReloadPlugin(externalPlugin);
LogHelper.WriteLogToFile($"插件 {plugin.Name} 已成功热重载以应用实时状态", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {plugin.Name} 已成功热重载以应用实时状态");
}
catch (Exception ex)
{
@@ -964,7 +965,7 @@ namespace Ink_Canvas.Helpers.Plugins
}
}
LogHelper.WriteLogToFile($"插件 {plugin.Name} 实时状态已应用: {(enable ? "" : "")}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {plugin.Name} 实时状态已应用: {(enable ? "" : "")}");
}
catch (Exception ex)
{
@@ -986,7 +987,7 @@ namespace Ink_Canvas.Helpers.Plugins
// 通知任何可能打开的插件设置窗口刷新
foreach (Window window in Application.Current.Windows)
{
if (window is Windows.PluginSettingsWindow pluginWindow)
if (window is PluginSettingsWindow pluginWindow)
{
pluginWindow.RefreshPluginList();
break;
@@ -1009,7 +1010,7 @@ namespace Ink_Canvas.Helpers.Plugins
const int maxRetries = 3; // 最大重试次数
const int retryDelayMs = 300; // 重试延迟时间(毫秒)
LogHelper.WriteLogToFile($"开始从配置文件加载插件状态: {PluginConfigFile}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"开始从配置文件加载插件状态: {PluginConfigFile}");
// 确保至少有一个默认配置
Dictionary<string, bool> defaultConfig = new Dictionary<string, bool>();
@@ -1033,14 +1034,13 @@ namespace Ink_Canvas.Helpers.Plugins
json = reader.ReadToEnd();
}
var loadedStates = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, bool>>(json);
var loadedStates = JsonConvert.DeserializeObject<Dictionary<string, bool>>(json);
if (loadedStates != null && loadedStates.Count > 0)
{
PluginStates = loadedStates;
_configDirty = false; // 重置脏标记
LogHelper.WriteLogToFile($"成功从配置文件加载了 {PluginStates.Count} 个插件状态", LogHelper.LogType.Info);
return; // 成功加载,提前退出
LogHelper.WriteLogToFile($"成功从配置文件加载了 {PluginStates.Count} 个插件状态");
}
else
{
@@ -1051,13 +1051,13 @@ namespace Ink_Canvas.Helpers.Plugins
try
{
string backupJson = File.ReadAllText(PluginConfigBackupFile);
var backupStates = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, bool>>(backupJson);
var backupStates = JsonConvert.DeserializeObject<Dictionary<string, bool>>(backupJson);
if (backupStates != null && backupStates.Count > 0)
{
PluginStates = backupStates;
_configDirty = true; // 从备份加载,需要重新保存主配置
LogHelper.WriteLogToFile($"已从备份恢复 {PluginStates.Count} 个插件状态", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"已从备份恢复 {PluginStates.Count} 个插件状态");
return; // 成功从备份加载,提前退出
}
}
@@ -1082,13 +1082,13 @@ namespace Ink_Canvas.Helpers.Plugins
try
{
string backupJson = File.ReadAllText(PluginConfigBackupFile);
var backupStates = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, bool>>(backupJson);
var backupStates = JsonConvert.DeserializeObject<Dictionary<string, bool>>(backupJson);
if (backupStates != null && backupStates.Count > 0)
{
PluginStates = backupStates;
_configDirty = true; // 从备份加载,需要重新保存主配置
LogHelper.WriteLogToFile($"已从备份恢复 {PluginStates.Count} 个插件状态", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"已从备份恢复 {PluginStates.Count} 个插件状态");
return; // 成功从备份加载,提前退出
}
}
@@ -1111,7 +1111,7 @@ namespace Ink_Canvas.Helpers.Plugins
if (attempt < maxRetries)
{
LogHelper.WriteLogToFile($"加载配置失败 (尝试 {attempt}/{maxRetries}): {ex.Message},将在 {retryDelayMs}ms 后重试", LogHelper.LogType.Warning);
System.Threading.Thread.Sleep(retryDelayMs);
Thread.Sleep(retryDelayMs);
}
else
{
@@ -1178,10 +1178,10 @@ namespace Ink_Canvas.Helpers.Plugins
try
{
LogHelper.WriteLogToFile($"开始保存插件配置到: {PluginConfigFile}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"开始保存插件配置到: {PluginConfigFile}");
// 生成JSON数据
string json = Newtonsoft.Json.JsonConvert.SerializeObject(PluginStates, Newtonsoft.Json.Formatting.Indented);
string json = JsonConvert.SerializeObject(PluginStates, Formatting.Indented);
string tempFile = PluginConfigFile + ".temp"; // 临时文件路径
// 确保目录存在
@@ -1189,7 +1189,7 @@ namespace Ink_Canvas.Helpers.Plugins
if (!Directory.Exists(configDir))
{
Directory.CreateDirectory(configDir);
LogHelper.WriteLogToFile($"创建配置目录: {configDir}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"创建配置目录: {configDir}");
}
// 先备份当前配置
@@ -1217,7 +1217,7 @@ namespace Ink_Canvas.Helpers.Plugins
{
// 重置脏标记
_configDirty = false;
LogHelper.WriteLogToFile($"插件配置已成功保存到磁盘: {PluginConfigFile}, 共 {PluginStates.Count} 个插件状态", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件配置已成功保存到磁盘: {PluginConfigFile}, 共 {PluginStates.Count} 个插件状态");
return;
}
}
@@ -1226,7 +1226,7 @@ namespace Ink_Canvas.Helpers.Plugins
if (attempt < maxRetries)
{
LogHelper.WriteLogToFile($"保存配置失败 (尝试 {attempt}/{maxRetries}): {ex.Message},将在 {retryDelayMs}ms 后重试", LogHelper.LogType.Warning);
System.Threading.Thread.Sleep(retryDelayMs);
Thread.Sleep(retryDelayMs);
}
else
{
@@ -1255,7 +1255,7 @@ namespace Ink_Canvas.Helpers.Plugins
// 重置脏标记
_configDirty = false;
LogHelper.WriteLogToFile($"使用临时文件方式成功保存配置: {PluginConfigFile}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"使用临时文件方式成功保存配置: {PluginConfigFile}");
return;
}
catch (Exception fallbackEx)
@@ -1302,7 +1302,7 @@ namespace Ink_Canvas.Helpers.Plugins
{
try
{
LogHelper.WriteLogToFile("开始从配置文件重新加载插件状态", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("开始从配置文件重新加载插件状态");
// 保存当前配置状态,以便在加载失败时回滚
Dictionary<string, bool> previousStates = new Dictionary<string, bool>(PluginStates);
@@ -1318,7 +1318,7 @@ namespace Ink_Canvas.Helpers.Plugins
return;
}
LogHelper.WriteLogToFile($"已加载 {PluginStates.Count} 个插件状态,开始应用...", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"已加载 {PluginStates.Count} 个插件状态,开始应用...");
// 对比配置,查找变更的插件
foreach (var plugin in Plugins.ToList()) // 创建副本进行遍历,避免集合修改异常
@@ -1333,7 +1333,7 @@ namespace Ink_Canvas.Helpers.Plugins
// 如果状态需要变更
if (currentlyEnabled != shouldBeEnabled)
{
LogHelper.WriteLogToFile($"应用插件 {plugin.Name} 的配置状态: {(shouldBeEnabled ? "" : "")}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"应用插件 {plugin.Name} 的配置状态: {(shouldBeEnabled ? "" : "")}");
if (shouldBeEnabled)
{
@@ -1352,7 +1352,7 @@ namespace Ink_Canvas.Helpers.Plugins
{
// 记录禁用信息,特别是内置插件
bool isBuiltIn = plugin.IsBuiltIn;
LogHelper.WriteLogToFile($"尝试禁用{(isBuiltIn ? "" : "")}插件 {plugin.Name}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"尝试禁用{(isBuiltIn ? "" : "")}插件 {plugin.Name}");
// 禁用插件
plugin.Disable();
@@ -1368,7 +1368,7 @@ namespace Ink_Canvas.Helpers.Plugins
if (enabledProperty != null)
{
enabledProperty.SetValue(builtInPluginBase, false);
LogHelper.WriteLogToFile($"已通过反射强制禁用内置插件 {plugin.Name}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"已通过反射强制禁用内置插件 {plugin.Name}");
}
}
}
@@ -1397,7 +1397,7 @@ namespace Ink_Canvas.Helpers.Plugins
{
// 插件不在配置中,将其添加为禁用状态
PluginStates[pluginTypeName] = false;
LogHelper.WriteLogToFile($"插件 {plugin.Name} 不在配置中,默认设置为禁用状态", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {plugin.Name} 不在配置中,默认设置为禁用状态");
// 如果当前是启用状态,则禁用它
if (plugin is PluginBase pluginBase && pluginBase.IsEnabled)
@@ -1405,7 +1405,7 @@ namespace Ink_Canvas.Helpers.Plugins
try
{
bool isBuiltIn = plugin.IsBuiltIn;
LogHelper.WriteLogToFile($"尝试禁用未配置的{(isBuiltIn ? "" : "")}插件 {plugin.Name}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"尝试禁用未配置的{(isBuiltIn ? "" : "")}插件 {plugin.Name}");
plugin.Disable();
@@ -1418,7 +1418,7 @@ namespace Ink_Canvas.Helpers.Plugins
if (enabledProperty != null)
{
enabledProperty.SetValue(pluginBase, false);
LogHelper.WriteLogToFile($"已通过反射强制禁用未配置的内置插件 {plugin.Name}", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"已通过反射强制禁用未配置的内置插件 {plugin.Name}");
}
}
}
@@ -1440,7 +1440,7 @@ namespace Ink_Canvas.Helpers.Plugins
// 通知任何可能打开的插件设置窗口刷新
foreach (Window window in Application.Current.Windows)
{
if (window is Windows.PluginSettingsWindow pluginWindow)
if (window is PluginSettingsWindow pluginWindow)
{
pluginWindow.RefreshPluginList();
}
@@ -1448,7 +1448,7 @@ namespace Ink_Canvas.Helpers.Plugins
});
}
LogHelper.WriteLogToFile("插件状态已从配置文件重新加载完成", LogHelper.LogType.Info);
LogHelper.WriteLogToFile("插件状态已从配置文件重新加载完成");
}
catch (Exception ex)
{
+5 -5
View File
@@ -53,7 +53,7 @@ namespace Ink_Canvas.Helpers.Plugins
// TODO: 在这里进行插件初始化工作
// 示例:记录初始化信息
LogHelper.WriteLogToFile($"插件 {Name} 开始初始化", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {Name} 开始初始化");
// 示例:加载配置
LoadConfig();
@@ -61,7 +61,7 @@ namespace Ink_Canvas.Helpers.Plugins
// 示例:注册自定义事件
// MainWindow.Instance.SomeEvent += OnSomeEvent;
LogHelper.WriteLogToFile($"插件 {Name} 初始化完成", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {Name} 初始化完成");
}
/// <summary>
@@ -75,7 +75,7 @@ namespace Ink_Canvas.Helpers.Plugins
// TODO: 在这里启用插件功能
LogHelper.WriteLogToFile($"插件 {Name} 已启用", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {Name} 已启用");
}
/// <summary>
@@ -89,7 +89,7 @@ namespace Ink_Canvas.Helpers.Plugins
// TODO: 在这里禁用插件功能
LogHelper.WriteLogToFile($"插件 {Name} 已禁用", LogHelper.LogType.Info);
LogHelper.WriteLogToFile($"插件 {Name} 已禁用");
}
/// <summary>
@@ -270,7 +270,7 @@ namespace Ink_Canvas.Helpers.Plugins
panel.Children.Add(button);
// 设置控件内容
this.Content = panel;
Content = panel;
}
}
}
+6 -8
View File
@@ -1,7 +1,8 @@
using Microsoft.Win32;
using System;
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using Microsoft.Win32;
namespace Ink_Canvas.Helpers
{
@@ -27,10 +28,7 @@ namespace Ink_Canvas.Helpers
//MessageBox.Show("启动失败: " + ex.Message);
}
}
else
{
//Console.WriteLine(softwareName + " 未找到可执行文件路径。");
}
//Console.WriteLine(softwareName + " 未找到可执行文件路径。");
}
private static string FindEasiCameraExecutablePath(string softwareName)
@@ -51,7 +49,7 @@ namespace Ink_Canvas.Helpers
{
if (!string.IsNullOrEmpty(installLocation))
{
executablePath = System.IO.Path.Combine(installLocation, "sweclauncher.exe");
executablePath = Path.Combine(installLocation, "sweclauncher.exe");
}
else if (!string.IsNullOrEmpty(uninstallString))
{
@@ -59,7 +57,7 @@ namespace Ink_Canvas.Helpers
if (lastSlashIndex >= 0)
{
string folderPath = uninstallString.Substring(0, lastSlashIndex);
executablePath = System.IO.Path.Combine(folderPath, "sweclauncher", "sweclauncher.exe");
executablePath = Path.Combine(folderPath, "sweclauncher", "sweclauncher.exe");
}
}
break;
+4 -2
View File
@@ -1,8 +1,10 @@
using System;
using System.Collections.Generic;
using System.Windows;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows; // Added for UIElement
// Added for UIElement
namespace Ink_Canvas.Helpers
{
@@ -133,7 +135,7 @@ namespace Ink_Canvas.Helpers
public class TimeMachineHistory
{
public TimeMachineHistoryType CommitType;
public bool StrokeHasBeenCleared = false;
public bool StrokeHasBeenCleared;
public StrokeCollection CurrentStroke;
public StrokeCollection ReplacedStroke;
//这里说一下 Tuple的 Value1 是初始值 ; Value 2 是改变值