From fdddb786ac2cd2b1d89bab2932aedfec4d05e358 Mon Sep 17 00:00:00 2001 From: tangxu <76880903@qq.com> Date: 星期三, 26 十月 2022 09:11:57 +0800 Subject: [PATCH] 添加单位类型 重量 --- Socket/IStation.DataDockingSocket4NT/HandleHelper.cs | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/Socket/IStation.DataDockingSocket4NT/HandleHelper.cs b/Socket/IStation.DataDockingSocket4NT/HandleHelper.cs index 64bad0f..2c6b626 100644 --- a/Socket/IStation.DataDockingSocket4NT/HandleHelper.cs +++ b/Socket/IStation.DataDockingSocket4NT/HandleHelper.cs @@ -33,16 +33,12 @@ SessionHelper.Cache = session; - var appParas = AppParasHelper.Get(); - if (appParas == null) - { - LogHelper.Error("Socket 鏁版嵁瀵规帴涓紝NT 缂哄皯鏁版嵁瀵规帴閰嶇疆鏂囦欢"); - return; - } - foreach (var item in appParas.InstructionItems) + + foreach (var item in MsgDataHelper.GetInstructionQuerys()) { SendInstructionJobHelper.StartJob(session, item); - Thread.Sleep(appParas.InstructionSendSpace * 1000); + if(item.SpaceTime>0) + Thread.Sleep(item.SpaceTime * 1000); } SendControlJobHelper.StartJob(session); @@ -73,24 +69,19 @@ return; if (bytes == null) return; - var appParas = AppParasHelper.Get(); - if (appParas == null) - { - LogHelper.Error("Socket 鏁版嵁瀵规帴涓紝NT 缂哄皯鏁版嵁瀵规帴閰嶇疆鏂囦欢"); - return; - } + - var receList = HandleDataHelper.HandleData(bytes); + var receList = MsgDataHelper.HandleData(bytes); if (receList != null && receList.Count > 0) { receive(receList); } - if (appParas.Src) + if (MsgDataHelper.IsSrc()) { SrcHelper.Src(bytes); } - if (appParas.Debug) + if (MsgDataHelper.IsDebug()) { DebugHelper.Debug(receList); } -- Gitblit v1.9.3