播放

# Conflicts:
#	XHWK.WKTool/FileDirectoryWindow.xaml.cs

XHWK.WKTool/App.cs

@@ -9,6 +9,7 @@ using System.Security.Principal;
 using System.Security.RightsManagement;
 using System.Threading;
 using System.Windows;
+using System.Windows.Documents;
 using System.Windows.Threading;
 
 using TStudyDigitalPen.HID;
@@ -142,6 +143,7 @@ namespace XHWK.WKTool
                     // 定义Application对象作为整个应用程序入口
                     Application app = new Application();
                     app.Run(W_CreateAMicroLessonWindow);
+                    //Application.Run(W_CreateAMicroLessonWindow);
                 }
                 else
                 {
@@ -161,7 +163,8 @@ namespace XHWK.WKTool
                         return;
                     }
                     //退出
-                    Application.Current.Shutdown();
+                    //Current.Shutdown();
+                    Environment.Exit(0);
 
                 }
                 #endregion
@@ -172,12 +175,6 @@ namespace XHWK.WKTool
                 string ErrMessage = "【进程】(Main):进程意外关闭。 " + ex.Message;
                 LogHelper.WriteErrLog(ErrMessage, ex);
             }
-
-            //app.DispatcherUnhandledException += MyApp_DispatcherUnhandledException;
-            //Application app = new Application();
-            //W_CreateAMicroLessonWindow = new CreateAMicroLessonWindow();
-            //app.Run(W_CreateAMicroLessonWindow);
-            //LogHelper.WriteInfoLog("启动项目");
             StopSameProcess();
             Killffmpeg();
             LatticeFileHelper.RunPrintConfig();

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -142,12 +142,13 @@ namespace XHWK.WKTool
                 {
                     DAL_Upload dAL_Upload = new DAL_Upload();
 
-
                     if (dAL_Upload.UploadVideo(pageData.menuList[i].FileGuid, out string ErrMessage))
                     {
                         pageData.menuList[i].Visi = "Visible";
                         pageData.menuList[i].Coll = "Collapsed";
+
                         DataContext = pageData;
+
                         MessageBox.Show("视频上传成功！");
                     }
                     else
@@ -171,7 +172,27 @@ namespace XHWK.WKTool
             {
                 if (buttons[i] == sender)
                 {
-
+                    foreach (Model_WKData wKData in APP.WKDataList)
+                    {
+                        if (wKData.VideoList == null)
+                            continue;
+                        if(wKData.VideoList.Exists(x=>x.FileGuid==pageData.menuList[i].FileGuid))
+                        {
+                            try
+                            {
+                                FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[i].FileGuid).VideoPath);
+                                FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[i].FileGuid).ThumbnailPath);
+                                wKData.VideoList.Remove(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[i].FileGuid));
+                                Initialize();
+                                return;
+                            }
+                            catch (Exception ex)
+                            {
+                                MessageBox.Show("无法删除视频！"+ex.Message);
+                                return;
+                            }
+                        }
+                    }
                 }
             }
         }

XHWK.WKTool/VideoPlaybackWindow.xaml

@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-         xmlns:local="clr-namespace:WPFMediaPlayerApp"
+        
         mc:Ignorable="d"
         Title="VideoPlaybackWindow" Height="693" Width="1039" AllowsTransparency="True" 
     ShowInTaskbar="False"
@@ -21,13 +21,13 @@
             <TextBlock x:Name="txbVideoName" Text="微课1.mp4" HorizontalAlignment="Center" Foreground="#FFFFFF" FontSize="16"/>
         </Grid>
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Cursor="Hand" x:Name="btnShrink" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnShrink_Click" Margin="8,0,8,0">
+            <Button Cursor="Hand" x:Name="btnShrink" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  Margin="8,0,8,0">
                 <Image Source="./Images/microLessonSystem_19.png"/>
             </Button>
             <Button Cursor="Hand" x:Name="btnEnlarge" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="8,0,8,0">
                         <Image Source="./Images/microLessonSystem_8.png"/>
                     </Button>
-            <Button Cursor="Hand" x:Name="btnDown" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click" >
+            <Button Cursor="Hand" x:Name="btnDown" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  >
                 <Image Source="./Images/microLessonSystem_10.png"/>
             </Button>
         </StackPanel>

XHWK.WKTool/XHWK.WKTool.csproj

@@ -149,6 +149,9 @@
     <Compile Include="UCCamera.xaml.cs">
       <DependentUpon>UCCamera.xaml</DependentUpon>
     </Compile>
+    <Compile Include="VideoPlaybackWindow.xaml.cs">
+      <DependentUpon>VideoPlaybackWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="XHMicroLessonSystemWindow.xaml.cs">
       <DependentUpon>XHMicroLessonSystemWindow.xaml</DependentUpon>
     </Compile>
@@ -181,6 +184,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="VideoPlaybackWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="XHMicroLessonSystemWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>