版本号显示调整

样式调整
打印流程修改(使用固定软件打印)

XHWK.WKTool/App.config

   </startup>
   <appSettings>
     <!--0正式 1测试-->
-    <add key="IsDebug" value="0" />
+    <add key="IsDebug" value="1" />
     <!--参数是否加密 0不加密 1加密-->
     <add key="IsParameterEncryption" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="117" />
-    <add key="VersionName" value="3.9.0" />
+    <add key="VersionCode" value="118" />
+    <add key="VersionName" value="3.9.1" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>

XHWK.WKTool/MainWindow.xaml

         <!--  ListBox容器样式  -->
 
         <!--  摄像头样式  -->
-        <Style x:Key="StlToggleButton" TargetType="ToggleButton">
-            <Setter Property="Foreground" Value="White" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate>
-                        <Border
-                            x:Name="Back"
-                            Background="#FFFFFFFF"
-                            BorderBrush="Transparent"
-                            BorderThickness="0">
-                            <Path
-                                Name="PathFill"
-                                Width="8"
-                                Height="6"
-                                Data="M5,0 L10,10 L0,10 z"
-                                Fill="Black"
-                                RenderTransformOrigin="0.5,0.5"
-                                Stretch="Fill"
-                                StrokeThickness="0">
-                                <Path.RenderTransform>
-                                    <TransformGroup>
-                                        <ScaleTransform />
-                                        <SkewTransform />
-                                        <RotateTransform Angle="180" />
-                                        <TranslateTransform />
-                                    </TransformGroup>
-                                </Path.RenderTransform>
-                            </Path>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="PathFill" Property="Fill" Value="White" />
-                                <Setter TargetName="Back" Property="Background" Value="#FFDCDCDC" />
-                                <Setter TargetName="Back" Property="BorderBrush" Value="#FFDCDCDC" />
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <Style x:Key="StlComboBox" TargetType="ComboBox">
-            <Setter Property="SnapsToDevicePixels" Value="True" />
-            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-            <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-            <Setter Property="HorizontalAlignment" Value="Left" />
-            <Setter Property="Foreground" Value="Black" />
-            <Setter Property="Height" Value="30" />
-            <Setter Property="Margin" Value="0,0,0,0" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="ComboBox">
-                        <Grid Background="#F7FDF7">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="0.8*" />
-                                <ColumnDefinition Width="0.2*" MaxWidth="20" />
-                            </Grid.ColumnDefinitions>
-                            <TextBox
-                                Grid.Column="0"
-                                VerticalContentAlignment="Center"
-                                IsReadOnly="True"
-                                Text="{TemplateBinding Text}" />
-                            <Border
-                                Grid.Column="0"
-                                BorderBrush="#FFDCDCDC"
-                                BorderThickness="1,1,1,1"
-                                CornerRadius="1,0,0,1" />
-                            <Border
-                                Grid.Column="1"
-                                BorderBrush="#FFDCDCDC"
-                                BorderThickness="0,1,1,1"
-                                CornerRadius="0,1,1,0">
-                                <ToggleButton
-                                    ClickMode="Press"
-                                    IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                    Style="{StaticResource StlToggleButton}" />
-                            </Border>
-                            <Popup
-                                x:Name="Popup"
-                                Grid.Column="0"
-                                AllowsTransparency="True"
-                                Focusable="False"
-                                IsOpen="{TemplateBinding IsDropDownOpen}"
-                                Placement="Bottom"
-                                PopupAnimation="Slide">
-                                <Border
-                                    x:Name="DropDown"
-                                    MinWidth="{TemplateBinding ActualWidth}"
-                                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                                    CornerRadius="1"
-                                    SnapsToDevicePixels="True">
-                                    <Border.Effect>
-                                        <DropShadowEffect
-                                            BlurRadius="2"
-                                            Opacity="0.5"
-                                            ShadowDepth="0"
-                                            Color="Black" />
-                                    </Border.Effect>
-                                    <ScrollViewer
-                                        MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                                        Margin="4,6,4,6"
-                                        CanContentScroll="True"
-                                        HorizontalScrollBarVisibility="Auto"
-                                        SnapsToDevicePixels="True"
-                                        Style="{DynamicResource ScrollViewerStyle}"
-                                        VerticalScrollBarVisibility="Auto">
-                                        <!--  StackPanel 用于显示子级，方法是将 IsItemsHost 设置为 True  -->
-                                        <StackPanel
-                                            Background="White"
-                                            IsItemsHost="True"
-                                            KeyboardNavigation.DirectionalNavigation="Contained" />
-                                    </ScrollViewer>
-                                </Border>
-                            </Popup>
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
     </Window.Resources>
 
     <Grid>
                                     </Grid>
                                     <ControlTemplate.Triggers>
                                         <Trigger Property="IsMouseOver" Value="True">
-                                            <Setter TargetName="ImgSetUp" Property="Source"
-                                                    Value="/SkinImages/TechnologyBlue/HM_Close_MI.png" />
+                                            <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/TechnologyBlue/HM_Close_MI.png" />
                                             <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF" />
                                         </Trigger>
                                     </ControlTemplate.Triggers>
                                         </Grid>
                                         <ControlTemplate.Triggers>
                                             <Trigger Property="IsMouseOver" Value="True">
-                                                <Setter TargetName="ImgScreenRecording" Property="Source"
-                                                        Value="/SkinImages/White/Toolbar_LP_MI.png" />
+                                                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_MI.png" />
                                             </Trigger>
                                             <Trigger Property="IsPressed" Value="True">
-                                                <Setter TargetName="ImgScreenRecording" Property="Source"
-                                                        Value="/SkinImages/White/Toolbar_LP_CL.png" />
-                                                <Setter TargetName="WordScreenRecording" Property="Foreground"
-                                                        Value="#FFFFFFFF" />
+                                                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_CL.png" />
+                                                <Setter TargetName="WordScreenRecording" Property="Foreground" Value="#FFFFFFFF" />
                                             </Trigger>
                                             <Trigger Property="IsEnabled" Value="False">
-                                                <Setter TargetName="ImgScreenRecording" Property="Source"
-                                                        Value="/SkinImages/White/Toolbar_LP_N.png" />
-                                                <Setter TargetName="WordScreenRecording" Property="Foreground"
-                                                        Value="#FFC3C3C3" />
+                                                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_N.png" />
+                                                <Setter TargetName="WordScreenRecording" Property="Foreground" Value="#FFC3C3C3" />
                                             </Trigger>
                                         </ControlTemplate.Triggers>
                                     </ControlTemplate>
                                                 <Button.Template>
                                                     <ControlTemplate TargetType="{x:Type Button}">
                                                         <StackPanel>
-                                                            <Image x:Name="ImgRecord"
-                                                                   Source="/SkinImages/Skin/Skin_White.png" />
+                                                            <Image x:Name="ImgRecord" Source="/SkinImages/Skin/Skin_White.png" />
                                                         </StackPanel>
                                                         <ControlTemplate.Triggers>
                                                             <Trigger Property="IsMouseOver" Value="True">
-                                                                <Setter TargetName="ImgRecord" Property="Source"
-                                                                        Value="/SkinImages/Skin/Skin_White_MI.png" />
+                                                                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/Skin/Skin_White_MI.png" />
                                                             </Trigger>
                                                         </ControlTemplate.Triggers>
                                                     </ControlTemplate>
                                                 <Button.Template>
                                                     <ControlTemplate TargetType="{x:Type Button}">
                                                         <StackPanel>
-                                                            <Image x:Name="ImgRecord"
-                                                                   Source="/SkinImages/Skin/Skin_TechnologyBlue.png" />
+                                                            <Image x:Name="ImgRecord" Source="/SkinImages/Skin/Skin_TechnologyBlue.png" />
                                                         </StackPanel>
                                                         <ControlTemplate.Triggers>
                                                             <Trigger Property="IsMouseOver" Value="True">
-                                                                <Setter TargetName="ImgRecord" Property="Source"
-                                                                        Value="/SkinImages/Skin/Skin_TechnologyBlue_MI.png" />
+                                                                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/Skin/Skin_TechnologyBlue_MI.png" />
                                                             </Trigger>
                                                         </ControlTemplate.Triggers>
                                                     </ControlTemplate>
         <Border
             x:Name="GridPrintingTitle"
             Width="446"
-            Height="188"
+            Height="108"
             BorderBrush="#eeeeee"
             BorderThickness="1"
             Visibility="Collapsed">
             <Grid Background="#ffffff">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="42" />
-                    <RowDefinition Height="*" />
+                    <RowDefinition Height="40" />
                     <RowDefinition Height="64" />
                 </Grid.RowDefinitions>
                 <Grid Grid.Row="0" Background="#3F6FFF">
                         VerticalAlignment="Center"
                         FontSize="16"
                         Foreground="White"
-                        Text="打印机" />
+                        Text="打印" />
 
                     <Button
                         Grid.Row="0"
                         Width="46"
+                        Margin="0,-2,0,0"
                         HorizontalAlignment="Right"
-                        VerticalAlignment="Stretch"
+                        VerticalContentAlignment="Center"
                         Click="BtnPrintCloseClick"
                         Content="×"
                         Cursor="Hand"
                         FontSize="30"
                         Foreground="White" />
                 </Grid>
-                <Grid Grid.Row="1" Height="46">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Grid.Column="0"
-                        Margin="10,0,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        FontSize="16"
-                        Style="{DynamicResource TxbMesColor}"
-                        Text="打印机" />
-
-                    <ComboBox
-                        x:Name="CmbClass"
-                        Grid.Column="1"
-                        Height="36"
-                        Margin="10,0,10,0"
-                        HorizontalAlignment="Stretch"
-                        HorizontalContentAlignment="Left"
-                        VerticalContentAlignment="Center"
-                        Background="White"
-                        BorderThickness="0"
-                        Cursor="Hand"
-                        DisplayMemberPath="Value"
-                        FontSize="16"
-                        SelectedValuePath="Key"
-                        Style="{StaticResource StlComboBox}"
-                        Text="请选择" />
-                </Grid>
 
-                <Grid Grid.Row="2">
+                <Grid Grid.Row="1">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="30" />
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="86" />
-                        <ColumnDefinition Width="86" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
                     <Image
                         Click="btnPrintExplain_Click"
                         Content="打印说明"
                         Cursor="Hand"
-                        FontSize="14"
+                        FontSize="16"
                         Foreground="#3F6FFF"
                         IsDefault="True" />
 
                     <Button
                         Grid.Column="3"
-                        Width="76"
-                        Height="30"
+                        Width="100"
+                        Height="36"
                         Margin="0,0,10,0"
                         HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
+                        VerticalAlignment="Center"
                         Background="#3F6FFF"
                         Click="Print_No_Code_Click"
                         Content="普通打印"
                         Cursor="Hand"
-                        FontSize="12"
+                        FontSize="16"
                         Foreground="White"
                         IsDefault="True" />
 
                     <Button
                         x:Name="BtnPrintPrint"
                         Grid.Column="4"
-                        Width="76"
-                        Height="30"
+                        Width="100"
+                        Height="36"
                         Margin="0,0,10,0"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         Click="BtnPrint_Print_Click"
                         Content="铺码打印"
                         Cursor="Hand"
-                        FontSize="12"
+                        FontSize="16"
                         Foreground="White"
                         IsDefault="True" />
                 </Grid>

XHWK.WKTool/MainWindow.xaml.cs

 using NReco.VideoConverter;
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
             APP.PageDrawList = new List<Model_DrawData>();
             Model_DrawData modelDrawData = new Model_DrawData { PageNum = APP.PageContextData.currpage };
             APP.PageDrawList.Add(modelDrawData);
-            Txbv.Text = APP.isDebug ? "测试版" : "正式版" + " v" + FileToolsCommon.GetConfigValue("VersionName");
+            Txbv.Text = (APP.isDebug ? "测试版" : "正式版") + " v" + FileToolsCommon.GetConfigValue("VersionName");
             TxbStoragePath.Content = FileToolsCommon.GetConfigValue("VideoType");
             TxbStoragePath.Content = FileToolsCommon.GetConfigValue("VideoSavePath");
             Initialize();
 
         private void Print()
         {
-            if (string.IsNullOrWhiteSpace(CmbClass.Text))
+            if (!ZPrintUtils.IsExistAcroRd32())
             {
-                MessageWindow.Show("请设置打印机！");
+                MessageBoxResult dr = MessageWindow.Show
+                (
+                    "需要安装PDF阅读器，是否下载安装？",
+                    "提示",
+                    MessageBoxButton.OKCancel
+                );
+                if (dr == MessageBoxResult.OK)
+                {
+                    ZPrintUtils.InstallAcroRd32ByUser();
+                }
                 return;
             }
             BtnPrint.IsEnabled = false;
             printmodel.filepath = imgPath;
             //打印数量
             printmodel.num = 1;
-            //打印机名称
-            string printerName = CmbClass.Text;
-            printmodel.printname = printerName;
             _printMsg = "准备中";
             _msgnum = 0;
             _num = 0;
 
         #region 打印界面
 
-        /// <summary>
-        /// 下拉框数据源
-        /// </summary>
-        public DataTable printlist = new DataTable();
-
-        private DataTable _dtComponentsUniqueNo;
-
         private double _hei;
 
         private int _msgnum;
         /// <summary>
         /// 打印初始化
         /// </summary>
-        public async void InitPrint()
+        public void InitPrint()
         {
             ResizeMode = ResizeMode.NoResize;
-            await Task.Run
-            (
-                () =>
-                {
-                    List<string> defaList = ZPrintUtils.GetLocalPrinters();
-                    if (defaList.Count > 0)
-                    {
-                        printlist.Columns.Add("Value");
-                        printlist.Columns.Add("Key");
-                        for (int i = 0; i < defaList.Count; i++)
-                        {
-                            //创建一行
-                            DataRow row = printlist.NewRow();
-                            //将此行添加到table中
-                            printlist.Rows.Add(row);
-                            printlist.Rows[i]["Value"] = defaList[i];
-                            printlist.Rows[i]["Key"] = i.ToString();
-                        }
-                        _dtComponentsUniqueNo = printlist.DefaultView.ToTable();
-                    }
-                }
-            );
-            CmbClass.ItemsSource = _dtComponentsUniqueNo.DefaultView;
-            CmbClass.SelectedIndex = 0;
             TqlPrintInit();
         }
 
             }
             //PDF位置
             string sourcePath = printModel.filepath;
-            string printerName = printModel.printname;
             if (_isHasCode)
             {
                 _printMsg = "铺码中";
                             string fileName = strs[i];
 
                             //打印文件
-                            ZPrintUtils.Print(fileName, printerName);
+                            ZPrintUtils.Print2(fileName);
                         }
                         Dispatcher.Invoke
                         (
             else
             {
                 //打印文件
-                ZPrintUtils.Print(sourcePath, printerName);
+                ZPrintUtils.Print2(sourcePath);
                 Dispatcher.Invoke
                 (
                     () =>

XHWK.WKTool/MessageWindow.xaml

     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="星火微课"
     Width="446"
-    Height="188"
+    Height="148"
     d:DesignHeight="250"
-    AllowsTransparency="False"
     MouseMove="Window_MouseMove"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
                     HorizontalContentAlignment="Stretch"
                     VerticalContentAlignment="Stretch"
                     Content="提示"
-                    FontSize="16"
+                    FontSize="18"
                     Foreground="White" />
 
                 <Button
             <Grid Grid.Row="1">
                 <TextBlock
                     x:Name="TbkContent"
-                    Margin="20,0,20,0"
+                    Margin="20,20,20,0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="16"
                     TextWrapping="Wrap" />
             </Grid>
             <Grid Grid.Row="2" Margin="0,0,0,0">
-
                 <Border
                     x:Name="BorOk"
                     Margin="0,0,10,0"
                     CornerRadius="6">
                     <Button
                         x:Name="BtnOk"
-                        Width="76"
-                        Height="30"
+                        Width="100"
+                        Height="36"
                         Background="#00000000"
                         BorderBrush="{x:Null}"
                         Click="BtnOK_Click"
                         Content="确定"
                         Cursor="Hand"
-                        FontSize="14"
+                        FontSize="16"
                         Foreground="White"
                         IsDefault="True" />
                 </Border>

XHWK.WKTool/Utils/ZPrintUtils.cs

 using Common.system;
-
+using Microsoft.Win32;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing.Printing;
 using System.Runtime.InteropServices;
 
 {
     internal class ZPrintUtils
     {
-        private static PrintDocument fPrintDocument = new PrintDocument();
+        private static readonly PrintDocument FPrintDocument = new PrintDocument();
 
         /// <summary>
         /// 获取本机默认打印机名称
         /// <returns></returns>
         public static string DefaultPrinter()
         {
-            return fPrintDocument.PrinterSettings.PrinterName;
+            return FPrintDocument.PrinterSettings.PrinterName;
         }
 
         /// <summary>
         /// <summary>
         /// 调用win api将指定名称的打印机设置为默认打印机
         /// </summary>
-        /// <param name="Name"></param>
+        /// <param name="name"></param>
         /// <returns></returns>
         [DllImport("winspool.drv")]
-        public static extern bool SetDefaultPrinter(string Name);
+        public static extern bool SetDefaultPrinter(string name);
 
         /// <summary>
         /// 打印
         /// </summary>
-        /// <param name="PDFPath">打印文件的路径</param>
-        /// <param name="PrinterName">打印机的名称</param>
-        public static void Print(string PDFPath, string PrinterName)
+        /// <param name="pdfPath">打印文件的路径</param>
+        /// <param name="printerName">打印机的名称</param>
+        public static void Print(string pdfPath, string printerName)
         {
             //设置默认打印机
-            SetDefaultPrinter(PrinterName);
-            System.Diagnostics.Process p = new System.Diagnostics.Process();
+            SetDefaultPrinter(printerName);
+            Process p = new Process();
             //不能启动进程是否显示错误弹窗，如果文件没有打开方式会提示选择文件的打开方式
             p.StartInfo.ErrorDialog = true;
             //不显示调用程序窗口,但是对于某些应用无效
             p.StartInfo.CreateNoWindow = true;
-            p.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;
+            p.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
             //采用操作系统自动识别的模式
             p.StartInfo.UseShellExecute = true;
             //要打印的文件路径
-            p.StartInfo.FileName = PDFPath;
+            p.StartInfo.FileName = pdfPath;
             //指定执行的动作，是打印，即print，打开是 open
             p.StartInfo.Verb = "print";
             //开始打印
             //等待15秒
             p.WaitForExit(15000);
         }
+
+        /// <summary>
+        /// 是否安装AcroRd32
+        /// </summary>
+        /// <returns></returns>
+        public static bool IsExistAcroRd32()
+        {
+            RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\AcroRd32.exe");
+            return key != null;
+        }
+
+        public static bool Print2(string pdfPath)
+        {
+            try
+            {
+                RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\AcroRd32.exe");
+                if (key != null)
+                {
+                    string acroRd32Path = key.GetValue("").ToString();
+                    string args = $"/P \"{pdfPath}\"";
+                    Process.Start(acroRd32Path, args);
+                    return true;
+                }
+                return false;
+            }
+            catch
+            {
+                // ignored
+            }
+            return false;
+        }
+
+        public static void InstallAcroRd32ByUser()
+        {
+            string downloadUrl = "https://xhkjedu.oss-cn-huhehaote.aliyuncs.com/runtime/AcroRdrDC1900820071_zh_CN.exe";
+            Process.Start(downloadUrl);
+        }
     }
-}
+}

星火微课/星火微课-测试.iss

 
 #define MyAppName "星火微课测试版"  
 #define MyAppDir "xhwk_test"
-#define MyAppVersion "3.2.7"
+#define MyAppVersion "3.9.1"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
-#define MySourcePath "D:\Project\CSharp\xhwkclient\XHWK.WKTool\bin\x86\Debug\"
+#define MySourcePath "D:\Project\CSharp\xh-wkclient\XHWK.WKTool\bin\x86\Debug\"
 #define MyAppExeName "星火微课.exe"
 #define MyIcoName "256.ico"
 #define MyTargetPath "D:\程序打包\星火微课-测试\"