zhao：1修改转码设置 2录制设置统一大小

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -2289,6 +2289,7 @@ namespace XHWK.WKTool
         }
 
         #endregion
+
         #region 新上传 显示缩略图
         #region 初始值
         /// <summary>
@@ -2333,7 +2334,7 @@ namespace XHWK.WKTool
                 //根据页面大小获取每页显示的数量 H300W250
                 int videoRow = (int)((GridMyVideo.ActualHeight - 50) / 300);
                 int videColumn = (int)(GridMyVideo.ActualWidth / 250);
-                PageShowNum = videoRow * videColumn;
+                PageShowNum = (videoRow == 0 ? 1 : videoRow) * (videColumn == 0 ? 1 : videColumn);
                 //获取总页数
                 TotalPage = model_VideoList.Count / PageShowNum + (model_VideoList.Count % PageShowNum > 0 ? 1 : 0);
                 //如果当前页大于总页数 总页数为当前页
@@ -2445,6 +2446,7 @@ namespace XHWK.WKTool
         }
         #endregion
         #endregion
+
         #region 录制窗口
         #region 变量
         /// <summary>
@@ -2504,6 +2506,15 @@ namespace XHWK.WKTool
         /// 录制计时
         /// </summary>
         private DateTime SRTime = DateTime.Now;
+        /// <summary>
+        /// 录制大小
+        /// </summary>
+        int gridActWidth = 1276;
+        /// <summary>
+        /// 录制大小
+        /// </summary>
+        int gridActHeight = 898;
+        
         #endregion
 
         #region 录屏
@@ -2800,6 +2811,13 @@ namespace XHWK.WKTool
                     //blackboard_canvas.Cursor = System.Windows.Input.Cursors.Pen;
                     #endregion
 
+                    #region 设置录制大小
+                    //gridActWidth = (int)GridMain.ActualWidth==0?1276: (int)GridMain.ActualWidth;
+                    //gridActHeight = (int)GridMain.ActualHeight==0?898: (int)GridMain.ActualHeight;
+                    gridActWidth = 1276;
+                    gridActHeight = 898;
+                    #endregion
+
                     #region 录像倒计时
                     if (APP.W_CountdownWindow == null)
                     {
@@ -2825,6 +2843,7 @@ namespace XHWK.WKTool
                     //};//设置执行一次（false）还是一直执行(true)
                     //timer.Elapsed += new System.Timers.ElapsedEventHandler(Timer_Elapsed);
                     //timer.Enabled = true; //启动计时器
+
                 }
 
                 //继续录制
@@ -3072,8 +3091,6 @@ namespace XHWK.WKTool
                     FileToolsCommon.CreateDirectory(ThumbnailPath);
                     //缩略图存储位置
                     string ThumbnailPathName = ThumbnailPath + FileToolsCommon.GetIOFileName(VideoSavePathName).Replace(".", "") + ".JPG";
-                    int gridActWidth = (int)GridMain.ActualWidth;
-                    int gridActHeight = (int)GridMain.ActualHeight;
                     APP.FFmpeg.StopFFmpeg(AudioPathName);
                     new Thread(new ThreadStart(new Action(() =>
                     {
@@ -3149,8 +3166,6 @@ namespace XHWK.WKTool
                         //生成缩略图
                         bool ThuRes = APP.FFmpeg.GenerateThumbnails(VideoSynthesisPathName, ThumbnailPathName,200,130);
                         Thread.Sleep(500);
-                        int imgW = (int)GridMain.ActualWidth + (((int)GridMain.ActualWidth) % 2 > 0 ? 1 : 0);
-                        int imgH = (int)GridMain.ActualHeight + (((int)GridMain.ActualHeight) % 2 > 0 ? 1 : 0);
                         //if (ThuRes)
                         //{
                         //    Bitmap bmp = ImageHelper.ReadBitmapFile(ThumbnailPathName);
@@ -3161,7 +3176,7 @@ namespace XHWK.WKTool
                         //    }
                         //}
 
-                        APP.FFmpeg.VideoTranscode(VideoSynthesisPathName, VideoSavePathName, imgW, imgH);
+                        APP.FFmpeg.VideoTranscode(VideoSynthesisPathName, VideoSavePathName, gridActWidth, gridActHeight);
                         VideoInfo.FileGuid = Guid.NewGuid().ToString();
                         VideoInfo.IsUpload = false;
                         VideoInfo.Uploaded = 0;