Merge branch 'dev' into xiaoyang

wanshenmean

2 天以前 ef57389fd66aca85d6fb4a73c0f7c1c1f7d607b2

 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SocketServer/TcpSocketServer.Messaging.cs

@@ -23,8 +23,7 @@
        /// <param name="client">TCP 客户端连接</param>
        /// <param name="clientId">客户端唯一标识</param>
        /// <param name="cancellationToken">取消令牌</param>
        /// <param name="robotCrane">机器人状态</param>
        public async Task HandleClientAsync(TcpClient client, string clientId, CancellationToken cancellationToken, RobotSocketState robotCrane)
        public async Task HandleClientAsync(TcpClient client, string clientId, CancellationToken cancellationToken)
        {
            using (client)
            using (NetworkStream networkStream = client.GetStream())
@@ -61,14 +60,14 @@
                        }

                        // 按客户端去重：检查是否与该客户端上次消息相同
                        lock (_syncRoot)
                        {
                            if (_clientLastMessage.TryGetValue(clientId, out var prev) && message == prev)
                            {
                                continue;
                            }
                            _clientLastMessage[clientId] = message;
                        }
                        //lock (_syncRoot)
                        //{
                        //    if (_clientLastMessage.TryGetValue(clientId, out var prev) && message == prev)
                        //    {
                        //        continue;
                        //    }
                        //    _clientLastMessage[clientId] = message;
                        //}

                        // 更新客户端状态
                        UpdateClientStatus(clientId, message);