笔迹 导入清晰度 优化功能

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,72 +331,93 @@ namespace Common.system
         StylusPointCollection stylusPoints = new StylusPointCollection();
         StylusPoint stylusPoint = new StylusPoint();
         Stroke stroke;
-        public void changepages(double _x, double _y, bool _new)
-        {
-            if (_new)
-            {
-                if(stroke!=null&&stroke.StylusPoints.Count > 1)
-                {
-                    m_canvas.Strokes.Add(stroke);
-                }
-            
-                stylusPoints = new StylusPointCollection();
-                stylusPoint = new StylusPoint();
-                //stroke = new Stroke(stylusPoints);
-                stroke=null;
-            }
-            else
-            {
-                //stylusPoints = new StylusPointCollection();
-                //stylusPoint = new StylusPoint();
-                stylusPoint.X = _x;
-                stylusPoint.Y = _y;
-                stylusPoints.Add(stylusPoint);
-                stroke = new Stroke(stylusPoints);
-            }
-           
+        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;
+        //        }
 
-            //page.lines.Last().lines_curr.Add();
-            //if (stroke.StylusPoints.Count > 20)
-            //{
-              
-            
+        //        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);
+        //        }
+        //    }
+        //}
 
 
 
-        }
-        //声明一个 DrawingAttributes 类型的变量  
-        DrawingAttributes drawingAttributes;
-        public void changepaget(double _x, double _y, bool _new,InkCanvas canvas) 
+
+
+
+
+
+
+
+
+
+
+
+
+
+        public void changepages(double _x, double _y, bool _new, Color _color, int _size)
         {
             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 = new DrawingAttributes();
+                    //m_canvas.DefaultDrawingAttributes = drawingAttributes;
+                    drawingAttributes.Color = _color;
+                    drawingAttributes.Width = _size*5;
+                    drawingAttributes.Height = _size*5;
                     drawingAttributes.FitToCurve = true;
                     drawingAttributes.IgnorePressure = false;
-                
-                    canvas.Strokes.Add(stroke);
-                    canvas.DefaultDrawingAttributes = drawingAttributes;
-                    ZBBPage page = strokes_page_all[pagenum];
-                    if (page != null)
-                    {
-                        step.lines_curr.Add(m_canvas.Strokes);
-                        page.lines.Add(step);
-                        step = null;
-                    }
+
+                    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
             {
@@ -395,21 +427,65 @@ namespace Common.system
                 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)
-            //{
-
-
-
-
-
         }
+        ////声明一个 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

@@ -18,5 +18,7 @@
     <add key="userName" value="" />
     <!--记住密码-->
     <add key="isRemind" value="" />
+    <!--摄像头位置 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>
         /// 点阵笔
@@ -108,6 +112,7 @@ namespace XHWK.WKTool
         /// 批注
         /// </summary>
         public static PracticeWindow W_PracticeWindow = 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

@@ -76,8 +76,8 @@ namespace XHWK.WKTool
             //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

XHWK.WKTool/PrintWindow.xaml

@@ -11,26 +11,34 @@
     WindowStyle="None">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="102"/>
+            <RowDefinition Height="120"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="80"/>
         </Grid.RowDefinitions>
-        <Grid Grid.Row="0" Background="#E6EAF0">
+        <Grid Grid.Row="0" Background="#E6EAF0" MouseLeftButtonDown="Window_MouseLeftButtonDown">
             <Grid.RowDefinitions>
                 <RowDefinition Height="auto"/>
-                <RowDefinition Height="auto"/>
-                <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"/>
-                <TextBox Width="100"/>
+                <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" Background="#CC4848" Foreground="#FFFFFF" Content="×" FontSize="20" Width="30" Height="30" HorizontalAlignment="Right" Margin="0,0,20,0">
+            <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,10,0,0">
+            <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"
@@ -38,14 +46,13 @@
                                 BorderThickness="0"
                                 DisplayMemberPath="Value"
                                 FontSize="14"
-                                ItemsSource="{Binding bookList}"
                                 SelectedValuePath="Key"
-                                SelectionChanged="cmbClass_SelectionChanged" />
-                <TextBlock Text="点型：" FontSize="20"  Margin="120,0,0,0"/>
-                <RadioButton Content="方点" FontSize="16" IsChecked="True" Margin="0,5,0,0"/>
-                <RadioButton Content="圆点" FontSize="16" IsChecked="True" Margin="0,5,0,0"/>
+                                />
+                <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,10,20,0"  Width="30" Height="30"/>
+            <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"/>

XHWK.WKTool/PrintWindow.xaml.cs

@@ -9,6 +9,7 @@ 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;
@@ -25,6 +26,7 @@ namespace XHWK.WKTool
         /// 下拉框数据源
         /// </summary>
         public DataTable data = new DataTable();
+        private DataTable dtComponentsUniqueNo;
         public PrintWindow()
         {
             InitializeComponent();
@@ -43,23 +45,17 @@ namespace XHWK.WKTool
                     data.Rows[i]["Value"] = defaList[i];
                     data.Rows[i]["Key"] = i.ToString();
                 }
-                //dtComponentsUniqueNo = data.DefaultView.ToTable();
-                //cmbClass.ItemsSource = dtComponentsUniqueNo.DefaultView;
+                dtComponentsUniqueNo = data.DefaultView.ToTable();
+                cmbClass.ItemsSource = dtComponentsUniqueNo.DefaultView;
                 cmbClass.SelectedIndex = 0;
             }
         }
         public void Initialize(string _imgPath)
         {
-         
-        }
-        /// <summary>
-        /// 打印机下拉框改变事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void cmbClass_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-
+         if(!string.IsNullOrWhiteSpace(_imgPath))
+            {
+                imgPri.Source = new BitmapImage(new Uri(_imgPath));
+            }
         }
         /// <summary>
         /// 打印
@@ -68,21 +64,102 @@ namespace XHWK.WKTool
         /// <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;
-            LatticeFileHelper.GeneratingPDF(@"G:\101.pdf", @"G:\102.TPF", out pr, out msg, out outPut);
+            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 defa = string.Empty;
-                List<string> defaList = LatticeFileHelper.GetPrinterList(out defa);
+                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;
-                LatticeFileHelper.PrinterTPFFile(@"G:\102.TPF", 1, /*defa*/"导出为WPS PDF", out printResult, out standardError, out standardOutput);
+                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/XHWK.WKTool.csproj

@@ -135,6 +135,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>
@@ -165,6 +168,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>