improve:OOBE

Ink Canvas/Windows/OobeWindow.xaml

@@ -9,10 +9,10 @@
         xmlns:sys="clr-namespace:System;assembly=mscorlib"
         mc:Ignorable="d"
         Title="欢迎使用 InkCanvasForClass"
-        Height="660"
+        Height="700"
-        Width="980"
+        Width="1080"
-        MinHeight="460"
+        MinHeight="520"
-        MinWidth="760"
+        MinWidth="880"
         WindowStartupLocation="CenterScreen"
         ResizeMode="CanResize"
         Topmost="True"
@@ -21,7 +21,7 @@
         ui:TitleBar.ExtendViewIntoTitleBar="True"
         ui:WindowHelper.SystemBackdropType="Mica"
         ui:WindowHelper.UseModernWindowStyle="True"
-        ui:TitleBar.Height="48">
+        ui:TitleBar.Height="40">
 
     <Window.Resources>
         <ResourceDictionary>
@@ -43,10 +43,8 @@
 
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
-            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
         <!-- 自定义标题栏 -->
@@ -67,7 +65,7 @@
                                       Spacing="12"
                                       VerticalAlignment="Center"
                                       Margin="16,0,0,0">
-                    <Image Source="\Resources\icc.ico" Width="20"
+                    <Image Source="\Resources\icc.ico" Width="18"
                            RenderOptions.BitmapScalingMode="HighQuality" />
                     <TextBlock VerticalAlignment="Center"
                                Text="欢迎使用 InkCanvasForClass"
@@ -79,78 +77,162 @@
             </Grid>
         </Border>
 
-        <!-- 顶部 Banner -->
+        <!-- 主体: 左侧导航 + 内容 -->
-        <Border Grid.Row="1"
+        <ui:NavigationView x:Name="NavView"
-                x:Name="HeaderBanner"
+                           Grid.Row="1"
-                Padding="56,16,56,18"
+                           PaneDisplayMode="Left"
-                BorderThickness="0,0,0,1"
+                           IsPaneOpen="True"
-                BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}">
+                           IsBackButtonVisible="Collapsed"
-            <Border.Background>
+                           IsBackEnabled="False"
-                <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                           IsSettingsVisible="False"
-                    <GradientStop Color="#1F3B82F6" Offset="0" />
+                           OpenPaneLength="240"
-                    <GradientStop Color="#0A8B5CF6" Offset="1" />
+                           SelectionChanged="NavView_SelectionChanged">
-                </LinearGradientBrush>
+
-            </Border.Background>
+            <ui:NavigationView.MenuItems>
+                <ui:NavigationViewItem x:Name="NavItemWelcome" Content="欢迎" Tag="welcome">
+                    <ui:NavigationViewItem.Icon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Home}" />
+                    </ui:NavigationViewItem.Icon>
+                </ui:NavigationViewItem>
+                <ui:NavigationViewItemSeparator />
+                <ui:NavigationViewItem x:Name="NavItemTelemetry" Content="启动与隐私" Tag="step0">
+                    <ui:NavigationViewItem.Icon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Shield}" />
+                    </ui:NavigationViewItem.Icon>
+                </ui:NavigationViewItem>
+                <ui:NavigationViewItem x:Name="NavItemCanvas" Content="画板与墨迹" Tag="step1">
+                    <ui:NavigationViewItem.Icon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Edit}" />
+                    </ui:NavigationViewItem.Icon>
+                </ui:NavigationViewItem>
+                <ui:NavigationViewItem x:Name="NavItemGestures" Content="手势操作" Tag="step2">
+                    <ui:NavigationViewItem.Icon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.TouchPointer}" />
+                    </ui:NavigationViewItem.Icon>
+                </ui:NavigationViewItem>
+                <ui:NavigationViewItem x:Name="NavItemAppearance" Content="个性化" Tag="step3">
+                    <ui:NavigationViewItem.Icon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Personalize}" />
+                    </ui:NavigationViewItem.Icon>
+                </ui:NavigationViewItem>
+                <ui:NavigationViewItem x:Name="NavItemPpt" Content="PowerPoint 联动" Tag="step4">
+                    <ui:NavigationViewItem.Icon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Slideshow}" />
+                    </ui:NavigationViewItem.Icon>
+                </ui:NavigationViewItem>
+                <ui:NavigationViewItem x:Name="NavItemAutomation" Content="自动化与截图" Tag="step5">
+                    <ui:NavigationViewItem.Icon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Sync}" />
+                    </ui:NavigationViewItem.Icon>
+                </ui:NavigationViewItem>
+                <ui:NavigationViewItem x:Name="NavItemLuckyRandom" Content="随机点名" Tag="step6">
+                    <ui:NavigationViewItem.Icon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.People}" />
+                    </ui:NavigationViewItem.Icon>
+                </ui:NavigationViewItem>
+                <ui:NavigationViewItem x:Name="NavItemAdvanced" Content="高级选项" Tag="step7">
+                    <ui:NavigationViewItem.Icon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Settings}" />
+                    </ui:NavigationViewItem.Icon>
+                </ui:NavigationViewItem>
+                <ui:NavigationViewItemSeparator />
+                <ui:NavigationViewItem x:Name="NavItemFinish" Content="完成" Tag="finish">
+                    <ui:NavigationViewItem.Icon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Accept}" />
+                    </ui:NavigationViewItem.Icon>
+                </ui:NavigationViewItem>
+            </ui:NavigationView.MenuItems>
+
             <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
-                    <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
-                <Border Grid.Column="0" Grid.RowSpan="3"
+                <!-- 内容区 -->
-                        Width="56" Height="56"
+                <Grid Grid.Row="0" ClipToBounds="True">
-                        Margin="0,0,18,0"
+
-                        VerticalAlignment="Top"
+                    <!-- 欢迎页 (居中布局, 不进 ScrollViewer 的滚动条) -->
-                        CornerRadius="12"
+                    <Grid x:Name="WelcomePanel" Visibility="Visible">
-                        Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
+                        <ikw:SimpleStackPanel HorizontalAlignment="Center"
-                    <ui:FontIcon x:Name="StepIcon"
-                                 FontSize="28"
-                                 HorizontalAlignment="Center"
                                               VerticalAlignment="Center"
-                                 Icon="{x:Static ui:SegoeFluentIcons.Shield}" />
+                                              MaxWidth="640"
+                                              Spacing="16">
+                            <Border Width="96" Height="96"
+                                    HorizontalAlignment="Center"
+                                    CornerRadius="20"
+                                    Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}">
+                                <Image Source="\Resources\icc.ico"
+                                       Width="64"
+                                       RenderOptions.BitmapScalingMode="HighQuality" />
                             </Border>
 
-                <TextBlock Grid.Column="1" Grid.Row="0"
+                            <TextBlock Text="欢迎使用 InkCanvasForClass"
-                           x:Name="StepIndicatorText"
+                                       Style="{DynamicResource TitleLargeTextBlockStyle}"
-                           Style="{DynamicResource CaptionTextBlockStyle}"
+                                       HorizontalAlignment="Center"
-                           Opacity="0.75"
+                                       TextAlignment="Center"
-                           Text="步骤 1 / 8" />
+                                       Margin="0,8,0,0" />
-                <TextBlock Grid.Column="1" Grid.Row="1"
+
-                           x:Name="StepTitleText"
+                            <TextBlock HorizontalAlignment="Center"
-                           Style="{DynamicResource TitleTextBlockStyle}"
+                                       TextAlignment="Center"
-                           Margin="0,2,0,0"
-                           Text="启动与隐私" />
-                <TextBlock Grid.Column="1" Grid.Row="2"
-                           x:Name="StepSubtitleText"
-                           Style="{DynamicResource BodyTextBlockStyle}"
-                           Margin="0,4,0,0"
-                           Opacity="0.85"
                                        TextWrapping="Wrap"
-                           Text="遥测、隐私协议、自动更新与崩溃处理。" />
+                                       Opacity="0.85"
-            </Grid>
+                                       Style="{DynamicResource BodyTextBlockStyle}"
-        </Border>
+                                       Text="一款面向课堂场景的批注与白板工具。下面的向导将帮助你快速完成首次配置,所有选项都可以稍后在「设置」中修改。" />
 
-        <!-- 步骤内容 -->
+                            <TextBlock HorizontalAlignment="Center"
-        <Grid Grid.Row="2" ClipToBounds="True">
+                                       TextAlignment="Center"
+                                       Opacity="0.6"
+                                       Style="{DynamicResource CaptionTextBlockStyle}"
+                                       Text="共 8 个步骤 · 大约 1 分钟" />
+
+                            <Button x:Name="BtnStartWelcome"
+                                    HorizontalAlignment="Center"
+                                    MinWidth="180"
+                                    Height="36"
+                                    Margin="0,12,0,0"
+                                    Style="{DynamicResource AccentButtonStyle}"
+                                    Click="BtnStartWelcome_Click">
+                                <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
+                                    <TextBlock Text="开始" />
+                                    <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.ChevronRight}" FontSize="12" />
+                                </ikw:SimpleStackPanel>
+                            </Button>
+                        </ikw:SimpleStackPanel>
+                    </Grid>
+
+                    <!-- 步骤页 (8 个) -->
                     <ScrollViewer x:Name="StepScrollViewer"
+                                  Visibility="Collapsed"
                                   PanningMode="VerticalFirst"
                                   VerticalScrollBarVisibility="Auto"
                                   HorizontalScrollBarVisibility="Disabled">
-                <Grid Margin="56,18,56,0">
+                        <Grid Margin="40,16,40,0">
                             <ikw:SimpleStackPanel x:Name="StepHost"
-                                          MaxWidth="1000"
+                                                  MaxWidth="900"
                                                   HorizontalAlignment="Stretch"
                                                   Spacing="{StaticResource SettingsCardSpacing}">
-
                                 <ikw:SimpleStackPanel.RenderTransform>
                                     <TranslateTransform x:Name="StepHostTransform" X="0" Y="0" />
                                 </ikw:SimpleStackPanel.RenderTransform>
 
+                                <!-- 步骤标题 -->
+                                <ikw:SimpleStackPanel Margin="0,0,0,8" Spacing="2">
+                                    <TextBlock x:Name="StepIndicatorText"
+                                               Style="{DynamicResource CaptionTextBlockStyle}"
+                                               Opacity="0.7"
+                                               Text="步骤 1 / 8" />
+                                    <TextBlock x:Name="StepTitleText"
+                                               Style="{DynamicResource TitleTextBlockStyle}"
+                                               Text="启动与隐私" />
+                                    <TextBlock x:Name="StepSubtitleText"
+                                               Style="{DynamicResource BodyTextBlockStyle}"
+                                               Margin="0,2,0,0"
+                                               Opacity="0.85"
+                                               TextWrapping="Wrap"
+                                               Text="遥测、隐私协议、自动更新与崩溃处理。" />
+                                </ikw:SimpleStackPanel>
+
                                 <!-- 步骤 1: 启动与隐私 -->
                                 <ikw:SimpleStackPanel x:Name="StepTelemetryPanel"
                                                       Spacing="{StaticResource SettingsCardSpacing}">
@@ -281,7 +363,7 @@
                                                                   SwitchName="ToggleSwitchEnablePalmEraser" />
                                 </ikw:SimpleStackPanel>
 
-                        <!-- 步骤 4: 个性化(主题 + 启动动画 + 托盘 + 快速面板 + 快捷键) -->
+                                <!-- 步骤 4: 个性化 -->
                                 <ikw:SimpleStackPanel x:Name="StepAppearancePanel"
                                                       Spacing="{StaticResource SettingsCardSpacing}"
                                                       Visibility="Collapsed">
@@ -435,11 +517,57 @@
                             </ikw:SimpleStackPanel>
                         </Grid>
                     </ScrollViewer>
+
+                    <!-- 完成页 -->
+                    <Grid x:Name="FinishPanel" Visibility="Collapsed">
+                        <ScrollViewer VerticalScrollBarVisibility="Auto"
+                                      HorizontalScrollBarVisibility="Disabled">
+                            <ikw:SimpleStackPanel HorizontalAlignment="Center"
+                                                  VerticalAlignment="Top"
+                                                  MaxWidth="640"
+                                                  Margin="40,32,40,16"
+                                                  Spacing="14">
+                                <Border Width="80" Height="80"
+                                        HorizontalAlignment="Center"
+                                        CornerRadius="20"
+                                        Background="{DynamicResource SystemControlBackgroundAccentBrush}">
+                                    <ui:FontIcon FontSize="40"
+                                                 Foreground="White"
+                                                 HorizontalAlignment="Center"
+                                                 VerticalAlignment="Center"
+                                                 Icon="{x:Static ui:SegoeFluentIcons.Accept}" />
+                                </Border>
+
+                                <TextBlock Text="一切就绪"
+                                           Style="{DynamicResource TitleLargeTextBlockStyle}"
+                                           HorizontalAlignment="Center"
+                                           TextAlignment="Center"
+                                           Margin="0,4,0,0" />
+
+                                <TextBlock HorizontalAlignment="Center"
+                                           TextAlignment="Center"
+                                           TextWrapping="Wrap"
+                                           Opacity="0.85"
+                                           Style="{DynamicResource BodyTextBlockStyle}"
+                                           Text="确认下面的关键配置后即可开始使用。所有设置稍后都能在「设置」中修改。" />
+
+                                <Border CornerRadius="8"
+                                        Padding="16"
+                                        Margin="0,8,0,0"
+                                        BorderThickness="1"
+                                        BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+                                        Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}">
+                                    <ikw:SimpleStackPanel x:Name="FinishSummaryHost" Spacing="6" />
+                                </Border>
+                            </ikw:SimpleStackPanel>
+                        </ScrollViewer>
+                    </Grid>
+
                 </Grid>
 
                 <!-- Footer -->
-        <Border Grid.Row="3"
+                <Border Grid.Row="1"
-                Padding="56,12,56,16"
+                        Padding="40,12,40,16"
                         BorderThickness="0,1,0,0"
                         BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}">
                     <Grid>
@@ -450,15 +578,15 @@
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
 
-                <Grid Grid.Column="0" VerticalAlignment="Center" Margin="0,0,16,0" MaxWidth="420" HorizontalAlignment="Left">
+                        <ui:ProgressBar x:Name="StepProgressBar"
-                    <Border Height="4" CornerRadius="2"
+                                        Grid.Column="0"
-                            Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
+                                        VerticalAlignment="Center"
-                    <Border x:Name="ProgressFill"
+                                        Margin="0,0,16,0"
-                            Height="4"
+                                        MaxWidth="420"
-                            CornerRadius="2"
+                                        HorizontalAlignment="Stretch"
-                            HorizontalAlignment="Left"
+                                        Minimum="0"
-                            Background="{DynamicResource SystemControlForegroundAccentBrush}" />
+                                        Maximum="100"
-                </Grid>
+                                        Value="0" />
 
                         <TextBlock Grid.Column="1"
                                    x:Name="FooterStepText"
@@ -466,7 +594,7 @@
                                    Margin="0,0,16,0"
                                    Style="{DynamicResource CaptionTextBlockStyle}"
                                    Opacity="0.7"
-                           Text="1 / 8" />
+                                   Text="" />
 
                         <Button x:Name="BtnPreviousStep"
                                 Grid.Column="2"
@@ -494,4 +622,6 @@
                     </Grid>
                 </Border>
             </Grid>
+        </ui:NavigationView>
+    </Grid>
 </Window>

Ink Canvas/Windows/OobeWindow.xaml.cs

@@ -4,21 +4,33 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
+using FontIcon = iNKORE.UI.WPF.Modern.Controls.FontIcon;
+using NavigationView = iNKORE.UI.WPF.Modern.Controls.NavigationView;
+using NavigationViewItem = iNKORE.UI.WPF.Modern.Controls.NavigationViewItem;
+using NavigationViewSelectionChangedEventArgs = iNKORE.UI.WPF.Modern.Controls.NavigationViewSelectionChangedEventArgs;
 
 namespace Ink_Canvas.Windows
 {
     /// <summary>
-    /// 首次启动体验(OOBE)窗口,使用与设置窗口一致的卡片化 UI 引导用户完成初始配置。
+    /// 首次启动体验(OOBE)窗口。使用 iNKORE.UI.WPF.Modern 的 NavigationView 作为左侧导航,
-    /// 切换步骤时使用横向滑动 + 淡入,模仿 ClassIsland 的设置向导动画风格。
+    /// 引导用户依次完成欢迎页、8 个配置步骤与完成摘要页。
     /// </summary>
     public partial class OobeWindow : Window
     {
         private readonly Settings _settings;
-        private int _currentStep = 0;
+
-        private const int MaxStepIndex = 7;
+        // 视图状态: -1 = 欢迎; 0..7 = 步骤; 8 = 完成
+        private const int WelcomeIndex = -1;
+        private const int FinishIndex = 8;
         private const int StepCount = 8;
+        private const int MaxStepIndex = StepCount - 1;
+
+        private int _currentStep = WelcomeIndex;
+        private bool _suppressNavSelection;
 
         private FrameworkElement[] _stepPanels;
+        private NavigationViewItem[] _navItems;
+
         private static readonly TimeSpan SlideDuration = TimeSpan.FromMilliseconds(280);
         private static readonly IEasingFunction SlideEase = new CubicEase { EasingMode = EasingMode.EaseOut };
 
@@ -43,8 +55,21 @@ namespace Ink_Canvas.Windows
                 StepAdvancedPanel,
             };
 
+            _navItems = new[]
+            {
+                NavItemTelemetry,
+                NavItemCanvas,
+                NavItemGestures,
+                NavItemAppearance,
+                NavItemPpt,
+                NavItemAutomation,
+                NavItemLuckyRandom,
+                NavItemAdvanced,
+            };
+
             InitializeFromSettings();
-            UpdateStepUI(animateDirection: 0, instant: true);
+            UpdateView(animateDirection: 0, instant: true);
+            SyncNavSelection();
         }
 
         #region Settings IO
@@ -273,8 +298,14 @@ namespace Ink_Canvas.Windows
 
         #region Navigation
 
+        private void BtnStartWelcome_Click(object sender, RoutedEventArgs e)
+        {
+            NavigateTo(0, direction: 1);
+        }
+
         private void BtnConfirm_Click(object sender, RoutedEventArgs e)
         {
+            // 离开"启动与隐私"页前必须勾选隐私协议
             if (_currentStep == 0 && CheckBoxPrivacyAccepted.IsChecked != true)
             {
                 MessageBox.Show(this,
@@ -285,23 +316,83 @@ namespace Ink_Canvas.Windows
                 return;
             }
 
-            if (_currentStep < MaxStepIndex)
+            if (_currentStep == FinishIndex)
             {
-                _currentStep++;
-                UpdateStepUI(animateDirection: 1);
-                return;
-            }
-
                 ApplySelection();
                 DialogResult = true;
                 Close();
+                return;
+            }
+
+            NavigateTo(_currentStep + 1, direction: 1);
         }
 
         private void BtnPreviousStep_Click(object sender, RoutedEventArgs e)
         {
-            if (_currentStep <= 0) return;
+            if (_currentStep <= WelcomeIndex) return;
-            _currentStep--;
+            NavigateTo(_currentStep - 1, direction: -1);
-            UpdateStepUI(animateDirection: -1);
+        }
+
+        private void NavView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
+        {
+            if (_suppressNavSelection) return;
+
+            int target = ResolveTargetFromNavItem(args.SelectedItem as NavigationViewItem);
+            if (target == _currentStep) return;
+
+            // 强制隐私门禁: 如果当前在步骤 0 且未勾选, 仅允许返回欢迎页, 不允许跳到后续步骤
+            if (_currentStep == 0 && CheckBoxPrivacyAccepted.IsChecked != true && target > 0)
+            {
+                MessageBox.Show(this,
+                    "请先勾选\"我已阅读并同意《隐私协议》\"后再继续。",
+                    "需要同意隐私协议",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Information);
+                SyncNavSelection();
+                return;
+            }
+
+            int direction = target > _currentStep ? 1 : -1;
+            NavigateTo(target, direction);
+        }
+
+        private int ResolveTargetFromNavItem(NavigationViewItem item)
+        {
+            if (item == null) return _currentStep;
+            if (item == NavItemWelcome) return WelcomeIndex;
+            if (item == NavItemFinish) return FinishIndex;
+            for (int i = 0; i < _navItems.Length; i++)
+            {
+                if (_navItems[i] == item) return i;
+            }
+            return _currentStep;
+        }
+
+        private void NavigateTo(int target, int direction)
+        {
+            if (target < WelcomeIndex) target = WelcomeIndex;
+            if (target > FinishIndex) target = FinishIndex;
+            _currentStep = target;
+            UpdateView(direction);
+            SyncNavSelection();
+        }
+
+        private void SyncNavSelection()
+        {
+            _suppressNavSelection = true;
+            try
+            {
+                if (_currentStep == WelcomeIndex)
+                    NavView.SelectedItem = NavItemWelcome;
+                else if (_currentStep == FinishIndex)
+                    NavView.SelectedItem = NavItemFinish;
+                else
+                    NavView.SelectedItem = _navItems[_currentStep];
+            }
+            finally
+            {
+                _suppressNavSelection = false;
+            }
         }
 
         private void CheckBoxPrivacyAccepted_Changed(object sender, RoutedEventArgs e)
@@ -328,11 +419,16 @@ namespace Ink_Canvas.Windows
             {
                 System.Diagnostics.Debug.WriteLine(ex);
             }
+            finally
+            {
+                _privacyDialogShown = false;
+            }
         }
 
         private void UpdateConfirmEnabled()
         {
             if (BtnConfirm == null || CheckBoxPrivacyAccepted == null) return;
+            // 在步骤 0 时, 必须先勾选隐私协议才能继续
             BtnConfirm.IsEnabled = _currentStep != 0 || CheckBoxPrivacyAccepted.IsChecked == true;
         }
 
@@ -357,9 +453,19 @@ namespace Ink_Canvas.Windows
             }
         }
 
-        private void UpdateStepUI(int animateDirection, bool instant = false)
+        private void UpdateView(int animateDirection, bool instant = false)
         {
             try
+            {
+                bool isWelcome = _currentStep == WelcomeIndex;
+                bool isFinish = _currentStep == FinishIndex;
+                bool isStep = !isWelcome && !isFinish;
+
+                WelcomePanel.Visibility = isWelcome ? Visibility.Visible : Visibility.Collapsed;
+                StepScrollViewer.Visibility = isStep ? Visibility.Visible : Visibility.Collapsed;
+                FinishPanel.Visibility = isFinish ? Visibility.Visible : Visibility.Collapsed;
+
+                if (isStep)
                 {
                     for (int i = 0; i < _stepPanels.Length; i++)
                     {
@@ -367,25 +473,50 @@ namespace Ink_Canvas.Windows
                     }
 
                     StepIndicatorText.Text = $"步骤 {_currentStep + 1} / {StepCount}";
-                FooterStepText.Text = $"{_currentStep + 1} / {StepCount}";
-                BtnPreviousStep.Visibility = _currentStep > 0 ? Visibility.Visible : Visibility.Collapsed;
-
                     ApplyStepMeta(_currentStep);
 
-                BtnConfirmText.Text = _currentStep == MaxStepIndex ? "保存并开始使用" : "下一步";
+                    if (StepScrollViewer != null) StepScrollViewer.ScrollToTop();
-                BtnConfirmIcon.Icon = _currentStep == MaxStepIndex
+                }
-                    ? SegoeFluentIcons.Accept
+
-                    : SegoeFluentIcons.ChevronRight;
+                if (isFinish)
+                {
+                    BuildFinishSummary();
+                }
+
+                // 底部进度: 欢迎=0, 各步骤按比例, 完成=100
+                double progress;
+                if (isWelcome) progress = 0;
+                else if (isFinish) progress = 100;
+                else progress = (_currentStep + 1) / (double)(StepCount + 1) * 100.0;
+
+                AnimateProgress(progress, instant);
+
+                // Footer 步骤计数
+                if (isWelcome) FooterStepText.Text = string.Empty;
+                else if (isFinish) FooterStepText.Text = $"{StepCount} / {StepCount} · 完成";
+                else FooterStepText.Text = $"{_currentStep + 1} / {StepCount}";
+
+                // 上一步按钮: 欢迎页隐藏
+                BtnPreviousStep.Visibility = isWelcome ? Visibility.Collapsed : Visibility.Visible;
+
+                // 主按钮: 欢迎页隐藏(由欢迎页自身的"开始"按钮负责)
+                BtnConfirm.Visibility = isWelcome ? Visibility.Collapsed : Visibility.Visible;
+                if (isFinish)
+                {
+                    BtnConfirmText.Text = "保存并开始使用";
+                    BtnConfirmIcon.Icon = SegoeFluentIcons.Accept;
+                }
+                else
+                {
+                    BtnConfirmText.Text = "下一步";
+                    BtnConfirmIcon.Icon = SegoeFluentIcons.ChevronRight;
+                }
 
                 UpdateConfirmEnabled();
 
-                if (StepScrollViewer != null) StepScrollViewer.ScrollToTop();
-
-                AnimateProgress(instant);
-
                 if (!instant && animateDirection != 0)
                 {
-                    AnimateStepSlide(animateDirection);
+                    AnimateContentSlide(animateDirection);
                 }
                 else
                 {
@@ -401,81 +532,135 @@ namespace Ink_Canvas.Windows
 
         private void ApplyStepMeta(int step)
         {
-            string title; string subtitle; FontIconData icon;
+            string title; string subtitle;
             switch (step)
             {
                 case 0:
                     title = "启动与隐私";
                     subtitle = "遥测、隐私协议、自动更新与崩溃处理。";
-                    icon = SegoeFluentIcons.Shield;
                     break;
                 case 1:
                     title = "画板与墨迹";
                     subtitle = "光标、压感、墨迹显示与墨迹纠正。";
-                    icon = SegoeFluentIcons.Edit;
                     break;
                 case 2:
                     title = "手势操作";
                     subtitle = "双指缩放/平移、手掌擦等。";
-                    icon = SegoeFluentIcons.TouchPointer;
                     break;
                 case 3:
                     title = "个性化";
                     subtitle = "主题、启动动画、托盘、快速面板与快捷键。";
-                    icon = SegoeFluentIcons.Personalize;
                     break;
                 case 4:
                     title = "PowerPoint 联动";
                     subtitle = "放映联动、墨迹与截屏自动保存、时间胶囊。";
-                    icon = SegoeFluentIcons.Slideshow;
                     break;
                 case 5:
                     title = "自动化与截图";
                     subtitle = "自动收纳、墨迹自动保存、悬浮窗拦截与截图保存。";
-                    icon = SegoeFluentIcons.Sync;
                     break;
                 case 6:
                     title = "随机点名";
                     subtitle = "点名窗口选项。";
-                    icon = SegoeFluentIcons.People;
                     break;
                 case 7:
                     title = "高级选项";
                     subtitle = "日志等高级配置。";
-                    icon = SegoeFluentIcons.Settings;
                     break;
                 default:
-                    title = string.Empty; subtitle = string.Empty; icon = SegoeFluentIcons.Home;
+                    title = string.Empty; subtitle = string.Empty;
                     break;
             }
 
             StepTitleText.Text = title;
             StepSubtitleText.Text = subtitle;
-            StepIcon.Icon = icon;
         }
 
-        private void AnimateProgress(bool instant)
+        private void BuildFinishSummary()
+        {
+            FinishSummaryHost.Children.Clear();
+
+            string telemetryText;
+            switch (ComboBoxTelemetryUploadLevel.SelectedIndex)
+            {
+                case 0: telemetryText = "不上传任何匿名使用数据"; break;
+                case 1: telemetryText = "基础(崩溃信息、版本与系统信息)"; break;
+                default: telemetryText = "可选(功能使用频率等)"; break;
+            }
+
+            string themeText;
+            switch (ComboBoxTheme.SelectedIndex)
+            {
+                case 0: themeText = "浅色"; break;
+                case 1: themeText = "深色"; break;
+                default: themeText = "跟随系统"; break;
+            }
+
+            AddSummaryRow(SegoeFluentIcons.Shield, "遥测级别", telemetryText);
+            AddSummaryRow(SegoeFluentIcons.Sync, "自动检查更新", BoolText(CardAutoUpdate.IsOn));
+            AddSummaryRow(SegoeFluentIcons.Personalize, "应用主题", themeText);
+            AddSummaryRow(SegoeFluentIcons.Slideshow, "PowerPoint / WPS 联动", BoolText(CardPptSupport.IsOn));
+            AddSummaryRow(SegoeFluentIcons.TouchPointer, "双指缩放 / 平移",
+                $"{BoolText(CardTwoFingerZoom.IsOn)} / {BoolText(CardTwoFingerTranslate.IsOn)}");
+            AddSummaryRow(SegoeFluentIcons.Pin, "系统托盘图标", BoolText(CardEnableTrayIcon.IsOn));
+            AddSummaryRow(SegoeFluentIcons.Document, "启用日志", BoolText(CardIsLogEnabled.IsOn));
+        }
+
+        private static string BoolText(bool value) => value ? "已启用" : "已关闭";
+
+        private void AddSummaryRow(FontIconData icon, string label, string value)
+        {
+            var grid = new Grid { Margin = new Thickness(0, 2, 0, 2) };
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(28) });
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(180) });
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+
+            var fontIcon = new FontIcon { Icon = icon, FontSize = 16, Opacity = 0.85 };
+            Grid.SetColumn(fontIcon, 0);
+            grid.Children.Add(fontIcon);
+
+            var labelBlock = new TextBlock
+            {
+                Text = label,
+                Opacity = 0.85,
+                VerticalAlignment = VerticalAlignment.Center
+            };
+            Grid.SetColumn(labelBlock, 1);
+            grid.Children.Add(labelBlock);
+
+            var valueBlock = new TextBlock
+            {
+                Text = value,
+                FontWeight = FontWeights.SemiBold,
+                TextWrapping = TextWrapping.Wrap,
+                VerticalAlignment = VerticalAlignment.Center
+            };
+            Grid.SetColumn(valueBlock, 2);
+            grid.Children.Add(valueBlock);
+
+            FinishSummaryHost.Children.Add(grid);
+        }
+
+        private void AnimateProgress(double targetPercent, bool instant)
         {
             try
             {
-                double total = ActualWidth > 0 ? ActualWidth : Width;
+                if (StepProgressBar == null) return;
-                double trackWidth = Math.Max(0, Math.Min(420, total - 56 * 2 - 320));
-                double progress = (_currentStep + 1) / (double)StepCount;
-                double targetWidth = trackWidth * progress;
 
                 if (instant)
                 {
-                    ProgressFill.Width = targetWidth;
+                    StepProgressBar.BeginAnimation(System.Windows.Controls.Primitives.RangeBase.ValueProperty, null);
+                    StepProgressBar.Value = targetPercent;
                     return;
                 }
 
                 var anim = new DoubleAnimation
                 {
-                    To = targetWidth,
+                    To = targetPercent,
                     Duration = TimeSpan.FromMilliseconds(320),
                     EasingFunction = new CubicEase { EasingMode = EasingMode.EaseOut }
                 };
-                ProgressFill.BeginAnimation(WidthProperty, anim);
+                StepProgressBar.BeginAnimation(System.Windows.Controls.Primitives.RangeBase.ValueProperty, anim);
             }
             catch (Exception ex)
             {
@@ -483,7 +668,7 @@ namespace Ink_Canvas.Windows
             }
         }
 
-        private void AnimateStepSlide(int direction)
+        private void AnimateContentSlide(int direction)
         {
             // direction: 1 = 前进 (新内容从右滑入), -1 = 后退 (从左滑入)
             double from = direction > 0 ? 36 : -36;
@@ -509,11 +694,5 @@ namespace Ink_Canvas.Windows
             StepHostTransform.BeginAnimation(TranslateTransform.XProperty, slide);
             StepHost.BeginAnimation(OpacityProperty, fade);
         }
-
-        protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
-        {
-            base.OnRenderSizeChanged(sizeInfo);
-            AnimateProgress(instant: true);
-        }
     }
 }