Merge remote-tracking branch 'origin/ZhangXueYang'

XHZB.Desktop/LoginWindow.xaml.cs

@@ -503,32 +503,51 @@ namespace XHZB.Desktop
             APP.myloading.Hide();
             if (serverReturnCode == APP.ServerScuessCode)
             {
-                grLogin.Visibility = Visibility.Collapsed;
-                grLoginTwo.Visibility = Visibility.Visible;
-                imgBrush.ImageSource = new BitmapImage(new Uri("pack://application:,,,/Images/Login/login2_1.png"));
-                txbHeader.Text = APP.LoginUser.username + "老师，您好!";
-                version_tb.Visibility = Visibility.Collapsed;
-                btnSetUp.Visibility = Visibility.Collapsed;
-                UpdateSettingString("userName", txbAccountNumber.Text);
-
-                new Thread(o =>
+                string imagepath = APP.classRoomImagePath();
+                if (!Directory.Exists(imagepath))
                 {
-                    InvokeClassListServering();
-                    Dispatcher.Invoke(new Action(() =>
-                    {
-                        InvokeServerClassListCompate();
-                    }));
+                    Directory.CreateDirectory(imagepath);
+                }
+                ToolbarWindow win = new ToolbarWindow();
 
-                }).Start();
-                new Thread(o =>
-                {
-                    InvokeTsubjectbookListServering();
-                    Dispatcher.Invoke(new Action(() =>
-                    {
-                        InvokeServerTsubjectbookListCompate();
-                    }));
+                Close();
+                win.ShowDialog();
+
+
+
+
+
+
+
+
+
+
+                //grLogin.Visibility = Visibility.Collapsed;
+                //grLoginTwo.Visibility = Visibility.Visible;
+                //imgBrush.ImageSource = new BitmapImage(new Uri("pack://application:,,,/Images/Login/login2_1.png"));
+                //txbHeader.Text = APP.LoginUser.username + "老师，您好!";
+                //version_tb.Visibility = Visibility.Collapsed;
+                //btnSetUp.Visibility = Visibility.Collapsed;
+                //UpdateSettingString("userName", txbAccountNumber.Text);
+
+                //new Thread(o =>
+                //{
+                //    InvokeClassListServering();
+                //    Dispatcher.Invoke(new Action(() =>
+                //    {
+                //        InvokeServerClassListCompate();
+                //    }));
+
+                //}).Start();
+                //new Thread(o =>
+                //{
+                //    InvokeTsubjectbookListServering();
+                //    Dispatcher.Invoke(new Action(() =>
+                //    {
+                //        InvokeServerTsubjectbookListCompate();
+                //    }));
 
-                }).Start();
+                //}).Start();
             }
             else
             {

XHZB.Desktop/RollCallWindow.xaml.cs

@@ -11,6 +11,7 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Threading;
 using XHZB.Desktop.Utils;
+using XHZB.Desktop.WebSocket;
 using XHZB.Model;
 
 namespace XHZB.Desktop
@@ -363,6 +364,12 @@ namespace XHZB.Desktop
         /// <param name="e"></param>
         private void btnRandomRollCall_Click(object sender, RoutedEventArgs e)
         {
+          
+
+
+
+
+
             if (!IsRandomRollCallButton)
             {
                 IsRandomRollCallButton = true;
@@ -571,6 +578,7 @@ namespace XHZB.Desktop
             if ("重新点名".Equals(text))
             {
                 returnNum = 0;
+                WSocketClient.getInstance().SendMessage(SocketMsgManger.RandomRollCallEndMsg());
                 //ZSocketServer.getInstance().SendMessage(ZSocketMsgManger.qiangdaEnd());
                 initPageData();
                 IsRandomRollCallButton = true;
@@ -588,7 +596,7 @@ namespace XHZB.Desktop
                 useridsss = string.Empty;
                 isRollCall = false;
                 isRushToAnswer = false;
-                //ZSocketServer.getInstance().SendMessage(ZSocketMsgManger.qiangdaEnd());
+                WSocketClient.getInstance().SendMessage(SocketMsgManger.RandomRollCallEndMsg());
                 IsRandomRollCallButton = false;
                 //ToolbarWindow.IsOpenRollCallWindow = false;
                 Hide();
@@ -607,6 +615,11 @@ namespace XHZB.Desktop
         /// <param name="e"></param>
         private void btnDown_Click(object sender, RoutedEventArgs e)
         {
+            WSocketClient.getInstance().SendMessage(SocketMsgManger.RushToAnswerEndMsg());
+
+
+
+
             //ToolbarWindow.IsNotOperation = false;
             APP.myloading.Show();
             new Thread(o =>
@@ -646,6 +659,10 @@ namespace XHZB.Desktop
         /// <param name="e"></param>
         private void btnAnswer_Click(object sender, RoutedEventArgs e)
         {
+            WSocketClient.getInstance().SendMessage(SocketMsgManger.RushToAnswerMsg());
+
+
+
             if (!IsRandomRollCallButton)
             {
                 returnNum = 0;
@@ -781,8 +798,7 @@ namespace XHZB.Desktop
             //    json = ZJsonHelper.ToJson(askstudent),
             //    askid = askteacher.asktid
             //});
-            //string msg = ZSocketMsgManger.dianmingBegin(ZCommonData.askid, user.userid);
-            //ZSocketServer.getInstance().SendMessage(msg);
+            WSocketClient.getInstance().SendMessage(SocketMsgManger.RandomRollCallMsg(user.userid));
             //ZSqliteManger.insertClassAction(new ClassAction()
             //{
             //    unix = DataProvider.TimestampTotalSeconds(),

XHZB.Desktop/ToolbarWindow.xaml.cs

@@ -18,6 +18,7 @@ using XHZB.Desktop.Utils;
 using Common.system;
 using System.Windows.Media.Animation;
 using System.Threading;
+using XHZB.Desktop.WebSocket;
 
 namespace XHZB.Desktop
 {
@@ -168,14 +169,13 @@ namespace XHZB.Desktop
                         MessageWindow.Show(ErrMessage);
                     }
                 }
-                else
-                {
-                    //tongpingEnd();
-                    EndLive();
-                    pageData.menuList[1].Pic = "../Images/ToolBar/直播@2x.png";
-                    pageData.menuList[1].Name = "直播";
-                    APP.W_CameraWindow.Hide();
-                }
+                //else
+                //{
+                //    EndLive();
+                //    pageData.menuList[1].Pic = "../Images/ToolBar/直播@2x.png";
+                //    pageData.menuList[1].Name = "直播";
+                //    APP.W_CameraWindow.Hide();
+                //}
             }
             else if (clickindex == 2)//抢答点名
             {
@@ -612,7 +612,7 @@ namespace XHZB.Desktop
                 //        MyApp.ZipFile();
                 //    }
 
-
+                WSocketClient.getInstance().SendMessage(SocketMsgManger.NolineMsg());
                 Dispatcher.Invoke(new Action(() =>
                 {
                     System.Environment.Exit(0);
@@ -813,7 +813,7 @@ namespace XHZB.Desktop
         /// </summary>
         private void startSocket()
         {
-            //ZSocketServer.getInstance().startWsServer();
+            WSocketClient.getInstance().StartWsClient();
         }
         #endregion
         #region 直播
@@ -828,10 +828,10 @@ namespace XHZB.Desktop
         {
             try
             {
+                WSocketClient.getInstance().SendMessage(SocketMsgManger.GetIntoMsg());
 
 
-
-                //NodeKey=Node+Key;
+                NodeKey = "1";
                 System.Drawing.Size DesktopSize = PrimaryScreen.DESKTOP;
                 //开始直播
                 if(APP.FFmpeg.StartLiveRecordingVideo(APP.RTMPServerPath, NodeKey, DesktopSize,out ErrMessage))

XHZB.Desktop/UserCenterWindow.xaml.cs

@@ -62,8 +62,8 @@ namespace XHZB.Desktop
             //ZJConfigUtil.init();
             isInitial = true;
             Resourceclass = 0;
-            Lsbid = APP.REQStartClass.lsbid;
-            Directorid = APP.REQStartClass.directorid;
+            Lsbid = 0;
+            Directorid = 0;
             borAll.Background = new SolidColorBrush(Colors.DodgerBlue);
             borAudio.Background = new SolidColorBrush(Colors.Transparent);
             borVideo.Background = new SolidColorBrush(Colors.Transparent);
@@ -76,7 +76,21 @@ namespace XHZB.Desktop
             btnDoc.Foreground = new SolidColorBrush(Colors.Black);
             initJiaocai();
         }
-
+        /// <summary>
+        /// 教师教材列表服务-返回结果
+        /// </summary>
+        /// <returns></returns>
+        public void InvokeServerTsubjectbookListCompate()
+        {
+            if (serverReturnCode == APP.ServerScuessCode)
+            {
+                initJiaocai();
+            }
+            else
+            {
+                MessageWindow.Show(APP.ErrorMessage);
+            }
+        }
         private void initJiaocai()
         {
             System.Collections.Generic.List<TsubjectbookListModel> list = APP.TsubjectbookList;

XHZB.Desktop/WebSocket/SocketClient.cs

@@ -21,30 +21,30 @@ namespace XHZB.Desktop.WebSocket
             return instance;
         }
 
-        static void Starts() 
+        public static void StartWsClient()  
         {
-            //新建客户端类 
-            //服务端IP地址 ws://192.168.1.13 如果服务端开启了ssl或者tsl 这里前缀应该改成 wss:/
-            //服务端监听端口 1234
-            //自定义的地址参数 可以根据地址参数来区分客户端 /lcj控制台
-            //WSocketClient client = new WSocketClient("wss://a.lcj888.ml:54645/lcj控制台");
-            WSocketClient client = new WSocketClient("ws://schoolwstest.xhkjedu.com/ws");
-            //注册消息接收事件，接收服务端发送的数据
-            client.MessageReceived += (data) => {
-                Console.WriteLine(data);
-            };
-            //开始链接
-            client.Start();
-
-            Console.WriteLine("输入“c”，退出");
-            var input = "";
-            do
-            {
-                input = Console.ReadLine();
-                //客户端发送消息到服务端
-                client.SendMessage(input);
-            } while (input != "c");
-            client.Dispose();
+            ////新建客户端类 
+            ////服务端IP地址 ws://192.168.1.13 如果服务端开启了ssl或者tsl 这里前缀应该改成 wss:/
+            ////服务端监听端口 1234
+            ////自定义的地址参数 可以根据地址参数来区分客户端 /lcj控制台
+            ////WSocketClient client = new WSocketClient("wss://a.lcj888.ml:54645/lcj控制台");
+            //WSocketClient client = new WSocketClient("ws://schoolwstest.xhkjedu.com/ws");
+            ////注册消息接收事件，接收服务端发送的数据
+            //client.MessageReceived += (data) => {
+            //    Console.WriteLine(data);
+            //};
+            ////开始链接
+            //client.Start();
+
+            //Console.WriteLine("输入“c”，退出");
+            //var input = "";
+            //do
+            //{
+            //    input = Console.ReadLine();
+            //    //客户端发送消息到服务端
+            //    client.SendMessage(input);
+            //} while (input != "c");
+            //client.Dispose();
         }
 
 

XHZB.Desktop/WebSocket/SocketMsgManger.cs

@@ -1,16 +1,16 @@
 using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using XHZB.Model;
 
 namespace XHZB.Desktop.WebSocket
 {
     internal class SocketMsgManger
     {
-        public static string offlineMsg(int userid)
+        /// <summary>
+        /// 创建直播
+        /// </summary>
+        /// <returns></returns>
+        public static string offlineMsg()
         {
             SocketModel msg = new SocketModel
             {
@@ -18,14 +18,160 @@ namespace XHZB.Desktop.WebSocket
                 rid = 1,
                 d = "pc",
                 u = 1,
+                s=1,
                 b = new BodyModel
                 {
-                    
+                    stname = APP.LoginUser.username,
+                    stid = APP.LoginUser.userid,
+                    stpic=APP.LoginUser.headpic
                 },
+
+
                 f = APP.LoginUser.userid,
                 t = new List<int>()
             };
             return JsonConvert.SerializeObject(msg);
         }
+        /// <summary>
+        /// 进入直播
+        /// </summary>
+        /// <returns></returns>
+        public static string GetIntoMsg() 
+        {
+            SocketModel msg = new SocketModel
+            {
+                c = 2001,
+                rid = 1,
+                d = "pc",
+                u = 1,
+                s = 1,
+                b = new BodyModel
+                {
+                    stname = APP.LoginUser.username,
+                    stid = APP.LoginUser.userid,
+                    stpic = APP.LoginUser.headpic
+                },
+
+
+                f = APP.LoginUser.userid,
+                t = new List<int>()
+            };
+            return JsonConvert.SerializeObject(msg);
+        }
+        /// <summary>
+        /// 关闭直播
+        /// </summary>
+        /// <returns></returns>
+        public static string NolineMsg() 
+        {
+            SocketModel msg = new SocketModel
+            {
+                c = 1002,
+                rid = 1,
+                d = "pc",
+                u = 1,
+                s = 1,
+                b = new BodyModel(),
+                f = APP.LoginUser.userid,
+                t = new List<int>()
+            };
+            return JsonConvert.SerializeObject(msg);
+        }
+        /// <summary>
+        /// 抢答
+        /// </summary>
+        /// <returns></returns>
+        public static string RushToAnswerMsg()
+        {
+            SocketModel msg = new SocketModel
+            {
+                c = 1021,
+                rid = 1,
+                d = "pc",
+                u = 1,
+                s = 1,
+                b = new BodyModel(),
+                f = APP.LoginUser.userid,
+                t = new List<int>()
+            };
+            return JsonConvert.SerializeObject(msg);
+        }
+        /// <summary>
+        /// 结束抢答
+        /// </summary>
+        /// <returns></returns>
+        public static string RushToAnswerEndMsg() 
+        {
+            SocketModel msg = new SocketModel
+            {
+                c = 1022,
+                rid = 1,
+                d = "pc",
+                u = 1,
+                s = 1,
+                b = new BodyModel(),
+                f = APP.LoginUser.userid,
+                t = new List<int>()
+            };
+            return JsonConvert.SerializeObject(msg);
+        }
+        /// <summary>
+        /// 随机点名
+        /// </summary>
+        /// <returns></returns>
+        public static string RandomRollCallMsg(int userid)
+        {
+            SocketModel msg = new SocketModel
+            {
+                c = 1031,
+                rid = 1,
+                d = "pc",
+                u = 1,
+                s = 1,
+                b = new BodyModel(),
+                f = APP.LoginUser.userid,
+                t = new List<int>(),
+            };
+            msg.t.Add(userid);
+            return JsonConvert.SerializeObject(msg);
+        }
+        /// <summary>
+        /// 随机点名结束
+        /// </summary>
+        /// <returns></returns>
+        public static string RandomRollCallEndMsg()
+        {
+            SocketModel msg = new SocketModel
+            {
+                c = 1032,
+                rid = 1,
+                d = "pc",
+                u = 1,
+                s = 1,
+                b = new BodyModel(),
+                f = APP.LoginUser.userid,
+                t = new List<int>(),
+            };
+            return JsonConvert.SerializeObject(msg);
+        }
+        /// <summary>
+        /// 获取消息
+        /// </summary>
+        /// <returns></returns>
+        public static string AddMsg()
+        {
+            SocketModel msg = new SocketModel
+            {
+                c = 1040,
+                rid = 1,
+                d = "pc",
+                u = 1,
+                s = 1,
+                b = new BodyModel(),
+                f = APP.LoginUser.userid,
+                t = new List<int>(),
+            };
+            return JsonConvert.SerializeObject(msg);
+        }
     }
 }

XHZB.Desktop/WebSocket/WSocketClient.cs

@@ -1,13 +1,33 @@
-using SuperSocket.ClientEngine;
+using Common.system;
+using SuperSocket.ClientEngine;
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using WebSocket4Net;
+using XHZB.Model;
 
 namespace XHZB.Desktop.WebSocket
 {
     public class WSocketClient : IDisposable
     {
+        // 打开的窗口列表
+        private static readonly Dictionary<Type, object> WinDic = new Dictionary<Type, object>();
+        private static WSocketClient instance;
+        public static WSocketClient getInstance()
+        {
+            if (instance == null)
+            {
+                instance = new WSocketClient();
+            }
+            return instance;
+        }
+
+
+
+
+
+
         public static NLog.Logger _Logger = NLog.LogManager.GetCurrentClassLogger();
 
         #region 向外传递数据事件
@@ -25,16 +45,45 @@ namespace XHZB.Desktop.WebSocket
         /// </summary>
         public string ServerPath { get; set; }
 
-        public WSocketClient(string url)
+        //public WSocketClient()
+        //{
+        //    string url = "ws://schoolwstest.xhkjedu.com/ws";
+        //    ServerPath = url;
+        //    this._webSocket = new WebSocket4Net.WebSocket(url);
+        //    this._webSocket.Opened += WebSocket_Opened;
+        //    this._webSocket.Error += WebSocket_Error;
+        //    this._webSocket.Closed += WebSocket_Closed;
+        //    this._webSocket.MessageReceived += WebSocket_MessageReceived;
+
+        //    //注册消息接收事件，接收服务端发送的数据
+        //    MessageReceived += (data) => {
+        //        Console.WriteLine(data);
+        //    };
+        //    //开始链接
+        //    Start();
+        //    SendMessage(SocketMsgManger.offlineMsg());
+        //}
+
+
+        public void StartWsClient()
         {
+            string url = "ws://schoolwstest.xhkjedu.com/ws";
             ServerPath = url;
             this._webSocket = new WebSocket4Net.WebSocket(url);
             this._webSocket.Opened += WebSocket_Opened;
             this._webSocket.Error += WebSocket_Error;
             this._webSocket.Closed += WebSocket_Closed;
             this._webSocket.MessageReceived += WebSocket_MessageReceived;
-        }
 
+            //注册消息接收事件，接收服务端发送的数据
+            MessageReceived += (data) =>
+            {
+                Console.WriteLine(data);
+            };
+            //开始链接
+            Start();
+            SendMessage(SocketMsgManger.offlineMsg());
+        }
         #region "web socket "
         /// <summary>
         /// 连接方法
@@ -67,12 +116,47 @@ namespace XHZB.Desktop.WebSocket
             _Logger.Info(" Received:" + e.Message);
             MessageReceived?.Invoke(e.Message);
 
+            Console.WriteLine("WS:消息收到:" + e.Message);
 
 
+            SocketModel msgBean = JsonHelper.JsonToObj<SocketModel>(e.Message);
 
-
-
-
+            if (msgBean != null && msgBean.b != null)
+            {
+                if (msgBean.c != 0&& msgBean.u == 2)
+                {
+                    if (msgBean.c == 2001)//上线
+                    {
+                        OnlineUserModel item = new OnlineUserModel
+                        {
+                            usertype = msgBean.c,
+                            userid = msgBean.b.stid,
+                            username = msgBean.b.stname,
+                            userpic = msgBean.b.stpic
+                        };
+                        APP.OnlineUserList.Add(item);
+                    }
+                    else if(msgBean.c == 2002)//下线
+                    {
+                        try
+                        {
+                            for (int i = 0; i < APP.OnlineUserList.Count; i++)
+                            {
+                                if (msgBean.b.stid == APP.OnlineUserList[i].userid)
+                                {
+                                    APP.OnlineUserList.RemoveAt(i);
+                                    break;
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteErrLog("(移除)" + ex.Message, ex);
+                        }
+                    }
+                  
+                }
+            }
 
         }
         /// <summary>
@@ -101,6 +185,9 @@ namespace XHZB.Desktop.WebSocket
         void WebSocket_Opened(object sender, EventArgs e)
         {
             _Logger.Info(" websocket_Opened");
+
+            SendMessage(SocketMsgManger.offlineMsg());
+
         }
         /// <summary>
         /// 检查重连线程
@@ -139,6 +226,7 @@ namespace XHZB.Desktop.WebSocket
                 if (_webSocket != null && _webSocket.State == WebSocket4Net.WebSocketState.Open)
                 {
                     this._webSocket.Send(Message);
+                    Console.WriteLine("WS:发送消息:" + Message);
                 }
             });
         }

XHZB.Model/AddSocketMsgModel.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XHZB.Model
+{
+    public class AddSocketMsgModel
+    {
+        /// <summary>
+        /// 获取学生在线消息
+        /// </summary>
+        public List<SocketModel> addSocketMsg { get; set; } 
+    }
+}

XHZB.Model/BodyModel.cs

@@ -8,10 +8,10 @@ namespace XHZB.Model
 {
     public class BodyModel
     {
-        public string rtmp { get; set; }
-        public string cn { get; set; }
-        public string mac { get; set; }
-        public int stnum { get; set; }
+        //public string rtmp { get; set; }
+        //public string cn { get; set; }
+        //public string mac { get; set; }
+        //public int stnum { get; set; }
         public string stname { get; set; }
         public int stid { get; set; }
         public string stpic { get; set; }

XHZB.Model/SocketModel.cs

@@ -35,7 +35,7 @@ namespace XHZB.Model
         /// <summary>
         /// 错误信息
         /// </summary>
-        public int m { get; set; }
+        public string m { get; set; }
         /// <summary>
         /// 是否群发 0不发 1发
         /// </summary>

XHZB.Model/XHZB.Model.csproj

@@ -41,6 +41,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AddSocketMsgModel.cs" />
     <Compile Include="BodyModel.cs" />
     <Compile Include="Class1.cs" />
     <Compile Include="ClassListModel.cs" />