合并

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -21,18 +21,18 @@ namespace XHWK.WKTool
         /// <summary>
         /// 计时器
         /// </summary>
-        private int ImgNum = 21;
-        public void Initialize(bool ShowlblShortcut = false, int changeTime = 2100)
+        private int ImgNum = 22;
+        public void Initialize(bool ShowlblShortcut = false, int changeTime = 2000)
         {
-            //if (ShowlblShortcut)
-            //{
-            //    lblShortcut.Visibility = Visibility.Visible;
-            //}
-            //else
-            //{
-            //    lblShortcut.Visibility = Visibility.Hidden;
-            //}
-            ImgNum = 21;
+            if (ShowlblShortcut)
+            {
+                lblShortcut.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                lblShortcut.Visibility = Visibility.Hidden;
+            }
+            ImgNum = 22;
             bool IsStart = true;
             new Thread(new ThreadStart(new Action(() =>
             {
@@ -45,7 +45,7 @@ namespace XHWK.WKTool
                             loadingImg(ImgNum);
                             LogHelper.WriteInfoLog("【" + ImgNum + "】");
                             ImgNum--;
-                            Thread.Sleep(changeTime / 21);
+                            Thread.Sleep(changeTime / 22);
                         }
                         else
                         {
@@ -107,7 +107,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_5.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_7.png"));
                       }));
                     break;
                 case 2:
@@ -115,7 +115,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_4.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_6.png"));
                       }));
                     break;
                 case 3:
@@ -123,7 +123,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_3.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_5.png"));
                       }));
                     break;
                 case 4:
@@ -131,7 +131,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_2.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_4.png"));
                       }));
                     break;
                 case 5:
@@ -139,7 +139,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_1.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_3.png"));
                       }));
                     break;
                 case 6:
@@ -147,7 +147,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_7.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_2.png"));
                       }));
                     break;
                 case 7:
@@ -155,7 +155,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_6.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_1.png"));
                       }));
                     break;
                 case 8:
@@ -163,7 +163,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_5.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_7.png"));
                       }));
                     break;
                 case 9:
@@ -171,7 +171,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_4.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_6.png"));
                       }));
                     break;
                 case 10:
@@ -179,7 +179,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_3.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_5.png"));
                       }));
                     break;
                 case 11:
@@ -187,7 +187,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_2.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_4.png"));
                       }));
                     break;
                 case 12:
@@ -195,7 +195,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_1.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_3.png"));
                       }));
                     break;
                 case 13:
@@ -203,7 +203,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_9.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_2.png"));
                       }));
                     break;
                 case 14:
@@ -211,7 +211,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_8.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_1.png"));
                       }));
                     break;
                 case 15:
@@ -219,7 +219,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_7.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_8.png"));
                       }));
                     break;
                 case 16:
@@ -227,7 +227,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_6.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_7.png"));
                       }));
                     break;
                 case 17:
@@ -235,7 +235,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_5.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_6.png"));
                       }));
                     break;
                 case 18:
@@ -243,7 +243,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_4.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_5.png"));
                       }));
                     break;
                 case 19:
@@ -251,7 +251,7 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_3.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_4.png"));
                       }));
                     break;
                 case 20:
@@ -259,10 +259,18 @@ namespace XHWK.WKTool
                       DispatcherPriority.Send,
                       new Action(() =>
                       {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_2.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_3.png"));
                       }));
                     break;
                 case 21:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() =>
+                      {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_2.png"));
+                      }));
+                    break;
+                case 22:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
                       new Action(() =>

XHWK.WKTool/PrintWindow.xaml

@@ -32,23 +32,23 @@
     </Window.Resources>
     <Viewbox>
         <Grid x:Name="GridContent" Height="600" Width="900">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="120"/>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="80"/>
-        </Grid.RowDefinitions>
-        <Grid Grid.Row="0" Background="#E6EAF0" MouseLeftButtonDown="Window_MouseLeftButtonDown">
             <Grid.RowDefinitions>
-                <RowDefinition Height="50"/>
-                <RowDefinition Height="50"/>
+                <RowDefinition Height="120"/>
                 <RowDefinition Height="*"/>
+                <RowDefinition Height="80"/>
             </Grid.RowDefinitions>
-            <Button Cursor="Hand" Grid.Row="0" x:Name="btnClose" Background="#CC4848" Foreground="#FFFFFF" Content="×" FontSize="20" Width="30" Height="30" HorizontalAlignment="Right" Margin="0,0,10,0" Click="BtnClose_Click" Style="{StaticResource NoMouseOverButtonStyle}">
+            <Grid Grid.Row="0" Background="#E6EAF0" MouseLeftButtonDown="Window_MouseLeftButtonDown">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="50"/>
+                    <RowDefinition Height="50"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+                <Button Cursor="Hand" Grid.Row="0" x:Name="btnClose" Background="#CC4848" Foreground="#FFFFFF" Content="×" FontSize="20" Width="30" Height="30" HorizontalAlignment="Right" Margin="0,0,10,0" Click="BtnClose_Click" Style="{StaticResource NoMouseOverButtonStyle}">
 
-            </Button>
-            <StackPanel Grid.Row="1" HorizontalAlignment="Left" Orientation="Horizontal" Margin="10,2,0,0" Height="40">
-                <TextBlock  Text="打印机："  FontSize="20" Padding="0,5,0,0"/>
-                <ComboBox Cursor="Hand" Width="210"
+                </Button>
+                <StackPanel Grid.Row="1" HorizontalAlignment="Left" Orientation="Horizontal" Margin="10,2,0,0" Height="40">
+                    <TextBlock  Text="打印机："  FontSize="20" Padding="0,5,0,0"/>
+                    <ComboBox Cursor="Hand" Width="210"
                                 x:Name="cmbClass"
                                 Padding="30,0,10,0"
                                 VerticalContentAlignment="Center"
@@ -57,26 +57,48 @@
                                 FontSize="14"
                                 SelectedValuePath="Key"
                                 />
-                <TextBlock Text="份数：" FontSize="20" Margin="80,0,0,0" Padding="0,5,0,0" HorizontalAlignment="Right"/>
-                <TextBlock x:Name="txbNumberOfCopies" Width="100" Text="1" FontSize="16" Padding="50,10,0,0" Background="White"/>
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                    </Grid.RowDefinitions>
-                    <Button Cursor="Hand" Grid.Row="0" x:Name="btnLess"  Content="-" Click="BtnLess_Click"/>
-                    <Button Cursor="Hand" Grid.Row="1" x:Name="btnAdd"  Content="+" Click="BtnAdd_Click"/>
-                </Grid>
-                <!--<TextBlock Text="点型：" FontSize="20"  Margin="120,10,0,0"/>
+                    <TextBlock Text="份数：" FontSize="20" Margin="80,0,0,0" Padding="0,5,0,0" HorizontalAlignment="Right"/>
+                    <TextBlock x:Name="txbNumberOfCopies" Width="100" Text="1" FontSize="16" Padding="50,10,0,0" Background="White"/>
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="auto"/>
+                            <RowDefinition Height="auto"/>
+                        </Grid.RowDefinitions>
+                        <Button Cursor="Hand" Grid.Row="0" x:Name="btnLess"  Content="-" Click="BtnLess_Click"/>
+                        <Button Cursor="Hand" Grid.Row="1" x:Name="btnAdd"  Content="+" Click="BtnAdd_Click"/>
+                    </Grid>
+                    <!--<TextBlock Text="点型：" FontSize="20"  Margin="120,10,0,0"/>
                 <RadioButton x:Name="rbnSquarePoint" Content="方点" FontSize="16"  Margin="0,15,0,0" IsChecked="True"/>
                 <RadioButton x:Name="rbnDots" Content="圆点" FontSize="16"  Margin="0,15,0,0"/>-->
-            </StackPanel>
-        </Grid>
-        <Grid Grid.Row="1">
-            <Image x:Name="imgPri"/>
-        </Grid>
+                </StackPanel>
+            </Grid>
 
-        <Button
+            <Views:ZJClippingBorder Grid.Row="0" x:Name="tip_outer" Margin="0" Background="#FFE6EAF0" CornerRadius="4" Visibility="Collapsed">
+                <Grid>
+                    <Label Content="打印中..." HorizontalAlignment="Center" Margin="0,20,0,0" Height="35" VerticalAlignment="Top" FontSize="20"></Label>
+                    <ProgressBar BorderBrush="#4597FF"
+                             Foreground="#4597FF"
+                    Grid.Row="0"
+                    x:Name="pgbProcess"
+                    Height="20"
+                    Margin="50,20,50,0"
+                    Visibility="Visible" />
+                    <Label Grid.Row="0"
+                    HorizontalAlignment="Center" Width="100"
+                    x:Name="lbProcess"
+                    Height="30"
+                    Margin="0,20,0,0"
+                       FontSize="16"
+                    Content=""
+                       Foreground="White"
+                    Visibility="Visible" />
+                </Grid>
+            </Views:ZJClippingBorder>
+            <Grid Grid.Row="1">
+                <Image x:Name="imgPri"/>
+            </Grid>
+
+            <Button
                     x:Name="btnPrint"
                     Grid.Row="8"
                     Width="115"
@@ -88,51 +110,21 @@
                     IsDefault="True"
                     Cursor="Hand"
                     Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-            <Button.Template>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Border
+                <Button.Template>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <Border
                                 BorderBrush="{TemplateBinding Control.BorderBrush}"
                                 BorderThickness="1"
                                 CornerRadius="7">
-                        <Border.Background>#2E8CF0</Border.Background>
-                        <ContentPresenter
+                            <Border.Background>#2E8CF0</Border.Background>
+                            <ContentPresenter
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     Content="{TemplateBinding ContentControl.Content}" />
-                    </Border>
-                </ControlTemplate>
-            </Button.Template>
-        </Button>
-        <Views:ZJClippingBorder
-            x:Name="tip_outer"
-            Width="760"
-            Height="44"
-            Margin="0,30,0,0"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Background="#FAFAFA"
-            CornerRadius="4"
-            Visibility="Collapsed">
-            <Grid>
-
-                <ProgressBar BorderBrush="#4597FF"
-                             Foreground="#4597FF"
-                    Grid.Row="0"
-                    x:Name="pgbProcess"
-                    Height="20"
-                    Margin="0,0,0,0"
-                    Visibility="Visible" />
-                <Label Grid.Row="0"
-                    HorizontalAlignment="Center" Width="100"
-                    x:Name="lbProcess"
-                    Height="30"
-                    Margin="0,0,0,0"
-                       FontSize="16"
-                    Content=""
-                       Foreground="White"
-                    Visibility="Visible" />
-            </Grid>
-        </Views:ZJClippingBorder>
-    </Grid>
+                        </Border>
+                    </ControlTemplate>
+                </Button.Template>
+            </Button>
+        </Grid>
     </Viewbox>
 </Window>

XHWK.WKTool/PrintWindow.xaml.cs

@@ -21,24 +21,8 @@ namespace XHWK.WKTool
         /// </summary>
         public DataTable data = new DataTable();
         private DataTable dtComponentsUniqueNo;
-        /// <summary>
-        /// 计时器状态
-        /// </summary>
-        private enum State
-        {
-            Start,
-            Pause,
-            End
-        }
-        private DispatcherTimer t = null;
-        /// <summary>
-        /// 状态
-        /// </summary>
-        private State _state = State.End;
-        /// <summary>
-        /// 计时用
-        /// </summary>
-        private TimeSpan _timeSpan = new TimeSpan(0, 0, 0, 0, 0);
+
+        private System.Timers.Timer times;
         public PrintWindow()
         {
             InitializeComponent();
@@ -81,18 +65,8 @@ namespace XHWK.WKTool
                 imgPri.Source = null;
             }
             I = 0;
-            if (t == null)
-            {
-                t = new DispatcherTimer();
-                t.Tick += OnTimer;
-                t.Interval = new TimeSpan(0, 0, 0, 1);
-                t.IsEnabled = true;
-                t.Start();
-            }
-            t.Interval = new TimeSpan(0, 0, 0, 1);
             tip_outer.Visibility = Visibility.Collapsed;
         }
-        private System.Timers.Timer times;
         /// <summary>
         /// 打印
         /// </summary>
@@ -106,100 +80,110 @@ namespace XHWK.WKTool
                 MessageWindow.Show("打印机不能为空！");
                 return;
             }
-            APP.myloading.Show();
-            APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeServering, InvokeServerCompate);
-
-
-
-
-            //I = 1;
             //APP.myloading.Show();
-            //tip_outer.Visibility = Visibility.Visible;
-            //Thread.Sleep(2000);
-            //Times();
-            //Dispatcher.Invoke(() =>
-            //{
-            //    times = new System.Timers.Timer(100)//初始值为300
-            //    {
-            //        AutoReset = true//设置是否执行System.Timers.Timer.Elapsed事件
-            //    };//设置执行一次（false）还是一直执行(true)
-            //    I = 0;
-            //    tip_outer.Visibility = Visibility.Visible;
-            //    times.Elapsed += new System.Timers.ElapsedEventHandler(Times_Elapsed);
-            //    times.Enabled = true; //启动计时器
-            //                          //APP.myloading.Show();
-            //});
-
+            btnClose.IsEnabled = false;
+            btnPrint.IsEnabled = false;
+            //APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeServering, InvokeServerCompate);
+            Thread myThread = new Thread(StartPrint);
+            List<string> StrList = new List<string>();
 
-
-            //string imgPath = FileToolsCommon.GetFileAbsolutePath("temp");
+            //string imgPath = 
             //FileToolsCommon.CreateFile(imgPath);
             //string pdf = imgPath + "\\101.pdf";
-            //string tpf = imgPath + "\\102.TPF";
-            //string msg = string.Empty;
-            //string outPut = string.Empty;
-            ////if(rbnSquarePoint.IsChecked==false)
-            ////{
-            ////    pyte = 1;
-            ////}
-            //LatticeFileHelper.GeneratingPDF(pdf, tpf, out int pr, out msg, out outPut/*, pyte*/);
-            //if (pr == 0)
-            //{
-            //    //outPut = outPut.Replace("[", "").Replace("]", "").Replace("\"", "").Trim();
-            //    //APP.OutPut = outPut.Split(',');
-            //    //string []page= outPut.Split(',');
-            //    //for(int i=0;i<page.Length;i++) //增加页码编号
-            //    //{
-            //    //    APP.PageDrawList[i].PageCode = page[i];
-            //    //}
-
-            //    //string defa = string.Empty;
-            //    //List<string> defaList = LatticeFileHelper.GetPrinterList(out defa);
-
-            //    string standardError = string.Empty;
-            //    string standardOutput = string.Empty;
-            //    int frequency = Convert.ToInt32(txbNumberOfCopies.Text);
-            //    //for (int i=0;i< frequency;i++)
-            //    //{
-            //    LatticeFileHelper.PrinterTPFFile(tpf, frequency, cmbClass.Text, out int printResult, out standardError, out standardOutput);
-            //    //}
-            //    if (printResult == 0)// 0为成功
-            //    {
-            //        new Thread(new ThreadStart(new Action(() =>
-            //        {
-            //            Dispatcher.Invoke(() =>
-            //            {
-            //                I = 100;
-            //                pgbProcess.Value = I * 100 / 100;
-            //                lbProcess.Content = string.Format("{0}/{1}", I, 100);
-            //                APP.myloading.Hide();
-            //                I = 0;
-            //            });
-            //            Thread.Sleep(2000);
-            //            Dispatcher.Invoke(() =>
-            //            {
-            //                //tip_outer.Visibility = Visibility.Collapsed;
-            //                MessageWindow.Show("打印成功");
-            //            });
-            //        }))).Start();
+            //PDF位置
+            string SourcePath=FileToolsCommon.GetFileAbsolutePath("/temp/101.pdf");
+            StrList.Add(SourcePath);
+            //打印数量
+            int PrinterNum = Convert.ToInt32(txbNumberOfCopies.Text);
+            StrList.Add(PrinterNum.ToString());
+            //打印机名称
+            string PrinterName = cmbClass.Text;
+            StrList.Add(PrinterName);
 
+            num = 0;
+            tip_outer.Visibility = Visibility.Visible;
+            myThread.Start(StrList);
+            times = new System.Timers.Timer(100);
+            times.Elapsed += Times_ElapsedClick;
+            times.Start();
+        }
+        int num = 0;
+        /// <summary>
+        /// 计时器
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Times_ElapsedClick(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            Dispatcher.Invoke(() =>
+            {
+                pgbProcess.Value = num;
+                lbProcess.Content = string.Format("{0}/{1}", num, 100);
+                if (num < 99)
+                {
+                    num++;
+                    times.Interval += (num/2);
+                }
+                else
+                {
+                    times.Stop();
+                }
+            });
+        }
 
-                   
-                    
-                  
-            //    }
-            //    else
-            //    {
-            //        APP.myloading.Hide();
-            //        MessageWindow.Show(standardError);
-            //    }
-            //}
-            //else
-            //{
-            //    APP.myloading.Hide();
-            //    MessageWindow.Show(msg);
-            //}
+        /// <summary>
+        /// 开始打印
+        /// </summary>
+        void StartPrint(object obj)
+        {
+            List<string> objStr = (List<string>)obj;
+            string SourcePath= objStr[0];
+            int PrinterNum=int.Parse(objStr[1]);
+            string PrinterName= objStr[2];
+            //TPF文件位置
+            string TPFPath = FileToolsCommon.GetFileAbsolutePath("temp/");
+            FileToolsCommon.CreateDirectory(TPFPath);
+            TPFPath += "101.TPF";
+            //生成点阵文件
+            LatticeFileHelper.GeneratingPDF(SourcePath, TPFPath, out int pr, out string msg, out string outPut/*, pyte*/);
+            while(!FileToolsCommon.IsExistFile(TPFPath))
+            {
+                Thread.Sleep(100);
+            }
+            while(string.IsNullOrWhiteSpace(pr.ToString()))
+            {
+                Thread.Sleep(100);
+            }
+            Thread.Sleep(1000);
+            //打印
+            LatticeFileHelper.PrinterTPFFile(TPFPath, PrinterNum, PrinterName, out int printResult, out string standardError, out string standardOutput);
+            if (printResult == 0)
+            {
+                Dispatcher.Invoke(() =>
+                {
+                    btnClose.IsEnabled = true;
+                    btnPrint.IsEnabled = true;
+                    num = 99;
+                    times.Stop();
+                    pgbProcess.Value = 100;
+                    lbProcess.Content = string.Format("{0}/{1}", 100, 100);
+                    MessageWindow.Show("打印成功！");
+                    tip_outer.Visibility = Visibility.Collapsed;
+                });
+            }
+            else
+            {
+                Dispatcher.Invoke(() =>
+                {
+                    btnClose.IsEnabled = true;
+                    btnPrint.IsEnabled = true;
+                    times.Stop();
+                    tip_outer.Visibility = Visibility.Collapsed;
+                    MessageWindow.Show(standardError);
+                });
+            }
         }
+
         /// <summary>
         /// 打印-开始
         /// </summary>
@@ -207,13 +191,13 @@ namespace XHWK.WKTool
         private object InvokeServering()
         {
             Dispatcher.Invoke(() =>
-                       {
-                           I = 1;
-                           pgbProcess.Value = I * 100 / 100;
-                           lbProcess.Content = string.Format("{0}/{1}", I, 100);
-                           tip_outer.Visibility = Visibility.Visible;
-                           //I = 0;
-                       });
+             {
+                 I = 1;
+                 pgbProcess.Value = I * 100 / 100;
+                 lbProcess.Content = string.Format("{0}/{1}", I, 100);
+                 tip_outer.Visibility = Visibility.Visible;
+                 //I = 0;
+             });
             Thread.Sleep(2000);
 
             string imgPath = FileToolsCommon.GetFileAbsolutePath("temp");
@@ -243,8 +227,8 @@ namespace XHWK.WKTool
                 string standardError = string.Empty;
                 string standardOutput = string.Empty;
                 int frequency = 1;
-                Dispatcher.Invoke(() =>
-                {
+                //Dispatcher.Invoke(() =>
+                //{
                      frequency = Convert.ToInt32(txbNumberOfCopies.Text);
                     LatticeFileHelper.PrinterTPFFile(tpf, frequency, cmbClass.Text, out int printResult, out standardError, out standardOutput);
                     if (printResult == 0)// 0为成功
@@ -267,14 +251,17 @@ namespace XHWK.WKTool
                                 MessageWindow.Show("打印成功");
                             });
                         }))).Start();
-                    }
-                    else
+                }
+                else
+                {
+                    Dispatcher.Invoke(() =>
                     {
                         APP.myloading.Hide();
                         MessageWindow.Show(standardError);
-                    }
-                });
-             
+                    });
+                }
+                //});
+
             }
             else
             {
@@ -298,66 +285,6 @@ namespace XHWK.WKTool
             {
             }
         }
-        /// <summary>
-        /// 时钟回调
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void OnTimer(object sender, EventArgs e)
-        {
-            switch (_state)
-            {
-                case State.Start:
-                    {
-                        _timeSpan += new TimeSpan(0, 0, 0, 1);
-                    }
-                    break;
-
-                case State.Pause:
-                    {
-                    }
-                    break;
-
-                case State.End:
-                    {
-                        _timeSpan = new TimeSpan();
-                        //_timeSpan = new TimeSpan(0, 23, 12, 45, 54);
-                    }
-                    break;
-            }
-
-            string time = string.Format("{0:D2}:{1:D2}",/* _timeSpan.Hours,*/ _timeSpan.Minutes, _timeSpan.Seconds);
-            if(I < 90 && I != 0)
-            {
-                Dispatcher.Invoke(() =>
-                {
-                 
-                    pgbProcess.Value = I * 100 / 100;
-            lbProcess.Content = string.Format("{0}/{1}", I, 100);
-                    if (I == 1)
-                    {
-                        I = 30;
-                    }
-                    else
-                    {
-                        I += 30;
-                    }
-                });
-            }
-        }
-        private void Times()
-        {
-            Dispatcher.Invoke(() =>
-            {
-                while (I <= 90&&I!=0)
-            {
-                pgbProcess.Value = I * 100 / 100;
-                lbProcess.Content = string.Format("{0}/{1}", I, 100);
-                Thread.Sleep(100);
-                I++;
-            }
-            });
-        }
 
         private int I = 0;
         private void Times_Elapsed(object sender, System.Timers.ElapsedEventArgs e)

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -619,6 +619,7 @@
                 </Border>
             </Grid>
 
+
             <Grid x:Name="GridMyVideo" Grid.Row="1" Margin="0" Background="White" Visibility="Collapsed">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="*"/>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -3145,15 +3145,15 @@ namespace XHWK.WKTool
                         Thread.Sleep(500);
                         int imgW = (int)GridMain.ActualWidth + (GridMain.ActualWidth % 2 > 0 ? 1 : 0);
                         int imgH = (int)GridMain.ActualHeight + (GridMain.ActualHeight % 2 > 0 ? 1 : 0);
-                        if (ThuRes)
-                        {
-                            Bitmap bmp = ImageHelper.ReadBitmapFile(ThumbnailPathName);
-                            if (bmp != null)
-                            {
-                                imgW = bmp.Width + (bmp.Width % 2 > 0 ? 1 : 0);
-                                imgH = bmp.Height + (bmp.Height % 2 > 0 ? 1 : 0);
-                            }
-                        }
+                        //if (ThuRes)
+                        //{
+                        //    Bitmap bmp = ImageHelper.ReadBitmapFile(ThumbnailPathName);
+                        //    if (bmp != null)
+                        //    {
+                        //        imgW = bmp.Width + (bmp.Width % 2 > 0 ? 1 : 0);
+                        //        imgH = bmp.Height + (bmp.Height % 2 > 0 ? 1 : 0);
+                        //    }
+                        //}
 
                         APP.FFmpeg.VideoTranscode(VideoSynthesisPathName, VideoSavePathName, imgW, imgH);
                         VideoInfo.FileGuid = Guid.NewGuid().ToString();
@@ -3320,9 +3320,9 @@ namespace XHWK.WKTool
                 ////设置纸张横向
                 //document.SetPageSize(iTextSharp.text.PageSize.A4.Rotate());
 
-                string imgPath = FileToolsCommon.GetFileAbsolutePath("temp");
-                FileToolsCommon.CreateFile(imgPath);
-                imgPath += "\\101.pdf";
+                string imgPath = FileToolsCommon.GetFileAbsolutePath("temp/");
+                FileToolsCommon.CreateDirectory(imgPath);
+                imgPath += "101.pdf";
                 iTextSharp.text.pdf.PdfWriter.GetInstance(document, new FileStream(imgPath, FileMode.Create, FileAccess.ReadWrite));
                 document.Open();
                 iTextSharp.text.Image image;

XHWK.WKTool/XHWK.WKTool.csproj

@@ -1586,7 +1586,6 @@
     <Resource Include="Images\countdown3_6.png" />
     <Resource Include="Images\countdown3_7.png" />
     <Resource Include="Images\countdown3_8.png" />
-    <Resource Include="Images\countdown3_9.png" />
     <Resource Include="Images\microLessonSystem_999.png" />
   </ItemGroup>
   <ItemGroup>
@@ -1611,5 +1610,9 @@
     <Resource Include="Images\rdo_no.png" />
     <Resource Include="Images\rdo_yes.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\countdown1_6.png" />
+    <Resource Include="Images\countdown1_7.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>