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

主页面UI优化
大幅提升进入主页面的速度
设备检测不再在每次开始时检测

XHWK.WKTool/App.config

@@ -9,8 +9,8 @@
     <!--参数是否加密 0不加密 1加密-->
     <add key="IsParameterEncryption" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="109" />
-    <add key="VersionName" value="3.2.0" />
+    <add key="VersionCode" value="110" />
+    <add key="VersionName" value="3.2.1" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -182,7 +182,7 @@
                                     </Grid>
                                     <Label Height="1.5" Background="#3F6FFF" />
                                 </StackPanel>
-                            
+
                             </Grid>
                             <!--  按钮  -->
                             <Grid Grid.Row="3">
@@ -229,7 +229,11 @@
                             </Grid>
 
                             <Grid Grid.Row="4">
-                                <Label Name="versionLabel" Content="版本号：" Foreground="#666666" HorizontalAlignment="Center"></Label>
+                                <Label
+                                    Name="versionLabel"
+                                    HorizontalAlignment="Center"
+                                    Content="版本号："
+                                    Foreground="#666666" />
                             </Grid>
                         </Grid>
                     </Grid>
@@ -245,8 +249,7 @@
                 Content="×"
                 Cursor="Hand"
                 FontSize="25"
-                Foreground="#FFFFFF"
-                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
+                Foreground="#FFFFFF" />
         </Grid>
         <Grid Visibility="Collapsed">
             <!--  分4行  -->

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -195,9 +195,6 @@ namespace XHWK.WKTool
                 if (ofd.SelectedPath != "")
                 {
                     txbStoragePath.Text = ofd.SelectedPath;
-                    //string ApplicationData = ZConfig.dataPath + "fileStorageAddress.txt";
-                    //string temp = ofd.SelectedPath;
-                    //System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
                 }
             }
         }
@@ -307,9 +304,6 @@ namespace XHWK.WKTool
             Hide();
         }
 
-        private double screeHeight = SystemParameters.FullPrimaryScreenHeight;
-        private double screeWidth = SystemParameters.FullPrimaryScreenWidth;
-
         /// <summary>
         /// 窗体移动
         /// </summary>

XHWK.WKTool/KeyVerification.xaml

@@ -1,21 +1,21 @@
-<Window x:Class="XHWK.WKTool.KeyVerification"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:XHWK.WKTool"
-         xmlns:Views="clr-namespace:XHWK.WKTool.Helpers"
-        Title="KeyVerification"    Width="300"
+<Window
+    x:Class="XHWK.WKTool.KeyVerification"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Views="clr-namespace:XHWK.WKTool.Helpers"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:XHWK.WKTool"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="KeyVerification"
+    Width="400"
     Height="230"
     AllowsTransparency="True"
     Background="Transparent"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
     WindowStyle="None"
-    mc:Ignorable="d" BorderThickness="7">
-    <Window.Effect>
-        <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
-    </Window.Effect>
+    mc:Ignorable="d">
+
     <Window.Resources>
         <Style x:Key="oiliu" TargetType="ListBoxItem">
             <!--  设置控件模板  -->
@@ -41,11 +41,11 @@
                 Height="auto"
                 Background="Transparent">
                 <TextBlock
-                        Padding="0,12,0,0"
-                        HorizontalAlignment="Left"
-                        FontSize="20"
-                        Foreground="#3C525B"
-                        Text="{Binding username}" />
+                    Padding="0,12,0,0"
+                    HorizontalAlignment="Left"
+                    FontSize="20"
+                    Foreground="#3C525B"
+                    Text="{Binding username}" />
             </StackPanel>
         </DataTemplate>
     </Window.Resources>
@@ -70,57 +70,51 @@
                     FontSize="16"
                     Foreground="White"
                     Text="产品激活" />
-                <!--<Button
-                    Grid.Column="0"
-                    Width="46"
-                    Height="46"
-                    Margin="0,0,10,0"
+
+                <Button
+                    x:Name="btnDown"
+                    Grid.Row="0"
+                    Padding="10,0,10,0"
                     HorizontalAlignment="Right"
-                    VerticalAlignment="Center"
-                    Background="White"
-                    Click="close_click" Cursor="Hand"
-                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                    <Button.Template>
-                        <ControlTemplate TargetType="{x:Type Button}">
-                            <Border
-                                BorderBrush="{TemplateBinding Control.BorderBrush}"
-                                BorderThickness="0"
-                                CornerRadius="20">
-                                <ContentPresenter
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding ContentControl.Content}" />
-                            </Border>
-                        </ControlTemplate>
-                    </Button.Template>
-                    <Image
-                        Width="40"
-                        Height="40"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Source="./Images/rollCall_1.png"
-                        Stretch="Fill" />
-                </Button>-->
-                <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="close_click"/>
+                    Click="close_click"
+                    Content="×"
+                    Cursor="Hand"
+                    FontSize="30"
+                    Foreground="#FFFFFF" />
             </Grid>
             <Grid Grid.Row="1" Margin="30,20,30,0">
-                <StackPanel Orientation="Horizontal" Height="43">
-                    <TextBlock Text="密匙：" FontSize="20" Padding="0,5,0,0"/>
-                    <TextBox x:Name="txbKey" Text="" Width="164" Foreground="gray" FontSize="18" VerticalContentAlignment="Center"/>
-                </StackPanel>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <TextBlock
+                    Padding="0,0,0,0"
+                    VerticalAlignment="Center"
+                    FontSize="20"
+                    Text="密匙：" />
+                <TextBox
+                    x:Name="txbKey"
+                    Grid.Column="1"
+                    Height="46"
+                    VerticalAlignment="Center"
+                    VerticalContentAlignment="Center"
+                    FontSize="18"
+                    Foreground="gray"
+                    Text="" />
             </Grid>
 
-            <Button Cursor="Hand"
+            <Button
                 x:Name="btnEnd"
                 Grid.Row="2"
-                    IsDefault="True"
                 Height="48"
                 Margin="30,0,30,0"
                 Click="btnEnd_Click"
                 Content="验证"
-                    FontWeight="Bold"
+                Cursor="Hand"
                 FontSize="18"
-                Foreground="White">
+                FontWeight="Bold"
+                Foreground="White"
+                IsDefault="True">
                 <Button.Template>
                     <ControlTemplate TargetType="{x:Type Button}">
                         <Border

XHWK.WKTool/MainWindow.xaml

@@ -9,7 +9,7 @@
     Height="700"
     AllowsTransparency="False"
     BorderBrush="#eee"
-    BorderThickness="1"
+    BorderThickness="0"
     Loaded="Window_Loaded"
     MouseLeftButtonDown="Window_MouseLeftButtonDown_1"
     ResizeMode="CanMinimize"
@@ -479,8 +479,7 @@
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
                                 Click="BtnLoginType_Click"
-                                Cursor="Hand"
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                                Cursor="Hand">
                                 <StackPanel>
                                     <Border
                                         x:Name="ImgHeadImgN"
@@ -505,7 +504,7 @@
                                         x:Name="TxbLoginType"
                                         Margin="0,10,0,0"
                                         HorizontalAlignment="Center"
-                                        FontSize="12"
+                                        FontSize="14"
                                         Style="{DynamicResource LoginTypeColor}"
                                         Text="未登录" />
                                 </StackPanel>
@@ -693,7 +692,6 @@
                                             Background="#FFFFFF"
                                             MouseLeftButtonDown="Window_MouseLeftButtonDown_1"
                                             Visibility="Visible">
-
                                             <Grid>
                                                 <Border CornerRadius="5">
                                                     <Grid x:Name="IMG" Margin="0,0,0,0">
@@ -1834,7 +1832,7 @@
                         Height="36"
                         Margin="10,0,10,0"
                         HorizontalAlignment="Stretch"
-                        HorizontalContentAlignment="Center"
+                        HorizontalContentAlignment="Left"
                         VerticalContentAlignment="Center"
                         Background="White"
                         BorderThickness="0"

XHWK.WKTool/MainWindow.xaml.cs

@@ -165,7 +165,6 @@ namespace XHWK.WKTool
             luoBoPenUtil.InitlbPen();
             //腾千里
             InitTQLPPen();
-            InitPrint();
 
             SkinSelectInit();
             byte[] license = Convert.FromBase64String("PExpY2Vuc2U+CiAgPERhdGE+CiAgICA8TGljZW5zZWRUbz5TdXpob3UgQXVuYm94IFNvZnR3YXJlIENvLiwgTHRkLjwvTGljZW5zZWRUbz4KICAgIDxFbWFpbFRvPnNhbGVzQGF1bnRlYy5jb208L0VtYWlsVG8+CiAgICA8TGljZW5zZVR5cGU+RGV2ZWxvcGVyIE9FTTwvTGljZW5zZVR5cGU+CiAgICA8TGljZW5zZU5vdGU+TGltaXRlZCB0byAxIGRldmVsb3BlciwgdW5saW1pdGVkIHBoeXNpY2FsIGxvY2F0aW9uczwvTGljZW5zZU5vdGU+CiAgICA8T3JkZXJJRD4xOTA4MjYwODA3NTM8L09yZGVySUQ+CiAgICA8VXNlcklEPjEzNDk3NjAwNjwvVXNlcklEPgogICAgPE9FTT5UaGlzIGlzIGEgcmVkaXN0cmlidXRhYmxlIGxpY2Vuc2U8L09FTT4KICAgIDxQcm9kdWN0cz4KICAgICAgPFByb2R1Y3Q+QXNwb3NlLlRvdGFsIGZvciAuTkVUPC9Qcm9kdWN0PgogICAgPC9Qcm9kdWN0cz4KICAgIDxFZGl0aW9uVHlwZT5FbnRlcnByaXNlPC9FZGl0aW9uVHlwZT4KICAgIDxTZXJpYWxOdW1iZXI+M2U0NGRlMzAtZmNkMi00MTA2LWIzNWQtNDZjNmEzNzE1ZmMyPC9TZXJpYWxOdW1iZXI+CiAgICA8U3Vic2NyaXB0aW9uRXhwaXJ5PjIwMjAwODI3PC9TdWJzY3JpcHRpb25FeHBpcnk+CiAgICA8TGljZW5zZVZlcnNpb24+My4wPC9MaWNlbnNlVmVyc2lvbj4KICAgIDxMaWNlbnNlSW5zdHJ1Y3Rpb25zPmh0dHBzOi8vcHVyY2hhc2UuYXNwb3NlLmNvbS9wb2xpY2llcy91c2UtbGljZW5zZTwvTGljZW5zZUluc3RydWN0aW9ucz4KICA8L0RhdGE+CiAgPFNpZ25hdHVyZT53UGJtNUt3ZTYvRFZXWFNIY1o4d2FiVEFQQXlSR0pEOGI3L00zVkV4YWZpQnd5U2h3YWtrNGI5N2c2eGtnTjhtbUFGY3J0c0cwd1ZDcnp6MytVYk9iQjRYUndTZWxsTFdXeXNDL0haTDNpN01SMC9jZUFxaVZFOU0rWndOQkR4RnlRbE9uYTFQajhQMzhzR1grQ3ZsemJLZFZPZXk1S3A2dDN5c0dqYWtaL1E9PC9TaWduYXR1cmU+CjwvTGljZW5zZT4=");
@@ -180,8 +179,9 @@ namespace XHWK.WKTool
                  RectRightDown,
                 RectImgBorder,
                 imgCanvas,
-                GridM
-        );
+                GridM);
+
+            InitPrint();
         }
 
         /// <summary>
@@ -285,11 +285,35 @@ namespace XHWK.WKTool
         /// </param>
         /// <param name="e">
         /// </param>
-        private void Window_Loaded(object sender, RoutedEventArgs e)
+        private async void Window_Loaded(object sender, RoutedEventArgs e)
         {
             //调整录制区域宽高
             double proportion = 210.0 / 297.0;
             GridM.Height = GridM.ActualWidth / proportion;
+            await checkDevice();
+        }
+
+        private bool microphoneGood = false;
+        private bool loudspeakerGood = false;
+
+        private async Task checkDevice()
+        {
+            Task<bool> checkMicrophone = Task.Run(() =>
+            {
+                return ZAudioRecordHelper.IsDeviceGood(ZAudioRecordHelper.RecordType.microphone);
+            }
+              );
+
+            Task<bool> checkLoudspeaker = Task.Run(
+                () =>
+                {
+                    return ZAudioRecordHelper.IsDeviceGood(ZAudioRecordHelper.RecordType.loudspeaker);
+                });
+
+            await Task.WhenAll(checkMicrophone, checkLoudspeaker);
+
+            microphoneGood = checkMicrophone.Result;
+            loudspeakerGood = checkMicrophone.Result;
         }
 
         #endregion 初始化
@@ -857,7 +881,7 @@ namespace XHWK.WKTool
         /// </param>
         private void btnPrintExplain_Click(object sender, RoutedEventArgs e)
         {
-            System.Diagnostics.Process.Start(FileToolsCommon.GetFileAbsolutePath("/星火微课点阵码打印及印刷指导手册.docx"));
+            Process.Start(FileToolsCommon.GetFileAbsolutePath("/星火微课点阵码打印及印刷指导手册.docx"));
         }
 
         private void PageHide()
@@ -2693,56 +2717,48 @@ namespace XHWK.WKTool
         /// </param>
         /// <param name="e">
         /// </param>
-        private void BtnScreenRecording_Click(object sender, RoutedEventArgs e)
+        private async void BtnScreenRecording_Click(object sender, RoutedEventArgs e)
         {
             luoBoPenUtil.lb_device_mouse();
-            ThreadPool.QueueUserWorkItem(o =>
-            {
-                bool microphoneGood = ZAudioRecordHelper.IsDeviceGood(ZAudioRecordHelper.RecordType.microphone);
-                bool loudspeakerGood = ZAudioRecordHelper.IsDeviceGood(ZAudioRecordHelper.RecordType.loudspeaker);
 
-                Dispatcher.Invoke(() =>
-                {
-                    if (!microphoneGood)
-                    {
-                        MessageWindow.Show("麦克风不可用");
-                        return;
-                    }
+            if (!microphoneGood)
+            {
+                MessageWindow.Show("麦克风不可用");
+                return;
+            }
 
-                    if (!loudspeakerGood)
-                    {
-                        MessageWindow.Show("扬声器不可用");
-                        return;
-                    }
+            if (!loudspeakerGood)
+            {
+                MessageWindow.Show("扬声器不可用");
+                return;
+            }
 
-                    Record();
+            Record();
 
-                    k_hook.Stop();
-                    if (APP.W_ScreenRecordingToolbarWindow == null)
-                    {
-                        APP.W_ScreenRecordingToolbarWindow = new ScreenRecordingToolbarWindow
-                        {
-                            Topmost = true
-                        };
-                        APP.W_ScreenRecordingToolbarWindow.Initialize();
-                    }
-                    else
-                    {
-                        APP.W_ScreenRecordingToolbarWindow.Initialize();
-                    }
-                    APP.W_ScreenRecordingToolbarWindow.Click_stopRecordingScreen += W_ScreenRecordingToolbarWindow_Click_stopRecordingScreen;
-                    //显示在右下角
-                    APP.W_ScreenRecordingToolbarWindow.WindowStartupLocation = WindowStartupLocation.Manual;
-                    Graphics graphics = Graphics.FromHwnd(IntPtr.Zero);
-                    float DIP = graphics.DpiX;
-                    float DIPY = graphics.DpiY;
-                    APP.W_ScreenRecordingToolbarWindow.Left = PrimaryScreen.WorkingArea.Width / (DIP / 96) - APP.W_ScreenRecordingToolbarWindow.Width;
-                    APP.W_ScreenRecordingToolbarWindow.Top = PrimaryScreen.WorkingArea.Height / (DIP / 96) - APP.W_ScreenRecordingToolbarWindow.Height - 100;
-                    APP.W_ScreenRecordingToolbarWindow.Topmost = true;
-                    APP.W_ScreenRecordingToolbarWindow.Show();
-                    Hide();
-                });
-            });
+            k_hook.Stop();
+            if (APP.W_ScreenRecordingToolbarWindow == null)
+            {
+                APP.W_ScreenRecordingToolbarWindow = new ScreenRecordingToolbarWindow
+                {
+                    Topmost = true
+                };
+                APP.W_ScreenRecordingToolbarWindow.Initialize();
+            }
+            else
+            {
+                APP.W_ScreenRecordingToolbarWindow.Initialize();
+            }
+            APP.W_ScreenRecordingToolbarWindow.Click_stopRecordingScreen += W_ScreenRecordingToolbarWindow_Click_stopRecordingScreen;
+            //显示在右下角
+            APP.W_ScreenRecordingToolbarWindow.WindowStartupLocation = WindowStartupLocation.Manual;
+            Graphics graphics = Graphics.FromHwnd(IntPtr.Zero);
+            float DIP = graphics.DpiX;
+            float DIPY = graphics.DpiY;
+            APP.W_ScreenRecordingToolbarWindow.Left = PrimaryScreen.WorkingArea.Width / (DIP / 96) - APP.W_ScreenRecordingToolbarWindow.Width;
+            APP.W_ScreenRecordingToolbarWindow.Top = PrimaryScreen.WorkingArea.Height / (DIP / 96) - APP.W_ScreenRecordingToolbarWindow.Height - 100;
+            APP.W_ScreenRecordingToolbarWindow.Topmost = true;
+            APP.W_ScreenRecordingToolbarWindow.Show();
+            Hide();
         }
 
         /// <summary>
@@ -2751,10 +2767,8 @@ namespace XHWK.WKTool
         private void W_ScreenRecordingToolbarWindow_Click_stopRecordingScreen()
         {
             TxbTime.Text = "00:00";
-            //TxbTime.Visibility = Visibility.Hidden;
-            //ImgLZImg.Visibility = Visibility.Hidden;
-            //TxbType.Visibility = Visibility.Visible;
             TxbType.Text = "保存中";
+            RecordType = 1;
             BtnScreenRecording.IsEnabled = false;
 
             new Thread(new ThreadStart(new Action(() =>
@@ -2766,10 +2780,9 @@ namespace XHWK.WKTool
                 Thread.Sleep(100);
                 Dispatcher.Invoke(() =>
                 {
+                    RecordType = 0;
                     BtnScreenRecording.IsEnabled = true;
                     TxbType.Text = "准备就绪";
-                    //TxbType.Visibility = Visibility.Hidden;
-                    //TxbRecordScreenWord.Text = "录屏";
                 });
             }))).Start();
         }
@@ -2875,14 +2888,10 @@ namespace XHWK.WKTool
 
             if (RecordType == 0)
             {
-                bool microphoneGood = true;
                 start_pause_grid.Visibility = Visibility.Hidden;
                 stop_grid.Visibility = Visibility.Hidden;
                 close_grid.Visibility = Visibility.Hidden;
-                await Task.Run(() =>
-                {
-                    microphoneGood = ZAudioRecordHelper.IsDeviceGood(ZAudioRecordHelper.RecordType.microphone);
-                });
+
                 if (!microphoneGood)
                 {
                     start_pause_grid.Visibility = Visibility.Visible;
@@ -4036,27 +4045,31 @@ namespace XHWK.WKTool
         /// <summary>
         /// 打印初始化
         /// </summary>
-        public void InitPrint()
+        public async void InitPrint()
         {
             ResizeMode = ResizeMode.NoResize;
-            List<string> defaList = ZPrintUtils.GetLocalPrinters();
-            if (defaList.Count > 0)
+            await Task.Run(() =>
             {
-                printlist.Columns.Add("Value");
-                printlist.Columns.Add("Key");
-                for (int i = 0; i < defaList.Count; i++)
+                List<string> defaList = ZPrintUtils.GetLocalPrinters();
+                if (defaList.Count > 0)
                 {
-                    //创建一行
-                    DataRow row = printlist.NewRow();
-                    //将此行添加到table中
-                    printlist.Rows.Add(row);
-                    printlist.Rows[i]["Value"] = defaList[i];
-                    printlist.Rows[i]["Key"] = i.ToString();
+                    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();
                 }
-                dtComponentsUniqueNo = printlist.DefaultView.ToTable();
-                cmbClass.ItemsSource = dtComponentsUniqueNo.DefaultView;
-                cmbClass.SelectedIndex = 0;
-            }
+            });
+
+            cmbClass.ItemsSource = dtComponentsUniqueNo.DefaultView;
+            cmbClass.SelectedIndex = 0;
 
             TQLPrintInit();
         }

XHWK.WKTool/Utils/ZPrintUtils.cs

@@ -4,9 +4,10 @@ using System.Runtime.InteropServices;
 
 namespace XHWK.WKTool.Utils
 {
-    class ZPrintUtils
+    internal class ZPrintUtils
     {
         private static PrintDocument fPrintDocument = new PrintDocument();
+
         /// <summary>
         /// 获取本机默认打印机名称
         /// </summary>
@@ -23,14 +24,21 @@ namespace XHWK.WKTool.Utils
         public static List<string> GetLocalPrinters()
         {
             List<string> fPrinters = new List<string>();
-            fPrinters.Add(DefaultPrinter()); //默认打印机始终出现在列表的第一项
-            foreach (string fPrinterName in PrinterSettings.InstalledPrinters)
+            try
             {
-                if (!fPrinters.Contains(fPrinterName))
+                fPrinters.Add(DefaultPrinter()); //默认打印机始终出现在列表的第一项
+                foreach (string fPrinterName in PrinterSettings.InstalledPrinters)
                 {
-                    fPrinters.Add(fPrinterName);
+                    if (!fPrinters.Contains(fPrinterName))
+                    {
+                        fPrinters.Add(fPrinterName);
+                    }
                 }
             }
+            catch (System.Exception)
+            {
+                throw;
+            }
             return fPrinters;
         }
 
@@ -69,4 +77,4 @@ namespace XHWK.WKTool.Utils
             p.WaitForExit(15000);
         }
     }
-}
+}

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

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课"  
 #define MyAppDir "xhwk"
-#define MyAppVersion "3.1.14"
+#define MyAppVersion "3.2.1"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xhwkclient\XHWK.WKTool\bin\x86\Debug\"
@@ -56,61 +56,6 @@ Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Fil
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
 
 [Code]  
-// 自定义函数，判断软件是否运行，参数为需要判断的软件的exe名称
-function CheckSoftRun(strExeName: String): Boolean;
-// 变量定义
-var ErrorCode: Integer;
-var bRes: Boolean;
-var strFileContent: AnsiString;
-var strTmpPath: String;  // 临时目录
-var strTmpFile: String;  // 临时文件，保存查找软件数据结果
-var strCmdFind: String;  // 查找软件命令
-var strCmdKill: String;  // 终止软件命令
-begin
-  strTmpPath := GetTempDir();
-  strTmpFile := Format('%sfindSoftRes.txt', [strTmpPath]);
-  strCmdFind := Format('/c tasklist /nh|find /c /i "%s" > "%s"', [strExeName, strTmpFile]);
-  strCmdKill := Format('/c taskkill /f /t /im %s', [strExeName]);
-  bRes := ShellExec('open', ExpandConstant('{cmd}'), strCmdFind, '', SW_HIDE, ewWaitUntilTerminated, ErrorCode);
-  if bRes then begin
-      bRes := LoadStringFromFile(strTmpFile, strFileContent);
-      strFileContent := Trim(strFileContent);
-      if bRes then begin
-         if StrToInt(strFileContent) > 0 then begin
-            if MsgBox(ExpandConstant('{cm:checkSoftTip}'), mbConfirmation, MB_OKCANCEL) = IDOK then begin
-             // 终止程序
-             ShellExec('open', ExpandConstant('{cmd}'), strCmdKill, '', SW_HIDE, ewNoWait, ErrorCode);
-             Result:= true;// 继续安装
-            end else begin
-             Result:= false;// 安装程序退出
-             Exit;
-            end;
-         end else begin
-            // 软件没在运行
-            Result:= true;
-            Exit;
-         end;
-      end;
-  end;
-  Result :=true;
-end;
-
-// 开始页下一步时判断软件是否运行
-function NextButtonClick(CurPageID: Integer): Boolean;
-begin
-  if 1=CurPageID then begin
-      Result := CheckSoftRun('{#MyAppExeName}');
-      Exit;
-  end; 
-  Result:= true;
-end;
-
-// 卸载时关闭软件
-function InitializeUninstall(): Boolean;
-begin
-  Result := CheckSoftRun('{#MyAppExeName}');
-end;
-
 function CheckVC():boolean;
 var Path:string; 
       ResultCode: Integer;  
@@ -232,5 +177,55 @@ begin
 end;   
 
 
-[CustomMessages]
-chinesesimp.checkSoftTip=安装程序检测到将安装的软件正在运行！%n%n点击"确定"终止软件后继续操作，否则点击"取消"。
+// 自定义函数，判断软件是否运行，参数为需要判断的软件的exe名称
+function CheckSoftRun(strExeName: String): Boolean;
+// 变量定义
+var ErrorCode: Integer;
+var bRes: Boolean;
+var strFileContent: AnsiString;
+var strTmpPath: String;  // 临时目录
+var strTmpFile: String;  // 临时文件，保存查找软件数据结果
+var strCmdFind: String;  // 查找软件命令
+var strCmdKill: String;  // 终止软件命令
+begin
+  strTmpPath := GetTempDir();
+  strTmpFile := Format('%sfindSoftRes.txt', [strTmpPath]);
+  strCmdFind := Format('/c tasklist /nh|find /c /i "%s" > "%s"', [strExeName, strTmpFile]);
+  strCmdKill := Format('/c taskkill /f /t /im %s', [strExeName]);
+  bRes := ShellExec('open', ExpandConstant('{cmd}'), strCmdFind, '', SW_HIDE, ewWaitUntilTerminated, ErrorCode);
+  if bRes then begin
+      bRes := LoadStringFromFile(strTmpFile, strFileContent);
+      strFileContent := Trim(strFileContent);
+      if bRes then begin
+         if StrToInt(strFileContent) > 0 then begin
+            // 终止程序
+           ShellExec('open', ExpandConstant('{cmd}'), strCmdKill, '', SW_HIDE, ewNoWait, ErrorCode);
+           Result:= true;// 继续安装
+         end else begin
+            // 软件没在运行
+            Result:= true;
+         end;
+      end;
+  end;
+  Result :=true;
+end;
+
+// 开始页下一步时判断软件是否运行
+function NextButtonClick(CurPageID: Integer): Boolean;
+begin
+  if 1=CurPageID then begin
+      Result := CheckSoftRun('{#MyAppExeName}');
+  end 
+  else begin
+      Result:= true;
+   end;
+end;
+
+// 卸载时关闭软件
+function InitializeUninstall(): Boolean;
+begin
+  Result := CheckSoftRun('{#MyAppExeName}');
+end;
+
+
+