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

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -634,10 +634,10 @@
                 </StackPanel>
                 <!--页码-->
                 <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed" MouseLeftButtonDown="Window_MouseLeftButtonDown_1" HorizontalAlignment="Center">
-                    <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="180" HorizontalAlignment="Center" Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">
+                    <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="120" HorizontalAlignment="Center" Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">
                         <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                     x:Name="last_button"
-                    Width="60" Height="20"
+                    Width="28" Height="20"
                     Click="last_button_Click">
 
                             <Button.Content>
@@ -661,7 +661,7 @@
                         </Grid>
                         <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                     x:Name="next_btn"  Background="Transparent"
-                    Width="60" Height="20"
+                    Width="28" Height="20"
                     Click="next_btn_Click">
                             <Button.Content>
                                 <StackPanel>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -1340,7 +1340,7 @@ namespace XHWK.WKTool
                                         APP.PageDrawList[i].PdfImagePath = page[i - APP.pageData.pagenum];
                                         APP.PageDrawList[i].PageNum = i + 1;
                                         APP.PageDrawList[i].ImgDocumentation = true;
-                                        APP.PageDrawList[i].Type = "ppt";
+                                        APP.PageDrawList[i].Type = "word";
                                     }
                                     else
                                     {
@@ -1351,7 +1351,7 @@ namespace XHWK.WKTool
                                             PdfImagePath = page[i - APP.pageData.pagenum],
                                             PageNum = i + 1,
                                             ImgDocumentation = true,
-                                            Type = "ppt"
+                                            Type = "word"
                                         };
                                         APP.PageDrawList.Add(model_DrawData);
                                     }
@@ -1370,27 +1370,15 @@ namespace XHWK.WKTool
                                 }
                                 if (APP.pageData.currpage > 0 && APP.pageData.currpage <= APP.PageDrawList.Count)
                                 {
+
                                     imgCanvas.Source = null;
+                                    imgPPT.Source = null;
                                     ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
                                     ImgScreenshotTwo.Visibility = Visibility.Visible;
                                     btnScreenshot.IsEnabled = false;
-                                    imgDocumentation.Source = null;
-                                    imgPPT.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
+                                    imgDocumentation.Visibility = Visibility.Visible;
+                                    imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
                                     scroMain.ScrollToVerticalOffset(0);
-                                    for (int i = iStart; i < iEnd; i++)
-                                    {
-                                        APP.PageDrawList[i].ImageLocation = new TranslateTransform
-                                        {
-                                            X = 0.1,
-                                            Y = 0.1
-                                        };
-                                        APP.PageDrawList[i].IsImageLocation = true;
-                                        APP.PageDrawList[i].ImageSizes = new ScaleTransform
-                                        {
-                                            CenterX = imgCanvas.Width,
-                                            CenterY = imgCanvas.Height
-                                        };
-                                    }
                                 }
                                 else
                                 {
@@ -3490,6 +3478,7 @@ namespace XHWK.WKTool
                 MessageBoxResult dr = MessageWindow.Show("确定退出登陆？", "提示", MessageBoxButton.OKCancel);
                 if (dr == MessageBoxResult.OK)
                 {
+                    LoginType();
                     Login();
                 }
             }
@@ -3536,8 +3525,8 @@ namespace XHWK.WKTool
             APP.IsLoginType = false;
             txbLoginType.Text = "未登录";
             APP.UserInfo = new Model_UserInfo();
-            ImgUpload.Visibility = Visibility.Collapsed;
-            ImgUploadTwo.Visibility = Visibility.Visible;
+            //ImgUpload.Visibility = Visibility.Collapsed;
+            //ImgUploadTwo.Visibility = Visibility.Visible;
         }
         /// <summary>
         /// 获取时间戳