Merge remote-tracking branch 'origin/zyy' into zhangxueyang

Common/system/ImageHelper.cs

@@ -403,6 +403,8 @@ namespace Common.system
         /// <param name="ImgHeight">图片高</param>
         public static void SaveUIToImage(FrameworkElement ui, string filePathName, int width, int height, int ImgWidth, int ImgHeight)
         {
+            //SaveUI(ui, filePathName, width, height, ImgWidth, ImgHeight);
+            //return;
             try
             {
                 //在位图中呈现UI元素
@@ -481,8 +483,209 @@ namespace Common.system
                 //Console.WriteLine(ex.Message);
             }
         }
+        public static void SaveUI(FrameworkElement ui, string filePathName, int width, int height, int ImgWidth, int ImgHeight)
+        {
+            try
+            {
+                //在位图中呈现UI元素
+                RenderTargetBitmap bmp = new RenderTargetBitmap(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY, PixelFormats.Pbgra32);
+                bmp.Render(ui);
+
+                BitmapEncoder encoder = new PngBitmapEncoder();
+                encoder.Frames.Add(BitmapFrame.Create(bmp));
+
+                SaveModel saveModel = new SaveModel();
+                saveModel.ImgWidth = ImgWidth;
+                saveModel.ImgHeight = ImgHeight;
+                saveModel.filePathName = filePathName;
+                saveModel.bmp = bmp;
+                //定义切割矩形
+                var cut = new Int32Rect(0, 0, width, height);
+
+                //计算Stride
+
+                var stride = bmp.Format.BitsPerPixel * cut.Width / 8;
 
-        private static void SaveImage(object obj)
+                //声明字节数组
+
+                byte[] data = new byte[cut.Height * stride];
+
+                //调用CopyPixels
+
+                bmp.CopyPixels(cut, data, stride, 0);
+
+                //saveModel.encoder =new PngBitmapEncoder();
+                //foreach (BitmapFrame eitem in encoder.Frames)
+                //{
+                //    saveModel.encoder = new PngBitmapEncoder();
+                //    saveModel.encoder.Frames.Add( eitem );
+                //}
+                Thread myThread = new Thread(SaveImage);
+                myThread.Start(saveModel);
+            }
+            catch (Exception ex)
+            {
+
+            }
+
+        }
+        public static void SaveImage(object model)
+        {
+            try
+            {
+                SaveModel saveModel = (SaveModel)model;
+                int ImgWidth = saveModel.ImgWidth;
+                int ImgHeight = saveModel.ImgHeight;
+                //BitmapEncoder encoder = saveModel.encoder;
+                RenderTargetBitmap bmp = saveModel.bmp;
+                BitmapEncoder encoder = new PngBitmapEncoder();
+                encoder.Frames.Add(BitmapFrame.Create(bmp));
+                string filePathName = saveModel.filePathName;
+            if (ImgWidth > 0)
+            {
+                Bitmap Img = new Bitmap(ImgWidth, ImgHeight);
+                try
+                {
+                    MemoryStream memoryStream = new MemoryStream();
+                    encoder.Save(memoryStream);
+                    new Thread(new ThreadStart(new Action(() =>
+                    {
+                        //System.Drawing.Image img = System.Drawing.Image.FromStream(memoryStream);
+                        Bitmap bit = new Bitmap(memoryStream);
+                        if (ImgWidth - 2 < bit.Width)
+                        {
+                            try
+                            {
+                                Graphics g = Graphics.FromImage(Img);
+                                //g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                                g.DrawImage(bit, new Rectangle(0, 0, ImgWidth, ImgHeight), new Rectangle(0, 0, bit.Width, bit.Height), GraphicsUnit.Pixel);
+                                g.Dispose();
+                            }
+                            catch
+                            {
+                                Img = bit;
+                            }
+                        }
+                        else
+                        {
+                            Img = bit;
+                        }
+                        Img.Save(filePathName);
+                        //Bitmap bitmap = CutImageWhitePart(Img);
+                        //FileToolsCommon.DeleteFile(filePathName);
+                        //bitmap.Save(filePathName);
+                        //bitmap.Dispose();
+                        memoryStream.Dispose();
+                        Img.Dispose();
+                        bit.Dispose();
+                    }))).Start();
+                }
+                catch (Exception ex)
+                {
+
+                }
+            }
+            else
+            {
+                //SaveImageModel sim = new SaveImageModel();
+                //sim.encoder = new PngBitmapEncoder();
+                //sim.encoder = new PngBitmapEncoder();
+                //BitmapFrame test= encoder.Frames[0];
+                //sim.encoder.Frames.Add(BitmapFrame.Create(test));
+                ////sim.encoder.Frames[0].CopyTo(encoder.Frames[0]);
+                ////sim.encoder.CopyTo(encoder);
+                ////encoder.CopyTo(sim.encoder);
+                //sim.FilePath = filePathName;
+                ////sim.bmp = new RenderTargetBitmap(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY, PixelFormats.Pbgra32);
+                ////bmp.CopyTo(sim.bmp);
+                //Thread t1 = new Thread(SaveImage);
+                //t1.Start(sim);
+
+                System.IO.FileStream fs = new System.IO.FileStream(filePathName, System.IO.FileMode.Create);
+                encoder.Save(fs);
+                fs.Close();
+            }
+            }
+            catch (Exception ex)
+            {
+
+            }
+        }
+        /// <summary>
+        /// 截图转换成bitmap
+        /// </summary>
+        /// <param name="element"></param>
+        /// <param name="width">默认控件宽度</param>
+        /// <param name="height">默认控件高度</param>
+        /// <param name="x">默认0</param>
+        /// <param name="y">默认0</param>
+        /// <returns></returns>
+        public static Bitmap ToBitmap(FrameworkElement element, string filePathName, int width = 0, int height = 0, int x = 0, int y = 0)
+        {
+            if (width == 0) width = (int)element.ActualWidth;
+            if (height == 0) height = (int)element.ActualHeight;
+
+            var rtb = new RenderTargetBitmap(width, height, x, y, System.Windows.Media.PixelFormats.Default);
+            rtb.Render(element);
+            var bit = BitmapSourceToBitmap(rtb);
+
+            //测试代码
+            DirectoryInfo d = new DirectoryInfo(System.IO.Path.Combine(Directory.GetCurrentDirectory(), "Cache"));
+            if (!d.Exists) d.Create();
+            bit.Save(System.IO.Path.Combine(d.FullName, "控件截图.png"));
+
+            return bit;
+        }
+
+        /// <summary>
+        /// BitmapSource转Bitmap
+        /// </summary>
+        /// <param name="source"></param>
+        /// <returns></returns>
+        public static Bitmap BitmapSourceToBitmap(BitmapSource source)
+        {
+            return BitmapSourceToBitmap(source, source.PixelWidth, source.PixelHeight);
+        }
+
+        /// <summary>
+        /// Convert BitmapSource to Bitmap
+        /// </summary>
+        /// <param name="source"></param>
+        /// <returns></returns>
+        public static Bitmap BitmapSourceToBitmap(BitmapSource source, int width, int height)
+        {
+            Bitmap bmp = null;
+            try
+            {
+                System.Drawing.Imaging.PixelFormat format = System.Drawing.Imaging.PixelFormat.Format24bppRgb;
+                /*set the translate type according to the in param(source)*/
+                switch (source.Format.ToString())
+                {
+                    case "Rgb24":
+                    case "Bgr24": format = System.Drawing.Imaging.PixelFormat.Format24bppRgb; break;
+                    case "Bgra32": format = System.Drawing.Imaging.PixelFormat.Format32bppPArgb; break;
+                    case "Bgr32": format = System.Drawing.Imaging.PixelFormat.Format32bppRgb; break;
+                    case "Pbgra32": format = System.Drawing.Imaging.PixelFormat.Format32bppArgb; break;
+                }
+                bmp = new Bitmap(width, height, format);
+                BitmapData data = bmp.LockBits(new System.Drawing.Rectangle(System.Drawing.Point.Empty, bmp.Size),
+                    ImageLockMode.WriteOnly,
+                    format);
+                source.CopyPixels(Int32Rect.Empty, data.Scan0, data.Height * data.Stride, data.Stride);
+                bmp.UnlockBits(data);
+            }
+            catch
+            {
+                if (bmp != null)
+                {
+                    bmp.Dispose();
+                    bmp = null;
+                }
+            }
+
+            return bmp;
+        }
+        private static void SaveImage1(object obj)
         {
             SaveImageModel sim = (SaveImageModel)obj;
             //RenderTargetBitmap bmp = sim.bmp;
@@ -627,5 +830,12 @@ namespace Common.system
         public BitmapEncoder encoder { get; set; }
         //public RenderTargetBitmap bmp { get; set; }
     }
-
+    public class SaveModel
+    {
+        public int ImgWidth { get; set; }
+        public int ImgHeight { get; set; }
+        public BitmapEncoder encoder { get; set; }
+        public string filePathName { get; set; }
+        public RenderTargetBitmap bmp { get; set; }
+    }
 }

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -29,7 +29,7 @@ namespace XHWK.WKTool
             ResizeMode = ResizeMode.NoResize;
             if (!APP.CheckScreenCapturerRecorder())
             {
-                MessageWindow.Show("首次运行需安装环境,请在确定后依次点击“OK-Next>-Next>Install”完成安装！");
+                MessageWindow.Show("首次运行需安装环境,请在确定后依次点击“English-OK-Next>-Next>Install”完成安装！");
                 APP.InstallScreenCapturerRecorder();
             }
             txbStoragePath.Text = FileToolsCommon.GetConfigValue("VideoSavePath");

XHWK.WKTool/PrintWindow.xaml.cs

@@ -235,9 +235,6 @@ namespace XHWK.WKTool
             }
             catch (Exception ex)
             {
-
-
-
                 Dispatcher.Invoke(() =>
                 {
                     btnClose.IsEnabled = true;
@@ -335,8 +332,13 @@ namespace XHWK.WKTool
                     bitmap = ImageHelper.ReadBitmapFile(_path);
                     g.DrawImage(bitmap, _rectangle);
                 }
-
-
+                #region 添加箭头
+                string Str = "↑";
+                SolidBrush mybrush= new SolidBrush(Color.Black);  //设置默认画刷颜色
+                Font myfont= new Font("黑体", 14);         //设置默认字体格式
+                g.DrawString(Str, myfont, mybrush,new Rectangle((int)wit - 50, 20,50,50));
+                
+                #endregion
                 backgroudImg.Save(_saveimg);
 
                 g.Dispose();

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -56,10 +56,7 @@ namespace XHWK.WKTool
         /// 状态
         /// </summary>
         private State _state = State.End;
-        /// <summary>
-        /// 计时用
-        /// </summary>
-        private TimeSpan _timeSpan = new TimeSpan(0, 0, 0, 0, 0);
+        
         private KeyboardHookCommon k_hook;
         /// <summary>
         /// 🖊状态 0红色 1蓝色 10红色批注内 11蓝色批注内
@@ -145,11 +142,11 @@ namespace XHWK.WKTool
             {
                 t = new DispatcherTimer();
                 t.Tick += OnTimer;
-                t.Interval = new TimeSpan(0, 0, 0, 1);
+                t.Interval = new TimeSpan(0, 0, 0,0, 300);
                 t.IsEnabled = true;
                 t.Start();
             }
-            t.Interval = new TimeSpan(0, 0, 0, 1);
+            t.Interval = new TimeSpan(0, 0, 0, 0,300);
             //Stack();
             //ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
             //BtnRecordingScreen_Click(null, null);
@@ -199,6 +196,11 @@ namespace XHWK.WKTool
 
         #region 事件
         /// <summary>
+        /// 记录上次执行时间
+        /// </summary>
+        private DateTime Recorddt = DateTime.Now;
+        DateTime SRTime = Convert.ToDateTime("2020-01-01 00:00:00");
+        /// <summary>
         /// 时钟回调
         /// </summary>
         /// <param name="sender"></param>
@@ -209,7 +211,14 @@ namespace XHWK.WKTool
             {
                 case State.Start:
                     {
-                        _timeSpan += new TimeSpan(0, 0, 0, 1);
+                        DateTime dt = DateTime.Now;
+                        TimeSpan ts = dt.Subtract(Recorddt);//时间差   
+                        double tsmi = ts.TotalMilliseconds;
+                        if (tsmi > 500.0)
+                        {
+                            Recorddt = Recorddt.AddMilliseconds(500);
+                            SRTime = SRTime.AddMilliseconds(500);
+                        }
                     }
                     break;
 
@@ -220,16 +229,31 @@ namespace XHWK.WKTool
 
                 case State.End:
                     {
-                        _timeSpan = new TimeSpan();
-                        //_timeSpan = new TimeSpan(0, 23, 12, 45, 54);
+                        SRTime = Convert.ToDateTime("2020-01-01 00:00:00");
+                        //_timeSpan = new TimeSpan();
+                        ////_timeSpan = new TimeSpan(0, 23, 12, 45, 54);
                     }
                     break;
             }
 
-            string time = string.Format("{0:D2}:{1:D2}",/* _timeSpan.Hours,*/ _timeSpan.Minutes, _timeSpan.Seconds);
+            //string time = string.Format("{0:D2}:{1:D2}",/* _timeSpan.Hours,*/ _timeSpan.Minutes, _timeSpan.Seconds);
             //char[] times = time.ToCharArray();
-            txbTime.Text = time;
+            if (SRTime.Hour > 0)
+            {
+                //Dispatcher.Invoke(() =>
+                //{
+                txbTime.Text = SRTime.ToString("HH:mm:ss");
+                //});
+            }
+            else
+            {
+                //Dispatcher.Invoke(() =>
+                //{
+                txbTime.Text = SRTime.ToString("mm:ss");
+                //});
+            }
         }
+
         /// <summary>
         /// 开始
         /// </summary>
@@ -237,6 +261,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void Stack()
         {
+            Recorddt = DateTime.Now;
             _state = State.Start;
         }
         /// <summary>
@@ -556,7 +581,7 @@ namespace XHWK.WKTool
             {
                 try
                 {
-                    if (_timeSpan.Minutes > 0 || _timeSpan.Seconds > 3)
+                    if (SRTime.Hour > 0 || SRTime.Minute > 0 || SRTime.Second > 3)
                     {
                         try
                         {

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -318,18 +318,18 @@
                              MouseWheel="IMG1_MouseWheel" >
                                             </ContentControl>
                                         </ScrollViewer>-->
-                                    <!--图片表框 -->
-                                    <Rectangle x:Name="RectImgBorder" Cursor="SizeAll" Fill="#00000000" HorizontalAlignment="Left" Stroke="#2D8CF0" VerticalAlignment="Top" Width="300" Height="300" Visibility="Hidden" Margin="373,175,0,0" StrokeThickness="4" StrokeDashArray="4 4" SnapsToDevicePixels="True"/>
-                                    <Image Name="imgCanvas" Height="0" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Fill" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseLeftButtonDown="imgCanvas_MouseLeftButtonDown" Focusable="True" MouseMove="imgCanvas_MouseMove" MouseUp="imgCanvas_MouseUp"/>
-                                    <!--四个点 -->
-                                    <Canvas>
-                                        <Thumb x:Name="RectLeftUp" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2"  DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
-                                        <Thumb x:Name="RectRightUp" Cursor="SizeNESW"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="775" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
-                                        <Thumb x:Name="RectLeftDown" Cursor="SizeNESW"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="508" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
-                                        <Thumb x:Name="RectRightDown" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="775" Canvas.Top="508" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
-                                    </Canvas>
-                                </Grid>
-                            </Border>
+                                        <!--图片表框 -->
+                                        <Rectangle x:Name="RectImgBorder" Cursor="SizeAll" Fill="#00000000" HorizontalAlignment="Left" Stroke="#2D8CF0" VerticalAlignment="Top" Width="300" Height="300" Visibility="Hidden" Margin="373,175,0,0" StrokeThickness="4" StrokeDashArray="4 4" SnapsToDevicePixels="True"/>
+                                        <Image x:Name="imgCanvas" Height="0" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Fill" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseLeftButtonDown="imgCanvas_MouseLeftButtonDown" Focusable="True" MouseMove="imgCanvas_MouseMove" MouseUp="imgCanvas_MouseUp"/>
+                                        <!--四个点 -->
+                                        <Canvas>
+                                            <Thumb x:Name="RectLeftUp" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2"  DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
+                                            <Thumb x:Name="RectRightUp" Cursor="SizeNESW"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="775" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
+                                            <Thumb x:Name="RectLeftDown" Cursor="SizeNESW"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="508" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
+                                            <Thumb x:Name="RectRightDown" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="775" Canvas.Top="508" Background="White" BorderBrush="#2D8CF0" BorderThickness="2" DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>
+                                        </Canvas>
+                                    </Grid>
+                                </Border>
                             </Grid>
                             <Image x:Name="imgDocumentation" Visibility="Visible" Stretch="Fill"/>
                             <!--<Grid Width="auto" Height="auto" HorizontalAlignment="Center" VerticalAlignment="Center">
@@ -338,11 +338,11 @@
                                 </Border>
                             </Grid>-->
                             <Image x:Name="imgPPT" Visibility="Visible" VerticalAlignment="Top"/>
-                        <!--导入图片-->
-                        <!--<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"/>
-                        <!--摄像头-->
-                        <!--<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">
+                            <!--导入图片-->
+                            <!--<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"/>
+                            <!--摄像头-->
+                            <!--<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>-->
                             <!--<Image x:Name="imgLoad"
@@ -438,14 +438,16 @@
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
                                     <Border
-                                BorderBrush="{TemplateBinding Control.BorderBrush}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="1"
                                 CornerRadius="2">
-                                        <Border.Background>#EBEFF3</Border.Background>
+                                        <Border.Background>
+                                            <Brush>#EBEFF3</Brush>
+                                        </Border.Background>
                                         <ContentPresenter
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Content="{TemplateBinding ContentControl.Content}" />
+                                    Content="{TemplateBinding Content}" />
                                     </Border>
                                 </ControlTemplate>
                             </Button.Template>
@@ -471,14 +473,16 @@
                         <Button.Template>
                             <ControlTemplate TargetType="{x:Type Button}">
                                 <Border
-                                BorderBrush="{TemplateBinding Control.BorderBrush}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="1"
                                 CornerRadius="2">
-                                    <Border.Background>#2D8CF0</Border.Background>
+                                    <Border.Background>
+                                        <Brush>#2D8CF0</Brush>
+                                    </Border.Background>
                                     <ContentPresenter
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Content="{TemplateBinding ContentControl.Content}" />
+                                    Content="{TemplateBinding Content}" />
                                 </Border>
                             </ControlTemplate>
                         </Button.Template>
@@ -553,11 +557,9 @@
                     x:Name="btnLastPage"
                     Width="60" Height="20"
                     Click="BtnLastPage_Click">
-                                <Button.Content>
-                                    <StackPanel>
-                                        <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
-                                    </StackPanel>
-                                </Button.Content>
+                                <StackPanel>
+                                    <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
+                                </StackPanel>
                             </Button>
                             <Grid Width="60"  Background="Transparent">
                                 <Grid.RowDefinitions>
@@ -576,11 +578,9 @@
                     x:Name="btnNextPage"  Background="Transparent"
                     Width="60" Height="20"
                     Click="BtnNextPage_Click">
-                                <Button.Content>
-                                    <StackPanel>
-                                        <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
-                                    </StackPanel>
-                                </Button.Content>
+                                <StackPanel>
+                                    <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
+                                </StackPanel>
                             </Button>
                         </StackPanel>
                     </Grid>
@@ -645,11 +645,9 @@
                     Width="28" Height="20"
                     Click="last_button_Click">
 
-                            <Button.Content>
-                                <StackPanel>
-                                    <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
-                                </StackPanel>
-                            </Button.Content>
+                            <StackPanel>
+                                <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
+                            </StackPanel>
                         </Button>
                         <Grid Width="60"  Background="Transparent" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
                             <Grid.RowDefinitions>
@@ -668,11 +666,9 @@
                     x:Name="next_btn"  Background="Transparent"
                     Width="28" Height="20"
                     Click="next_btn_Click">
-                            <Button.Content>
-                                <StackPanel>
-                                    <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
-                                </StackPanel>
-                            </Button.Content>
+                            <StackPanel>
+                                <Image Width="16" Height="12" Source=".\Images\class_p2.png" />
+                            </StackPanel>
                         </Button>
                     </StackPanel>
                 </Grid>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -265,75 +265,6 @@ namespace XHWK.WKTool
             }
         }
 
-        /// <summary>
-        /// 开始
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Stack()
-        {
-            _state = State.Start;
-        }
-        /// <summary>
-        /// 暂停
-        /// </summary>
-        private void TimeOut()
-        {
-            _state = State.Pause;
-        }
-        /// <summary>
-        /// 结束
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void End()
-        {
-            _state = State.End;
-        }
-        /// <summary>
-        /// 时钟回调
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void OnTimer(object sender, EventArgs e)
-        {
-            switch (_state)
-            {
-                case State.Start:
-                    {
-                        _timeSpan += new TimeSpan(0, 0, 0, 1);
-                    }
-                    break;
-
-                case State.Pause:
-                    {
-                    }
-                    break;
-
-                case State.End:
-                    {
-                        _timeSpan = new TimeSpan();
-                        //_timeSpan = new TimeSpan(0, 23, 12, 45, 54);
-                    }
-                    break;
-            }
-
-            string time = string.Format("{0:D2}:{1:D2}",/* _timeSpan.Hours,*/ _timeSpan.Minutes, _timeSpan.Seconds);
-            txbTime.Text = time;
-            //txbTime.Text = time;
-        }
-        /// <summary>
-        /// 修改布局
-        /// </summary>
-        public void SetUpLayout()
-        {
-            //宽高比1276，1040
-            //double AspectRatio = 1276.0 / 1040.0;
-            ////System.Drawing.Size des = PrimaryScreen.DESKTOP;
-            //System.Drawing.Size workingArea = PrimaryScreen.WorkingArea;
-            //this.Height = workingArea.Height;
-
-        }
         #endregion
 
         #region 事件
@@ -347,7 +278,6 @@ namespace XHWK.WKTool
             DragMove();
         }
 
-
         #region 摄像头
         private System.Timers.Timer times;
         private List<string> RbnOpen;
@@ -2776,6 +2706,8 @@ namespace XHWK.WKTool
         /// </summary>
         private void W_ScreenRecordingToolbarWindow_Click_stopRecordingScreen()
         {
+            txbTime.Text = "";
+            txbTime.Visibility = Visibility.Hidden;
             txbType.Visibility = Visibility.Visible;
             txbType.Text = "保存中";
             btnScreenRecording.IsEnabled = false;
@@ -2928,19 +2860,7 @@ namespace XHWK.WKTool
                     }
                     #endregion
 
-                    #region 计时器初始化
-
-                    //if (t == null)
-                    //{
-                    //    t = new DispatcherTimer();
-                    //    t.Tick += OnTimer;
-                    //    t.Interval = new TimeSpan(0, 0, 0, 1);
-                    //    t.IsEnabled = true;
-                    //    t.Start();
-                    //}
-                    //t.Interval = new TimeSpan(0, 0, 0, 1);
                     txbTime.Visibility = Visibility.Visible;
-                    #endregion
 
                     VideoInfo = new Model_Video
                     {
@@ -3326,8 +3246,6 @@ namespace XHWK.WKTool
                     //根据录制时间长度确定是否保存
                     if (SRTime.Hour > 0 || SRTime.Minute > 0 || SRTime.Second > 3)
                     {
-                        txbType.Visibility = Visibility.Visible;
-                        txbType.Text = "保存中";
                         #region 2秒内不可点击
                         new Thread(new ThreadStart(new Action(() =>
                         {
@@ -3359,6 +3277,8 @@ namespace XHWK.WKTool
                                 //End();
                                 txbTime.Text = "";
                                 txbTime.Visibility = Visibility.Hidden;
+                                txbType.Visibility = Visibility.Visible;
+                                txbType.Text = "保存中";
                             });
                             //}))).Start();
                             //new Thread(new ThreadStart(new Action(() =>
@@ -3455,9 +3375,6 @@ namespace XHWK.WKTool
                         timer.Dispose();
                         IsFirstR = true;
 
-
-
-
                         BtnRecord.IsEnabled = true;
                         btnStop.IsEnabled = true;
                         TxbRecordingWord.Text = "录制";
@@ -4671,17 +4588,6 @@ namespace XHWK.WKTool
             }
         }
         /// <summary>
-        /// 位置确定
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnOk_Click(object sender, RoutedEventArgs e)
-        {
-            //APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
-            //btnOk.Visibility = Visibility.Collapsed;
-            //blackboard_canvas.Visibility = Visibility.Visible;
-        }
-        /// <summary>
         /// 引用user32.dll动态链接库（windows api），
         /// 使用库中定义 API：SetCursorPos
         /// 设置光标位置