LucianoDev
37d099cdbd
Unlock progress UI:
- UnlockProgressDialog with dark-themed progress ring, phase indicator, elapsed
time, and cancel/close buttons (non-modal, draggable borderless window)
- UnlockProgressViewModel with event-driven progress tracking via IUnlockService
- Triggers on pump selection (manual or K-Line auto-detect), not test start
UnlockService rewrite:
- Persistent CAN senders that outlive the unlock sequence (StopSenders on pump change)
- Concurrent K-Line fast unlock: awaits session Connected, sends RAM timer shortcut
({02 88 02 03 A8 01 00}), verifies via CAN TestUnlock before skipping wait
- Fix Type 1 verification (Value == 0 means unlocked, was inverted)
K-Line fast unlock support:
- IKwpService.TryFastUnlockAsync / KwpService implementation
Additional features:
- ILocalizationService with ES/EN resource dictionaries and runtime switching
- Safety dialogs: VoltageWarning, OilPumpConfirm, RpmSafetyWarning
- SettingsDialog for app configuration
- BenchService enhancements, ConfigurationService improvements, PDF report updates
- All UI strings localized via DynamicResource
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
108 lines
6.7 KiB
XML
108 lines
6.7 KiB
XML
<UserControl x:Class="HC_APTBS.Views.UserControls.PumpIdentificationView"
|
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
|
|
|
<UserControl.Resources>
|
|
<BooleanToVisibilityConverter x:Key="BoolToVis"/>
|
|
</UserControl.Resources>
|
|
|
|
<StackPanel>
|
|
<!-- Pump selector -->
|
|
<Border BorderBrush="#999" BorderThickness="0,0,0,1" Padding="6,8">
|
|
<Grid>
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition Width="Auto"/>
|
|
<ColumnDefinition/>
|
|
<ColumnDefinition Width="Auto"/>
|
|
</Grid.ColumnDefinitions>
|
|
<TextBlock Text="{DynamicResource PumpId.Label}" VerticalAlignment="Center" Margin="0,0,8,0" FontSize="14"/>
|
|
<ComboBox Grid.Column="1"
|
|
ItemsSource="{Binding PumpIds}"
|
|
SelectedItem="{Binding SelectedPumpId}"
|
|
FontSize="14" VerticalAlignment="Center"/>
|
|
<TextBlock Grid.Column="2" Margin="8,0,0,0"
|
|
Text="{Binding CurrentPump.Model}" FontSize="12"
|
|
Foreground="Gray" VerticalAlignment="Center"/>
|
|
</Grid>
|
|
</Border>
|
|
|
|
<!-- K-Line ECU info + read button -->
|
|
<Border BorderBrush="#999" BorderThickness="0,0,0,1" Padding="6,6">
|
|
<Grid>
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition/>
|
|
<ColumnDefinition Width="Auto"/>
|
|
</Grid.ColumnDefinitions>
|
|
|
|
<StackPanel>
|
|
<StackPanel Orientation="Horizontal">
|
|
<TextBlock Text="{DynamicResource PumpId.Dfi}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
|
<TextBlock Text="{Binding KlineDfi}" FontSize="12" FontFamily="Consolas"/>
|
|
</StackPanel>
|
|
<StackPanel Orientation="Horizontal">
|
|
<TextBlock Text="{DynamicResource PumpId.PumpId}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
|
<TextBlock Text="{Binding KlinePumpId}" FontSize="12" FontFamily="Consolas"/>
|
|
</StackPanel>
|
|
<StackPanel Orientation="Horizontal">
|
|
<TextBlock Text="{DynamicResource PumpId.SerialNo}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
|
<TextBlock Text="{Binding KlineSerialNumber}" FontSize="12" FontFamily="Consolas"/>
|
|
</StackPanel>
|
|
<StackPanel Orientation="Horizontal">
|
|
<TextBlock Text="{DynamicResource PumpId.ModelRef}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
|
<TextBlock Text="{Binding KlineModelRef}" FontSize="12" FontFamily="Consolas"/>
|
|
</StackPanel>
|
|
<StackPanel Orientation="Horizontal">
|
|
<TextBlock Text="{DynamicResource PumpId.DataRecord}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
|
<TextBlock Text="{Binding KlineDataRecord}" FontSize="12" FontFamily="Consolas"/>
|
|
</StackPanel>
|
|
<StackPanel Orientation="Horizontal">
|
|
<TextBlock Text="{DynamicResource PumpId.PumpCtrl}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
|
<TextBlock Text="{Binding KlinePumpControl}" FontSize="12" FontFamily="Consolas"/>
|
|
</StackPanel>
|
|
<StackPanel Orientation="Horizontal">
|
|
<TextBlock Text="{DynamicResource PumpId.ModelIndex}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
|
<TextBlock Text="{Binding KlineModelIndex}" FontSize="12" FontFamily="Consolas"/>
|
|
</StackPanel>
|
|
<StackPanel Orientation="Horizontal">
|
|
<TextBlock Text="{DynamicResource PumpId.SwVer1}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
|
<TextBlock Text="{Binding KlineSwVersion1}" FontSize="12" FontFamily="Consolas"/>
|
|
</StackPanel>
|
|
<StackPanel Orientation="Horizontal">
|
|
<TextBlock Text="{DynamicResource PumpId.SwVer2}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
|
<TextBlock Text="{Binding KlineSwVersion2}" FontSize="12" FontFamily="Consolas"/>
|
|
</StackPanel>
|
|
<StackPanel Orientation="Horizontal">
|
|
<TextBlock Text="{DynamicResource PumpId.Errors}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
|
<TextBlock Text="{Binding KlineErrors}" FontSize="12" FontFamily="Consolas" Foreground="DarkRed"/>
|
|
</StackPanel>
|
|
<!-- ConnectError row: auto-collapses when empty via DataTrigger -->
|
|
<StackPanel Orientation="Horizontal">
|
|
<StackPanel.Style>
|
|
<Style TargetType="StackPanel">
|
|
<Style.Triggers>
|
|
<DataTrigger Binding="{Binding KlineConnectError}" Value="">
|
|
<Setter Property="Visibility" Value="Collapsed"/>
|
|
</DataTrigger>
|
|
</Style.Triggers>
|
|
</Style>
|
|
</StackPanel.Style>
|
|
<TextBlock Text="{DynamicResource PumpId.Error}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
|
<TextBlock Text="{Binding KlineConnectError}" FontSize="12" FontFamily="Consolas" Foreground="Red"/>
|
|
</StackPanel>
|
|
</StackPanel>
|
|
|
|
<StackPanel Grid.Column="1" VerticalAlignment="Center" Margin="6,0,0,0">
|
|
<Button Content="{DynamicResource PumpId.ReadKLine}" Width="90" Margin="0,2"
|
|
Command="{Binding ReadKlineCommand}"/>
|
|
<Button Content="{DynamicResource PumpId.Disconnect}" Width="90" Margin="0,2"
|
|
Command="{Binding DisconnectKLineCommand}"/>
|
|
<!-- Progress bar shown during K-Line read -->
|
|
<ProgressBar Value="{Binding ProgressPercent, Mode=OneWay}"
|
|
Minimum="0" Maximum="100" Height="6"
|
|
Visibility="{Binding IsReading, Converter={StaticResource BoolToVis}}"/>
|
|
</StackPanel>
|
|
</Grid>
|
|
</Border>
|
|
</StackPanel>
|
|
</UserControl>
|