Browse Source

pdf

tags/录制修改前
zhangxueyang 4 years ago
parent
commit
bf6de03746

+ 3
- 3
XHWK.WKTool/XHMicroLessonSystemWindow.xaml View File

634
                 </StackPanel>
634
                 </StackPanel>
635
                 <!--页码-->
635
                 <!--页码-->
636
                 <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed" MouseLeftButtonDown="Window_MouseLeftButtonDown_1" HorizontalAlignment="Center">
636
                 <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed" MouseLeftButtonDown="Window_MouseLeftButtonDown_1" HorizontalAlignment="Center">
637
-                    <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="180" HorizontalAlignment="Center" Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">
637
+                    <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="120" HorizontalAlignment="Center" Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">
638
                         <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
638
                         <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
639
                     x:Name="last_button"
639
                     x:Name="last_button"
640
-                    Width="60" Height="20"
640
+                    Width="28" Height="20"
641
                     Click="last_button_Click">
641
                     Click="last_button_Click">
642
 
642
 
643
                             <Button.Content>
643
                             <Button.Content>
661
                         </Grid>
661
                         </Grid>
662
                         <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
662
                         <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
663
                     x:Name="next_btn"  Background="Transparent"
663
                     x:Name="next_btn"  Background="Transparent"
664
-                    Width="60" Height="20"
664
+                    Width="28" Height="20"
665
                     Click="next_btn_Click">
665
                     Click="next_btn_Click">
666
                             <Button.Content>
666
                             <Button.Content>
667
                                 <StackPanel>
667
                                 <StackPanel>

+ 9
- 20
XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs View File

1340
                                         APP.PageDrawList[i].PdfImagePath = page[i - APP.pageData.pagenum];
1340
                                         APP.PageDrawList[i].PdfImagePath = page[i - APP.pageData.pagenum];
1341
                                         APP.PageDrawList[i].PageNum = i + 1;
1341
                                         APP.PageDrawList[i].PageNum = i + 1;
1342
                                         APP.PageDrawList[i].ImgDocumentation = true;
1342
                                         APP.PageDrawList[i].ImgDocumentation = true;
1343
-                                        APP.PageDrawList[i].Type = "ppt";
1343
+                                        APP.PageDrawList[i].Type = "word";
1344
                                     }
1344
                                     }
1345
                                     else
1345
                                     else
1346
                                     {
1346
                                     {
1351
                                             PdfImagePath = page[i - APP.pageData.pagenum],
1351
                                             PdfImagePath = page[i - APP.pageData.pagenum],
1352
                                             PageNum = i + 1,
1352
                                             PageNum = i + 1,
1353
                                             ImgDocumentation = true,
1353
                                             ImgDocumentation = true,
1354
-                                            Type = "ppt"
1354
+                                            Type = "word"
1355
                                         };
1355
                                         };
1356
                                         APP.PageDrawList.Add(model_DrawData);
1356
                                         APP.PageDrawList.Add(model_DrawData);
1357
                                     }
1357
                                     }
1370
                                 }
1370
                                 }
1371
                                 if (APP.pageData.currpage > 0 && APP.pageData.currpage <= APP.PageDrawList.Count)
1371
                                 if (APP.pageData.currpage > 0 && APP.pageData.currpage <= APP.PageDrawList.Count)
1372
                                 {
1372
                                 {
1373
+
1373
                                     imgCanvas.Source = null;
1374
                                     imgCanvas.Source = null;
1375
+                                    imgPPT.Source = null;
1374
                                     ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
1376
                                     ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
1375
                                     ImgScreenshotTwo.Visibility = Visibility.Visible;
1377
                                     ImgScreenshotTwo.Visibility = Visibility.Visible;
1376
                                     btnScreenshot.IsEnabled = false;
1378
                                     btnScreenshot.IsEnabled = false;
1377
-                                    imgDocumentation.Source = null;
1378
-                                    imgPPT.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
1379
+                                    imgDocumentation.Visibility = Visibility.Visible;
1380
+                                    imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
1379
                                     scroMain.ScrollToVerticalOffset(0);
1381
                                     scroMain.ScrollToVerticalOffset(0);
1380
-                                    for (int i = iStart; i < iEnd; i++)
1381
-                                    {
1382
-                                        APP.PageDrawList[i].ImageLocation = new TranslateTransform
1383
-                                        {
1384
-                                            X = 0.1,
1385
-                                            Y = 0.1
1386
-                                        };
1387
-                                        APP.PageDrawList[i].IsImageLocation = true;
1388
-                                        APP.PageDrawList[i].ImageSizes = new ScaleTransform
1389
-                                        {
1390
-                                            CenterX = imgCanvas.Width,
1391
-                                            CenterY = imgCanvas.Height
1392
-                                        };
1393
-                                    }
1394
                                 }
1382
                                 }
1395
                                 else
1383
                                 else
1396
                                 {
1384
                                 {
3486
                 MessageBoxResult dr = MessageWindow.Show("确定退出登陆?", "提示", MessageBoxButton.OKCancel);
3474
                 MessageBoxResult dr = MessageWindow.Show("确定退出登陆?", "提示", MessageBoxButton.OKCancel);
3487
                 if (dr == MessageBoxResult.OK)
3475
                 if (dr == MessageBoxResult.OK)
3488
                 {
3476
                 {
3477
+                    LoginType();
3489
                     Login();
3478
                     Login();
3490
                 }
3479
                 }
3491
             }
3480
             }
3532
             APP.IsLoginType = false;
3521
             APP.IsLoginType = false;
3533
             txbLoginType.Text = "未登录";
3522
             txbLoginType.Text = "未登录";
3534
             APP.UserInfo = new Model_UserInfo();
3523
             APP.UserInfo = new Model_UserInfo();
3535
-            ImgUpload.Visibility = Visibility.Collapsed;
3536
-            ImgUploadTwo.Visibility = Visibility.Visible;
3524
+            //ImgUpload.Visibility = Visibility.Collapsed;
3525
+            //ImgUploadTwo.Visibility = Visibility.Visible;
3537
         }
3526
         }
3538
         /// <summary>
3527
         /// <summary>
3539
         /// 获取时间戳
3528
         /// 获取时间戳

Loading…
Cancel
Save