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

解决冲突
# Conflicts:
#	XHWK.WKTool/XHMicroLessonSystemWindow.xaml
#	XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

XHWK.WKTool/PrintWindow.xaml.cs

@@ -76,6 +76,10 @@ namespace XHWK.WKTool
             {
                 imgPri.Source = new BitmapImage(new Uri(_imgPath));
             }
+            else
+            {
+                imgPri.Source = null;
+            }
             I = 0;
             if (t == null)
             {

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -625,16 +625,14 @@
                     <RowDefinition Height="50"/>
                 </Grid.RowDefinitions>
                 <Label x:Name="lblVideoMess" Grid.Row="0" Content="暂无微课录制信息，请录制并等待保存完成后重试！" HorizontalAlignment="Center" Margin="0,0,0,100" VerticalAlignment="Center" FontSize="20" Visibility="Hidden"/>
-                <Button x:Name="BtnVideoUpPage" Content="上一页" HorizontalAlignment="Center" Margin="0,0,150,12" Grid.Row="1" VerticalAlignment="Bottom" Width="60" Background="{x:Null}" BorderBrush="{x:Null}" FontSize="16" Foreground="#FF333333" Click="BtnVideoUpPage_Click"/>
+                <Button x:Name="BtnVideoUpPage" Content="上一页" Cursor="Hand" HorizontalAlignment="Center" Margin="0,0,150,12" Grid.Row="1" VerticalAlignment="Bottom" Width="60" Background="{x:Null}" BorderBrush="{x:Null}" FontSize="16" Foreground="#FF333333" Click="BtnVideoUpPage_Click"/>
                 <Label x:Name="lblVideoPageNum" Grid.Row="1" FontSize="14" Content="100/100" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,10" Foreground="#FF333333" />
-                <Button x:Name="BtnVideoDownPage" Content="下一页" HorizontalAlignment="Center" Margin="150,0,0,12" Grid.Row="1" VerticalAlignment="Bottom" Width="60" Background="{x:Null}" BorderBrush="{x:Null}" FontSize="16" Foreground="#FF333333" Click="BtnVideoDownPage_Click"/>
+                <Button x:Name="BtnVideoDownPage" Content="下一页" Cursor="Hand" HorizontalAlignment="Center" Margin="150,0,0,12" Grid.Row="1" VerticalAlignment="Bottom" Width="60" Background="{x:Null}" BorderBrush="{x:Null}" FontSize="16" Foreground="#FF333333" Click="BtnVideoDownPage_Click"/>
             </Grid>
-
             <Grid Grid.Row="2" Background="#EFF1F8" Margin="0,0,0,0">
                 <StackPanel Orientation="Horizontal" Margin="0,5,0,5">
                     <TextBlock Text="颜色：" FontSize="14" Padding="10,3,0,0"/>
                     <Button Cursor="Hand" x:Name="btnWhite" Background="#FFFFFF" Width="20" Height="20" Click="BtnWhite_Click" Margin="0,2,0,0" Visibility="Collapsed"/>
-
                     <Border Background="#666666" Width="20" Height="20" Margin="5,2,0,0">
                         <Button Cursor="Hand" x:Name="btnRed" Width="20" Height="20" Background="#FF0000" Margin="1,1,1,1" HorizontalAlignment="Center"  Click="BtnRed_Click" Style="{StaticResource NoMouseOverButtonStyle}">
                             <Image x:Name="imgRed" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Visible"/>
@@ -646,8 +644,6 @@
                         </Button>
                     </Border>
                     <Border Background="#666666" Width="20" Height="20" Margin="5,2,0,0">
-
-
                         <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="1,1,1,1" Click="BtnCyanBlue_Click" Style="{StaticResource NoMouseOverButtonStyle}">
                             <Image x:Name="imgCyanBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
                         </Button>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -473,7 +473,7 @@ namespace XHWK.WKTool
                     //gridUpload.Visibility = Visibility.Collapsed;
                     GridMyVideo.Visibility = Visibility.Collapsed;
                     txbStoragePath.Content = APP.WKData.WkPath;
-
+                    GridMyVideo.Visibility = Visibility.Collapsed;
                     #region 读取用户配置
                     //接口地址
                     if (!File.Exists(APP.dataPath + "interfaceAddress.txt")) //若为空
@@ -987,7 +987,7 @@ namespace XHWK.WKTool
                 ofd = new System.Windows.Forms.OpenFileDialog
                 {
                     //Filter = "文档|*.docx;*.doc;*.ppt;*.pptx",
-                    Filter = "文档|*.docx;*.doc;*.ppt;*.pptx;*.pdf",
+                    Filter = "文档|*.docx;*.doc;*.ppt;*.pptx",
                     InitialDirectory = desktopPath,
                     Multiselect = false,
                     AddExtension = true,
@@ -3283,6 +3283,9 @@ namespace XHWK.WKTool
                 PageNum = APP.pageData.currpage
             };
             APP.PageDrawList.Add(model_DrawData);
+             ImgPrint.Visibility = Visibility.Visible;//可打印
+                                ImgPrintTwo.Visibility = Visibility.Collapsed;
+                                btnPrint.IsEnabled = true;
             //APP.SaveDraw();
             if (btnImport.IsEnabled == true)
             {
@@ -3302,7 +3305,11 @@ namespace XHWK.WKTool
             try
             {
                 //3种情况  1.文档图片 2.截图图片 3.没有图片
-
+                if(APP.PageDrawList.Count==0)
+                {
+                    MessageWindow.Show("没有可打印的页，您可以新增、截图或导入来增加页！");
+                    return;
+                }
 
 
                 iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 25, 25, 25, 25);