最新版本

XHWK.WKTool/App.config

@@ -33,8 +33,8 @@
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1" />
     <!--版本号-->
-    <add key="VersionCode" value="21" />
-    <add key="VersionName" value="1.2.0" />
+    <add key="VersionCode" value="23" />
+    <add key="VersionName" value="1.2.2" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <system.web>

XHWK.WKTool/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.2.0")]
+[assembly: AssemblyFileVersion("1.2.2.0")]

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -355,45 +355,7 @@
                 <Label Content="" Grid.Column="1" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,0"/>
                 <!--<TextBlock x:Name="txbTime" Text="123456" FontSize="20" Foreground="#000000" Margin="0,0,0,10" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>-->
             </Grid>
-            <!--页码-->
-            <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
-                <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="180" 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"
-                    Click="last_button_Click">
-
-                        <Button.Content>
-                            <StackPanel>
-                                <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
-                            </StackPanel>
-                        </Button.Content>
-                    </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">
-                            <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>
-                    </Grid>
-                    <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                    x:Name="next_btn"  Background="Transparent"
-                    Width="60" Height="20"
-                    Click="next_btn_Click">
-                        <Button.Content>
-                            <StackPanel>
-                                <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
-                            </StackPanel>
-                        </Button.Content>
-                    </Button>
-                </StackPanel>
-            </Grid>
+            
             <!--设置-->
             <ScrollViewer x:Name="gridSetUp" Grid.Row="1" VerticalScrollBarVisibility="Auto" Visibility="Collapsed">
                 <Grid Grid.Row="1"   Background="#FFFFFF" >
@@ -668,13 +630,51 @@
                     <RadioButton Cursor="Hand" x:Name="rbnFine" Content=" 细" Style="{StaticResource radBase}" FontSize="14" Margin="0,4,0,0" IsChecked="True" Click="RbnFine_Click"/>
                     <RadioButton Cursor="Hand" x:Name="rbnIn" Content=" 中" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,0,0" Click="RbnIn_Click"/>
                     <RadioButton Cursor="Hand" x:Name="rbnCrude" Content=" 粗" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,0,0" Click="RbnCrude_Click"/>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="摄像头：" FontSize="14" Padding="20,3,0,0"/>
-                        <RadioButton Cursor="Hand" x:Name="rbnOpen" Content=" 开" Style="{StaticResource radBase}" FontSize="14" Margin="0,4,0,0" Click="RbnOpen_Click"/>
-                        <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content=" 关" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,0,0" IsChecked="True" Click="RbnTurnOff_Click"/>
-                    </StackPanel>
                 </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">
+                        <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                    x:Name="last_button"
+                    Width="60" Height="20"
+                    Click="last_button_Click">
+
+                            <Button.Content>
+                                <StackPanel>
+                                    <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
+                                </StackPanel>
+                            </Button.Content>
+                        </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">
+                                <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>
+                        </Grid>
+                        <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                    x:Name="next_btn"  Background="Transparent"
+                    Width="60" Height="20"
+                    Click="next_btn_Click">
+                            <Button.Content>
+                                <StackPanel>
+                                    <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
+                                </StackPanel>
+                            </Button.Content>
+                        </Button>
+                    </StackPanel>
+                </Grid>
+
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,5,10,5">
+                    <TextBlock Text="摄像头：" FontSize="14" Padding="20,3,0,0"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnOpen" Content=" 开" Style="{StaticResource radBase}" FontSize="14" Margin="0,4,0,0" Click="RbnOpen_Click"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content=" 关"  Style="{StaticResource radBase}" FontSize="14" Margin="5,4,20,0" IsChecked="True" Click="RbnTurnOff_Click"/>
                     <TextBlock Text="智能笔状态：" FontSize="14" Padding="0,4,0,0"/>
                     <TextBlock x:Name="txbNotConnected" Text="未连接" FontSize="14" Padding="0,4,5,0"/>
                 </StackPanel>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -106,6 +106,10 @@ namespace XHWK.WKTool
         #endregion
         private double screeHeight = SystemParameters.FullPrimaryScreenHeight;
         private double screeWidth = SystemParameters.FullPrimaryScreenWidth;
+        /// <summary>
+        /// 键盘钩子
+        /// </summary>
+        private KeyboardHookCommon k_hook;
         #endregion
 
         #region 初始化
@@ -183,8 +187,9 @@ namespace XHWK.WKTool
             APP.pageData.currpage = APP.pageData.pagenum;
             btnStop.IsEnabled = false;//停止录制按钮不可点击
             #endregion
-
-
+            k_hook = new KeyboardHookCommon();
+            k_hook.KeyDownEvent += K_hook_KeyDownEvent;
+            k_hook.Start();//安装键盘钩子
 
             APP.CameraPosition = FileToolsCommon.GetConfigValue("CameraPosition");
             //创建 DrawingAttributes 类的一个实例  
@@ -204,6 +209,39 @@ namespace XHWK.WKTool
             ImgPDFPath = new string[300];
 
         }
+        /// <summary>
+        /// 快捷键
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void K_hook_KeyDownEvent(object sender, System.Windows.Forms.KeyEventArgs e)
+        {
+            if (e.KeyValue == (int)System.Windows.Forms.Keys.Left)
+            {
+                if(APP.pageData.currpage > 1 )
+                {
+                    //上一页
+                    last_button_Click(null, null);
+                }
+            }
+            if (e.KeyValue == (int)System.Windows.Forms.Keys.Right)
+            {
+                if ( APP.pageData.currpage < APP.pageData.pagenum)
+                {
+                    //下一页
+                    next_btn_Click(null, null);
+                }
+            }
+            //if (e.KeyValue == (int)System.Windows.Forms.Keys.Delete)
+            //{
+            //    if (APP.pageData.currpage < APP.pageData.pagenum)
+            //    {
+            //        //下一页
+            //        next_btn_Click(null, null);
+            //    }
+            //}
+        }
+
         /// <summary>
         /// 开始
         /// </summary>
@@ -3510,6 +3548,7 @@ namespace XHWK.WKTool
                 //}
                 APP.pageData.currpage -= 1;
                 myblackboard.changepage(APP.pageData.currpage - 1);
+                scroMain.ScrollToVerticalOffset(0);
                 if (btnImport.IsEnabled == true)
                 {
                     ///截图可用
@@ -3611,6 +3650,7 @@ namespace XHWK.WKTool
                 //}
                 APP.pageData.currpage += 1;
                 myblackboard.changepage(APP.pageData.currpage - 1);
+                scroMain.ScrollToVerticalOffset(0);
                 if (btnImport.IsEnabled == true)
                 {
                     ///截图可用