浅色主题统一 - 标题栏/导航栏/面板层次感/状态色对比度

src/YZWater.Avalonia/Controls/ThemeHelper.cs

@@ -25,6 +25,7 @@ internal static class ThemeHelper
     }
 
     // 常用快捷方法
+    public static IBrush AppBg() => GetBrush("AppBgBrush", "#0A0E14");
     public static IBrush SurfaceBg() => GetBrush("SurfaceBgBrush", "#111820");
     public static IBrush PanelBg() => GetBrush("PanelBgBrush", "#0D1117");
     public static IBrush Border() => GetBrush("BorderBrush", "#1C2333");
@@ -36,4 +37,8 @@ internal static class ThemeHelper
     public static IBrush Warning() => GetBrush("WarningBrush", "#F59E0B");
     public static IBrush Danger() => GetBrush("DangerBrush", "#EF4444");
     public static IBrush Info() => GetBrush("InfoBrush", "#3B82F6");
+    public static IBrush HeaderBg() => GetBrush("HeaderBgBrush", "#111820");
+    public static IBrush HeaderText() => GetBrush("HeaderTextBrush", "#E6EDF3");
+    public static IBrush HeaderSubtext() => GetBrush("HeaderSubtextBrush", "#9CA3AF");
+    public static IBrush NavBg() => GetBrush("NavBgBrush", "#111820");
 }

src/YZWater.Avalonia/Themes/IndustrialTheme.axaml

@@ -41,6 +41,14 @@
     <!-- 报警背景 -->
     <Color x:Key="AlarmBgColor">#1C0000</Color>
 
+    <!-- 标题栏专用色 -->
+    <Color x:Key="HeaderBgColor">#111820</Color>
+    <Color x:Key="HeaderTextColor">#E6EDF3</Color>
+    <Color x:Key="HeaderSubtextColor">#9CA3AF</Color>
+
+    <!-- 底部导航栏 -->
+    <Color x:Key="NavBgColor">#111820</Color>
+
     <!-- 按钮交互状态色 -->
     <Color x:Key="SuccessHoverColor">#009688</Color>
     <Color x:Key="SuccessPressedColor">#00796B</Color>
@@ -77,6 +85,10 @@
     <SolidColorBrush x:Key="TankSedimentBrush" Color="{StaticResource TankSedimentColor}"/>
     <SolidColorBrush x:Key="TankOutletBrush" Color="{StaticResource TankOutletColor}"/>
     <SolidColorBrush x:Key="AlarmBgBrush" Color="{StaticResource AlarmBgColor}"/>
+    <SolidColorBrush x:Key="HeaderBgBrush" Color="{StaticResource HeaderBgColor}"/>
+    <SolidColorBrush x:Key="HeaderTextBrush" Color="{StaticResource HeaderTextColor}"/>
+    <SolidColorBrush x:Key="HeaderSubtextBrush" Color="{StaticResource HeaderSubtextColor}"/>
+    <SolidColorBrush x:Key="NavBgBrush" Color="{StaticResource NavBgColor}"/>
     <SolidColorBrush x:Key="SuccessHoverBrush" Color="{StaticResource SuccessHoverColor}"/>
     <SolidColorBrush x:Key="SuccessPressedBrush" Color="{StaticResource SuccessPressedColor}"/>
     <SolidColorBrush x:Key="DangerHoverBrush" Color="{StaticResource DangerHoverColor}"/>

src/YZWater.Avalonia/Themes/IndustrialThemeLight.axaml

@@ -5,45 +5,53 @@
          YZWater3 工业风格设计系统 - 浅色主题
          ═══════════════════════════════════════════════════════════════ -->
 
-    <!-- 背景层级 -->
-    <Color x:Key="AppBgColor">#F0F2F5</Color>
-    <Color x:Key="SurfaceBgColor">#FFFFFF</Color>
-    <Color x:Key="PanelBgColor">#F8F9FA</Color>
+    <!-- 背景层级 (更深的层次区分) -->
+    <Color x:Key="AppBgColor">#E5E7EB</Color>
+    <Color x:Key="SurfaceBgColor">#F3F4F6</Color>
+    <Color x:Key="PanelBgColor">#FFFFFF</Color>
     <Color x:Key="CardBgColor">#FFFFFF</Color>
 
-    <!-- 边框/分隔线 -->
-    <Color x:Key="BorderColor">#D0D5DD</Color>
-    <Color x:Key="DividerColor">#E5E7EB</Color>
+    <!-- 标题栏专用色 -->
+    <Color x:Key="HeaderBgColor">#1F2937</Color>
+    <Color x:Key="HeaderTextColor">#F9FAFB</Color>
+    <Color x:Key="HeaderSubtextColor">#9CA3AF</Color>
+
+    <!-- 底部导航栏 -->
+    <Color x:Key="NavBgColor">#F9FAFB</Color>
+
+    <!-- 边框/分隔线 (更明显) -->
+    <Color x:Key="BorderColor">#9CA3AF</Color>
+    <Color x:Key="DividerColor">#D1D5DB</Color>
 
     <!-- 文字层级 -->
-    <Color x:Key="TextPrimaryColor">#101828</Color>
-    <Color x:Key="TextSecondaryColor">#667085</Color>
-    <Color x:Key="TextTertiaryColor">#98A2B3</Color>
-    <Color x:Key="TextDisabledColor">#B0B8C4</Color>
+    <Color x:Key="TextPrimaryColor">#111827</Color>
+    <Color x:Key="TextSecondaryColor">#4B5563</Color>
+    <Color x:Key="TextTertiaryColor">#6B7280</Color>
+    <Color x:Key="TextDisabledColor">#9CA3AF</Color>
 
-    <!-- 语义状态色 (保持不变) -->
-    <Color x:Key="SuccessColor">#00897B</Color>
-    <Color x:Key="WarningColor">#D97706</Color>
-    <Color x:Key="DangerColor">#DC2626</Color>
-    <Color x:Key="InfoColor">#2563EB</Color>
-    <Color x:Key="WaterColor">#0284C7</Color>
+    <!-- 语义状态色 (深色版，确保在浅色背景上可读) -->
+    <Color x:Key="SuccessColor">#047857</Color>
+    <Color x:Key="WarningColor">#B45309</Color>
+    <Color x:Key="DangerColor">#B91C1C</Color>
+    <Color x:Key="InfoColor">#1D4ED8</Color>
+    <Color x:Key="WaterColor">#0369A1</Color>
 
     <!-- 设备状态色 -->
-    <Color x:Key="DeviceRunningColor">#00897B</Color>
-    <Color x:Key="DeviceStoppedColor">#98A2B3</Color>
+    <Color x:Key="DeviceRunningColor">#047857</Color>
+    <Color x:Key="DeviceStoppedColor">#9CA3AF</Color>
 
-    <!-- 水箱色 -->
-    <Color x:Key="TankInletColor">#00897B</Color>
-    <Color x:Key="TankBioColor">#0284C7</Color>
-    <Color x:Key="TankSedimentColor">#7C3AED</Color>
-    <Color x:Key="TankOutletColor">#16A34A</Color>
+    <!-- 水箱色 (深色版) -->
+    <Color x:Key="TankInletColor">#047857</Color>
+    <Color x:Key="TankBioColor">#0369A1</Color>
+    <Color x:Key="TankSedimentColor">#6D28D9</Color>
+    <Color x:Key="TankOutletColor">#15803D</Color>
 
     <!-- 报警背景 -->
     <Color x:Key="AlarmBgColor">#FEF2F2</Color>
 
     <!-- 按钮交互状态色 -->
-    <Color x:Key="SuccessHoverColor">#009688</Color>
-    <Color x:Key="SuccessPressedColor">#00796B</Color>
+    <Color x:Key="SuccessHoverColor">#065F46</Color>
+    <Color x:Key="SuccessPressedColor">#064E3B</Color>
     <Color x:Key="DangerHoverColor">#FEE2E2</Color>
     <Color x:Key="DangerPressedColor">#FECACA</Color>
     <Color x:Key="InfoHoverColor">#DBEAFE</Color>
@@ -52,9 +60,9 @@
     <Color x:Key="WarningPressedColor">#FDE68A</Color>
 
     <!-- 切换按钮专用色 -->
-    <Color x:Key="ToggleBgColor">#F0F2F5</Color>
-    <Color x:Key="ToggleBorderColor">#D0D5DD</Color>
-    <Color x:Key="ToggleActiveBgColor">#00897B</Color>
+    <Color x:Key="ToggleBgColor">#E5E7EB</Color>
+    <Color x:Key="ToggleBorderColor">#9CA3AF</Color>
+    <Color x:Key="ToggleActiveBgColor">#047857</Color>
 
     <!-- 画刷 -->
     <SolidColorBrush x:Key="AppBgBrush" Color="{StaticResource AppBgColor}"/>
@@ -88,6 +96,10 @@
     <SolidColorBrush x:Key="ToggleBgBrush" Color="{StaticResource ToggleBgColor}"/>
     <SolidColorBrush x:Key="ToggleBorderBrush" Color="{StaticResource ToggleBorderColor}"/>
     <SolidColorBrush x:Key="ToggleActiveBgBrush" Color="{StaticResource ToggleActiveBgColor}"/>
+    <SolidColorBrush x:Key="HeaderBgBrush" Color="{StaticResource HeaderBgColor}"/>
+    <SolidColorBrush x:Key="HeaderTextBrush" Color="{StaticResource HeaderTextColor}"/>
+    <SolidColorBrush x:Key="HeaderSubtextBrush" Color="{StaticResource HeaderSubtextColor}"/>
+    <SolidColorBrush x:Key="NavBgBrush" Color="{StaticResource NavBgColor}"/>
 
     <!-- 字体 -->
     <FontFamily x:Key="MonoFont">Consolas, Courier New, monospace</FontFamily>

src/YZWater.Avalonia/Views/MainWindow.axaml

@@ -17,7 +17,7 @@
 
     <DockPanel>
         <!-- ═══ 底部导航栏 ═══ -->
-        <Border DockPanel.Dock="Bottom" Background="{DynamicResource SurfaceBgBrush}"
+        <Border DockPanel.Dock="Bottom" Background="{DynamicResource NavBgBrush}"
                 BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,1,0,0" Padding="4,0">
             <Grid ColumnDefinitions="*,Auto,Auto">
                 <!-- 导航按钮 -->

src/YZWater.Avalonia/Views/ViewAView.axaml

@@ -13,7 +13,7 @@
         <Grid RowDefinitions="48,*,32">
 
             <!-- ═══ 顶部标题栏 ═══ -->
-            <Border Grid.Row="0" Background="{DynamicResource SurfaceBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
+            <Border Grid.Row="0" Background="{DynamicResource HeaderBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
                 <Grid ColumnDefinitions="Auto,*,Auto,Auto,Auto" Margin="16,0">
                     <StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="12" VerticalAlignment="Center">
                         <Border Background="{DynamicResource SuccessBrush}" Width="4" Height="24" CornerRadius="2"/>
@@ -21,7 +21,7 @@
                                    Foreground="{DynamicResource TextPrimaryBrush}" FontFamily="Consolas, monospace"
                                    VerticalAlignment="Center"/>
                         <TextBlock Text="{Binding SubtitleText}" FontSize="12"
-                                   Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                                   Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                     </StackPanel>
 
                     <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="8" VerticalAlignment="Center" Margin="24,0">
@@ -42,7 +42,7 @@
                                    Foreground="{DynamicResource SuccessBrush}"/>
                         <TextBlock Text="{Binding CurrentTime, StringFormat='{}{0:yyyy-MM-dd}'}"
                                    FontFamily="Consolas, monospace" FontSize="10"
-                                   Foreground="{DynamicResource TextDisabledBrush}" HorizontalAlignment="Right"/>
+                                   Foreground="{DynamicResource HeaderSubtextBrush}" HorizontalAlignment="Right"/>
                     </StackPanel>
                 </Grid>
             </Border>
@@ -400,7 +400,7 @@
             </Grid>
 
             <!-- ═══ 底部状态栏 ═══ -->
-            <Border Grid.Row="2" Background="{DynamicResource SurfaceBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,1,0,0">
+            <Border Grid.Row="2" Background="{DynamicResource NavBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,1,0,0">
                 <Grid ColumnDefinitions="Auto,*,Auto,Auto,Auto,Auto" Margin="16,0">
                     <TextBlock Grid.Column="0" VerticalAlignment="Center"
                                FontFamily="Consolas, monospace" FontSize="11" Foreground="{DynamicResource TextDisabledBrush}">

src/YZWater.Avalonia/Views/ViewBView.axaml

@@ -11,13 +11,13 @@
     <Border Background="{DynamicResource AppBgBrush}">
         <Grid RowDefinitions="48,*,32">
             <!-- 顶部 -->
-            <Border Grid.Row="0" Background="{DynamicResource SurfaceBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
+            <Border Grid.Row="0" Background="{DynamicResource HeaderBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
                 <Grid Margin="16,0">
                     <StackPanel Orientation="Horizontal" Spacing="12" VerticalAlignment="Center">
                         <Border Background="{DynamicResource InfoBrush}" Width="3" Height="20" CornerRadius="1"/>
                         <TextBlock Text="{Binding TitleText}" FontFamily="{DynamicResource MonoFont}" FontSize="16" FontWeight="Bold"
                                    Foreground="{DynamicResource TextPrimaryBrush}" VerticalAlignment="Center"/>
-                        <TextBlock Text="{Binding SubtitleText}" FontSize="12" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                        <TextBlock Text="{Binding SubtitleText}" FontSize="12" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                     </StackPanel>
                 </Grid>
             </Border>
@@ -36,16 +36,16 @@
                                            Foreground="{DynamicResource TextSecondaryBrush}"/>
                             </StackPanel>
                             <Grid ColumnDefinitions="100,*" RowDefinitions="Auto,Auto,Auto,Auto" Margin="4,0">
-                                <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding IpAddressText}" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                                <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding IpAddressText}" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                                 <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding PlcIp}" Margin="0,4"/>
 
-                                <TextBlock Grid.Row="1" Grid.Column="0" Text="{Binding PortText}" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                                <TextBlock Grid.Row="1" Grid.Column="0" Text="{Binding PortText}" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                                 <NumericUpDown Grid.Row="1" Grid.Column="1" Value="{Binding PlcPort}" Minimum="1" Maximum="65535" Margin="0,4"/>
 
-                                <TextBlock Grid.Row="2" Grid.Column="0" Text="{Binding AutoConnectText}" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                                <TextBlock Grid.Row="2" Grid.Column="0" Text="{Binding AutoConnectText}" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                                 <CheckBox Grid.Row="2" Grid.Column="1" IsChecked="{Binding AutoConnect}" Margin="0,4"/>
 
-                                <TextBlock Grid.Row="3" Grid.Column="0" Text="{Binding StatusText}" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                                <TextBlock Grid.Row="3" Grid.Column="0" Text="{Binding StatusText}" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                                 <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal" Spacing="10" Margin="0,4">
                                     <TextBlock Text="{Binding ConnectionStatus}" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource TextSecondaryBrush}" VerticalAlignment="Center"/>
                                     <Button Content="{Binding TestText}" Command="{Binding TestConnectionCommand}" Classes="btn-info"
@@ -65,17 +65,17 @@
                                            Foreground="{DynamicResource TextSecondaryBrush}"/>
                             </StackPanel>
                             <Grid ColumnDefinitions="120,*,60" RowDefinitions="Auto,Auto,Auto" Margin="4,0">
-                                <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding LevelHighText}" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                                <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding LevelHighText}" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                                 <NumericUpDown Grid.Row="0" Grid.Column="1" Value="{Binding LevelHighAlarm}" Minimum="0" Maximum="100" FormatString="F1" Margin="0,4"/>
-                                <TextBlock Grid.Row="0" Grid.Column="2" Text="%" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                                <TextBlock Grid.Row="0" Grid.Column="2" Text="%" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
 
-                                <TextBlock Grid.Row="1" Grid.Column="0" Text="{Binding LevelLowText}" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                                <TextBlock Grid.Row="1" Grid.Column="0" Text="{Binding LevelLowText}" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                                 <NumericUpDown Grid.Row="1" Grid.Column="1" Value="{Binding LevelLowAlarm}" Minimum="0" Maximum="100" FormatString="F1" Margin="0,4"/>
-                                <TextBlock Grid.Row="1" Grid.Column="2" Text="%" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                                <TextBlock Grid.Row="1" Grid.Column="2" Text="%" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
 
-                                <TextBlock Grid.Row="2" Grid.Column="0" Text="{Binding FlowHighText}" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                                <TextBlock Grid.Row="2" Grid.Column="0" Text="{Binding FlowHighText}" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                                 <NumericUpDown Grid.Row="2" Grid.Column="1" Value="{Binding FlowHighAlarm}" Minimum="0" Maximum="1000" FormatString="F1" Margin="0,4"/>
-                                <TextBlock Grid.Row="2" Grid.Column="2" Text="m³/h" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                                <TextBlock Grid.Row="2" Grid.Column="2" Text="m³/h" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                             </Grid>
                         </StackPanel>
                     </Border>
@@ -90,9 +90,9 @@
                                            Foreground="{DynamicResource TextSecondaryBrush}"/>
                             </StackPanel>
                             <Grid ColumnDefinitions="120,*,60" Margin="4,0">
-                                <TextBlock Grid.Column="0" Text="{Binding FrequencyText}" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                                <TextBlock Grid.Column="0" Text="{Binding FrequencyText}" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                                 <NumericUpDown Grid.Column="1" Value="{Binding PumpFrequency}" Minimum="0" Maximum="100" FormatString="F1" Margin="0,4"/>
-                                <TextBlock Grid.Column="2" Text="Hz" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                                <TextBlock Grid.Column="2" Text="Hz" FontFamily="{DynamicResource MonoFont}" FontSize="11" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                             </Grid>
                         </StackPanel>
                     </Border>
@@ -113,7 +113,7 @@
             </ScrollViewer>
 
             <!-- 底部状态栏 -->
-            <Border Grid.Row="2" Background="{DynamicResource SurfaceBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,1,0,0">
+            <Border Grid.Row="2" Background="{DynamicResource NavBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,1,0,0">
                 <TextBlock Text="v3.0" FontFamily="{DynamicResource MonoFont}" FontSize="10"
                            Foreground="{DynamicResource TextDisabledBrush}" VerticalAlignment="Center" Margin="16,0"/>
             </Border>

src/YZWater.Avalonia/Views/ViewCView.axaml

@@ -12,13 +12,13 @@
     <Border Background="{DynamicResource AppBgBrush}">
         <Grid RowDefinitions="48,*,32">
             <!-- 顶部 -->
-            <Border Grid.Row="0" Background="{DynamicResource SurfaceBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
+            <Border Grid.Row="0" Background="{DynamicResource HeaderBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
                 <Grid Margin="16,0">
                     <StackPanel Orientation="Horizontal" Spacing="12" VerticalAlignment="Center">
                         <Border Background="{DynamicResource SuccessBrush}" Width="3" Height="20" CornerRadius="1"/>
                         <TextBlock Text="{Binding TitleText}" FontFamily="{DynamicResource MonoFont}" FontSize="16" FontWeight="Bold"
                                    Foreground="{DynamicResource TextPrimaryBrush}" VerticalAlignment="Center"/>
-                        <TextBlock Text="{Binding SubtitleText}" FontSize="12" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                        <TextBlock Text="{Binding SubtitleText}" FontSize="12" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                     </StackPanel>
                 </Grid>
             </Border>
@@ -31,11 +31,11 @@
                         BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Padding="12" Margin="0,0,0,4">
                     <StackPanel Orientation="Horizontal" Spacing="16">
                         <StackPanel Orientation="Horizontal" Spacing="6">
-                            <TextBlock Text="{Binding FromText}" FontFamily="{DynamicResource MonoFont}" FontSize="10" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                            <TextBlock Text="{Binding FromText}" FontFamily="{DynamicResource MonoFont}" FontSize="10" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                             <DatePicker SelectedDate="{Binding StartDate}" Width="150"/>
                         </StackPanel>
                         <StackPanel Orientation="Horizontal" Spacing="6">
-                            <TextBlock Text="{Binding ToText}" FontFamily="{DynamicResource MonoFont}" FontSize="10" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                            <TextBlock Text="{Binding ToText}" FontFamily="{DynamicResource MonoFont}" FontSize="10" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                             <DatePicker SelectedDate="{Binding EndDate}" Width="150"/>
                         </StackPanel>
                         <Button Content="{Binding QueryText}" Command="{Binding LoadFlowRecordsCommand}" Classes="btn-info"/>
@@ -80,7 +80,7 @@
             </Grid>
 
             <!-- 底部 -->
-            <Border Grid.Row="2" Background="{DynamicResource SurfaceBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,1,0,0">
+            <Border Grid.Row="2" Background="{DynamicResource NavBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,1,0,0">
                 <TextBlock Text="v3.0" FontFamily="{DynamicResource MonoFont}" FontSize="10"
                            Foreground="{DynamicResource TextDisabledBrush}" VerticalAlignment="Center" Margin="16,0"/>
             </Border>

src/YZWater.Avalonia/Views/ViewDView.axaml

@@ -11,13 +11,13 @@
     <Border Background="{DynamicResource AppBgBrush}">
         <Grid RowDefinitions="48,*,32">
             <!-- 顶部 -->
-            <Border Grid.Row="0" Background="{DynamicResource SurfaceBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
+            <Border Grid.Row="0" Background="{DynamicResource HeaderBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
                 <Grid Margin="16,0">
                     <StackPanel Orientation="Horizontal" Spacing="12" VerticalAlignment="Center">
                         <Border Background="{DynamicResource DangerBrush}" Width="3" Height="20" CornerRadius="1"/>
                         <TextBlock Text="{Binding TitleText}" FontFamily="{DynamicResource MonoFont}" FontSize="16" FontWeight="Bold"
                                    Foreground="{DynamicResource TextPrimaryBrush}" VerticalAlignment="Center"/>
-                        <TextBlock Text="{Binding SubtitleText}" FontSize="12" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                        <TextBlock Text="{Binding SubtitleText}" FontSize="12" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                         <Border Background="{DynamicResource DangerBrush}" CornerRadius="10" Padding="8,2" Margin="8,0,0,0">
                             <TextBlock Text="{Binding UnconfirmedCount, StringFormat='{}{0}'}" FontFamily="{DynamicResource MonoFont}" FontSize="11"
                                        Foreground="White"/>
@@ -34,11 +34,11 @@
                         BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Padding="12" Margin="0,0,0,4">
                     <StackPanel Orientation="Horizontal" Spacing="16">
                         <StackPanel Orientation="Horizontal" Spacing="6">
-                            <TextBlock Text="{Binding FromText}" FontFamily="{DynamicResource MonoFont}" FontSize="10" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                            <TextBlock Text="{Binding FromText}" FontFamily="{DynamicResource MonoFont}" FontSize="10" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                             <DatePicker SelectedDate="{Binding StartDate}" Width="150"/>
                         </StackPanel>
                         <StackPanel Orientation="Horizontal" Spacing="6">
-                            <TextBlock Text="{Binding ToText}" FontFamily="{DynamicResource MonoFont}" FontSize="10" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                            <TextBlock Text="{Binding ToText}" FontFamily="{DynamicResource MonoFont}" FontSize="10" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                             <DatePicker SelectedDate="{Binding EndDate}" Width="150"/>
                         </StackPanel>
                         <Button Content="{Binding QueryText}" Command="{Binding LoadAlarmRecordsCommand}" Classes="btn-info"/>
@@ -91,7 +91,7 @@
             </Grid>
 
             <!-- 底部 -->
-            <Border Grid.Row="2" Background="{DynamicResource SurfaceBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,1,0,0">
+            <Border Grid.Row="2" Background="{DynamicResource NavBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,1,0,0">
                 <TextBlock Text="v3.0" FontFamily="{DynamicResource MonoFont}" FontSize="10"
                            Foreground="{DynamicResource TextDisabledBrush}" VerticalAlignment="Center" Margin="16,0"/>
             </Border>

src/YZWater.Avalonia/Views/ViewEView.axaml

@@ -11,13 +11,13 @@
     <Border Background="{DynamicResource AppBgBrush}">
         <Grid RowDefinitions="48,*,32">
             <!-- 顶部 -->
-            <Border Grid.Row="0" Background="{DynamicResource SurfaceBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
+            <Border Grid.Row="0" Background="{DynamicResource HeaderBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
                 <Grid Margin="16,0">
                     <StackPanel Orientation="Horizontal" Spacing="12" VerticalAlignment="Center">
                         <Border Background="{DynamicResource TextSecondaryBrush}" Width="3" Height="20" CornerRadius="1"/>
                         <TextBlock Text="{Binding TitleText}" FontFamily="{DynamicResource MonoFont}" FontSize="16" FontWeight="Bold"
                                    Foreground="{DynamicResource TextPrimaryBrush}" VerticalAlignment="Center"/>
-                        <TextBlock Text="{Binding SubtitleText}" FontSize="12" Foreground="{DynamicResource TextTertiaryBrush}" VerticalAlignment="Center"/>
+                        <TextBlock Text="{Binding SubtitleText}" FontSize="12" Foreground="{DynamicResource HeaderSubtextBrush}" VerticalAlignment="Center"/>
                     </StackPanel>
                 </Grid>
             </Border>
@@ -96,7 +96,7 @@
             </ScrollViewer>
 
             <!-- 底部 -->
-            <Border Grid.Row="2" Background="{DynamicResource SurfaceBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,1,0,0">
+            <Border Grid.Row="2" Background="{DynamicResource NavBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,1,0,0">
                 <TextBlock Text="v3.0" FontFamily="{DynamicResource MonoFont}" FontSize="10"
                            Foreground="{DynamicResource TextDisabledBrush}" VerticalAlignment="Center" Margin="16,0"/>
             </Border>