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

Common/system/ImageHelper.cs

@@ -4,6 +4,7 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Text;
+using System.Threading;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
@@ -370,6 +371,12 @@ namespace Common.system
                 encoder.Frames.Add(BitmapFrame.Create(bmp));
                 encoder.Save(fs);
                 fs.Close();
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    Bitmap bitmap = CutImageWhitePart(filePathName);
+                    FileToolsCommon.DeleteFile(filePathName);
+                    bitmap.Save(filePathName);
+                }))).Start();
             }
             catch (Exception ex)
             {
@@ -378,5 +385,106 @@ namespace Common.system
             }
         }
         #endregion
+
+        #region 去掉白边
+        /// <summary>
+        /// 裁剪图片（去掉白边）
+        /// </summary>
+        /// <param name="FilePath"></param>
+        public static Bitmap CutImageWhitePart(string FilePath)
+        {
+            Bitmap bmp = new Bitmap(FilePath);
+            //上左右下
+            int top = 0, left = 0, right = bmp.Width, bottom = bmp.Height;
+
+            //寻找最上面的标线,从左(0)到右，从上(0)到下
+            for (int i = 0; i < bmp.Height; i++)//行
+            {
+                bool find = false;
+                for (int j = 0; j < bmp.Width; j++)//列
+                {
+                    System.Drawing.Color c = bmp.GetPixel(j, i);
+                    if (!IsWhite(c))
+                    {
+                        top = i;
+                        find = true;
+                        break;
+                    }
+                }
+                if (find)
+                    break;
+            }
+            //寻找最左边的标线，从上（top位）到下，从左到右
+            for (int i = 0; i < bmp.Width; i++)//列
+            {
+                bool find = false;
+                for (int j = top; j < bmp.Height; j++)//行
+                {
+                    System.Drawing.Color c = bmp.GetPixel(i, j);
+                    if (!IsWhite(c))
+                    {
+                        left = i;
+                        find = true;
+                        break;
+                    }
+                }
+                if (find)
+                    break;
+            }
+            //寻找最下边标线，从下到上，从左到右
+            for (int i = bmp.Height - 1; i >= 0; i--)//行
+            {
+                bool find = false;
+                for (int j = left; j < bmp.Width; j++)//列
+                {
+                    System.Drawing.Color c = bmp.GetPixel(j, i);
+                    if (!IsWhite(c))
+                    {
+                        bottom = i;
+                        find = true;
+                        break;
+                    }
+                }
+                if (find)
+                    break;
+            }
+            //寻找最右边的标线，从上到下，从右往左
+            for (int i = bmp.Width - 1; i >= 0; i--)//列
+            {
+                bool find = false;
+                for (int j = 0; j <= bottom; j++)//行
+                {
+                    System.Drawing.Color c = bmp.GetPixel(i, j);
+                    if (!IsWhite(c))
+                    {
+                        right = i;
+                        find = true;
+                        break;
+                    }
+                }
+                if (find)
+                    break;
+            }
+
+            //克隆位图对象的一部分。
+            System.Drawing.Rectangle cloneRect = new System.Drawing.Rectangle(left, top, right - left, bottom - top);
+            Bitmap cloneBitmap = bmp.Clone(cloneRect, bmp.PixelFormat);
+            bmp.Dispose();
+            //cloneBitmap.Save(@"d:\123.png", ImageFormat.Png);
+            return cloneBitmap;
+        }
+
+        /// <summary>
+        /// 判断是否白色和纯透明色（10点的容差）
+        /// </summary>
+        public static bool IsWhite(System.Drawing.Color c)
+        {
+            //纯透明也是白色,RGB都为255为纯白
+            if (c.A < 10 || (c.R > 245 && c.G > 245 && c.B > 245))
+                return true;
+
+            return false;
+        }
+        #endregion
     }
 }

Common/system/XmlUtilHelper.cs

@@ -136,6 +136,9 @@ namespace Common.system
             return null;
         }
 
+        #endregion
+
+        #region 序列化
         /// <summary>
         /// 实体类转XML
         /// </summary>
@@ -153,9 +156,6 @@ namespace Common.system
                 return sw.ToString();
             }
         }
-        #endregion
-
-        #region 序列化
         /// <summary>
         /// 序列化
         /// </summary>

XHWK.WKTool/App.cs

@@ -4,6 +4,7 @@ using Common.system;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Security.RightsManagement;
 using System.Threading;
 using System.Windows;
 using System.Windows.Threading;
@@ -28,6 +29,10 @@ namespace XHWK.WKTool
         /// </summary>
         public static Model_WKData WKData = null;
         /// <summary>
+        /// 微课视频列表
+        /// </summary>
+        public static List<Model_Video> VideoList = null;
+        /// <summary>
         /// 主页面
         /// </summary>
         public static XHMicroLessonSystemWindow W_XHMicroLessonSystemWindow = null;
@@ -80,14 +85,18 @@ namespace XHWK.WKTool
         {
             // 定义Application对象作为整个应用程序入口
             Application app = new Application();
-            WKData = new Model_WKData();
+            UserInfo = new Model_UserInfo();
+             WKData = new Model_WKData();
+            VideoList = new List<Model_Video>();
             //app.DispatcherUnhandledException += MyApp_DispatcherUnhandledException;
             CreateAMicroLessonWindow win = new CreateAMicroLessonWindow();
             app.Run(win);
             //LogHelper.WriteInfoLog("启动项目");
             StopSameProcess();
         }
-
+        /// <summary>
+        /// 结束已运行的程序
+        /// </summary>
         private static void StopSameProcess()
         {
             Process current = Process.GetCurrentProcess();
@@ -110,6 +119,11 @@ namespace XHWK.WKTool
             }
         }
 
+        /// <summary>
+        /// 错误处理
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void MyApp_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
         {
             LogHelper.WriteErrLog("未标示错误：" + e.Exception.Message, e.Exception);
@@ -117,6 +131,28 @@ namespace XHWK.WKTool
             e.Handled = true;
         }
 
+        /// <summary>
+        /// 保存微课信息
+        /// </summary>
+        public static void SaveWkData()
+        {
+            if(UserInfo == null)
+            {
+                return;
+            }
+            if (!string.IsNullOrWhiteSpace(APP.UserInfo.Username))
+            {
+                WKData.VideoList = VideoList;
+                //string WkDateXmlStr = XmlUtilHelper.Serializer(typeof(Model_WKData), WKData);
+                string WkDateXmlStr = XmlUtilHelper.XmlSerialize(WKData);
+                string SavePath = FileToolsCommon.GetFileAbsolutePath("/Data/" + APP.UserInfo.Username + "/");
+                FileToolsCommon.CreateDirectory(SavePath);
+                
+            }
+            //if(APP.UserInfo)
+            //APP.UserInfo.Wkdata.Add(APP.WKData);
+        }
+
         #region 内存处理 -创建人：赵耀 -创建时间：2020年8月12日
 
         /// <summary>

XHWK.WKTool/CountdownWindow.xaml

@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:XHWK.WKTool"
-        xmlns:gifLib="http://wpfanimatedgif.codeplex.com" ContentRendered="Window_ContentRendered"
+        xmlns:gifLib="http://wpfanimatedgif.codeplex.com"
         mc:Ignorable="d"
         Title="CountdownWindow" Height="450" Width="800"  AllowsTransparency="True"
     ShowInTaskbar="False"

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -12,171 +12,80 @@ namespace XHWK.WKTool
     /// </summary>
     public partial class CountdownWindow : Window
     {
-        /// <summary>
-        /// 计时用
-        /// </summary>
-        private TimeSpan _timeSpan = new TimeSpan(0, 0, 0, 0, 0);
-        DispatcherTimer timer = null;
-        /// <summary>
-        /// 状态
-        /// </summary>
-        private State _state = State.End;
-        /// <summary>
-        /// 计时器状态
-        /// </summary>
-        private enum State
-        {
-            Start,
-            Pause,
-            End
-        }
-        public CountdownWindow()
+        public CountdownWindow(int changeTime = 650)
         {
             InitializeComponent();
+            timer = new System.Timers.Timer(changeTime);//设置执行一次（false）还是一直执行(true)
+            timer.AutoReset = true;//设置是否执行System.Timers.Timer.Elapsed事件
+            timer.Elapsed +=new System.Timers.ElapsedEventHandler(Timer_Elapsed);
             Initialize();
         }
-        public void Initialize()
+        /// <summary>
+        /// 计时器
+        /// </summary>
+        new System.Timers.Timer timer;
+        int ImgNum = 3;
+        public void Initialize(int changeTime=650)
         {
-            //Thread.Sleep(1200);
-            //this.Hide();
-            //MediaElement.Position
-            //((MediaElement)((object)ImgGif)).Position= TimeSpan.Zero;
-            //timer = new DispatcherTimer
-            //{
-            //    Interval = TimeSpan.FromMilliseconds(2500)
-            //};
-            //timer.Tick += Timer_Tick;
-            //timer.Start();
-
-
+            timer.Interval = changeTime;
+            timer.Enabled = true; //启动计时器
+            ImgNum = 3;
+        }
 
-            if (timer == null)
+        private void Timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            if (ImgNum >= 1)
             {
-                timer = new DispatcherTimer();
-                timer.Tick += OnTimer;
-                timer.Interval = new TimeSpan(0, 0, 0, 1);
-                timer.IsEnabled = true;
-                timer.Start();
+                loadingImg(ImgNum);
+                ImgNum--;
             }
-            timer.Interval = new TimeSpan(0, 0, 0, 1);
-            Stack();
-
-      
-                // 开启线程
-                Thread tr = new Thread(new ThreadStart(Countdown))
-                {
-                    IsBackground = true
-                };
-                tr.Start();
-           
-        }
-        private void Countdown()
-        {
-            while (_timeSpan.Seconds <= 2)
+            else
             {
-              
-                if (_timeSpan.Seconds > 1)
+                timer.Enabled = false;
+                Dispatcher.Invoke(() =>
                 {
-                    Dispatcher.Invoke(
-                  DispatcherPriority.Normal,
-                  new Action(() => { imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown_1.png")); })
-                  );
-                 
-                }
-                else if(_timeSpan.Seconds > 0)
-                {
-                    Dispatcher.Invoke(
-                  DispatcherPriority.Normal,
-                  new Action(() => { imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown_2.png")); })
-                  );
-                    
-                }
-                Thread.Sleep(888);
+                    Hide();
+                });
             }
-
-
-                _state = State.End;
-                Dispatcher.Invoke(
-                    DispatcherPriority.Normal,
-                    new Action(() => { this.Hide(); imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown_3.png"));})
-                    );
-          
         }
         /// <summary>
-        /// 结束
+        /// 加载图片
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void End()
+        /// <param name="num"></param>
+        void loadingImg(int num)
         {
-            _state = State.End;
-        }
-
-        /// <summary>
-        /// 时钟回调
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void OnTimer(object sender, EventArgs e)
-        {
-            switch (_state)
+            switch (num)
             {
-                case State.Start:
-                    {
-                        _timeSpan += new TimeSpan(0, 0, 0, 1);
-                    }
+                case 1:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => { 
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown_1.png"));
+                      }));
                     break;
-
-                case State.Pause:
-                    {
-                    }
+                case 2:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown_2.png"));
+                      }));
                     break;
-
-                case State.End:
-                    {
-                        _timeSpan = new TimeSpan();
-                        //_timeSpan = new TimeSpan(0, 23, 12, 45, 54);
-                    }
+                case 3:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown_3.png"));
+                      }));
+                    break;
+                default:
                     break;
             }
-
-         
-        }
-        /// <summary>
-        /// 开始
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Stack()
-        {
-            _state = State.Start;
-        }
-        private void Timer_Tick(object sender, EventArgs e)
-        {
-            this.Hide();
-            timer.Stop();
         }
 
-        /// <summary>
-        /// 跳转页面
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
         private void Window_ContentRendered(object sender, EventArgs e)
         {
-            //Thread.Sleep(800);
-            //imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown_2.png"));
-            //Thread.Sleep(800);
-            //imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown_1.png"));
-            //Thread.Sleep(300);
-            //this.Hide();
 
-            //Initialize();
         }
 
-        private void Image_MediaEnded(object sender, RoutedEventArgs e)
-        {
-            ((MediaElement)sender).Position = ((MediaElement)sender).Position.Add(TimeSpan.FromMilliseconds(10000));
-        }
     }
 }

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -34,6 +34,10 @@ namespace XHWK.WKTool
         /// 是否暂停
         /// </summary>
         bool IsSuspend = true;
+        /// <summary>
+        /// 视频信息
+        /// </summary>
+        Model_Video VideoInfo = null;
         //声明一个 DrawingAttributes 类型的变量  
         DrawingAttributes drawingAttributes;
         #endregion
@@ -78,6 +82,9 @@ namespace XHWK.WKTool
             {
                 if (IsFirstRS)
                 {
+                    VideoInfo = new Model_Video();
+                    VideoInfo.VideoType = (Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"));
+                    VideoInfo.WkType = Enum_WKVidetype.RecordingScreen;
                     RecordingPath = APP.WKData.WkPath;
                     //FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temp/");
                     FileToolsCommon.CreateDirectory(RecordingPath);
@@ -87,7 +94,15 @@ namespace XHWK.WKTool
                         MessageBoxResult dr = System.Windows.MessageBox.Show("已存在录屏，是否覆盖？", "提示", MessageBoxButton.OKCancel);
                         if (dr == MessageBoxResult.OK)
                         {
-                            FileToolsCommon.DeleteFile(VideoSavePathName);
+                            try
+                            {
+                                FileToolsCommon.DeleteFile(VideoSavePathName);
+                                APP.VideoList.RemoveAll(x => x.VidePath == VideoSavePathName);
+                            }
+                            catch (Exception ex)
+                            {
+                                LogHelper.WriteErrLog("【录屏】（BtnRecordingScreen_Click）无法移除视频，" + ex.Message, ex);
+                            }
                         }
                         else
                         {
@@ -107,7 +122,7 @@ namespace XHWK.WKTool
                 else
                 {
                     APP.W_CountdownWindow.Initialize();
-                    APP.W_CountdownWindow.Topmost = true;
+                    //APP.W_CountdownWindow.Topmost = true;
                 }
                 APP.W_CountdownWindow.Show();
                 #endregion
@@ -173,7 +188,12 @@ namespace XHWK.WKTool
                             Thread.Sleep(100);
                         }
                         FileToolsCommon.DeleteFile(ThumbnailPathName);
+                        VideoInfo.VideoSize = FileToolsCommon.GetFileSizeByMB(VideoSavePathName).ToString() + " MB";
+                        VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                        VideoInfo.VidePath = VideoSavePathName;
+                        VideoInfo.ThumbnailPath = ThumbnailPathName;
                         APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName);
+                        APP.VideoList.Add(VideoInfo);
                     }))).Start();
                 }
                 catch (Exception ex)

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -123,6 +123,7 @@
             </Grid>
             <!--主内容-->
             <Grid Grid.Row="1" x:Name="GridMain"  Margin="20,0,20,0" Background="#FFFFFF" Height="793.700787401575" Width="1142.51968503937" Visibility="Visible">
+                <Label Content="" Grid.Column="0" Height="1" Width="1" Background="#FF0F0F0F" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="1,0,0,0"/>
                 <Grid>
                     <Border Grid.Row="1"  CornerRadius="5">
                         <Grid x:Name="IMG" Margin="0,0,0,0">
@@ -131,8 +132,9 @@
                                     <ScaleTransform/>
                                     <TranslateTransform/>
                                 </TransformGroup>
-                            </Grid.Resources>
-                            <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled"   Cursor="SizeAll"
+                                </Grid.Resources>
+                                <Label Content="" Grid.Column="0" HorizontalAlignment="Left" Height="1" VerticalAlignment="Top" Width="1" Background="#FF0F0F0F" Margin="1,0,0,0"/>
+                                <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled"   Cursor="SizeAll"
                   Margin="0,0,0,0" Focusable="False" x:Name="BackFrame">
                                 <ContentControl  MouseLeftButtonDown="IMG1_MouseLeftButtonDown"   
                              MouseLeftButtonUp="IMG1_MouseLeftButtonUp"
@@ -194,6 +196,9 @@
                         </Button.Content>
                     </Button>
                 </StackPanel>
+
+                <Label Content="" Grid.Column="1" Height="1" Width="1" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,21,0"/>
+                <Label Content="" Grid.Column="1" Height="1" Width="1" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,21,0"/>
             </Grid>
             <!--设置-->
             <Grid Grid.Row="1" x:Name="gridSetUp" Margin="20,0,20,0" Background="#FFFFFF" Visibility="Collapsed">

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -37,6 +37,7 @@ namespace XHWK.WKTool
         private System.Windows.Forms.OpenFileDialog ofd;
         //声明一个 DrawingAttributes 类型的变量  
         DrawingAttributes drawingAttributes;
+        Model_Video VideoInfo = null;
         //定义事件
         public event ChangeTextHandler ChangeTextEvent;
         //定义委托
@@ -713,6 +714,9 @@ namespace XHWK.WKTool
             {
                 if (IsFirstR)//是否第一次录制  初始化录制
                 {
+                    VideoInfo = new Model_Video();
+                    VideoInfo.VideoType = (Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"));
+                    VideoInfo.WkType = Enum_WKVidetype.RecordingLessons;
                     RecordingPath = APP.WKData.WkPath;
                     ImgPath = APP.WKData.WkPath + "temp/Image/";
                     AudioPathName = APP.WKData.WkPath + "temp/audio/";
@@ -721,13 +725,22 @@ namespace XHWK.WKTool
                     FileToolsCommon.CreateDirectory(ImgPath);
                     FileToolsCommon.CreateDirectory(AudioPathName);
                     AudioPathName += APP.WKData.WkName + ".MP3";
-                    VideoSavePathName = RecordingPath + APP.WKData.WkName + "_录制." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
+                    VideoSavePathName = RecordingPath + APP.WKData.WkName + "_录制." + VideoInfo.VideoType.ToString();
+                    
                     if (FileToolsCommon.IsExistFile(VideoSavePathName))
                     {
                         MessageBoxResult dr = System.Windows.MessageBox.Show("课程已录制，是否覆盖？", "提示", MessageBoxButton.OKCancel);
                         if (dr == MessageBoxResult.OK)
                         {
-                            FileToolsCommon.DeleteFile(VideoSavePathName);
+                            try
+                            {
+                                FileToolsCommon.DeleteFile(VideoSavePathName);
+                                APP.VideoList.RemoveAll(x => x.VidePath == VideoSavePathName);
+                            }
+                            catch (Exception ex)
+                            {
+                                LogHelper.WriteErrLog("【录制】（StartRecord）无法移除视频，" + ex.Message, ex);
+                            }
                         }
                         else
                         {
@@ -740,25 +753,6 @@ namespace XHWK.WKTool
                     timer.AutoReset = true;//设置是否执行System.Timers.Timer.Elapsed事件
                     timer.Elapsed += new System.Timers.ElapsedEventHandler(Timer_Elapsed);
                     timer.Enabled = true; //启动计时器
-                    #region 保存图片
-                    //new Thread(new ThreadStart(new Action(() =>
-                    //{
-                    //    while (true)
-                    //    {
-                    //        Thread.Sleep(200);
-                    //        if (IsStartCount)
-                    //        {
-                    //            ImgNum++;
-                    //            Dispatcher.Invoke(() =>
-                    //            {
-                    //                lblNumber.Content = ImgNum;
-                    //                string FilePathName = ImgPath + ImgNum + ".png";
-                    //                ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)GridMain.ActualWidth, (int)GridMain.ActualHeight);
-                    //            });
-                    //        }
-                    //    }
-                    //}))).Start();
-                    #endregion
                 }
                 #region 录像倒计时
                 if (APP.W_CountdownWindow == null)
@@ -834,7 +828,7 @@ namespace XHWK.WKTool
                     Dispatcher.Invoke(() =>
                     {
                         string FilePathName = ImgPath + RsImgName.Count + ".png";
-                        ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)GridMain.ActualWidth, (int)GridMain.ActualHeight);
+                        ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)this.ActualWidth, (int)this.ActualHeight);
                         RsImgName.Add(FilePathName);
                     });
                 }
@@ -891,9 +885,14 @@ namespace XHWK.WKTool
                             Thread.Sleep(100);
                         }
                         FileToolsCommon.DeleteFile(ThumbnailPathName);
+                        VideoInfo.VideoSize = FileToolsCommon.GetFileSizeByMB(VideoSavePathName).ToString() + " MB";
+                        VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                        VideoInfo.VidePath = VideoSavePathName;
+                        VideoInfo.ThumbnailPath = ThumbnailPathName;
                         APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName);
+                        APP.VideoList.Add(VideoInfo);
                     }))).Start();
-
+                    //List<Model_Video> VideoList
                 }
                 catch (Exception ex)
                 {