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

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

Common/system/FileToolsCommon.cs

@@ -300,13 +300,13 @@ namespace Common.system
         /// 获取一个文件的长度,单位为Byte  
         /// </summary>  
         /// <param name="filePath">文件的绝对路径</param>          
-        public static int GetFileSize(string filePath)
+        public static long GetFileSize(string filePath)
         {
             //创建一个文件对象  
             FileInfo fi = new FileInfo(filePath);
 
             //获取文件的大小  
-            return (int)fi.Length;
+            return fi.Length;
         }
 
         /// <summary>  
@@ -317,9 +317,10 @@ namespace Common.system
         {
             //创建一个文件对象  
             FileInfo fi = new FileInfo(filePath);
-            long size = fi.Length / 1024;
+            //double size = fi.Length / 1024;
+            double size = Math.Round(((double)fi.Length / 1024.0), 2, MidpointRounding.AwayFromZero);
             //获取文件的大小  
-            return double.Parse(size.ToString());
+            return size;
         }
 
         /// <summary>  
@@ -330,9 +331,10 @@ namespace Common.system
         {
             //创建一个文件对象  
             FileInfo fi = new FileInfo(filePath);
-            long size = fi.Length / 1024 / 1024;
+            //double size = fi.Length / 1024 / 1024;
+            double size = Math.Round(((double)fi.Length / 1024.0 / 1024.0), 2, MidpointRounding.AwayFromZero);
             //获取文件的大小  
-            return double.Parse(size.ToString());
+            return size;
         }
         #endregion
 
@@ -536,7 +538,7 @@ namespace Common.system
         public static byte[] FileToBytes(string filePath)
         {
             //获取文件的大小   
-            int fileSize = GetFileSize(filePath);
+            long fileSize = GetFileSize(filePath);
 
             //创建一个临时缓冲区  
             byte[] buffer = new byte[fileSize];
@@ -548,7 +550,7 @@ namespace Common.system
             try
             {
                 //将文件流读入缓冲区  
-                fs.Read(buffer, 0, fileSize);
+                fs.Read(buffer, 0, (int)fileSize);
 
                 return buffer;
             }

XHWK.WKTool/App.cs

@@ -4,6 +4,8 @@ using Common.system;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Reflection;
+using System.Security.Principal;
 using System.Security.RightsManagement;
 using System.Threading;
 using System.Windows;
@@ -123,15 +125,58 @@ namespace XHWK.WKTool
         [STAThread]
         private static void Main()
         {
-            // 定义Application对象作为整个应用程序入口
-            Application app = new Application();
-            UserInfo = new Model_UserInfo();
-             WKDataList = new List<Model_WKData>();
-            WKData = new Model_WKData();
-            VideoList = new List<Model_Video>();
+            try
+            {
+                UserInfo = new Model_UserInfo();
+                WKDataList = new List<Model_WKData>();
+                WKData = new Model_WKData();
+                VideoList = new List<Model_Video>();
+                #region 强制以管理员方式运行 修改人：赵耀 修改时间：2020年9月7日
+                WindowsIdentity identity = WindowsIdentity.GetCurrent();
+                WindowsPrincipal principal = new WindowsPrincipal(identity);
+                //判断当前登录用户是否为管理员
+                if (principal.IsInRole(WindowsBuiltInRole.Administrator))
+                {
+                    //如果是管理员，则直接运行
+                    W_CreateAMicroLessonWindow = new CreateAMicroLessonWindow();
+                    // 定义Application对象作为整个应用程序入口
+                    Application app = new Application();
+                    app.Run(W_CreateAMicroLessonWindow);
+                }
+                else
+                {
+                    //创建启动对象
+                    System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo();
+                    startInfo.UseShellExecute = true;
+                    startInfo.WorkingDirectory = Environment.CurrentDirectory;
+                    startInfo.FileName = Assembly.GetExecutingAssembly().Location;
+                    //设置启动动作,确保以管理员身份运行
+                    startInfo.Verb = "runas";
+                    try
+                    {
+                        System.Diagnostics.Process.Start(startInfo);
+                    }
+                    catch
+                    {
+                        return;
+                    }
+                    //退出
+                    Application.Current.Shutdown();
+
+                }
+                #endregion
+            }
+            catch (Exception ex)
+            {
+
+                string ErrMessage = "【进程】(Main):进程意外关闭。 " + ex.Message;
+                LogHelper.WriteErrLog(ErrMessage, ex);
+            }
+
             //app.DispatcherUnhandledException += MyApp_DispatcherUnhandledException;
-            W_CreateAMicroLessonWindow = new CreateAMicroLessonWindow();
-            app.Run(W_CreateAMicroLessonWindow);
+            //Application app = new Application();
+            //W_CreateAMicroLessonWindow = new CreateAMicroLessonWindow();
+            //app.Run(W_CreateAMicroLessonWindow);
             //LogHelper.WriteInfoLog("启动项目");
             StopSameProcess();
             Killffmpeg();

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -7,7 +7,7 @@
         mc:Ignorable="d"
         Title="MainWindow" Height="341" Width="454"   AllowsTransparency="True"
     ShowInTaskbar="False"
-    WindowStartupLocation="CenterOwner"
+    WindowStartupLocation="CenterScreen"
     WindowStyle="None">
     <Viewbox>
         <Grid Height="341" Width="454" >

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -84,29 +84,7 @@ namespace XHWK.WKTool
                 System.Windows.MessageBox.Show("路径不可为空！");
                 return;
             }
-            APP.WKData.WkPath = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + txbExplainName.Text.Trim() + "/";
-            if (APP.UserInfo != null)
-            {
-                if (!string.IsNullOrWhiteSpace(APP.UserInfo.Username))
-                {
-                    //判断课程是否存在
-                    if (APP.WKDataList.Exists(x => x.WkName == APP.WKData.WkName))
-                    {
-                        MessageBoxResult dr = System.Windows.MessageBox.Show("此微课已存在是否覆盖？", "提示", MessageBoxButton.OKCancel);
-                        if (dr == MessageBoxResult.OK)
-                        {
-                            FileToolsCommon.DeleteDirectory(APP.WKData.WkPath);
-                            FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
-                            APP.WKDataList.RemoveAll(x => x.WkName == APP.WKData.WkName);
-                        }
-                        else
-                        {
-                            return;
-                        }
-                    }
-                    APP.WKData.WkPath += APP.UserInfo.Username + "/";
-                }
-            }
+            APP.WKData.WkPath = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + txbExplainName.Text.Trim() + "/"+APP.UserInfo.Username + "/";
             #endregion
             //创建文件夹
             FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
@@ -114,14 +92,31 @@ namespace XHWK.WKTool
             FileToolsCommon.SetConfigValue("VideoSavePath", txbStoragePath.Text);
             APP.WKData.WkName = txbExplainName.Text;
             APP.WKData.WkCreateDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            //判断微课是否存在，存在则询问
+            if (APP.WKDataList != null&& APP.WKDataList.Count>0)
+            {
+                if (APP.WKDataList.Exists(x => x.WkName == APP.WKData.WkName))
+                {
+                    MessageBoxResult dr = System.Windows.MessageBox.Show("此微课已存在是否覆盖？", "提示", MessageBoxButton.OKCancel);
+                    if (dr == MessageBoxResult.OK)
+                    {
+                        FileToolsCommon.DeleteDirectory(APP.WKData.WkPath);
+                        FileToolsCommon.CreateDirectory(APP.WKData.WkPath);
+                        APP.WKDataList.RemoveAll(x => x.WkName == APP.WKData.WkName);
+                    }
+                    else
+                    {
+                        return;
+                    }
+                }
+            }
             if (APP.W_XHMicroLessonSystemWindow == null)
             {
                 APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
                 //APP.W_XHMicroLessonSystemWindow .Topmost = true;
             }
-            this.Hide();
             APP.W_XHMicroLessonSystemWindow.Show();
-          
+            this.Hide();
         }
         /// <summary>
         /// 窗体移动

XHWK.WKTool/DAL/DAL_Upload.cs

@@ -120,7 +120,27 @@ namespace XHWK.WKTool.DAL
             ErrMessage = "";
             try
             {
-                Model_Video VideoInfo = APP.VideoList.Find(x => x.FileGuid == VideoGuid);
+                Model_Video VideoInfo = null;
+                foreach (Model_WKData Vdata in APP.WKDataList)
+                {
+                    if (Vdata.VideoList == null)
+                        continue;
+                    foreach (Model_Video videoinfo in Vdata.VideoList)
+                    {
+                        if(videoinfo.FileGuid== VideoGuid)
+                        {
+                            VideoInfo = videoinfo;
+                            break;
+                        }
+                    }
+                    if (VideoInfo != null)
+                        break;
+                }
+                if (VideoInfo==null)
+                {
+                    ErrMessage = "未找到课程！";
+                    return false;
+                }
                 string UploadUrl = FileRequestAddress + "/chunkdb/upchunk";
                 if (VideoInfo.IsUpload)
                 {

XHWK.WKTool/FileDirectoryWindow.xaml

@@ -180,7 +180,9 @@
                     FontSize="20"
                     ItemContainerStyle="{StaticResource ListBoxItemContainerStyle}"
                     ItemTemplate="{StaticResource TongjiItem}"
-                    ItemsSource="{Binding menuList}" />
+                    ItemsSource="{Binding menuList}" 
+                           ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                ScrollViewer.VerticalScrollBarVisibility="Disabled"/>
             </Grid>
             <!--第三行 删除 上传 按钮-->
             <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center" Height="32">

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -40,6 +40,7 @@ namespace XHWK.WKTool
             LoadingVideoList();
             int i = 1;
             bool isColour = true;
+            pageData.menuList.Clear();
             //显示视频
             foreach (Model_Video videoinfo in model_VideoList)
             {
@@ -74,7 +75,6 @@ namespace XHWK.WKTool
                     vis= "Collapsed";
                     cos= "Visible";
                 }
-
                 pageData.menuList.Add(new FileDirectoryModel()
                 {
                     SerialNumber = i,
@@ -141,18 +141,21 @@ namespace XHWK.WKTool
                 if (buttons[i] == sender)
                 {
                     DAL_Upload dAL_Upload = new DAL_Upload();
-                    string msg = string.Empty;
-                    bool isOK= dAL_Upload.UploadVideo(pageData.menuList[i].FileGuid,out msg);
-                    if(isOK)
+
+
+                    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
                     {
-                        System.Windows.Forms.MessageBox.Show(msg, "", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Information, System.Windows.Forms.MessageBoxDefaultButton.Button1, System.Windows.Forms.MessageBoxOptions.DefaultDesktopOnly);
-                        return;
+                        MessageBox.Show(ErrMessage);
                     }
+                    
+
                 }
             }
         }

XHWK.WKTool/LoginWindow.xaml.cs

@@ -95,7 +95,9 @@ namespace XHWK.WKTool
                         }
                         else
                         {
-                            APP.W_CreateAMicroLessonWindow.Show();
+                            APP.W_CreateAMicroLessonWindow.Owner = this;
+                            //APP.W_CreateAMicroLessonWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+                            APP.W_CreateAMicroLessonWindow.ShowDialog();
                         }
                     }
                 }

XHWK.WKTool/VideoPlaybackWindow.xaml

@@ -0,0 +1,35 @@
+<Window x:Class="XHWK.WKTool.VideoPlaybackWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        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"
+    WindowStartupLocation="CenterOwner"
+    WindowStyle="None">
+    <Grid Background="#121212">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="37"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="60"/>
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="0" Margin="5,5,5,0">
+
+            <TextBlock Text="预览" HorizontalAlignment="Left" Foreground="#FFFFFF" FontSize="16"/>
+            <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">
+                <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" >
+                <Image Source="./Images/microLessonSystem_10.png"/>
+            </Button>
+        </StackPanel>
+    </Grid>
+</Window>

XHWK.WKTool/VideoPlaybackWindow.xaml.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace XHWK.WKTool
+{
+    /// <summary>
+    /// VideoPlaybackWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class VideoPlaybackWindow : Window
+    {
+        public VideoPlaybackWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -304,14 +304,14 @@ namespace XHWK.WKTool
             if(APP.fileDirectoryWindow==null)
             {
                 APP.fileDirectoryWindow = new FileDirectoryWindow();
-                APP.fileDirectoryWindow.Topmost = true;
+                //APP.fileDirectoryWindow.Topmost = true;
                 APP.fileDirectoryWindow.Owner = this;
             }
             else
             {
-                Initialize();
+                APP.fileDirectoryWindow.Initialize();
             }
-            APP.fileDirectoryWindow.Show();
+            APP.fileDirectoryWindow.ShowDialog();
         }
         /// <summary>
         /// 关闭事件
@@ -704,6 +704,7 @@ namespace XHWK.WKTool
                     if (APP.PageDrawList.Count >= APP.pageData.currpage && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
                     {
                         //imgCanvas.Source = new BitmapImage(new Uri(APP.JPaths[APP.pageData.currpage]));
+                        imgDocumentation.Source = null;
                         imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
                         //btnOk.Visibility = Visibility.Visible;
                         //blackboard_canvas.Visibility = Visibility.Collapsed;
@@ -882,10 +883,12 @@ namespace XHWK.WKTool
                             if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.PageDrawList.Count)
                             {
                                 //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));//cs
-                                imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
+                                imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
+                                imgCanvas.Source = null;
                             }
                             else
                             {
+                                imgDocumentation.Source = null;
                                 imgCanvas.Source = null;
                             }
                         }
@@ -946,10 +949,12 @@ namespace XHWK.WKTool
                             if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.PageDrawList.Count)
                             {
                                 //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));//cs
-                                imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
+                                imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
+                                imgCanvas.Source = null;
                             }
                             else
                             {
+                                imgDocumentation.Source = null;
                                 imgCanvas.Source = null;
                             }
                         }
@@ -1048,36 +1053,6 @@ namespace XHWK.WKTool
         {
             if (IsSuspendR)
             {
-                ImgPrint.Visibility = Visibility.Collapsed;//录制中不可打印
-                ImgPrintTwo.Visibility = Visibility.Visible;
-                btnPrint.IsEnabled = false;
-
-                ImgScreenshot.Visibility = Visibility.Collapsed;//录制中不可截图
-                ImgScreenshotTwo.Visibility = Visibility.Visible;
-                btnScreenshot.IsEnabled = false;
-
-                ImgImport.Visibility = Visibility.Collapsed;//录制中不可导入文档
-                ImgImportTwo.Visibility = Visibility.Visible;
-                btnImport.IsEnabled = false;
-
-                ImgScreenRecording.Visibility = Visibility.Collapsed;//录制中不可录屏
-                ImgScreenRecordingTwo.Visibility = Visibility.Visible;
-                btnScreenRecording.IsEnabled = false;
-
-                ImgUpload.Visibility = Visibility.Collapsed;//录制中不可上传
-                ImgUploadTwo.Visibility = Visibility.Visible;
-                btnUpload.IsEnabled = false;
-
-                ImgMyMine.Visibility = Visibility.Collapsed;//录制中不可点击我的
-                ImgMyMineTwo.Visibility = Visibility.Visible;
-                btnMyMine.IsEnabled = false;
-
-                ImgSetUp.Visibility = Visibility.Collapsed;//录制中不可设置
-                ImgSetUpTwo.Visibility = Visibility.Visible;
-                btnSetUp.IsEnabled = false;
-
-                btnLoginType.IsEnabled = false;
-
                 if (IsFirstR)//是否第一次录制  初始化录制
                 {
                     VideoInfo = new Model_Video();
@@ -1113,6 +1088,39 @@ namespace XHWK.WKTool
                             return;
                         }
                     }
+
+                    #region 禁用按钮
+                    ImgPrint.Visibility = Visibility.Collapsed;//录制中不可打印
+                    ImgPrintTwo.Visibility = Visibility.Visible;
+                    btnPrint.IsEnabled = false;
+
+                    ImgScreenshot.Visibility = Visibility.Collapsed;//录制中不可截图
+                    ImgScreenshotTwo.Visibility = Visibility.Visible;
+                    btnScreenshot.IsEnabled = false;
+
+                    ImgImport.Visibility = Visibility.Collapsed;//录制中不可导入文档
+                    ImgImportTwo.Visibility = Visibility.Visible;
+                    btnImport.IsEnabled = false;
+
+                    ImgScreenRecording.Visibility = Visibility.Collapsed;//录制中不可录屏
+                    ImgScreenRecordingTwo.Visibility = Visibility.Visible;
+                    btnScreenRecording.IsEnabled = false;
+
+                    ImgUpload.Visibility = Visibility.Collapsed;//录制中不可上传
+                    ImgUploadTwo.Visibility = Visibility.Visible;
+                    btnUpload.IsEnabled = false;
+
+                    ImgMyMine.Visibility = Visibility.Collapsed;//录制中不可点击我的
+                    ImgMyMineTwo.Visibility = Visibility.Visible;
+                    btnMyMine.IsEnabled = false;
+
+                    ImgSetUp.Visibility = Visibility.Collapsed;//录制中不可设置
+                    ImgSetUpTwo.Visibility = Visibility.Visible;
+                    btnSetUp.IsEnabled = false;
+
+                    btnLoginType.IsEnabled = false;
+                    #endregion
+
                     IsFirstR = false;
                     RsImgName = new List<string>();
                     timer = new System.Timers.Timer(200);//设置执行一次（false）还是一直执行(true)
@@ -1279,10 +1287,11 @@ 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.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;