互动 个人空间数据

Common/Common.csproj

@@ -139,6 +139,7 @@
     <Compile Include="system\LogHelper.cs" />
     <Compile Include="system\PrimaryScreen.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="system\RegistryHelper.cs" />
     <Compile Include="system\SplashScreen.cs" />
     <Compile Include="system\XmlUtilHelper.cs" />
     <Compile Include="system\ZJClippingBorder.cs" />

XHZB.Desktop/AttendanceWindow.xaml

@@ -174,7 +174,7 @@
             <Grid x:Name="gridImg" Grid.Row="2" Visibility="Collapsed">
                 <Image x:Name="img"/>
             </Grid>
-            <Viewbox Grid.Row="3">
+            <Viewbox Grid.Row="3" Visibility="Hidden">
                 <Border
                     Grid.Row="3"
                     Margin="25,0,25,0"

XHZB.Desktop/AttendanceWindow.xaml.cs

@@ -56,7 +56,7 @@ namespace XHZB.Desktop
             DragMove();
         }
 
-        public void receiveWsMsg(ZWsMsgVo msg)
+        public void receiveWsMsg(SocketModel msg)
         {
         }
 

XHZB.Desktop/LoginWindow.xaml

@@ -459,7 +459,7 @@
                 Foreground="White"
                 Text="测试版" />
             </StackPanel>
-            <Button x:Name="btnSetUp" Height="25" Width="66" HorizontalAlignment="Right" Cursor="Hand"  Margin="0,0,5,6" VerticalAlignment="Bottom" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="btnSetUp_Click">
+            <Button x:Name="btnSetUp" Height="25" Width="66" HorizontalAlignment="Right" Cursor="Hand"  Margin="0,0,5,6" VerticalAlignment="Bottom" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="btnSetUp_Click" Visibility="Hidden">
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
                     <Image Source=".\Images\Login\设置@2x.png"/>
                     <TextBlock Text="设置" Foreground="White" FontSize="16"   HorizontalAlignment="Right"    

XHZB.Desktop/LoginWindow.xaml.cs

@@ -503,15 +503,20 @@ namespace XHZB.Desktop
             APP.myloading.Hide();
             if (serverReturnCode == APP.ServerScuessCode)
             {
-                string imagepath = APP.classRoomImagePath();
-                if (!Directory.Exists(imagepath))
+                new Thread(o =>
                 {
-                    Directory.CreateDirectory(imagepath);
-                }
-                ToolbarWindow win = new ToolbarWindow();
+                    InvokeLiveBroadcastServering();
+                    Dispatcher.Invoke(new Action(() =>
+                    {
+                        InvokeServerLiveBroadcastCompate();
+                    }));
+
+                }).Start();
+
 
-                Close();
-                win.ShowDialog();
+
+
+           
 
 
 
@@ -555,6 +560,38 @@ namespace XHZB.Desktop
             }
         }
         /// <summary>
+        /// 开始直播服务-调用
+        /// </summary>
+        /// <returns></returns>
+        private object InvokeLiveBroadcastServering()  
+        {
+            serverReturnCode = registerController.ClassList();
+            return APP.ErrorMessage;
+        }
+        /// <summary>
+        /// 开始直播服务-返回结果
+        /// </summary>
+        /// <returns></returns>
+        public void InvokeServerLiveBroadcastCompate()
+        {
+            if (serverReturnCode == APP.ServerScuessCode)
+            {
+                string imagepath = APP.classRoomImagePath();
+                if (!Directory.Exists(imagepath))
+                {
+                    Directory.CreateDirectory(imagepath);
+                }
+                ToolbarWindow win = new ToolbarWindow();
+
+                Close();
+                win.ShowDialog();
+            }
+            else
+            {
+                MessageWindow.Show(APP.ErrorMessage);
+            }
+        }
+        /// <summary>
         /// 教师任教班级服务-调用
         /// </summary>
         /// <returns></returns>

XHZB.Desktop/RollCallWindow.xaml

@@ -283,7 +283,7 @@
                     <TextBlock FontSize="30" Text="人抢答" />
                 </StackPanel>
             </Grid>
-            <Viewbox Grid.Row="3">
+            <Viewbox Grid.Row="3" Visibility="Hidden">
                 <Border
                     Grid.Row="3"
                     Margin="33,0,33,0"

XHZB.Desktop/RollCallWindow.xaml.cs

@@ -19,7 +19,7 @@ namespace XHZB.Desktop
     /// <summary>
     /// 点名抢答
     /// </summary>
-    public partial class RollCallWindow : Window/*, ZSocketCallback*/
+    public partial class RollCallWindow : Window, SocketCallback
     {
         #region 值初始化
 
@@ -86,7 +86,7 @@ namespace XHZB.Desktop
             }
             Initialize();
 
-            //ZSocketServer.getInstance().addWin(this);
+            WSocketClient.getInstance().addWin(this);
         }
 
         /// <summary>
@@ -123,13 +123,13 @@ namespace XHZB.Desktop
                    receiveWsMsg(null);
                }));
         }
-        public void receiveWsMsg(ZWsMsgVo msg)
+        public void receiveWsMsg(SocketModel msg)
         {
             if (!isRollCall && !isRushToAnswer)
             {
                 initPageData();
             }
-            if (msg != null && msg.type == 402 && isRushToAnswer && msg.body.asktid == APP.askid)
+            if (msg != null && msg.c == 2021)
             {
                 Console.WriteLine(msg);
 
@@ -137,7 +137,7 @@ namespace XHZB.Desktop
                 #region 去重
                 for (int i = 0; i < pageData.userList.Count; i++)
                 {
-                    if (msg.body.userid.ToString().Equals(pageData.userList[i].ID))
+                    if (msg.b.stid.ToString().Equals(pageData.userList[i].ID))
                     {
                         return;
                     }
@@ -197,20 +197,20 @@ namespace XHZB.Desktop
                 Dispatcher.Invoke(DispatcherPriority.Normal,
                     new Action(() =>
                     {
-                        try
-                        {
-                            if (pageData.userList.Count > 0)
-                            {
-                                if (pageData.userList[pageData.userList.Count - 1].askid != msg.body.asktid)
-                                {
-                                    pageData.userList.Clear();
-                                }
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.WriteErrLog("【抢答】（receiveWsMsg）socket移除askid不一致用户，" + ex.Message, ex);
-                        }
+                        //try
+                        //{
+                        //    if (pageData.userList.Count > 0)
+                        //    {
+                        //        if (pageData.userList[pageData.userList.Count - 1].askid != msg.body.asktid)
+                        //        {
+                        //            pageData.userList.Clear();
+                        //        }
+                        //    }
+                        //}
+                        //catch (Exception ex)
+                        //{
+                        //    LogHelper.WriteErrLog("【抢答】（receiveWsMsg）socket移除askid不一致用户，" + ex.Message, ex);
+                        //}
 
                         //renderView();
                         returnNum++;
@@ -233,7 +233,7 @@ namespace XHZB.Desktop
                                 medal = "../Images/RollCall/rollCall_6.png";
                                 attendance = "../Images/RollCall/attendance_33.png";
                             }
-                            string userpic = msg.body.userpic;
+                            string userpic = msg.b.stpic;
                             if (ZCache.headDic.ContainsKey(userpic.Replace("/", "")))
                             {
                                 userpic = ZCache.headDic[userpic.Replace("/", "")];
@@ -244,14 +244,14 @@ namespace XHZB.Desktop
                             }
                             pageData.userList.Add(new RollCallPageData()
                             {
-                                Name = msg.body.username,
+                                Name = msg.b.stname,
                                 Attendance_33 = "Collapsed",
                                 Attendance_3 = "Visible",
                                 Pic = userpic,
-                                ID = msg.body.userid.ToString(),
+                                ID = msg.b.stid.ToString(),
                                 Attendance = attendance,
                                 Medal = medal,
-                                askid = msg.body.asktid
+                              
 
                             });
                             stpAnswer.Visibility = Visibility.Visible;

XHZB.Desktop/ToolbarWindow.xaml.cs

@@ -611,13 +611,15 @@ namespace XHZB.Desktop
                 //    {
                 //        MyApp.ZipFile();
                 //    }
-
+                //else
+                //{
+                EndLive();
+                //}
                 WSocketClient.getInstance().SendMessage(SocketMsgManger.NolineMsg());
                 Dispatcher.Invoke(new Action(() =>
                 {
                     System.Environment.Exit(0);
                 }));
-                //}).Start();
             }
             catch (Exception ex)
             {
@@ -831,7 +833,7 @@ namespace XHZB.Desktop
                 WSocketClient.getInstance().SendMessage(SocketMsgManger.GetIntoMsg());
 
 
-                NodeKey = "1";
+                NodeKey = "live/1";
                 System.Drawing.Size DesktopSize = PrimaryScreen.DESKTOP;
                 //开始直播
                 if(APP.FFmpeg.StartLiveRecordingVideo(APP.RTMPServerPath, NodeKey, DesktopSize,out ErrMessage))

XHZB.Desktop/UserCenterWindow.xaml.cs

@@ -74,7 +74,24 @@ namespace XHZB.Desktop
             btnVideo.Foreground = new SolidColorBrush(Colors.Black);
             btnImage.Foreground = new SolidColorBrush(Colors.Black);
             btnDoc.Foreground = new SolidColorBrush(Colors.Black);
-            initJiaocai();
+            new Thread(o =>
+            {
+                InvokeTsubjectbookListServering();
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    InvokeServerTsubjectbookListCompate();
+                }));
+
+            }).Start();
+        }
+        /// <summary>
+        /// 教师教材列表服务-调用
+        /// </summary>
+        /// <returns></returns>
+        private object InvokeTsubjectbookListServering()
+        {
+            serverReturnCode = registerController.TsubjectbookList();
+            return APP.ErrorMessage;
         }
         /// <summary>
         /// 教师教材列表服务-返回结果
@@ -273,21 +290,21 @@ namespace XHZB.Desktop
                         if ("doc".Equals(APP.ResourceMyList.obj[i].suffix)
                             || "docx".Equals(APP.ResourceMyList.obj[i].suffix))
                         {
-                            imgSuffix = "../Images/Resource/DOC.png";
+                            imgSuffix = "./Images/Resource/DOC.png";
                         }
                         else if ("ppt".Equals(APP.ResourceMyList.obj[i].suffix)
                             || "pptx".Equals(APP.ResourceMyList.obj[i].suffix))
                         {
-                            imgSuffix = "../Images/Resource/PPT.png";
+                            imgSuffix = "./Images/Resource/PPT.png";
                         }
                         else if ("pdf".Equals(APP.ResourceMyList.obj[i].suffix))
                         {
-                            imgSuffix = "../Images/Resource/PDF.png";
+                            imgSuffix = "./Images/Resource/PDF.png";
                         }
                         else if ("excel".Equals(APP.ResourceMyList.obj[i].suffix)
                             || "xls".Equals(APP.ResourceMyList.obj[i].suffix) || "xlsx".Equals(APP.ResourceMyList.obj[i].suffix))
                         {
-                            imgSuffix = "../Images/Resource/EXCEL.png";
+                            imgSuffix = "./Images/Resource/EXCEL.png";
                         }
                         else if ("class".Equals(APP.ResourceMyList.obj[i].suffix))
                         {
@@ -295,12 +312,12 @@ namespace XHZB.Desktop
                         }
                         else if ("dsc".Equals(APP.ResourceMyList.obj[i].suffix))
                         {
-                            imgSuffix = "../Images/Resource/DSC.png";
+                            imgSuffix = "./Images/Resource/DSC.png";
                         }
                         else if ("mp3".Equals(APP.ResourceMyList.obj[i].suffix))
                         {
                             visDuration = "Visible";
-                            imgSuffix = "../Images/Resource/MP3.png";
+                            imgSuffix = "./Images/Resource/MP3.png";
                         }
                         else if ("mp4".Equals(APP.ResourceMyList.obj[i].suffix)
                             || "flv".Equals(APP.ResourceMyList.obj[i].suffix))
@@ -312,26 +329,26 @@ namespace XHZB.Desktop
                             }
                             else
                             {
-                                imgSuffix = "../Images/Resource/MP4.png";
+                                imgSuffix = "./Images/Resource/MP4.png";
                             }
                         }
                         else if ("png".Equals(APP.ResourceMyList.obj[i].suffix)
                             || "jpg".Equals(APP.ResourceMyList.obj[i].suffix)
                             || "jpeg".Equals(APP.ResourceMyList.obj[i].suffix))
                         {
-                            imgSuffix = "../Images/Resource/PNG.png";
+                            imgSuffix = "./Images/Resource/PNG.png";
                         }
                         else if ("txt".Equals(APP.ResourceMyList.obj[i].suffix))
                         {
-                            imgSuffix = "../Images/Resource/TXT.png";
+                            imgSuffix = "./Images/Resource/TXT.png";
                         }
                         else if ("txt".Equals(APP.ResourceMyList.obj[i].suffix))
                         {
-                            imgSuffix = "../Images/Resource/FLV.png";
+                            imgSuffix = "./Images/Resource/FLV.png";
                         }
                         else if ("wav".Equals(APP.ResourceMyList.obj[i].suffix))
                         {
-                            imgSuffix = "../Images/Resource/WAV.png";
+                            imgSuffix = "./Images/Resource/WAV.png";
                         }
                         string resourcesSuffix = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "\\" + APP.LoginUser.username + "\\" + APP.ResourceMyList.obj[i].resourcename + "." + APP.ResourceMyList.obj[i].suffix;
                         if (!string.IsNullOrWhiteSpace(APP.fileStorageAddress))

XHZB.Desktop/Utils/RegisterController.cs

@@ -40,6 +40,32 @@ namespace XHZB.Desktop.Utils
             }
         }
         /// <summary>
+        /// 开始直播
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public int UpdateState()  
+        {
+            string url = APP.apiUrl + "/course/update_state";//地址
+            Dictionary<string, int> dic = new Dictionary<string, int>
+            {
+                { "courseid", 1},
+                { "loginpwd", 2}
+            };
+            string body = JsonHelper.ToJson(dic);
+            ResultVo<CisectionidModel> result = HttpHelper.PostAndRespSignle<ResultVo<CisectionidModel>>(url, postData: body);
+            if (result != null)
+            {
+                APP.ErrorMessage = result.msg;
+                return result.code;
+            }
+            else
+            {
+                APP.ErrorMessage = "网络异常！";
+                return 1;
+            }
+        }
+        /// <summary>
         /// 教师任教班级
         /// </summary>
         /// <param name="request"></param>

XHZB.Desktop/WebSocket/SocketCallback.cs

@@ -4,7 +4,7 @@ namespace XHZB.Desktop.WebSocket
 {
     public interface SocketCallback
     {
-        void receiveWsMsg(ZWsMsgVo msg);
+        void receiveWsMsg(SocketModel msg);
         void userListChange();
     }
 }

XHZB.Desktop/WebSocket/SocketClient.cs

@@ -75,6 +75,7 @@ namespace XHZB.Desktop.WebSocket
                 WinDic.Add(win.GetType(), win);
             }
         }
+     
         /// <summary>
         /// 发送给需要接收的窗口
         /// </summary>

XHZB.Desktop/WebSocket/WSocketClient.cs

@@ -135,6 +135,7 @@ namespace XHZB.Desktop.WebSocket
                             userpic = msgBean.b.stpic
                         };
                         APP.OnlineUserList.Add(item);
+                        sendUserChangeToWin();
                     }
                     else if(msgBean.c == 2002)//下线
                     {
@@ -145,6 +146,7 @@ namespace XHZB.Desktop.WebSocket
                                 if (msgBean.b.stid == APP.OnlineUserList[i].userid)
                                 {
                                     APP.OnlineUserList.RemoveAt(i);
+                                  
                                     break;
                                 }
                             }
@@ -153,12 +155,65 @@ namespace XHZB.Desktop.WebSocket
                         {
                             LogHelper.WriteErrLog("(移除)" + ex.Message, ex);
                         }
+                        sendUserChangeToWin();
                     }
-                  
+                    sendMsgToWin(msgBean);
                 }
             }
-
+        }
+        private static void sendMsgToWin(SocketModel msg)
+        {
+            foreach (KeyValuePair<Type, object> kvp in WinDic)
+            {
+                if (kvp.Value is SocketCallback callback)
+                {
+                    callback.receiveWsMsg(msg);
+                }
+            }
+        }
+        /// <summary>
+        /// 添加要推送消息的窗口
+        /// </summary>
+        /// <param name="win"></param>
+        public void addWin(object win)
+        {
+            if (WinDic.ContainsKey(win.GetType()))
+            {
+                WinDic[win.GetType()] = win;
+            }
+            else
+            {
+                WinDic.Add(win.GetType(), win);
+            }
         }
+        /// <summary>
+        /// 发送给需要接收的窗口
+        /// </summary>
+        private static void sendUserChangeToWin()
+        {
+            foreach (KeyValuePair<Type, object> kvp in WinDic)
+            {
+                if (kvp.Value is SocketCallback callback)
+                {
+                    callback.userListChange();
+                }
+            }
+        }
+        /// <summary>
+        /// 移除窗口
+        /// </summary>
+        /// <param name="win"></param>
+        public void removedWin(object win)
+        {
+            if (WinDic.ContainsKey(win.GetType()))
+            {
+                WinDic.Remove(win.GetType());
+            }
+        }
+
+
+
+
         /// <summary>
         /// Socket关闭事件
         /// </summary>
@@ -184,8 +239,11 @@ namespace XHZB.Desktop.WebSocket
         /// <param name="e"></param>
         void WebSocket_Opened(object sender, EventArgs e)
         {
+            SendMessage(SocketMsgManger.AddMsg());
             _Logger.Info(" websocket_Opened");
 
+
+
             SendMessage(SocketMsgManger.offlineMsg());
 
         }

XHZB.Desktop/XHZB.Desktop.csproj

@@ -340,6 +340,22 @@
   <ItemGroup>
     <Resource Include="Images\RollCall\rollCall_2_1.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Images\Resource\CLASS.png" />
+    <Resource Include="Images\Resource\DOC.png" />
+    <Resource Include="Images\Resource\DSC.png" />
+    <Resource Include="Images\Resource\EXCEL.png" />
+    <Resource Include="Images\Resource\FLV.png" />
+    <Resource Include="Images\Resource\MP3.png" />
+    <Resource Include="Images\Resource\MP4.png" />
+    <Resource Include="Images\Resource\PDF.png" />
+    <Resource Include="Images\Resource\PNG.png" />
+    <Resource Include="Images\Resource\PPT.png" />
+    <Resource Include="Images\Resource\resource_0.png" />
+    <Resource Include="Images\Resource\resource_1.png" />
+    <Resource Include="Images\Resource\resource_2.png" />
+    <Resource Include="Images\Resource\TXT.png" />
+    <Resource Include="Images\Resource\WAV.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

XHZB.Model/CisectionidModel.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XHZB.Model
+{
+    public class CisectionidModel
+    {
+        public int cisectionid { get; set; }
+    }
+}

XHZB.Model/XHZB.Model.csproj

@@ -43,6 +43,7 @@
   <ItemGroup>
     <Compile Include="AddSocketMsgModel.cs" />
     <Compile Include="BodyModel.cs" />
+    <Compile Include="CisectionidModel.cs" />
     <Compile Include="Class1.cs" />
     <Compile Include="ClassListModel.cs" />
     <Compile Include="ClassStudentListModel.cs" />