1. 修复 吹膜追边测厚仪客户端 initparam 没有create

2. 修复 由于引入 MahApp 蓝色主题，导致group
3. 修复 吹膜扫描测厚仪客户端 的吹膜测厚界面 显示不了分区表
4.修复 客户端界面编辑 不能找到 strCantAddAgain 出错

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/App.xaml

@@ -12,9 +12,11 @@
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Blue.xaml" />
                 
+                
                 <ResourceDictionary Source="Culture/StringResource.en-US.xaml"/>
                 <ResourceDictionary Source="Culture/StringResource.zh-CN.xaml"/>
             </ResourceDictionary.MergedDictionaries>
+            <Style TargetType="GroupBox" />
         </ResourceDictionary>
     </Application.Resources>
 </Application>

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_Blowing.xaml

@@ -388,7 +388,7 @@
                                         </StackPanel>
                                     </StackPanel>
 
-                                    <GroupBox Header="分区表" FontSize="20" Grid.Row="2" Style="{x:Null}">
+                                    <GroupBox Header="分区表" FontSize="20" Grid.Row="2" >
                                         <StackPanel Orientation="Vertical">
                                             <StackPanel Orientation="Horizontal">
                                                 <StackPanel Orientation="Vertical" Margin="5" >

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/TDGage.cs

@@ -70,7 +70,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
             mWarningService = new WarningServiceSimple();
 
             mTDGageService = new TDGageService();
-            //mInitParamService = new InitParamService();
+            mInitParamService = new InitParamService();
             mFixService = new FixService();
 
             mPasswordService = new PasswordService();

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/App.xaml

@@ -15,6 +15,7 @@
                 <ResourceDictionary Source="Culture/StringResource.en-US.xaml"/>
                 <ResourceDictionary Source="Culture/StringResource.zh-CN.xaml"/>
             </ResourceDictionary.MergedDictionaries>
+            <Style TargetType="GroupBox" />
         </ResourceDictionary>
     </Application.Resources>
 </Application>

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Page_Blowing.xaml

@@ -411,7 +411,9 @@
                                                     <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="使用分区表" />
                                                     <ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding IsUsedMap}"/>
                                                 </StackPanel>
-                                                <DataGrid AutoGenerateColumns="False" x:Name="gridMap"  TextBlock.FontSize="18" TextBlock.FontWeight="Normal" IsReadOnly="True"
+                                                <DataGrid AutoGenerateColumns="False" 
+                                                          ItemsSource="{Binding ElementName=grid_viewModel,Path=DataContext.BoltMap}" 
+                                                          TextBlock.FontSize="18" TextBlock.FontWeight="Normal" IsReadOnly="True"
                                                       Visibility="{Binding IsUsedMap,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed}" 
                                                       >
                                                     <DataGrid.Columns>

thick_public/Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/Page_MainEditGraph.xaml.cs

@@ -426,7 +426,7 @@ namespace ThickTcpUiInWindow.MainEdit
 
             if (!gct.IsEnable)
             {
-                string strCantAddAgain = Application.Current.FindResource("strCantAddAgain") as string;
+                string strCantAddAgain = Application.Current.FindResource("strTipCantAddAgain") as string;
                 FLY.ControlLibrary.MyMessageBox.Show(strCantAddAgain);
                 return;
             }