解决冲突

# Resources/Strings.zh-CN.xaml # Window6.xaml # Window6.xaml.cs
2026-05-09 10:57:16 +08:00
parent f8f1711239 c915b795e3
commit 91a8155c67
5 changed files with 159 additions and 44 deletions
--- a/Window6.xaml
+++ b/Window6.xaml
@@ -2,7 +2,7 @@
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:oxy="http://oxyplot.org/wpf"
-        Title="手动界面" Height="768" Width="1024"
+        Title="{DynamicResource Manual}" Height="768" Width="1024"
        WindowStartupLocation="CenterScreen" Loaded="Window_Loaded"
        Background="#F5F7FA" >
    <Window.Resources>
@@ -18,7 +18,7 @@
            <Setter Property="BorderThickness" Value="0"/>
            <Setter Property="Cursor" Value="Hand"/>
            <Setter Property="Height" Value="30"/>
-            <Setter Property="Width" Value="100"/>
+            <Setter Property="Width" Value="160"/>
            <Setter Property="Template">
                <Setter.Value>
                    <ControlTemplate TargetType="Button">
@@ -76,7 +76,7 @@
            <Setter Property="FontSize" Value="14"/>
            <Setter Property="Foreground" Value="#666666"/>
            <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="Width" Value="100"/>
+            <Setter Property="Width" Value="160"/>
        </Style>

        <!-- 单位文本样式 -->
@@ -92,7 +92,7 @@
    <DockPanel LastChildFill="True">
        <!-- 1. 顶部标题区 - 停靠在顶部 -->
        <Border DockPanel.Dock="Top" Height="60" Background="#4A90E2" CornerRadius="8" Margin="20,20,20,0">
-            <TextBlock Text="手动界面" 
+            <TextBlock Text="{DynamicResource Manual}" 
                       HorizontalAlignment="Center" 
                       VerticalAlignment="Center" 
                       FontSize="24" 
@@ -107,11 +107,11 @@
            <StackPanel Orientation="Horizontal" 
                        HorizontalAlignment="Center" 
                        VerticalAlignment="Center">
-                <Button Content="主页" Style="{StaticResource MyButtonStyle}" Width="120" Click="Button_Click_2"/>
-                <Button Content="测试界面" Style="{StaticResource MyButtonStyle}" Width="120" Click="Button_Click_1"/>
+                <Button Content="{DynamicResource Deformation}" Style="{StaticResource MyButtonStyle}" Width="120" Click="Button_Click_2"/>
+                <Button Content="{DynamicResource Manual191}" Style="{StaticResource MyButtonStyle}" Width="120" Click="Button_Click_1"/>
                <!--<Button Content="曲线" Style="{StaticResource MyButtonStyle}" Width="120"/>-->
                <!--<Button Content="手动界面" Style="{StaticResource MyButtonStyle}" Width="120" Background="#3A7BBE"/>-->
-                <Button Content="记录画面" Style="{StaticResource MyButtonStyle}" Width="120" Click="Button_Click_3"/>
+                <Button Content="{DynamicResource test28}" Style="{StaticResource MyButtonStyle}" Width="130" Click="Button_Click_3"/>
            </StackPanel>
        </Border>

@@ -134,7 +134,7 @@
                </Grid.RowDefinitions>

                <!-- 第一组：基础参数 -->
-                <TextBlock Text="基础参数设置" Style="{StaticResource SectionTitleStyle}" Grid.Row="0"/>
+                <TextBlock Text="{DynamicResource Manual24}" Style="{StaticResource SectionTitleStyle}" Grid.Row="0"/>
                <Grid Grid.Row="1">
                    <Grid.RowDefinitions>
                        <RowDefinition Height="40"/>
@@ -151,48 +151,54 @@
                        <ColumnDefinition Width="Auto"/>
                    </Grid.ColumnDefinitions>

-
-
-
                    <!-- 手动速度 -->
-                    <TextBlock Text="手动速度" Style="{StaticResource ParamLabelStyle}" Grid.Row="0" Grid.Column="0" Margin="5"/>
+                    <TextBlock Text="{DynamicResource Manual1}" Style="{StaticResource ParamLabelStyle}" Grid.Row="0" Grid.Column="0" Margin="5"/>
                    <TextBox Name="handmovementTxt" Style="{StaticResource MyTextBoxStyle}" Grid.Row="0" Grid.Column="1" 
         
                             IsReadOnly="True"
                          />
-                    <TextBlock Text="mm/min" Style="{StaticResource UnitTextStyle}" Grid.Row="0" Grid.Column="2"/>
-                    <Button Name="btn1" Content="设置" Style="{StaticResource MyButtonStyle}" Width="50" Click="Button_Click_14" Grid.Row="0" Grid.Column="3"/>
+
+                    <!--<TextBlock Text="mm/min" Style="{StaticResource UnitTextStyle}" Grid.Row="0" Grid.Column="2"/>-->
+                    <Button Content="{DynamicResource Manual3}" Style="{StaticResource MyButtonStyle}" Width="60" Click="Button_Click_14" Grid.Row="0" Grid.Column="3"/>

                    <!-- 潮气量系数 -->
-                    <TextBlock Text="潮气量系数" Style="{StaticResource ParamLabelStyle}" Grid.Row="1" Grid.Column="0" Margin="5"/>
+                    <TextBlock Text="{DynamicResource Manual4}" Style="{StaticResource ParamLabelStyle}" Grid.Row="1" Grid.Column="0" Margin="5"/>
                    <TextBox Name="moistureTxt" Style="{StaticResource MyTextBoxStyle}" Grid.Row="1" Grid.Column="1"   
 IsReadOnly="True"
                           />
-                    <Button Name="btn2" Content="设置" Style="{StaticResource MyButtonStyle}" Width="50" Click="Button_Click_15"  Grid.Row="1" Grid.Column="3"/>
+
+                    <Button Content="{DynamicResource Manual3}" Style="{StaticResource MyButtonStyle}" Width="60" Click="Button_Click_15"  Grid.Row="1" Grid.Column="3"/>
+

                    <!-- 呼气流量系数 -->
-                    <TextBlock Text="呼气流量系数" Style="{StaticResource ParamLabelStyle}" Grid.Row="2" Grid.Column="0" Margin="5"/>
+                    <TextBlock Text="{DynamicResource Manual5}" Style="{StaticResource ParamLabelStyle}" Grid.Row="2" Grid.Column="0" Margin="5"/>
                    <TextBox Name="OutFowRateTxt" Style="{StaticResource MyTextBoxStyle}" Grid.Row="2" Grid.Column="1" 
 IsReadOnly="True"
                          />
-                    <Button Name="btn3" Content="设置" Style="{StaticResource MyButtonStyle}" Width="50" Click="Button_Click_16"  Grid.Row="2" Grid.Column="3"/>
+
+                    <Button Content="{DynamicResource Manual3}" Style="{StaticResource MyButtonStyle}" Width="60" Click="Button_Click_16"  Grid.Row="2" Grid.Column="3"/>
+
                    <!--<TextBlock Text="L/min" Style="{StaticResource UnitTextStyle}" Grid.Row="2" Grid.Column="2"/>-->

                    <!-- 吸气流量系数 -->
-                    <TextBlock Text="吸气流量系数" Style="{StaticResource ParamLabelStyle}" Grid.Row="3" Grid.Column="0" Margin="5"/>
+                    <TextBlock Text="{DynamicResource Manual6}" Style="{StaticResource ParamLabelStyle}" Grid.Row="3" Grid.Column="0" Margin="5"/>
                    <TextBox Name="InFowRateTxt" Style="{StaticResource MyTextBoxStyle}" Grid.Row="3" Grid.Column="1" 
  IsReadOnly="True"
                            />
-                    <Button Name="btn4" Content="设置" Style="{StaticResource MyButtonStyle}" Width="50" Click="Button_Click_17"  Grid.Row="3" Grid.Column="3"/>
+
+                    <Button Content="{DynamicResource Manual3}" Style="{StaticResource MyButtonStyle}" Width="60" Click="Button_Click_17"  Grid.Row="3" Grid.Column="3"/>
+
                    <!--<TextBlock Text="L/min" Style="{StaticResource UnitTextStyle}" Grid.Row="3" Grid.Column="2"/>-->


                    <!-- 压力系数 -->
-                    <TextBlock Text="压力系数" Style="{StaticResource ParamLabelStyle}" Grid.Row="4" Grid.Column="0" Margin="5"/>
+                    <TextBlock Text="{DynamicResource Manual7}" Style="{StaticResource ParamLabelStyle}" Grid.Row="4" Grid.Column="0" Margin="5"/>
                    <TextBox Name="PressRateTxt" Style="{StaticResource MyTextBoxStyle}" Grid.Row="4" Grid.Column="1" 
 IsReadOnly="True"
                           />
-                    <Button Name="btn5" Content="设置" Style="{StaticResource MyButtonStyle}" Width="50" Click="Button_Click_18"  Grid.Row="4" Grid.Column="3"/>
+
+                    <Button Content="{DynamicResource Manual3}" Style="{StaticResource MyButtonStyle}" Width="60" Click="Button_Click_18"  Grid.Row="4" Grid.Column="3"/>
+
                    <!--<TextBlock Text="L/min" Style="{StaticResource UnitTextStyle}" Grid.Row="4" Grid.Column="2"/>-->


@@ -201,7 +207,7 @@ IsReadOnly="True"
                </Grid>

                <!-- 第二组：实时监测参数 -->
-                <TextBlock Text="实时监测参数" Style="{StaticResource SectionTitleStyle}" Grid.Row="3"/>
+                <TextBlock Text="{DynamicResource Manual8}" Style="{StaticResource SectionTitleStyle}" Grid.Row="3"/>
                <Grid Grid.Row="4">
                    <Grid.RowDefinitions>
                        <RowDefinition Height="40"/>
@@ -216,22 +222,22 @@ IsReadOnly="True"
                    </Grid.ColumnDefinitions>

                    <!-- 位置 -->
-                    <TextBlock Text="位置" Style="{StaticResource ParamLabelStyle}" Grid.Row="0" Grid.Column="0" Margin="5"/>
+                    <TextBlock Text="{DynamicResource Manual9}" Style="{StaticResource ParamLabelStyle}" Grid.Row="0" Grid.Column="0" Margin="5"/>
                    <TextBox Name="positionTxt" Style="{StaticResource MyTextBoxStyle}" Grid.Row="0" Grid.Column="1" IsReadOnly="True" Background="#F0F0F0"/>
                    <TextBlock Text="mm" Style="{StaticResource UnitTextStyle}" Grid.Row="0" Grid.Column="2"/>

                    <!-- 压力 -->
-                    <TextBlock Text="压力" Style="{StaticResource ParamLabelStyle}" Grid.Row="1" Grid.Column="0" Margin="5"/>
+                    <TextBlock Text="{DynamicResource Manual10}" Style="{StaticResource ParamLabelStyle}" Grid.Row="1" Grid.Column="0" Margin="5"/>
                    <TextBox Name="pressTxt" Style="{StaticResource MyTextBoxStyle}" Grid.Row="1" Grid.Column="1" IsReadOnly="True" Background="#F0F0F0"/>
                    <TextBlock Text="pa" Style="{StaticResource UnitTextStyle}" Grid.Row="1" Grid.Column="2"/>

                    <!-- 呼气流量 -->
-                    <TextBlock Text="呼气流量" Style="{StaticResource ParamLabelStyle}" Grid.Row="2" Grid.Column="0" Margin="5"/>
+                    <TextBlock Text="{DynamicResource Manual11}" Style="{StaticResource ParamLabelStyle}" Grid.Row="2" Grid.Column="0" Margin="5"/>
                    <TextBox Name="OutFowTxt" Style="{StaticResource MyTextBoxStyle}" Grid.Row="2" Grid.Column="1"   IsReadOnly="True" Background="#F0F0F0"/>
                    <TextBlock Text="L/min" Style="{StaticResource UnitTextStyle}" Grid.Row="2" Grid.Column="2"/>

                    <!-- 吸气流量 -->
-                    <TextBlock Text="吸气流量" Style="{StaticResource ParamLabelStyle}" Grid.Row="3" Grid.Column="0" Margin="5"/>
+                    <TextBlock Text="{DynamicResource Manual12}" Style="{StaticResource ParamLabelStyle}" Grid.Row="3" Grid.Column="0" Margin="5"/>
                    <TextBox Name="InFlowTxt" Style="{StaticResource MyTextBoxStyle}" Grid.Row="3" Grid.Column="1" IsReadOnly="True" Background="#F0F0F0"/>
                    <TextBlock Text="L/min" Style="{StaticResource UnitTextStyle}" Grid.Row="3" Grid.Column="2"/>
                </Grid>
@@ -251,9 +257,9 @@ IsReadOnly="True"
                        </Grid.RowDefinitions>
                        <StackPanel Orientation="Horizontal" Grid.Row="0" HorizontalAlignment="Center">
                            <Rectangle Width="20" Height="20" Fill="Red" Margin="5"/>
-                            <TextBlock Text="呼气流量" Foreground="#999999" FontSize="16" VerticalAlignment="Center" />
+                            <TextBlock Text="{DynamicResource Manual11}" Foreground="#999999" FontSize="16" VerticalAlignment="Center" />
                            <Rectangle Width="20" Height="20" Fill="Blue" Margin="5"/>
-                            <TextBlock Text="吸气流量" Foreground="#999999" FontSize="16" VerticalAlignment="Center" />
+                            <TextBlock Text="{DynamicResource Manual12}" Foreground="#999999" FontSize="16" VerticalAlignment="Center" />
                        </StackPanel>
                        <oxy:PlotView x:Name="plotView" 
                          Margin="10" 
@@ -279,27 +285,27 @@ IsReadOnly="True"
                </Grid.RowDefinitions>

                <!-- 操作按钮标题 -->
-                <TextBlock Text="控制操作" Style="{StaticResource SectionTitleStyle}" Grid.Row="0"/>
+                <TextBlock Text="{DynamicResource Manual19}" Style="{StaticResource SectionTitleStyle}" Grid.Row="0"/>

                <!-- 控制按钮组 -->
                <StackPanel Grid.Row="1" Margin="0,0,0,10">
-                    <Button Content="呼上" Style="{StaticResource MyButtonStyle}" Click="Button_Click_4"/>
-                    <Button Content="呼下" Style="{StaticResource MyButtonStyle}" Click="Button_Click_5"/>
-                    <Button Content="吸上" Style="{StaticResource MyButtonStyle}" Click="Button_Click_6"/>
-                    <Button Content="吸下" Style="{StaticResource MyButtonStyle}" Click="Button_Click_7"/>
-                    <Button Content="手动吸" Style="{StaticResource MyButtonStyle}" Click="Button_Click_8"/>
-                    <Button Content="手动呼" Style="{StaticResource MyButtonStyle}" Click="Button_Click_9"/>
-                    <Button Name="ResetBtn" Content="复位" Style="{StaticResource MyButtonStyle}" Background="#F5A623" Click="Button_Click_10"/>
+                    <Button Content="{DynamicResource Manual13}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_4"/>
+                    <Button Content="{DynamicResource Manual14}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_5"/>
+                    <Button Content="{DynamicResource Manual15}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_6"/>
+                    <Button Content="{DynamicResource Manual16}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_7"/>
+                    <Button Content="{DynamicResource Manual17}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_8"/>
+                    <Button Content="{DynamicResource Manual171}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_9"/>
+                    <Button Name="ResetBtn" Content="{DynamicResource Manual18}" Style="{StaticResource MyButtonStyle}" Background="#F5A623" Click="Button_Click_10"/>
                </StackPanel>

                <!-- 校准按钮标题 -->
-                <TextBlock Text="校准操作" Style="{StaticResource SectionTitleStyle}" Grid.Row="3"/>
+                <TextBlock Text="{DynamicResource Manual20}" Style="{StaticResource SectionTitleStyle}" Grid.Row="3"/>

                <!-- 校准按钮组 -->
                <StackPanel Grid.Row="4">
-                    <Button Content="呼气校准" Style="{StaticResource MyButtonStyle}" Click="Button_Click_11"/>
-                    <Button Content="吸气校准" Style="{StaticResource MyButtonStyle}" Click="Button_Click_12"/>
-                    <Button Content="压力校准" Style="{StaticResource MyButtonStyle}" Click="Button_Click_13"/>
+                    <Button Content="{DynamicResource Manual21}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_11"/>
+                    <Button Content="{DynamicResource Manual22}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_12"/>
+                    <Button Content="{DynamicResource Manual23}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_13"/>
                </StackPanel>
            </Grid>
        </Grid>