zhao：录制页面增加跳转

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -3,6 +3,7 @@
         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:input="clr-namespace:System.Windows.Input;assembly=PresentationCore"
          xmlns:wfi ="clr-namespace:System.Windows.Forms.Integration;assembly=WindowsFormsIntegration"
         xmlns:aforge ="clr-namespace:AForge.Controls;assembly=AForge.Controls"
         xmlns:gifLib="http://wpfanimatedgif.codeplex.com"
@@ -638,8 +639,8 @@
                     <RadioButton Cursor="Hand" x:Name="rbnCrude" Content=" 粗" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,0,0" Click="RbnCrude_Click"/>
                 </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="120" HorizontalAlignment="Center" Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">
+                <Grid Grid.Row="1" x:Name="gridPage" Visibility="Hidden" MouseLeftButtonDown="Window_MouseLeftButtonDown_1" HorizontalAlignment="Center">
+                    <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="150" 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="28" Height="20"
@@ -649,18 +650,27 @@
                                 <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
                             </StackPanel>
                         </Button>
-                        <Grid Width="60"  Background="Transparent" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="311*"/>
-                                <RowDefinition Height="483*"/>
-                            </Grid.RowDefinitions>
-                            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,-12,0,0" Grid.Row="1"  Background="Transparent">
+                        <Grid Width="95"  Background="Transparent" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
+                            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal"  Background="Transparent">
+                                <TextBlock x:Name="txbCurrpage" Text="{Binding currpage}" TextAlignment="Center" FontSize="15" MouseLeftButtonDown="txbCurrpage_MouseLeftButtonDown" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0" ToolTip="双击跳转"/>
+                                <TextBlock Text="/" TextAlignment="Center" FontSize="15" HorizontalAlignment="Center" VerticalAlignment="Center" MouseLeftButtonDown="txbCurrpage_MouseLeftButtonDown" ToolTip="双击跳转"/>
+                                <TextBlock x:Name="txbTotalpage" Text="{Binding pagenum}" TextAlignment="Center" FontSize="15" HorizontalAlignment="Center" VerticalAlignment="Center" MouseLeftButtonDown="txbCurrpage_MouseLeftButtonDown" ToolTip="双击跳转"/>
+                            </StackPanel>
+                            <TextBox x:Name="txtJump" Text="123" Height="17" Width="25" Visibility="Hidden" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0"  input:InputMethod.IsInputMethodEnabled="False" PreviewTextInput="txtJump_PreviewTextInput" KeyDown="txtJump_KeyDown"/>
+                            <Button Cursor="Hand" Visibility="Hidden" x:Name="BtnJumpPage" HorizontalAlignment="Left"  VerticalAlignment="Center" Width="17" Height="17" Background="White" BorderBrush="#FFABADB3" Margin="24,0,0,0" Click="BtnJumpPage_Click">
+                                <Button.Resources>
+                                    <Style TargetType="{x:Type Border}">
+                                        <Setter Property="CornerRadius" Value="0"/>
+                                        <Setter Property="BorderBrush" Value="#3492F4"/>
+                                    </Style>
+                                </Button.Resources>
+                                <Image Source="/星火微课;component/Images/VideoList_OK.png" Margin="2,2,2,2"></Image>
+                            </Button>
+                            <!--<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,0"  Background="Transparent">
                                 <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>
-                            </StackPanel>
+                            </StackPanel>-->
                         </Grid>
                         <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                     x:Name="next_btn"  Background="Transparent"

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -14,6 +14,7 @@ using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
@@ -3680,72 +3681,103 @@ namespace XHWK.WKTool
             {
                 mouseDown = false;
                 HideAngleBorder();
+
+                //隐藏跳转
+                txbCurrpage.Visibility = Visibility.Visible;
+                txtJump.Visibility = Visibility.Hidden;
+                BtnJumpPage.Visibility = Visibility.Hidden;
                 //if(!APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation)
                 //{
                 //    ImgWG();
                 //}
                 APP.pageData.currpage -= 1;
-                myblackboard.changepage(APP.pageData.currpage - 1);
-                scroMain.ScrollToVerticalOffset(0);
-                if (btnImport.IsEnabled == true)
+                JumpPageClick();
+            }
+        }
+        /// <summary>
+        /// 跳转
+        /// </summary>
+        void JumpPageClick()
+        {
+            myblackboard.changepage(APP.pageData.currpage - 1);
+            scroMain.ScrollToVerticalOffset(0);
+            if (btnImport.IsEnabled == true)
+            {
+                ///截图可用
+                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)
                 {
-                    ///截图可用
-                    ImgScreenshot.Visibility = Visibility.Visible;
-                    ImgScreenshotTwo.Visibility = Visibility.Collapsed;
-                    btnScreenshot.IsEnabled = true;
+                    APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
                 }
-                if (APP.pageData.currpage <= APP.PageDrawList.Count)
+                if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage <= APP.PageDrawList.Count && APP.pageData.currpage > 0 && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
                 {
-                    if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null)
-                    {
-                        APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
-                    }
-                    if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage <= APP.PageDrawList.Count && APP.pageData.currpage > 0 && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
+                    if (APP.PageDrawList[APP.pageData.currpage - 1].ImgDocumentation)
                     {
-                        //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));//cs
-
-                        if (APP.PageDrawList[APP.pageData.currpage - 1].ImgDocumentation)
+                        if ("ppt".Equals(APP.PageDrawList[APP.pageData.currpage - 1].Type))
                         {
-                            if ("ppt".Equals(APP.PageDrawList[APP.pageData.currpage - 1].Type))
-                            {
-                                imgCanvas.Source = null;
-                                imgDocumentation.Source = null;
-                                imgPPT.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
-                                ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
-                                ImgScreenshotTwo.Visibility = Visibility.Visible;
-                                btnScreenshot.IsEnabled = false;
-                            }
-                            else
-                            {
-                                imgPPT.Source = null;
-                                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;
-                            }
+                            imgCanvas.Source = null;
+                            imgDocumentation.Source = null;
+                            imgPPT.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                            ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
+                            ImgScreenshotTwo.Visibility = Visibility.Visible;
+                            btnScreenshot.IsEnabled = false;
                         }
                         else
                         {
                             imgPPT.Source = null;
-                            imgDocumentation.Source = null;
-                            imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
-                            APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
-                            if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X > 0)
-                            {
-                                mouseDown = false;
-                                ImgXY();
-
-                            }
+                            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;
                         }
+                        //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
                     {
                         imgPPT.Source = null;
-                        imgCanvas.Source = null;
                         imgDocumentation.Source = null;
+                        imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                        APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
+                        if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X > 0)
+                        {
+                            //var group = IMG.FindResource("Imageview") as TransformGroup;
+                            //#region 高低 缩放比例
+                            //if (APP.PageDrawList[APP.pageData.currpage - 1].ImageSize != null)
+                            //{
+                            //    var transform1 = group.Children[0] as ScaleTransform;
+                            //    transform1.ScaleX = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX;
+                            //    transform1.ScaleY = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY;
+                            //    imgCanvas.Width = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterX;
+                            //    imgCanvas.Height = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterY;
+                            //}
+                            //#endregion
+                            //#region 坐标XY轴
+                            //var transform = group.Children[1] as TranslateTransform;
+                            //transform.X = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
+                            //transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
+                            //#endregion
+                            mouseDown = false;
+                            ImgXY();
+
+                        }
                     }
                 }
+                else
+                {
+                    imgPPT.Source = null;
+                    imgCanvas.Source = null;
+                    imgDocumentation.Source = null;
+                }
             }
         }
         private void ImgXY()
@@ -3782,91 +3814,18 @@ namespace XHWK.WKTool
             {
                 mouseDown = false;
                 HideAngleBorder();
+
+                //隐藏跳转
+                txbCurrpage.Visibility = Visibility.Visible;
+                txtJump.Visibility = Visibility.Hidden;
+                BtnJumpPage.Visibility = Visibility.Hidden;
+
                 //if (!APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation)
                 //{
                 //    ImgWG();
                 //}
                 APP.pageData.currpage += 1;
-                myblackboard.changepage(APP.pageData.currpage - 1);
-                scroMain.ScrollToVerticalOffset(0);
-                if (btnImport.IsEnabled == true)
-                {
-                    ///截图可用
-                    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)
-                    {
-                        APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
-                    }
-                    if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage <= APP.PageDrawList.Count && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
-                    {
-                        if (APP.PageDrawList[APP.pageData.currpage - 1].ImgDocumentation)
-                        {
-                            if ("ppt".Equals(APP.PageDrawList[APP.pageData.currpage - 1].Type))
-                            {
-                                imgCanvas.Source = null;
-                                imgDocumentation.Source = null;
-                                imgPPT.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
-                                ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
-                                ImgScreenshotTwo.Visibility = Visibility.Visible;
-                                btnScreenshot.IsEnabled = false;
-                            }
-                            else
-                            {
-                                imgPPT.Source = null;
-                                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;
-                            }
-                            //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
-                        {
-                            imgPPT.Source = null;
-                            imgDocumentation.Source = null;
-                            imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
-                            APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
-                            if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X > 0)
-                            {
-                                //var group = IMG.FindResource("Imageview") as TransformGroup;
-                                //#region 高低 缩放比例
-                                //if (APP.PageDrawList[APP.pageData.currpage - 1].ImageSize != null)
-                                //{
-                                //    var transform1 = group.Children[0] as ScaleTransform;
-                                //    transform1.ScaleX = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX;
-                                //    transform1.ScaleY = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY;
-                                //    imgCanvas.Width = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterX;
-                                //    imgCanvas.Height = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterY;
-                                //}
-                                //#endregion
-                                //#region 坐标XY轴
-                                //var transform = group.Children[1] as TranslateTransform;
-                                //transform.X = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
-                                //transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
-                                //#endregion
-                                mouseDown = false;
-                                ImgXY();
-
-                            }
-                        }
-                    }
-                    else
-                    {
-                        imgPPT.Source = null;
-                        imgCanvas.Source = null;
-                        imgDocumentation.Source = null;
-                    }
-                }
+                JumpPageClick();
             }
         }
         /// <summary>
@@ -5006,5 +4965,83 @@ namespace XHWK.WKTool
             double proportion = 210.0 / 297.0;
             gridM.Height = gridM.ActualWidth / proportion;
         }
+        /// <summary>
+        /// 跳转页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void txbCurrpage_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if(e.ClickCount==2)
+            {
+                try
+                {
+                    if (int.Parse(txbCurrpage.Text) > 0)
+                    {
+                        txtJump.Text = txbCurrpage.Text;
+                        txbCurrpage.Visibility = Visibility.Hidden;
+                        txtJump.Visibility = Visibility.Visible;
+                        BtnJumpPage.Visibility = Visibility.Visible;
+                        txtJump.Focus();
+                        txtJump.SelectAll();
+                    }
+                }
+                catch (Exception)
+                {
+                }
+            }
+        }
+        /// <summary>
+        /// 确定跳转
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnJumpPage_Click(object sender, RoutedEventArgs e)
+        {
+            int JumpPage = 0;
+            try
+            {
+                JumpPage = int.Parse(txtJump.Text);
+            }
+            catch (Exception ex)
+            {
+                MessageWindow.Show("操作有误！请输入有效的页码!");
+                return;
+            }
+            if(JumpPage<1)
+            {
+                JumpPage = 1;
+            }
+            if (JumpPage > int.Parse(txbTotalpage.Text))
+            {
+                JumpPage = int.Parse(txbTotalpage.Text);
+            }
+            #region 跳转
+            APP.pageData.currpage = JumpPage;
+            JumpPageClick();
+            #endregion
+
+            txbCurrpage.Visibility = Visibility.Visible;
+            txtJump.Visibility = Visibility.Hidden;
+            BtnJumpPage.Visibility = Visibility.Hidden;
+        }
+        /// <summary>
+        /// 只允许输入数字
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void txtJump_PreviewTextInput(object sender, TextCompositionEventArgs e)
+        {
+            Regex re = new Regex("[^0-9.-]+");
+            e.Handled = re.IsMatch(e.Text);
+        }
+
+        private void txtJump_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                BtnJumpPage_Click(null, null);
+            }
+        }
     }
 }