From ef57389fd66aca85d6fb4a73c0f7c1c1f7d607b2 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期日, 26 四月 2026 17:46:51 +0800
Subject: [PATCH] Merge branch 'dev' into xiaoyang
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SocketServer/TcpSocketServer.Messaging.cs | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SocketServer/TcpSocketServer.Messaging.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SocketServer/TcpSocketServer.Messaging.cs
index 5b0ba27..15fd6f2 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SocketServer/TcpSocketServer.Messaging.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SocketServer/TcpSocketServer.Messaging.cs
@@ -2,6 +2,7 @@
using System.Text;
using System.Text.Json;
using System.IO;
+using WIDESEAWCS_Model.Models;
namespace WIDESEAWCS_Tasks.SocketServer
{
@@ -22,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())
@@ -59,11 +59,15 @@
break;
}
- if(message == lastMessage)
- {
- // 閲嶅娑堟伅锛屽拷鐣�
- continue;
- }
+ // 鎸夊鎴风鍘婚噸锛氭鏌ユ槸鍚︿笌璇ュ鎴风涓婃娑堟伅鐩稿悓
+ //lock (_syncRoot)
+ //{
+ // if (_clientLastMessage.TryGetValue(clientId, out var prev) && message == prev)
+ // {
+ // continue;
+ // }
+ // _clientLastMessage[clientId] = message;
+ //}
// 鏇存柊瀹㈡埛绔姸鎬�
UpdateClientStatus(clientId, message);
@@ -83,7 +87,7 @@
{
// 鍒ゆ柇鏄惁涓� JSON 鏍煎紡
bool isJsonFormat = TryParseJsonSilent(message);
- _ = MessageReceived.Invoke(message, isJsonFormat, client, robotCrane);
+ _ = MessageReceived.Invoke(message, isJsonFormat, client);
}
catch { }
}
--
Gitblit v1.9.3