feat: 优化UI
This commit is contained in:
GukSang.Jin
@@ -1550,79 +1550,482 @@
|
||||
Foreground="#2E7D32"
|
||||
Margin="0,0,0,20"/>
|
||||
|
||||
<!-- 参数列表 -->
|
||||
<StackPanel>
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="20,15"
|
||||
Margin="0,0,0,10">
|
||||
<Grid>
|
||||
<TextBlock Text="水温设置"
|
||||
FontSize="18"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<TextBlock Text="40°C"
|
||||
FontSize="20"
|
||||
FontWeight="Bold"
|
||||
Foreground="#FF6F00"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
<!-- 参数列表 - 两列布局 -->
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="15"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="20,15"
|
||||
Margin="0,0,0,10">
|
||||
<Grid>
|
||||
<TextBlock Text="风温设置"
|
||||
FontSize="18"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<TextBlock Text="45°C"
|
||||
FontSize="20"
|
||||
FontWeight="Bold"
|
||||
Foreground="#FF6F00"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
<!-- 左列 -->
|
||||
<StackPanel Grid.Column="0">
|
||||
<!-- 首次喷水 -->
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="15,12"
|
||||
Margin="0,0,0,10">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="首次喷水"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<StackPanel Grid.Column="1" Orientation="Horizontal">
|
||||
<TextBox Text="{Binding FirstSprayWaterTime, UpdateSourceTrigger=PropertyChanged}"
|
||||
Width="70"
|
||||
FontSize="16"
|
||||
FontWeight="Bold"
|
||||
Foreground="#FF6F00"
|
||||
Background="White"
|
||||
BorderBrush="#FF6F00"
|
||||
BorderThickness="2"
|
||||
Padding="6,4"
|
||||
TextAlignment="Center"
|
||||
VerticalContentAlignment="Center"/>
|
||||
<TextBlock Text="分钟"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
Margin="8,0,0,0"
|
||||
VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 喷沐浴露1 -->
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="15,12"
|
||||
Margin="0,0,0,10">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="喷沐浴露1"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<StackPanel Grid.Column="1" Orientation="Horizontal">
|
||||
<TextBox Text="{Binding SprayShampoo1Time, UpdateSourceTrigger=PropertyChanged}"
|
||||
Width="70"
|
||||
FontSize="16"
|
||||
FontWeight="Bold"
|
||||
Foreground="#FF6F00"
|
||||
Background="White"
|
||||
BorderBrush="#FF6F00"
|
||||
BorderThickness="2"
|
||||
Padding="6,4"
|
||||
TextAlignment="Center"
|
||||
VerticalContentAlignment="Center"/>
|
||||
<TextBlock Text="分钟"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
Margin="8,0,0,0"
|
||||
VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 沐浴1后喷水 -->
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="15,12"
|
||||
Margin="0,0,0,10">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="沐浴1后喷水"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<StackPanel Grid.Column="1" Orientation="Horizontal">
|
||||
<TextBox Text="{Binding AfterShampoo1SprayTime, UpdateSourceTrigger=PropertyChanged}"
|
||||
Width="70"
|
||||
FontSize="16"
|
||||
FontWeight="Bold"
|
||||
Foreground="#FF6F00"
|
||||
Background="White"
|
||||
BorderBrush="#FF6F00"
|
||||
BorderThickness="2"
|
||||
Padding="6,4"
|
||||
TextAlignment="Center"
|
||||
VerticalContentAlignment="Center"/>
|
||||
<TextBlock Text="分钟"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
Margin="8,0,0,0"
|
||||
VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 喷沐浴露2 -->
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="15,12"
|
||||
Margin="0,0,0,10">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="喷沐浴露2"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<StackPanel Grid.Column="1" Orientation="Horizontal">
|
||||
<TextBox Text="{Binding SprayShampoo2Time, UpdateSourceTrigger=PropertyChanged}"
|
||||
Width="70"
|
||||
FontSize="16"
|
||||
FontWeight="Bold"
|
||||
Foreground="#FF6F00"
|
||||
Background="White"
|
||||
BorderBrush="#FF6F00"
|
||||
BorderThickness="2"
|
||||
Padding="6,4"
|
||||
TextAlignment="Center"
|
||||
VerticalContentAlignment="Center"/>
|
||||
<TextBlock Text="分钟"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
Margin="8,0,0,0"
|
||||
VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 沐浴2后喷水 -->
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="15,12"
|
||||
Margin="0,0,0,10">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="沐浴2后喷水"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<StackPanel Grid.Column="1" Orientation="Horizontal">
|
||||
<TextBox Text="{Binding AfterShampoo2SprayTime, UpdateSourceTrigger=PropertyChanged}"
|
||||
Width="70"
|
||||
FontSize="16"
|
||||
FontWeight="Bold"
|
||||
Foreground="#FF6F00"
|
||||
Background="White"
|
||||
BorderBrush="#FF6F00"
|
||||
BorderThickness="2"
|
||||
Padding="6,4"
|
||||
TextAlignment="Center"
|
||||
VerticalContentAlignment="Center"/>
|
||||
<TextBlock Text="分钟"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
Margin="8,0,0,0"
|
||||
VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="20,15"
|
||||
Margin="0,0,0,10">
|
||||
<Grid>
|
||||
<TextBlock Text="水压设置"
|
||||
FontSize="18"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<TextBlock Text="标准"
|
||||
FontSize="20"
|
||||
FontWeight="Bold"
|
||||
Foreground="#4CAF50"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
<!-- 右列 -->
|
||||
<StackPanel Grid.Column="2">
|
||||
<!-- 喷沐浴露3 -->
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="15,12"
|
||||
Margin="0,0,0,10">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="喷沐浴露3"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<StackPanel Grid.Column="1" Orientation="Horizontal">
|
||||
<TextBox Text="{Binding SprayShampoo3Time, UpdateSourceTrigger=PropertyChanged}"
|
||||
Width="70"
|
||||
FontSize="16"
|
||||
FontWeight="Bold"
|
||||
Foreground="#FF6F00"
|
||||
Background="White"
|
||||
BorderBrush="#FF6F00"
|
||||
BorderThickness="2"
|
||||
Padding="6,4"
|
||||
TextAlignment="Center"
|
||||
VerticalContentAlignment="Center"/>
|
||||
<TextBlock Text="分钟"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
Margin="8,0,0,0"
|
||||
VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 沐浴3后喷水 -->
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="15,12"
|
||||
Margin="0,0,0,10">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="沐浴3后喷水"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<StackPanel Grid.Column="1" Orientation="Horizontal">
|
||||
<TextBox Text="{Binding AfterShampoo3SprayTime, UpdateSourceTrigger=PropertyChanged}"
|
||||
Width="70"
|
||||
FontSize="16"
|
||||
FontWeight="Bold"
|
||||
Foreground="#FF6F00"
|
||||
Background="White"
|
||||
BorderBrush="#FF6F00"
|
||||
BorderThickness="2"
|
||||
Padding="6,4"
|
||||
TextAlignment="Center"
|
||||
VerticalContentAlignment="Center"/>
|
||||
<TextBlock Text="分钟"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
Margin="8,0,0,0"
|
||||
VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 喷水时间 -->
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="15,12"
|
||||
Margin="0,0,0,10">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="喷水时间"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<StackPanel Grid.Column="1" Orientation="Horizontal">
|
||||
<TextBox Text="{Binding SprayWaterTime, UpdateSourceTrigger=PropertyChanged}"
|
||||
Width="70"
|
||||
FontSize="16"
|
||||
FontWeight="Bold"
|
||||
Foreground="#FF6F00"
|
||||
Background="White"
|
||||
BorderBrush="#FF6F00"
|
||||
BorderThickness="2"
|
||||
Padding="6,4"
|
||||
TextAlignment="Center"
|
||||
VerticalContentAlignment="Center"/>
|
||||
<TextBlock Text="分钟"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
Margin="8,0,0,0"
|
||||
VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 冷风机时间 -->
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="15,12"
|
||||
Margin="0,0,0,10">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="冷风机时间"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<StackPanel Grid.Column="1" Orientation="Horizontal">
|
||||
<TextBox Text="{Binding ColdAirTime, UpdateSourceTrigger=PropertyChanged}"
|
||||
Width="70"
|
||||
FontSize="16"
|
||||
FontWeight="Bold"
|
||||
Foreground="#FF6F00"
|
||||
Background="White"
|
||||
BorderBrush="#FF6F00"
|
||||
BorderThickness="2"
|
||||
Padding="6,4"
|
||||
TextAlignment="Center"
|
||||
VerticalContentAlignment="Center"/>
|
||||
<TextBlock Text="分钟"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
Margin="8,0,0,0"
|
||||
VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 热风机时间 -->
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="15,12"
|
||||
Margin="0,0,0,10">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="热风机时间"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<StackPanel Grid.Column="1" Orientation="Horizontal">
|
||||
<TextBox Text="{Binding HotAirTime, UpdateSourceTrigger=PropertyChanged}"
|
||||
Width="70"
|
||||
FontSize="16"
|
||||
FontWeight="Bold"
|
||||
Foreground="#FF6F00"
|
||||
Background="White"
|
||||
BorderBrush="#FF6F00"
|
||||
BorderThickness="2"
|
||||
Padding="6,4"
|
||||
TextAlignment="Center"
|
||||
VerticalContentAlignment="Center"/>
|
||||
<TextBlock Text="分钟"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
Margin="8,0,0,0"
|
||||
VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
|
||||
<!-- 分隔线 -->
|
||||
<Border Height="2" Background="#E0E0E0" Margin="0,20,0,20"/>
|
||||
|
||||
<!-- 固定参数显示 - 两列布局 -->
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="15"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="20,15">
|
||||
<Grid>
|
||||
<TextBlock Text="系统版本"
|
||||
FontSize="18"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<TextBlock Text="v1.0.0"
|
||||
FontSize="20"
|
||||
FontWeight="Bold"
|
||||
Foreground="#3F51B5"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
<StackPanel Grid.Column="0">
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="15,12"
|
||||
Margin="0,0,0,10">
|
||||
<Grid>
|
||||
<TextBlock Text="水温设置"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<TextBlock Text="40°C"
|
||||
FontSize="18"
|
||||
FontWeight="Bold"
|
||||
Foreground="#FF6F00"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="15,12"
|
||||
Margin="0,0,0,10">
|
||||
<Grid>
|
||||
<TextBlock Text="水压设置"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<TextBlock Text="标准"
|
||||
FontSize="18"
|
||||
FontWeight="Bold"
|
||||
Foreground="#4CAF50"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Grid.Column="2">
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="15,12"
|
||||
Margin="0,0,0,10">
|
||||
<Grid>
|
||||
<TextBlock Text="风温设置"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<TextBlock Text="45°C"
|
||||
FontSize="18"
|
||||
FontWeight="Bold"
|
||||
Foreground="#FF6F00"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<Border Background="#F5F5F5"
|
||||
CornerRadius="10"
|
||||
Padding="15,12"
|
||||
Margin="0,0,0,10">
|
||||
<Grid>
|
||||
<TextBlock Text="系统版本"
|
||||
FontSize="16"
|
||||
Foreground="#424242"
|
||||
VerticalAlignment="Center"/>
|
||||
<TextBlock Text="v1.0.0"
|
||||
FontSize="18"
|
||||
FontWeight="Bold"
|
||||
Foreground="#3F51B5"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
|
||||
<!-- 保存按钮 -->
|
||||
<Button Content="保存设置"
|
||||
FontSize="24"
|
||||
FontWeight="Bold"
|
||||
Height="60"
|
||||
Background="#4CAF50"
|
||||
Foreground="White"
|
||||
BorderThickness="0"
|
||||
Margin="0,20,0,0"
|
||||
Cursor="Hand"
|
||||
Command="{Binding SaveSettingsCommand}">
|
||||
<Button.Template>
|
||||
<ControlTemplate TargetType="Button">
|
||||
<Border Background="{TemplateBinding Background}"
|
||||
CornerRadius="15">
|
||||
<Border.Effect>
|
||||
<DropShadowEffect Color="#000000" BlurRadius="8" ShadowDepth="3" Opacity="0.3"/>
|
||||
</Border.Effect>
|
||||
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||
</Border>
|
||||
</ControlTemplate>
|
||||
</Button.Template>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
|
||||
Reference in New Issue
Block a user