From 93022424b382e0f41c4855a43f17e16aa1e17c17 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Wed, 1 Oct 2025 18:38:01 +0800
Subject: [PATCH] =?UTF-8?q?add:=E8=BD=AF=E4=BB=B6=E5=90=AF=E5=8A=A8?=
=?UTF-8?q?=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/App.xaml.cs | 93 +++++++++++++-----
Ink Canvas/MainWindow.xaml | 7 ++
Ink Canvas/MainWindow_cs/MW_Settings.cs | 7 ++
Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs | 2 +
Ink Canvas/Resources/Settings.cs | 2 +
...vasForClass.csproj.AssemblyReference.cache | Bin 38044 -> 38181 bytes
6 files changed, 84 insertions(+), 27 deletions(-)
diff --git a/Ink Canvas/App.xaml.cs b/Ink Canvas/App.xaml.cs
index 795743fd..bb7eb6fe 100644
--- a/Ink Canvas/App.xaml.cs
+++ b/Ink Canvas/App.xaml.cs
@@ -420,7 +420,7 @@ namespace Ink_Canvas
}
}
- // 新增：关闭启动画面
+ // 关闭启动画面
public static void CloseSplashScreen()
{
if (!_isSplashScreenShown || _splashScreen == null) return;
@@ -437,7 +437,7 @@ namespace Ink_Canvas
}
}
- // 新增：设置启动画面进度
+ // 设置启动画面进度
public static void SetSplashProgress(int progress)
{
if (_splashScreen != null)
@@ -446,7 +446,7 @@ namespace Ink_Canvas
}
}
- // 新增：设置启动画面消息
+ // 设置启动画面消息
public static void SetSplashMessage(string message)
{
if (_splashScreen != null)
@@ -455,7 +455,33 @@ namespace Ink_Canvas
}
}
- // 新增：记录崩溃日志
+ private static bool ShouldShowSplashScreen()
+ {
+ try
+ {
+ // 检查设置文件中的启动动画开关
+ var settingsPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Configs", "Settings.json");
+ if (File.Exists(settingsPath))
+ {
+ var json = File.ReadAllText(settingsPath);
+ dynamic obj = JsonConvert.DeserializeObject(json);
+ if (obj?["appearance"]?["enableSplashScreen"] != null)
+ {
+ return (bool)obj["appearance"]["enableSplashScreen"];
+ }
+ }
+
+ // 如果设置文件不存在或没有该设置，返回默认值false
+ return false;
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"检查启动动画设置失败: {ex.Message}", LogHelper.LogType.Warning);
+ return false;
+ }
+ }
+
+ // 记录崩溃日志
private static void WriteCrashLog(string message)
{
try
@@ -490,7 +516,6 @@ namespace Ink_Canvas
// 增加字段保存崩溃后操作设置
public static CrashActionType CrashAction = CrashActionType.SilentRestart;
- // 修正：允许静态调用
public static void SyncCrashActionFromSettings()
{
try
@@ -554,13 +579,16 @@ namespace Ink_Canvas
// 初始化应用启动时间
appStartTime = DateTime.Now;
- // 显示启动画面
- ShowSplashScreen();
- SetSplashMessage("正在启动 Ink Canvas...");
- SetSplashProgress(10);
+ // 根据设置决定是否显示启动画面
+ if (ShouldShowSplashScreen())
+ {
+ ShowSplashScreen();
+ SetSplashMessage("正在启动 Ink Canvas...");
+ SetSplashProgress(10);
- // 强制刷新UI，确保启动画面显示
- Application.Current.Dispatcher.Invoke(() => { }, DispatcherPriority.Render);
+ // 强制刷新UI，确保启动画面显示
+ Application.Current.Dispatcher.Invoke(() => { }, DispatcherPriority.Render);
+ }
System.Threading.Thread.Sleep(1000);
RootPath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
@@ -586,9 +614,12 @@ namespace Ink_Canvas
}
// 在应用启动时自动释放IACore相关DLL
- SetSplashMessage("正在初始化组件...");
- SetSplashProgress(20);
- await Task.Delay(500);
+ if (_isSplashScreenShown)
+ {
+ SetSplashMessage("正在初始化组件...");
+ SetSplashProgress(20);
+ await Task.Delay(500);
+ }
try
{
IACoreDllExtractor.ExtractIACoreDlls();
@@ -599,9 +630,12 @@ namespace Ink_Canvas
}
// 记录应用启动（设备标识符）
- SetSplashMessage("正在加载配置...");
- SetSplashProgress(40);
- await Task.Delay(500);
+ if (_isSplashScreenShown)
+ {
+ SetSplashMessage("正在加载配置...");
+ SetSplashProgress(40);
+ await Task.Delay(500);
+ }
DeviceIdentifier.RecordAppLaunch();
LogHelper.WriteLogToFile($"App | 设备ID: {DeviceIdentifier.GetDeviceId()}");
LogHelper.WriteLogToFile($"App | 使用频率: {DeviceIdentifier.GetUsageFrequency()}");
@@ -829,23 +863,28 @@ namespace Ink_Canvas
StartArgs = e.Args;
// 在非更新模式下创建主窗口
- SetSplashMessage("正在初始化主界面...");
- SetSplashProgress(80);
- await Task.Delay(500);
+ if (_isSplashScreenShown)
+ {
+ SetSplashMessage("正在初始化主界面...");
+ SetSplashProgress(80);
+ await Task.Delay(500);
+ }
var mainWindow = new MainWindow();
MainWindow = mainWindow;
// 主窗口加载完成后关闭启动画面
mainWindow.Loaded += (s, args) =>
{
- SetSplashMessage("启动完成！");
- SetSplashProgress(100);
-
- // 延迟关闭启动画面，让用户看到完成消息
- Task.Delay(500).ContinueWith(_ =>
+ if (_isSplashScreenShown)
{
- Dispatcher.Invoke(() => CloseSplashScreen());
- });
+ SetSplashMessage("启动完成！");
+ SetSplashProgress(500);
+
+ Task.Delay(500).ContinueWith(_ =>
+ {
+ Dispatcher.Invoke(() => CloseSplashScreen());
+ });
+ }
};
mainWindow.Show();
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index e9495e55..453e6421 100644
--- a/Ink Canvas/MainWindow.xaml
+++ b/Ink Canvas/MainWindow.xaml
@@ -1040,6 +1040,13 @@
+
+
+
+
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index 48b22800..4b30d65d 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs
@@ -186,6 +186,13 @@ namespace Ink_Canvas
SaveSettingsToFile();
}
+ private void ToggleSwitchEnableSplashScreen_Toggled(object sender, RoutedEventArgs e)
+ {
+ if (!isLoaded) return;
+ Settings.Appearance.EnableSplashScreen = ToggleSwitchEnableSplashScreen.IsOn;
+ SaveSettingsToFile();
+ }
+
private void ViewboxFloatingBarScaleTransformValueSlider_ValueChanged(object sender, RoutedEventArgs e)
{
if (!isLoaded) return;
diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
index f5d4f5cb..d34d0ce4 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
@@ -332,6 +332,8 @@ namespace Ink_Canvas
ToggleSwitchEnableQuickPanel.IsOn = Settings.Appearance.IsShowQuickPanel;
+ ToggleSwitchEnableSplashScreen.IsOn = Settings.Appearance.EnableSplashScreen;
+
ToggleSwitchEnableTrayIcon.IsOn = Settings.Appearance.EnableTrayIcon;
ICCTrayIconExampleImage.Visibility =
Settings.Appearance.EnableTrayIcon ? Visibility.Visible : Visibility.Collapsed;
diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs
index 77f0103b..88a7a36a 100644
--- a/Ink Canvas/Resources/Settings.cs
+++ b/Ink Canvas/Resources/Settings.cs
@@ -199,6 +199,8 @@ namespace Ink_Canvas
public int UnFoldButtonImageType { get; set; }
[JsonProperty("isShowLRSwitchButton")]
public bool IsShowLRSwitchButton { get; set; }
+ [JsonProperty("enableSplashScreen")]
+ public bool EnableSplashScreen { get; set; } = false;
[JsonProperty("isShowQuickPanel")]
public bool IsShowQuickPanel { get; set; } = true;
[JsonProperty("chickenSoupSource")]
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
index c8c2dfbd497b829755ee6211820ad2e2d43c9d13..57d842b8b7d92d5308ee26301638a87ff9085d80 100644
GIT binary patch
delta 70
zcmbQUl4B~nPN5rP?War*kO`k`FUd8TkDE=&SuZ6ghmjGefZ>7T
XjqeIqIY4T;%1rbO^o$LR4J{b}mk1Gb
delta 23
fcmZ3wifPVDCJr`6Lk0#0#>B~nPN5rP?WX_$OSlGi