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

Common/system/FFMpeg.cs

@@ -20,6 +20,10 @@ namespace Common.system
     {
         public Process myProcess = null;
 
+        /// <summary>
+        /// 是否输出录课录屏日志
+        /// </summary>
+        public bool OutputVideoLog = FileToolsCommon.GetConfigValue("OutputVideoLog") != "0";
         /// <summary>
         /// ffmpeg输出日志文件地址  每个文件2MB左右
         /// </summary>
@@ -138,7 +142,10 @@ namespace Common.system
                     myProcess.StartInfo.Arguments = SpeakerStr + MicrophoneStr + " -f gdigrab -i desktop -vcodec libx264 -preset:v ultrafast -tune:v zerolatency -acodec aac " + PathName;
                     break;
             }
-            LogHelper.WriteInfoLog("【录屏】："+myProcess.StartInfo.Arguments);
+            if (OutputVideoLog)
+            {
+                LogHelper.WriteInfoLog("【录屏】：" + myProcess.StartInfo.Arguments);
+            }
             myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
             myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
             myProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
@@ -228,7 +235,8 @@ namespace Common.system
                         MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 " + PathName;
                 }
             }
-            LogHelper.WriteInfoLog("【录音】：" + myProcess.StartInfo.Arguments);
+            if (OutputVideoLog)
+                LogHelper.WriteInfoLog("【录音】：" + myProcess.StartInfo.Arguments);
             myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
             myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
             myProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
@@ -371,6 +379,8 @@ namespace Common.system
                             VideoSavePath;
                         break;
                 }
+                if (OutputVideoLog)
+                    LogHelper.WriteInfoLog("【图片音频合成视频】：" + myProcess.StartInfo.Arguments);
                 myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
                 myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
                 myProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
@@ -471,6 +481,8 @@ namespace Common.system
 
                 myProcess.StartInfo.Arguments = "-f concat  -safe 0 -i " + Path + "temprs/filelist.d -c copy " + FilePath;
             }
+            if (OutputVideoLog)
+                LogHelper.WriteInfoLog("【音视频合成】：" + myProcess.StartInfo.Arguments);
             myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
             myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
             myProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
@@ -595,6 +607,9 @@ namespace Common.system
                 myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
                                                                                                                  //myProcess.StartInfo.Arguments = "-i \"" + VideoPath + "\" -ss 1 -vframes 1 -r 1 -ac 1 -ab 2 -s " + thubWidth + "*" + thubHeight + " -f image2 \"" + ImagePath + "\"";
                 myProcess.StartInfo.Arguments = "-i \"" + VideoPath + "\" -ss 1 -vframes 1 -r 1 -ac 1 -ab 2"+ WHStr + " -f image2 \"" + ImagePath + "\"";
+
+                if (OutputVideoLog)
+                    LogHelper.WriteInfoLog("【生成缩略图】：" + myProcess.StartInfo.Arguments);
                 myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
                 myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
                 myProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
@@ -653,6 +668,9 @@ namespace Common.system
                 LogPath = CreateffmpegLog();
                 myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
                 myProcess.StartInfo.Arguments = "-i " + VideoPathName + " -acodec copy -vcodec libx264 -s " + Width + "*" + Height + " " + VideoSavePathName;
+
+                if (OutputVideoLog)
+                    LogHelper.WriteInfoLog("【视频转码】：" + myProcess.StartInfo.Arguments);
                 myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
                 myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
                 myProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
@@ -741,16 +759,6 @@ namespace Common.system
             }
         }
 
-        //private void P_ErrorDataReceived(object sender, DataReceivedEventArgs e)
-        //{
-        //    //+= new DataReceivedEventHandler((s, message) => { Console.WriteLine(message.Data); })
-        //    using (StreamWriter fs = new StreamWriter("E:\\项目\\测试\\Wpf测试\\bin\\Debug\\ffmpeg\\log.txt", true))
-        //    {
-        //        fs.WriteLine(e.Data);
-        //        Debug.WriteLine(output.Data.ToString());
-        //    }
-        //}
-
         /// <summary>
         /// 获取麦克风
         /// </summary>

Common/system/HttpHelper.cs

@@ -564,7 +564,7 @@ namespace Common.system
                     response.Close();
                     readStream.Close();
                     //MessageWindow.Show(returnValue);
-                    LogHelper.WriteInfoLog("【文件上传】" + returnValue);
+                    //LogHelper.WriteInfoLog("【文件上传】" + returnValue);
                 }
                 return jobResult;
             }

XHWK.WKTool/App.config

@@ -6,6 +6,7 @@
   <appSettings>
     <!--0正式 1测试-->
     <add key="IsDebug" value="1" />
+    <add key="OutputVideoLog" value="0"/>
     <!--图片压缩等级-->
     <add key="ImageCompressionLevel" value="30" />
     <!--文件存放路径  路径\账户名\讲解名称_x.MP4-->

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -43,7 +43,6 @@ namespace XHWK.WKTool
                         if (ImgNum >= 1)
                         {
                             loadingImg(ImgNum);
-                            LogHelper.WriteInfoLog("【" + ImgNum + "】");
                             ImgNum--;
                             Thread.Sleep(changeTime / 22);
                         }
@@ -79,7 +78,6 @@ namespace XHWK.WKTool
             {
                 loadingImg(ImgNum);
                 ImgNum--;
-                LogHelper.WriteInfoLog("【" + ImgNum + "】");
             }
             else
             {

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -3182,25 +3182,26 @@ namespace XHWK.WKTool
         {
             try
             {
-                Dispatcher.Invoke(() =>
+                if (IsStartCount)
                 {
-                    if (IsStartCount)
+                    string FilePathName = ImgPath + RsImgName.Count + ".png";
+                    RsImgName.Add(FilePathName);
+                    #region 设置大小
+                    double RsW = (int)(GridMain.ActualWidth * (PrimaryScreen.DpiX / 96f));
+                    double RsH = (int)(GridMain.ActualHeight * (PrimaryScreen.DpiY / 96f));
+                    if (RsW > 1266)
                     {
-                        string FilePathName = ImgPath + RsImgName.Count + ".png";
-                        RsImgName.Add(FilePathName);
-                        #region 设置大小
-                        //double RsW = (int)(ActualWidth * (PrimaryScreen.DpiX / 96f));
-                        //double RsH = (int)(ActualHeight * (PrimaryScreen.DpiY / 96f));
-                        //if (RsW > 1281)
-                        //{
-                        //    //double Proportion = RsH / RsW;
-                        //    RsW = 1281;
-                        //    //RsH = RsW * Proportion;
-                        //    RsH = 1026;
-                        //}
-                        #endregion         
+                        double Proportion = RsH / RsW;
+                        RsW = 1266;
+                        RsH = RsW * Proportion;
+                        RsH = ((int)RsH) % 2 > 0 ? (int)RsH - 1 : (int)RsH;
+                        //RsH = 898;
+                    }
+                    Dispatcher.Invoke(() =>
+                    {
+                        #endregion
                         //保存图片
-                        ImageHelper.SaveUIToImage(GridMain, FilePathName, gridActWidth, gridActHeight, gridActWidth, gridActHeight);
+                        ImageHelper.SaveUIToImage(GridMain, FilePathName, gridActWidth, gridActHeight, (int)RsW, (int)RsH);
                         //ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)(GridMain.ActualWidth * (PrimaryScreen.DpiX / 96f)), (int)(GridMain.ActualHeight * (PrimaryScreen.DpiY / 96f)), 0, 0);
                         //ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)(ActualWidth * (PrimaryScreen.DpiX / 96f)), (int)(ActualHeight * (PrimaryScreen.DpiY / 96f)), (int)RsW, (int)RsH);
                         //ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)(ActualWidth * (PrimaryScreen.DpiX / 96f)), (int)(ActualHeight * (PrimaryScreen.DpiY / 96f)), 1281, 1026);
@@ -3223,8 +3224,8 @@ namespace XHWK.WKTool
                             txbTime.Text = SRTime.ToString("mm:ss");
                             //});
                         }
-                    }
-                });
+                    });
+                }
             }
             catch (Exception ex)
             {
@@ -4129,9 +4130,9 @@ namespace XHWK.WKTool
             TranslateTransform transform1 = group.Children[1] as TranslateTransform;
             transform1.X = -1 * ((pointToContent.X * transform.ScaleX) - point.X);
             transform1.Y = -1 * ((pointToContent.Y * transform.ScaleY) - point.Y);
-            LogHelper.WriteInfoLog("【img宽高】" + imgCanvas.ActualWidth.ToString() + ":"
-                 + imgCanvas.ActualHeight.ToString() + "百分比:" + transform.ScaleX.ToString() + ":" + transform.ScaleY.ToString()
-                );
+            //LogHelper.WriteInfoLog("【img宽高】" + imgCanvas.ActualWidth.ToString() + ":"
+            //     + imgCanvas.ActualHeight.ToString() + "百分比:" + transform.ScaleX.ToString() + ":" + transform.ScaleY.ToString()
+            //    );
 
             //Console.WriteLine("transform.ScaleX = " + transform.ScaleX + "; transform.ScaleY = " + transform.ScaleY);