工具栏

XHWK.WKTool/PracticeWindow.xaml

@@ -14,6 +14,6 @@
     WindowStyle="None">
     <Grid>
         <Image x:Name="imgCanvas"/>
-        <InkCanvas Grid.Row="0" x:Name="blackboard_canvas" Background="Transparent" Visibility="Visible" Grid.ColumnSpan="2" MouseDown="blackboard_canvas_MouseDown" MouseMove="blackboard_canvas_MouseMove" Width="{Binding ElementName=imgMeasure, Path=ActualWidth}" Height="{Binding ElementName=imgMeasure, Path=ActualHeight}" EditingMode="None" Strokes="{Binding InkStrokes, Mode=TwoWay}" PreviewMouseLeftButtonUp="blackboard_canvas_PreviewMouseLeftButtonUp" />
+        <InkCanvas Grid.Row="0" x:Name="blackboard_canvas" PreviewMouseRightButtonDown="blackboard_canvas_PreviewMouseRightButtonDown" Background="Transparent" Visibility="Visible" Grid.ColumnSpan="2"/>
     </Grid>
 </Window>

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -347,6 +347,49 @@ namespace XHWK.WKTool
             StrokeRound = null;
             StrokeRectangle = null;
         }
+        /// <summary>
+        /// 鼠标右键
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Window_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (APP.W_ScreenRecordingToolbarWindow.flg==10)
+            {
+                APP.W_ScreenRecordingToolbarWindow.flg = 0;
+            }
+            else
+            {
+                APP.W_ScreenRecordingToolbarWindow.flg = 1;
+            }
+            this.Hide();
+        }
+
+        private void blackboard_canvas_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (APP.W_ScreenRecordingToolbarWindow.flg == 10)
+            {
+                APP.W_ScreenRecordingToolbarWindow.flg = 0;
+            }
+            else
+            {
+                APP.W_ScreenRecordingToolbarWindow.flg = 1;
+            }
+            this.Hide();
+        }
+
+        private void blackboard_canvas_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (APP.W_ScreenRecordingToolbarWindow.flg == 10)
+            {
+                APP.W_ScreenRecordingToolbarWindow.flg = 0;
+            }
+            else
+            {
+                APP.W_ScreenRecordingToolbarWindow.flg = 1;
+            }
+            this.Hide();
+        }
     }
 }
 

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -74,24 +74,24 @@
 
             <Image Grid.Row="1"  Source="./Images/Toobar0.png"/>
             <Button Grid.Row="1" x:Name="BtnRecordingScreen" HorizontalAlignment="Left"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="46,0,15,0" Click="BtnRecordingScreen_Click">
-                <Image x:Name="ImgRecordingScreen" Source="./Images/Toobar25.png"/>
+                <Image x:Name="ImgRecordingScreen" Source="./Images/Toobar26.png"/>
             </Button>
-            <TextBlock Grid.Row="1" x:Name="txbTime" Text="00:00" FontSize="20" Foreground="#FFFFFF" Margin="39,80,0,0" Visibility="Hidden"/>
+            <TextBlock Grid.Row="1" x:Name="txbTime" Text="00:00" FontSize="20" Foreground="#FFFFFF" Margin="43,80,0,0" Visibility="Hidden"/>
             <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,15,0">
                 <!--<Button x:Name="BtnRecordingScreen"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0" Click="BtnRecordingScreen_Click">
                     <Image x:Name="ImgRecordingScreen" Source="./Images/Toobar25.png"/>
                 </Button>-->
                 <Button x:Name="BtnStopRecordingScreen" Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnStopRecordingScreen_Click">
-                    <Image x:Name="ImgEndRecordingScreen" Source="./Images/Toobar14.png"/>
+                    <Image x:Name="ImgEndRecordingScreen" Source="./Images/Toobar15.png"/>
                 </Button>
-                <Button  Cursor="Hand" x:Name="btnBlackPenOne" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnBlackPen_Click">
-                    <Image Source="./Images/Toobar27.png"/>
+                <Button  Cursor="Hand" x:Name="btnBlackPenOne" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnBrush_Click">
+                    <Image x:Name="imgBlackPenOne" Source="./Images/31.png"/>
                 </Button>
-                <Button  Cursor="Hand" x:Name="btnBlackPenTwo" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnBlackPen_Click">
-                    <Image Source="./Images/Toobar28.png"/>
+                <Button  Cursor="Hand" x:Name="btnBlackPenTwo" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnBlackPenTwo_Click">
+                    <Image x:Name="imgBlackPenTwo" Source="./Images/31.png"/>
                 </Button>
-                <Button  Cursor="Hand" x:Name="btnBlackPen" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnBlackPen_Click">
-                    <Image Source="./Images/Toobar29.png"/>
+                <Button  Cursor="Hand" x:Name="btnReturn" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,20,0" Click="BtnReturn_Click">
+                    <Image x:Name="imgReturn" Source="./Images/Toobar29.png"/>
                 </Button>
             </StackPanel>
         </Grid>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -58,6 +58,10 @@ namespace XHWK.WKTool
         private TimeSpan _timeSpan = new TimeSpan(0, 0, 0, 0, 0);
 
         KeyboardHookCommon k_hook;
+        /// <summary>
+        /// 🖊状态 0红色 1蓝色 10红色批注内 11蓝色批注内
+        /// </summary>
+       public int flg = 0;
         #endregion
 
         #region 初始化
@@ -87,7 +91,17 @@ namespace XHWK.WKTool
             gridToolbar.Visibility = Visibility.Hidden;
             gridColour.Visibility = Visibility.Hidden;
             gridThickness.Visibility = Visibility.Hidden;
-            ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));
+
+            ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));//大圆圈三角形
+            ImgEndRecordingScreen.Source= new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
+            BtnStopRecordingScreen.IsEnabled = false; //停止录制按钮不点击
+            imgBlackPenOne.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
+            btnBlackPenOne.IsEnabled = false;//蓝笔不可点击
+            imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
+            btnBlackPenTwo.IsEnabled = false;//红笔不可点击
+            imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
+            btnReturn.IsEnabled = true;//返回主界面可点击
+            txbTime.Visibility = Visibility.Hidden;//时间不显示
             if (t == null)
             {
                 t = new DispatcherTimer();
@@ -114,6 +128,7 @@ namespace XHWK.WKTool
                 //结束
                 BtnStopRecordingScreen_Click(null, null);
             }
+
         }
         #endregion
 
@@ -186,9 +201,9 @@ namespace XHWK.WKTool
             FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "tempsr/");
             VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
             int num = 1;
-            while(FileToolsCommon.IsExistFile(VideoSavePathName))
+            while (FileToolsCommon.IsExistFile(VideoSavePathName))
             {
-                VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏_"+ num + "." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
+                VideoSavePathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏_" + num + "." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
                 num++;
             }
         }
@@ -227,8 +242,17 @@ namespace XHWK.WKTool
                 //APP.W_CountdownWindow.Show();
                 //#endregion
 
-                ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
-                txbTime.Visibility = Visibility.Visible;
+
+                ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));//播放状态
+                ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar14.png"));
+                BtnStopRecordingScreen.IsEnabled = true; //停止录制按钮可点击
+                imgBlackPenOne.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar27.png"));
+                btnBlackPenOne.IsEnabled = true;//蓝笔可点击
+                imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar28.png"));
+                btnBlackPenTwo.IsEnabled = true;//红笔可点击
+                imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
+                btnReturn.IsEnabled = false;//返回主界面不可点击
+                txbTime.Visibility = Visibility.Visible;//时间显示
                 try
                 {
                     new Thread(new ThreadStart(new Action(() =>
@@ -245,7 +269,14 @@ namespace XHWK.WKTool
             {
                 TimeOut();
                 IsSuspend = true;
-                ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_14.png"));
+                ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));//大圆圈三角形
+                ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar15.png"));
+                BtnStopRecordingScreen.IsEnabled = false; //停止录制按钮不点击
+                imgBlackPenOne.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
+                btnBlackPenOne.IsEnabled = false;//蓝笔不可点击
+                imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
+                btnBlackPenTwo.IsEnabled = false;//红笔不可点击
+                txbTime.Visibility = Visibility.Hidden;//时间不显示
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
                 {
@@ -257,6 +288,7 @@ namespace XHWK.WKTool
                     Thread.Sleep(2000);
                     Dispatcher.Invoke(() =>
                     {
+                        ImgEndRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar14.png"));
                         BtnRecordingScreen.IsEnabled = true;
                         BtnStopRecordingScreen.IsEnabled = true;
                     });
@@ -282,9 +314,9 @@ namespace XHWK.WKTool
             k_hook.Stop();
             IsSuspend = true;
             txbTime.Text = "00:00";
+            txbTime.Visibility = Visibility.Hidden;
             End();
-            ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
-            if (gridToolbar.Visibility==Visibility.Visible)
+            if (gridToolbar.Visibility == Visibility.Visible)
             {
                 gridToolbar.Visibility = Visibility.Hidden;
                 gridColour.Visibility = Visibility.Hidden;
@@ -372,15 +404,21 @@ namespace XHWK.WKTool
                 Directory.CreateDirectory(tempPath);
             }
             string imagePath = Path.Combine(tempPath, time + ".jpg");
-            //ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath);
-            if (gridToolbar.Visibility == Visibility.Visible)
-            {
-                gridToolbar.Visibility = Visibility.Hidden;
-            }
-            else
+            ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
+
+            try
             {
-                gridToolbar.Visibility = Visibility.Visible;
-                try
+                if (flg == 11)
+                {
+                    flg = 1;
+                    APP.W_PracticeWindow.Hide();
+                }
+                else if(flg==10)
+                {
+                    APP.W_PracticeWindow.Blue();
+                    flg = 11;
+                }
+                else
                 {
                     if (APP.W_PracticeWindow == null)
                     {
@@ -393,15 +431,18 @@ namespace XHWK.WKTool
                         //practiceWin.Owner = this;
                     }
                     APP.W_PracticeWindow.Initialize(imagePath);
+                    flg = 11;
+                    APP.W_PracticeWindow.Blue();
                     APP.W_PracticeWindow.Show();
                 }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteErrLog("【批注（PracticeWindow）" + ex.Message, ex);
-                }
             }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【批注（PracticeWindow）" + ex.Message, ex);
+            }
+
             //imgCanvas.Source = new BitmapImage(new Uri(imagePath));
-         
+
         }
         /// <summary>
         /// 屏幕宽
@@ -609,5 +650,124 @@ namespace XHWK.WKTool
         {
             DragMove();
         }
+        /// <summary>
+        /// 红笔
+        /// </summary>
+        /// <param name="sender"></param> 
+        /// <param name="e"></param>
+        private void BtnBlackPenTwo_Click(object sender, RoutedEventArgs e)
+        {
+            string time = GetTimeStamp();
+            string tempPath = AppDomain.CurrentDomain.BaseDirectory + "temp\\";
+            if (!Directory.Exists(tempPath))
+            {
+                Directory.CreateDirectory(tempPath);
+            }
+            string imagePath = Path.Combine(tempPath, time + ".jpg");
+            ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
+
+            try
+            {
+                if (flg == 10)
+                {
+                    flg = 0;
+                    APP.W_PracticeWindow.Hide();
+                }
+                else if(flg==11)
+                {
+                    flg = 10;
+                    APP.W_PracticeWindow.Red();
+                }
+                else
+                {
+                    if (APP.W_PracticeWindow == null)
+                    {
+                        APP.W_PracticeWindow = new PracticeWindow();
+                        //APP.W_PracticeWindow.Topmost = true;
+                        APP.W_PracticeWindow.Width = pwidth;
+                        APP.W_PracticeWindow.Height = pHeight;
+                        APP.W_PracticeWindow.Left = 0;
+                        APP.W_PracticeWindow.Top = 0;
+                        //practiceWin.Owner = this;
+                    }
+                    APP.W_PracticeWindow.Initialize(imagePath);
+                    flg = 10;
+                    APP.W_PracticeWindow.Red();
+                    APP.W_PracticeWindow.Show();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【批注（PracticeWindow）" + ex.Message, ex);
+            }
+        }
+        /// <summary>
+        /// 鼠标右键按下事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void RightButtonDown()
+        {
+            if (flg > 9)
+            {
+                APP.W_PracticeWindow.Hide();
+            }
+            else
+            {
+                string time = GetTimeStamp();
+                string tempPath = AppDomain.CurrentDomain.BaseDirectory + "temp\\";
+                if (!Directory.Exists(tempPath))
+                {
+                    Directory.CreateDirectory(tempPath);
+                }
+                string imagePath = Path.Combine(tempPath, time + ".jpg");
+                ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), imagePath, true, out BitmapImage bitmap);
+
+                try
+                {
+                    if (APP.W_PracticeWindow == null)
+                    {
+                        APP.W_PracticeWindow = new PracticeWindow();
+                        //APP.W_PracticeWindow.Topmost = true;
+                        APP.W_PracticeWindow.Width = pwidth;
+                        APP.W_PracticeWindow.Height = pHeight;
+                        APP.W_PracticeWindow.Left = 0;
+                        APP.W_PracticeWindow.Top = 0;
+                        //practiceWin.Owner = this;
+                    }
+                    APP.W_PracticeWindow.Initialize(imagePath);
+
+                    if (flg == 0)
+                    {
+                        flg = 10;
+                        APP.W_PracticeWindow.Red();
+                    }
+                    else
+                    {
+                        flg = 11;
+                        APP.W_PracticeWindow.Blue();
+                    }
+                    APP.W_PracticeWindow.Show();
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteErrLog("【批注（PracticeWindow）" + ex.Message, ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 返回主界面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnReturn_Click(object sender, RoutedEventArgs e)
+        {
+            if (APP.W_XHMicroLessonSystemWindow == null)
+            {
+                APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
+            }
+            APP.W_XHMicroLessonSystemWindow.Show();
+            this.Hide();
+        }
     }
 }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -164,7 +164,7 @@
                              MouseLeftButtonUp="IMG1_MouseLeftButtonUp"
                              MouseMove="IMG1_MouseMove"
                              MouseWheel="IMG1_MouseWheel" >
-                                                <Image Name="imgCanvas" Width="635" Height="auto" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Uniform" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseRightButtonDown="imgCanvas_MouseRightButtonDown" Visibility="Collapsed">
+                                                <Image Name="imgCanvas" Width="635" Height="auto" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Uniform" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseRightButtonDown="imgCanvas_MouseRightButtonDown">
                                                 </Image>
                                             </ContentControl>
                                         </ScrollViewer>
@@ -172,7 +172,7 @@
                                 </Border>
                             </Grid>
                             <!--导入图片-->
-                            <Image x:Name="imgDocumentation" Visibility="Collapsed"/>
+                            <Image x:Name="imgDocumentation" Visibility="Visible"/>
                             <!--<Button Cursor="Hand" x:Name="btnOk" Height="50" Width="50" Content="√" FontSize="26" Background="#2E8CF0" Foreground="#FFFFFF" Click="btnOk_Click" Visibility="Collapsed"/>-->
                             <InkCanvas Grid.Row="0" x:Name="blackboard_canvas"  Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2" />
                             <!--摄像头-->
@@ -317,6 +317,10 @@
                     </Button.Template>
                 </Button>
             </Grid>
+                <!--上传-->
+                <Grid Grid.Row="1" x:Name="gridUpload">
+                    
+                </Grid>
             <Grid Grid.Row="2" Background="#EFF1F8" Margin="0,0,0,0">
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,0">
                     <TextBlock Text="颜色：" FontSize="14" Padding="10,10,0,0"/>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -805,8 +805,10 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnScreenshot_Click(object sender, RoutedEventArgs e)
         {
+            APP.ImgPath = string.Empty;
             string time = GetTimeStamp();
             string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory) + time + ".jpg";
+            APP.ImgPath = desktopPath;
             ImageHelper.GetScreenshot(new System.Drawing.Rectangle(0, 0, 0, 0), desktopPath,false,out BitmapImage bitmap);
             if (this.WindowState == WindowState.Normal)//截图隐藏窗口
             {
@@ -840,6 +842,7 @@ namespace XHWK.WKTool
             {
                 if (this.WindowState == WindowState.Minimized)//截图完恢复窗口
                 {
+                    this.Topmost = true;
                     this.WindowState = WindowState.Normal;
                 }
                 if (!string.IsNullOrWhiteSpace(APP.ImgPath) && File.Exists(APP.ImgPath))
@@ -872,6 +875,7 @@ namespace XHWK.WKTool
                         btnPrint.IsEnabled = true;
                     }
                 }
+                this.Topmost = false;
             }
         }
         /// <summary>
@@ -1029,11 +1033,11 @@ namespace XHWK.WKTool
                             }
                             if (APP.pageData.currpage > 0 && APP.pageData.currpage < APP.PageDrawList.Count)
                             {
-                                imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
                                 imgCanvas.Source = null;
                                 ImgScreenshot.Visibility = Visibility.Collapsed;//当前页为导入时不可截图
                                 ImgScreenshotTwo.Visibility = Visibility.Visible;
                                 btnScreenshot.IsEnabled = false;
+                                imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
                             }
                             else
                             {

XHWK.WKTool/XHWK.WKTool.csproj

@@ -1528,5 +1528,13 @@
   <ItemGroup>
     <Resource Include="Images\microLessonSystem_999.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\31.png" />
+    <Resource Include="Images\32.png" />
+    <Resource Include="Images\Toobar27.png" />
+    <Resource Include="Images\Toobar28.png" />
+    <Resource Include="Images\Toobar29.png" />
+    <Resource Include="Images\Toobar30.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>