From c9a1df9c19a64844d05d120ff171f523d77e7823 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期六, 25 四月 2026 22:15:36 +0800
Subject: [PATCH] Merge branch 'xiaoyang' into dev
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SocketServer/TcpSocketServer.cs | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SocketServer/TcpSocketServer.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SocketServer/TcpSocketServer.cs
index e08d58f..3523884 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SocketServer/TcpSocketServer.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SocketServer/TcpSocketServer.cs
@@ -1,12 +1,6 @@
using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.IO;
using System.Net.Sockets;
using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using WIDESEAWCS_QuartzJob;
namespace WIDESEAWCS_Tasks.SocketServer
{
@@ -136,13 +130,22 @@
public bool IsRunning { get; private set; }
/// <summary>
+ /// 姣忎釜瀹㈡埛绔笂娆℃帴鏀剁殑娑堟伅锛岀敤浜庡幓閲�
+ /// </summary>
+ /// <remarks>
+ /// Key: 瀹㈡埛绔� ID
+ /// Value: 涓婃鎺ユ敹鐨勬秷鎭唴瀹�
+ /// </remarks>
+ public readonly Dictionary<string, string> _clientLastMessage = new();
+
+ /// <summary>
/// 娑堟伅鎺ユ敹浜嬩欢
/// </summary>
/// <remarks>
/// 褰撴湇鍔″櫒鎺ユ敹鍒版秷鎭椂瑙﹀彂銆�
/// 鍙傛暟锛氭秷鎭唴瀹广�佹槸鍚� JSON 鏍煎紡銆乀CP 瀹㈡埛绔�佹満鍣ㄤ汉鐘舵��
/// </remarks>
- public event Func<string, bool, TcpClient, RobotSocketState, Task<string?>>? MessageReceived;
+ public event Func<string, bool, TcpClient, Task<string?>>? MessageReceived;
/// <summary>
/// 鏈哄櫒浜鸿繛鎺ユ柇寮�浜嬩欢
@@ -194,8 +197,9 @@
/// <param name="message">鏃ュ織娑堟伅</param>
private void Log(string message)
{
+ //Logger.None.Information(message);
Console.WriteLine(message);
try { File.AppendAllText(_logFile, message + Environment.NewLine); } catch { }
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3