优化 称重交换 料斗重量 与失重仓重量 的位置

Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/UcWeighterItem.xaml

@@ -113,14 +113,14 @@
                     </Grid.RowDefinitions>
 
 
-                    <StackPanel Margin="3" Grid.Row="1" >
+                    <StackPanel Margin="3" Grid.Row="2" >
                         <TextBlock Text="失重仓重量" Style="{StaticResource TextBlockStyle_title}"/>
                         <TextBlock >
                                             <Run Text="{Binding BinWeight,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text}" />
                                             <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
                         </TextBlock>
                     </StackPanel>
-                    <StackPanel Margin="3" Grid.Row="2" Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
+                    <StackPanel Margin="3" Grid.Row="1" Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
                         <TextBlock Text="料斗重量" Style="{StaticResource TextBlockStyle_title}"/>
                         <TextBlock >
                                             <Run Text="{Binding MixBucketWeight,StringFormat={}{0:F4}}" Style="{StaticResource RunStyle_text}" FontSize="36"/>

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/UcWeighterItem2.xaml

@@ -82,22 +82,24 @@
                         </StackPanel>
                     </StackPanel>
                 </Button>
+                <StackPanel Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
                     <StackPanel Margin="3" >
-                    <TextBlock Text="失重仓重量" Style="{StaticResource TextBlockStyle_title}"/>
+                        <TextBlock Text="料斗重量" Style="{StaticResource TextBlockStyle_title}"/>
                         <TextBlock >
-                                            <Run Text="{Binding BinWeight,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text}" />
+                                            <Run Text="{Binding MixBucketWeight,StringFormat={}{0:F4}}" Style="{StaticResource RunStyle_text}" FontSize="36"/>
                                             <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
                         </TextBlock>
                     </StackPanel>
-                <StackPanel Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
+                </StackPanel>
                 <StackPanel Margin="3" >
-                        <TextBlock Text="料斗重量" Style="{StaticResource TextBlockStyle_title}"/>
+                    <TextBlock Text="失重仓重量" Style="{StaticResource TextBlockStyle_title}"/>
                     <TextBlock >
-                                            <Run Text="{Binding MixBucketWeight,StringFormat={}{0:F4}}" Style="{StaticResource RunStyle_text}" FontSize="36"/>
+                                            <Run Text="{Binding BinWeight,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text}" />
                                             <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
                     </TextBlock>
                 </StackPanel>
 
+                <StackPanel Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
                     <StackPanel Margin="3" >
                         <TextBlock Text="配料" Style="{StaticResource TextBlockStyle_title_activity}"/>
                         <flyctrl:ToggleButtonOnOff
@@ -121,7 +123,6 @@
                         </flyctrl:ToggleButtonOnOff>
                     </StackPanel>
                 </StackPanel>
-
                 <Button Style="{StaticResource ButtonStyle_empty}" Background="Transparent" Click="button_frequency_Click" 
                                                 Tag="{Binding .}"
                                                 >