From 7d137036dbcf65fa9fc31d2cf3ea054a77ffbc6e Mon Sep 17 00:00:00 2001
From: "GukSang.Jin" <guksang_chen@163.com>
Date: Fri, 27 Feb 2026 17:46:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PetWash.Api/petwash.db                        | Bin 20480 -> 20480 bytes
 PetWash.Api/petwash.db-shm                    | Bin 32768 -> 32768 bytes
 PetWash.Api/petwash.db-wal                    | Bin 24752 -> 37112 bytes
 PetWashControl/ViewModels/MainViewModel.cs    |   5 +-
 PetWashControl/Views/CompletionDialog.xaml    |  93 ++++++++++++++++++
 PetWashControl/Views/CompletionDialog.xaml.cs |  57 +++++++++++
 6 files changed, 153 insertions(+), 2 deletions(-)
 create mode 100644 PetWashControl/Views/CompletionDialog.xaml
 create mode 100644 PetWashControl/Views/CompletionDialog.xaml.cs

diff --git a/PetWash.Api/petwash.db b/PetWash.Api/petwash.db
index 251e2624475f27d699187dd19b1fb1297bbd1caf..ff520a0fcfb01a6ef480ce82934596b4e468ff54 100644
GIT binary patch
delta 337
zcmZY4F-ikL6vpuxCb+D`1RFcS3*_yaH*faMOcfc@q%p06MG#4mQb?P41lbGZ2*Msf
zaw72tu3EX<yypMl$9FjD!%@F~RaZFH=31}TPuun8`Ndo)rBI!k0v|^@s?*!+{eFj~
zDzh$g&V*FYkY*$|R+6)c9SA$iUe1QC1|Nth$}mL;wI^ckB~By|Z6IO4tA5@65GGDm
zK&*F>`*7C?A%-Z7J-AB_0ex`6$Nw-%LV_s50mB3Q4Zh8)`)WVzVq$PwG{t;r#?zu*
S&D+WO$dnp?PSsrAeSQP-l0~Ng

delta 65
zcmV-H0KWf#paFoO0kH8e7A_0{104ZSVPk7yXJvB(4FCWDE&;KV2QXc+flUFku`yE)
X11=8{lLtUbvsFN{4v|m}lMzqvasLy4

diff --git a/PetWash.Api/petwash.db-shm b/PetWash.Api/petwash.db-shm
index b8dbf7cabb9dd99dc06b9e2646a63b269b14fc42..9d3c4eecc7708cacba51f7fa1bfbc04f6b9cc130 100644
GIT binary patch
delta 195
zcmZo@U}|V!s+V}A%K!o_K+MR%AixQv*@1Yi;a9C#QTEpy`!?jn|8zZ*Yq!f-hWkJ!
zsp^47fdL1Q{Eq~n!V~Ky1%cLrt!D$$AgkFoE(~>IWZk&%H|yqK9!$)PY#SH;WZL}A
U?;jH*Q0^}iGY13b#)aJ408Je?4gdfE

delta 173
zcmZo@U}|V!s+V}A%K!o_K+MR%AixHsS%G*bE6>A3MmF32`Mw_nly|WG-rQUomnHa)
zRP{ikzyM_Ce<T1Eo>(u*3bLAI<3?YnjRyqSHvjTqVrFJ#VB5IyJJaTGe*c&@9^laf
E0LLFP@Bjb+

diff --git a/PetWash.Api/petwash.db-wal b/PetWash.Api/petwash.db-wal
index 3e616b65a7edeb5359b02be2c7c9785c25c9c9fb..bb6784995f75e6bc1b6bb4d5836523e5bf381a66 100644
GIT binary patch
delta 2273
zcmcIlO>Em_7`C0irKB++s;olQKFkhlw|chY#7PdQp5u;asq^Pb4HBeT;zC4{Zi!Pk
zAPk#?loRT5nAju+sA88*TGb2VFcG9_J5)kQNN|7)hy!qe2_&Y1#P=n3nxD03hx%aa
z`=0lEzvun&^WJLXe}7B}g5kV?&Hi{8!=A*@bLh^ka_*tLEnaRvd-v|8BXG;szaMO_
zeDK!BJDb7-l4d=)Z3<833$N#2)#}L1-f#NNrRQ#9_x10`;U<e+ZC#st#SzBZ*wytE
zOB`ieKRo3#crL;UG%qlL5EEWw+?ZR!-I6463>TbbxLHmBtPt_D5#CP=yr1O*f^!rL
z(t!}iabaN;3e%xrfa7?62;w80K!=@dh!gn0)-S1h-c}ME@>$_87e2lHS|M?L3~?uk
z)+&hGTqLpeIk@2+v)kM_i(X7iKlxAZjN@P7v!w@3u^X?^i`Q6BO%QWz>koD)USg0F
z%mv5Lp+JBaIQC$2LG71}zFep<Y`njgj+xs(J@d2iRVEcL=^9vBtyS_m@WZAd2y6}j
zXp8FaLTAjU*AM0zUr#+hVZ-Q^Ur~bWo(ksu)BB0%Yfoh}_3#Pftlj1FPvY-7O4XwF
zW^5^!s1>zZJ!iI8tk_*Uq_ixmGKeWrc?nRDu%kdi0aVwT0>`MH18VxBVsrT>C-L{*
z(DP@@TGyugHteQjRXi1!`_7M#0r*g{A_ebM<<oK+C<zrPi}5&+5=ur*i*O%M$ulNn
z3MA991u>lkXXGpp7u7^efxZ`HMLl6U+oja=X;@Az8>yz{b*(7s6j0?Qc%gZzg=h4<
z-l&g~vhY|vnJ+zpw1p#d*ZHCmk6Q@zTpPF<hH7EbYUNy6+XL-S$GnvetAKr#q`-V4
zEyqqPoeXs=WIzdlIi3b-d0tM-iX>-XPEBb+W$b{kvQarM!}?2NMiQg)_}FxkaQcoP
z$FrT1*3Xw=f9C4i`G!_4XhTceK#d1Lqo5tD<}2C>cy#)L8+ZAprtphe$Eiib`Vs?f
z`dL0kvsli|b}{zr7X=dAqYaX^QeiJF+NkCA(rR^~RBh<mKD`pv>T`u!=^Qd1x(6m0
z{jKO9wzP5Q+L5)(3s=exxQCNF2y&4-tvkuAt&KskJ8Ycls5pj==-aN=AEfq$9)A$@
zwC_vrQ5cVtK`#`U6?F6ZNAG*KXI?<s#b9kD?lw5g)>B#IV5Iv0m3r-DXIyUmp8CQ|
zL0U+BT^8Tkcgr7cH@<xl@x{pvjNI5vT_KH^SaZaR`xVDNQn=m0Gz#%F#|6V|V3@+p
zU+m4_ToW&MDKs&%iEXCeCW!{y$~`@?EJOx||Ik<;7>0Y_IfMiv3`aA9KghG}e;q+W
AhX4Qo

delta 336
zcmeydkZHp~MsxFewk8JMM-mJS0t_I~Ki~I*fbtHuqb7?MHD8$<4isWW7O%Qlsq%f!
zzm4Xf`1SO87@1`m0}_+76Vp?RLCRQ=l_n}@>n`k?A;}9A)MxCTd_EzLv3p~nDkGDM
z{^Yj;;*+J4csDZ&h4YESEcKiCQ0LCy_5?1F4t}1=`3gRp_baUCo0z~ixkUdDTwTCi
z?GMo>gEv7;&Ig;EzcG-Lk;y@SGNU2bWJadR8w90+<_Gb~fSkn&vt-VSpYtBQk7<Kw
z4gqTpnHczvDO!KBV5;b3i6nkT7NA};EP5aEu<o>FV@!nTwFK%-m>6_vGh@<mJ^*6U
BY5o8J

diff --git a/PetWashControl/ViewModels/MainViewModel.cs b/PetWashControl/ViewModels/MainViewModel.cs
index 4275647..c9d3828 100644
--- a/PetWashControl/ViewModels/MainViewModel.cs
+++ b/PetWashControl/ViewModels/MainViewModel.cs
@@ -988,8 +988,9 @@ public partial class MainViewModel : ObservableObject
             IsDoorOpen = true;
             StatusMessage = "清洗完成！请取出宠物";
             
-            MessageBox.Show("清洗完成！\n\n感谢使用无人自动洗宠机", "完成", 
-                          MessageBoxButton.OK, MessageBoxImage.Information);
+            // 显示自动关闭的完成对话框
+            var dialog = new Views.CompletionDialog();
+            dialog.ShowDialog();
             
             _logger.LogInfo("订单流程完成");
 
diff --git a/PetWashControl/Views/CompletionDialog.xaml b/PetWashControl/Views/CompletionDialog.xaml
new file mode 100644
index 0000000..9ee85e4
--- /dev/null
+++ b/PetWashControl/Views/CompletionDialog.xaml
@@ -0,0 +1,93 @@
+<Window x:Class="PetWashControl.Views.CompletionDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="完成" 
+        Height="250" 
+        Width="400"
+        WindowStartupLocation="CenterScreen"
+        WindowStyle="None"
+        AllowsTransparency="True"
+        Background="Transparent"
+        ResizeMode="NoResize">
+    <Border Background="White" 
+            CornerRadius="15" 
+            BorderBrush="#4A90E2" 
+            BorderThickness="2"
+            Padding="30">
+        <Border.Effect>
+            <DropShadowEffect Color="Black" 
+                            Direction="270" 
+                            ShadowDepth="3" 
+                            BlurRadius="10" 
+                            Opacity="0.3"/>
+        </Border.Effect>
+        
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+
+            <!-- 图标 -->
+            <Viewbox Grid.Row="0" Width="60" Height="60" Margin="0,0,0,20">
+                <Path Fill="#4CAF50" 
+                      Data="M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2M12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4M11,16.5L6.5,12L7.91,10.59L11,13.67L16.59,8.09L18,9.5L11,16.5Z"/>
+            </Viewbox>
+
+            <!-- 消息文本 -->
+            <TextBlock Grid.Row="1" 
+                      Text="清洗完成！&#x0a;&#x0a;感谢使用无人自动洗宠机"
+                      FontSize="18"
+                      FontWeight="Medium"
+                      TextAlignment="Center"
+                      TextWrapping="Wrap"
+                      Foreground="#333333"
+                      VerticalAlignment="Center"/>
+
+            <!-- 倒计时文本 -->
+            <TextBlock Grid.Row="2" 
+                      x:Name="CountdownText"
+                      Text="30秒后自动返回首页"
+                      FontSize="14"
+                      TextAlignment="Center"
+                      Foreground="#666666"
+                      Margin="0,20,0,15"/>
+
+            <!-- 确定按钮 -->
+            <Button Grid.Row="3"
+                   Content="确定"
+                   Click="OkButton_Click"
+                   Height="40"
+                   FontSize="16"
+                   FontWeight="Medium"
+                   Background="#4A90E2"
+                   Foreground="White"
+                   BorderThickness="0"
+                   Cursor="Hand">
+                <Button.Style>
+                    <Style TargetType="Button">
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="Button">
+                                    <Border Background="{TemplateBinding Background}"
+                                           CornerRadius="8"
+                                           Padding="20,0">
+                                        <ContentPresenter HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"/>
+                                    </Border>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                        <Style.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" Value="#357ABD"/>
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </Button.Style>
+            </Button>
+        </Grid>
+    </Border>
+</Window>
diff --git a/PetWashControl/Views/CompletionDialog.xaml.cs b/PetWashControl/Views/CompletionDialog.xaml.cs
new file mode 100644
index 0000000..ac0ab49
--- /dev/null
+++ b/PetWashControl/Views/CompletionDialog.xaml.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace PetWashControl.Views
+{
+    public partial class CompletionDialog : Window
+    {
+        private DispatcherTimer? _countdownTimer;
+        private int _remainingSeconds = 30;
+
+        public CompletionDialog()
+        {
+            InitializeComponent();
+            StartCountdown();
+        }
+
+        private void StartCountdown()
+        {
+            _countdownTimer = new DispatcherTimer
+            {
+                Interval = TimeSpan.FromSeconds(1)
+            };
+            _countdownTimer.Tick += CountdownTimer_Tick;
+            _countdownTimer.Start();
+        }
+
+        private void CountdownTimer_Tick(object? sender, EventArgs e)
+        {
+            _remainingSeconds--;
+            
+            if (_remainingSeconds > 0)
+            {
+                CountdownText.Text = $"{_remainingSeconds}秒后自动返回首页";
+            }
+            else
+            {
+                _countdownTimer?.Stop();
+                DialogResult = true;
+                Close();
+            }
+        }
+
+        private void OkButton_Click(object sender, RoutedEventArgs e)
+        {
+            _countdownTimer?.Stop();
+            DialogResult = true;
+            Close();
+        }
+
+        protected override void OnClosed(EventArgs e)
+        {
+            _countdownTimer?.Stop();
+            base.OnClosed(e);
+        }
+    }
+}