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

Common/system/FFMpeg.cs

@@ -554,5 +554,7 @@ namespace Common.system
             }
             return devs;
         }
+
+
     }
 }

Common/system/FileToolsCommon.cs

@@ -922,5 +922,9 @@ namespace Common.system
         }
         #endregion
         #endregion
+
+        #region 获取媒体文件的播放时长
+
+        #endregion
     }
 }

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -120,7 +120,12 @@ namespace XHWK.WKTool
                     continue;
                 foreach(Model_Video videoinfo in Vdata.VideoList)
                 {
+                    if (string.IsNullOrWhiteSpace(videoinfo.VideoSize)|| videoinfo.VideoSize=="0 MB")
+                    {
+                        videoinfo.VideoSize = FileToolsCommon.GetFileSizeByMB(videoinfo.VideoPath).ToString() + " MB";
+                    }
                     model_VideoList.Add(videoinfo);
+
                 }
             }
         }

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -178,26 +178,6 @@ namespace XHWK.WKTool
                     //FileToolsCommon.DeleteDirectory(APP.WKData.WkPath + "temp/");
                     FileToolsCommon.CreateDirectory(RecordingPath);
                     VideoSavePathName = RecordingPath + APP.WKData.WkName + "_录屏." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
-                    if (FileToolsCommon.IsExistFile(VideoSavePathName))
-                    {
-                        MessageBoxResult dr = System.Windows.MessageBox.Show("已存在录屏，是否覆盖？", "提示", MessageBoxButton.OKCancel);
-                        if (dr == MessageBoxResult.OK)
-                        {
-                            try
-                            {
-                                FileToolsCommon.DeleteFile(VideoSavePathName);
-                                APP.VideoList.RemoveAll(x => x.VideoPath == VideoSavePathName);
-                            }
-                            catch (Exception ex)
-                            {
-                                LogHelper.WriteErrLog("【录屏】（BtnRecordingScreen_Click）无法移除视频，" + ex.Message, ex);
-                            }
-                        }
-                        else
-                        {
-                            return;
-                        }
-                    }
                     IsFirstRS = false;
                 }
                 IsSuspend = false;
@@ -289,7 +269,7 @@ namespace XHWK.WKTool
                             Thread.Sleep(100);
                         }
                         FileToolsCommon.DeleteFile(ThumbnailPathName);
-                        VideoInfo.VideoSize = FileToolsCommon.GetFileSizeByMB(VideoSavePathName).ToString() + " MB";
+                        //VideoInfo.VideoSize = FileToolsCommon.GetFileSizeByMB(VideoSavePathName).ToString() + " MB";
                         VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                         VideoInfo.VideoPath = VideoSavePathName;
                         VideoInfo.ThumbnailPath = ThumbnailPathName;

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -52,7 +52,7 @@
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgScreenRecording" Source="./Images/microLessonSystem_2.png"/>
                             <Image x:Name="ImgScreenRecordingTwo" Source="./Images/microLessonSystem_3.png" Visibility="Collapsed"/>
-                            <TextBlock Text="录屏" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
+                            <TextBlock x:Name="TxbRecordScreenWord" Text="录屏" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
                     <Button Cursor="Hand" x:Name="btnScreenshot" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="30,0,30,0" Click="BtnScreenshot_Click">

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -268,6 +268,27 @@ namespace XHWK.WKTool
                 Login();
                 return;
             }
+            string RecordScreenPathName = APP.WKData.WkPath + APP.WKData.WkName + "_录屏." + ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
+            if (FileToolsCommon.IsExistFile(RecordScreenPathName))
+            {
+                MessageBoxResult dr = System.Windows.MessageBox.Show("已存在录屏，是否覆盖？", "提示", MessageBoxButton.OKCancel);
+                if (dr == MessageBoxResult.OK)
+                {
+                    try
+                    {
+                        FileToolsCommon.DeleteFile(RecordScreenPathName);
+                        APP.VideoList.RemoveAll(x => x.VideoPath == RecordScreenPathName);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteErrLog("【录屏】（BtnRecordingScreen_Click）无法移除视频，" + ex.Message, ex);
+                    }
+                }
+                else
+                {
+                    return;
+                }
+            }
             if (APP.W_ScreenRecordingToolbarWindow == null)
             {
                 APP.W_ScreenRecordingToolbarWindow = new ScreenRecordingToolbarWindow
@@ -288,6 +309,7 @@ namespace XHWK.WKTool
             APP.W_ScreenRecordingToolbarWindow.Topmost = true;
             APP.W_ScreenRecordingToolbarWindow.Show();
             Hide();
+            TxbRecordScreenWord.Text = "已录屏";
         }
         /// <summary>
         /// 上传事件
@@ -1250,7 +1272,7 @@ namespace XHWK.WKTool
                 btnLoginType.IsEnabled = true;
                 IsSuspendR = true;
                 ImgRecord.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_14.png"));
-                TxbRecordingWord.Text = "录制";
+                TxbRecordingWord.Text = "已录制";
                 try
                 {
                     APP.FFmpeg.StopFFmpeg(AudioPathName);
@@ -1288,10 +1310,9 @@ namespace XHWK.WKTool
                         }
                         FileToolsCommon.DeleteFile(ThumbnailPathName);
                         VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                        //VideoInfo.VideoSize = FileToolsCommon.GetFileSizeByMB(VideoSavePathName).ToString() + " MB";
                         VideoInfo.VideoPath = VideoSavePathName;
                         VideoInfo.ThumbnailPath = ThumbnailPathName;
-                        Thread.Sleep(500);
-                        VideoInfo.VideoSize = FileToolsCommon.GetFileSizeByMB(VideoSavePathName).ToString() + " MB";
                         APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName);
                         VideoInfo.FileGuid = Guid.NewGuid().ToString();
                         VideoInfo.IsUpload = false;