From af4101b1d8461331bc3163b738fc75d4bf67c85c Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 七月 2020 17:47:44 +0800
Subject: [PATCH] 2020-07-28-1
---
HDL_ON/DriverLayer/Packet.cs | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/DriverLayer/Packet.cs b/HDL_ON/DriverLayer/Packet.cs
index fb19585..06b29b2 100644
--- a/HDL_ON/DriverLayer/Packet.cs
+++ b/HDL_ON/DriverLayer/Packet.cs
@@ -95,28 +95,30 @@
//鏈夌敤鐨勯檮鍔犳暟鎹�
usefulBytes = new byte[this.Bytes[16] - 11];
Array.Copy(Bytes, 25, usefulBytes, 0, usefulBytes.Length);
- }
- if (ReceiveEvent != null)
- {
- string revIp = $"{Bytes[0]}.{Bytes[1]}.{Bytes[2]}.{Bytes[3]}";
- if (revIp == "172.16.2.237")
+
+
+ if (ReceiveEvent != null)
{
+ string revIp = $"{Bytes[0]}.{Bytes[1]}.{Bytes[2]}.{Bytes[3]}";
+ if (revIp == "172.16.2.237")
+ {
+ }
+ ReceiveEvent(subnetID, deviceID, command, usefulBytes, revIp);
}
- ReceiveEvent(subnetID, deviceID, command, usefulBytes, revIp);
- }
- //if (command == Command.SuperGatewayAgentACK) {
- // SuperGateWay.SendAndReceiveDatas.Recevice (subnetID, deviceID, usefulBytes);
- //}
- if (ReceviceAllDadaAction != null)
- {
- ReceviceAllDadaAction(subnetID, deviceID, deviceType, command, targetSubnetID, targetDeviceID, usefulBytes, (System.Net.IPEndPoint)RemoteEndPoint);
- }
- //澶勭悊鏄惁瑕侀噸鍙戞暟鎹�
- Control.ManagerReceive(subnetID, deviceID, command, targetSubnetID, targetDeviceID, usefulBytes, RemoteEndPoint);
+ //if (command == Command.SuperGatewayAgentACK) {
+ // SuperGateWay.SendAndReceiveDatas.Recevice (subnetID, deviceID, usefulBytes);
+ //}
+ if (ReceviceAllDadaAction != null)
+ {
+ ReceviceAllDadaAction(subnetID, deviceID, deviceType, command, targetSubnetID, targetDeviceID, usefulBytes, (System.Net.IPEndPoint)RemoteEndPoint);
+ }
+ //澶勭悊鏄惁瑕侀噸鍙戞暟鎹�
+ Control.ManagerReceive(subnetID, deviceID, command, targetSubnetID, targetDeviceID, usefulBytes, RemoteEndPoint);
+ }
}
}
}
--
Gitblit v1.8.0