CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:软件启动动画

Browse Source
This commit is contained in:
CJKmkp
2025-10-02 00:05:09 +08:00
parent 4724a432ab
commit 26acb72e17
3 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/App.xaml.cs
+4 -6
View File
@@ -530,7 +530,7 @@ namespace Ink_Canvas
try { crashAction = (int)(obj["startup"]["crashAction"] ?? 0); } catch { } try { crashAction = (int)(obj["startup"]["crashAction"] ?? 0); } catch { }
CrashAction = (CrashActionType)crashAction; CrashAction = (CrashActionType)crashAction;
} }
// 兜底：从主窗口同步 // 从主窗口同步
else if (Ink_Canvas.MainWindow.Settings != null && Ink_Canvas.MainWindow.Settings.Startup != null) else if (Ink_Canvas.MainWindow.Settings != null && Ink_Canvas.MainWindow.Settings.Startup != null)
{ {
CrashAction = (CrashActionType)Ink_Canvas.MainWindow.Settings.Startup.CrashAction; CrashAction = (CrashActionType)Ink_Canvas.MainWindow.Settings.Startup.CrashAction;
@@ -544,13 +544,13 @@ namespace Ink_Canvas
Ink_Canvas.MainWindow.ShowNewMessage("抱歉，出现未预期的异常，可能导致 InkCanvasForClass 运行不稳定。\n建议保存墨迹后重启应用。"); Ink_Canvas.MainWindow.ShowNewMessage("抱歉，出现未预期的异常，可能导致 InkCanvasForClass 运行不稳定。\n建议保存墨迹后重启应用。");
LogHelper.NewLog(e.Exception.ToString()); LogHelper.NewLog(e.Exception.ToString());
// 新增：记录到崩溃日志 // 记录到崩溃日志
lastErrorMessage = e.Exception.ToString(); lastErrorMessage = e.Exception.ToString();
WriteCrashLog($"UI线程未处理异常: {e.Exception}"); WriteCrashLog($"UI线程未处理异常: {e.Exception}");
e.Handled = true; e.Handled = true;
SyncCrashActionFromSettings(); // 新增：崩溃时同步最新设置 SyncCrashActionFromSettings(); // 崩溃时同步最新设置
if (CrashAction == CrashActionType.SilentRestart && !IsAppExitByUser) if (CrashAction == CrashActionType.SilentRestart && !IsAppExitByUser)
{ {
@@ -879,10 +879,8 @@ namespace Ink_Canvas
{ {
SetSplashMessage("启动完成！"); SetSplashMessage("启动完成！");
SetSplashProgress(100); SetSplashProgress(100);
SetSplashProgress(500);
// 延迟关闭启动画面，让用户看到完成消息 // 延迟关闭启动画面，让用户看到完成消息
Task.Delay(800).ContinueWith(_ => Task.Delay(500).ContinueWith(_ =>
{ {
Dispatcher.Invoke(() => CloseSplashScreen()); Dispatcher.Invoke(() => CloseSplashScreen());
}); });
Ink Canvas/Windows/SplashScreen.xaml
+15 -12
View File
@@ -19,7 +19,6 @@
<StackPanel> <StackPanel>
<!-- 启动图片 --> <!-- 启动图片 -->
<Image x:Name="StartupImage" <Image x:Name="StartupImage"
Source="pack://application:,,,/Resources/Startup-animation/ICC Autumn.png"
Width="600" Width="600"
Height="450" Height="450"
Stretch="Uniform" /> Stretch="Uniform" />
@@ -41,23 +40,27 @@
FontWeight="SemiBold" FontWeight="SemiBold"
Foreground="White" Foreground="White"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Margin="0,-150,0,0" /> Margin="0,-150,0,140" />
<!-- 进度条 --> <!-- 进度条 -->
<Grid HorizontalAlignment="Center" <Grid HorizontalAlignment="Center"
Margin="1,-175,0,0" Margin="1,-200,0,0"
Width="530" Width="532"
Height="10"> Height="10">
<!-- 进度条填充 --> <!-- 进度条填充 -->
<Border x:Name="ProgressBarFill" <Border x:Name="ProgressBarFill"
Background="#0198D4" Background="#41A5EE"
CornerRadius="2.5" HorizontalAlignment="Left"
HorizontalAlignment="Left" Width="0">
Width="0"> <Border.Style>
</Border> <Style TargetType="Border">
<Setter Property="CornerRadius" Value="0,0,7,7"/>
</Style>
</Border.Style>
</Border>
<!-- 进度条背景 --> <!-- 进度条背景 -->
<Border x:Name="ProgressBarBackground" <Border x:Name="ProgressBarBackground"
CornerRadius="2.5" CornerRadius="7"
BorderThickness="1" BorderThickness="1"
ClipToBounds="True"/> ClipToBounds="True"/>
</Grid> </Grid>
Ink Canvas/Windows/SplashScreen.xaml.cs
+12
View File
@@ -130,6 +130,18 @@ namespace Ink_Canvas.Windows
{ {
// 确保最终值正确设置 // 确保最终值正确设置
ProgressBarFill.Width = targetWidth; ProgressBarFill.Width = targetWidth;
// 根据进度调整圆角
if (progress >= 100)
{
// 进度100%时，底部角都是圆角
ProgressBarFill.CornerRadius = new CornerRadius(0, 0, 7, 7);
}
else
{
// 进度未满时，只有左侧是圆角
ProgressBarFill.CornerRadius = new CornerRadius(0, 0, 0, 7);
}
}; };
// 开始动画 // 开始动画