From 2fe482b802e9292628fc8a7b94bb1796cfa8069d Mon Sep 17 00:00:00 2001 From: PrefacedCorg <1876568293@qq.com> Date: Sun, 31 Aug 2025 01:47:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A9=E8=AD=A6=E5=91=8A=E6=B2=A1=E9=82=A3?= =?UTF-8?q?=E4=B9=88=E5=A4=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 应该不会出问题的吧 --- Ink Canvas/Helpers/DeviceIdentifier.cs | 56 +++++++++---------- Ink Canvas/Helpers/InkFadeManager.cs | 6 +- Ink Canvas/MainWindow.xaml.cs | 4 +- .../Windows/HotkeySettingsWindow.xaml.cs | 2 +- 4 files changed, 32 insertions(+), 36 deletions(-) diff --git a/Ink Canvas/Helpers/DeviceIdentifier.cs b/Ink Canvas/Helpers/DeviceIdentifier.cs index 82bc3897..04736514 100644 --- a/Ink Canvas/Helpers/DeviceIdentifier.cs +++ b/Ink Canvas/Helpers/DeviceIdentifier.cs @@ -404,28 +404,28 @@ namespace Ink_Canvas.Helpers try { // 如果新字段为空但旧字段有数据，进行迁移 - if (TotalUsageSeconds == 0 && TotalUsageMinutes > 0) + if (TotalUsageSeconds == 0 && TotalUsageSeconds > 0) { - TotalUsageSeconds = TotalUsageMinutes * 60; - LogHelper.WriteLogToFile($"DeviceIdentifier | 迁移总使用时长: {TotalUsageMinutes}分钟 -> {TotalUsageSeconds}秒"); + TotalUsageSeconds = TotalUsageSeconds * 60; + LogHelper.WriteLogToFile($"DeviceIdentifier | 迁移总使用时长: {TotalUsageSeconds}分钟 -> {TotalUsageSeconds}秒"); } - if (AverageSessionSeconds == 0 && AverageSessionMinutes > 0) + if (AverageSessionSeconds == 0 && AverageSessionSeconds > 0) { - AverageSessionSeconds = AverageSessionMinutes * 60; - LogHelper.WriteLogToFile($"DeviceIdentifier | 迁移平均会话时长: {AverageSessionMinutes}分钟 -> {AverageSessionSeconds}秒"); + AverageSessionSeconds = AverageSessionSeconds * 60; + LogHelper.WriteLogToFile($"DeviceIdentifier | 迁移平均会话时长: {AverageSessionSeconds}分钟 -> {AverageSessionSeconds}秒"); } - if (WeeklyUsageSeconds == 0 && WeeklyUsageMinutes > 0) + if (WeeklyUsageSeconds == 0 && WeeklyUsageSeconds > 0) { - WeeklyUsageSeconds = WeeklyUsageMinutes * 60; - LogHelper.WriteLogToFile($"DeviceIdentifier | 迁移每周使用时长: {WeeklyUsageMinutes}分钟 -> {WeeklyUsageSeconds}秒"); + WeeklyUsageSeconds = WeeklyUsageSeconds * 60; + LogHelper.WriteLogToFile($"DeviceIdentifier | 迁移每周使用时长: {WeeklyUsageSeconds}分钟 -> {WeeklyUsageSeconds}秒"); } - if (LastWeekUsageSeconds == 0 && LastWeekUsageMinutes > 0) + if (LastWeekUsageSeconds == 0 && LastWeekUsageSeconds > 0) { - LastWeekUsageSeconds = LastWeekUsageMinutes * 60; - LogHelper.WriteLogToFile($"DeviceIdentifier | 迁移上周使用时长: {LastWeekUsageMinutes}分钟 -> {LastWeekUsageSeconds}秒"); + LastWeekUsageSeconds = LastWeekUsageSeconds * 60; + LogHelper.WriteLogToFile($"DeviceIdentifier | 迁移上周使用时长: {LastWeekUsageSeconds}分钟 -> {LastWeekUsageSeconds}秒"); } } catch (Exception ex) @@ -450,12 +450,12 @@ namespace Ink_Canvas.Helpers LastWeekUsageSeconds = WeeklyUsageSeconds; // 同时更新旧字段以保持兼容性 - LastWeekUsageMinutes = LastWeekUsageSeconds / 60; + LastWeekUsageSeconds = LastWeekUsageSeconds / 60; // 重置本周数据 WeeklyLaunchCount = 0; WeeklyUsageSeconds = 0; - WeeklyUsageMinutes = 0; + WeeklyUsageSeconds = 0; WeekStartDate = currentWeekStart; LogHelper.WriteLogToFile($"DeviceIdentifier | 每周统计重置 - 上周启动: {LastWeekLaunchCount}次, 上周使用: {FormatDuration(LastWeekUsageSeconds)}"); @@ -489,7 +489,7 @@ namespace Ink_Canvas.Helpers CheckAndResetWeeklyStats(); WeeklyUsageSeconds += seconds; // 同时更新旧字段以保持兼容性 - WeeklyUsageMinutes = WeeklyUsageSeconds / 60; + WeeklyUsageSeconds = WeeklyUsageSeconds / 60; } } @@ -601,7 +601,7 @@ namespace Ink_Canvas.Helpers stats.TotalUsageSeconds += sessionSeconds; // 同时更新旧字段以保持兼容性 - stats.TotalUsageMinutes = stats.TotalUsageSeconds / 60; + stats.TotalUsageSeconds = stats.TotalUsageSeconds / 60; // 记录每周使用时长（秒级精度） stats.RecordWeeklyUsage(sessionSeconds); @@ -611,7 +611,7 @@ namespace Ink_Canvas.Helpers { stats.AverageSessionSeconds = (double)stats.TotalUsageSeconds / stats.LaunchCount; // 同时更新旧字段以保持兼容性 - stats.AverageSessionMinutes = stats.AverageSessionSeconds / 60; + stats.AverageSessionSeconds = stats.AverageSessionSeconds / 60; } } @@ -650,9 +650,9 @@ namespace Ink_Canvas.Helpers var currentWeekSeconds = stats.WeeklyUsageSeconds; // 如果秒级数据为空但分钟数据存在，进行转换 - if (currentWeekSeconds == 0 && stats.WeeklyUsageMinutes > 0) + if (currentWeekSeconds == 0 && stats.WeeklyUsageSeconds > 0) { - currentWeekSeconds = stats.WeeklyUsageMinutes * 60; + currentWeekSeconds = stats.WeeklyUsageSeconds * 60; } // 如果本周数据不足，参考上周数据 @@ -660,9 +660,9 @@ namespace Ink_Canvas.Helpers var weeklySeconds = currentWeekSeconds > 0 ? currentWeekSeconds : stats.LastWeekUsageSeconds; // 如果秒级数据仍为空，使用分钟数据转换 - if (weeklySeconds == 0 && stats.LastWeekUsageMinutes > 0) + if (weeklySeconds == 0 && stats.LastWeekUsageSeconds > 0) { - weeklySeconds = stats.LastWeekUsageMinutes * 60; + weeklySeconds = stats.LastWeekUsageSeconds * 60; } // 综合评分系统（0-100分） @@ -731,7 +731,7 @@ namespace Ink_Canvas.Helpers else if (weeklySeconds >= 3600) score += 5; // 1-2小时：轻度使用 // 历史使用深度评分（10分）- 反映用户的长期使用习惯（秒级精度） - var totalSeconds = stats.TotalUsageSeconds > 0 ? stats.TotalUsageSeconds : stats.TotalUsageMinutes * 60; + var totalSeconds = stats.TotalUsageSeconds > 0 ? stats.TotalUsageSeconds : stats.TotalUsageSeconds * 60; if (totalSeconds >= 180000) score += 10; // 50小时以上：资深用户 else if (totalSeconds >= 72000) score += 7; // 20-50小时：中等用户 else if (totalSeconds >= 18000) score += 4; // 5-20小时：新手用户 @@ -854,10 +854,8 @@ namespace Ink_Canvas.Helpers DeviceId = DeviceId, LastLaunchTime = DateTime.Now, LaunchCount = 0, - TotalUsageSeconds = 0, - AverageSessionSeconds = 0, - TotalUsageMinutes = 0, // 保持兼容性 - AverageSessionMinutes = 0, // 保持兼容性 + TotalUsageSeconds = 0, // 保持兼容性 + AverageSessionSeconds = 0, // 保持兼容性 LastUpdateCheck = DateTime.MinValue, UpdatePriority = UpdatePriority.Medium, UsageFrequency = UsageFrequency.Medium @@ -879,8 +877,6 @@ namespace Ink_Canvas.Helpers LaunchCount = 0, TotalUsageSeconds = 0, AverageSessionSeconds = 0, - TotalUsageMinutes = 0, - AverageSessionMinutes = 0, LastUpdateCheck = DateTime.MinValue, UpdatePriority = UpdatePriority.Medium, UsageFrequency = UsageFrequency.Medium @@ -1316,7 +1312,7 @@ namespace Ink_Canvas.Helpers double daysBetweenVersions, double daysSinceLastUse, UsageStats stats, UpdateType updateType) { // 考虑用户的总体使用模式 - var isHeavyUser = stats.TotalUsageMinutes > 3000; // 超过50小时的重度用户 + var isHeavyUser = stats.TotalUsageSeconds > 3000; // 超过50小时的重度用户 var isFrequentUser = stats.LaunchCount > 100; // 启动超过100次的频繁用户 // 根据更新类型调整推送策略 @@ -1490,7 +1486,7 @@ namespace Ink_Canvas.Helpers /// private static string GetUserTypeDescription(UsageStats stats) { - var isHeavyUser = stats.TotalUsageMinutes > 3000; + var isHeavyUser = stats.TotalUsageSeconds > 3000; var isFrequentUser = stats.LaunchCount > 100; var daysSinceLastUse = (DateTime.Now - stats.LastLaunchTime).TotalDays; diff --git a/Ink Canvas/Helpers/InkFadeManager.cs b/Ink Canvas/Helpers/InkFadeManager.cs index 1bd3d9c2..febc4662 100644 --- a/Ink Canvas/Helpers/InkFadeManager.cs +++ b/Ink Canvas/Helpers/InkFadeManager.cs @@ -335,7 +335,7 @@ namespace Ink_Canvas.Helpers return path; } - catch (Exception ex) + catch (Exception) { return null; } @@ -497,7 +497,7 @@ namespace Ink_Canvas.Helpers // 开始分段渐隐动画 StartSegmentedFadeAnimation(segments, stroke, originalVisual, duration); } - catch (Exception ex) + catch (Exception) { StartSimpleFadeAnimation(originalVisual, stroke, opacity, duration); } @@ -551,7 +551,7 @@ namespace Ink_Canvas.Helpers return path; } - catch (Exception ex) + catch (Exception) { return null; } diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 4de702cb..5e9794d2 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -1360,7 +1360,7 @@ namespace Ink_Canvas // 直接设置滚动位置，不使用动画 SettingsPanelScrollViewer.ScrollToVerticalOffset(targetPosition); } - catch (Exception ex) + catch (Exception) { // 如果出现异常，恢复到原来的滚动位置 SettingsPanelScrollViewer.ScrollToVerticalOffset(originalOffset); @@ -2106,7 +2106,7 @@ namespace Ink_Canvas } } } - catch (Exception ex) + catch (Exception) { // 如果直接发送失败，回退到原来的方法 if (isPrevious) diff --git a/Ink Canvas/Windows/HotkeySettingsWindow.xaml.cs b/Ink Canvas/Windows/HotkeySettingsWindow.xaml.cs index 5539d553..ea00e278 100644 --- a/Ink Canvas/Windows/HotkeySettingsWindow.xaml.cs +++ b/Ink Canvas/Windows/HotkeySettingsWindow.xaml.cs @@ -224,7 +224,7 @@ namespace Ink_Canvas.Windows break; } } - catch (Exception ex) + catch (Exception) { // 设置默认快捷键时出错，忽略 }