zhao：优化录制和录屏，录制时间过短提示

XHWK.WKTool/App.config

@@ -33,8 +33,8 @@
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1" />
     <!--版本号-->
-    <add key="VersionCode" value="20" />
-    <add key="VersionName" value="1.1.9" />
+    <add key="VersionCode" value="23" />
+    <add key="VersionName" value="1.2.2" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <system.web>

XHWK.WKTool/App.cs

@@ -239,7 +239,16 @@ namespace XHWK.WKTool
                 //}
                 #endregion
 
-
+                try
+                {
+                    if(Directory.Exists(AppDomain.CurrentDomain.BaseDirectory+"temp"))//清除临时文件
+                    {
+                        Directory.Delete(AppDomain.CurrentDomain.BaseDirectory + "temp",true);
+                    }
+                }
+                catch (Exception ex)
+                {
+                }
 
                 //如果本地文件为空，弹出弹窗 输密匙
                 //本地文件不为空， 解析

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -108,6 +108,8 @@ namespace XHWK.WKTool
             }
             //创建文件夹
             FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
+            FileToolsCommon.DeleteDirectory(wkpath + "temp");
+            FileToolsCommon.DeleteDirectory(wkpath + "temprs");
             //存储文件
             FileToolsCommon.SetConfigValue("VideoSavePath", txbStoragePath.Text);
             APP.ReadDrawData();

XHWK.WKTool/PrintWindow.xaml.cs

@@ -3,6 +3,8 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Drawing;
+using System.IO;
 using System.Threading;
 using System.Windows;
 using System.Windows.Input;
@@ -54,8 +56,12 @@ namespace XHWK.WKTool
                 cmbClass.SelectedIndex = 0;
             }
         }
-        public void Initialize(string _imgPath)
+        double wit = 0;
+        double hei = 0;
+        public void Initialize(string _imgPath, double _wit,double _hei)
         {
+            wit = _wit;
+            hei = _hei;
             if (!string.IsNullOrWhiteSpace(_imgPath))
             {
                 imgPri.Source = new BitmapImage(new Uri(_imgPath));
@@ -136,6 +142,111 @@ namespace XHWK.WKTool
         /// </summary>
         void StartPrint(object obj)
         {
+          
+                try
+            {
+                iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 0, 0, 0, 0);
+                //iTextSharp.text.Rectangle page = new iTextSharp.text.Rectangle(iTextSharp.text.PageSize.A4., 250f);//cs
+                ////设置纸张横向
+                //document.SetPageSize(iTextSharp.text.PageSize.A4.Rotate());
+                int ipdf = 102;
+                string imgPath = FileToolsCommon.GetFileAbsolutePath("temp/");
+                string tempImgPath = imgPath;
+                FileToolsCommon.CreateDirectory(imgPath);
+                imgPath += "101.pdf";
+                while(File.Exists(imgPath))
+                {
+                    imgPath = tempImgPath + ipdf.ToString() + ".pdf";
+                    ipdf++;
+                }
+                iTextSharp.text.pdf.PdfWriter.GetInstance(document, new FileStream(imgPath, FileMode.Create, FileAccess.ReadWrite));
+                document.Open();
+                iTextSharp.text.Image image;
+                for (int i = 0; i < APP.PageDrawList.Count; i++)
+                {
+                    long ii = Timestamp();
+                    string directoryPath = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
+                    string filePathOutPut = Path.Combine(directoryPath, string.Format("print{0}{1}.jpg", ii, i));
+                    RectangleF rectangleFs = new RectangleF();
+                    MergerImg("", filePathOutPut, rectangleFs, out string errmsg);
+                    image = iTextSharp.text.Image.GetInstance(filePathOutPut);
+                    if (string.IsNullOrEmpty(APP.PageDrawList[i].PageImagePath))//没有图片
+                    {
+
+                    }
+                    else if (APP.PageDrawList[i].ImgDocumentation == true && !APP.PageDrawList[i].Type.Equals("ppt"))
+                    {
+                        image = iTextSharp.text.Image.GetInstance(APP.PageDrawList[i].PageImagePath);
+                    }
+                    else
+                    {
+                        RectangleF rectangleF = new RectangleF(0,0,0,0) ;
+                        Dispatcher.Invoke(() =>
+                        {
+                             rectangleF = new RectangleF
+                            {
+                                Width = (float)APP.PageDrawList[i].ImageSizes.CenterX,
+                                Height = (float)APP.PageDrawList[i].ImageSizes.CenterY,
+                                X = (float)APP.PageDrawList[i].ImageLocation.X,
+                                Y = (float)APP.PageDrawList[i].ImageLocation.Y
+                            };
+                        });
+                   
+
+
+                        string msgs = string.Empty;
+
+               
+                            bool isImg = MergerImg(APP.PageDrawList[i].PageImagePath, filePathOutPut, rectangleF, out msgs);
+                            if (isImg)
+                            {
+                                image = iTextSharp.text.Image.GetInstance(filePathOutPut);
+                            }
+                            else
+                            {
+                                image = iTextSharp.text.Image.GetInstance(APP.PageDrawList[i].PageImagePath);
+                            }
+                   
+                     
+                    }
+                    if (image.Height > iTextSharp.text.PageSize.A4.Height)
+                    {
+                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width, iTextSharp.text.PageSize.A4.Height);
+                    }
+                    else if (image.Width > iTextSharp.text.PageSize.A4.Width)
+                    {
+                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width, iTextSharp.text.PageSize.A4.Height);
+                    }
+                    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("转换成功！");
+                document.Close();
+            }
+            catch (Exception ex)
+            {
+
+
+
+                Dispatcher.Invoke(() =>
+                {
+                    btnClose.IsEnabled = true;
+                    btnPrint.IsEnabled = true;
+                    times.Stop();
+                    tip_outer.Visibility = Visibility.Collapsed;
+                    MessageWindow.Show(ex.Message);
+                    return;
+                });
+                LogHelper.WriteErrLog("打印转换PDF失败，原因：" + ex.Message,ex);
+            }
+
+
+
             List<string> objStr = (List<string>)obj;
             string SourcePath= objStr[0];
             int PrinterNum=int.Parse(objStr[1]);
@@ -183,7 +294,64 @@ namespace XHWK.WKTool
                 });
             }
         }
+        /// <summary>
+        /// 返回一个时间戳到毫秒
+        /// </summary>
+        /// <returns></returns>
+        public static long Timestamp()
+        {
+            TimeSpan ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
+            long timestr = Convert.ToInt64(ts.TotalMilliseconds);
+            return timestr;
+        }
+        /// <summary>
+        /// 生成图片
+        /// </summary>
+        /// <param name="_path">图片地址</param>
+        /// <param name="_saveimg">保存位置</param>
+        /// <param name="_rectangle">图片位置</param>
+        /// <param name="errmsg">错误消息</param>
+        /// <returns></returns>
+        private bool MergerImg(string _path, string _saveimg, RectangleF _rectangle, out string errmsg)
+        {
+            errmsg = null;
+            try
+            {
+                Bitmap bitmap = null;
 
+                //创建要显示的图片对象,根据参数的个数设置宽度
+                Bitmap backgroudImg = new Bitmap((int)/*gridM.ActualWidth*/wit, (int)/*gridM.ActualHeight*/hei);
+                Graphics g = Graphics.FromImage(backgroudImg);
+                //清除画布,背景设置为白色
+                g.Clear(System.Drawing.Color.White);
+
+                if (!string.IsNullOrWhiteSpace(_path))
+                {
+                    bitmap = ImageHelper.ReadBitmapFile(_path);
+                    g.DrawImage(bitmap, _rectangle);
+                }
+
+
+                backgroudImg.Save(_saveimg);
+
+                g.Dispose();
+                backgroudImg.Dispose();
+                if (bitmap != null)
+                {
+                    bitmap.Dispose();
+                }
+
+                GC.Collect();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                errmsg = ex.Message;
+                LogHelper.WriteErrLog("【截图合成】（MergerImg）图片合成失败：" + ex.Message, ex);
+                return false;
+            }
+
+        }
         /// <summary>
         /// 打印-开始
         /// </summary>

XHWK.WKTool/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.9.0")]
-[assembly: AssemblyFileVersion("1.1.9.0")]
+[assembly: AssemblyVersion("1.2.2.0")]
+[assembly: AssemblyFileVersion("1.2.2.0")]

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -347,7 +347,7 @@ namespace XHWK.WKTool
                 imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar28.png"));
                 btnBlackPenTwo.IsEnabled = true;//红笔可点击
                 txbTime.Visibility = Visibility.Visible;//时间显示
-                imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
+                //imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
                 //borOne.Background = new SolidColorBrush(Colors.LightBlue);
                 //btnReturn.IsEnabled = false;//返回主界面可点击
 
@@ -356,12 +356,12 @@ namespace XHWK.WKTool
                     #region 4秒内不可点击
                     new Thread(new ThreadStart(new Action(() =>
                     {
-                        Dispatcher.Invoke(() =>
-                        {
-                            ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
-                            BtnRecordingScreen.IsEnabled = false;
-                            BtnStopRecordingScreen.IsEnabled = false;
-                        });
+                        //Dispatcher.Invoke(() =>
+                        //{
+                        //    ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
+                        //    BtnRecordingScreen.IsEnabled = false;
+                        //    BtnStopRecordingScreen.IsEnabled = false;
+                        //});
                         //Thread.Sleep(4000);
                         Dispatcher.Invoke(() =>
                         {
@@ -406,17 +406,17 @@ namespace XHWK.WKTool
                 //imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
                 //btnBlackPenTwo.IsEnabled = false;//红笔不可点击
                 txbTime.Visibility = Visibility.Hidden;//时间不显示
-                imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
+                //imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
                 //btnReturn.IsEnabled = true;//返回主界面可点击
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
                 {
-                    Dispatcher.Invoke(() =>
-                    {
-                        ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
-                        BtnRecordingScreen.IsEnabled = false;
-                        BtnStopRecordingScreen.IsEnabled = false;
-                    });
+                    //Dispatcher.Invoke(() =>
+                    //{
+                    //    ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
+                    //    BtnRecordingScreen.IsEnabled = false;
+                    //    BtnStopRecordingScreen.IsEnabled = false;
+                    //});
                     //Thread.Sleep(2000);
                     Dispatcher.Invoke(() =>
                     {
@@ -446,7 +446,6 @@ namespace XHWK.WKTool
             k_hook.Stop();
             IsSuspend = true;
             txbTime.Text = "00:00";
-
             txbTime.Visibility = Visibility.Hidden;
             End();
             if (APP.W_PracticeWindow != null)
@@ -471,41 +470,51 @@ namespace XHWK.WKTool
             {
                 try
                 {
-                    try
-                    {
-                        APP.FFmpeg.StopFFmpeg(VideoSavePathName);
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.WriteErrLog("【停止录屏】（BtnStopRecordingScreen_Click）" + ex.Message, ex);
-                    }
-                    IsFirstRS = true;
-                    //生成缩略图
-                    string ThumbnailPath = FileToolsCommon.GetDirectoryName(VideoSavePathName) + "ThumbnailPath/";
-                    FileToolsCommon.CreateDirectory(ThumbnailPath);
-                    //缩略图存储位置
-                    string ThumbnailPathName = ThumbnailPath + FileToolsCommon.GetIOFileName(VideoSavePathName).Replace(".", "") + ".JPG";
-                    new Thread(new ThreadStart(new Action(() =>
+                    if (_timeSpan.Minutes > 0 || _timeSpan.Seconds > 3)
                     {
-                        while (!FileToolsCommon.IsExistFile(VideoSavePathName))
+                        try
                         {
-                            Thread.Sleep(100);
+                            APP.FFmpeg.StopFFmpeg(VideoSavePathName);
                         }
-                        FileToolsCommon.DeleteFile(ThumbnailPathName);
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteErrLog("【停止录屏】（BtnStopRecordingScreen_Click）" + ex.Message, ex);
+                        }
+                        IsFirstRS = true;
+                        //生成缩略图
+                        string ThumbnailPath = FileToolsCommon.GetDirectoryName(VideoSavePathName) + "ThumbnailPath/";
+                        FileToolsCommon.CreateDirectory(ThumbnailPath);
+                        //缩略图存储位置
+                        string ThumbnailPathName = ThumbnailPath + FileToolsCommon.GetIOFileName(VideoSavePathName).Replace(".", "") + ".JPG";
+                        new Thread(new ThreadStart(new Action(() =>
+                        {
+                            while (!FileToolsCommon.IsExistFile(VideoSavePathName))
+                            {
+                                Thread.Sleep(100);
+                            }
+                            FileToolsCommon.DeleteFile(ThumbnailPathName);
                         //VideoInfo.VideoSize = FileToolsCommon.GetFileSizeByMB(VideoSavePathName).ToString() + " MB";
                         VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-                        VideoInfo.VideoPath = VideoSavePathName;
-                        VideoInfo.ThumbnailPath = ThumbnailPathName;
-                        APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName,200,130);
-                        VideoInfo.FileGuid = Guid.NewGuid().ToString();
-                        VideoInfo.IsUpload = false;
-                        VideoInfo.Uploaded = 0;
-                        VideoInfo.Savefolder = APP.UserInfo.Schoolid + "/resource";
-                        APP.VideoList.Add(VideoInfo);
+                            VideoInfo.VideoPath = VideoSavePathName;
+                            VideoInfo.ThumbnailPath = ThumbnailPathName;
+                            APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName, 200, 130);
+                            VideoInfo.FileGuid = Guid.NewGuid().ToString();
+                            VideoInfo.IsUpload = false;
+                            VideoInfo.Uploaded = 0;
+                            VideoInfo.Savefolder = APP.UserInfo.Schoolid + "/resource";
+                            APP.VideoList.Add(VideoInfo);
                         //保存数据
                         APP.SaveWkData();
-                    }))).Start();
-                    Click_stopRecordingScreen();
+                        }))).Start();
+                        Click_stopRecordingScreen();
+                    }
+                    else
+                    {
+                        //视频过短
+                        APP.FFmpeg.SuspendFFmpeg();
+                        IsFirstRS = true;
+                        MessageWindow.Show("保存失败，录屏时间过短！");
+                    }
                 }
                 catch (Exception ex)
                 {

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -297,20 +297,20 @@
             </Grid>
             <!--主内容-->
             <Border  Grid.Row="1">
-            <Grid Grid.Row="1" x:Name="GridMain" Visibility="Visible" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
-                <ScrollViewer x:Name="scroMain" VerticalScrollBarVisibility="Visible" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
-                    <Grid x:Name="gridM"  Margin="0,0,0,0" Background="#FFFFFF" Visibility="Visible" Height="1780" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
-                        <Grid>
-                            <Border Grid.Row="1"  CornerRadius="5">
-                                <Grid x:Name="IMG" Margin="0,0,0,0">
-                                    <Grid.Resources>
-                                        <TransformGroup x:Key="Imageview">
-                                            <ScaleTransform/>
-                                            <TranslateTransform/>
-                                        </TransformGroup>
-                                    </Grid.Resources>
-
-                                    <!--<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled"   Cursor="SizeAll"
+                <Grid Grid.Row="1" x:Name="GridMain" Visibility="Visible" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
+                    <ScrollViewer x:Name="scroMain" VerticalScrollBarVisibility="Visible" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
+                        <Grid x:Name="gridM"  Margin="0,0,0,0" Background="#FFFFFF" Visibility="Visible" Height="1780" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
+                            <Grid>
+                                <Border Grid.Row="1"  CornerRadius="5">
+                                    <Grid x:Name="IMG" Margin="0,0,0,0">
+                                        <Grid.Resources>
+                                            <TransformGroup x:Key="Imageview">
+                                                <ScaleTransform/>
+                                                <TranslateTransform/>
+                                            </TransformGroup>
+                                        </Grid.Resources>
+
+                                        <!--<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled"   Cursor="SizeAll"
                   Margin="0,0,0,0" Focusable="False" x:Name="BackFrame">
                                             <ContentControl  MouseLeftButtonDown="IMG1_MouseLeftButtonDown"   
                              MouseLeftButtonUp="IMG1_MouseLeftButtonUp"
@@ -318,84 +318,45 @@
                              MouseWheel="IMG1_MouseWheel" >
                                             </ContentControl>
                                         </ScrollViewer>-->
-                                    <!--图片表框 -->
-                                    <Rectangle x:Name="RectImgBorder" Cursor="SizeAll" Fill="#00000000" HorizontalAlignment="Left" Stroke="#2D8CF0" VerticalAlignment="Top" Width="300" Height="300" Visibility="Hidden" Margin="373,175,0,0" StrokeThickness="4" StrokeDashArray="4 4" SnapsToDevicePixels="True"/>
-                                    <Image Name="imgCanvas" Height="0" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Fill" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseRightButtonDown="imgCanvas_MouseRightButtonDown" MouseLeftButtonDown="imgCanvas_MouseLeftButtonDown" Focusable="True" MouseMove="imgCanvas_MouseMove" MouseUp="imgCanvas_MouseUp"/>
-                                    <!--四个点 -->
-                                    <Canvas>
-                                        <Thumb x:Name="RectLeftUp" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2"  DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
-                                        <Thumb x:Name="RectRightUp" Cursor="SizeNESW"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="775" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
-                                        <Thumb x:Name="RectLeftDown" Cursor="SizeNESW"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="508" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
-                                        <Thumb x:Name="RectRightDown" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="775" Canvas.Top="508" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
-                                    </Canvas>
-                                </Grid>
-                            </Border>
-                        </Grid>
-                        <Image x:Name="imgDocumentation" Visibility="Visible" VerticalAlignment="Top" Stretch="Fill"/>
-                        <Image x:Name="imgPPT" Visibility="Visible" VerticalAlignment="Top"/>
-                        <!--导入图片-->
-                        <!--<Button Cursor="Hand" x:Name="btnOk" Height="50" Width="50" Content="√" FontSize="26" Background="#2E8CF0" Foreground="#FFFFFF" Click="btnOk_Click" Visibility="Collapsed"/>-->
-                        <InkCanvas Grid.Row="0" x:Name="blackboard_canvas"  Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2"/>
-                        <!--摄像头-->
-                        <!--<wfi:WindowsFormsHost Grid.Row="0" Grid.Column="1" x:Name="wfhCamera" Height="124" Width="172" HorizontalAlignment="Right" Margin="0,10,30.10,0" VerticalAlignment="Top">
+                                        <!--图片表框 -->
+                                        <Rectangle x:Name="RectImgBorder" Cursor="SizeAll" Fill="#00000000" HorizontalAlignment="Left" Stroke="#2D8CF0" VerticalAlignment="Top" Width="300" Height="300" Visibility="Hidden" Margin="373,175,0,0" StrokeThickness="4" StrokeDashArray="4 4" SnapsToDevicePixels="True"/>
+                                        <Image Name="imgCanvas" Height="0" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Fill" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseRightButtonDown="imgCanvas_MouseRightButtonDown" MouseLeftButtonDown="imgCanvas_MouseLeftButtonDown" Focusable="True" MouseMove="imgCanvas_MouseMove" MouseUp="imgCanvas_MouseUp"/>
+                                        <!--四个点 -->
+                                        <Canvas>
+                                            <Thumb x:Name="RectLeftUp" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2"  DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
+                                            <Thumb x:Name="RectRightUp" Cursor="SizeNESW"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="775" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
+                                            <Thumb x:Name="RectLeftDown" Cursor="SizeNESW"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="508" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
+                                            <Thumb x:Name="RectRightDown" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="775" Canvas.Top="508" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
+                                        </Canvas>
+                                    </Grid>
+                                </Border>
+                            </Grid>
+                            <Image x:Name="imgDocumentation" Visibility="Visible" VerticalAlignment="Top" Stretch="Fill"/>
+                            <Image x:Name="imgPPT" Visibility="Visible" VerticalAlignment="Top"/>
+                            <!--导入图片-->
+                            <!--<Button Cursor="Hand" x:Name="btnOk" Height="50" Width="50" Content="√" FontSize="26" Background="#2E8CF0" Foreground="#FFFFFF" Click="btnOk_Click" Visibility="Collapsed"/>-->
+                            <InkCanvas Grid.Row="0" x:Name="blackboard_canvas"  Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2"/>
+                            <!--摄像头-->
+                            <!--<wfi:WindowsFormsHost Grid.Row="0" Grid.Column="1" x:Name="wfhCamera" Height="124" Width="172" HorizontalAlignment="Right" Margin="0,10,30.10,0" VerticalAlignment="Top">
                     <aforge:VideoSourcePlayer x:Name="player" Height="124" Width="172"  />
                 </wfi:WindowsFormsHost>-->
-                        <!--<Image x:Name="imgLoad"
+                            <!--<Image x:Name="imgLoad"
                     Width="300"
                     Height="300"
                     gifLib:ImageBehavior.AnimatedSource="./Images/img_load.gif" VerticalAlignment="Top" Margin="0,200,0,0" Visibility="Visible"/>-->
-                    </Grid>
-                </ScrollViewer>
-                <Image x:Name="imgPlayerLeft" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Left"  Margin="10,7,10,10" VerticalAlignment="Top" Visibility="Collapsed"/>
-                <Image x:Name="imgPlayerRight" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Right"  Margin="10,7,26,10" VerticalAlignment="Top" Visibility="Collapsed"/>
-                <Image x:Name="imgPlayerLeftUnder" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Left"  Margin="10,7,10,10" VerticalAlignment="Bottom" Visibility="Collapsed"/>
-                <Image x:Name="imgPlayerRightUnder" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Right" Margin="10,7,26,10" VerticalAlignment="Bottom" Visibility="Collapsed"/>
-                <Label Content="" Grid.Column="0" Height="2" Width="2" HorizontalAlignment="Left"  VerticalAlignment="Top" Background="#FF0F0F0F" Margin="1,0,0,0"/>
-                <Label Content="" Grid.Column="1" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,16,0"/>
-                <Label Content="" Grid.Column="0" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="1,0,0,0"/>
-                <Label Content="" Grid.Column="1" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,0"/>
-                <!--<TextBlock x:Name="txbTime" Text="123456" FontSize="20" Foreground="#000000" Margin="0,0,0,10" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>-->
-            </Grid>
+                        </Grid>
+                    </ScrollViewer>
+                    <Image x:Name="imgPlayerLeft" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Left"  Margin="10,7,10,10" VerticalAlignment="Top" Visibility="Collapsed"/>
+                    <Image x:Name="imgPlayerRight" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Right"  Margin="10,7,26,10" VerticalAlignment="Top" Visibility="Collapsed"/>
+                    <Image x:Name="imgPlayerLeftUnder" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Left"  Margin="10,7,10,10" VerticalAlignment="Bottom" Visibility="Collapsed"/>
+                    <Image x:Name="imgPlayerRightUnder" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Right" Margin="10,7,26,10" VerticalAlignment="Bottom" Visibility="Collapsed"/>
+                    <Label Content="" Grid.Column="0" Height="2" Width="2" HorizontalAlignment="Left"  VerticalAlignment="Top" Background="#FF0F0F0F" Margin="1,0,0,0"/>
+                    <Label Content="" Grid.Column="1" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,16,0"/>
+                    <Label Content="" Grid.Column="0" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="1,0,0,0"/>
+                    <Label Content="" Grid.Column="1" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,0"/>
+                    <!--<TextBlock x:Name="txbTime" Text="123456" FontSize="20" Foreground="#000000" Margin="0,0,0,10" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>-->
+                </Grid>
             </Border>
-            <!--页码-->
-            <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
-                <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="180" HorizontalAlignment="Center" Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">
-                    <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                    x:Name="last_button"
-                    Width="60" Height="20"
-                    Click="last_button_Click">
-
-                        <Button.Content>
-                            <StackPanel>
-                                <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
-                            </StackPanel>
-                        </Button.Content>
-                    </Button>
-                    <Grid Width="60"  Background="Transparent" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="311*"/>
-                            <RowDefinition Height="483*"/>
-                        </Grid.RowDefinitions>
-                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,-12,0,0" Grid.Row="1"  Background="Transparent">
-                            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal"  Background="Transparent">
-                                <TextBlock x:Name="txbCurrpage" Text="{Binding currpage}" TextAlignment="Center" FontSize="15"/>
-                                <TextBlock Text="/" TextAlignment="Center" FontSize="15"/>
-                                <TextBlock Text="{Binding pagenum}" TextAlignment="Center" FontSize="15"/>
-                            </StackPanel>
-                        </StackPanel>
-                    </Grid>
-                    <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                    x:Name="next_btn"  Background="Transparent"
-                    Width="60" Height="20"
-                    Click="next_btn_Click">
-                        <Button.Content>
-                            <StackPanel>
-                                <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
-                            </StackPanel>
-                        </Button.Content>
-                    </Button>
-                </StackPanel>
-            </Grid>
             <!--设置-->
             <ScrollViewer x:Name="gridSetUp" Grid.Row="1" VerticalScrollBarVisibility="Auto" Visibility="Collapsed">
                 <Grid Grid.Row="1"   Background="#FFFFFF" >
@@ -499,7 +460,7 @@
                         <TextBlock Text="河南星火燎原软件科技有限公司" FontSize="14" Foreground="#333333"/>
                     </StackPanel>
 
-                    
+
                     <!--第四行 开始按钮-->
                     <Button Cursor="Hand" Grid.Row="10" Grid.ColumnSpan="2" x:Name="btnSave" Content="保存" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="10,10,10,10" Click="BtnSave_Click">
                         <Button.Template>
@@ -670,13 +631,51 @@
                     <RadioButton Cursor="Hand" x:Name="rbnFine" Content=" 细" Style="{StaticResource radBase}" FontSize="14" Margin="0,4,0,0" IsChecked="True" Click="RbnFine_Click"/>
                     <RadioButton Cursor="Hand" x:Name="rbnIn" Content=" 中" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,0,0" Click="RbnIn_Click"/>
                     <RadioButton Cursor="Hand" x:Name="rbnCrude" Content=" 粗" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,0,0" Click="RbnCrude_Click"/>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="摄像头：" FontSize="14" Padding="20,3,0,0"/>
-                        <RadioButton Cursor="Hand" x:Name="rbnOpen" Content=" 开" Style="{StaticResource radBase}" FontSize="14" Margin="0,4,0,0" Click="RbnOpen_Click"/>
-                        <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content=" 关" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,0,0" IsChecked="True" Click="RbnTurnOff_Click"/>
-                    </StackPanel>
                 </StackPanel>
+                <!--页码-->
+                <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed" MouseLeftButtonDown="Window_MouseLeftButtonDown_1" HorizontalAlignment="Center">
+                    <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="180" HorizontalAlignment="Center" Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">
+                        <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                    x:Name="last_button"
+                    Width="60" Height="20"
+                    Click="last_button_Click">
+
+                            <Button.Content>
+                                <StackPanel>
+                                    <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
+                                </StackPanel>
+                            </Button.Content>
+                        </Button>
+                        <Grid Width="60"  Background="Transparent" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="311*"/>
+                                <RowDefinition Height="483*"/>
+                            </Grid.RowDefinitions>
+                            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,-12,0,0" Grid.Row="1"  Background="Transparent">
+                                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal"  Background="Transparent">
+                                    <TextBlock x:Name="txbCurrpage" Text="{Binding currpage}" TextAlignment="Center" FontSize="15"/>
+                                    <TextBlock Text="/" TextAlignment="Center" FontSize="15"/>
+                                    <TextBlock Text="{Binding pagenum}" TextAlignment="Center" FontSize="15"/>
+                                </StackPanel>
+                            </StackPanel>
+                        </Grid>
+                        <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                    x:Name="next_btn"  Background="Transparent"
+                    Width="60" Height="20"
+                    Click="next_btn_Click">
+                            <Button.Content>
+                                <StackPanel>
+                                    <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
+                                </StackPanel>
+                            </Button.Content>
+                        </Button>
+                    </StackPanel>
+                </Grid>
+
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,5,10,5">
+                    <TextBlock Text="摄像头：" FontSize="14" Padding="20,3,0,0"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnOpen" Content=" 开" Style="{StaticResource radBase}" FontSize="14" Margin="0,4,0,0" Click="RbnOpen_Click"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content=" 关"  Style="{StaticResource radBase}" FontSize="14" Margin="5,4,20,0" IsChecked="True" Click="RbnTurnOff_Click"/>
                     <TextBlock Text="智能笔状态：" FontSize="14" Padding="0,4,0,0"/>
                     <TextBlock x:Name="txbNotConnected" Text="未连接" FontSize="14" Padding="0,4,5,0"/>
                 </StackPanel>