Merge remote-tracking branch 'origin/zxy' into zyy

XHWK.Model/ViewModel.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Ink;
+
+namespace XHWK.Model
+{
+    public class ViewModel : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected virtual void OnPropertyChanged(string propertyName = null)
+        {
+            if (PropertyChanged != null)
+                PropertyChanged.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        private string meaInfo;
+        public string MeaInfo
+        {
+            get => meaInfo;
+            set
+            {
+                meaInfo = value;
+                OnPropertyChanged("MeaInfo");
+            }
+        }
+
+        private StrokeCollection inkStrokes;
+        public StrokeCollection InkStrokes
+        {
+            get { return inkStrokes; }
+            set
+            {
+                inkStrokes = value;
+                OnPropertyChanged("InkStrokes");
+            }
+        }
+    }
+
+}

XHWK.Model/XHWK.Model.csproj

@@ -31,8 +31,16 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Ink, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ink.0.5.0\lib\net451\Ink.dll</HintPath>
+    </Reference>
+    <Reference Include="NStandard, Version=0.4.15.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NStandard.0.4.15\lib\net451\NStandard.dll</HintPath>
+    </Reference>
+    <Reference Include="PresentationCore" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -49,6 +57,10 @@
     <Compile Include="Model_WKData.cs" />
     <Compile Include="NotifyModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

XHWK.Model/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Ink" version="0.5.0" targetFramework="net452" />
+  <package id="NStandard" version="0.4.15" targetFramework="net452" />
+</packages>

XHWK.WKTool/PracticeWindow.xaml

@@ -14,6 +14,6 @@
     WindowStyle="None">
     <Grid>
         <Image x:Name="imgCanvas"/>
-        <InkCanvas Grid.Row="0" x:Name="blackboard_canvas" Background="Transparent" Visibility="Visible" Grid.ColumnSpan="2" />
+        <InkCanvas Grid.Row="0" x:Name="blackboard_canvas" Background="Transparent" Visibility="Visible" Grid.ColumnSpan="2" MouseDown="blackboard_canvas_MouseDown" MouseMove="blackboard_canvas_MouseMove" Width="{Binding ElementName=imgMeasure, Path=ActualWidth}" Height="{Binding ElementName=imgMeasure, Path=ActualHeight}" EditingMode="None" Strokes="{Binding InkStrokes, Mode=TwoWay}" PreviewMouseLeftButtonUp="blackboard_canvas_PreviewMouseLeftButtonUp" />
     </Grid>
 </Window>

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -13,6 +13,7 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
+using XHWK.Model;
 
 namespace XHWK.WKTool
 {
@@ -23,12 +24,19 @@ namespace XHWK.WKTool
     {
         //声明一个 DrawingAttributes 类型的变量  
         DrawingAttributes drawingAttributes;
+
+        private ViewModel viewModel;
+        /// <summary>
+        /// 0 画笔 1 矩形 2 圆形 
+        /// </summary>
+        private int flg = 0;
         public PracticeWindow()
         {
             InitializeComponent();
         }
         public void Initialize(string _imgPath)
         {
+            flg = 0;
             blackboard_canvas.Strokes.Clear();
             blackboard_canvas.UseCustomCursor = true;
             //blackboard_canvas.EditingMode = InkCanvasEditingMode.EraseByStroke;
@@ -36,16 +44,50 @@ namespace XHWK.WKTool
             {
                 imgCanvas.Source = new BitmapImage(new Uri(_imgPath));
             }
-            //创建 DrawingAttributes 类的一个实例  
-            drawingAttributes = new DrawingAttributes();
-            //将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用  
-            //InkCanvas 通过 DefaultDrawingAttributes 属性来获取墨迹的各种设置，该属性的类型为 DrawingAttributes 型  
+
+
+            drawingAttributes = new DrawingAttributes
+            {
+                Color = Colors.Red,
+                Width = 2,
+                Height = 2,
+                StylusTip = StylusTip.Rectangle,
+                //FitToCurve = true,
+                IsHighlighter = false,
+                IgnorePressure = true,
+
+            };
             blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
-            Pen();
-            blackboard_canvas.Cursor = Cursors.Pen;
-            //Cursor cus = new Cursor(@"G:\Icon.ico");
+
+
+
+
+            ////创建 DrawingAttributes 类的一个实例  
+            //drawingAttributes = new DrawingAttributes();
+
+            //drawingAttributes.StylusTip = StylusTip.Rectangle;
+            //drawingAttributes.IsHighlighter = false;
+            //drawingAttributes.IgnorePressure = true;
+
+
+
+            ////将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用  
+            ////InkCanvas 通过 DefaultDrawingAttributes 属性来获取墨迹的各种设置，该属性的类型为 DrawingAttributes 型  
+            //blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
+            //Pen();
+            //blackboard_canvas.Cursor = Cursors.Pen;
+
+
+            //Cursor cus = new Cursor(@"G:\Icon.cur");
             
             //blackboard_canvas.Cursor = cus;
+
+            viewModel = new ViewModel
+            {
+                InkStrokes = new StrokeCollection(),
+            };
+
+            DataContext = viewModel;
         }
 
 
@@ -57,6 +99,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void White()
         {
+            flg = 0;
             drawingAttributes.Color = Colors.White;
         }
         /// <summary>
@@ -66,7 +109,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void Red()
         {
-
+            flg = 0;
             //设置 DrawingAttributes 的 Color 属性设置颜色  
             drawingAttributes.Color = Colors.Red;
         }
@@ -77,6 +120,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void Gray()
         {
+            flg = 0;
             drawingAttributes.Color = Colors.Gray;
         }
         /// <summary>
@@ -86,6 +130,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void CyanBlue()
         {
+            flg = 0;
             drawingAttributes.Color = Colors.LimeGreen;
         }
         /// <summary>
@@ -95,6 +140,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void Yellow()
         {
+            flg = 0;
             drawingAttributes.Color = Colors.Gold;
         }
         /// <summary>
@@ -104,6 +150,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void Blue()
         {
+            flg = 0;
             drawingAttributes.Color = Colors.DeepSkyBlue;
         }
         /// <summary>
@@ -113,6 +160,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void Fine()
         {
+            flg = 0;
             drawingAttributes.Width = 1;
             drawingAttributes.Height = 1;
         }
@@ -123,6 +171,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void In()
         {
+            flg = 0;
             drawingAttributes.Width = 3;
             drawingAttributes.Height = 3;
         }
@@ -133,23 +182,144 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void Crude()
         {
+            flg = 0;
             drawingAttributes.Width = 5;
             drawingAttributes.Height = 5;
         }
+        /// <summary>
+        /// 橡皮
+        /// </summary>
         public void Eraser() 
         {
+            flg = 0;
             //this.type = ZPenType.Erase;
             blackboard_canvas.UseCustomCursor = false;
             blackboard_canvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
             blackboard_canvas.EraserShape = new EllipseStylusShape(64, 64, 0);
         }
+        /// <summary>
+        /// 画笔
+        /// </summary>
         public void Pen()
         {
+            flg = 0;
             blackboard_canvas.EditingMode = InkCanvasEditingMode.Ink;
             blackboard_canvas.UseCustomCursor = true;
             drawingAttributes.FitToCurve = true;
             drawingAttributes.IgnorePressure = false;
+        
             blackboard_canvas.Cursor = Cursors.Pen;
         }
+        private bool IsRound = false;
+        StrokeCollection StrokeCollectionRound; 
+        /// <summary>
+        /// 圆
+        /// </summary>
+        public void Round()
+        {
+            flg = 2;
+            blackboard_canvas.EditingMode = InkCanvasEditingMode.None;
+        }
+        /// <summary>
+        /// 矩形
+        /// </summary>
+        public void Rectangle()
+        {
+            flg = 1;
+            blackboard_canvas.EditingMode = InkCanvasEditingMode.None;
+        }
+        private System.Windows.Point iniP;
+        private void blackboard_canvas_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (flg != 0)
+            {
+                if (e.LeftButton == MouseButtonState.Pressed)
+                {
+                    iniP = e.GetPosition(blackboard_canvas);
+                }
+            }
+        }
+        Stroke StrokeRound;
+        Stroke StrokeRectangle; 
+        private void blackboard_canvas_MouseMove(object sender, MouseEventArgs e)
+        {
+            if(flg!=0)
+            {
+                if (e.LeftButton == MouseButtonState.Pressed)
+                {
+                    // Draw square
+                    if (flg == 1)
+                    {
+                        System.Windows.Point endP = e.GetPosition(blackboard_canvas);
+                        List<System.Windows.Point> pointList = new List<System.Windows.Point>
+                    {
+                        new System.Windows.Point(iniP.X, iniP.Y),
+                        new System.Windows.Point(iniP.X, endP.Y),
+                        new System.Windows.Point(endP.X, endP.Y),
+                        new System.Windows.Point(endP.X, iniP.Y),
+                        new System.Windows.Point(iniP.X, iniP.Y),
+                    };
+                        //Stroke stroke1 = new Stroke(drawingAttributesRound);
+                        StylusPointCollection point = new StylusPointCollection(pointList);
+                        Stroke stroke = new Stroke(point)
+                        {
+                            DrawingAttributes = blackboard_canvas.DefaultDrawingAttributes.Clone()
+                        };
+                        if(StrokeRectangle!=null)
+                        {
+                            viewModel.InkStrokes.Remove(StrokeRectangle);
+                        }
+                        StrokeRectangle = stroke;
+
+                        viewModel.InkStrokes.Add(stroke);
+                    }
+                    // Draw Eclipse
+                    else if (flg == 2)
+                    {
+                        System.Windows.Point endP = e.GetPosition(blackboard_canvas);
+                        List<System.Windows.Point> pointList = GenerateEclipseGeometry(iniP, endP);
+                        StylusPointCollection point = new StylusPointCollection(pointList);
+                        Stroke stroke = new Stroke(point)
+                        {
+                            DrawingAttributes = blackboard_canvas.DefaultDrawingAttributes.Clone()
+                        };
+                        //viewModel.InkStrokes.Clear();
+                        if(StrokeRound!=null)
+                        {
+                            viewModel.InkStrokes.Remove(StrokeRound);
+                        }
+                        StrokeRound = stroke;
+                        viewModel.InkStrokes.Add(stroke);
+                    }
+                }
+            }
+        }
+        private List<System.Windows.Point> GenerateEclipseGeometry(System.Windows.Point st, System.Windows.Point ed)
+        {
+                double a = 0.5 * (ed.X - st.X);
+            double b = 0.5 * (ed.Y - st.Y);
+            List<System.Windows.Point> pointList = new List<System.Windows.Point>();
+            for (double r = 0; r <= 2 * Math.PI; r = r + 0.01)
+            {
+                pointList.Add(new System.Windows.Point(0.5 * (st.X + ed.X) + a * Math.Cos(r), 0.5 * (st.Y + ed.Y) + b * Math.Sin(r)));
+            }
+            return pointList;
+        }
+
+        private void blackboard_canvas_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+
+        }
+        /// <summary>
+        /// 鼠标松开时
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void blackboard_canvas_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            StrokeRound = null;
+            StrokeRectangle = null;
+        }
     }
 }
+

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -27,7 +27,7 @@
                     <Button  Cursor="Hand" x:Name="btnToolbarDown" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0" Click="BtnToolbarDown_Click">
                         <Image Source="./Images/Toobar5.png"/>
                     </Button>
-                    <Button  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0">
+                    <Button  Cursor="Hand" x:Name="btnEraser" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0" Click="BtnEraser_Click">
                         <Image Source="./Images/Toobar12.png"/>
                     </Button>
                     <Button  Cursor="Hand" x:Name="btnPen" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0" Click="BtnPen_Click">
@@ -36,16 +36,16 @@
                     <Button  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0">
                         <Image Source="./Images/Toobar16.png"/>
                     </Button>
-                    <Button  Cursor="Hand" x:Name="btnEraser" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0" Click="BtnEraser_Click">
+                    <Button  Cursor="Hand" x:Name="btnRectangle" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0" Click="BtnRectangle_Click">
                         <Image Source="./Images/Toobar3.png"/>
                     </Button>
-                    <Button  Cursor="Hand" x:Name="btnColour" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0" Click="BtnColour_Click">
+                    <Button  Cursor="Hand" x:Name="btnRound" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0" Click="BtnRound_Click">
                         <Image Source="./Images/Toobar23.png"/>
                     </Button>
                     <Button  Cursor="Hand" x:Name="btnThickness" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0" Click="BtnThickness_Click">
                         <Image Source="./Images/Toobar1.png"/>
                     </Button>
-                    <Button  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0">
+                    <Button  Cursor="Hand" x:Name="btnColour" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0" Click="BtnColour_Click">
                         <Image Source="./Images/Toobar18.png"/>
                     </Button>
                 </StackPanel>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -409,5 +409,23 @@ namespace XHWK.WKTool
         {
             APP.W_PracticeWindow.Pen();
         }
+        /// <summary>
+        /// ⚪
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnRound_Click(object sender, RoutedEventArgs e) 
+        {
+            APP.W_PracticeWindow.Round();
+        }
+        /// <summary>
+        /// 矩形
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnRectangle_Click(object sender, RoutedEventArgs e)
+        {
+            APP.W_PracticeWindow.Rectangle();
+        }
     }
 }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -42,6 +42,10 @@ namespace XHWK.WKTool
         public event ChangeTextHandler ChangeTextEvent;
         //定义委托
         public delegate void ChangeTextHandler(string text);
+        /// <summary>
+        /// 图片
+        /// </summary>
+        string [] ImgPDFPath = new string[300]; 
         #endregion
 
         #region 初始化
@@ -86,6 +90,8 @@ namespace XHWK.WKTool
             drawingAttributes.IgnorePressure = false;
             blackboard_canvas.Cursor = System.Windows.Input.Cursors.Pen;
             wfhCamera.Visibility = Visibility.Hidden;
+            ImgPDFPath = null;
+            ImgPDFPath = new string[300];
         }
         #endregion
 
@@ -505,7 +511,7 @@ namespace XHWK.WKTool
                         Thread.Sleep(400);
                         Dispatcher.Invoke(new Action(() =>
                         {
-                            OpenDialogPPT();
+                            OpenDialog();
                         }
                             ));
                     })
@@ -519,36 +525,6 @@ namespace XHWK.WKTool
             }
         }
         private void OpenDialog()
-        {
-            result = ofd.ShowDialog();
-            if (result == System.Windows.Forms.DialogResult.OK)
-            {
-                if (ofd.FileName != "")
-                {
-                    string filepath = ofd.FileName;
-                    string path = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
-                    APP.Paths = ConvertWordToImage(filepath, path, "", 0, 0, null, 0).ToArray();
-
-                    for (int i = 0; i < APP.Paths.Length; i++)
-                    {
-                        APP.pageData.pagenum += 1;
-                    }
-                    if (APP.pageData.pagenum > 1)
-                    {
-                        APP.pageData.pagenum -= 1;
-                    }
-                    if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.Paths.Length)
-                    {
-                        imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));
-                    }
-                    else
-                    {
-                        imgCanvas.Source = null;
-                    }
-                }
-            }
-        }
-        private void OpenDialogPPT()
         {
             result = ofd.ShowDialog();
             if (result == System.Windows.Forms.DialogResult.OK)
@@ -558,68 +534,110 @@ namespace XHWK.WKTool
                     #region PPT转PDF
                     string filepath = ofd.FileName;
                     string path = ofd.SafeFileName.Replace(".ppt", "").Trim();
-                    string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
-                    path = pathTemp + path + ".pdf";
-                    //PPT转PDF
-                    Presentation ppt = new Presentation(filepath);
-                    ppt.Save(path, Aspose.Slides.Export.SaveFormat.Pdf); 
-                    #endregion
-
-
-                    #region PDF转图片
-                    // 图片绝对路径集合
-                    List<string> images = new List<string>();
-                    string directoryPath = pathTemp;
-                    //aspose许可证
-                    //Aspose.Pdf.License l = new Aspose.Pdf.License();
-                    //string licenseName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Aspose.Total.Product.Family.lic");
-                    //l.SetLicense(licenseName);
-                    //定义Jpeg转换设备
-                    Aspose.Pdf.Document document = new Aspose.Pdf.Document(path);
-                    var device = new Aspose.Pdf.Devices.JpegDevice();
-                    //int quality = int.Parse(this.comboBox1.SelectedItem.ToString());
-                    //directoryPath += quality;
-                    Directory.CreateDirectory(directoryPath);
-                    //默认质量为100，设置质量的好坏与处理速度不成正比，甚至是设置的质量越低反而花的时间越长，怀疑处理过程是先生成高质量的再压缩
-                    device = new Aspose.Pdf.Devices.JpegDevice(100);
-                    //遍历每一页转为jpg
-                    for (var i = 1; i <= document.Pages.Count; i++)
+                    string type = ofd.SafeFileName.Replace(".ppt", "typezsygppt").Trim();
+                    if (type.Contains("typezsygppt"))
                     {
-                        long ii = Timestamp();
-                        string filePathOutPut = Path.Combine(directoryPath, string.Format("{0}{1}.jpg", ii, i));
-                        images.Add(filePathOutPut);
-                        FileStream fs = new FileStream(filePathOutPut, FileMode.OpenOrCreate);
                         try
                         {
-                            device.Process(document.Pages[i], fs);
-                            fs.Close();
+                            string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
+                            path = pathTemp + path + ".pdf";
+                            //PPT转PDF
+                            Presentation ppt = new Presentation(filepath);
+                            ppt.Save(path, Aspose.Slides.Export.SaveFormat.Pdf);
+                            #endregion
+
+
+                            #region PDF转图片
+                            // 图片绝对路径集合
+                            List<string> images = new List<string>();
+                            string directoryPath = pathTemp;
+                            //aspose许可证
+                            //Aspose.Pdf.License l = new Aspose.Pdf.License();
+                            //string licenseName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Aspose.Total.Product.Family.lic");
+                            //l.SetLicense(licenseName);
+                            //定义Jpeg转换设备
+                            Aspose.Pdf.Document document = new Aspose.Pdf.Document(path);
+                            var device = new Aspose.Pdf.Devices.JpegDevice();
+                            //int quality = int.Parse(this.comboBox1.SelectedItem.ToString());
+                            //directoryPath += quality;
+                            Directory.CreateDirectory(directoryPath);
+                            //默认质量为100，设置质量的好坏与处理速度不成正比，甚至是设置的质量越低反而花的时间越长，怀疑处理过程是先生成高质量的再压缩
+                            device = new Aspose.Pdf.Devices.JpegDevice(100);
+                            //遍历每一页转为jpg
+                            for (var i = 1; i <= document.Pages.Count; i++)
+                            {
+                                long ii = Timestamp();
+                                string filePathOutPut = Path.Combine(directoryPath, string.Format("{0}{1}.jpg", ii, i));
+                                images.Add(filePathOutPut);
+                                FileStream fs = new FileStream(filePathOutPut, FileMode.OpenOrCreate);
+                                try
+                                {
+                                    device.Process(document.Pages[i], fs);
+                                    fs.Close();
+                                }
+                                catch (Exception ex)
+                                {
+                                    fs.Close();
+                                    File.Delete(filePathOutPut);
+                                }
+                            }
+                            #endregion
+
+                            APP.Paths = images.ToArray();
+                            ImgPDFPath = images.ToArray();
+                            for (int i = 0; i < APP.Paths.Length; i++)
+                            {
+                                APP.pageData.pagenum += 1;
+                            }
+                            if (APP.pageData.pagenum > 1)
+                            {
+                                APP.pageData.pagenum -= 1;
+                            }
+                            if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.Paths.Length)
+                            {
+                                imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));
+                            }
+                            else
+                            {
+                                imgCanvas.Source = null;
+                            }
                         }
                         catch (Exception ex)
                         {
-                            fs.Close();
-                            File.Delete(filePathOutPut);
+                            LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog PPT)" + ex.Message, ex);
                         }
-                    } 
-                    #endregion
-
-                    APP.Paths = images.ToArray(); 
-
-                    for (int i = 0; i < APP.Paths.Length; i++)
-                    {
-                        APP.pageData.pagenum += 1;
-                    }
-                    if (APP.pageData.pagenum > 1)
-                    {
-                        APP.pageData.pagenum -= 1;
-                    }
-                    if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.Paths.Length)
-                    {
-                        imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));
                     }
                     else
                     {
-                        imgCanvas.Source = null;
+                        try
+                        {
+                            string paths = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
+                            APP.Paths = ConvertWordToImage(filepath, paths, "", 0, 0, null, 0).ToArray();
+
+                            for (int i = 0; i < APP.Paths.Length; i++)
+                            {
+                                APP.pageData.pagenum += 1;
+                            }
+                            if (APP.pageData.pagenum > 1)
+                            {
+                                APP.pageData.pagenum -= 1;
+                            }
+                            if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.Paths.Length)
+                            {
+                                imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));
+                            }
+                            else
+                            {
+                                imgCanvas.Source = null;
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog PDF)" + ex.Message, ex);
+                        }
                     }
+
+              
                 }
             }
         }
@@ -923,6 +941,63 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnPrint_Click(object sender, RoutedEventArgs e)
         {
+            if (APP.IsLoginType == false)
+            {
+                Login();
+                return;
+            }
+
+            //for(int i=0;i< APP.pageData.pagenum; i++)
+            //{
+
+            //}
+
+
+
+            ////string[] files = { @"C:\101\1.jpg", @"C:\101\2.jpg" };
+            iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 25, 25, 25, 25);
+            try
+            {
+                //iTextSharp.text.Rectangle page = new iTextSharp.text.Rectangle(iTextSharp.text.PageSize.A4., 250f);//cs
+                //设置纸张横向
+                document.SetPageSize(iTextSharp.text.PageSize.A4.Rotate());
+
+
+                iTextSharp.text.pdf.PdfWriter.GetInstance(document, new FileStream(@"G:\101.pdf", FileMode.Create, FileAccess.ReadWrite));
+                document.Open();
+                iTextSharp.text.Image image;
+                for (int i = 0; i < 10/*ImgPDFPath.Length*/; i++)
+                {
+                    if (String.IsNullOrEmpty(ImgPDFPath[i])) break;
+
+
+                    image = iTextSharp.text.Image.GetInstance(ImgPDFPath[i]);
+
+
+                    if (image.Height > iTextSharp.text.PageSize.A4.Height - 25)
+                    {
+                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width - 25, iTextSharp.text.PageSize.A4.Height - 25);
+                    }
+                    else if (image.Width > iTextSharp.text.PageSize.A4.Width - 25)
+                    {
+                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width - 25, iTextSharp.text.PageSize.A4.Height - 25);
+                    }
+                    image.Alignment = iTextSharp.text.Image.ALIGN_MIDDLE;
+                    document.NewPage();
+                    document.Add(image);
+                    //iTextSharp.text.Chunk c1 = new iTextSharp.text.Chunk("Hello World");
+                    //iTextSharp.text.Phrase p1 = new iTextSharp.text.Phrase();
+                    //p1.Leading = 150;      //行间距
+                    //document.Add(p1);
+                }
+                Console.WriteLine("转换成功！");
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("转换失败，原因：" + ex.Message);
+            }
+            document.Close();
+            ////Console.ReadKey();
 
         }
         /// <summary>
@@ -947,6 +1022,21 @@ namespace XHWK.WKTool
         {
             if (APP.pageData.currpage > 1)
             {
+                try
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        string filePath = FileToolsCommon.GetFileAbsolutePath("/Data/" + APP.UserInfo.Username + "/pdfimagetemp/");
+                        FileToolsCommon.CreateDirectory(filePath);
+                        string filePathName = filePath + APP.pageData.currpage.ToString() + ".jpg";
+                        ImageHelper.SaveUIToImage(GridMain, filePathName, (int)GridMain.ActualWidth, (int)GridMain.ActualHeight);
+                        ImgPDFPath[APP.pageData.currpage - 1] = filePathName;
+                    });
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(last_button_Click)生成图片错误:" + ex.Message, ex);
+                }
                 APP.pageData.currpage -= 1;
                 myblackboard.changepage(APP.pageData.currpage - 1);
                 if (APP.Paths.Length > 0)
@@ -976,11 +1066,26 @@ namespace XHWK.WKTool
         {
             if (APP.pageData.currpage < APP.pageData.pagenum)
             {
+                try
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        string filePath = FileToolsCommon.GetFileAbsolutePath("/Data/" + APP.UserInfo.Username + "/pdfimagetemp/");
+                        FileToolsCommon.CreateDirectory(filePath);
+                        string filePathName = filePath + APP.pageData.currpage.ToString() + ".jpg";
+                        ImageHelper.SaveUIToImage(GridMain, filePathName, (int)GridMain.ActualWidth, (int)GridMain.ActualHeight);
+                        ImgPDFPath[APP.pageData.currpage - 1] = filePathName;
+                    });
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(next_btn_Click)生成图片错误:" + ex.Message, ex);
+                }
                 APP.pageData.currpage += 1;
                 myblackboard.changepage(APP.pageData.currpage - 1);
                 if (APP.Paths.Length > 0)
                 {
-
+                  
                     if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage <= APP.Paths.Length)
                     {
                         imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage-1]));

XHWK.WKTool/XHWK.WKTool.csproj

@@ -62,6 +62,9 @@
     <Reference Include="Aspose.Words">
       <HintPath>..\dl\Aspose.Words.dll</HintPath>
     </Reference>
+    <Reference Include="itextsharp, Version=5.5.13.1, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\iTextSharp.5.5.13.1\lib\itextsharp.dll</HintPath>
+    </Reference>
     <Reference Include="log4net">
       <HintPath>..\Common\dlls\log4net.dll</HintPath>
     </Reference>

XHWK.WKTool/packages.config

@@ -7,5 +7,6 @@
   <package id="AForge.Video" version="2.2.5" targetFramework="net452" />
   <package id="AForge.Video.DirectShow" version="2.2.5" targetFramework="net452" />
   <package id="Aspose.PDF" version="19.1.0" targetFramework="net452" />
+  <package id="iTextSharp" version="5.5.13.1" targetFramework="net452" />
   <package id="WpfAnimatedGif" version="2.0.0" targetFramework="net452" />
 </packages>