工具栏

Common/system/ImageHelper.cs

@@ -158,8 +158,11 @@ namespace Common.system
         /// <returns></returns>
         public static string GetTempImagePath()
         {
+            TimeSpan ts = DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0);
+            
             string TempPath=FileToolsCommon.GetFileAbsolutePath("/temp/Screenshot/");
             FileToolsCommon.CreateDirectory(TempPath);
+            TempPath += Convert.ToInt64(ts.TotalMilliseconds).ToString() + ".jpg";
             return TempPath;
         }
         #endregion 截图统一方法

XHWK.Model/Model_Screenshot.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XHWK.Model
+{
+    public class Model_Screenshot
+    {
+        private string _imgPath;
+        private int _subscript;
+        /// <summary>
+        /// 图片地址
+        /// </summary>
+        public string ImgPath { get => _imgPath; set => _imgPath = value; }
+        /// <summary>
+        /// 图片下标
+        /// </summary>
+        public int Subscript { get => _subscript; set => _subscript = value; }
+      
+    }
+}

XHWK.Model/XHWK.Model.csproj

@@ -43,6 +43,7 @@
   <ItemGroup>
     <Compile Include="Model_Canvas.cs" />
     <Compile Include="Model_Page.cs" />
+    <Compile Include="Model_Screenshot.cs" />
     <Compile Include="Model_UserInfo.cs" />
     <Compile Include="Model_Video.cs" />
     <Compile Include="Model_WKData.cs" />

XHWK.WKTool/App.cs

@@ -2,6 +2,7 @@
 using Common.system;
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using System.Windows;
@@ -51,6 +52,10 @@ namespace XHWK.WKTool
         /// </summary>
         public static JieTuWindow W_JieTuWindow = null;
         /// <summary>
+        /// 批注
+        /// </summary>
+        public static PracticeWindow W_PracticeWindow = null;
+        /// <summary>
         /// 登陆状态 false 未登录 true已登陆
         /// </summary>
         public static bool IsLoginType = false;
@@ -60,9 +65,14 @@ namespace XHWK.WKTool
         /// </summary>
         public static long num = 9999;
         /// <summary>
-        /// 图片路径
+        /// 导入图片路径
         /// </summary>
         public static string[] Paths = new string[] { };
+        /// <summary>
+        /// 截图图片路径
+        /// </summary>
+        public static string[] JPaths = new string[999];
+        public static string ImgPath = string.Empty;
         #endregion
 
         [STAThread]

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -98,7 +98,7 @@ namespace XHWK.WKTool
                 _state = State.End;
                 Dispatcher.Invoke(
                     DispatcherPriority.Normal,
-                    new Action(() => { this.Hide(); })
+                    new Action(() => { this.Hide(); imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown_3.png"));})
                     );
           
         }

XHWK.WKTool/JieTuWindow.xaml.cs

@@ -15,6 +15,8 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using XHWK.WKTool;
+using static XHWK.WKTool.XHMicroLessonSystemWindow;
 
 namespace ComeCapture
 {
@@ -79,7 +81,7 @@ namespace ComeCapture
                 Directory.CreateDirectory(tempPath);
             }
             string imagePath = Path.Combine(tempPath, time + ".jpg");
-            Background = new ImageBrush(ImageHelper.GetScreenshot(new Rectangle(0, 0, 0, 0), imagePath));
+            Background = new ImageBrush(ImageHelper.GetScreenshot(new Rectangle(0, 0, 0, 0), null));
         }
 
         public void initialization()
@@ -209,8 +211,8 @@ namespace ComeCapture
 
         #endregion 保存
 
-        ////定义事件
-        //public event ChangeTextHandler ChangeTextEvent;
+        //定义事件
+        public event ChangeTextHandler ChangeTextEvent;
 
         #region 获取截图
 
@@ -223,8 +225,10 @@ namespace ComeCapture
             {
                 Directory.CreateDirectory(tempPath);
             }
+            APP.ImgPath = string.Empty;
             string imagePath = Path.Combine(tempPath, time + ".jpg");
-            LogHelper.WriteInfoLog(imagePath);
+            APP.ImgPath = imagePath;
+            //LogHelper.WriteInfoLog(imagePath);
             //this.Close();
             //string imagePath = ImageHelper.GetImagePath(out string serverSavePath);
 
@@ -281,10 +285,10 @@ namespace ComeCapture
             Visibility = Visibility.Hidden;
             ShowInTaskbar = false;
             //this.Hide();
-            //if (ChangeTextEvent != null)
-            //{
-            //    ChangeTextEvent("关闭窗口");
-            //}
+            if (ChangeTextEvent != null)
+            {
+                ChangeTextEvent("关闭窗口");
+            }
         }
 
         #endregion 获取截图

XHWK.WKTool/PracticeWindow.xaml

@@ -0,0 +1,19 @@
+<Window x:Class="XHWK.WKTool.PracticeWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        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:local="clr-namespace:XHWK.WKTool"
+        mc:Ignorable="d"
+        Title="PracticeWindow"  Width="1280"
+    Height="800"
+    AllowsTransparency="True"
+    Background="Transparent"
+    Opacity="1"
+    ShowInTaskbar="False"
+    WindowStyle="None">
+    <Grid>
+        <Image x:Name="imgCanvas"/>
+        <InkCanvas Grid.Row="0" x:Name="blackboard_canvas" Background="Transparent" Visibility="Visible" Grid.ColumnSpan="2" />
+    </Grid>
+</Window>

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace XHWK.WKTool
+{
+    /// <summary>
+    /// PracticeWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class PracticeWindow : Window
+    {
+        public PracticeWindow()
+        {
+            InitializeComponent();
+        }
+        public void Initialize(string _imgPath)
+        {
+            if(File.Exists(_imgPath))
+            {
+                imgCanvas.Source = new BitmapImage(new Uri(_imgPath));
+            }
+        }
+    }
+}

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -18,6 +18,8 @@
                 <RowDefinition Height="auto"/>
                 <RowDefinition Height="auto"/>
             </Grid.RowDefinitions>
+            <Image x:Name="imgCanvas" Visibility="Collapsed"/>
+            <InkCanvas Grid.Row="0" x:Name="blackboard_canvas" Background="Transparent" Visibility="Collapsed" Grid.RowSpan="2" />
             <!--画笔工具栏-->
             <Grid Grid.Row="0" x:Name="gridToolbar" Visibility="Visible">
                 <Image Grid.Row="0"  Source="./Images/Toobar22.png" HorizontalAlignment="Right"/>
@@ -49,28 +51,28 @@
                 </StackPanel>
             </Grid>
             <!--字体颜色-->
-            <Grid Grid.Row="0" x:Name="gridColour" Visibility="Collapsed">
+            <Grid Grid.Row="0" x:Name="gridColour" Visibility="Visible">
                 <Image Source="./Images/Toobar20.png" HorizontalAlignment="Right" Margin="0,200,62,0"/>
                 <StackPanel Orientation="Vertical" HorizontalAlignment="Right" Margin="0,215,68,0">
-                    <Button  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="15" Width="15" Margin="0,0,0,0"/>
-                    <Button  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FF0000" Height="15" Width="15" Margin="0,8,0,0"/>
-                    <Button  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#A7A9AC" Height="15" Width="15" Margin="0,8,0,0"/>
-                    <Button  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#63D600" Height="15" Width="15" Margin="0,8,0,0"/>
-                    <Button  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFBC00" Height="15" Width="15" Margin="0,8,0,0"/>
-                    <Button  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#00B4FC" Height="15" Width="15" Margin="0,8,0,0"/>
+                    <Button  Cursor="Hand" x:Name="btnWhite" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="15" Width="15" Margin="0,0,0,0" Click="BtnWhite_Click"/>
+                    <Button  Cursor="Hand" x:Name="btnRed" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FF0000" Height="15" Width="15" Margin="0,8,0,0" Click="BtnRed_Click"/>
+                    <Button  Cursor="Hand" x:Name="btnGray" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#A7A9AC" Height="15" Width="15" Margin="0,8,0,0" Click="BtnGray_Click"/>
+                    <Button  Cursor="Hand" x:Name="btnCyanBlue" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#63D600" Height="15" Width="15" Margin="0,8,0,0" Click="BtnCyanBlue_Click"/>
+                    <Button  Cursor="Hand" x:Name="btnYellow" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFBC00" Height="15" Width="15" Margin="0,8,0,0" Click="BtnYellow_Click"/>
+                    <Button  Cursor="Hand" x:Name="btnBlue" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#00B4FC" Height="15" Width="15" Margin="0,8,0,0" Click="BtnBlue_Click"/>
                 </StackPanel>
             </Grid>
             <!--字体粗细-->
             <Grid Grid.Row="0" x:Name="gridThickness" Visibility="Collapsed">
                 <Image Grid.Row="0"  Source="./Images/Toobar21.png" HorizontalAlignment="Right" Margin="0,200,62,0"/>
-            <StackPanel Grid.Row="0" Orientation="Vertical" HorizontalAlignment="Right" Margin="0,260,62,0">
-                <Button  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="3" Width="20" Margin="0,0,0,0"/>
-                <Button  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="5" Width="20" Margin="0,10,0,0"/>
-                <Button  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="10" Width="20" Margin="0,10,0,0"/>
-            </StackPanel>
+                <StackPanel Grid.Row="0" Orientation="Vertical" HorizontalAlignment="Right" Margin="0,260,62,0">
+                    <Button  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="3" Width="20" Margin="0,0,0,0"/>
+                    <Button  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="5" Width="20" Margin="0,10,0,0"/>
+                    <Button  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="10" Width="20" Margin="0,10,0,0"/>
+                </StackPanel>
             </Grid>
-            
-                <Image Grid.Row="1"  Source="./Images/Toobar0.png"/>
+
+            <Image Grid.Row="1"  Source="./Images/Toobar0.png"/>
             <TextBlock Grid.Row="1" Text="01:35" FontSize="23" Foreground="#FFFFFF" Margin="30,50,0,0"/>
             <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">

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -2,8 +2,11 @@
 
 using System;
 using System.Configuration;
+using System.IO;
 using System.Threading;
 using System.Windows;
+using System.Windows.Ink;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using XHWK.Model;
 
@@ -31,6 +34,8 @@ namespace XHWK.WKTool
         /// 是否暂停
         /// </summary>
         bool IsSuspend = true;
+        //声明一个 DrawingAttributes 类型的变量  
+        DrawingAttributes drawingAttributes;
         #endregion
 
         #region 初始化
@@ -46,6 +51,12 @@ namespace XHWK.WKTool
         /// </summary>
         public void Initialize()
         {
+            //创建 DrawingAttributes 类的一个实例  
+            drawingAttributes = new DrawingAttributes();
+            //将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用  
+            //InkCanvas 通过 DefaultDrawingAttributes 属性来获取墨迹的各种设置，该属性的类型为 DrawingAttributes 型  
+            blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
+            drawingAttributes.FitToCurve = true;
             //隐藏画笔工具栏
             BtnToolbarDown_Click(null, null);
         }
@@ -189,6 +200,14 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnBrush_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);
             if (gridToolbar.Visibility == Visibility.Visible)
             {
                 gridToolbar.Visibility = Visibility.Hidden;
@@ -197,6 +216,44 @@ namespace XHWK.WKTool
             {
                 gridToolbar.Visibility = Visibility.Visible;
             }
+            //imgCanvas.Source = new BitmapImage(new Uri(imagePath));
+            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);
+                APP.W_PracticeWindow.ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【批注（PracticeWindow）" + ex.Message, ex);
+            }
+        }
+        /// <summary>
+        /// 屏幕宽
+        /// </summary>
+        internal double pwidth = SystemParameters.PrimaryScreenWidth;
+
+        /// <summary>
+        /// 屏幕高
+        /// </summary>
+        internal double pHeight = SystemParameters.PrimaryScreenHeight;
+        /// <summary>
+        /// 获取时间戳
+        /// </summary>
+        /// <returns></returns>
+        public string GetTimeStamp()
+        {
+            TimeSpan ts = DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0);
+            return Convert.ToInt64(ts.TotalMilliseconds).ToString();
         }
         /// <summary>
         /// 画笔粗细事件
@@ -219,5 +276,60 @@ namespace XHWK.WKTool
             gridThickness.Visibility = Visibility.Collapsed;
         }
         #endregion
+
+        /// <summary>
+        /// 白色
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnWhite_Click(object sender, RoutedEventArgs e)
+        {
+            drawingAttributes.Color = Colors.White;
+        }
+        /// <summary>
+        /// 红色
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnRed_Click(object sender, RoutedEventArgs e)
+        {
+            drawingAttributes.Color = Colors.Red;
+        }
+        /// <summary>
+        /// 黄色
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnYellow_Click(object sender, RoutedEventArgs e)
+        {
+            drawingAttributes.Color = Colors.Gold;
+        }
+        /// <summary>
+        /// 青色
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnCyanBlue_Click(object sender, RoutedEventArgs e)
+        {
+            drawingAttributes.Color = Colors.LimeGreen;
+        }
+        /// <summary>
+        /// 灰色
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnGray_Click(object sender, RoutedEventArgs e)
+        {
+            drawingAttributes.Color = Colors.Gray;
+        }
+        /// <summary>
+        /// 蓝色
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnBlue_Click(object sender, RoutedEventArgs e)
+        {
+            drawingAttributes.Color = Colors.DeepSkyBlue;
+        }
     }
 }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -122,35 +122,32 @@
                 </StackPanel>
             </Grid>
             <!--主内容-->
-            <Grid Grid.Row="1" x:Name="GridMain"  Margin="20,0,20,0" Background="#FFFFFF" Height="793.700787401575" Width="1142.51968503937" Visibility="Collapsed">
-                <Grid.Resources>
-                    <TransformGroup x:Key="ImageTransformResource">
-                        <ScaleTransform />
-                        <TranslateTransform />
-                    </TransformGroup>
-                </Grid.Resources>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="79*" />
-                    <ColumnDefinition Width="1063*"/>
-                </Grid.ColumnDefinitions>
-                <Rectangle Grid.Column="0" x:Name="MasterImage"
-MouseLeftButtonDown="MasterImage_MouseLeftButtonDown"
-MouseLeftButtonUp="MasterImage_MouseLeftButtonUp"
-MouseMove="MasterImage_MouseMove"
-MouseWheel="MasterImage_MouseWheel" Grid.ColumnSpan="2" Margin="0,0,0.4,-0.299">
-                    <Rectangle.Fill>
-                        <VisualBrush Transform="{StaticResource ImageTransformResource}" Stretch="Uniform">
-                            <VisualBrush.Visual>
-                                <Image x:Name="imgCanvas" Height="760"/>
-                            </VisualBrush.Visual>
-                        </VisualBrush>
-                    </Rectangle.Fill>
-                </Rectangle>
-
-                <!--<Image Grid.Row="0" x:Name="imgCanvas" Height="760"/>-->
-                <InkCanvas Grid.Row="0" x:Name="blackboard_canvas" Background="Transparent" Visibility="Visible" Grid.ColumnSpan="2" Margin="0,0,0.4,-0.299"/>
+            <Grid Grid.Row="1" x:Name="GridMain"  Margin="20,0,20,0" Background="#FFFFFF" Height="793.700787401575" Width="1142.51968503937" Visibility="Visible">
+                <Grid>
+                    <Border Grid.Row="1"  CornerRadius="5">
+                        <Grid x:Name="IMG" Margin="0,0,0,0">
+                            <Grid.Resources>
+                                <TransformGroup x:Key="Imageview">
+                                    <ScaleTransform/>
+                                    <TranslateTransform/>
+                                </TransformGroup>
+                            </Grid.Resources>
+                            <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled"   Cursor="SizeAll"
+                  Margin="0,0,0,0" Focusable="False" x:Name="BackFrame">
+                                <ContentControl  MouseLeftButtonDown="IMG1_MouseLeftButtonDown"   
+                             MouseLeftButtonUp="IMG1_MouseLeftButtonUp"
+                             MouseMove="IMG1_MouseMove"
+                             MouseWheel="IMG1_MouseWheel" >
+                                    <Image Name="imgCanvas" Width="800" Height="600" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}"  RenderOptions.BitmapScalingMode="NearestNeighbor">
+                                    </Image>
+                                </ContentControl>
+                            </ScrollViewer>
+                        </Grid>
+                    </Border>
+                </Grid>
+                <InkCanvas Grid.Row="0" x:Name="blackboard_canvas" Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2" />
                 <!--摄像头-->
-                <wfi:WindowsFormsHost Grid.Row="0" Grid.Column="1" x:Name="wfhCamera" Height="124" Width="172" HorizontalAlignment="Right" Margin="0,10,10.4,0" VerticalAlignment="Top">
+                <wfi:WindowsFormsHost Grid.Row="0" Grid.Column="1" x:Name="wfhCamera" Height="124" Width="172" HorizontalAlignment="Right" Margin="0,10,30.10,0" VerticalAlignment="Top">
                     <aforge:VideoSourcePlayer x:Name="player" Height="124" Width="172"  />
                 </wfi:WindowsFormsHost>
                 <StackPanel Grid.Row="0" Orientation="Horizontal" Background="#FFFFFF" Width="240" HorizontalAlignment="Right"
@@ -211,7 +208,7 @@ MouseWheel="MasterImage_MouseWheel" Grid.ColumnSpan="2" Margin="0,0,0.4,-0.299">
                 </StackPanel>
             </Grid>
             <!--设置-->
-            <Grid Grid.Row="1" x:Name="gridSetUp" Margin="20,0,20,0" Background="#FFFFFF" Visibility="Visible">
+            <Grid Grid.Row="1" x:Name="gridSetUp" Margin="20,0,20,0" Background="#FFFFFF" Visibility="Collapsed">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="120"/>
                     <RowDefinition Height="90"/>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -53,6 +53,10 @@ namespace XHWK.WKTool
         private System.Windows.Forms.OpenFileDialog ofd;
         //声明一个 DrawingAttributes 类型的变量  
         DrawingAttributes drawingAttributes;
+        //定义事件
+        public event ChangeTextHandler ChangeTextEvent;
+        //定义委托
+        public delegate void ChangeTextHandler(string text);
         #endregion
 
         #region 初始化
@@ -167,9 +171,11 @@ namespace XHWK.WKTool
                 APP.W_ScreenRecordingToolbarWindow.Initialize();
             }
             //显示在右下角
-            APP.W_ScreenRecordingToolbarWindow.Show();
+
             APP.W_ScreenRecordingToolbarWindow.Left = PrimaryScreen.DESKTOP.Width - APP.W_ScreenRecordingToolbarWindow.Width - 10;
             APP.W_ScreenRecordingToolbarWindow.Top = PrimaryScreen.DESKTOP.Height - APP.W_ScreenRecordingToolbarWindow.Height - 60;
+            APP.W_ScreenRecordingToolbarWindow.Topmost = true;
+            APP.W_ScreenRecordingToolbarWindow.Show();
             Hide();
         }
         /// <summary>
@@ -295,12 +301,12 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnWhite_Click(object sender, RoutedEventArgs e)
         {
-            //创建 DrawingAttributes 类的一个实例  
-            drawingAttributes = new DrawingAttributes();
-            //将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用  
-            //InkCanvas 通过 DefaultDrawingAttributes 属性来获取墨迹的各种设置，该属性的类型为 DrawingAttributes 型  
-            blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
-            //设置 DrawingAttributes 的 Color 属性设置颜色  
+            ////创建 DrawingAttributes 类的一个实例  
+            //drawingAttributes = new DrawingAttributes();
+            ////将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用  
+            ////InkCanvas 通过 DefaultDrawingAttributes 属性来获取墨迹的各种设置，该属性的类型为 DrawingAttributes 型  
+            //blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
+            ////设置 DrawingAttributes 的 Color 属性设置颜色  
             drawingAttributes.Color = Colors.White;
         }
         /// <summary>
@@ -440,14 +446,39 @@ namespace XHWK.WKTool
             {
                 APP.W_JieTuWindow = new JieTuWindow();
                 // 订阅事件
-                //APP.W_JieTuWindow.ChangeTextEvent += new ChangeTextHandler(frm_ChangeTextEvent);
-                //APP.W_JieTuWindow.click_closeJietuWindowClick += JietuWindow_click_closeJietuWindowClick;
+                APP.W_JieTuWindow.ChangeTextEvent += new ChangeTextHandler(frm_ChangeTextEvent);
+                APP.W_JieTuWindow.click_closeJietuWindowClick += JietuWindow_click_closeJietuWindowClick;
                 APP.W_JieTuWindow.Show();
             }
 
             //imgCanvas.Source = new BitmapImage(new Uri(desktopPath));
         }
         /// <summary>
+        /// 截图关闭窗口
+        /// </summary>
+        /// <param name="text"></param>
+        private void frm_ChangeTextEvent(string text)
+        {
+            if ("关闭窗口".Equals(text))
+            {
+                if(!string.IsNullOrWhiteSpace(APP.ImgPath)&&File.Exists(APP.ImgPath))
+                {
+                    APP.JPaths[APP.pageData.currpage]= APP.ImgPath;
+                    if(!string.IsNullOrWhiteSpace(APP.JPaths[APP.pageData.currpage]))
+                    {
+                        imgCanvas.Source = new BitmapImage(new Uri(APP.JPaths[APP.pageData.currpage]));
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// 截图关闭 非正常关闭截图时，截图清空
+        /// </summary>
+        private void JietuWindow_click_closeJietuWindowClick()
+        {
+            APP.W_JieTuWindow = null;
+        }
+        /// <summary>
         /// 获取时间戳
         /// </summary>
         /// <returns></returns>
@@ -584,6 +615,8 @@ namespace XHWK.WKTool
                 Login();
                 return;
             }
+
+            blackboard_canvas.Visibility = Visibility.Visible;
             StartRecord();
         }
         /// <summary>
@@ -598,6 +631,7 @@ namespace XHWK.WKTool
                 Login();
                 return;
             }
+            blackboard_canvas.Visibility = Visibility.Collapsed;
             EndRecord();
         }
         System.Timers.Timer timer;
@@ -857,6 +891,10 @@ namespace XHWK.WKTool
                         imgCanvas.Source = null;
                     }
                 }
+                if (!string.IsNullOrWhiteSpace(APP.JPaths[APP.pageData.currpage]))
+                {
+                    imgCanvas.Source = new BitmapImage(new Uri(APP.JPaths[APP.pageData.currpage]));
+                }
             }
 
         }
@@ -883,6 +921,10 @@ namespace XHWK.WKTool
                         imgCanvas.Source = null;
                     }
                 }
+                if (!string.IsNullOrWhiteSpace(APP.JPaths[APP.pageData.currpage]))
+                {
+                    imgCanvas.Source = new BitmapImage(new Uri(APP.JPaths[APP.pageData.currpage]));
+                }
             }
         }
         /// <summary>
@@ -895,6 +937,7 @@ namespace XHWK.WKTool
             APP.pageData.pagenum += 1;
             APP.pageData.currpage = APP.pageData.pagenum;
             myblackboard.changepage(APP.pageData.currpage - 1);
+            imgCanvas.Source = null;
         }
         /// <summary>
         /// 将Word文档转换为图片的方法（该方法基于第三方DLL），你可以像这样调用该方法： ConvertPDF2Image("F:\\PdfFile.doc", "F:\\",
@@ -977,70 +1020,95 @@ namespace XHWK.WKTool
             return sf;
         }
 
-
-
-
-
-
-        private bool m_IsMouseLeftButtonDown;
-
-        private void MasterImage_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        #region 图像缩放，移动
+        private bool mouseDown;
+        private System.Windows.Point mouseXY;
+        private void IMG1_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
-            Rectangle rectangle = sender as Rectangle;
-            if (rectangle == null)
+            var img = sender as ContentControl;
+            if (img == null)
+            {
                 return;
+            }
+            img.CaptureMouse();
+            mouseDown = true;
+            mouseXY = e.GetPosition(img);
+            Console.WriteLine("mouseXY.X = " + mouseXY.X + "; mouseXY.Y = " + mouseXY.Y);
 
-            rectangle.ReleaseMouseCapture();
-            m_IsMouseLeftButtonDown = false;
         }
-
-        private Point m_PreviousMousePoint;
-        private void MasterImage_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        private void PicEMap_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            Rectangle rectangle = sender as Rectangle;
-            if (rectangle == null)
+            System.Windows.Point point = e.GetPosition(imgCanvas);
+            //Console.WriteLine("PicEmap.X = " + point.X + "; PicEmap.Y = " + point.Y);
+            //if ((point.X - 304) * (point.X - 304) + (point.Y - 86) * (point.Y - 86) < 100) 
+            //{
+            //    Console.WriteLine("在范围内");
+            //}
+        }
+        private void IMG1_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            var img = sender as ContentControl;
+            if (img == null)
+            {
                 return;
-
-            rectangle.CaptureMouse();
-            m_IsMouseLeftButtonDown = true;
-            m_PreviousMousePoint = e.GetPosition(rectangle);
+            }
+            img.ReleaseMouseCapture();
+            mouseDown = false;
         }
-
-        private void MasterImage_MouseMove(object sender, System.Windows.Input.MouseEventArgs e)
+        private void IMG1_MouseMove(object sender, System.Windows.Input.MouseEventArgs e)
         {
-            Rectangle rectangle = sender as Rectangle;
-            if (rectangle == null)
+            var img = sender as ContentControl;
+            if (img == null)
+            {
                 return;
-
-            if (m_IsMouseLeftButtonDown)
-                DoImageMove(rectangle, e);
+            }
+            if (mouseDown)
+            {
+                Domousemove(img, e);
+            }
         }
-
-        private void DoImageMove(Rectangle rectangle, System.Windows.Input.MouseEventArgs e)
+        private void Domousemove(ContentControl img, System.Windows.Input.MouseEventArgs e)
         {
-            //Debug.Assert(e.LeftButton == MouseButtonState.Pressed); 
             if (e.LeftButton != MouseButtonState.Pressed)
+            {
                 return;
+            }
+            var group = IMG.FindResource("Imageview") as TransformGroup;
+            var transform = group.Children[1] as TranslateTransform;
+            var position = e.GetPosition(img);
+            transform.X -= mouseXY.X - position.X;
+            transform.Y -= mouseXY.Y - position.Y;
+            mouseXY = position;
+        }
+        private void IMG1_MouseWheel(object sender, MouseWheelEventArgs e)
+        {
+            var img = sender as ContentControl;
+            if (img == null)
+            {
+                return;
+            }
+            var point = e.GetPosition(img);
+            Console.WriteLine("point.X = " + point.X + "; point.Y=" + point.Y);
+            var PicLocate = e.GetPosition(imgCanvas);
+            Console.WriteLine("PicEmap.X = " + PicLocate.X + "; PicEmap.Y=" + PicLocate.Y);
 
-            TransformGroup group = GridMain.FindResource("ImageTransformResource") as TransformGroup;
-            Debug.Assert(group != null);
-            TranslateTransform transform = group.Children[1] as TranslateTransform;
-            Point position = e.GetPosition(rectangle);
-            transform.X += position.X - m_PreviousMousePoint.X;
-            transform.Y += position.Y - m_PreviousMousePoint.Y;
 
-            m_PreviousMousePoint = position;
+            var group = IMG.FindResource("Imageview") as TransformGroup;
+            var delta = e.Delta * 0.001;
+            DowheelZoom(group, point, delta);
         }
-
-        private void MasterImage_MouseWheel(object sender, MouseWheelEventArgs e)
+        private void DowheelZoom(TransformGroup group, System.Windows.Point point, double delta)
         {
-            TransformGroup group = GridMain.FindResource("ImageTransformResource") as TransformGroup;
-            Debug.Assert(group != null);
-            ScaleTransform transform = group.Children[0] as ScaleTransform;
-            transform.ScaleX += e.Delta * 0.001;
-            transform.ScaleY += e.Delta * 0.001;
+            var pointToContent = group.Inverse.Transform(point);
+            var transform = group.Children[0] as ScaleTransform;
+            if (transform.ScaleX + delta < 0.1) return;
+            transform.ScaleX += delta;
+            transform.ScaleY += delta;
+            var transform1 = group.Children[1] as TranslateTransform;
+            transform1.X = -1 * ((pointToContent.X * transform.ScaleX) - point.X);
+            transform1.Y = -1 * ((pointToContent.Y * transform.ScaleY) - point.Y);
+            //Console.WriteLine("transform.ScaleX = " + transform.ScaleX + "; transform.ScaleY = " + transform.ScaleY);
         }
-
-
+        #endregion
     }
 }

XHWK.WKTool/XHWK.WKTool.csproj

@@ -118,6 +118,9 @@
     <Compile Include="Models\EntityBase.cs" />
     <Compile Include="Models\Limit.cs" />
     <Compile Include="Models\Tool.cs" />
+    <Compile Include="PracticeWindow.xaml.cs">
+      <DependentUpon>PracticeWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ScreenRecordingToolbarWindow.xaml.cs">
       <DependentUpon>ScreenRecordingToolbarWindow.xaml</DependentUpon>
     </Compile>
@@ -144,6 +147,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="PracticeWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>