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>
139 lines
6.0 KiB
XML
139 lines
6.0 KiB
XML
<Window x:Class="HC_APTBS.Views.Dialogs.UnlockProgressDialog"
|
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
mc:Ignorable="d"
|
|
Title="{DynamicResource Dialog.Unlock.Title}"
|
|
Height="360" Width="340"
|
|
WindowStyle="None" ResizeMode="NoResize"
|
|
WindowStartupLocation="CenterOwner"
|
|
Topmost="True"
|
|
Background="#FF2B2929"
|
|
MouseLeftButtonDown="OnMouseDrag"
|
|
Closing="OnWindowClosing">
|
|
|
|
<Window.Resources>
|
|
<BooleanToVisibilityConverter x:Key="BoolToVis"/>
|
|
</Window.Resources>
|
|
|
|
<Grid Margin="16">
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="210"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="*"/>
|
|
<RowDefinition Height="Auto"/>
|
|
</Grid.RowDefinitions>
|
|
|
|
<!-- Unlock type label -->
|
|
<TextBlock Grid.Row="0"
|
|
Text="{Binding UnlockTypeLabel, Mode=OneWay}"
|
|
FontSize="14" Foreground="#AAAAAA"
|
|
HorizontalAlignment="Center" Margin="0,0,0,4"/>
|
|
|
|
<!-- Progress ring area -->
|
|
<Grid Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center">
|
|
<!-- Background ring -->
|
|
<Ellipse Width="200" Height="200"
|
|
Stroke="#4D4D4D" StrokeThickness="10"
|
|
Fill="Transparent"/>
|
|
|
|
<!-- Content inside ring -->
|
|
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
|
|
<TextBlock Text="{DynamicResource Dialog.Unlock.Progress}"
|
|
FontSize="12" Foreground="#888888"
|
|
HorizontalAlignment="Center" Margin="0,0,0,4"/>
|
|
|
|
<!-- Percentage -->
|
|
<TextBlock FontSize="60" FontFamily="Courier New"
|
|
Foreground="White" HorizontalAlignment="Center">
|
|
<TextBlock.Text>
|
|
<Binding Path="Progress" Mode="OneWay"
|
|
StringFormat="{}{0}%"/>
|
|
</TextBlock.Text>
|
|
</TextBlock>
|
|
|
|
<!-- Elapsed time -->
|
|
<TextBlock Text="{Binding ElapsedTime, Mode=OneWay}"
|
|
FontSize="16" FontFamily="Courier New"
|
|
Foreground="#CCCCCC" HorizontalAlignment="Center"
|
|
Margin="0,2,0,0"/>
|
|
</StackPanel>
|
|
</Grid>
|
|
|
|
<!-- Phase text -->
|
|
<TextBlock Grid.Row="2"
|
|
Text="{Binding PhaseText, Mode=OneWay}"
|
|
FontSize="16" Foreground="White"
|
|
HorizontalAlignment="Center" Margin="0,4,0,6"/>
|
|
|
|
<!-- Progress bar -->
|
|
<ProgressBar Grid.Row="3"
|
|
Value="{Binding Progress, Mode=OneWay}"
|
|
Minimum="0" Maximum="100"
|
|
Height="12" Margin="8,0"
|
|
Foreground="#00EC00" Background="#3D3D3D"/>
|
|
|
|
<!-- Result text — overlays the spacer row so it never displaces buttons -->
|
|
<TextBlock Grid.Row="4"
|
|
Text="{Binding ResultText, Mode=OneWay}"
|
|
FontSize="22" FontWeight="Bold"
|
|
HorizontalAlignment="Center" VerticalAlignment="Center"
|
|
Visibility="{Binding IsComplete, Converter={StaticResource BoolToVis}}">
|
|
<TextBlock.Style>
|
|
<Style TargetType="TextBlock">
|
|
<Setter Property="Foreground" Value="#FF5858"/>
|
|
<Style.Triggers>
|
|
<DataTrigger Binding="{Binding IsSuccess}" Value="True">
|
|
<Setter Property="Foreground" Value="#00EC00"/>
|
|
</DataTrigger>
|
|
</Style.Triggers>
|
|
</Style>
|
|
</TextBlock.Style>
|
|
</TextBlock>
|
|
|
|
<!-- Buttons -->
|
|
<StackPanel Grid.Row="5" Orientation="Horizontal"
|
|
HorizontalAlignment="Center" Margin="0,8,0,0">
|
|
<!-- Cancel button -->
|
|
<Button Content="{DynamicResource Common.Cancel}" Width="90" Height="30"
|
|
Margin="0,0,12,0"
|
|
Command="{Binding CancelCommand}"
|
|
Foreground="White" FontWeight="Bold">
|
|
<Button.Style>
|
|
<Style TargetType="Button">
|
|
<Setter Property="Background" Value="#FF5858"/>
|
|
<Style.Triggers>
|
|
<Trigger Property="IsEnabled" Value="False">
|
|
<Setter Property="Background" Value="#4D4D4D"/>
|
|
<Setter Property="Foreground" Value="#888888"/>
|
|
</Trigger>
|
|
</Style.Triggers>
|
|
</Style>
|
|
</Button.Style>
|
|
</Button>
|
|
|
|
<!-- Close button -->
|
|
<Button Content="{DynamicResource Common.Close}" Width="90" Height="30"
|
|
Command="{Binding CloseCommand}"
|
|
Foreground="White" FontWeight="Bold">
|
|
<Button.Style>
|
|
<Style TargetType="Button">
|
|
<Setter Property="Background" Value="#4D4D4D"/>
|
|
<Style.Triggers>
|
|
<Trigger Property="IsEnabled" Value="True">
|
|
<Setter Property="Background" Value="#337AB7"/>
|
|
</Trigger>
|
|
<Trigger Property="IsEnabled" Value="False">
|
|
<Setter Property="Foreground" Value="#888888"/>
|
|
</Trigger>
|
|
</Style.Triggers>
|
|
</Style>
|
|
</Button.Style>
|
|
</Button>
|
|
</StackPanel>
|
|
</Grid>
|
|
</Window>
|