Commit 5df9c727 LN

rfid分包修改

1 个父辈 1de1acb1
...@@ -151,6 +151,8 @@ namespace Asa.RFID ...@@ -151,6 +151,8 @@ namespace Asa.RFID
{ {
IsConnect = true; IsConnect = true;
byte[] dataBuffer = new byte[0];
while (IsConnect) while (IsConnect)
{ {
try try
...@@ -164,14 +166,19 @@ namespace Asa.RFID ...@@ -164,14 +166,19 @@ namespace Asa.RFID
string dataStr = byteToStr(data, len); string dataStr = byteToStr(data, len);
LOGGER.Debug(IP + " Receive Code: " + ErrCode + " Len: " + len + " Data:" + dataStr); LOGGER.Debug(IP + " Receive Code: " + ErrCode + " Len: " + len + " Data:" + dataStr);
byte[] temp = new byte[dataBuffer.Length+len];
Array.Copy(dataBuffer, temp, dataBuffer.Length);
Array.Copy(data, 0, temp, dataBuffer.Length, len);
byte[] bb = new byte[10]; byte[] bb = new byte[10];
int idx = -1; int idx = -1;
bool start = false; bool start = false;
bool end = false; bool end = false;
for (int i = 0; i < len; i++) int endIndex = -1;
for (int i = 0; i < temp.Length; i++)
{ {
byte b = data[i]; byte b = temp[i];
if (b == 0x5A) if (b == 0x5A)
{ {
start = true; start = true;
...@@ -182,6 +189,7 @@ namespace Asa.RFID ...@@ -182,6 +189,7 @@ namespace Asa.RFID
{ {
start = false; start = false;
end = true; end = true;
endIndex = i;
bb[idx++] = b; bb[idx++] = b;
} }
...@@ -216,6 +224,16 @@ namespace Asa.RFID ...@@ -216,6 +224,16 @@ namespace Asa.RFID
Received?.Invoke(IP, _buff); Received?.Invoke(IP, _buff);
} }
} }
endIndex++;
if (endIndex<temp.Length)
{
dataBuffer = new byte[temp.Length - endIndex];
Array.Copy(temp, endIndex, dataBuffer, 0, temp.Length - endIndex);
dataStr = byteToStr(dataBuffer, dataBuffer.Length);
LOGGER.Debug(IP + " Receive Code: 剩余 Length: " + dataBuffer.Length + " Data:" + dataStr);
}
} }
System.Threading.Thread.Sleep(60); System.Threading.Thread.Sleep(60);
......
...@@ -347,7 +347,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -347,7 +347,7 @@ namespace OnlineStore.DeviceLibrary
// string[] msgArray = msg.Split(cmd_spilt); // string[] msgArray = msg.Split(cmd_spilt);
msg = msg.Replace("\r", ""); msg = msg.Replace("\r", "");
LogUtil.debug("收到【" + client.AddStr + "】的消息【" + msg + "】"); // LogUtil.debug("收到【" + client.AddStr + "】的消息【" + msg + "】");
StoreSendBean storeSMsg = JsonHelper.DeserializeJsonToObject<StoreSendBean>(msg); StoreSendBean storeSMsg = JsonHelper.DeserializeJsonToObject<StoreSendBean>(msg);
if (storeSMsg == null) if (storeSMsg == null)
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!