zhao：1代码优化，2修改录制跳转

Common/system/FFMpeg.cs

@@ -900,7 +900,7 @@ namespace Common.system
         /// </summary>
         public void GetMToFFmpeg()
         {
-            return;
+            //return;
             new Thread(new ThreadStart(new Action(() =>
             {
                 try

Common/system/ImageHelper.cs

@@ -457,7 +457,7 @@ namespace Common.system
                             Img.Dispose();
                             bit.Dispose();
                         }
-                        catch (Exception ex)
+                        catch (Exception)
                         {
                             using (var stream = new FileStream(filePathName, FileMode.Create))
                             {
@@ -474,7 +474,7 @@ namespace Common.system
                     }
                 }))).Start();
             }
-            catch (Exception ex)
+            catch (Exception)
             {
 
             }
@@ -620,7 +620,7 @@ namespace Common.system
                 //Thread myThread = new Thread(SaveImage);
                 //myThread.Start(saveModel);
             }
-            catch (Exception ex)
+            catch (Exception)
             {
 
             }
@@ -677,7 +677,7 @@ namespace Common.system
                             bit.Dispose();
                         }))).Start();
                     }
-                    catch (Exception ex)
+                    catch (Exception)
                     {
 
                     }
@@ -703,7 +703,7 @@ namespace Common.system
                     fs.Close();
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
 
             }

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -45,7 +45,7 @@ namespace XHWK.WKTool
                             ZipHelper.UnZip(FileToolsCommon.GetFileAbsolutePath("/ffmpegx32.zip"), FileToolsCommon.GetFileAbsolutePath());
                         }
                     }
-                    catch (Exception ex)
+                    catch (Exception)
                     {
                         ZipHelper.UnZip(FileToolsCommon.GetFileAbsolutePath("/ffmpegx64.zip"), FileToolsCommon.GetFileAbsolutePath());
                     }
@@ -57,7 +57,7 @@ namespace XHWK.WKTool
                 APP.InstallScreenCapturerRecorder();
             }
             txbStoragePath.Text = FileToolsCommon.GetConfigValue("VideoSavePath");
-            APP.FFmpeg.GetMToFFmpeg();
+            //APP.FFmpeg.GetMToFFmpeg();
         }
 
         #region 事件

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -639,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="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">
+                <Grid Grid.Row="1" x:Name="gridPage" Visibility="Visible" MouseLeftButtonDown="Window_MouseLeftButtonDown_1" HorizontalAlignment="Center" Margin="30,0,0,0">
+                    <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="215" 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"
@@ -650,27 +650,12 @@
                                 <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
                             </StackPanel>
                         </Button>
-                        <Grid Width="95"  Background="Transparent" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
+                        <Grid Width="60"  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="双击跳转"/>
+                                <TextBlock x:Name="txbCurrpage" Text="{Binding currpage}" TextAlignment="Center" FontSize="15" MouseLeftButtonDown="txbCurrpage_MouseLeftButtonDown" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0"/>
+                                <TextBlock Text="/" TextAlignment="Center" FontSize="15" HorizontalAlignment="Center" VerticalAlignment="Center" MouseLeftButtonDown="txbCurrpage_MouseLeftButtonDown"/>
+                                <TextBlock x:Name="txbTotalpage" Text="{Binding pagenum}" TextAlignment="Center" FontSize="15" HorizontalAlignment="Center" VerticalAlignment="Center" MouseLeftButtonDown="txbCurrpage_MouseLeftButtonDown"/>
                             </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">
-                                   
-                                </StackPanel>
-                            </StackPanel>-->
                         </Grid>
                         <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                     x:Name="next_btn"  Background="Transparent"
@@ -680,6 +665,35 @@
                                 <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
                             </StackPanel>
                         </Button>
+
+                        <TextBlock Text="跳转" Height="18" Margin="0,5,3,0"></TextBlock>
+                        <!--<TextBox x:Name="txtJump" Text="123" Height="17" Width="25" Visibility="Visible" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0"  input:InputMethod.IsInputMethodEnabled="False" PreviewTextInput="txtJump_PreviewTextInput" KeyDown="txtJump_KeyDown"/>-->
+                        <!--<Button Cursor="Hand" Visibility="Visible" 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>-->
+
+                        <ComboBox Cursor="Hand" Width="50" Height="20"
+                                x:Name="CbxPageList"
+                                VerticalContentAlignment="Center"
+                                BorderThickness="1"
+                                FontSize="13" SelectedIndex="-1"
+                                  DisplayMemberPath="PageName" SelectedValuePath="PageCode" SelectionChanged="CbxPageList_SelectionChanged"
+                                >
+                            <ComboBox.Background>
+                                <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                    <GradientStop Color="#FFF0F0F0" Offset="0"/>
+                                    <GradientStop Color="#FFE5E5E5" Offset="1"/>
+                                </LinearGradientBrush>
+                            </ComboBox.Background>
+                        </ComboBox>
+                        <TextBlock Text="页" Height="18" Margin="3,5,0,0"></TextBlock>
+
                     </StackPanel>
                 </Grid>
 

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -40,6 +40,10 @@ namespace XHWK.WKTool
     public partial class XHMicroLessonSystemWindow : Window
     {
         #region 字段
+        /// <summary>
+        /// 页码下拉列表
+        /// </summary>
+        List<PageData> PageData =null;
         private FolderBrowserDialog Ofd;
         private DialogResult Result;
         public BlackboardNew myblackboard;
@@ -960,6 +964,19 @@ namespace XHWK.WKTool
                         APP.pageData.currpage = APP.pageData.pagenum;
                         myblackboard.changepage(APP.pageData.currpage - 1);
                         gridPage.Visibility = Visibility.Visible;//页码大于0 显示
+
+                        #region 插入页码
+                        PageData = new List<PageData>();
+                        for (int i = 1; i <= APP.pageData.pagenum; i++)
+                        {
+                            PageData pd = new PageData();
+                            pd.PageName = i.ToString();// + "页";
+                            pd.PageCode = i;
+                            PageData.Add(pd);
+                        }
+                        CbxPageList.ItemsSource = PageData;
+                        CbxPageList.SelectedIndex = APP.pageData.currpage - 1;
+                        #endregion
                     }
                     if (APP.PageDrawList.Count >= APP.pageData.currpage)
                     {
@@ -1095,7 +1112,6 @@ namespace XHWK.WKTool
                         APP.myloading.Show();
                         myblackboard.changepage(APP.pageData.pagenum);
                     }));
-                    #region PPT转PDF
                     string filepath = ofd.FileName;
                     string path = ofd.SafeFileName.Replace(".ppt", "").Replace(".pptx", "").Trim();
                     string type = ofd.SafeFileName.Replace(".ppt", "typezsygppt").Replace(".pptx", "typezsygppt").Replace(".pdf", "typepdf").Trim();
@@ -1103,6 +1119,7 @@ namespace XHWK.WKTool
                     {
                         try
                         {
+                            #region PPT转PDF
                             string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
                             path = pathTemp + path + ".pdf";
                             FileToolsCommon.CreateDirectory(pathTemp);
@@ -1435,6 +1452,22 @@ namespace XHWK.WKTool
                             LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog 导入文档)" + ex.Message, ex);
                         }
                     }
+                    #region 插入页码
+
+                    Dispatcher.Invoke(new Action(() =>
+                    {
+                        PageData = new List<PageData>();
+                        for (int i = 1; i <= APP.pageData.pagenum; i++)
+                        {
+                            PageData pd = new PageData();
+                            pd.PageName = i.ToString();//+ "页";
+                            pd.PageCode = i;
+                            PageData.Add(pd);
+                        }
+                        CbxPageList.ItemsSource = PageData;
+                        CbxPageList.SelectedIndex = APP.pageData.currpage - 1;
+                    }));
+                    #endregion
                 }
             }
             //OpenDialog();
@@ -3543,6 +3576,19 @@ namespace XHWK.WKTool
                 ImgScreenshotTwo.Visibility = Visibility.Collapsed;
                 btnScreenshot.IsEnabled = true;
             }
+
+            #region 插入页码
+            PageData = new List<PageData>();
+            for (int i = 1; i <= APP.pageData.pagenum; i++)
+            {
+                PageData pd = new PageData();
+                pd.PageName = i.ToString();// + "页";
+                pd.PageCode = i;
+                PageData.Add(pd);
+            }
+            CbxPageList.ItemsSource = PageData;
+            CbxPageList.SelectedIndex = APP.pageData.currpage - 1;
+            #endregion
         }
         /// <summary>
         /// 打印事件
@@ -3683,9 +3729,10 @@ namespace XHWK.WKTool
                 HideAngleBorder();
 
                 //隐藏跳转
-                txbCurrpage.Visibility = Visibility.Visible;
-                txtJump.Visibility = Visibility.Hidden;
-                BtnJumpPage.Visibility = Visibility.Hidden;
+                //txbCurrpage.Visibility = Visibility.Visible;
+                //txtJump.Visibility = Visibility.Hidden;
+                //BtnJumpPage.Visibility = Visibility.Hidden;
+
                 //if(!APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation)
                 //{
                 //    ImgWG();
@@ -3778,6 +3825,9 @@ namespace XHWK.WKTool
                     imgCanvas.Source = null;
                     imgDocumentation.Source = null;
                 }
+                #region 修改跳转页码
+                CbxPageList.SelectedIndex = APP.pageData.currpage - 1;
+                #endregion
             }
         }
         private void ImgXY()
@@ -3816,9 +3866,9 @@ namespace XHWK.WKTool
                 HideAngleBorder();
 
                 //隐藏跳转
-                txbCurrpage.Visibility = Visibility.Visible;
-                txtJump.Visibility = Visibility.Hidden;
-                BtnJumpPage.Visibility = Visibility.Hidden;
+                //txbCurrpage.Visibility = Visibility.Visible;
+                //txtJump.Visibility = Visibility.Hidden;
+                //BtnJumpPage.Visibility = Visibility.Hidden;
 
                 //if (!APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation)
                 //{
@@ -4965,6 +5015,8 @@ namespace XHWK.WKTool
             double proportion = 210.0 / 297.0;
             gridM.Height = gridM.ActualWidth / proportion;
         }
+
+        #region 原跳转
         /// <summary>
         /// 跳转页
         /// </summary>
@@ -4978,12 +5030,12 @@ namespace XHWK.WKTool
                 {
                     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();
+                        //txtJump.Text = txbCurrpage.Text;
+                        //txbCurrpage.Visibility = Visibility.Hidden;
+                        //txtJump.Visibility = Visibility.Visible;
+                        //BtnJumpPage.Visibility = Visibility.Visible;
+                        //txtJump.Focus();
+                        //txtJump.SelectAll();
                     }
                 }
                 catch (Exception)
@@ -4999,15 +5051,15 @@ namespace XHWK.WKTool
         private void BtnJumpPage_Click(object sender, RoutedEventArgs e)
         {
             int JumpPage = 0;
-            try
-            {
-                JumpPage = int.Parse(txtJump.Text);
-            }
-            catch (Exception ex)
-            {
-                MessageWindow.Show("操作有误！请输入有效的页码!");
-                return;
-            }
+            //try
+            //{
+            //    JumpPage = int.Parse(txtJump.Text);
+            //}
+            //catch (Exception ex)
+            //{
+            //    MessageWindow.Show("操作有误！请输入有效的页码!");
+            //    return;
+            //}
             if (JumpPage < 1)
             {
                 JumpPage = 1;
@@ -5021,9 +5073,9 @@ namespace XHWK.WKTool
             JumpPageClick();
             #endregion
 
-            txbCurrpage.Visibility = Visibility.Visible;
-            txtJump.Visibility = Visibility.Hidden;
-            BtnJumpPage.Visibility = Visibility.Hidden;
+            //txbCurrpage.Visibility = Visibility.Visible;
+            //txtJump.Visibility = Visibility.Hidden;
+            //BtnJumpPage.Visibility = Visibility.Hidden;
         }
         /// <summary>
         /// 只允许输入数字
@@ -5043,5 +5095,53 @@ namespace XHWK.WKTool
                 BtnJumpPage_Click(null, null);
             }
         }
+        #endregion
+        #region 跳转
+        /// <summary>
+        /// 跳转
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void CbxPageList_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            #region 安全
+            if(CbxPageList.SelectedValue==null)
+            {
+                return;
+            }
+            if (APP.pageData.currpage == int.Parse(CbxPageList.SelectedValue.ToString()))
+            {
+                return;
+            }
+            #endregion
+            int JumpPage = 0;
+            try
+            {
+                JumpPage = int.Parse(CbxPageList.SelectedValue.ToString());
+            }
+            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
+        }
+        #endregion
+    }
+    public class PageData
+    {
+        public int PageCode { get; set; }
+        public string PageName { get; set; }
     }
 }