无法获取打印机异常退出问题

主页面UI优化
大幅提升进入主页面的速度
设备检测不再在每次开始时检测
录制未完成不能退出
全局按钮样式调整

XHWK.WKTool/App.config

@@ -5,12 +5,12 @@
   </startup>
   <appSettings>
     <!--0正式 1测试-->
-    <add key="IsDebug" value="1" />
+    <add key="IsDebug" value="0" />
     <!--参数是否加密 0不加密 1加密-->
     <add key="IsParameterEncryption" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="110" />
-    <add key="VersionName" value="3.2.1" />
+    <add key="VersionCode" value="111" />
+    <add key="VersionName" value="3.2.2" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -210,7 +210,7 @@
                                     FontWeight="Bold"
                                     Foreground="#FFFFFF"
                                     IsDefault="True"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                                    >
                                     <Button.Template>
                                         <ControlTemplate TargetType="{x:Type Button}">
                                             <Border
@@ -272,7 +272,7 @@
                     FontSize="16"
                     Foreground="#FFFFFF"
                     Text="创建微课" />
-                <!--<Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" VerticalAlignment="Top" Foreground="#FFFFFF" FontSize="30" Padding="10,2,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>-->
+                <!--<Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" VerticalAlignment="Top" Foreground="#FFFFFF" FontSize="30" Padding="10,2,10,0" HorizontalAlignment="Right"  Click="BtnDown_Click"/>-->
             </Grid>
             <Grid
                 x:Name="GridTitle_Black"
@@ -297,7 +297,7 @@
                     Cursor="Hand"
                     FontSize="30"
                     Foreground="#FF333333"
-                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
+                     />
             </Grid>
             <!--  第二行 讲解名称  -->
             <!--  第三行 存放路径  -->

XHWK.WKTool/DeviceWindow.xaml

@@ -181,8 +181,7 @@
                             Margin="0,0,0,0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
-                            IsEnabled="False"
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                            IsEnabled="False">
                             <StackPanel Orientation="Horizontal">
                                 <Image
                                     Height="18"
@@ -203,8 +202,7 @@
                             Margin="0,0,0,0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
-                            IsEnabled="False"
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                            IsEnabled="False">
                             <StackPanel Orientation="Horizontal">
                                 <Image
                                     Height="18"
@@ -226,8 +224,7 @@
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
                             Cursor="Hand"
-                            IsEnabled="False"
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                            IsEnabled="False">
                             <StackPanel Orientation="Horizontal">
                                 <Image
                                     Height="18"
@@ -248,8 +245,7 @@
                             Margin="0,0,0,0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
-                            IsEnabled="False"
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                            IsEnabled="False">
                             <StackPanel Orientation="Horizontal">
                                 <Image
                                     Height="18"
@@ -386,8 +382,7 @@
                             Cursor="Hand"
                             FontSize="15"
                             Foreground="White"
-                            IsDefault="True"
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                            IsDefault="True">
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
                                     <Border

XHWK.WKTool/LoginWindow.xaml

@@ -236,7 +236,7 @@
                             FontSize="18"
                             Foreground="#FFFFFF"
                             IsDefault="True"
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                            >
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
                                     <Border
@@ -269,7 +269,7 @@
                             FontSize="18"
                             Foreground="#FFFFFF"
                             IsDefault="True"
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                            >
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
                                     <Border
@@ -296,7 +296,7 @@
                             Click="BtnServiceAddress_Click"
                             Cursor="Hand"
                             FontSize="{Binding WordSize12}"
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                            >
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
                                     <Grid>
@@ -427,7 +427,7 @@
                             FontWeight="Bold"
                             Foreground="#FFFFFF"
                             IsDefault="True"
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                            >
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
                                     <Border
@@ -461,7 +461,7 @@
                             FontWeight="Bold"
                             Foreground="#FFFFFF"
                             IsDefault="True"
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                            >
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
                                     <Border

XHWK.WKTool/MainWindow.xaml

@@ -352,7 +352,7 @@
                                 Click="BtnRecord_Click"
                                 Cursor="Hand"
                                 FontSize="14"
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
+                                 />
                             <Button
                                 x:Name="BtnRecordSuspend"
                                 Margin="5,0"
@@ -362,7 +362,7 @@
                                 Click="BtnRecord_Click"
                                 Cursor="Hand"
                                 FontSize="14"
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                
                                 Visibility="Collapsed" />
                         </Grid>
                         <Grid Name="stop_grid" Grid.Column="3">
@@ -375,7 +375,7 @@
                                 Click="BtnStop_Click"
                                 Cursor="Hand"
                                 FontSize="14"
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
+                                 />
                         </Grid>
                     </Grid>
 
@@ -395,7 +395,7 @@
                             Click="BtnClose_Click"
                             Cursor="Hand"
                             FontSize="14"
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
+                             />
                     </Grid>
                     <!--  测试  -->
                     <Grid Grid.Column="2" Visibility="Collapsed">
@@ -411,7 +411,7 @@
                             Click="BtnClose_Click"
                             Cursor="Hand"
                             FontSize="16"
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                            >
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
                                     <Grid>
@@ -535,7 +535,7 @@
                                 Click="BtnScreenshot_Click"
                                 Cursor="Hand"
                                 FontSize="16"
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
+                                 />
                         </Grid>
                         <!--  导入  -->
                         <Grid Grid.Row="3">
@@ -547,7 +547,7 @@
                                 Click="BtnImport_Click"
                                 Cursor="Hand"
                                 FontSize="16"
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
+                                 />
                         </Grid>
                         <!--  加页  -->
                         <Grid Grid.Row="4">
@@ -559,7 +559,7 @@
                                 Click="BtnAdd_Click"
                                 Cursor="Hand"
                                 FontSize="16"
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
+                                 />
                         </Grid>
                         <!--  打印  -->
                         <Grid Grid.Row="5">
@@ -571,7 +571,7 @@
                                 Click="BtnPrint_Click"
                                 Cursor="Hand"
                                 FontSize="16"
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
+                                 />
                         </Grid>
                         <!--  我的  -->
                         <Grid Grid.Row="6">
@@ -583,7 +583,7 @@
                                 Click="BtnUpload_Click"
                                 Cursor="Hand"
                                 FontSize="16"
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
+                                 />
                         </Grid>
                         <!--  检测  -->
                         <Grid Grid.Row="7">
@@ -595,7 +595,7 @@
                                 Click="BtnDevice_Click"
                                 Cursor="Hand"
                                 FontSize="16"
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
+                                 />
                         </Grid>
                         <!--  设置  -->
                         <Grid Grid.Row="8">
@@ -607,7 +607,7 @@
                                 Click="BtnSetUp_Click"
                                 Cursor="Hand"
                                 FontSize="16"
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
+                                 />
                         </Grid>
                         <!--  测试  -->
                         <Grid
@@ -621,7 +621,7 @@
                                 Click="BtnSetUp_Click"
                                 Cursor="Hand"
                                 FontSize="18"
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                                >
                                 <Button.Template>
                                     <ControlTemplate TargetType="{x:Type Button}">
                                         <Grid>
@@ -919,7 +919,7 @@
                                         Height="20"
                                         Click="last_button_Click"
                                         Cursor="Hand"
-                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                                        >
                                         <StackPanel>
                                             <Image
                                                 Width="16"
@@ -965,7 +965,7 @@
                                         Background="Transparent"
                                         Click="next_btn_Click"
                                         Cursor="Hand"
-                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                                        >
                                         <StackPanel>
                                             <Image
                                                 Width="16"
@@ -1231,7 +1231,7 @@
                                                 VerticalAlignment="Center"
                                                 Click="BtnSkinWhite_Click"
                                                 Cursor="Hand"
-                                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                                                >
                                                 <Button.Template>
                                                     <ControlTemplate TargetType="{x:Type Button}">
                                                         <StackPanel>
@@ -1262,7 +1262,7 @@
                                                 VerticalAlignment="Center"
                                                 Click="BtnSkinTechnologyBlue_Click"
                                                 Cursor="Hand"
-                                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                                                >
                                                 <Button.Template>
                                                     <ControlTemplate TargetType="{x:Type Button}">
                                                         <StackPanel>

XHWK.WKTool/MinToolbar.xaml

@@ -16,7 +16,7 @@
         <Grid>
             <Border Background="White" CornerRadius="3">
                 <!--<Grid x:Name="buttonMin" Height="25" Width="3"
-                        Margin="0.5"  Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                        Margin="0.5"  
                         MouseEnter="buttonMin_MouseEnter">
                     <Button.Template>
                         <ControlTemplate TargetType="{x:Type Button}">

XHWK.WKTool/ProductVerification.xaml

@@ -87,7 +87,7 @@
                     Background="White"
                     Click="close_click"
                     Cursor="Hand"
-                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                    >
                     <Button.Template>
                         <ControlTemplate TargetType="{x:Type Button}">
                             <Border

XHWK.WKTool/PromptWindow.xaml

@@ -26,10 +26,10 @@
        
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,30,0,0">
             <Border x:Name="borCancel" Background="#E5E5E5" CornerRadius="6" >
-                <Button x:Name="btnCancel" Width="104" Height="42" Content="取消" FontSize="18" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="Transparent"/>
+                <Button x:Name="btnCancel" Width="104" Height="42" Content="取消" FontSize="18"  Background="Transparent"/>
             </Border>
             <Border Background="#E5E5E5" CornerRadius="6" Margin="30,0,20,0">
-                <Button Width="104" Height="42" Content="确定" FontSize="18" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="Transparent"/>
+                <Button Width="104" Height="42" Content="确定" FontSize="18"  Background="Transparent"/>
             </Border>
         </StackPanel>
     </Grid>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -39,7 +39,7 @@
                     x:Name="BtnRecordingScreen"
                     Click="BtnRecordingScreen_Click"
                     Cursor="Hand"
-                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                    
                     ToolTip="开始"
                     Visibility="Visible">
                     <Button.Template>
@@ -63,7 +63,7 @@
                     x:Name="BtnRecordingScreenPause"
                     Click="BtnRecordingScreen_Click"
                     Cursor="Hand"
-                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                    
                     ToolTip="暂停"
                     Visibility="Collapsed">
                     <Button.Template>
@@ -110,7 +110,7 @@
                         x:Name="BtnStopRecordingScreen"
                         Click="BtnStopRecordingScreen_Click"
                         Cursor="Hand"
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                        
                         ToolTip="停止">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
@@ -178,7 +178,7 @@
                         x:Name="BtnPenBlue"
                         Click="BtnBrush_Click"
                         Cursor="Hand"
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                        
                         ToolTip="蓝笔">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
@@ -199,7 +199,7 @@
                         x:Name="BtnPenBlue_CL"
                         Click="BtnBrush_Click"
                         Cursor="Hand"
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                        
                         ToolTip="批注"
                         Visibility="Collapsed">
                         <Button.Template>
@@ -215,7 +215,7 @@
                         x:Name="BtnPenRed"
                         Click="BtnBlackPenTwo_Click"
                         Cursor="Hand"
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                        
                         ToolTip="批注">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
@@ -236,7 +236,7 @@
                         x:Name="BtnPenRed_CL"
                         Click="BtnBlackPenTwo_Click"
                         Cursor="Hand"
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                        
                         ToolTip="批注"
                         Visibility="Collapsed">
                         <Button.Template>
@@ -265,7 +265,7 @@
                         x:Name="BtnReturn"
                         Click="BtnReturn_Click"
                         Cursor="Hand"
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                        
                         ToolTip="返回">
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">

XHWK.WKTool/UControl/Uc_VideoItem.xaml

@@ -31,7 +31,7 @@
                             VerticalAlignment="Stretch"
                             Click="BtnVideoPlay_Click"
                             Cursor="Hand"
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                            >
                             <Image
                                 x:Name="ImgVideo"
                                 Cursor="Hand"
@@ -60,7 +60,7 @@
                                 VerticalAlignment="Center"
                                 Click="Button_Click"
                                 Cursor="Hand"
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                                >
                                 <Image
                                     x:Name="ImgSetUp"
                                     Source="/Images/Clip_Clip.png"

XHWK.WKTool/UploadWindow.xaml

@@ -50,7 +50,7 @@
                 Cursor="Hand"
                 FontSize="25"
                 Foreground="#FFFFFF"
-                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
+                 />
         </Grid>
         <Grid
             x:Name="GridTitle_Black"
@@ -74,7 +74,7 @@
                 Cursor="Hand"
                 FontSize="25"
                 Foreground="#FF333333"
-                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
+                 />
         </Grid>
         <!--  第三行 教材  -->
         <ComboBox
@@ -132,7 +132,7 @@
             FontSize="18"
             Foreground="#FFFFFF"
             IsDefault="True"
-            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+            >
             <Button.Template>
                 <ControlTemplate TargetType="{x:Type Button}">
                     <Border

XHWK.WKTool/Utils/ZPrintUtils.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using Common.system;
+
+using System.Collections.Generic;
 using System.Drawing.Printing;
 using System.Runtime.InteropServices;
 
@@ -27,6 +29,14 @@ namespace XHWK.WKTool.Utils
             try
             {
                 fPrinters.Add(DefaultPrinter()); //默认打印机始终出现在列表的第一项
+            }
+            catch (System.Exception ex)
+            {
+                LogHelper.WriteErrLog("添加默认打印机" + ex.Message, ex);
+            }
+
+            try
+            {
                 foreach (string fPrinterName in PrinterSettings.InstalledPrinters)
                 {
                     if (!fPrinters.Contains(fPrinterName))
@@ -35,9 +45,9 @@ namespace XHWK.WKTool.Utils
                     }
                 }
             }
-            catch (System.Exception)
+            catch (System.Exception ex)
             {
-                throw;
+                LogHelper.WriteErrLog("添加其它打印机" + ex.Message, ex);
             }
             return fPrinters;
         }

XHWK.WKTool/VideoClipWindow.xaml

@@ -268,7 +268,7 @@
         </Grid.RowDefinitions>
         <Grid Background="#3f6fff" Grid.Row="0" MouseLeftButtonDown="Title_MouseLeftButtonDown">
             <TextBlock Text="视频剪辑" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
-            <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="Button_Click"/>
+            <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right"  Click="Button_Click"/>
         </Grid>
         <Grid x:Name="GridMovie" Grid.Row="1" Background="Black">
             <MediaElement Stretch="Fill" LoadedBehavior="Manual" Name="QS_Movie" MediaOpened="Element_MediaOpened" Loaded="QS_Movie_Loaded" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.ColumnSpan="2" Volume="1"/>
@@ -283,7 +283,7 @@
                 <ColumnDefinition Width="60*"/>
             </Grid.ColumnDefinitions>
             <Grid Grid.Column="0">
-                <Button Cursor="Hand" x:Name="Play" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0" Click="Play_Click" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                <Button Cursor="Hand" x:Name="Play"  Margin="0" Click="Play_Click" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                     <StackPanel Orientation="Vertical">
                         <Image x:Name="ImgPlay" Source="/Images/Clip_Play.png" Visibility="Visible"/>
                         <Image x:Name="ImgPause" Source="/Images/Clip_Pause.png" Visibility="Collapsed"/>
@@ -346,7 +346,7 @@
             </Grid>
             <Grid Grid.Row="1" Grid.Column="2">
 
-                <Button x:Name="BtnClip" Cursor="Hand" Content="  剪  辑  " Foreground="White" FontSize="{Binding WordSize20}" Click="BtnClip_Click" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <Button x:Name="BtnClip" Cursor="Hand" Content="  剪  辑  " Foreground="White" FontSize="{Binding WordSize20}" Click="BtnClip_Click"  HorizontalAlignment="Center" VerticalAlignment="Center">
                     <Button.Template>
                         <ControlTemplate TargetType="{x:Type Button}">
                             <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="8" Padding="10,5">

星火微课/星火微课-正式.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课"  
 #define MyAppDir "xhwk"
-#define MyAppVersion "3.2.1"
+#define MyAppVersion "3.2.2"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xhwkclient\XHWK.WKTool\bin\x86\Debug\"