去重

XHZB.Desktop/ToolbarWindow.xaml.cs

@@ -204,7 +204,7 @@ namespace XHZB.Desktop
                     }
                     else
                     {
-                        //APP.W_RollCallWindow.Initialize();
+                        APP.W_RollCallWindow.Initialize();
                     }
                     APP.W_RollCallWindow.Owner = this;
                     //ZSocketServer.getInstance().addWin(rollCallWindow);

XHZB.Desktop/WebSocket/WSocketClient.cs

@@ -125,41 +125,50 @@ namespace XHZB.Desktop.WebSocket
 
             SocketModel msgBean = JsonHelper.JsonToObj<SocketModel>(e.Message);
 
-           //if(isMsg)
-           // {
-           //     GetOnlineStudentsModel msgBean = JsonHelper.JsonToObj<GetOnlineStudentsModel>(e.Message);
-           //     if (msgBean.c == 1040)
-           //     {
+            //if(isMsg)
+            // {
+            //     GetOnlineStudentsModel msgBean = JsonHelper.JsonToObj<GetOnlineStudentsModel>(e.Message);
+            //     if (msgBean.c == 1040)
+            //     {
 
-           //     }
-           // }
+            //     }
+            // }
 
             if (msgBean != null && msgBean.b != null)
             {
-                if(msgBean.c==1040)
+                if (msgBean.c == 1040)
                 {
-                    GetOnlineStudentsModel msgOnline= JsonHelper.JsonToObj<GetOnlineStudentsModel>(e.Message);
+                    GetOnlineStudentsModel msgOnline = JsonHelper.JsonToObj<GetOnlineStudentsModel>(e.Message);
 
-                    foreach(StudentModel getOnline in msgOnline.b.stulst)
+                    foreach (StudentModel getOnline in msgOnline.b.stulst)
                     {
-                        OnlineUserModel item = new OnlineUserModel
+
+                        OnlineUserModel item = new OnlineUserModel();
+                        if (getUserByIds(getOnline.userid) == null)
                         {
-                            usertype = 2001,
-                            userid = getOnline.userid,
-                            username = getOnline.username,
-                            userpic = getOnline.headportrait
-                        };
-                        APP.OnlineUserList.Add(item);
-                    }
+                         
+                            item.usertype = 2001;
+                            item.userid = getOnline.userid;
+                            item.username = getOnline.username;
+                            item.userpic = getOnline.headportrait;
+                            APP.OnlineUserList.Add(item);
+                        }
 
-                    //GetOnlineStudentsModel get = new GetOnlineStudentsModel();
-                    //get.b = new StulstModel();
+                    }
                    
-                    //Console.WriteLine("WS:消息收到1111:" + get);
+                    return;
                 }
-                if (msgBean.c != 0&& msgBean.u == 2)
+               
+                //GetOnlineStudentsModel get = new GetOnlineStudentsModel();
+                //get.b = new StulstModel();
+
+                //Console.WriteLine("WS:消息收到1111:" + get);
+            }
+            if (msgBean.c != 0 && msgBean.u == 2)
+            {
+                if (msgBean.c == 2001)//上线
                 {
-                    if (msgBean.c == 2001)//上线
+                    if(getUserByIds(msgBean.b.stid) == null)
                     {
                         OnlineUserModel item = new OnlineUserModel
                         {
@@ -171,172 +180,198 @@ namespace XHZB.Desktop.WebSocket
                         APP.OnlineUserList.Add(item);
                         sendUserChangeToWin();
                     }
-                    else if(msgBean.c == 2002)//下线
+                 
+                   
+                }
+                else if (msgBean.c == 2002)//下线
+                {
+                    try
                     {
-                        try
+                        for (int i = 0; i < APP.OnlineUserList.Count; i++)
                         {
-                            for (int i = 0; i < APP.OnlineUserList.Count; i++)
+                            if (msgBean.b.stid == APP.OnlineUserList[i].userid)
                             {
-                                if (msgBean.b.stid == APP.OnlineUserList[i].userid)
-                                {
-                                    APP.OnlineUserList.RemoveAt(i);
-                                  
-                                    break;
-                                }
+                                APP.OnlineUserList.RemoveAt(i);
+
+                                break;
                             }
                         }
-                        catch (Exception ex)
-                        {
-                            LogHelper.WriteErrLog("(移除)" + ex.Message, ex);
-                        }
-                        sendUserChangeToWin();
                     }
-                    sendMsgToWin(msgBean);
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteErrLog("(移除)" + ex.Message, ex);
+                    }
+                    sendUserChangeToWin();
                 }
+                sendMsgToWin(msgBean);
             }
         }
-        private static void sendMsgToWin(SocketModel msg)
+  
+    /// <summary>
+    /// 是否存在用户
+    /// </summary>
+    /// <param name="userid"></param>
+    /// <returns></returns>
+    public OnlineUserModel getUserByIds(int userid)
+    {
+        if (APP.OnlineUserList.Count > 0)
         {
-            foreach (KeyValuePair<Type, object> kvp in WinDic)
+            OnlineUserModel[] userList = APP.OnlineUserList.ToArray();
+            foreach (OnlineUserModel user in userList)
             {
-                if (kvp.Value is SocketCallback callback)
+                if (user != null)
                 {
-                    callback.receiveWsMsg(msg);
+                    if (user.userid == userid)
+                    {
+                        return user;
+                    }
                 }
             }
         }
-        /// <summary>
-        /// 添加要推送消息的窗口
-        /// </summary>
-        /// <param name="win"></param>
-        public void addWin(object win)
+        return null;
+    }
+    private static void sendMsgToWin(SocketModel msg)
+    {
+        foreach (KeyValuePair<Type, object> kvp in WinDic)
         {
-            if (WinDic.ContainsKey(win.GetType()))
+            if (kvp.Value is SocketCallback callback)
             {
-                WinDic[win.GetType()] = win;
-            }
-            else
-            {
-                WinDic.Add(win.GetType(), win);
+                callback.receiveWsMsg(msg);
             }
         }
-        /// <summary>
-        /// 发送给需要接收的窗口
-        /// </summary>
-        private static void sendUserChangeToWin()
+    }
+    /// <summary>
+    /// 添加要推送消息的窗口
+    /// </summary>
+    /// <param name="win"></param>
+    public void addWin(object win)
+    {
+        if (WinDic.ContainsKey(win.GetType()))
         {
-            foreach (KeyValuePair<Type, object> kvp in WinDic)
-            {
-                if (kvp.Value is SocketCallback callback)
-                {
-                    callback.userListChange();
-                }
-            }
+            WinDic[win.GetType()] = win;
         }
-        /// <summary>
-        /// 移除窗口
-        /// </summary>
-        /// <param name="win"></param>
-        public void removedWin(object win)
+        else
+        {
+            WinDic.Add(win.GetType(), win);
+        }
+    }
+    /// <summary>
+    /// 发送给需要接收的窗口
+    /// </summary>
+    private static void sendUserChangeToWin()
+    {
+        foreach (KeyValuePair<Type, object> kvp in WinDic)
         {
-            if (WinDic.ContainsKey(win.GetType()))
+            if (kvp.Value is SocketCallback callback)
             {
-                WinDic.Remove(win.GetType());
+                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>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void WebSocket_Closed(object sender, EventArgs e)
-        {
-            _Logger.Info("websocket_Closed");
-        }
-        /// <summary>
-        /// Socket报错事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void WebSocket_Error(object sender, ErrorEventArgs e)
-        {
-            _Logger.Info("websocket_Error:" + e.Exception.ToString());
-        }
-        /// <summary>
-        /// Socket打开事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void WebSocket_Opened(object sender, EventArgs e)
-        {
-            SendMessage(SocketMsgManger.AddMsg());
-            _Logger.Info(" websocket_Opened");
+    /// <summary>
+    /// Socket关闭事件
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    void WebSocket_Closed(object sender, EventArgs e)
+    {
+        _Logger.Info("websocket_Closed");
+    }
+    /// <summary>
+    /// Socket报错事件
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    void WebSocket_Error(object sender, ErrorEventArgs e)
+    {
+        _Logger.Info("websocket_Error:" + e.Exception.ToString());
+    }
+    /// <summary>
+    /// Socket打开事件
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    void WebSocket_Opened(object sender, EventArgs e)
+    {
+        SendMessage(SocketMsgManger.AddMsg());
+        _Logger.Info(" websocket_Opened");
 
 
 
-            SendMessage(SocketMsgManger.offlineMsg());
+        SendMessage(SocketMsgManger.offlineMsg());
 
-        }
-        /// <summary>
-        /// 检查重连线程
-        /// </summary>
-        private void CheckConnection()
+    }
+    /// <summary>
+    /// 检查重连线程
+    /// </summary>
+    private void CheckConnection()
+    {
+        do
         {
-            do
+            try
             {
-                try
+                if (this._webSocket.State != WebSocket4Net.WebSocketState.Open && this._webSocket.State != WebSocket4Net.WebSocketState.Connecting)
                 {
-                    if (this._webSocket.State != WebSocket4Net.WebSocketState.Open && this._webSocket.State != WebSocket4Net.WebSocketState.Connecting)
-                    {
-                        _Logger.Info(" Reconnect websocket WebSocketState:" + this._webSocket.State);
-                        this._webSocket.Close();
-                        this._webSocket.Open();
-                        Console.WriteLine("正在重连");
-                    }
+                    _Logger.Info(" Reconnect websocket WebSocketState:" + this._webSocket.State);
+                    this._webSocket.Close();
+                    this._webSocket.Open();
+                    Console.WriteLine("正在重连");
                 }
-                catch (Exception ex)
-                {
-                    _Logger.Error(ex.ToString());
-                }
-                System.Threading.Thread.Sleep(5000);
-            } while (this._isRunning);
-        }
-        #endregion
-
-        /// <summary>
-        /// 发送消息
-        /// </summary>
-        /// <param name="Message"></param>
-        public void SendMessage(string Message)
-        {
-            Task.Factory.StartNew(() =>
+            }
+            catch (Exception ex)
             {
-                if (_webSocket != null && _webSocket.State == WebSocket4Net.WebSocketState.Open)
-                {
-                    this._webSocket.Send(Message);
-                    Console.WriteLine("WS:发送消息:" + Message);
-                }
-            });
-        }
+                _Logger.Error(ex.ToString());
+            }
+            System.Threading.Thread.Sleep(5000);
+        } while (this._isRunning);
+    }
+    #endregion
 
-        public void Dispose()
+    /// <summary>
+    /// 发送消息
+    /// </summary>
+    /// <param name="Message"></param>
+    public void SendMessage(string Message)
+    {
+        Task.Factory.StartNew(() =>
         {
-            this._isRunning = false;
-            try
+            if (_webSocket != null && _webSocket.State == WebSocket4Net.WebSocketState.Open)
             {
-                _thread.Abort();
+                this._webSocket.Send(Message);
+                Console.WriteLine("WS:发送消息:" + Message);
             }
-            catch
-            {
+        });
+    }
+
+    public void Dispose()
+    {
+        this._isRunning = false;
+        try
+        {
+            _thread.Abort();
+        }
+        catch
+        {
 
-            }
-            this._webSocket.Close();
-            this._webSocket.Dispose();
-            this._webSocket = null;
         }
+        this._webSocket.Close();
+        this._webSocket.Dispose();
+        this._webSocket = null;
     }
 }
+}