From 6ef11b752a8b4f40d1104f49ae656851be3a6a80 Mon Sep 17 00:00:00 2001
From: tian <11429339@qq.com>
Date: Fri, 7 Aug 2026 09:28:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A2=B0=E6=92=9E=E7=83=AD=E7=82=B9?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E8=AF=AD=E4=B9=89=E4=BF=AE=E6=AD=A3=EF=BC=88=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3=E5=9C=BA=E6=99=AF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 按钮'继续生成动画'→'重新生成动画'（手动分析入口不在动画生成流程中，
  旧名误导）；ToolTip 说明行为
- 按钮启用由勾选状态驱动：有默认预选或用户勾选的排除对象才激活
  （IsExcluded PropertyChanged → UpdateActionButtonState）
- 无排除选中时按钮禁用（用户点'取消'关闭）；ActionButton_Click 防御
  （无排除 → 等同取消，不再触发 Continue 保存记录）
- Continue 分支保留（自动关闭场景使用）

验证：集成测试 25/25
---
 src/UI/WPF/Views/CollisionAnalysisDialog.xaml |  5 +++-
 .../WPF/Views/CollisionAnalysisDialog.xaml.cs | 29 +++++++++++++++++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/UI/WPF/Views/CollisionAnalysisDialog.xaml b/src/UI/WPF/Views/CollisionAnalysisDialog.xaml
index 5e2679b..040e4e9 100644
--- a/src/UI/WPF/Views/CollisionAnalysisDialog.xaml
+++ b/src/UI/WPF/Views/CollisionAnalysisDialog.xaml
@@ -199,8 +199,11 @@
 
         <!-- 按钮 -->
         <StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Content="继续生成动画" 
+            <Button x:Name="ActionButton"
+                    Content="重新生成动画" 
                     Width="120" 
+                    IsEnabled="False"
+                    ToolTip="将选中的物体加入排除列表并重新生成动画（排除后重新检测）"
                     Click="ActionButton_Click"
                     Style="{StaticResource ActionButtonStyle}"/>
             <Button Content="取消" 
diff --git a/src/UI/WPF/Views/CollisionAnalysisDialog.xaml.cs b/src/UI/WPF/Views/CollisionAnalysisDialog.xaml.cs
index d1fd34f..36fa5a0 100644
--- a/src/UI/WPF/Views/CollisionAnalysisDialog.xaml.cs
+++ b/src/UI/WPF/Views/CollisionAnalysisDialog.xaml.cs
@@ -60,13 +60,37 @@ namespace NavisworksTransport.UI.WPF.Views
             
             _viewModels = viewModels;
             
+            // 🔥 勾选状态驱动“重新生成动画”按钮启用（有任一选中才可执行）
+            foreach (var vm in viewModels)
+            {
+                vm.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(HotspotViewModel.IsExcluded))
+                    {
+                        UpdateActionButtonState();
+                    }
+                };
+            }
+            
             // 记录自动选中结果
             int autoSelectedCount = viewModels.Count(vm => vm.IsExcluded);
             LogManager.Info($"[碰撞分析] 自动选中 {autoSelectedCount}/{viewModels.Count} 个高频碰撞物体（>100次或>50%）");
         }
 
+        private void UpdateActionButtonState()
+        {
+            if (ActionButton != null)
+            {
+                bool hasExcluded = _viewModels?.Any(vm => vm.IsExcluded) ?? false;
+                ActionButton.IsEnabled = hasExcluded;
+            }
+        }
+
         private void CollisionAnalysisDialog_Loaded(object sender, RoutedEventArgs e)
         {
+            // 初始预选状态驱动按钮（有自动选中的排除对象 → 激活重新生成动画）
+            UpdateActionButtonState();
+
             if (!TestAutomationHttpService.ShouldAutoConfirmCollisionAnalysisDialogs &&
                 !AutomationModeContext.IsAutomaticMode)
             {
@@ -185,8 +209,9 @@ namespace NavisworksTransport.UI.WPF.Views
             }
             else
             {
-                SelectedAction = CollisionAnalysisAction.Continue;
-                LogManager.Info("[碰撞分析] 用户选择直接继续生成（无排除对象）");
+                // 🔥 防御：无选中排除时（按钮通常已禁用）——等同取消，不做任何业务操作
+                SelectedAction = CollisionAnalysisAction.Cancel;
+                LogManager.Info("[碰撞分析] 无排除对象选中，等同取消");
             }
             
             Close();