zhao：修改FFMPEG类

Common/system/FFMpeg.cs

@@ -17,7 +17,7 @@ namespace Common.system
     /// </summary>
     public class FFMpeg
     {
-        Process myProcess = null;
+        public Process myProcess = null;
         /// <summary>
         /// ffmpeg输出日志文件地址  每个文件2MB左右
         /// </summary>
@@ -28,13 +28,16 @@ namespace Common.system
         /// <param name="FilePath">文件存储路径</param>
         public void StartRecordingVideo(string FilePath)
         {
+            while (myProcess != null)
+            {
+                Thread.Sleep(100);
+            }
             //路径
-            string Path = FileToolsCommon.GetDirectoryName(FilePath) + @"\";
+            string Path = FileToolsCommon.GetDirectoryName(FilePath);
             string Extension = FileToolsCommon.GetIOExtension(FilePath);//扩展名
             //文件保存路径
             string PathName = GetFilePathName(FilePath);
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-            Debug.WriteLine(KillProcessArray.Length.ToString());
             foreach (var KillProcess in KillProcessArray)
             {
                 KillProcess.Kill();
@@ -95,8 +98,13 @@ namespace Common.system
         /// <param name="Mp3Path">MP3音频位置</param>
         public void StartRecordingAudio(string Mp3Path)
         {
+            while (myProcess != null)
+            {
+                Thread.Sleep(100);
+            }
+            //文件保存路径
+            string PathName = GetFilePathName(Mp3Path);
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-            Debug.WriteLine(KillProcessArray.Length.ToString());
             foreach (var KillProcess in KillProcessArray)
             {
                 KillProcess.Kill();
@@ -107,12 +115,12 @@ namespace Common.system
             string MicrophoneName = GetMicrophone();
             if (string.IsNullOrWhiteSpace(MicrophoneName))
             {
-                myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" " + Mp3Path;
+                myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" " + PathName;
             }
             else
             {
                 myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\"  -f dshow -i audio=\"" +
-                        MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 " + Mp3Path;
+                        MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 " + PathName;
             }
             myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
             myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
@@ -127,14 +135,29 @@ namespace Common.system
         /// <summary>
         /// 暂停录制
         /// </summary>
-        public void SuspendFFmpeg()
+        public bool SuspendFFmpeg()
         {
-            if (myProcess == null)
-                return;
-            myProcess.StandardInput.WriteLine("q");//在这个进程的控制台中模拟输入q,用于暂停录制
-            myProcess.Close();//关闭进程
-            myProcess.Dispose();//释放资源
+            if (myProcess != null)
+            {
+                myProcess.StandardInput.WriteLine("q");//在这个进程的控制台中模拟输入q,用于暂停录制
+                myProcess.Close();//关闭进程
+                myProcess.Dispose();//释放资源
+            }
+            #region 进程是否已经释放
+            bool IsRunning = true;
+            while (IsRunning)
+            {
+                IsRunning = false;
+                Process[] ProcessArray = Process.GetProcessesByName("ffmpeg");
+                foreach (var KillProcess in ProcessArray)
+                {
+                    IsRunning = true;
+                    Thread.Sleep(100);
+                }
+            }
+            #endregion
             myProcess = null;
+            return true;
             //myProcess.Kill();
         }
 
@@ -142,17 +165,32 @@ namespace Common.system
         /// 停止录制并合成文件
         /// </summary>
         /// <param name="FilePath">文件存储路径 必须与开始时的路径完全一致</param>
-        public void StopFFmpeg(string FilePath)
+        public bool StopFFmpeg(string FilePath)
         {
             //文件完整路径
-            if (myProcess == null)
-                return;
-            myProcess.StandardInput.WriteLine("q");//在这个进程的控制台中模拟输入q,用于暂停录制
-            myProcess.Close();//关闭进程
-            myProcess.Dispose();//释放资源
+            if (myProcess != null)
+            {
+                myProcess.StandardInput.WriteLine("q");//在这个进程的控制台中模拟输入q,用于暂停录制
+                myProcess.Close();//关闭进程
+                myProcess.Dispose();//释放资源
+            }
+            #region 进程是否已经释放
+            bool IsRunning = true;
+            while (IsRunning)
+            {
+                IsRunning = false;
+                Process[] ProcessArray = Process.GetProcessesByName("ffmpeg");
+                foreach (var KillProcess in ProcessArray)
+                {
+                    IsRunning = true;
+                    Thread.Sleep(100);
+                }
+            }
+            #endregion
             myProcess = null;
             Thread t1 = new Thread(MergeVideoOrAudio);
             t1.Start(FilePath);
+            return true;
             //文件合成
         }
 
@@ -167,14 +205,16 @@ namespace Common.system
         /// <param name="VideoHeight">视频高度</param>
         public void SynthesisVideo(string ImageListPath, string Mp3Path, string VideoSavePath, int Frequency, int VideoWidth, int VideoHeight)
         {
-            Thread thread = new Thread(delegate ()
+            new Thread(new ThreadStart(new Action(() =>
             {
-                //// 允许不同线程间的调用
-                //Control.CheckForIllegalCrossThreadCalls = false;
                 Thread.Sleep(500);
+                while (myProcess != null)
+                {
+                    Thread.Sleep(100);
+                }
                 string Extension = FileToolsCommon.GetIOExtension(VideoSavePath);//扩展名
                 Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-                Debug.WriteLine(KillProcessArray.Length.ToString());
+                //Debug.WriteLine(KillProcessArray.Length.ToString());
                 foreach (var KillProcess in KillProcessArray)
                 {
                     KillProcess.Kill();
@@ -220,23 +260,53 @@ namespace Common.system
                 myProcess.WaitForExit();           //阻塞等待进程结束
                 myProcess.Close();                 //关闭进程
                 myProcess.Dispose();               //释放资源
-                                                   //生成视频后删除图片保存列表
-                FileToolsCommon.DeleteDirectory(ImageListPath);
-            });
+                #region 进程是否已经释放
+                bool IsRunning = true;
+                while (IsRunning)
+                {
+                    IsRunning = false;
+                    Process[] ProcessArray = Process.GetProcessesByName("ffmpeg");
+                    foreach (var KillProcess in ProcessArray)
+                    {
+                        IsRunning = true;
+                        Thread.Sleep(100);
+                    }
+                }
+                #endregion
+                myProcess = null;
+                //生成视频后删除图片和音频保存列表
+                //FileToolsCommon.DeleteDirectory(ImageListPath);
+                //FileToolsCommon.DeleteDirectory(FileToolsCommon.GetDirectoryName(Mp3Path));
+
+                //Dispatcher.Invoke(() =>
+                //{
+                //});
+                //// 允许不同线程间的调用
+                //Control.CheckForIllegalCrossThreadCalls = false;
+            }))).Start();
         }
 
         /// <summary>
         /// 视频音频合成
         /// </summary>
         /// <param name="FilePath">存储路径</param>
-        void MergeVideoOrAudio(object FilePathobj)
+        public void MergeVideoOrAudio(object FilePathobj)
         {
-            Thread.Sleep(500);
+            //new Thread(new ThreadStart(new Action(() =>
+            //{
+            //Dispatcher.Invoke(() =>
+            //{
+            //});
+            //}))).Start();
+
+            while (myProcess != null)
+            {
+                Thread.Sleep(100);
+            }
             //路径
             string FilePath = (string)FilePathobj;
-            string Path = FileToolsCommon.GetDirectoryName(FilePath) + @"\";
+            string Path = FileToolsCommon.GetDirectoryName(FilePath);
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-            Debug.WriteLine(KillProcessArray.Length.ToString());
             foreach (var KillProcess in KillProcessArray)
             {
                 KillProcess.Kill();
@@ -256,6 +326,20 @@ namespace Common.system
             myProcess.WaitForExit();           //阻塞等待进程结束
             myProcess.Close();                 //关闭进程
             myProcess.Dispose();               //释放资源
+            #region 进程是否已经释放
+            bool IsRunning = true;
+            while (IsRunning)
+            {
+                IsRunning = false;
+                Process[] ProcessArray = Process.GetProcessesByName("ffmpeg");
+                foreach (var KillProcess in ProcessArray)
+                {
+                    IsRunning = true;
+                    Thread.Sleep(100);
+                }
+            }
+            #endregion
+            myProcess = null;
         }
 
         /// <summary>
@@ -266,7 +350,7 @@ namespace Common.system
         string GetFilePathName(string FilePath)
         {
             //路径
-            string Path = FileToolsCommon.GetDirectoryName(FilePath) + @"\";
+            string Path = FileToolsCommon.GetDirectoryName(FilePath);
             //Path.GetFileName(FilePath);//获取文件名
             string Extension = FileToolsCommon.GetIOExtension(FilePath);//扩展名
             string tempFilePath = Path + "temp/";
@@ -295,8 +379,11 @@ namespace Common.system
         /// <param name="ImagePath">图片地址</param>
         public void GenerateThumbnails(string VideoPath, string ImagePath)
         {
+            while (myProcess != null)
+            {
+                Thread.Sleep(100);
+            }
             Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
-            Debug.WriteLine(KillProcessArray.Length.ToString());
             foreach (var KillProcess in KillProcessArray)
             {
                 KillProcess.Kill();
@@ -317,6 +404,20 @@ namespace Common.system
             myProcess.WaitForExit();           //阻塞等待进程结束
             myProcess.Close();                 //关闭进程
             myProcess.Dispose();               //释放资源
+            #region 进程是否已经释放
+            bool IsRunning = true;
+            while (IsRunning)
+            {
+                IsRunning = false;
+                Process[] ProcessArray = Process.GetProcessesByName("ffmpeg");
+                foreach (var KillProcess in ProcessArray)
+                {
+                    IsRunning = true;
+                    Thread.Sleep(100);
+                }
+            }
+            #endregion
+            myProcess = null;
         }
 
         /// <summary>

Common/system/FileToolsCommon.cs

@@ -70,6 +70,7 @@ namespace Common.system
             ErrMessage = "";
             try
             {
+                FilePathName = GetLegalPath(FilePathName);
                 FilePath = GetDirectoryName(FilePathName);
                 FileName = GetIOFileName(FilePathName);
             }
@@ -671,7 +672,7 @@ namespace Common.system
         /// <param name="filePath">文件的绝对路径</param>          
         public static string GetDirectoryName(string filePath)
         {
-            string DirectoryName = (System.IO.Path.GetDirectoryName(filePath) + "\\").Replace("\\", "/");
+            string DirectoryName = (System.IO.Path.GetDirectoryName(filePath+ "\\") ).Replace("\\", "/");
             return DirectoryName;
         }
         #endregion

Common/system/ImageHelper.cs

@@ -85,44 +85,44 @@ namespace Common.system
         /// <returns></returns>
         public static BitmapImage GetScreenshot(Rectangle ScreenSize, string ImageSavePath, long level = -1)
         {
-            try
-            {
-                System.Drawing.Size bounds = PrimaryScreen.DESKTOP;
-                //if (string.IsNullOrEmpty(ImageSavePath))
-                //{
-                //    ImageSavePath = GetTempImagePath();//如果为空则指定临时存储路径
-                //}
-                double scaleWidth = (bounds.Width * 1.0) / SystemParameters.PrimaryScreenWidth;
-                double scaleHeight = (bounds.Height * 1.0) / SystemParameters.PrimaryScreenHeight;
-                int width = bounds.Width;
-                int height = bounds.Height;
-                if (ScreenSize.Size != new System.Drawing.Size(0, 0))
-                {
-                    width = (int)(ScreenSize.Size.Width * scaleWidth);
-                    height = (int)(ScreenSize.Size.Height * scaleHeight);
-                }
-                int l = (int)(ScreenSize.X * scaleWidth);
-                int t = (int)(ScreenSize.Y * scaleHeight);
-                //if (_Bitmap != null)
-                //{
-                //    _Bitmap.Dispose();
-                //}
-                Bitmap _Bitmap = new Bitmap(width, height, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
-                using (Graphics g = Graphics.FromImage(_Bitmap))
-                {
-                    g.CopyFromScreen(l, t, 0, 0, _Bitmap.Size, CopyPixelOperation.SourceCopy);
-                    Compress(_Bitmap, ImageSavePath, level);
-                }
-                Uri uri = new Uri(ImageSavePath, UriKind.Absolute);
-                BitmapImage bimg = new BitmapImage(uri);
-                GC.Collect();
-                return bimg;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteErrLog("【截图】(GetBitmapSource)截图失败，" + ex.Message, ex);
-                return null;
-            }
+            //try
+            //{
+            //    System.Drawing.Size bounds = PrimaryScreen.DESKTOP;
+            //    //if (string.IsNullOrEmpty(ImageSavePath))
+            //    //{
+            //    //    ImageSavePath = GetTempImagePath();//如果为空则指定临时存储路径
+            //    //}
+            //    double scaleWidth = (bounds.Width * 1.0) / SystemParameters.PrimaryScreenWidth;
+            //    double scaleHeight = (bounds.Height * 1.0) / SystemParameters.PrimaryScreenHeight;
+            //    int width = bounds.Width;
+            //    int height = bounds.Height;
+            //    if (ScreenSize.Size != new System.Drawing.Size(0, 0))
+            //    {
+            //        width = (int)(ScreenSize.Size.Width * scaleWidth);
+            //        height = (int)(ScreenSize.Size.Height * scaleHeight);
+            //    }
+            //    int l = (int)(ScreenSize.X * scaleWidth);
+            //    int t = (int)(ScreenSize.Y * scaleHeight);
+            //    //if (_Bitmap != null)
+            //    //{
+            //    //    _Bitmap.Dispose();
+            //    //}
+            //    Bitmap _Bitmap = new Bitmap(width, height, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+            //    using (Graphics g = Graphics.FromImage(_Bitmap))
+            //    {
+            //        g.CopyFromScreen(l, t, 0, 0, _Bitmap.Size, CopyPixelOperation.SourceCopy);
+            //        Compress(_Bitmap, ImageSavePath, level);
+            //    }
+            //    Uri uri = new Uri(ImageSavePath, UriKind.Absolute);
+            //    BitmapImage bimg = new BitmapImage(uri);
+            //    GC.Collect();
+            //    return bimg;
+            //}
+            //catch (Exception ex)
+            //{
+            //    //LogHelper.WriteErrLog("【截图】(GetBitmapSource)截图失败，" + ex.Message, ex);
+            return null;
+            //}
         }
 
         //private static Bitmap _Bitmap = null;
@@ -164,7 +164,7 @@ namespace Common.system
         {
             if (level <= -1)
             {
-                int ImageCompressionLevel = int.Parse(ConfigurationManager.AppSettings["ImageCompressionLevel"]);
+                int ImageCompressionLevel = int.Parse(FileToolsCommon.GetConfigValue("ImageCompressionLevel"));
                 level = ImageCompressionLevel;
             }
             Stream s = new FileStream(destFile, FileMode.Create);
@@ -336,7 +336,6 @@ namespace Common.system
         #endregion 图片压缩
 
         #region 截屏指定UI控件
-
         /// <summary>
         /// 保存图片
         /// </summary>
@@ -344,7 +343,7 @@ namespace Common.system
         /// <param name="filePathName">图片保存地址 命名 1.png</param>
         /// <param name="width">保存宽</param>
         /// <param name="height">保存高</param>
-        private void SaveUIToImage(FrameworkElement ui, string filePathName, int width, int height)
+        public static void SaveUIToImage(FrameworkElement ui, string filePathName, int width, int height)
         {
             try
             {

XHWK.WKTool/App.config

@@ -10,5 +10,7 @@
     <add key="VideoSavePath" value="D:\星火微课" />
     <!--视频格式 1、MP4 2、FlV 3、AVI-->
     <add key="VideoType" value="1" />
+    <!--图片压缩质量-->
+    <add key="ImageCompressionLevel" value="50"/>
   </appSettings>
 </configuration>

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -22,7 +22,7 @@
             <Border Grid.Row="0" Background="#2D8CF0">
                 <Grid>
                     <TextBlock Text="创建微课" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
-                    <Button Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
+                    <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
                 </Grid>
             </Border>
             <!--第二行 讲解名称-->
@@ -31,7 +31,7 @@
                 <TextBlock Text="讲解名称" FontSize="18" Padding="2,15,10,0"/>
                 <!--输入框-->
                 <Border Background="#CDD6E0" Width="321" Height="43" CornerRadius="3">
-                    <TextBox x:Name="txbExplainName" Text="" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="319" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
+                    <TextBox x:Name="txbExplainName" Text="微课1" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="319" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
                 </Border>
             </StackPanel>
             <!--第三行 存放路径-->
@@ -40,10 +40,10 @@
                 <TextBlock Text="存放路径" FontSize="18" Padding="2,15,10,0"/>
                 <!--输入框-->
                 <Border Background="#CDD6E0" Width="225" Height="43" CornerRadius="3">
-                    <TextBox x:Name="txbStoragePath" Text="D:\星火微课" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="223" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
+                    <TextBox x:Name="txbStoragePath" Text="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="223" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
                 </Border>
                 <!--浏览按钮-->
-                <Button x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="BtnBrowse_Click">
+                <Button  Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="BtnBrowse_Click">
                     <Button.Template>
                         <ControlTemplate TargetType="{x:Type Button}">
                             <Border
@@ -61,7 +61,7 @@
                 </Button>
             </StackPanel>
             <!--第四行 开始按钮-->
-            <Button Grid.Row="3" x:Name="btnStart" Content="开始" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="43" Margin="10,0,10,0" Click="BtnStart_Click">
+            <Button  Cursor="Hand" Grid.Row="3" x:Name="btnStart" Content="开始" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="43" Margin="10,0,10,0" Click="BtnStart_Click">
                 <Button.Template>
                     <ControlTemplate TargetType="{x:Type Button}">
                         <Border

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -34,7 +34,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnDown_Click(object sender, RoutedEventArgs e)
         {
-
+            System.Environment.Exit(0);
         }
         /// <summary>
         /// 浏览
@@ -76,10 +76,11 @@ namespace XHWK.WKTool
                 System.Windows.MessageBox.Show("路径不可为空！");
                 return;
             }
-            if (!FileToolsCommon.IsLegalPath(txbExplainName.Text.Trim(), out string ErrMessage))
-            {
-                System.Windows.MessageBox.Show(ErrMessage);
-            }
+            //if (!FileToolsCommon.IsLegalPath(txbStoragePath.Text.Trim(), out string ErrMessage))
+            //{
+            //    System.Windows.MessageBox.Show(ErrMessage);
+            //    return;
+            //}
             string PathName = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + txbExplainName.Text.Trim() + "/";
             if (FileToolsCommon.IsExistDirectory(PathName))
             {

XHWK.WKTool/FileDirectoryWindow.xaml

@@ -21,7 +21,7 @@
             <Border Grid.Row="0" Background="#2D8CF0">
                 <Grid  MouseLeftButtonDown="Window_MouseLeftButtonDown">
                     <TextBlock Text="文件目录" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
-                    <Button Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="btnDown_Click"/>
+                    <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="btnDown_Click"/>
                 </Grid>
             </Border>
            <!--第二行 内容-->
@@ -30,7 +30,7 @@
             </Grid>
             <!--第三行 删除 上传 按钮-->
             <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center">
-                <Button x:Name="btnDelete" Content="删除" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="0,0,30,0">
+                <Button  Cursor="Hand" x:Name="btnDelete" Content="删除" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="0,0,30,0">
                     <Button.Template>
                         <ControlTemplate TargetType="{x:Type Button}">
                             <Border
@@ -46,7 +46,7 @@
                         </ControlTemplate>
                     </Button.Template>
                 </Button>
-                <Button x:Name="btnUpload" Content="上传" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="30,0,0,0">
+                <Button  Cursor="Hand" x:Name="btnUpload" Content="上传" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="30,0,0,0">
                     <Button.Template>
                         <ControlTemplate TargetType="{x:Type Button}">
                             <Border

XHWK.WKTool/LoginWindow.xaml

@@ -23,7 +23,7 @@
             <Border Grid.Row="0" Background="#2D8CF0">
                 <Grid>
                     <TextBlock Text="登录星火微课系统" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
-                    <Button Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
+                    <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
                 </Grid>
             </Border>
             <!--第二行 登陆 账号-->
@@ -43,7 +43,7 @@
                 </Border>
             </StackPanel>
             <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="20,0,0,0">
-                <Button Grid.Row="3" Height="20" Width="20" Content="√" FontSize="13" >
+                <Button  Cursor="Hand" Grid.Row="3" Height="20" Width="20" Content="√" FontSize="13" >
                     <Button.Template>
                         <ControlTemplate TargetType="{x:Type Button}">
                             <Border
@@ -63,7 +63,7 @@
             </StackPanel>
             
             <!--第五行 开始按钮-->
-            <Button Grid.Row="4" x:Name="btnStart" Content="登录" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="43" Margin="10,0,10,0" Click="BtnStart_Click">
+            <Button  Cursor="Hand" Grid.Row="4" x:Name="btnStart" Content="登录" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="43" Margin="10,0,10,0" Click="BtnStart_Click">
                 <Button.Template>
                     <ControlTemplate TargetType="{x:Type Button}">
                         <Border