cgx/petwash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 更新

Browse Source
This commit is contained in:
GukSang.Jin
2026-02-27 16:56:18 +08:00
parent c7d107c2f1
commit fe0aee16ad
5 changed files with 237 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
PetWashControl/Views/MainWindow.xaml
View File

@@ -1303,11 +1303,17 @@
<Border Background="#E0E0E0"
Height="16"
CornerRadius="8"
Margin="0,0,0,10">
Margin="0,0,0,10"
x:Name="ProgressBarContainer">
<Border Background="#FFB74D"
CornerRadius="8"
HorizontalAlignment="Left"
Width="{Binding WashProgress, Converter={StaticResource ProgressToWidthConverter}}">
HorizontalAlignment="Left">
<Border.Width>
<MultiBinding Converter="{StaticResource ProgressToWidthConverter}">
<Binding Path="WashProgress"/>
<Binding ElementName="ProgressBarContainer" Path="ActualWidth"/>
</MultiBinding>
</Border.Width>
<Border.Effect>
<DropShadowEffect Color="#FF6F00" BlurRadius="8" ShadowDepth="0" Opacity="0.6"/>
</Border.Effect>
@@ -2092,6 +2098,119 @@
</Border>
</Grid>
<!-- 清理和杀菌弹窗（不可手动关闭） -->
<Grid Visibility="{Binding IsCleaningDialogOpen, Converter={StaticResource BoolToVisibilityConverter}}"
Background="#CC000000">
<Border Background="White"
CornerRadius="30"
MaxWidth="600"
MaxHeight="400"
Padding="0"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<Border.Effect>
<DropShadowEffect Color="#000000" BlurRadius="40" ShadowDepth="15" Opacity="0.6"/>
</Border.Effect>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<!-- 标题栏 -->
<Border Grid.Row="0"
Background="#4CAF50"
CornerRadius="30,30,0,0"
Padding="40,25,40,25">
<TextBlock Text="设备清理中"
FontSize="32"
FontWeight="Bold"
Foreground="White"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</Border>
<!-- 内容区 -->
<Border Grid.Row="1"
Padding="40,40,40,40"
Background="White"
CornerRadius="0,0,30,30">
<StackPanel VerticalAlignment="Center">
<!-- 动画图标 -->
<Viewbox Width="80" Height="80" Margin="0,0,0,30">
<Canvas Width="100" Height="100">
<Ellipse Width="100" Height="100"
Stroke="#4CAF50"
StrokeThickness="8"
StrokeDashArray="25 15">
<Ellipse.RenderTransform>
<RotateTransform x:Name="SpinnerRotate" CenterX="50" CenterY="50"/>
</Ellipse.RenderTransform>
<Ellipse.Triggers>
<EventTrigger RoutedEvent="Loaded">
<BeginStoryboard>
<Storyboard RepeatBehavior="Forever">
<DoubleAnimation Storyboard.TargetName="SpinnerRotate"
Storyboard.TargetProperty="Angle"
From="0" To="360"
Duration="0:0:2"/>
</Storyboard>
</BeginStoryboard>
</EventTrigger>
</Ellipse.Triggers>
</Ellipse>
</Canvas>
</Viewbox>
<!-- 清理消息 -->
<TextBlock Text="{Binding CleaningMessage}"
FontSize="24"
FontWeight="SemiBold"
Foreground="#333"
HorizontalAlignment="Center"
TextAlignment="Center"
Margin="0,0,0,20"/>
<!-- 进度条 -->
<Border Background="#E0E0E0"
CornerRadius="10"
Height="20"
Margin="0,0,0,15">
<Border Background="#4CAF50"
CornerRadius="10"
HorizontalAlignment="Left">
<Border.Width>
<MultiBinding Converter="{StaticResource ProgressToWidthConverter}">
<Binding Path="CleaningProgress"/>
<Binding RelativeSource="{RelativeSource AncestorType=Border, AncestorLevel=1}" Path="ActualWidth"/>
</MultiBinding>
</Border.Width>
</Border>
</Border>
<!-- 进度百分比 -->
<TextBlock FontSize="20"
FontWeight="Bold"
Foreground="#4CAF50"
HorizontalAlignment="Center">
<Run Text="{Binding CleaningProgress, Mode=OneWay}"/>
<Run Text="%"/>
</TextBlock>
<!-- 提示文字 -->
<TextBlock Text="请勿打开设备门"
FontSize="16"
Foreground="#FF5722"
HorizontalAlignment="Center"
Margin="0,20,0,0"
FontWeight="SemiBold"/>
</StackPanel>
</Border>
</Grid>
</Border>
</Grid>
<!-- 联系客服弹窗 -->
<Grid Visibility="{Binding IsCustomerServiceDialogOpen, Converter={StaticResource BoolToVisibilityConverter}}"
Background="#80000000">