冲突

Common/system/DataProvider.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net;
 using System.Security.Cryptography;
 using System.Text;
 

Common/system/FFMpeg.cs

@@ -54,7 +54,7 @@ namespace Common.system
         /// <param name="size">大小</param>
         /// <param name="ErrMessage">错误信息返回</param>
         /// <returns></returns>
-        public bool StartRecordingVideo(string RTMPPath, string NodeKey, Size size, out string ErrMessage)
+        public bool StartLiveRecordingVideo(string RTMPPath, string NodeKey, Size size, out string ErrMessage)
         {
             while (myProcess != null)
             {
@@ -126,9 +126,9 @@ namespace Common.system
 
             if (OutputVideoLog)
             {
-                LogHelper.WriteInfoLog("【录屏】：" + myProcess.StartInfo.Arguments);
+                LogHelper.WriteInfoLog("【直播】：" + myProcess.StartInfo.Arguments);
             }
-            FileToolsCommon.AppendText(LogPath, "【录屏】：" + myProcess.StartInfo.Arguments + "\r\n");
+            FileToolsCommon.AppendText(LogPath, "【直播】：" + myProcess.StartInfo.Arguments + "\r\n");
             myProcess.StartInfo.UseShellExecute = false;           //不使用操作系统外壳程序启动
             myProcess.StartInfo.RedirectStandardError = true;      //重定向标准错误输出
             myProcess.StartInfo.CreateNoWindow = true;             //不显示程序窗口
@@ -149,13 +149,40 @@ namespace Common.system
                 {
                     ErrMessage = ex.Message + " 请关闭杀毒软件或信任此软件后重试！";
                 }
-                LogHelper.WriteErrLog("【录音】（StartRecordingAudio）" + ErrMessage, ex);
+                LogHelper.WriteErrLog("【直播】（StartLiveRecordingVideo）" + ErrMessage, ex);
                 myProcess.Dispose();
                 myProcess = null;
                 return false;
             }
             return true;
         }
+        /// <summary>
+        /// 结束直播推流
+        /// </summary>
+        public bool StopLive()
+        {
+            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 (Process KillProcess in ProcessArray)
+                {
+                    IsRunning = true;
+                    Thread.Sleep(100);
+                }
+            }
+            #endregion
+            myProcess = null;
+            return true;
+        }
         #endregion
         /// <summary>
         /// 录制屏幕

XHZB.Desktop/App.cs

@@ -268,6 +268,7 @@ namespace XHZB.Desktop
             myloading = new LoadDialog();
             StopSameProcess();
             Killffmpeg();
+            UnZipFFmpeg();
             try
             {
                 if (args != null&&args.Length>1)
@@ -436,7 +437,7 @@ namespace XHZB.Desktop
         }
 
         #region 检测解压ffmpeg
-        public void UnZipFFmpeg()
+        public static void UnZipFFmpeg()
         {
             new Thread(o =>
             {

XHZB.Desktop/AttendanceWindow.xaml

@@ -118,7 +118,7 @@
                 VerticalAlignment="Center"
                 FontSize="30"
                 Foreground="White"
-                Text="        考勤统计结果        "/>
+                Text="        在线学生        "/>
             </Grid>
 
             <StackPanel
@@ -127,7 +127,7 @@
                 HorizontalAlignment="Right"
                 VerticalAlignment="Center"
                 Orientation="Horizontal">
-                <TextBlock FontSize="26" Text="考勤人数：" />
+                <TextBlock FontSize="26" Text="在线人数：" />
                 <TextBlock
                     x:Name="txbOnlineUsers"
                     Margin="0,0,0,0"

XHZB.Desktop/CameraWindow.xaml

@@ -6,10 +6,10 @@
         xmlns:local="clr-namespace:XHZB.Desktop" xmlns:wfi="http://schemas.microsoft.com/netfx/2007/xaml/presentation"
 xmlns:aforge ="clr-namespace:AForge.Controls;assembly=AForge.Controls"
         mc:Ignorable="d"
-        Title="CameraWindow" Height="180" Width="220" ResizeMode="NoResize"
+        Title="摄像头" Height="200" Width="250" ResizeMode="NoResize"
     >
     <Grid>
-        <wfi:WindowsFormsHost Grid.Row="0" Grid.Column="1" x:Name="wfhCamera" Height="124" Width="172" HorizontalAlignment="Right" Margin="0,10,30.10,0" VerticalAlignment="Top">
+        <wfi:WindowsFormsHost Grid.Row="0" Grid.Column="1" x:Name="wfhCamera" Margin="0">
             <aforge:VideoSourcePlayer x:Name="player" Height="124" Width="172"  />
         </wfi:WindowsFormsHost>
     </Grid>

XHZB.Desktop/LoginWindow.xaml

@@ -156,7 +156,7 @@
                     Margin="35,-20,0,0"
                     FontSize="13"
                     Foreground="White"
-                    Text="星火智慧校园" />
+                    Text="星火直播" />
                 <Button
                     x:Name="btnDown"
                     Width="30.8"
@@ -200,13 +200,14 @@
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
 
-                <Image
+                <!--<Image
                     Grid.Row="0"
                     Width="228"
                     Height="34.5"
                     Margin="0,66.2,0,0"
                     HorizontalAlignment="Center"
-                    Source=".\Images\Login\智慧校园@2x.png" />
+                    Source=".\Images\Login\智慧校园@2x.png" />-->
+                <Label Content="星 火 直 播" Grid.Row="0" Width="200"  Margin="0,66.2,0,0" Foreground="White" FontSize="35" FontWeight="Bold" HorizontalContentAlignment="Center" />
                 <Border
                     Grid.Row="2"
                     Width="272"

XHZB.Desktop/RollCallWindow.xaml

@@ -135,7 +135,7 @@
                     VerticalAlignment="Center"
                     FontSize="30"
                     Foreground="White"
-                    Text="        课堂点名抢答        " />
+                    Text="        直播点名抢答        " />
             </Grid>
             <UniformGrid
                 Grid.Row="1"

XHZB.Desktop/ToolbarWindow.xaml.cs

@@ -50,6 +50,12 @@ namespace XHZB.Desktop
         {
             InitializeComponent();
 
+            if (!APP.CheckScreenCapturerRecorder())
+            {
+                MessageWindow.Show("首次运行需安装环境,请在确定后依次点击“English-OK-Next>-Next>Install”完成安装！");
+                APP.InstallScreenCapturerRecorder();
+            }
+
             txbName.Text = APP.LoginUser.username;
 
             heiban_btn.Click += Heiban_btn_Click;
@@ -149,21 +155,30 @@ namespace XHZB.Desktop
                 if (pageData.tongping)
                 {
                     //tongpingBegin();
-                    pageData.menuList[1].Pic = "../Images/ToolBar/img_shared_1.gif";
-                    pageData.menuList[1].Name = "正在直播";
-
-                    if(APP.W_CameraWindow==null)
+                    if (StartLive(out string ErrMessage))
                     {
-                        APP.W_CameraWindow = new CameraWindow();
-                        APP.W_CameraWindow.Topmost = true;
-                        APP.W_CameraWindow.Left = pwidth - 300;
-                        APP.W_CameraWindow.Top = 0;
+                        pageData.menuList[1].Pic = "../Images/ToolBar/img_shared_1.gif";
+                        pageData.menuList[1].Name = "正在直播";
+
+                        if (APP.W_CameraWindow == null)
+                        {
+                            APP.W_CameraWindow = new CameraWindow();
+                            APP.W_CameraWindow.Topmost = true;
+                            APP.W_CameraWindow.Left = pwidth - 300;
+                            APP.W_CameraWindow.Top = 0;
+                        }
+                        APP.W_CameraWindow.Show();
+                    }
+                    else
+                    {
+                        pageData.tongping = !pageData.tongping;
+                        MessageWindow.Show(ErrMessage);
                     }
-                    APP.W_CameraWindow.Show();
                 }
                 else
                 {
                     //tongpingEnd();
+                    EndLive();
                     pageData.menuList[1].Pic = "../Images/ToolBar/直播@2x.png";
                     pageData.menuList[1].Name = "直播";
                     APP.W_CameraWindow.Hide();
@@ -808,6 +823,49 @@ namespace XHZB.Desktop
             //ZSocketServer.getInstance().startWsServer();
         }
         #endregion
+        #region 直播
+        /// <summary>
+        /// 直播间节点和房号
+        /// </summary>
+        string NodeKey = "live/test";
+        /// <summary>
+        /// 开始直播
+        /// </summary>
+        public bool StartLive(out string ErrMessage)
+        {
+            try
+            {
+
+
+
+                //NodeKey=Node+Key;
+                System.Drawing.Size DesktopSize = PrimaryScreen.DESKTOP;
+                //开始直播
+                if(APP.FFmpeg.StartLiveRecordingVideo(APP.RTMPServerPath, NodeKey, DesktopSize,out ErrMessage))
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+                 
+            }
+            catch (Exception ex)
+            {
+                ErrMessage = "无法开始直播：" + ex.Message;
+                LogHelper.WriteErrLog(ErrMessage, ex);
+                return false;
+            }
+        }
+        /// <summary>
+        /// 结束直播
+        /// </summary>
+        public void EndLive()
+        {
+            APP.FFmpeg.StopLive();
+        }
+        #endregion
     }
     /// <summary>
     /// 工具栏模型

XHZB.Model/XHZB.Model.csproj

@@ -41,6 +41,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BodyModel.cs" />
     <Compile Include="Class1.cs" />
     <Compile Include="ClassListModel.cs" />
     <Compile Include="ClassStudentListModel.cs" />
@@ -51,8 +52,11 @@
     <Compile Include="OnlineUserModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="REQStartClassModel.cs" />
+    <Compile Include="ResourceMyListModel.cs" />
+    <Compile Include="ResourceMyListsModel.cs" />
     <Compile Include="RollCallModel.cs" />
     <Compile Include="SavefileModel.cs" />
+    <Compile Include="SocketModel.cs" />
     <Compile Include="TsubjectbookListModel.cs" />
     <Compile Include="ZBMenuModel.cs" />
     <Compile Include="ZBPageModel.cs" />