样式

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/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

@@ -116,55 +116,61 @@
                 </StackPanel>
             </Grid>
             <!--主内容-->
-            <ScrollViewer Grid.Row="1"  Height="585" VerticalScrollBarVisibility="Visible">
-                <Grid Grid.Row="1" x:Name="GridMain"  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>
-                                <Label Content="" Grid.Column="0" HorizontalAlignment="Left" Height="10" VerticalAlignment="Top" Width="10" 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   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>
-                            </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 Name="imgCanvas" Width="635" Height="auto" Stretch="Uniform" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}">
+                                            </Image>
+                                        </ContentControl>
+                                    </ScrollViewer>
+                                </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">
                     <aforge:VideoSourcePlayer x:Name="player" Height="124" Width="172"  />
                 </wfi:WindowsFormsHost>-->
-                    <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"/>
+             
 
-                    <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="Top" Margin="0,0,2,0"/>
-                    <Label Content="" Grid.Column="1" Height="10" Width="10" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,2,0"/>
-                </Grid>
-            </ScrollViewer>
+                    
+       
+                    </Grid>
+                </ScrollViewer>
+                <Image x:Name="imgPlayerLeft" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Left"  Margin="10,7,10,10" VerticalAlignment="Top" Visibility="Collapsed"/>
+                <Image x:Name="imgPlayerRight" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Right"  Margin="10,7,26,10" VerticalAlignment="Top" Visibility="Collapsed"/>
+                <Image x:Name="imgPlayerLeftUnder" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Left"  Margin="10,7,10,10" VerticalAlignment="Bottom" Visibility="Collapsed"/>
+                <Image x:Name="imgPlayerRightUnder" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Right" Margin="10,7,26,10" VerticalAlignment="Bottom" Visibility="Collapsed"/>
+                <Label Content="" Grid.Column="0" 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,500,0,0" Grid.Column="1">
+            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" Height="60"
+                    Width="60" Height="50"
                     Click="last_button_Click">
                         <Button.Content>
                             <StackPanel>
@@ -172,14 +178,14 @@
                             </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"/>
@@ -187,8 +193,8 @@
                         </StackPanel>
                     </Grid>
                     <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                    x:Name="next_btn"
-                    Width="60" Height="60"
+                    x:Name="next_btn"  Background="Transparent"
+                    Width="60" Height="50"
                     Click="next_btn_Click">
                         <Button.Content>
                             <StackPanel>
@@ -201,38 +207,38 @@
             <!--设置-->
             <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">
@@ -256,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>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -843,31 +843,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);
@@ -876,25 +868,15 @@ namespace XHWK.WKTool
                                 ImgPrintTwo.Visibility = Visibility.Collapsed;
                                 btnPrint.IsEnabled = true;
                                 APP.SaveDraw();
+                                num++;
                             }
-                            myblackboard.clear();
-                            APP.pageData.pagenum = 0;
-                            APP.pageData.currpage = 0;
-                            for (int i = 0; i < APP.PageDrawList.Count; i++)
-                            {
-                                APP.pageData.pagenum += 1;
-                            }
-                            //if (APP.pageData.pagenum > 1)
-                            //{
-                            //    APP.pageData.pagenum -= 1;
-                            //}
-                            if (IsStartCount && blackboard_canvas.Visibility == Visibility.Collapsed)
+                            if (num > 0)
                             {
-                                blackboard_canvas.Visibility = Visibility.Visible;
+                                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;//当前页为导入时不可截图
@@ -922,19 +904,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;
                                 }
@@ -942,8 +918,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);
@@ -951,23 +927,16 @@ 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;//当前页为导入时不可截图
@@ -986,7 +955,7 @@ namespace XHWK.WKTool
                         }
                         catch (Exception ex)
                         {
-                            LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog PDF)" + ex.Message, ex);
+                            LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog 导入文档)" + ex.Message, ex);
                         }
                     }
 
@@ -1051,6 +1020,11 @@ namespace XHWK.WKTool
             {
                 blackboard_canvas.Visibility = Visibility.Visible;
             }
+            else
+            {
+                System.Windows.MessageBox.Show("请先导入文档或截图！");
+                return;
+            }
             StartRecord();
         }
         /// <summary>
@@ -1353,8 +1327,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnAdd_Click(object sender, RoutedEventArgs e)
         {
-                if (APP.pageData.currpage>0&&APP.PageDrawList != null && APP.PageDrawList.Count > 0 && APP.PageDrawList.Count > APP.pageData.currpage - 1
-                    && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null)
+                if (APP.pageData.currpage>0)
                 {
                     APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
                 }
@@ -1367,6 +1340,7 @@ namespace XHWK.WKTool
                 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;