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

# Conflicts:
#	XHWK.WKTool/App.config
#	XHWK.WKTool/App.cs
#	XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

Common/system/BlackboardNew.cs

@@ -68,7 +68,7 @@ namespace Common.system
         {
             init(canvas, _pencolor);
         }
-
+        DrawingAttributes drawingAttributes;
         private void init(InkCanvas canvas, Color _pencolor)
         {
             m_canvas = canvas;
@@ -79,7 +79,7 @@ namespace Common.system
             if (canvas != null)
             {
                 canvas.EditingMode = InkCanvasEditingMode.Ink;
-                DrawingAttributes drawingAttributes = new DrawingAttributes();
+                 drawingAttributes = new DrawingAttributes();
                 canvas.DefaultDrawingAttributes = drawingAttributes;
                 drawingAttributes.Width = pensize;
                 drawingAttributes.Height = pensize;
@@ -159,12 +159,12 @@ namespace Common.system
         }
 
         // public方法 笔
-        public void change_pen()
+        public void change_pen(Color _color) 
         {
             //this.type = ZPenType.Pen;
             DrawingAttributes drawingAttributes = new DrawingAttributes();
             m_canvas.DefaultDrawingAttributes = drawingAttributes;
-            drawingAttributes.Color = pencolor;
+            drawingAttributes.Color = _color;
             drawingAttributes.Width = pensize;
             drawingAttributes.Height = pensize;
             drawingAttributes.FitToCurve = true;
@@ -230,14 +230,22 @@ namespace Common.system
         // 清空
         public void clear()
         {
-            ZBBPage page = strokes_page_all[pagenum];
-            if (page != null)
-            {
-                m_canvas.Strokes.Clear();
-                page.lines_histoty.Clear();
-                page.lines.Clear();
-                page.lines.Add(new ZBBPageStep());
-            }
+     
+            ZBBPage page = new ZBBPage();
+            page.lines.Add(new ZBBPageStep());
+            page.lines = new List<ZBBPageStep>();
+            page.lines_histoty = new List<ZBBPageStep>();
+            strokes_page_all.Add(page);
+
+
+            //ZBBPage page = strokes_page_all[pagenum];
+            //    if (page != null)
+            //{
+            //    m_canvas.Strokes.Clear();
+            //    page.lines_histoty.Clear();
+            //    page.lines.Clear();
+            //    page.lines.Add(new ZBBPageStep());
+            //}
         }
 
         public void changepage(int mpagenum)
@@ -257,7 +265,7 @@ namespace Common.system
                 }
 
                 ZBBPage page = strokes_page_all[pagenum];
-                if (page != null)
+                if (page != null&& page.lines.Count>0)
                 {
                     if (page.lines.Last().lines_curr.Count > 0)
                     {
@@ -270,13 +278,10 @@ namespace Common.system
                     }
 
                     m_canvas.Strokes.Add(page.lines.Last().lines_curr);
-                    //StylusPoints stylusPoints = new StylusPoints();
-                    //stylusPoints.Add();
-                    //m_canvas.Strokes[0].StylusPoints.Add();
+
+
                     StrokeCollection strokes = new StrokeCollection();
                     StylusPointCollection stylusPoints = new StylusPointCollection();
-                    //stylusPoints.
-                    //Stroke stroke = new Stroke();
                     System.Windows.Input.StylusPointDescription stylusPointDescription = new StylusPointDescription();
                     StylusPoint stylusPoint = new StylusPoint();
                     stylusPoint.X = 580;
@@ -289,30 +294,36 @@ namespace Common.system
                     stylusPoints.Add(stylusPoint);
                     stroke = new Stroke(stylusPoints);
 
-                    stylusPoint.X = 586;
-                    stylusPoint.Y = 214;
-                    stylusPoints.Add(stylusPoint);
-                    stroke = new Stroke(stylusPoints);
-
-                    stylusPoint.X = 599;
-                    stylusPoint.Y = 214;
-                    stylusPoints.Add(stylusPoint);
-                    stroke = new Stroke(stylusPoints);
-                    stylusPoint.X = 623;
-                    stylusPoint.Y = 214;
-                    stylusPoints.Add(stylusPoint);
-                    stroke = new Stroke(stylusPoints);
-
-                    stylusPoint.X = 663;
-                    stylusPoint.Y = 214;
-                    stylusPoints.Add(stylusPoint);
-                    stroke = new Stroke(stylusPoints);
-                    stylusPoint.X = 963;
-                    stylusPoint.Y = 214;
-                    stylusPoints.Add(stylusPoint);
-                    stroke = new Stroke(stylusPoints);
-                    //page.lines.Last().lines_curr.Add();
-
+                    //stylusPoint.X = 586;
+                    //stylusPoint.Y = 214;
+                    //stylusPoints.Add(stylusPoint);
+                    //stroke = new Stroke(stylusPoints);
+
+                    //stylusPoint.X = 599;
+                    //stylusPoint.Y = 214;
+                    //stylusPoints.Add(stylusPoint);
+                    //stroke = new Stroke(stylusPoints);
+                    //stylusPoint.X = 623;
+                    //stylusPoint.Y = 214;
+                    //stylusPoints.Add(stylusPoint);
+                    //stroke = new Stroke(stylusPoints);
+
+                    //stylusPoint.X = 663;
+                    //stylusPoint.Y = 214;
+                    //stylusPoints.Add(stylusPoint);
+                    //stroke = new Stroke(stylusPoints);
+                    //stylusPoint.X = 963;
+                    //stylusPoint.Y = 214;
+                    //stylusPoints.Add(stylusPoint);
+                    //stroke = new Stroke(stylusPoints);
+                    //DrawingAttributes drawingAttributes = new DrawingAttributes();
+                    //m_canvas.DefaultDrawingAttributes = drawingAttributes;
+                    //drawingAttributes.Color = Colors.Red;
+                    //drawingAttributes.Width = pensize;
+                    //drawingAttributes.Height = pensize;
+                    //drawingAttributes.FitToCurve = true;
+                    //drawingAttributes.IgnorePressure = false;
+                    //stroke.DrawingAttributes = drawingAttributes;
                     m_canvas.Strokes.Add(stroke);
                 }
             }
@@ -320,20 +331,93 @@ namespace Common.system
         StylusPointCollection stylusPoints = new StylusPointCollection();
         StylusPoint stylusPoint = new StylusPoint();
         Stroke stroke;
-        public void changepages(double _x, double _y, bool _new)
+        bool isFirst = true;
+        //public void changepages(double _x, double _y, bool _new, Color _color, int _size)
+        //{
+        //    if (_new)
+        //    {
+        //        if (stroke != null && stroke.StylusPoints.Count > 1)
+        //        {
+        //             drawingAttributes = new DrawingAttributes();
+        //            //m_canvas.DefaultDrawingAttributes = drawingAttributes;
+        //            drawingAttributes.Color = _color;
+        //            drawingAttributes.Width = _size;
+        //            drawingAttributes.Height = _size;
+        //            drawingAttributes.FitToCurve = true;
+        //            drawingAttributes.IgnorePressure = false;
+        //            stroke.DrawingAttributes = drawingAttributes;
+        //            m_canvas.Strokes.Add(stroke);
+        //            isFirst = true;
+        //        }
+
+        //        stylusPoints = new StylusPointCollection();
+        //        stylusPoint = new StylusPoint();
+        //        //stroke = new Stroke(stylusPoints);
+        //        stroke = null;
+        //    }
+        //    else
+        //    {
+        //        if(isFirst)
+        //        {
+        //            stylusPoint.X = _x;
+        //            stylusPoint.Y = _y;
+        //            stylusPoints.Add(stylusPoint);
+        //            if (stylusPoints.Count>1)
+        //            {
+        //                stroke = new Stroke(stylusPoints);
+        //                m_canvas.Strokes.Add(stroke);
+        //                isFirst = false;
+        //            }
+        //        }
+        //        else
+        //        {
+        //            stylusPoint.X = _x;
+        //            stylusPoint.Y = _y;
+        //            stylusPoints.Add(stylusPoint);
+        //            stroke = new Stroke(stylusPoints);
+        //            m_canvas.Strokes[m_canvas.Strokes.Count - 1].StylusPoints.Add(stylusPoints);
+        //        }
+        //    }
+        //}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        public void changepages(double _x, double _y, bool _new, Color _color, int _size)
         {
             if (_new)
             {
-                if(stroke!=null&&stroke.StylusPoints.Count > 1)
+                if (stroke != null && stroke.StylusPoints.Count > 1)
                 {
+                    drawingAttributes = new DrawingAttributes();
+                    //m_canvas.DefaultDrawingAttributes = drawingAttributes;
+                    drawingAttributes.Color = _color;
+                    drawingAttributes.Width = _size*5;
+                    drawingAttributes.Height = _size*5;
+                    drawingAttributes.FitToCurve = true;
+                    drawingAttributes.IgnorePressure = false;
+
+                    stroke.DrawingAttributes = drawingAttributes;
+                    //m_canvas.DefaultDrawingAttributes= drawingAttributes;
                     m_canvas.Strokes.Add(stroke);
-                   
                 }
-            
+
                 stylusPoints = new StylusPointCollection();
                 stylusPoint = new StylusPoint();
                 //stroke = new Stroke(stylusPoints);
-                stroke=null;
+                //stroke = null;
             }
             else
             {
@@ -344,16 +428,64 @@ namespace Common.system
                 stylusPoints.Add(stylusPoint);
                 stroke = new Stroke(stylusPoints);
             }
-           
-
-            //page.lines.Last().lines_curr.Add();
-            //if (stroke.StylusPoints.Count > 20)
-            //{
-              
-            
-
-
-
         }
+        ////声明一个 DrawingAttributes 类型的变量  
+        //DrawingAttributes drawingAttributes;
+        //public void changepaget(double _x, double _y, bool _new,InkCanvas canvas) 
+        //{
+        //    if (_new)
+        //    {
+        //        if (stroke != null && stroke.StylusPoints.Count > 1)
+        //        {
+        //            //m_canvas.Strokes.Add(stroke);
+        //            DrawingAttributes drawingAttributes = new DrawingAttributes();
+        //            canvas.DefaultDrawingAttributes = drawingAttributes;
+        //            drawingAttributes.Width = pensize;
+        //            drawingAttributes.Height = pensize;
+        //            drawingAttributes.Color = Colors.Red;
+        //            drawingAttributes.FitToCurve = true;
+        //            drawingAttributes.IgnorePressure = false;
+        //            canvas.DefaultDrawingAttributes = drawingAttributes;
+        //            canvas.Strokes.Add(stroke);
+
+        //            ZBBPage page = strokes_page_all[pagenum];
+        //            if (page != null)
+        //            {
+        //                step.lines_curr.Add(m_canvas.Strokes);
+        //                page.lines.Add(step);
+        //                step = null;
+        //            }
+        //        }
+
+        //        stylusPoints = new StylusPointCollection();
+        //        stylusPoint = new StylusPoint();
+        //        //stroke = new Stroke(stylusPoints);
+        //        stroke = null;
+        //    }
+        //    else
+        //    {
+        //       change_pen(Colors.Red);
+        //        //stylusPoints = new StylusPointCollection();
+        //        //stylusPoint = new StylusPoint();
+        //        stylusPoint.X = _x;
+        //        stylusPoint.Y = _y;
+        //        stylusPoints.Add(stylusPoint);
+        //        stroke = new Stroke(stylusPoints);
+        //        //m_canvas.
+
+        //        //page.lines.Last().lines_curr
+
+        //    }
+
+
+        //    //page.lines.Last().lines_curr.Add();
+        //    //if (stroke.StylusPoints.Count > 20)
+        //    //{
+
+
+
+
+
+        //}
     }
 }

XHWK.Model/Model_DrawData.cs

@@ -4,6 +4,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Media;
 
 namespace XHWK.Model
 {
@@ -15,11 +16,14 @@ namespace XHWK.Model
         private int _PageNum;
         private string _pageCode;
         private string _pageImagePath;
-        private PointF _ImageLocation;
-        private SizeF _ImageSize;
-        private string _PenColor;
-        private int _PenWigth;
+        private TranslateTransform _ImageLocation;
+        private ScaleTransform _ImageSize;
+        private bool _IsImageLocation;
+        //private string _PenColor;
+        //private int _PenWigth;
         //private List<PointF> _Handwriting;
+        private string _pdfImagePath;
+        private bool _imgDocumentation;
         /// <summary>
         /// 页码
         /// </summary>
@@ -35,19 +39,31 @@ namespace XHWK.Model
         /// <summary>
         /// 图片坐标
         /// </summary>
-        public PointF ImageLocation { get => _ImageLocation; set => _ImageLocation = value; }
+        public TranslateTransform ImageLocation { get => _ImageLocation; set => _ImageLocation = value; }
         /// <summary>
         /// 图片大小
         /// </summary>
-        public SizeF ImageSize { get => _ImageSize; set => _ImageSize = value; }
+        public ScaleTransform ImageSize { get => _ImageSize; set => _ImageSize = value; }
         /// <summary>
-        /// 笔颜色 十六进制
+        /// PDF 图片路径
         /// </summary>
-        public string PenColor { get => _PenColor; set => _PenColor = value; }
+        public string PdfImagePath { get => _pdfImagePath; set => _pdfImagePath = value; }
         /// <summary>
-        /// 线宽
+        /// 坐标是否固定
         /// </summary>
-        public int PenWigth { get => _PenWigth; set => _PenWigth = value; }
+        public bool IsImageLocation { get => _IsImageLocation; set => _IsImageLocation = value; }
+        /// <summary>
+        /// true 文档图片  folse 截图图片
+        /// </summary>
+        public bool ImgDocumentation { get => _imgDocumentation; set => _imgDocumentation = value; }
+        ///// <summary>
+        ///// 笔颜色 十六进制
+        ///// </summary>
+        //public string PenColor { get => _PenColor; set => _PenColor = value; }
+        ///// <summary>
+        ///// 线宽
+        ///// </summary>
+        //public int PenWigth { get => _PenWigth; set => _PenWigth = value; }
         ///// <summary>
         ///// 笔迹 暂无
         ///// </summary>

XHWK.WKTool/App.config

@@ -28,5 +28,7 @@
     <!--接口地址： https://schoolapitest.xhkjedu.com/
     文件上传： https://schoolfiletest.xhkjedu.com/
     展示文件:   https://schoolfiletest.xhkjedu.com/-->
+    <!--摄像头位置 1.右上 2.左上 3.右下 4.左下-->
+    <add key="CameraPosition" value=""/>
   </appSettings>
 </configuration>

XHWK.WKTool/App.cs

@@ -38,6 +38,9 @@ namespace XHWK.WKTool
         /// 微课视频列表
         /// </summary>
         public static List<Model_Video> VideoList = null;
+        /// <summary>
+        /// 画板模型
+        /// </summary>
         public static List<Model_DrawData> PageDrawList = null;
         /// <summary>
         /// 录屏工具
@@ -65,6 +68,7 @@ namespace XHWK.WKTool
         /// 页码IP
         /// </summary>
         public static string[] OutPut = new string[] { };
+        public static string CameraPosition = string.Empty;
         #region 点阵笔
         /// <summary>
         /// 点阵笔
@@ -112,6 +116,7 @@ namespace XHWK.WKTool
         /// 我的视频
         /// </summary>
         public static FileDirectoryWindow fileDirectoryWindow = null;
+        public static PrintWindow W_PrintWindow = null;
         #endregion
         #endregion
 

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -19,7 +19,7 @@
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
             <!--第一行 标题-->
-            <Border Grid.Row="0" Background="#2D8CF0">
+            <Border Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown">
                 <Grid>
                     <TextBlock Text="创建微课" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
                     <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -119,8 +119,9 @@ namespace XHWK.WKTool
                 APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
                 //APP.W_XHMicroLessonSystemWindow .Topmost = true;
             }
-            APP.W_XHMicroLessonSystemWindow.ShowDialog();
             this.Hide();
+            APP.W_XHMicroLessonSystemWindow.ShowDialog();
+          
         }
         /// <summary>
         /// 窗体移动

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -31,9 +31,17 @@ namespace XHWK.WKTool
         /// </summary>
         private int flg = 0;
         /// <summary>
-        /// 
+        /// 当前画笔颜色
         /// </summary>
         Color Colour=Colors.Black;
+        /// <summary>
+        /// 当前画笔宽
+        /// </summary>
+        private int Wit = 2;
+        /// <summary>
+        /// 当前画笔高
+        /// </summary>
+        private int Hei = 2;
         public PracticeWindow()
         {
             InitializeComponent();
@@ -50,13 +58,10 @@ namespace XHWK.WKTool
             }
 
 
-        
-
-
 
 
-            ////创建 DrawingAttributes 类的一个实例  
-            //drawingAttributes = new DrawingAttributes();
+            //创建 DrawingAttributes 类的一个实例  
+            drawingAttributes = new DrawingAttributes();
 
             //drawingAttributes.StylusTip = StylusTip.Rectangle;
             //drawingAttributes.IsHighlighter = false;
@@ -66,13 +71,13 @@ namespace XHWK.WKTool
 
             ////将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用  
             ////InkCanvas 通过 DefaultDrawingAttributes 属性来获取墨迹的各种设置，该属性的类型为 DrawingAttributes 型  
-            //blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
-            //Pen();
+            blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
+            Pen();
             //blackboard_canvas.Cursor = Cursors.Pen;
 
 
-            //Cursor cus = new Cursor(@"G:\Icon.cur");
-            
+            //Cursor cus = new Cursor(@"G:\06.cur");
+
             //blackboard_canvas.Cursor = cus;
 
             viewModel = new ViewModel
@@ -89,8 +94,9 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void White()
         {
-            flg = 0;
+            //flg = 0;
             drawingAttributes.Color = Colors.White;
+            Colour= Colors.White; 
         }
         /// <summary>
         /// 画笔颜色事件 红色
@@ -99,9 +105,10 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void Red()
         {
-            flg = 0;
+            //flg = 0;
             //设置 DrawingAttributes 的 Color 属性设置颜色  
             drawingAttributes.Color = Colors.Red;
+            Colour = Colors.Red;
         }
         /// <summary>
         /// 画笔颜色事件 灰色
@@ -110,8 +117,9 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void Gray()
         {
-            flg = 0;
+            //flg = 0;
             drawingAttributes.Color = Colors.Gray;
+            Colour = Colors.Gray;
         }
         /// <summary>
         /// 画笔颜色事件 青色
@@ -120,8 +128,9 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void CyanBlue()
         {
-            flg = 0;
+            //flg = 0;
             drawingAttributes.Color = Colors.LimeGreen;
+            Colour = Colors.LimeGreen;
         }
         /// <summary>
         /// 画笔颜色事件 黄色
@@ -130,8 +139,9 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void Yellow()
         {
-            flg = 0;
+            //flg = 0;
             drawingAttributes.Color = Colors.Gold;
+            Colour = Colors.Gold;
         }
         /// <summary>
         /// 画笔颜色事件 蓝色
@@ -140,8 +150,9 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void Blue()
         {
-            flg = 0;
+            //flg = 0;
             drawingAttributes.Color = Colors.DeepSkyBlue;
+            Colour = Colors.DeepSkyBlue;
         }
         /// <summary>
         /// 画笔粗细事件 细
@@ -150,9 +161,11 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void Fine()
         {
-            flg = 0;
+            //flg = 0;
             drawingAttributes.Width = 1;
             drawingAttributes.Height = 1;
+            Wit = 1;
+            Hei = 1;
         }
         /// <summary>
         /// 画笔粗细事件 中
@@ -161,9 +174,12 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void In()
         {
-            flg = 0;
+            //flg = 0;
             drawingAttributes.Width = 3;
             drawingAttributes.Height = 3;
+            Wit = 3;
+            Hei = 3;
+
         }
         /// <summary>
         /// 画笔粗细事件 粗
@@ -172,9 +188,11 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         public void Crude()
         {
-            flg = 0;
+            //flg = 0;
             drawingAttributes.Width = 5;
             drawingAttributes.Height = 5;
+            Wit = 5;
+            Hei = 5;
         }
         /// <summary>
         /// 橡皮
@@ -208,9 +226,9 @@ namespace XHWK.WKTool
             flg = 2;
             drawingAttributes = new DrawingAttributes
             {
-                Color = Colors.Red,
-                Width = 2,
-                Height = 2,
+                Color = Colour,
+                Width = Wit,
+                Height = Hei,
                 StylusTip = StylusTip.Rectangle,
                 //FitToCurve = true,
                 IsHighlighter = false,
@@ -219,6 +237,7 @@ namespace XHWK.WKTool
             };
             blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
             blackboard_canvas.EditingMode = InkCanvasEditingMode.None;
+            blackboard_canvas.Cursor = Cursors.Cross;
         }
         /// <summary>
         /// 矩形
@@ -226,7 +245,20 @@ namespace XHWK.WKTool
         public void Rectangle()
         {
             flg = 1;
+            drawingAttributes = new DrawingAttributes
+            {
+                Color = Colour,
+                Width = Wit,
+                Height = Hei,
+                StylusTip = StylusTip.Rectangle,
+                //FitToCurve = true,
+                IsHighlighter = false,
+                IgnorePressure = true,
+
+            };
+            blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
             blackboard_canvas.EditingMode = InkCanvasEditingMode.None;
+            blackboard_canvas.Cursor = Cursors.Cross;
         }
         private System.Windows.Point iniP;
         private void blackboard_canvas_MouseDown(object sender, MouseButtonEventArgs e)

XHWK.WKTool/PrintWindow.xaml

@@ -0,0 +1,89 @@
+<Window x:Class="XHWK.WKTool.PrintWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:XHWK.WKTool"
+        mc:Ignorable="d"
+        Title="PrintWindow" Height="729" Width="1028" AllowsTransparency="True"
+    ShowInTaskbar="False"
+    WindowStartupLocation="CenterOwner"
+    WindowStyle="None">
+    <Grid>
+        <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="auto"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="50"/>
+            </Grid.RowDefinitions>
+            <TextBlock Grid.Row="0" Text="打印预览" Background="#2E8CF0" Foreground="#FFFFFF" Width="50" HorizontalAlignment="Left" Margin="10,5,0,0"/>
+            <StackPanel Grid.Row="1" HorizontalAlignment="Left" Orientation="Horizontal" Margin="10,10,0,0">
+                <TextBlock  Text="打印机：" Width="210" FontSize="20"/>
+                <TextBlock Text="份数：" FontSize="20" Margin="120,0,0,0"/>
+                <TextBlock x:Name="txbNumberOfCopies" Width="100" Text="1" Padding="50,10,0,0" Background="White" />
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                    </Grid.RowDefinitions>
+                    <Button Grid.Row="0" x:Name="btnLess" Content="-" Click="BtnLess_Click"/>
+                    <Button Grid.Row="1" x:Name="btnAdd" Content="+" Click="BtnAdd_Click"/>
+                </Grid>
+            </StackPanel>
+            <Button Grid.Row="1" x:Name="btnClose" Background="#CC4848" Foreground="#FFFFFF" Content="×" FontSize="20" Width="30" Height="30" HorizontalAlignment="Right" Margin="0,0,20,0" Click="BtnClose_Click">
+
+            </Button>
+            <StackPanel Grid.Row="2" HorizontalAlignment="Left" Orientation="Horizontal" Margin="10,2,0,0">
+                <ComboBox Cursor="Hand" Width="210"
+                                x:Name="cmbClass"
+                                Padding="10,0,10,0"
+                                VerticalContentAlignment="Center"
+                                BorderThickness="0"
+                                DisplayMemberPath="Value"
+                                FontSize="14"
+                                SelectedValuePath="Key"
+                                />
+                <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>
+            <TextBlock Grid.Row="2" Text="关闭" HorizontalAlignment="Right" Margin="0,2,20,0"  Width="30" Height="30"/>
+        </Grid>
+        <Grid Grid.Row="1">
+            <Image x:Name="imgPri"/>
+        </Grid>
+
+        <Button
+                    x:Name="btnPrint"
+                    Grid.Row="8"
+                    Width="115"
+                    Height="46"
+                    Click="BtnPrint_Click"
+                    Content="打印"
+            Foreground="White"
+                    FontSize="17"
+                    IsDefault="True"
+                    Cursor="Hand"
+                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+            <Button.Template>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border
+                                BorderBrush="{TemplateBinding Control.BorderBrush}"
+                                BorderThickness="1"
+                                CornerRadius="7">
+                        <Border.Background>#2E8CF0</Border.Background>
+                        <ContentPresenter
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Content="{TemplateBinding ContentControl.Content}" />
+                    </Border>
+                </ControlTemplate>
+            </Button.Template>
+        </Button>
+    </Grid>
+</Window>

XHWK.WKTool/PrintWindow.xaml.cs

@@ -0,0 +1,166 @@
+using Common.system;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Forms;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace XHWK.WKTool
+{
+    /// <summary>
+    /// 打印
+    /// </summary>
+    public partial class PrintWindow : Window
+    {
+        /// <summary>
+        /// 下拉框数据源
+        /// </summary>
+        public DataTable data = new DataTable();
+        private DataTable dtComponentsUniqueNo;
+        public PrintWindow()
+        {
+            InitializeComponent();
+            string defa = string.Empty;
+            List<string> defaList = LatticeFileHelper.GetPrinterList(out defa);
+            if(defaList.Count>0)
+            {
+                data.Columns.Add("Value");
+                data.Columns.Add("Key");
+                for (int i = 0; i < defaList.Count; i++)
+                {
+                    //创建一行
+                    DataRow row = data.NewRow();
+                    //将此行添加到table中
+                    data.Rows.Add(row);
+                    data.Rows[i]["Value"] = defaList[i];
+                    data.Rows[i]["Key"] = i.ToString();
+                }
+                dtComponentsUniqueNo = data.DefaultView.ToTable();
+                cmbClass.ItemsSource = dtComponentsUniqueNo.DefaultView;
+                cmbClass.SelectedIndex = 0;
+            }
+        }
+        public void Initialize(string _imgPath)
+        {
+         if(!string.IsNullOrWhiteSpace(_imgPath))
+            {
+                imgPri.Source = new BitmapImage(new Uri(_imgPath));
+            }
+        }
+        /// <summary>
+        /// 打印
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnPrint_Click(object sender, RoutedEventArgs e)
+        {
+            if(string.IsNullOrWhiteSpace(cmbClass.Text))
+            {
+                //MessageBox.Show("打印机不能为空！");
+                System.Windows.Forms.MessageBox.Show("打印机不能为空！", "", MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1, System.Windows.Forms.MessageBoxOptions.DefaultDesktopOnly);
+                return;
+            }
+            int pr = 1;
+            string msg = string.Empty;
+            string outPut = string.Empty;
+            int pyte = 0; //0为方点 1为圆点
+            if(rbnSquarePoint.IsChecked==false)
+            {
+                pyte = 1;
+            }
+            LatticeFileHelper.GeneratingPDF(@"G:\101.pdf", @"G:\102.TPF", out 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);
+
+                int printResult = 1;
+                string standardError = string.Empty;
+                string standardOutput = string.Empty;
+                int frequency = Convert.ToInt32(txbNumberOfCopies.Text);
+                for (int i=0;i< frequency;i++)
+                {
+                    LatticeFileHelper.PrinterTPFFile(@"G:\102.TPF", 1, cmbClass.Text, out printResult, out standardError, out standardOutput);
+                }
+                if(printResult==0)// 0为成功
+                {
+                    //MessageBox.Show("打印成功!");
+                    System.Windows.Forms.MessageBox.Show("打印成功", "", MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1, System.Windows.Forms.MessageBoxOptions.DefaultDesktopOnly);
+                }
+                else
+                {
+                    System.Windows.Forms.MessageBox.Show(standardError, "", MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1, System.Windows.Forms.MessageBoxOptions.DefaultDesktopOnly);
+                    //MessageBox.Show(standardError);
+                }
+            }
+            else
+            {
+                System.Windows.Forms.MessageBox.Show(msg, "", MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1, System.Windows.Forms.MessageBoxOptions.DefaultDesktopOnly);
+            }
+        }
+        /// <summary>
+        /// 窗口移动
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            DragMove();
+        }
+        /// <summary>
+        /// 关闭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnClose_Click(object sender, RoutedEventArgs e)
+        {
+            this.Hide();
+        }
+        /// <summary>
+        /// 减
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnLess_Click(object sender, RoutedEventArgs e)
+        {
+            int num = Convert.ToInt32(txbNumberOfCopies.Text);
+            if(num>1)
+            {
+                num = num - 1;
+                txbNumberOfCopies.Text = num.ToString();
+            }
+        }
+        /// <summary>
+        /// 新增
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnAdd_Click(object sender, RoutedEventArgs e)
+        {
+            int num = Convert.ToInt32(txbNumberOfCopies.Text);
+            if (num > 0)
+            {
+                num = num + 1;
+                txbNumberOfCopies.Text = num.ToString();
+            }
+        }
+    }
+}

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -73,7 +73,7 @@
             </Grid>
 
             <Image Grid.Row="1"  Source="./Images/Toobar0.png"/>
-            <TextBlock Grid.Row="1" Text="01:35" FontSize="23" Foreground="#FFFFFF" Margin="30,50,0,0"/>
+            <TextBlock Grid.Row="1" x:Name="txbTime" Text="00:00" FontSize="23" Foreground="#FFFFFF" Margin="30,50,0,0"/>
             <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,15,0">
                 <Button x:Name="BtnRecordingScreen"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0" Click="BtnRecordingScreen_Click">
                     <Image x:Name="ImgRecordingScreen" Source="./Images/Toobar25.png"/>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -8,6 +8,7 @@ using System.Windows;
 using System.Windows.Ink;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using System.Windows.Threading;
 using XHWK.Model;
 
 namespace XHWK.WKTool
@@ -40,6 +41,24 @@ namespace XHWK.WKTool
         Model_Video VideoInfo = null;
         //声明一个 DrawingAttributes 类型的变量  
         DrawingAttributes drawingAttributes;
+        private DispatcherTimer t = null;
+        /// <summary>
+        /// 计时器状态
+        /// </summary>
+        private enum State
+        {
+            Start,
+            Pause,
+            End
+        }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        private State _state = State.End;
+        /// <summary>
+        /// 计时用
+        /// </summary>
+        private TimeSpan _timeSpan = new TimeSpan(0, 0, 0, 0, 0);
         #endregion
 
         #region 初始化
@@ -66,10 +85,79 @@ namespace XHWK.WKTool
             gridToolbar.Visibility = Visibility.Hidden;
             gridColour.Visibility = Visibility.Hidden;
             gridThickness.Visibility = Visibility.Hidden;
+            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);
+            Stack();
+            ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
+            BtnRecordingScreen_Click(null, null);
         }
         #endregion
 
         #region 事件
+        /// <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);
+            //char[] times = time.ToCharArray();
+            txbTime.Text = time;
+        }
+        /// <summary>
+        /// 开始
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Stack()
+        {
+            _state = State.Start;
+        }
+        /// <summary>
+        /// 暂停
+        /// </summary>
+        private void TimeOut()
+        {
+            _state = State.Pause;
+        }
+        /// <summary>
+        /// 结束
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void End()
+        {
+            _state = State.End;
+        }
         #region 录制
         /// <summary>
         /// 开始或暂停录制
@@ -80,6 +168,7 @@ namespace XHWK.WKTool
         {
             if (IsSuspend)
             {
+                Stack();
                 if (IsFirstRS)
                 {
                     VideoInfo = new Model_Video();
@@ -113,19 +202,19 @@ namespace XHWK.WKTool
                 }
                 IsSuspend = false;
 
-                #region 录像倒计时
-                if (APP.W_CountdownWindow == null)
-                {
-                    APP.W_CountdownWindow = new CountdownWindow();
-                    //APP.W_CountdownWindow.Topmost = true;
-                }
-                else
-                {
-                    APP.W_CountdownWindow.Initialize();
-                    //APP.W_CountdownWindow.Topmost = true;
-                }
-                APP.W_CountdownWindow.Show();
-                #endregion
+                //#region 录像倒计时
+                //if (APP.W_CountdownWindow == null)
+                //{
+                //    APP.W_CountdownWindow = new CountdownWindow();
+                //    //APP.W_CountdownWindow.Topmost = true;
+                //}
+                //else
+                //{
+                //    APP.W_CountdownWindow.Initialize();
+                //    //APP.W_CountdownWindow.Topmost = true;
+                //}
+                //APP.W_CountdownWindow.Show();
+                //#endregion
 
                 ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
                 try
@@ -139,8 +228,9 @@ namespace XHWK.WKTool
             }
             else
             {
+                TimeOut();
                 IsSuspend = true;
-                ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
+                ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_14.png"));
                 try
                 {
                     APP.FFmpeg.SuspendFFmpeg();
@@ -158,6 +248,17 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnStopRecordingScreen_Click(object sender, RoutedEventArgs e)
         {
+            IsSuspend = true;
+            txbTime.Text = "00:00";
+            End();
+            ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
+            if (gridToolbar.Visibility==Visibility.Visible)
+            {
+                gridToolbar.Visibility = Visibility.Hidden;
+                gridColour.Visibility = Visibility.Hidden;
+                gridThickness.Visibility = Visibility.Hidden;
+                APP.W_PracticeWindow.Hide();
+            }
             if (APP.W_XHMicroLessonSystemWindow == null)
             {
                 APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
@@ -242,27 +343,28 @@ namespace XHWK.WKTool
             else
             {
                 gridToolbar.Visibility = Visibility.Visible;
-            }
-            //imgCanvas.Source = new BitmapImage(new Uri(imagePath));
-            try
-            {
-                if (APP.W_PracticeWindow == null)
+                try
                 {
-                    APP.W_PracticeWindow = new PracticeWindow();
-                    //APP.W_PracticeWindow.Topmost = true;
-                    APP.W_PracticeWindow.Width = pwidth;
-                    APP.W_PracticeWindow.Height = pHeight;
-                    APP.W_PracticeWindow.Left = 0;
-                    APP.W_PracticeWindow.Top = 0;
-                    //practiceWin.Owner = this;
+                    if (APP.W_PracticeWindow == null)
+                    {
+                        APP.W_PracticeWindow = new PracticeWindow();
+                        //APP.W_PracticeWindow.Topmost = true;
+                        APP.W_PracticeWindow.Width = pwidth;
+                        APP.W_PracticeWindow.Height = pHeight;
+                        APP.W_PracticeWindow.Left = 0;
+                        APP.W_PracticeWindow.Top = 0;
+                        //practiceWin.Owner = this;
+                    }
+                    APP.W_PracticeWindow.Initialize(imagePath);
+                    APP.W_PracticeWindow.Show();
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteErrLog("【批注（PracticeWindow）" + ex.Message, ex);
                 }
-                APP.W_PracticeWindow.Initialize(imagePath);
-                APP.W_PracticeWindow.Show();
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteErrLog("【批注（PracticeWindow）" + ex.Message, ex);
             }
+            //imgCanvas.Source = new BitmapImage(new Uri(imagePath));
+         
         }
         /// <summary>
         /// 屏幕宽
@@ -310,6 +412,8 @@ namespace XHWK.WKTool
         {
             //drawingAttributes.Color = Colors.White;
             APP.W_PracticeWindow.White();
+            gridColour.Visibility = Visibility.Collapsed;
+            gridThickness.Visibility = Visibility.Collapsed;
         }
         /// <summary>
         /// 红色
@@ -320,6 +424,8 @@ namespace XHWK.WKTool
         {
             //drawingAttributes.Color = Colors.Red;
             APP.W_PracticeWindow.Red();
+            gridColour.Visibility = Visibility.Collapsed;
+            gridThickness.Visibility = Visibility.Collapsed;
         }
         /// <summary>
         /// 黄色
@@ -330,6 +436,8 @@ namespace XHWK.WKTool
         {
             //drawingAttributes.Color = Colors.Gold;
             APP.W_PracticeWindow.Yellow();
+            gridColour.Visibility = Visibility.Collapsed;
+            gridThickness.Visibility = Visibility.Collapsed;
         }
         /// <summary>
         /// 青色
@@ -340,6 +448,8 @@ namespace XHWK.WKTool
         {
             //drawingAttributes.Color = Colors.LimeGreen;
             APP.W_PracticeWindow.CyanBlue();
+            gridColour.Visibility = Visibility.Collapsed;
+            gridThickness.Visibility = Visibility.Collapsed;
         }
         /// <summary>
         /// 灰色
@@ -350,6 +460,8 @@ namespace XHWK.WKTool
         {
             //drawingAttributes.Color = Colors.Gray;
             APP.W_PracticeWindow.Gray();
+            gridColour.Visibility = Visibility.Collapsed;
+            gridThickness.Visibility = Visibility.Collapsed;
         }
         /// <summary>
         /// 蓝色
@@ -360,6 +472,8 @@ namespace XHWK.WKTool
         {
             //drawingAttributes.Color = Colors.DeepSkyBlue;
             APP.W_PracticeWindow.Blue();
+            gridColour.Visibility = Visibility.Collapsed;
+            gridThickness.Visibility = Visibility.Collapsed;
         }
         /// <summary>
         /// 画笔 细
@@ -369,6 +483,8 @@ namespace XHWK.WKTool
         private void BtnFine_Click(object sender, RoutedEventArgs e)
         {
             APP.W_PracticeWindow.Fine();
+            gridColour.Visibility = Visibility.Collapsed;
+            gridThickness.Visibility = Visibility.Collapsed;
         }
         /// <summary>
         /// 画笔 中
@@ -378,6 +494,8 @@ namespace XHWK.WKTool
         private void BtnIn_Click(object sender, RoutedEventArgs e)
         {
             APP.W_PracticeWindow.In();
+            gridColour.Visibility = Visibility.Collapsed;
+            gridThickness.Visibility = Visibility.Collapsed;
         }
         /// <summary>
         /// 画笔粗
@@ -387,6 +505,8 @@ namespace XHWK.WKTool
         private void BtnCrude_Click(object sender, RoutedEventArgs e)
         {
             APP.W_PracticeWindow.Crude();
+            gridColour.Visibility = Visibility.Collapsed;
+            gridThickness.Visibility = Visibility.Collapsed;
         }
         /// <summary>
         /// 橡皮
@@ -397,9 +517,6 @@ namespace XHWK.WKTool
         {
             APP.W_PracticeWindow.Eraser();
         }
-        #endregion
-
-        #endregion
         /// <summary>
         /// 🖊
         /// </summary>
@@ -414,7 +531,7 @@ namespace XHWK.WKTool
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void BtnRound_Click(object sender, RoutedEventArgs e) 
+        private void BtnRound_Click(object sender, RoutedEventArgs e)
         {
             APP.W_PracticeWindow.Round();
         }
@@ -427,5 +544,9 @@ namespace XHWK.WKTool
         {
             APP.W_PracticeWindow.Rectangle();
         }
+        #endregion
+        #endregion
+
+
     }
 }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -36,13 +36,13 @@
                             <TextBlock x:Name="txbLoginType" Text="未登录" FontSize="14" Padding="5,0,0,0" Foreground="#FFFFFF"/>
                         </StackPanel>
                     </Button>
-                    <Button Cursor="Hand" x:Name="btnShrink" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnShrink_Click">
+                    <Button Cursor="Hand" x:Name="btnShrink" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnShrink_Click" Margin="8,0,8,0">
                         <Image Source="./Images/microLessonSystem_19.png"/>
                     </Button>
-                    <Button Cursor="Hand" x:Name="btnEnlarge" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="8,0,8,0">
+                    <!--<Button Cursor="Hand" x:Name="btnEnlarge" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="8,0,8,0">
                         <Image Source="./Images/microLessonSystem_8.png"/>
-                    </Button>
-                    <Button Cursor="Hand" x:Name="btnDown" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click">
+                    </Button>-->
+                    <Button Cursor="Hand" x:Name="btnDown" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click" >
                         <Image Source="./Images/microLessonSystem_10.png"/>
                     </Button>
                 </StackPanel>
@@ -87,7 +87,7 @@
                 <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="10,10,10,0">
                     <Button Cursor="Hand" x:Name="btnAdd" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnAdd_Click">
                         <StackPanel Orientation="Vertical">
-                            <Image x:Name="ImgAdd" Source="./Images/microLessonSystem_25.png"/>
+                            <Image x:Name="ImgAdd" Source="./Images/microLessonSystem_25.png" Visibility="Visible"/>
                             <Image x:Name="ImgAddTwo" Source="./Images/microLessonSystem_24.png" Visibility="Collapsed"/>
                             <TextBlock Text="增加" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
@@ -101,21 +101,21 @@
                     </Button>
                     <Button Cursor="Hand" x:Name="btnUpload" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnUpload_Click">
                         <StackPanel Orientation="Vertical">
-                            <Image x:Name="ImgUpload" Source="./Images/microLessonSystem_16.png"/>
-                            <Image x:Name="ImgUploadTwo" Source="./Images/microLessonSystem_15.png" Visibility="Collapsed"/>
+                            <Image x:Name="ImgUpload" Source="./Images/microLessonSystem_15.png" Visibility="Collapsed"/>
+                            <Image x:Name="ImgUploadTwo" Source="./Images/microLessonSystem_16.png" Visibility="Visible"/>
                             <TextBlock Text="上传" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
                     <Button Cursor="Hand" x:Name="btnMyMine" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="30,0,30,0" Click="BtnMyMine_Click">
                         <StackPanel Orientation="Vertical">
-                            <Image x:Name="ImgMyMine" Source="./Images/microLessonSystem_1.png"/>
-                            <Image x:Name="ImgMyMineTwo" Source="./Images/microLessonSystem_22.png" Visibility="Collapsed"/>
+                            <Image x:Name="ImgMyMine" Source="./Images/microLessonSystem_22.png" Visibility="Collapsed"/>
+                            <Image x:Name="ImgMyMineTwo" Source="./Images/microLessonSystem_1.png" Visibility="Visible"/>
                             <TextBlock Text="我的" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
                     <Button Cursor="Hand" x:Name="btnSetUp" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnSetUp_Click">
                         <StackPanel Orientation="Vertical">
-                            <Image x:Name="ImgSetUp" Source="./Images/microLessonSystem_18.png"/>
+                            <Image x:Name="ImgSetUp" Source="./Images/microLessonSystem_18.png" Visibility="Visible"/>
                             <Image x:Name="ImgSetUpTwo" Source="./Images/microLessonSystem_17.png" Visibility="Collapsed"/>
                             <TextBlock Text="设置" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
@@ -141,19 +141,24 @@
                              MouseLeftButtonUp="IMG1_MouseLeftButtonUp"
                              MouseMove="IMG1_MouseMove"
                              MouseWheel="IMG1_MouseWheel" >
-                                    <Image Name="imgCanvas" Width="800" Height="600" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}"  RenderOptions.BitmapScalingMode="NearestNeighbor">
+                                    <Image Name="imgCanvas" Width="635" Height="auto" Stretch="Uniform" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}">
                                     </Image>
                                 </ContentControl>
                             </ScrollViewer>
                         </Grid>
                     </Border>
                 </Grid>
-                <InkCanvas Grid.Row="0" x:Name="blackboard_canvas" Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2" />
+                <Image x:Name="imgDocumentation"/>
+                <!--<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="imgPlayer" Width="172" Height="124"  HorizontalAlignment="Right" Margin="0,7,10,0" VerticalAlignment="Top" Visibility="Collapsed"/>
+                <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,10,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,10,10" VerticalAlignment="Bottom" Visibility="Collapsed"/>
                 <StackPanel Grid.Row="0" Orientation="Horizontal" Background="#FFFFFF" Width="180" HorizontalAlignment="Right"
             Height="58" Margin="0,830,20,0" Grid.Column="1">
                     <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
@@ -226,10 +231,10 @@
                 </StackPanel>
                 <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Left">
                     <TextBlock Text="头像位置" FontSize="16" Foreground="#2D8CF0"/>
-                    <RadioButton Cursor="Hand" Content="左上" FontSize="14" Foreground="#333333" Margin="10,2,0,0" IsChecked="True"/>
-                    <RadioButton Cursor="Hand" Content="左下" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
-                    <RadioButton Cursor="Hand" Content="右上" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
-                    <RadioButton Cursor="Hand" Content="右下" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnRight" Content="右上" FontSize="14" Foreground="#333333" Margin="10,2,0,0" IsChecked="True"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnRightUnder" Content="右下" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnLeft" Content="左上" FontSize="14" Foreground="#333333" Margin="20,2,0,0" />
+                    <RadioButton Cursor="Hand" x:Name="rbnLeftUnder" Content="左下" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
                 </StackPanel>
                 <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left">
                     <TextBlock Text="视频声音" FontSize="16" Foreground="#2D8CF0"/>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -51,6 +51,14 @@ namespace XHWK.WKTool
         /// 图片
         /// </summary>
         string[] ImgPDFPath = new string[300];
+        /// <summary>
+        /// 当前颜色
+        /// </summary>
+        private System.Windows.Media.Color Color = System.Windows.Media.Colors.Black;
+        /// <summary>
+        /// 笔迹粗细
+        /// </summary>
+        private int Size = 2;
         #endregion
 
         #region 初始化
@@ -62,11 +70,19 @@ namespace XHWK.WKTool
             new Aspose.Pdf.License().SetLicense(new MemoryStream(Convert.FromBase64String("PExpY2Vuc2U+CiAgPERhdGE+CiAgICA8TGljZW5zZWRUbz5TdXpob3UgQXVuYm94IFNvZnR3YXJlIENvLiwgTHRkLjwvTGljZW5zZWRUbz4KICAgIDxFbWFpbFRvPnNhbGVzQGF1bnRlYy5jb208L0VtYWlsVG8+CiAgICA8TGljZW5zZVR5cGU+RGV2ZWxvcGVyIE9FTTwvTGljZW5zZVR5cGU+CiAgICA8TGljZW5zZU5vdGU+TGltaXRlZCB0byAxIGRldmVsb3BlciwgdW5saW1pdGVkIHBoeXNpY2FsIGxvY2F0aW9uczwvTGljZW5zZU5vdGU+CiAgICA8T3JkZXJJRD4xOTA4MjYwODA3NTM8L09yZGVySUQ+CiAgICA8VXNlcklEPjEzNDk3NjAwNjwvVXNlcklEPgogICAgPE9FTT5UaGlzIGlzIGEgcmVkaXN0cmlidXRhYmxlIGxpY2Vuc2U8L09FTT4KICAgIDxQcm9kdWN0cz4KICAgICAgPFByb2R1Y3Q+QXNwb3NlLlRvdGFsIGZvciAuTkVUPC9Qcm9kdWN0PgogICAgPC9Qcm9kdWN0cz4KICAgIDxFZGl0aW9uVHlwZT5FbnRlcnByaXNlPC9FZGl0aW9uVHlwZT4KICAgIDxTZXJpYWxOdW1iZXI+M2U0NGRlMzAtZmNkMi00MTA2LWIzNWQtNDZjNmEzNzE1ZmMyPC9TZXJpYWxOdW1iZXI+CiAgICA8U3Vic2NyaXB0aW9uRXhwaXJ5PjIwMjAwODI3PC9TdWJzY3JpcHRpb25FeHBpcnk+CiAgICA8TGljZW5zZVZlcnNpb24+My4wPC9MaWNlbnNlVmVyc2lvbj4KICAgIDxMaWNlbnNlSW5zdHJ1Y3Rpb25zPmh0dHBzOi8vcHVyY2hhc2UuYXNwb3NlLmNvbS9wb2xpY2llcy91c2UtbGljZW5zZTwvTGljZW5zZUluc3RydWN0aW9ucz4KICA8L0RhdGE+CiAgPFNpZ25hdHVyZT53UGJtNUt3ZTYvRFZXWFNIY1o4d2FiVEFQQXlSR0pEOGI3L00zVkV4YWZpQnd5U2h3YWtrNGI5N2c2eGtnTjhtbUFGY3J0c0cwd1ZDcnp6MytVYk9iQjRYUndTZWxsTFdXeXNDL0haTDNpN01SMC9jZUFxaVZFOU0rWndOQkR4RnlRbE9uYTFQajhQMzhzR1grQ3ZsemJLZFZPZXk1S3A2dDN5c0dqYWtaL1E9PC9TaWduYXR1cmU+CjwvTGljZW5zZT4=")));
             InitializeComponent();
 
+            btnPrint.IsEnabled = false;
+
             myblackboard = new BlackboardNew(blackboard_canvas);
             APP.pageData.pagenum = 1;
             APP.pageData.currpage = 1;
             DataContext = APP.pageData;
 
+            //APP.SaveDraw();//画板模型第一页初始化
+            APP.PageDrawList = new List<Model_DrawData>();
+            Model_DrawData model_DrawData = new Model_DrawData();
+            model_DrawData.PageNum = APP.pageData.currpage;
+            APP.PageDrawList.Add(model_DrawData);
+
             txbStoragePath.Content = FileToolsCommon.GetConfigValue("VideoType");
             if (FileToolsCommon.GetConfigValue("IsSound").Equals("true"))
             {
@@ -85,6 +101,7 @@ namespace XHWK.WKTool
         /// </summary>
         public void Initialize()
         {
+            APP.CameraPosition = FileToolsCommon.GetConfigValue("CameraPosition");
             //创建 DrawingAttributes 类的一个实例  
             drawingAttributes = new DrawingAttributes();
             //将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用  
@@ -93,6 +110,9 @@ namespace XHWK.WKTool
             blackboard_canvas.UseCustomCursor = true;
             drawingAttributes.FitToCurve = true;
             drawingAttributes.IgnorePressure = false;
+            drawingAttributes.Width = Size;
+            drawingAttributes.Height = Size;
+            drawingAttributes.Color = Color;
             blackboard_canvas.Cursor = System.Windows.Input.Cursors.Pen;
             //wfhCamera.Visibility = Visibility.Hidden;
             ImgPDFPath = null;
@@ -136,7 +156,6 @@ namespace XHWK.WKTool
             if (CameraHelper.CameraDevices.Count > 0)
             {
                 CameraHelper.SetCameraDevice(0);
-                imgPlayer.Visibility = Visibility.Visible;
                 RbnOpen = new List<string>();
                 times = new System.Timers.Timer(200);//设置执行一次（false）还是一直执行(true)
                 times.AutoReset = true;//设置是否执行System.Timers.Timer.Elapsed事件
@@ -164,7 +183,47 @@ namespace XHWK.WKTool
                             if (!string.IsNullOrWhiteSpace(path))
                             {
                                 RbnOpen.Add(path);
-                                imgPlayer.Source = new BitmapImage(new Uri(path));
+                                imgPlayerRight.Visibility = Visibility.Visible;
+                                ///  < !--摄像头位置 1.右上 2.左上 3.右下 4.左下-- >
+                                if ("1".Equals(APP.CameraPosition))
+                                {
+                                    imgPlayerRight.Visibility = Visibility.Visible;
+                                    imgPlayerLeft.Visibility = Visibility.Collapsed;
+                                    imgPlayerRightUnder.Visibility = Visibility.Collapsed;
+                                    imgPlayerLeftUnder.Visibility = Visibility.Collapsed;
+                                    imgPlayerRight.Source = new BitmapImage(new Uri(path));
+                                }
+                                else if ("2".Equals(APP.CameraPosition))
+                                {
+                                    imgPlayerRight.Visibility = Visibility.Collapsed;
+                                    imgPlayerLeft.Visibility = Visibility.Visible;
+                                    imgPlayerRightUnder.Visibility = Visibility.Collapsed;
+                                    imgPlayerLeftUnder.Visibility = Visibility.Collapsed;
+                                    imgPlayerLeft.Source = new BitmapImage(new Uri(path));
+                                }
+                                else if ("3".Equals(APP.CameraPosition))
+                                {
+                                    imgPlayerRight.Visibility = Visibility.Collapsed;
+                                    imgPlayerLeft.Visibility = Visibility.Collapsed;
+                                    imgPlayerRightUnder.Visibility = Visibility.Visible;
+                                    imgPlayerLeftUnder.Visibility = Visibility.Collapsed;
+                                    imgPlayerRightUnder.Source = new BitmapImage(new Uri(path));
+                                }
+                                else if ("4".Equals(APP.CameraPosition))
+                                {
+                                    imgPlayerRight.Visibility = Visibility.Collapsed;
+                                    imgPlayerLeft.Visibility = Visibility.Collapsed;
+                                    imgPlayerRightUnder.Visibility = Visibility.Collapsed;
+                                    imgPlayerLeftUnder.Visibility = Visibility.Visible;
+                                    imgPlayerLeftUnder.Source = new BitmapImage(new Uri(path));
+                                }
+                                else
+                                {
+                                    imgPlayerLeft.Visibility = Visibility.Collapsed;
+                                    imgPlayerRightUnder.Visibility = Visibility.Collapsed;
+                                    imgPlayerLeftUnder.Visibility = Visibility.Collapsed;
+                                    imgPlayerRight.Source = new BitmapImage(new Uri(path));
+                                }
                             }
                         }
                         I++;
@@ -184,7 +243,10 @@ namespace XHWK.WKTool
         private void RbnTurnOff_Click(object sender, RoutedEventArgs e)
         {
             IsRbnOpen = false;
-            imgPlayer.Visibility = Visibility.Hidden;
+            imgPlayerRight.Visibility = Visibility.Collapsed;
+            imgPlayerLeft.Visibility = Visibility.Collapsed;
+            imgPlayerRightUnder.Visibility = Visibility.Collapsed;
+            imgPlayerLeftUnder.Visibility = Visibility.Collapsed;
             CameraHelper.CloseDevice();
             I = 9999;
         }
@@ -216,9 +278,9 @@ namespace XHWK.WKTool
                 APP.W_ScreenRecordingToolbarWindow.Initialize();
             }
             //显示在右下角
-
-            APP.W_ScreenRecordingToolbarWindow.Left = PrimaryScreen.DESKTOP.Width - APP.W_ScreenRecordingToolbarWindow.Width - 10;
-            APP.W_ScreenRecordingToolbarWindow.Top = PrimaryScreen.DESKTOP.Height - APP.W_ScreenRecordingToolbarWindow.Height - 160;
+            APP.W_ScreenRecordingToolbarWindow.WindowStartupLocation = WindowStartupLocation.Manual;
+            APP.W_ScreenRecordingToolbarWindow.Left = PrimaryScreen.DESKTOP.Width - APP.W_ScreenRecordingToolbarWindow.Width - 60;
+            APP.W_ScreenRecordingToolbarWindow.Top = PrimaryScreen.DESKTOP.Height - APP.W_ScreenRecordingToolbarWindow.Height - 30;
             APP.W_ScreenRecordingToolbarWindow.Topmost = true;
             APP.W_ScreenRecordingToolbarWindow.Show();
             Hide();
@@ -377,8 +439,30 @@ namespace XHWK.WKTool
             {
                 FileToolsCommon.SetConfigValue("IsSound", "false");
             }
+            ///  < !--摄像头位置 1.右上 2.左上 3.右下 4.左下-- >
+            if (rbnRight.IsChecked == true)
+            {
+                FileToolsCommon.SetConfigValue("CameraPosition", "1");
+            }
+            else if (rbnLeft.IsChecked == true)
+            {
+                FileToolsCommon.SetConfigValue("CameraPosition", "2");
+            }
+            else if (rbnRightUnder.IsChecked == true)
+            {
+                FileToolsCommon.SetConfigValue("CameraPosition", "3");
+            }
+            else if (rbnLeftUnder.IsChecked == true)
+            {
+                FileToolsCommon.SetConfigValue("CameraPosition", "4");
+            }
+            APP.CameraPosition = FileToolsCommon.GetConfigValue("CameraPosition");
             GridMain.Visibility = Visibility.Visible;
             gridSetUp.Visibility = Visibility.Collapsed;
+            imgPlayerRight.Visibility = Visibility.Collapsed;
+            imgPlayerLeft.Visibility = Visibility.Collapsed;
+            imgPlayerRightUnder.Visibility = Visibility.Collapsed;
+            imgPlayerLeftUnder.Visibility = Visibility.Collapsed;
         }
         /// <summary>
         /// 设置事件
@@ -387,9 +471,34 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnSetUp_Click(object sender, RoutedEventArgs e)
         {
-            GridMain.Visibility = Visibility.Collapsed;
-            gridSetUp.Visibility = Visibility.Visible;
-            txbStoragePath.Content = APP.WKData.WkPath;
+            if (APP.IsLoginType == false)
+            {
+                Login();
+                return;
+            }
+            if (!TxbRecordingWord.Text.Equals("暂停"))
+            {
+                GridMain.Visibility = Visibility.Collapsed;
+                gridSetUp.Visibility = Visibility.Visible;
+                txbStoragePath.Content = APP.WKData.WkPath;
+                ///  < !--摄像头位置 1.右上 2.左上 3.右下 4.左下-- >
+                if ("1".Equals(APP.CameraPosition))
+                {
+                    rbnRight.IsChecked = true;
+                }
+                else if ("2".Equals(APP.CameraPosition))
+                {
+                    rbnLeft.IsChecked = true;
+                }
+                else if ("3".Equals(APP.CameraPosition))
+                {
+                    rbnRightUnder.IsChecked = true;
+                }
+                else if ("4".Equals(APP.CameraPosition))
+                {
+                    rbnLeftUnder.IsChecked = true;
+                }
+            }
         }
         /// <summary>
         /// 设置 浏览事件
@@ -430,6 +539,7 @@ namespace XHWK.WKTool
             //blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
             ////设置 DrawingAttributes 的 Color 属性设置颜色  
             drawingAttributes.Color = Colors.White;
+            Color = Colors.White;
         }
         /// <summary>
         /// 画笔颜色事件 红色
@@ -441,6 +551,7 @@ namespace XHWK.WKTool
 
             //设置 DrawingAttributes 的 Color 属性设置颜色  
             drawingAttributes.Color = Colors.Red;
+            Color = Colors.Red;
         }
         /// <summary>
         /// 画笔颜色事件 灰色
@@ -450,6 +561,7 @@ namespace XHWK.WKTool
         private void BtnGray_Click(object sender, RoutedEventArgs e)
         {
             drawingAttributes.Color = Colors.Gray;
+            Color = Colors.Gray;
         }
         /// <summary>
         /// 画笔颜色事件 青色
@@ -459,6 +571,7 @@ namespace XHWK.WKTool
         private void BtnCyanBlue_Click(object sender, RoutedEventArgs e)
         {
             drawingAttributes.Color = Colors.LimeGreen;
+            Color = Colors.LimeGreen;
         }
         /// <summary>
         /// 画笔颜色事件 黄色
@@ -468,6 +581,7 @@ namespace XHWK.WKTool
         private void BtnYellow_Click(object sender, RoutedEventArgs e)
         {
             drawingAttributes.Color = Colors.Gold;
+            Color = Colors.Gold;
         }
         /// <summary>
         /// 画笔颜色事件 蓝色
@@ -477,6 +591,7 @@ namespace XHWK.WKTool
         private void BtnBlue_Click(object sender, RoutedEventArgs e)
         {
             drawingAttributes.Color = Colors.DeepSkyBlue;
+            Color = Colors.DeepSkyBlue;
         }
         /// <summary>
         /// 画笔粗细事件 细
@@ -487,6 +602,7 @@ namespace XHWK.WKTool
         {
             drawingAttributes.Width = 1;
             drawingAttributes.Height = 1;
+            Size = 1;
         }
         /// <summary>
         /// 画笔粗细事件 中
@@ -497,6 +613,7 @@ namespace XHWK.WKTool
         {
             drawingAttributes.Width = 3;
             drawingAttributes.Height = 3;
+            Size = 3;
         }
         /// <summary>
         /// 画笔粗细事件 粗
@@ -507,6 +624,7 @@ namespace XHWK.WKTool
         {
             drawingAttributes.Width = 5;
             drawingAttributes.Height = 5;
+            Size = 5;
         }
         /// <summary>
         /// 登陆事件
@@ -525,6 +643,8 @@ namespace XHWK.WKTool
             if (APP.W_LoginWindow == null)
             {
                 APP.W_LoginWindow = new LoginWindow();
+                APP.W_LoginWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+                APP.W_LoginWindow.Owner = this;
 
             }
             else
@@ -535,10 +655,20 @@ namespace XHWK.WKTool
             if (APP.IsLoginType)
             {
                 txbLoginType.Text = APP.UserInfo.Username;
+
+                ImgMyMine.Visibility = Visibility.Visible;
+                ImgMyMineTwo.Visibility = Visibility.Collapsed;
+                ImgUpload.Visibility = Visibility.Visible;
+                ImgUploadTwo.Visibility = Visibility.Collapsed;
             }
             else
             {
                 txbLoginType.Text = "未登录";
+
+                ImgMyMine.Visibility = Visibility.Collapsed;
+                ImgMyMineTwo.Visibility = Visibility.Visible;
+                ImgUpload.Visibility = Visibility.Collapsed;
+                ImgUploadTwo.Visibility = Visibility.Visible;
             }
         }
         /// <summary>
@@ -585,10 +715,35 @@ namespace XHWK.WKTool
             {
                 if (!string.IsNullOrWhiteSpace(APP.ImgPath) && File.Exists(APP.ImgPath))
                 {
-                    APP.JPaths[APP.pageData.currpage] = APP.ImgPath;
-                    if (!string.IsNullOrWhiteSpace(APP.JPaths[APP.pageData.currpage]))
+                    //APP.JPaths[APP.pageData.currpage]= APP.ImgPath;
+                    //APP.JPaths[APP.pageData.currpage] = APP.ImgPath;
+                    if (APP.PageDrawList.Count >= APP.pageData.currpage)
+                    {
+                        APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath = APP.ImgPath;//zxycs
+                        APP.PageDrawList[APP.pageData.currpage - 1].PdfImagePath = APP.ImgPath;
+                    }
+                    else
                     {
-                        imgCanvas.Source = new BitmapImage(new Uri(APP.JPaths[APP.pageData.currpage]));
+                        Model_DrawData model_DrawData = new Model_DrawData();
+                        model_DrawData.PageImagePath = APP.ImgPath;
+                        model_DrawData.PdfImagePath = APP.ImgPath;
+                        APP.PageDrawList.Add(model_DrawData);
+                    }
+                    //if (!string.IsNullOrWhiteSpace(APP.JPaths[APP.pageData.currpage]))
+                    //{
+                    //    //imgCanvas.Source = new BitmapImage(new Uri(APP.JPaths[APP.pageData.currpage]));
+                    //    imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage-1].PageImagePath));
+                    //}
+                    if (APP.PageDrawList.Count >= APP.pageData.currpage && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
+                    {
+                        //imgCanvas.Source = new BitmapImage(new Uri(APP.JPaths[APP.pageData.currpage]));
+                        imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                        //btnOk.Visibility = Visibility.Visible;
+                        //blackboard_canvas.Visibility = Visibility.Collapsed;
+
+                        ImgPrint.Visibility = Visibility.Visible;//截图成功可打印
+                        ImgPrintTwo.Visibility = Visibility.Collapsed;
+                        btnPrint.IsEnabled = true;
                     }
                 }
             }
@@ -652,6 +807,9 @@ namespace XHWK.WKTool
                 LogHelper.WriteErrLog("【导入（BtnImport_Click）" + ex.Message, ex);
             }
         }
+        /// <summary>
+        /// 导入文档
+        /// </summary>
         private void OpenDialog()
         {
             result = ofd.ShowDialog();
@@ -663,7 +821,7 @@ namespace XHWK.WKTool
                     string filepath = ofd.FileName;
                     string path = ofd.SafeFileName.Replace(".ppt", "").Trim();
                     string type = ofd.SafeFileName.Replace(".ppt", "typezsygppt").Trim();
-                    if (type.Contains("typezsygppt"))
+                    if (type.Contains("typezsygppt"))//ppt
                     {
                         try
                         {
@@ -674,7 +832,6 @@ namespace XHWK.WKTool
                             ppt.Save(path, Aspose.Slides.Export.SaveFormat.Pdf);
                             #endregion
 
-
                             #region PDF转图片
                             // 图片绝对路径集合
                             List<string> images = new List<string>();
@@ -711,9 +868,41 @@ namespace XHWK.WKTool
                             }
                             #endregion
 
-                            APP.Paths = images.ToArray();
-                            ImgPDFPath = images.ToArray();
-                            for (int i = 0; i < APP.Paths.Length; i++)
+                            //APP.Paths = images.ToArray();
+                            //ImgPDFPath = images.ToArray();
+
+                            string[] page = images.ToArray();
+                            if(page.Length>0)
+                            {
+                                APP.PageDrawList = null;
+                                APP.PageDrawList = new List<Model_DrawData>();
+                            }
+                            for (int i = 0; i < page.Length; i++)//给画板模型加图片路径
+                            {
+                                if (APP.PageDrawList != null && APP.PageDrawList.Count > i)
+                                {
+                                    APP.PageDrawList[i].PageImagePath = page[i]; //zxycs
+                                    APP.PageDrawList[i].PdfImagePath = page[i];
+                                    APP.PageDrawList[i].PageNum = i + 1;
+                                }
+                                else
+                                {
+                                 
+                                    Model_DrawData model_DrawData = new Model_DrawData();
+                                    model_DrawData.PageImagePath = page[i];
+                                    model_DrawData.PdfImagePath = page[i];
+                                    model_DrawData.PageNum = i + 1;
+                                    APP.PageDrawList.Add(model_DrawData);
+                                }
+                                ImgPrint.Visibility = Visibility.Visible;//导入成功可打印
+                                ImgPrintTwo.Visibility = Visibility.Collapsed;
+                                btnPrint.IsEnabled = true;
+                                APP.SaveDraw();
+                            }
+                            myblackboard.clear();
+                            APP.pageData.pagenum = 1;
+                            APP.pageData.currpage = 1;
+                            for (int i = 0; i < APP.PageDrawList.Count; i++)
                             {
                                 APP.pageData.pagenum += 1;
                             }
@@ -721,9 +910,10 @@ namespace XHWK.WKTool
                             {
                                 APP.pageData.pagenum -= 1;
                             }
-                            if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.Paths.Length)
+                            if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.PageDrawList.Count)
                             {
-                                imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));
+                                //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));//cs
+                                imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
                             }
                             else
                             {
@@ -735,14 +925,46 @@ namespace XHWK.WKTool
                             LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog PPT)" + ex.Message, ex);
                         }
                     }
-                    else
+                    else//word
                     {
                         try
                         {
                             string paths = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
-                            APP.Paths = ConvertWordToImage(filepath, paths, "", 0, 0, null, 0).ToArray();
+                            string[] page = ConvertWordToImage(filepath, paths, "", 0, 0, null, 0).ToArray();
+                            //APP.Paths = page;//cs
+                            //ImgPDFPath = page;
+                            if (page.Length > 0)
+                            {
+                                APP.PageDrawList = null;
+                                APP.PageDrawList = new List<Model_DrawData>();
+                            }
+                            for (int i = 0; i < page.Length; i++)//给画板模型加图片路径
+                            {
+                                if (APP.PageDrawList!=null&&APP.PageDrawList.Count > i)
+                                {
+                                    APP.PageDrawList[i].PageImagePath = page[i]; //zxycs
+                                    APP.PageDrawList[i].PdfImagePath = page[i];
+                                    APP.PageDrawList[i].PageNum = i + 1;
+                                }
+                                else
+                                {
+                                  
+                                    Model_DrawData model_DrawData = new Model_DrawData();
+                                    model_DrawData.PageImagePath = page[i];
+                                    model_DrawData.PdfImagePath = page[i];
+                                    model_DrawData.PageNum = i + 1;
+                                    APP.PageDrawList.Add(model_DrawData);
+                                }
+                                ImgPrint.Visibility = Visibility.Visible;//导入成功可打印
+                                ImgPrintTwo.Visibility = Visibility.Collapsed;
+                                btnPrint.IsEnabled = true;
 
-                            for (int i = 0; i < APP.Paths.Length; i++)
+                                APP.SaveDraw();
+                            }
+                            APP.pageData.pagenum = 1;
+                            APP.pageData.currpage = 1;
+                            //myblackboard.clear();
+                            for (int i = 0; i < APP.PageDrawList.Count; i++)
                             {
                                 APP.pageData.pagenum += 1;
                             }
@@ -750,9 +972,10 @@ namespace XHWK.WKTool
                             {
                                 APP.pageData.pagenum -= 1;
                             }
-                            if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.Paths.Length)
+                            if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.PageDrawList.Count)
                             {
-                                imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));
+                                //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));//cs
+                                imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
                             }
                             else
                             {
@@ -853,6 +1076,36 @@ namespace XHWK.WKTool
         {
             if (IsSuspendR)
             {
+                ImgPrint.Visibility = Visibility.Collapsed;//录制中不可打印
+                ImgPrintTwo.Visibility = Visibility.Visible;
+                btnPrint.IsEnabled = false;
+
+                ImgScreenshot.Visibility = Visibility.Collapsed;//录制中不可截图
+                ImgScreenshotTwo.Visibility = Visibility.Visible;
+                btnScreenshot.IsEnabled = false;
+
+                ImgImport.Visibility = Visibility.Collapsed;//录制中不可导入文档
+                ImgImportTwo.Visibility = Visibility.Visible;
+                btnImport.IsEnabled = false;
+
+                ImgScreenRecording.Visibility = Visibility.Collapsed;//录制中不可录屏
+                ImgScreenRecordingTwo.Visibility = Visibility.Visible;
+                btnScreenRecording.IsEnabled = false;
+
+                ImgUpload.Visibility = Visibility.Collapsed;//录制中不可上传
+                ImgUploadTwo.Visibility = Visibility.Visible;
+                btnUpload.IsEnabled = false;
+
+                ImgMyMine.Visibility = Visibility.Collapsed;//录制中不可点击我的
+                ImgMyMineTwo.Visibility = Visibility.Visible;
+                btnMyMine.IsEnabled = false;
+
+                ImgSetUp.Visibility = Visibility.Collapsed;//录制中不可设置
+                ImgSetUpTwo.Visibility = Visibility.Visible;
+                btnSetUp.IsEnabled = false;
+
+                btnLoginType.IsEnabled = false;
+
                 if (IsFirstR)//是否第一次录制  初始化录制
                 {
                     VideoInfo = new Model_Video();
@@ -986,6 +1239,35 @@ namespace XHWK.WKTool
         {
             if (!IsFirstR)
             {
+                ImgPrint.Visibility = Visibility.Visible;
+                ImgPrintTwo.Visibility = Visibility.Collapsed;
+                btnPrint.IsEnabled = true;
+
+                ImgScreenshot.Visibility = Visibility.Visible;
+                ImgScreenshotTwo.Visibility = Visibility.Collapsed;
+                btnScreenshot.IsEnabled = true;
+
+                ImgImport.Visibility = Visibility.Visible;
+                ImgImportTwo.Visibility = Visibility.Collapsed;
+                btnImport.IsEnabled = true;
+
+                ImgScreenRecording.Visibility = Visibility.Visible;
+                ImgScreenRecordingTwo.Visibility = Visibility.Collapsed;
+                btnScreenRecording.IsEnabled = true;
+
+                ImgUpload.Visibility = Visibility.Visible;
+                ImgUploadTwo.Visibility = Visibility.Collapsed;
+                btnUpload.IsEnabled = true;
+
+                ImgMyMine.Visibility = Visibility.Visible;
+                ImgMyMineTwo.Visibility = Visibility.Collapsed;
+                btnMyMine.IsEnabled = true;
+
+                ImgSetUp.Visibility = Visibility.Visible;
+                ImgSetUpTwo.Visibility = Visibility.Collapsed;
+                btnSetUp.IsEnabled = true;
+
+                btnLoginType.IsEnabled = true;
                 IsSuspendR = true;
                 ImgRecord.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_14.png"));
                 TxbRecordingWord.Text = "录制";
@@ -1057,10 +1339,25 @@ namespace XHWK.WKTool
                 Login();
                 return;
             }
-            APP.pageData.pagenum += 1;
-            APP.pageData.currpage = APP.pageData.pagenum;
-            myblackboard.changepage(APP.pageData.currpage - 1);
-            imgCanvas.Source = null;
+            if (APP.pageData.pagenum < 200)
+            {
+                if (APP.PageDrawList != null && APP.PageDrawList.Count > 0 && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null)
+                {
+                    APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
+                }
+                APP.pageData.pagenum += 1;
+                APP.pageData.currpage = APP.pageData.pagenum;
+                myblackboard.changepage(APP.pageData.currpage - 1);
+                imgCanvas.Source = null;
+                Model_DrawData model_DrawData = new Model_DrawData();
+                model_DrawData.PageNum = APP.pageData.currpage;
+                APP.PageDrawList.Add(model_DrawData);
+                APP.SaveDraw();//画板模型增加一页
+            }
+            else
+            {
+                System.Windows.Forms.MessageBox.Show("已达到最大页数无法继续增加！");
+            }
         }
         /// <summary>
         /// 打印事件
@@ -1083,23 +1380,24 @@ namespace XHWK.WKTool
 
 
             ////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.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 25, 25, 25, 25);
                 //iTextSharp.text.Rectangle page = new iTextSharp.text.Rectangle(iTextSharp.text.PageSize.A4., 250f);//cs
-                //设置纸张横向
-                document.SetPageSize(iTextSharp.text.PageSize.A4.Rotate());
+                ////设置纸张横向
+                //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++)
+                for (int i = 0; i < APP.PageDrawList.Count; i++)
                 {
-                    if (String.IsNullOrEmpty(ImgPDFPath[i])) break;
+                    if (String.IsNullOrEmpty(APP.PageDrawList[i].PdfImagePath)) break;
 
 
-                    image = iTextSharp.text.Image.GetInstance(ImgPDFPath[i]);
+                    image = iTextSharp.text.Image.GetInstance(APP.PageDrawList[i].PdfImagePath);
 
 
                     if (image.Height > iTextSharp.text.PageSize.A4.Height - 25)
@@ -1127,24 +1425,38 @@ namespace XHWK.WKTool
             }
             //document.Close();
             ////Console.ReadKey();
-
-            int pr = 1;
-            string msg = string.Empty;
-            string outPut = string.Empty;
-            LatticeFileHelper.GeneratingPDF(@"G:\101.pdf", @"G:\102.TPF", out pr, out msg, out outPut);
-            if (pr == 0)
+            if (APP.W_PrintWindow == null)
             {
-                outPut = outPut.Replace("[", "").Replace("]", "").Replace("\"", "").Trim();
-                APP.OutPut = outPut.Split(',');
-                string defa = string.Empty;
-                List<string> defaList = LatticeFileHelper.GetPrinterList(out defa);
+                APP.W_PrintWindow = new PrintWindow();
+                APP.W_PrintWindow.Topmost = true;
+                APP.W_PrintWindow.Owner = this;
+            }
+            if (APP.PageDrawList.Count > 0 && !string.IsNullOrWhiteSpace(APP.PageDrawList[0].PdfImagePath))
+            {
+                APP.W_PrintWindow.Initialize(APP.PageDrawList[0].PdfImagePath);
+            }
+            else
+            {
+                APP.W_PrintWindow.Initialize("");
+            }
+            APP.W_PrintWindow.Show();
+            //int pr = 1;
+            //string msg = string.Empty;
+            //string outPut = string.Empty;
+            //LatticeFileHelper.GeneratingPDF(@"G:\101.pdf", @"G:\102.TPF",out pr, out msg, out outPut);
+            //if(pr==0)
+            //{
+            //    outPut = outPut.Replace("[", "").Replace("]","").Replace("\"","").Trim();
+            //    APP.OutPut = outPut.Split(',');
+            //    string defa = string.Empty;
+            // List<string>defaList=   LatticeFileHelper.GetPrinterList(out defa);
 
-                int printResult = 1;
-                string standardError = string.Empty;
-                string standardOutput = string.Empty;
-                LatticeFileHelper.PrinterTPFFile(@"G:\102.TPF", 1, /*defa*/"导出为WPS PDF", out printResult, out standardError, out standardOutput);
+            //    int printResult = 1;
+            //    string standardError = string.Empty;
+            //    string standardOutput = string.Empty;
+            //    LatticeFileHelper.PrinterTPFFile(@"G:\102.TPF",1, /*defa*/"导出为WPS PDF", out printResult,out standardError,out standardOutput);
 
-            }
+            //}
         }
         /// <summary>
         /// 我的
@@ -1176,7 +1488,8 @@ namespace XHWK.WKTool
                         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;
+                        //ImgPDFPath[APP.pageData.currpage - 1] = filePathName;
+                        APP.PageDrawList[APP.pageData.currpage - 1].PdfImagePath = filePathName;
                     });
                 }
                 catch (Exception ex)
@@ -1184,22 +1497,45 @@ namespace XHWK.WKTool
                     LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(last_button_Click)生成图片错误:" + ex.Message, ex);
                 }
                 APP.pageData.currpage -= 1;
+
                 myblackboard.changepage(APP.pageData.currpage - 1);
-                if (APP.Paths.Length > 0)
+                if (APP.PageDrawList.Count > 0)
                 {
-                    if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.Paths.Length && APP.pageData.currpage > 0)
+                    if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null)
                     {
-                        imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));
+                        APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
+                    }
+                    if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage <= APP.PageDrawList.Count && APP.pageData.currpage > 0 && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
+                    {
+                        //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));//cs
+
+                        imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                        if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X > 0)
+                        {
+                            var group = IMG.FindResource("Imageview") as TransformGroup;
+                            var transform = group.Children[1] as TranslateTransform;
+                            //if (APP.PageDrawList[APP.pageData.currpage - 1].ImageSize != null)
+                            //{
+                            //    var transform1 = group.Children[0] as ScaleTransform;
+                            //    transform1.ScaleX = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX;
+                            //    transform1.ScaleY = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY;
+                            //}
+                            //var position = e.GetPosition(img);
+                            transform.X = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
+                            transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
+                            mouseDown = false;
+
+                        }
                     }
                     else
                     {
                         imgCanvas.Source = null;
                     }
                 }
-                if (!string.IsNullOrWhiteSpace(APP.JPaths[APP.pageData.currpage]))
-                {
-                    imgCanvas.Source = new BitmapImage(new Uri(APP.JPaths[APP.pageData.currpage]));
-                }
+                //if (!string.IsNullOrWhiteSpace(APP.JPaths[APP.pageData.currpage]))
+                //{
+                //    imgCanvas.Source = new BitmapImage(new Uri(APP.JPaths[APP.pageData.currpage]));
+                //}
             }
 
         }
@@ -1220,7 +1556,8 @@ namespace XHWK.WKTool
                         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;
+                        //ImgPDFPath[APP.pageData.currpage - 1] = filePathName;
+                        APP.PageDrawList[APP.pageData.currpage - 1].PdfImagePath = filePathName;
                     });
                 }
                 catch (Exception ex)
@@ -1229,22 +1566,44 @@ namespace XHWK.WKTool
                 }
                 APP.pageData.currpage += 1;
                 myblackboard.changepage(APP.pageData.currpage - 1);
-                if (APP.Paths.Length > 0)
+                if (APP.PageDrawList.Count > 0)
                 {
 
-                    if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage <= APP.Paths.Length)
+                    if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null)
+                    {
+                        APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
+                    }
+                    if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage <= APP.PageDrawList.Count && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
                     {
-                        imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));
+                        //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage-1]));
+                        imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                        if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X > 0)
+                        {
+                            var group = IMG.FindResource("Imageview") as TransformGroup;
+                            //if (APP.PageDrawList[APP.pageData.currpage - 1].ImageSize != null)
+                            //{
+                            //    var transform1 = group.Children[0] as ScaleTransform;
+                            //    transform1.ScaleX = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX;
+                            //    transform1.ScaleY = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY;
+                            //}
+                            var transform = group.Children[1] as TranslateTransform;
+                            //var position = e.GetPosition(img);
+                            transform.X = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
+                            transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
+
+
+                            mouseDown = false;
+                        }
                     }
                     else
                     {
                         imgCanvas.Source = null;
                     }
                 }
-                if (!string.IsNullOrWhiteSpace(APP.JPaths[APP.pageData.currpage]))
-                {
-                    imgCanvas.Source = new BitmapImage(new Uri(APP.JPaths[APP.pageData.currpage]));
-                }
+                //if (!string.IsNullOrWhiteSpace(APP.JPaths[APP.pageData.currpage]))
+                //{
+                //    imgCanvas.Source = new BitmapImage(new Uri(APP.JPaths[APP.pageData.currpage]));
+                //}
             }
         }
         /// <summary>
@@ -1375,18 +1734,31 @@ namespace XHWK.WKTool
                 Domousemove(img, e);
             }
         }
+        /// <summary>
+        /// x y轴
+        /// </summary>
+        /// <param name="img"></param>
+        /// <param name="e"></param>
         private void Domousemove(ContentControl img, System.Windows.Input.MouseEventArgs e)
         {
             if (e.LeftButton != MouseButtonState.Pressed)
             {
                 return;
             }
+            if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null && APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation)
+            {
+                return;
+            }
             var group = IMG.FindResource("Imageview") as TransformGroup;
             var transform = group.Children[1] as TranslateTransform;
             var position = e.GetPosition(img);
             transform.X -= mouseXY.X - position.X;
             transform.Y -= mouseXY.Y - position.Y;
             mouseXY = position;
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation = new TranslateTransform();
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X = transform.X;
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y = transform.Y;
+            //APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
         }
         private void IMG1_MouseWheel(object sender, MouseWheelEventArgs e)
         {
@@ -1416,6 +1788,14 @@ namespace XHWK.WKTool
             transform1.X = -1 * ((pointToContent.X * transform.ScaleX) - point.X);
             transform1.Y = -1 * ((pointToContent.Y * transform.ScaleY) - point.Y);
             //Console.WriteLine("transform.ScaleX = " + transform.ScaleX + "; transform.ScaleY = " + transform.ScaleY);
+
+            //APP.PageDrawList[APP.pageData.currpage - 1].ImageSize = new ScaleTransform();
+            //APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX = transform.ScaleX;
+            //APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY = transform.ScaleY;
+            //APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation = new TranslateTransform();
+            //APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X = transform1.X;
+            //APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y = transform1.Y;
+            //APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
         }
         #endregion
 
@@ -1514,6 +1894,60 @@ namespace XHWK.WKTool
                 //labPenSerial.Text = penSerial;
                 //labPenStatus.Text = "PenDown";
                 isPenDown = true;
+
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    for (int i = 0; i < APP.PageDrawList.Count; i++)
+                    {
+                        if (APP.PageDrawList[i].PageCode == penSerial)
+                        {
+                            if (i < APP.pageData.pagenum)
+                            {
+                                if (i < APP.pageData.currpage)
+                                {
+                                    int num = APP.pageData.currpage - i;
+                                    APP.pageData.currpage -= num;
+                                    myblackboard.changepage(APP.pageData.currpage - 1);
+                                    if (APP.PageDrawList.Count > 0)
+                                    {
+                                        if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage <= APP.PageDrawList.Count && APP.pageData.currpage > 0 && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
+                                        {
+                                            //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));//cs
+
+                                            imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                                        }
+                                        else
+                                        {
+                                            imgCanvas.Source = null;
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    int num = i - APP.pageData.currpage;
+                                    APP.pageData.currpage += num;
+                                    myblackboard.changepage(APP.pageData.currpage - 1);
+                                    if (APP.PageDrawList.Count > 0)
+                                    {
+
+                                        if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage <= APP.PageDrawList.Count && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
+                                        {
+                                            //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage-1]));
+                                            imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                                        }
+                                        else
+                                        {
+                                            imgCanvas.Source = null;
+                                        }
+                                    }
+                                }
+                            }
+                            return;
+                        }
+                    }
+                    //myblackboard.changepages(0, 0, true);
+                    //myblackboard.changepaget(0, 0, true, blackboard_canvas);
+                }));
             }
             //myblackboard.changepages(0, 0, true);
         }
@@ -1548,7 +1982,8 @@ namespace XHWK.WKTool
             }
             Dispatcher.Invoke(new Action(() =>
             {
-                myblackboard.changepages(0, 0, true);
+                //myblackboard.changepages(0, 0, true);
+                myblackboard.changepages(0, 0, true, Color, Size);
             }));
 
         }
@@ -1685,7 +2120,8 @@ namespace XHWK.WKTool
 
                 Dispatcher.Invoke(new Action(() =>
                 {
-                    myblackboard.changepages(testX, testY, false);
+                    //myblackboard.changepages(testX, testY,false);
+                    myblackboard.changepages(testX, testY, false, Color, Size);
                 }));
 
 
@@ -1765,5 +2201,16 @@ namespace XHWK.WKTool
             else
                 Visibility = Visibility.Hidden;
         }
+        /// <summary>
+        /// 位置确定
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnOk_Click(object sender, RoutedEventArgs e) 
+        {
+            //APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
+            //btnOk.Visibility = Visibility.Collapsed;
+            //blackboard_canvas.Visibility = Visibility.Visible;
+        }
     }
 }

XHWK.WKTool/XHWK.WKTool.csproj

@@ -140,6 +140,9 @@
     <Compile Include="PracticeWindow.xaml.cs">
       <DependentUpon>PracticeWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="PrintWindow.xaml.cs">
+      <DependentUpon>PrintWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ScreenRecordingToolbarWindow.xaml.cs">
       <DependentUpon>ScreenRecordingToolbarWindow.xaml</DependentUpon>
     </Compile>
@@ -170,6 +173,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="PrintWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>