zhao：解决冲突

XHWK.Model/Model_Page.cs

@@ -14,7 +14,7 @@ namespace XHWK.Model
         /// <summary>
         /// 总页码
         /// </summary>
-        private int _pagenum = 1;
+        private int _pagenum = 0;
 
         /// <summary>
         /// 总页码
@@ -28,7 +28,7 @@ namespace XHWK.Model
         /// <summary>
         /// 当前页 从1开始
         /// </summary>
-        private int _currpage = 1;// 从1开始
+        private int _currpage = 0;// 从1开始
 
         /// <summary>
         /// 当前页 从1开始

XHWK.WKTool/App.cs

@@ -123,7 +123,14 @@ namespace XHWK.WKTool
         /// 我的视频
         /// </summary>
         public static FileDirectoryWindow fileDirectoryWindow = null;
+        /// <summary>
+        /// 打印
+        /// </summary>
         public static PrintWindow W_PrintWindow = null;
+        /// <summary>
+        /// 提示窗口
+        /// </summary>
+        public static PromptWindow W_PromptWindow = null;
         #endregion
         #endregion
 

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -94,8 +94,8 @@ namespace XHWK.WKTool
                 pageData.menuList.Add(new FileDirectoryModel()
                 {
                     SerialNumber = i,
-                    VideoName = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace("AVI", "").Trim(),
-                    Name = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace("AVI", "").Trim(),
+                    VideoName = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
+                    Name = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace(".AVI", "").Trim(),
                     FilePath = videoinfo.VideoPath.Replace(FileToolsCommon.GetIOFileName(videoinfo.VideoPath), "").Trim(),
                     VideoDuration = 0,
                     VideoSize = videoinfo.VideoSize,
@@ -202,12 +202,22 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnDelete_Click(object sender, RoutedEventArgs e)
         {
+        
             pageData.menuList[Subscript].IsEnabled = false;
             List<Button> buttons = FindChilds<Button>(listView1, "btnDelete");
             for (int i = 0; i < buttons.Count; i++)
             {
                 if (buttons[i] == sender)
                 {
+
+                    //if (APP.W_PromptWindow == null)
+                    //{
+                    //    APP.W_PromptWindow = new PromptWindow();
+                    //    APP.W_PromptWindow.Owner = this;
+                    //}
+                    //APP.W_PromptWindow.Initialize(pageData.menuList[i].VideoName);
+                    //APP.W_PromptWindow.ShowDialog();
+
                     foreach (Model_WKData wKData in APP.WKDataList)
                     {
                         if (wKData.VideoList == null)

XHWK.WKTool/PrintWindow.xaml

@@ -5,7 +5,7 @@
         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"
+        Title="PrintWindow" Height="600" Width="900" AllowsTransparency="True"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
     WindowStyle="None">
@@ -25,14 +25,14 @@
             <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" />
+                <TextBlock x:Name="txbNumberOfCopies" Width="100" Text="1" FontSize="16" Padding="50,10,0,0" Background="White" />
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto"/>
                         <RowDefinition Height="auto"/>
                     </Grid.RowDefinitions>
-                    <Button Grid.Row="0" x:Name="btnLess" Content="-" Click="BtnLess_Click"/>
-                    <Button Grid.Row="1" x:Name="btnAdd" Content="+" Click="BtnAdd_Click"/>
+                    <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">

XHWK.WKTool/PrintWindow.xaml.cs

@@ -102,7 +102,7 @@ namespace XHWK.WKTool
                 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);
+                    LatticeFileHelper.PrinterTPFFile(tpf, 1, cmbClass.Text, out printResult, out standardError, out standardOutput);
                 }
                 if(printResult==0)// 0为成功
                 {

XHWK.WKTool/PromptWindow.xaml

@@ -0,0 +1,33 @@
+<Window x:Class="XHWK.WKTool.PromptWindow"
+        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="PromptWindow" Height="210" Width="553" WindowStartupLocation="CenterOwner"
+    WindowStyle="None" AllowsTransparency="True"    WindowState="Normal"
+    ShowInTaskbar="True"   ResizeMode="NoResize"
+  >
+    <Grid Background="#FFFFFF">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="auto"/>
+        </Grid.RowDefinitions>
+        <TextBlock Grid.Row="0" Text="确定删除" FontSize="24" Margin="25,26,0,0"/>
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="25,36,0,0">
+            <TextBlock Text="删除" FontSize="18" Foreground="#919191" />
+            <TextBlock x:Name="txbName" Text="微课01" FontSize="18" Foreground="#919191"/>
+        </StackPanel>
+       
+        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,30,0,0">
+            <Border x:Name="borCancel" Background="#E5E5E5" CornerRadius="6" >
+                <Button x:Name="btnCancel" Width="104" Height="42" Content="取消" FontSize="18" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="Transparent"/>
+            </Border>
+            <Border Background="#E5E5E5" CornerRadius="6" Margin="30,0,20,0">
+                <Button Width="104" Height="42" Content="确定" FontSize="18" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="Transparent"/>
+            </Border>
+        </StackPanel>
+    </Grid>
+</Window>

XHWK.WKTool/PromptWindow.xaml.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+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.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace XHWK.WKTool
+{
+    /// <summary>
+    /// PromptWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class PromptWindow : Window
+    {
+        public PromptWindow()
+        {
+            InitializeComponent();
+        }
+        public void Initialize(string _name)
+        {
+            txbName.Text = _name;
+        }
+        private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            System.Windows.Rect r = new System.Windows.Rect(e.NewSize);
+            RectangleGeometry gm = new RectangleGeometry(r, 1, 1);
+            ((UIElement)sender).Clip = gm;
+        }
+
+        private void Window_SizeChanged_1(object sender, SizeChangedEventArgs e)
+        {
+
+        }
+
+        private void Window_SizeChanged1(object sender, SizeChangedEventArgs e)
+        {
+
+        }
+    }
+}

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -7,17 +7,17 @@
         xmlns:aforge ="clr-namespace:AForge.Controls;assembly=AForge.Controls"
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
-        Title="星火微课系统" Height="1040.8" Width="875" WindowStartupLocation="CenterScreen"
+        Title="星火微课系统" Height="725.8" Width="975" WindowStartupLocation="CenterScreen"
     WindowStyle="None"    AllowsTransparency="True"  Background="#EFF1F8" ShowInTaskbar="True"
    >
     
     <Viewbox>
-        <Grid Height="1040.8" Width="875">
+        <Grid Height="725.8" Width="975">
             <!--分3行-->
             <Grid.RowDefinitions>
-                <RowDefinition Height="94"/>
+                <RowDefinition Height="110"/>
                 <RowDefinition Height="*"/>
-                <RowDefinition Height="30"/>
+                <RowDefinition Height="40"/>
             </Grid.RowDefinitions>
             <Grid Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Margin="0,0,0,0">
                 <Grid.RowDefinitions>
@@ -47,40 +47,40 @@
                     </Button>
                 </StackPanel>
                 <!--第二行-->
-                <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,2,0,0">
+                <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,6,0,0">
                     <Button Cursor="Hand" x:Name="btnScreenRecording" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnScreenRecording_Click">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgScreenRecording" Source="./Images/microLessonSystem_2.png"/>
                             <Image x:Name="ImgScreenRecordingTwo" Source="./Images/microLessonSystem_3.png" Visibility="Collapsed"/>
-                            <TextBlock x:Name="TxbRecordScreenWord" Text="录屏" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                            <TextBlock x:Name="TxbRecordScreenWord" Text="录屏" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
                     <Button Cursor="Hand" x:Name="btnScreenshot" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="30,0,30,0" Click="BtnScreenshot_Click">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgScreenshot" Source="./Images/microLessonSystem_12.png"/>
                             <Image x:Name="ImgScreenshotTwo" Source="./Images/microLessonSystem_11.png" Visibility="Collapsed"/>
-                            <TextBlock Text="截图" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                            <TextBlock Text="截图" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
                     <Button Cursor="Hand" x:Name="btnImport" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnImport_Click">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgImport" Source="./Images/microLessonSystem_6.png"/>
                             <Image x:Name="ImgImportTwo" Source="./Images/microLessonSystem_7.png" Visibility="Collapsed"/>
-                            <TextBlock Text="导入" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                            <TextBlock Text="导入" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
                     <Button Cursor="Hand" x:Name="BtnRecord" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="60,0,30,0" Click="BtnRecord_Click">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgRecord" Source="./Images/microLessonSystem_14.png"/>
                             <Image x:Name="ImgRecordTwo" Source="./Images/microLessonSystem_13.png" Visibility="Collapsed"/>
-                            <TextBlock x:Name="TxbRecordingWord" Text="录制" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                            <TextBlock x:Name="TxbRecordingWord" Text="录制" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
                     <Button Cursor="Hand" x:Name="btnStop" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnStop_Click">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgStop" Source="./Images/microLessonSystem_21.png"/>
                             <Image x:Name="ImgStopTwo" Source="./Images/microLessonSystem_20.png" Visibility="Collapsed"/>
-                            <TextBlock Text="停止" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                            <TextBlock Text="停止" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
                 </StackPanel>
@@ -89,152 +89,156 @@
                         <StackPanel Orientation="Vertical">
                             <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"/>
+                            <TextBlock Text="增加" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
                     <Button Cursor="Hand" x:Name="btnPrint" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="30,0,30,0" Click="BtnPrint_Click">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgPrint" Source="./Images/microLessonSystem_4.png" Visibility="Collapsed"/>
                             <Image x:Name="ImgPrintTwo" Source="./Images/microLessonSystem_5.png" Visibility="Visible"/>
-                            <TextBlock Text="打印" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                            <TextBlock Text="打印" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </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_15.png" Visibility="Collapsed"/>
                             <Image x:Name="ImgUploadTwo" Source="./Images/microLessonSystem_16.png" Visibility="Visible"/>
-                            <TextBlock Text="上传" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                            <TextBlock Text="上传" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
-                    <Button Cursor="Hand" x:Name="btnSetUp" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnSetUp_Click">
+                    <Button Cursor="Hand" x:Name="btnSetUp" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="30,0,0,0" Click="BtnSetUp_Click">
                         <StackPanel Orientation="Vertical">
                             <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"/>
+                            <TextBlock Text="设置" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
                 </StackPanel>
             </Grid>
             <!--主内容-->
-            <Grid Grid.Row="1" x:Name="GridMain"  Margin="0,0,0,0" Background="#FFFFFF" Width="635" Height="914" Visibility="Visible">
-                <Label Content="" Grid.Column="0" Height="1" Width="1" Background="#FF0F0F0F" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="1,0,0,0"/>
-                <Grid>
-                    <Border Grid.Row="1"  CornerRadius="5">
-                        <Grid x:Name="IMG" Margin="0,0,0,0">
-                            <Grid.Resources>
-                                <TransformGroup x:Key="Imageview">
-                                    <ScaleTransform/>
-                                    <TranslateTransform/>
-                                </TransformGroup>
-                                </Grid.Resources>
-                                <Label Content="" Grid.Column="0" HorizontalAlignment="Left" Height="1" VerticalAlignment="Top" Width="1" Background="#FF0F0F0F" Margin="1,0,0,0"/>
-                                <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled"   Cursor="SizeAll"
+            <Grid Grid.Row="1" x:Name="GridMain" Width="793.700787401575">
+                <ScrollViewer x:Name="scroMain" Height="580" VerticalScrollBarVisibility="Visible">
+                    <Grid x:Name="gridM"  Margin="0,0,0,0" Background="#FFFFFF" Width="793.700787401575" Height="1142.51968503937" Visibility="Visible">
+                        <Grid>
+                            <Border Grid.Row="1"  CornerRadius="5">
+                                <Grid x:Name="IMG" Margin="0,0,0,0">
+                                    <Grid.Resources>
+                                        <TransformGroup x:Key="Imageview">
+                                            <ScaleTransform/>
+                                            <TranslateTransform/>
+                                        </TransformGroup>
+                                    </Grid.Resources>
+                               
+                                    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled"   Cursor="SizeAll"
                   Margin="0,0,0,0" Focusable="False" x:Name="BackFrame">
-                                <ContentControl  MouseLeftButtonDown="IMG1_MouseLeftButtonDown"   
+                                        <ContentControl  MouseLeftButtonDown="IMG1_MouseLeftButtonDown"   
                              MouseLeftButtonUp="IMG1_MouseLeftButtonUp"
                              MouseMove="IMG1_MouseMove"
                              MouseWheel="IMG1_MouseWheel" >
-                                    <Image Name="imgCanvas" Width="635" Height="auto" Stretch="Uniform" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}">
-                                    </Image>
-                                </ContentControl>
-                            </ScrollViewer>
+                                            <Image Name="imgCanvas" Width="635" Height="auto" Stretch="Uniform" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}">
+                                            </Image>
+                                        </ContentControl>
+                                    </ScrollViewer>
+                                </Grid>
+                            </Border>
                         </Grid>
-                    </Border>
-                </Grid>
-                <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">
+                        <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>-->
+             
+
+                    
+       
+                    </Grid>
+                </ScrollViewer>
                 <Image x:Name="imgPlayerLeft" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Left"  Margin="10,7,10,10" VerticalAlignment="Top" Visibility="Collapsed"/>
-                <Image x:Name="imgPlayerRight" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Right"  Margin="10,7,10,10" VerticalAlignment="Top" Visibility="Collapsed"/>
+                <Image x:Name="imgPlayerRight" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Right"  Margin="10,7,26,10" VerticalAlignment="Top" Visibility="Collapsed"/>
                 <Image x:Name="imgPlayerLeftUnder" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Left"  Margin="10,7,10,10" VerticalAlignment="Bottom" Visibility="Collapsed"/>
-                <Image x:Name="imgPlayerRightUnder" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Right" Margin="10,7,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">
+                <Image x:Name="imgPlayerRightUnder" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Right" Margin="10,7,26,10" VerticalAlignment="Bottom" Visibility="Collapsed"/>
+                <Label Content="" Grid.Column="0" HorizontalAlignment="Left" Height="10" VerticalAlignment="Top" Width="10" Background="#FF0F0F0F" Margin="1,0,0,0"/>
+                <Label Content="" Grid.Column="1" Height="10" Width="10" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,16,0"/>
+                <Label Content="" Grid.Column="0" Height="10" Width="10" Background="#FF0F0F0F" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="1,0,0,0"/>
+                <Label Content="" Grid.Column="1" Height="10" Width="10" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,0"/>
+            </Grid>
+           
+            <Grid Grid.Row="1">
+                <StackPanel Grid.Row="0" Orientation="Horizontal" Background="#FFFFFF" Width="180" HorizontalAlignment="Center"
+            Height="58" Margin="0,520,0,0" Grid.Column="1">
                     <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                     x:Name="last_button"
-                    Width="60"
+                    Width="60" Height="50"
                     Click="last_button_Click">
                         <Button.Content>
                             <StackPanel>
                                 <Image Width="16" Source=".\Images\class_p1.png" />
-                                <TextBlock Margin="0,8,0,0" Text="上一页" />
                             </StackPanel>
                         </Button.Content>
                     </Button>
-                    <Grid Width="60">
+                    <Grid Width="60"  Background="Transparent">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="311*"/>
                             <RowDefinition Height="483*"/>
                         </Grid.RowDefinitions>
-                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,-25,0,0" Grid.Row="1" >
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,-25,0,0" Grid.Row="1"  Background="Transparent">
 
-                            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal"  Background="Transparent">
                                 <TextBlock x:Name="txbCurrpage" Text="{Binding currpage}" TextAlignment="Center" FontSize="15"/>
                                 <TextBlock Text="/" TextAlignment="Center" FontSize="15"/>
                                 <TextBlock Text="{Binding pagenum}" TextAlignment="Center" FontSize="15"/>
                             </StackPanel>
-
-                            <TextBlock
-                            Margin="0,8,0,0"
-                            HorizontalAlignment="Center"
-                            Text="页码" />
                         </StackPanel>
                     </Grid>
                     <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                    x:Name="next_btn"
-                    Width="60"
+                    x:Name="next_btn"  Background="Transparent"
+                    Width="60" Height="50"
                     Click="next_btn_Click">
                         <Button.Content>
                             <StackPanel>
                                 <Image Width="16" Source=".\Images\class_p2.png" />
-                                <TextBlock Margin="0,8,0,0" Text="下一页" />
                             </StackPanel>
                         </Button.Content>
                     </Button>
                 </StackPanel>
-
-                <Label Content="" Grid.Column="1" Height="1" Width="1" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,2,0"/>
-                <Label Content="" Grid.Column="1" Height="1" Width="1" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,2,0"/>
             </Grid>
             <!--设置-->
             <Grid Grid.Row="1" x:Name="gridSetUp" Margin="20,0,20,0" Background="#FFFFFF" Visibility="Collapsed">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="120"/>
-                    <RowDefinition Height="90"/>
-                    <RowDefinition Height="90"/>
-                    <RowDefinition Height="80"/>
-                    <RowDefinition Height="80"/>
-                    <RowDefinition Height="90"/>
                     <RowDefinition Height="90"/>
+                    <RowDefinition Height="70"/>
+                    <RowDefinition Height="70"/>
+                    <RowDefinition Height="70"/>
+                    <RowDefinition Height="70"/>
+                    <RowDefinition Height="70"/>
+                    <RowDefinition Height="70"/>
                     <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
-                <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,30,0,0">
+                <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,30,0,0">
                     <TextBlock Text="   点阵笔" FontSize="16" Foreground="#2D8CF0"/>
                     <TextBlock x:Name="txbNotConnecteds"  Text="未连接" FontSize="14" Foreground="#333333" Padding="10,0,0,0"/>
                 </StackPanel>
-                <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Left">
+                <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,0,0,0">
                     <TextBlock Text="视频格式" FontSize="16" Foreground="#2D8CF0"/>
                     <RadioButton x:Name="rbnMP4" Cursor="Hand" Content="MP4" FontSize="14" Foreground="#333333" Margin="10,2,0,0" IsChecked="True"/>
                     <RadioButton x:Name="rbnFLV" Cursor="Hand" Content="FLV" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
                     <RadioButton x:Name="rbnAVI" Cursor="Hand" Content="AVI" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
                 </StackPanel>
-                <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Left">
+                <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,0,0,0">
                     <TextBlock Text="头像位置" FontSize="16" Foreground="#2D8CF0"/>
                     <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">
+                <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,0,0,0">
                     <TextBlock Text="视频声音" FontSize="16" Foreground="#2D8CF0"/>
                     <RadioButton x:Name="rbnY" Cursor="Hand" Content="有" FontSize="14" Foreground="#333333" Margin="10,2,0,0" IsChecked="True"/>
                     <RadioButton x:Name="rbnN" Cursor="Hand" Content="无" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
                 </StackPanel>
-                <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Left">
+                <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,0,0,0">
                     <TextBlock x:Name="txbFilePath" Text="文件路径" FontSize="16" Foreground="#2D8CF0" Padding="2,36,10,0"/>
                     <!--输入框-->
                     <Border Background="#CDD6E0" Width="525" Height="43" CornerRadius="3">
@@ -258,11 +262,11 @@
                         </Button.Template>
                     </Button>
                 </StackPanel>
-                <StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,30,0,0">
+                <StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,30,0,0">
                     <TextBlock Text="    版本号" FontSize="16" Foreground="#2D8CF0"/>
                     <TextBlock Text="V0.0.0" FontSize="16" Foreground="#333333" Padding="10,0,0,0"/>
                 </StackPanel>
-                <StackPanel Grid.Row="6" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,30,0,0">
+                <StackPanel Grid.Row="6" Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,30,0,0">
                     <TextBlock Text="版权所有" FontSize="16" Foreground="#2D8CF0"/>
                     <TextBlock Text="河南星火燎原软件科技有限公司" FontSize="14" Foreground="#333333" Padding="10,0,0,0"/>
                 </StackPanel>
@@ -284,26 +288,26 @@
                     </Button.Template>
                 </Button>
             </Grid>
-            <Grid Grid.Row="2" Background="#EFF1F8">
-                <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
-                    <TextBlock Text="颜色：" FontSize="14" Padding="5,5,0,0"/>
-                    <Button Cursor="Hand" x:Name="btnWhite" Background="#FFFFFF" Width="20" Height="20" Click="BtnWhite_Click"/>
-                    <Button Cursor="Hand" x:Name="btnRed" Background="#FF0000" Width="20" Height="20" Margin="5,0,0,0" Click="BtnRed_Click"/>
-                    <Button Cursor="Hand" x:Name="btnGray" Background="#A7A9AC" Width="20" Height="20" Margin="5,0,0,0" Click="BtnGray_Click"/>
-                    <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="5,0,0,0" Click="BtnCyanBlue_Click"/>
-                    <Button Cursor="Hand" x:Name="btnYellow" Background="#FFBC00" Width="20" Height="20" Margin="5,0,0,0" Click="BtnYellow_Click"/>
-                    <Button Cursor="Hand" x:Name="btnBlue" Background="#00B4FC" Width="20" Height="20" Margin="5,0,0,0" Click="BtnBlue_Click"/>
-                    <TextBlock Text="粗细：" FontSize="14" Padding="15,5,0,0" Margin="5,0,0,0"/>
-                    <RadioButton Cursor="Hand" x:Name="rbnFine" Content="细" FontSize="14" Margin="0,5,0,0" IsChecked="True" Click="RbnFine_Click"/>
-                    <RadioButton Cursor="Hand" x:Name="rbnIn" Content="中" FontSize="14" Margin="5,5,0,0" Click="RbnIn_Click"/>
-                    <RadioButton Cursor="Hand" x:Name="rbnCrude" Content="粗" FontSize="14" Margin="5,5,0,0" Click="RbnCrude_Click"/>
+            <Grid Grid.Row="2" Background="#EFF1F8" Margin="0,2,0,0">
+                <StackPanel Orientation="Horizontal" Margin="0,0,0,0">
+                    <TextBlock Text="颜色：" FontSize="14" Padding="10,10,0,0"/>
+                    <Button Cursor="Hand" x:Name="btnWhite" Background="#FFFFFF" Width="20" Height="20" Click="BtnWhite_Click" Margin="0,2,0,0"/>
+                    <Button Cursor="Hand" x:Name="btnRed" Background="#FF0000" Width="20" Height="20" Margin="5,2,0,0" Click="BtnRed_Click"/>
+                    <Button Cursor="Hand" x:Name="btnGray" Background="#A7A9AC" Width="20" Height="20" Margin="5,2,0,0" Click="BtnGray_Click"/>
+                    <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="5,2,0,0" Click="BtnCyanBlue_Click"/>
+                    <Button Cursor="Hand" x:Name="btnYellow" Background="#FFBC00" Width="20" Height="20" Margin="5,2,0,0" Click="BtnYellow_Click"/>
+                    <Button Cursor="Hand" x:Name="btnBlue" Background="#00B4FC" Width="20" Height="20" Margin="5,2,0,0" Click="BtnBlue_Click"/>
+                    <TextBlock Text="粗细：" FontSize="14" Padding="15,5,0,0" Margin="5,5,0,0"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnFine" Content="细" FontSize="14" Margin="0,10,0,0" IsChecked="True" Click="RbnFine_Click"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnIn" Content="中" FontSize="14" Margin="5,10,0,0" Click="RbnIn_Click"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnCrude" Content="粗" FontSize="14" Margin="5,10,0,0" Click="RbnCrude_Click"/>
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="摄像头：" FontSize="14" Padding="15,5,0,0"/>
-                        <RadioButton Cursor="Hand" x:Name="rbnOpen" Content="开" FontSize="14" Margin="0,5,0,0" Click="RbnOpen_Click"/>
-                        <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content="关" FontSize="14" Margin="5,5,0,0" IsChecked="True" Click="RbnTurnOff_Click"/>
+                        <TextBlock Text="摄像头：" FontSize="14" Padding="15,10,0,0"/>
+                        <RadioButton Cursor="Hand" x:Name="rbnOpen" Content="开" FontSize="14" Margin="0,10,0,0" Click="RbnOpen_Click"/>
+                        <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content="关" FontSize="14" Margin="5,10,0,0" IsChecked="True" Click="RbnTurnOff_Click"/>
                     </StackPanel>
                 </StackPanel>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,5,5,0">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,5,10,0">
                     <TextBlock Text="智能笔状态：" FontSize="14" Padding="0,5,0,0"/>
                     <TextBlock x:Name="txbNotConnected" Text="未连接" FontSize="14" Padding="0,5,5,0"/>
                 </StackPanel>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -73,8 +73,8 @@ namespace XHWK.WKTool
             btnPrint.IsEnabled = false;
 
             myblackboard = new BlackboardNew(blackboard_canvas);
-            APP.pageData.pagenum = 1;
-            APP.pageData.currpage = 1;
+            APP.pageData.pagenum = 0;
+            APP.pageData.currpage = 0;
             DataContext = APP.pageData;
 
             //APP.SaveDraw();//画板模型第一页初始化
@@ -101,6 +101,13 @@ namespace XHWK.WKTool
         /// </summary>
         public void Initialize()
         {
+            #region 数据初始化
+            APP.pageData.pagenum = 0;
+            APP.pageData.currpage = APP.pageData.pagenum;
+            #endregion
+
+
+
             APP.CameraPosition = FileToolsCommon.GetConfigValue("CameraPosition");
             //创建 DrawingAttributes 类的一个实例  
             drawingAttributes = new DrawingAttributes();
@@ -383,7 +390,6 @@ namespace XHWK.WKTool
                         Thread.Sleep(100);
                     }
                     System.Environment.Exit(0);
-
                 }
                 else
                 {
@@ -709,8 +715,11 @@ namespace XHWK.WKTool
             {
                 if (!string.IsNullOrWhiteSpace(APP.ImgPath) && File.Exists(APP.ImgPath))
                 {
-                    //APP.JPaths[APP.pageData.currpage]= APP.ImgPath;
-                    //APP.JPaths[APP.pageData.currpage] = APP.ImgPath;
+                    if(APP.pageData.currpage==0)
+                    {
+                        APP.pageData.pagenum += 1;
+                        APP.pageData.currpage = APP.pageData.pagenum;
+                    }
                     if (APP.PageDrawList.Count >= APP.pageData.currpage)
                     {
                         APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath = APP.ImgPath;//zxycs
@@ -857,31 +866,23 @@ namespace XHWK.WKTool
                                 }
                             }
                             #endregion
-
-                            //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++)//给画板模型加图片路径
+                            int num = 0;
+                            for (int i = 0 + APP.pageData.pagenum; i < page.Length + APP.pageData.pagenum; 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].PageImagePath = page[i - APP.pageData.pagenum]; //zxycs
+                                    APP.PageDrawList[i].PdfImagePath = page[i - APP.pageData.pagenum];
                                     APP.PageDrawList[i].PageNum = i + 1;
                                     APP.PageDrawList[i].ImgDocumentation = true;
                                 }
                                 else
                                 {
-                                 
+
                                     Model_DrawData model_DrawData = new Model_DrawData();
-                                    model_DrawData.PageImagePath = page[i];
-                                    model_DrawData.PdfImagePath = page[i];
+                                    model_DrawData.PageImagePath = page[i - APP.pageData.pagenum];
+                                    model_DrawData.PdfImagePath = page[i - APP.pageData.pagenum];
                                     model_DrawData.PageNum = i + 1;
                                     model_DrawData.ImgDocumentation = true;
                                     APP.PageDrawList.Add(model_DrawData);
@@ -890,28 +891,29 @@ namespace XHWK.WKTool
                                 ImgPrintTwo.Visibility = Visibility.Collapsed;
                                 btnPrint.IsEnabled = true;
                                 APP.SaveDraw();
+                                num++;
                             }
-                            myblackboard.clear();
-                            APP.pageData.pagenum = 1;
-                            APP.pageData.currpage = 1;
-                            for (int i = 0; i < APP.PageDrawList.Count; i++)
+                            if (num > 0)
                             {
-                                APP.pageData.pagenum += 1;
+                                APP.pageData.currpage = APP.pageData.pagenum + 1;
+                                APP.pageData.pagenum += num;
                             }
-                            if (APP.pageData.pagenum > 1)
+                            if (APP.pageData.currpage > 0 && APP.pageData.currpage < APP.PageDrawList.Count)
                             {
-                                APP.pageData.pagenum -= 1;
-                            }
-                            if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.PageDrawList.Count)
-                            {
-                                //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));//cs
                                 imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
                                 imgCanvas.Source = null;
+                                ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
+                                ImgScreenshotTwo.Visibility = Visibility.Visible;
+                                btnScreenshot.IsEnabled = false;
                             }
                             else
                             {
                                 imgDocumentation.Source = null;
                                 imgCanvas.Source = null;
+                                ///截图可用
+                                ImgScreenshot.Visibility = Visibility.Visible;
+                                ImgScreenshotTwo.Visibility = Visibility.Collapsed;
+                                btnScreenshot.IsEnabled = true;
                             }
                         }
                         catch (Exception ex)
@@ -925,19 +927,13 @@ namespace XHWK.WKTool
                         {
                             string paths = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
                             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++)//给画板模型加图片路径
+                            int num = 0;
+                            for (int i = 0+ APP.pageData.pagenum; i < page.Length+ APP.pageData.pagenum; 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].PageImagePath = page[i- APP.pageData.pagenum]; //zxycs
+                                    APP.PageDrawList[i].PdfImagePath = page[i- APP.pageData.pagenum];
                                     APP.PageDrawList[i].PageNum = i + 1;
                                     APP.PageDrawList[i].ImgDocumentation = true;
                                 }
@@ -945,8 +941,8 @@ namespace XHWK.WKTool
                                 {
                                   
                                     Model_DrawData model_DrawData = new Model_DrawData();
-                                    model_DrawData.PageImagePath = page[i];
-                                    model_DrawData.PdfImagePath = page[i];
+                                    model_DrawData.PageImagePath = page[i- APP.pageData.pagenum];
+                                    model_DrawData.PdfImagePath = page[i- APP.pageData.pagenum];
                                     model_DrawData.PageNum = i + 1;
                                     model_DrawData.ImgDocumentation = true;
                                     APP.PageDrawList.Add(model_DrawData);
@@ -954,35 +950,35 @@ namespace XHWK.WKTool
                                 ImgPrint.Visibility = Visibility.Visible;//导入成功可打印
                                 ImgPrintTwo.Visibility = Visibility.Collapsed;
                                 btnPrint.IsEnabled = true;
-
                                 APP.SaveDraw();
+                                num++;
                             }
-                            APP.pageData.pagenum = 1;
-                            APP.pageData.currpage = 1;
-                            //myblackboard.clear();
-                            for (int i = 0; i < APP.PageDrawList.Count; i++)
-                            {
-                                APP.pageData.pagenum += 1;
-                            }
-                            if (APP.pageData.pagenum > 1)
+                            if(num>0)
                             {
-                                APP.pageData.pagenum -= 1;
+                                APP.pageData.currpage = APP.pageData.pagenum + 1;
+                                APP.pageData.pagenum += num;
                             }
-                            if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.PageDrawList.Count)
+                            if (APP.pageData.currpage>0 && APP.pageData.currpage < APP.PageDrawList.Count)
                             {
-                                //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));//cs
                                 imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
                                 imgCanvas.Source = null;
+                                ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
+                                ImgScreenshotTwo.Visibility = Visibility.Visible;
+                                btnScreenshot.IsEnabled = false;
                             }
                             else
                             {
                                 imgDocumentation.Source = null;
                                 imgCanvas.Source = null;
+                                ///截图可用
+                                ImgScreenshot.Visibility = Visibility.Visible;
+                                ImgScreenshotTwo.Visibility = Visibility.Collapsed;
+                                btnScreenshot.IsEnabled = true;
                             }
                         }
                         catch (Exception ex)
                         {
-                            LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog PDF)" + ex.Message, ex);
+                            LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog 导入文档)" + ex.Message, ex);
                         }
                     }
 
@@ -1043,7 +1039,15 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnRecord_Click(object sender, RoutedEventArgs e)
         {
-            blackboard_canvas.Visibility = Visibility.Visible;
+            if(APP.pageData.currpage > 0)
+            {
+                blackboard_canvas.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                System.Windows.MessageBox.Show("请先导入文档或截图！");
+                return;
+            }
             StartRecord();
         }
         /// <summary>
@@ -1167,6 +1171,8 @@ namespace XHWK.WKTool
                 IsSuspendR = false;
                 //BtnRecording.Content = "暂停录制";
                 ImgRecord.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_23.png"));
+                ImgStop.Visibility = Visibility.Collapsed;
+                ImgStopTwo.Visibility = Visibility.Visible;
                 TxbRecordingWord.Text = "暂停";
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
@@ -1207,6 +1213,8 @@ namespace XHWK.WKTool
                 //暂停
                 IsSuspendR = true;
                 ImgRecord.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_14.png"));
+                ImgStop.Visibility = Visibility.Visible;
+                ImgStopTwo.Visibility = Visibility.Collapsed;
                 TxbRecordingWord.Text = "继续";
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
@@ -1273,6 +1281,7 @@ namespace XHWK.WKTool
         {
             if (!IsFirstR)
             {
+                #region 恢复被禁用的按钮
                 ImgPrint.Visibility = Visibility.Visible;
                 ImgPrintTwo.Visibility = Visibility.Collapsed;
                 btnPrint.IsEnabled = true;
@@ -1297,9 +1306,13 @@ namespace XHWK.WKTool
                 ImgSetUpTwo.Visibility = Visibility.Collapsed;
                 btnSetUp.IsEnabled = true;
 
-                btnLoginType.IsEnabled = true;
+                btnLoginType.IsEnabled = true; 
+                #endregion
+
                 IsSuspendR = true;
                 ImgRecord.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_14.png"));
+                ImgStop.Visibility = Visibility.Visible;
+                ImgStopTwo.Visibility = Visibility.Collapsed;
                 TxbRecordingWord.Text = "保存中";
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
@@ -1389,26 +1402,40 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnAdd_Click(object sender, RoutedEventArgs e)
         {
-            if (APP.pageData.pagenum < 200)
-            {
-                if (APP.PageDrawList != null && APP.PageDrawList.Count > 0 && APP.PageDrawList.Count > APP.pageData.currpage - 1
-                    && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null)
+      //      RectangleF rectangleF = new RectangleF();
+      //      rectangleF.Width = (float)APP.PageDrawList[0].ImageSizes.CenterX;
+      //      rectangleF.Height = (float)APP.PageDrawList[0].ImageSizes.CenterY;
+      //      rectangleF.X= (float)APP.PageDrawList[0].ImageLocation.X;
+      //      rectangleF.Y = (float)APP.PageDrawList[0].ImageLocation.Y;
+
+      //      //CESHI 
+      //bool isImg=    MergerImg(APP.PageDrawList[0].PageImagePath, @"G:\102H.jpg", rectangleF, out string errmsg);
+
+
+
+                if (APP.pageData.currpage>0)
                 {
                     APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
                 }
+                if(IsStartCount&& blackboard_canvas.Visibility == Visibility.Collapsed)
+                {
+                    blackboard_canvas.Visibility = Visibility.Visible;
+                }
                 APP.pageData.pagenum += 1;
                 APP.pageData.currpage = APP.pageData.pagenum;
                 myblackboard.changepage(APP.pageData.currpage - 1);
+                ///清空页面图片UI
                 imgCanvas.Source = null;
+            imgDocumentation.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("已达到最大页数无法继续增加！");
-            }
+                APP.SaveDraw();
+            ///截图可用
+            ImgScreenshot.Visibility = Visibility.Visible;
+            ImgScreenshotTwo.Visibility = Visibility.Collapsed;
+            btnScreenshot.IsEnabled = true;
         }
         /// <summary>
         /// 打印事件
@@ -1419,7 +1446,11 @@ namespace XHWK.WKTool
         {
             try
             {
-                iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 25, 25, 25, 25);
+                //3种情况  1.文档图片 2.截图图片 3.没有图片
+
+
+
+                    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());
@@ -1432,10 +1463,42 @@ namespace XHWK.WKTool
                 iTextSharp.text.Image image;
                 for (int i = 0; i < APP.PageDrawList.Count; i++)
                 {
-                    if (String.IsNullOrEmpty(APP.PageDrawList[i].PdfImagePath)) break;
+                    long ii = Timestamp();
+                    string directoryPath = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
+                    string filePathOutPut = Path.Combine(directoryPath, string.Format("{0}{1}.jpg", ii, i));
+                    RectangleF rectangleFs = new RectangleF();
+                    MergerImg("", filePathOutPut, rectangleFs, out string errmsg);
+                    image = iTextSharp.text.Image.GetInstance(filePathOutPut);
+                    if (String.IsNullOrEmpty(APP.PageDrawList[i].PageImagePath))//没有图片
+                    {
+
+                    }
+                    else if(APP.PageDrawList[i].ImgDocumentation==true)
+                    {
+                        image = iTextSharp.text.Image.GetInstance(APP.PageDrawList[i].PageImagePath);
+                    }
+                    else
+                    {
+                        RectangleF rectangleF = new RectangleF();
+                        rectangleF.Width = (float)APP.PageDrawList[i].ImageSizes.CenterX;
+                        rectangleF.Height = (float)APP.PageDrawList[i].ImageSizes.CenterY;
+                        rectangleF.X = (float)APP.PageDrawList[i].ImageLocation.X;
+                        rectangleF.Y = (float)APP.PageDrawList[i].ImageLocation.Y;
 
 
-                    image = iTextSharp.text.Image.GetInstance(APP.PageDrawList[i].PdfImagePath);
+                        string msg = string.Empty;
+                        bool isImg = MergerImg(APP.PageDrawList[i].PageImagePath, filePathOutPut, rectangleF, out msg);
+                        if(isImg)
+                        {
+                            image = iTextSharp.text.Image.GetInstance(filePathOutPut);
+                        }
+                        else
+                        {
+                            image = iTextSharp.text.Image.GetInstance(APP.PageDrawList[i].PageImagePath);
+                        }
+                    }
+
+                   
 
 
                     if (image.Height > iTextSharp.text.PageSize.A4.Height - 25)
@@ -1461,6 +1524,23 @@ namespace XHWK.WKTool
             {
                 Console.WriteLine("转换失败，原因：" + ex.Message);
             }
+
+
+         
+
+
+
+
+
+
+
+
+
+
+
+
+
+
             //document.Close();
             ////Console.ReadKey();
             if (APP.W_PrintWindow == null)
@@ -1521,8 +1601,11 @@ namespace XHWK.WKTool
                     LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(last_button_Click)生成图片错误:" + ex.Message, ex);
                 }
                 APP.pageData.currpage -= 1;
-
                 myblackboard.changepage(APP.pageData.currpage - 1);
+                ///截图可用
+                ImgScreenshot.Visibility = Visibility.Visible;
+                ImgScreenshotTwo.Visibility = Visibility.Collapsed;
+                btnScreenshot.IsEnabled = true;
                 if (APP.pageData.currpage <= APP.PageDrawList.Count)
                 {
                     if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null)
@@ -1537,6 +1620,9 @@ namespace XHWK.WKTool
                         {
                             imgCanvas.Source = null;
                             imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                            ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
+                            ImgScreenshotTwo.Visibility = Visibility.Visible;
+                            btnScreenshot.IsEnabled = false;
                         }
                         else
                         {
@@ -1559,7 +1645,6 @@ namespace XHWK.WKTool
                                 transform.X = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
                                 transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
                                 mouseDown = false;
-
                             }
                         }
                     }
@@ -1569,10 +1654,6 @@ namespace XHWK.WKTool
                         imgDocumentation.Source = null;
                     }
                 }
-                //if (!string.IsNullOrWhiteSpace(APP.JPaths[APP.pageData.currpage]))
-                //{
-                //    imgCanvas.Source = new BitmapImage(new Uri(APP.JPaths[APP.pageData.currpage]));
-                //}
             }
 
         }
@@ -1603,6 +1684,10 @@ namespace XHWK.WKTool
                 }
                 APP.pageData.currpage += 1;
                 myblackboard.changepage(APP.pageData.currpage - 1);
+                ///截图可用
+                ImgScreenshot.Visibility = Visibility.Visible;
+                ImgScreenshotTwo.Visibility = Visibility.Collapsed;
+                btnScreenshot.IsEnabled = true;
                 if (APP.pageData.currpage <= APP.PageDrawList.Count)
                 {
 
@@ -1616,6 +1701,9 @@ namespace XHWK.WKTool
                         {
                             imgCanvas.Source = null;
                             imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                            ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
+                            ImgScreenshotTwo.Visibility = Visibility.Visible;
+                            btnScreenshot.IsEnabled = false;
                         }
                         else
                         {
@@ -1639,9 +1727,6 @@ namespace XHWK.WKTool
                                 //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;
                             }
                         }
@@ -1659,6 +1744,54 @@ namespace XHWK.WKTool
             }
         }
         /// <summary>
+        /// 生成图片
+        /// </summary>
+        /// <param name="_path">图片地址</param>
+        /// <param name="_saveimg">保存位置</param>
+        /// <param name="_rectangle">图片位置</param>
+        /// <param name="errmsg">错误消息</param>
+        /// <returns></returns>
+        private bool MergerImg(string _path,string _saveimg,RectangleF _rectangle, out string errmsg)
+        {
+            errmsg = null;
+            try
+            {
+                Bitmap bitmap = null;
+
+                 //创建要显示的图片对象,根据参数的个数设置宽度
+                 Bitmap backgroudImg = new Bitmap((int)gridM.ActualWidth, (int)gridM.ActualHeight);
+                Graphics g = Graphics.FromImage(backgroudImg);
+                //清除画布,背景设置为白色
+                g.Clear(System.Drawing.Color.White);
+
+                if(!string.IsNullOrWhiteSpace(_path))
+                {
+                     bitmap = ImageHelper.ReadBitmapFile(_path);
+                    g.DrawImage(bitmap, _rectangle);
+                }
+
+
+                backgroudImg.Save(_saveimg);
+               
+                g.Dispose();
+                backgroudImg.Dispose();
+                if(bitmap!=null)
+                {
+                    bitmap.Dispose();
+                }
+              
+                GC.Collect();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                errmsg = ex.Message;
+                LogHelper.WriteErrLog("【截图合成】（MergerImg）图片合成失败：" + ex.Message,ex);
+                return false;
+            }
+        
+        }
+        /// <summary>
         /// 将Word文档转换为图片的方法（该方法基于第三方DLL），你可以像这样调用该方法： ConvertPDF2Image("F:\\PdfFile.doc", "F:\\",
         /// "ImageFile", 1, 20, ImageFormat.Png, 256);
         /// </summary>
@@ -1954,59 +2087,59 @@ namespace XHWK.WKTool
                 //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);
-                }));
+                //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);
         }

XHWK.WKTool/XHWK.WKTool.csproj

@@ -146,6 +146,9 @@
     <Compile Include="PrintWindow.xaml.cs">
       <DependentUpon>PrintWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="PromptWindow.xaml.cs">
+      <DependentUpon>PromptWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ScreenRecordingToolbarWindow.xaml.cs">
       <DependentUpon>ScreenRecordingToolbarWindow.xaml</DependentUpon>
     </Compile>
@@ -177,6 +180,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="PromptWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>