aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org
diff options
context:
space:
mode:
authorNikolay Vlahovski <nvlahovski@gmail.com>2023-05-15 21:55:20 +0300
committerNikolay Vlahovski <nvlahovski@gmail.com>2023-05-15 21:55:20 +0300
commitcd092d7e2733881266a3b864743df61e6ac76ce4 (patch)
tree3fae545f6fd97394c2048cb5203104852667aea3 /src/main/java/org
parent6dae98179630a15c5f62899b32ed093e293822e2 (diff)
downloadtrackermap-server-cd092d7e2733881266a3b864743df61e6ac76ce4.tar.gz
trackermap-server-cd092d7e2733881266a3b864743df61e6ac76ce4.tar.bz2
trackermap-server-cd092d7e2733881266a3b864743df61e6ac76ce4.zip
Remove Instance variables from TranSyncProtocolDecoder.java
Add parseDate function Add getTrackerModel function Add setNetwork function Rename setTimestampPacket function -> getDatefromIntegerParameters
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/traccar/protocol/TranSyncProtocolDecoder.java303
1 files changed, 84 insertions, 219 deletions
diff --git a/src/main/java/org/traccar/protocol/TranSyncProtocolDecoder.java b/src/main/java/org/traccar/protocol/TranSyncProtocolDecoder.java
index 7cafc09ee..d5a69dbe2 100644
--- a/src/main/java/org/traccar/protocol/TranSyncProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/TranSyncProtocolDecoder.java
@@ -24,117 +24,18 @@ public class TranSyncProtocolDecoder extends BaseProtocolDecoder {
super(protocol);
}
- private boolean isOptionalParameters;
- private boolean extended;
- private final String STX = "3A3A";
- private final String ETX = "2323";
- private String lac;
- private String deviceId;
- private Date datePacket;
- private double latitude;
- private double longitude;
- private double speed;
- private int course;
- private int mobileNetworkCode;
- private int gsmSignalStrength;
- private double batteryVoltage;
- private int satellitesNumber;
- private int hdopProtocol;
- private short adcVoltageInMilliVolts;
- private String rfidTagName;
- private int adc2;
- private int cellIdInt;
- private int lacInt;
- private int odometer;
- private boolean isGpsFix;
- private boolean isLiveData;
- private boolean hasGpsAlert;
- private boolean isIgnitionOff;
- private boolean isPowerOff;
- private int deviceAlert;
- private String gpsTrackerModel;
- private boolean isOutPutTwo;
- private boolean isOutPutOne;
- private boolean isInPutThree;
-
-
-
- public String getLac() {
- return lac;
- }
-
- public void setLac(String lac) {
- this.lac = lac;
- }
-
- public String getDeviceId() {
- return deviceId;
- }
-
- public void setDeviceId(String deviceId) {
- this.deviceId = deviceId;
- }
-
- public void setDatePacket(Date datePacket) {
- this.datePacket = datePacket;
- }
-
- public double getLatitude() {
- return latitude;
- }
-
- public void setLatitude(double latitude) {
- this.latitude = latitude;
- }
-
- public double getLongitude() {
- return longitude;
- }
-
- public void setLongitude(double longitude) {
- this.longitude = longitude;
- }
-
- public int getCourse() {
- return course;
- }
-
- public void setCourse(int course) {
- this.course = course;
- }
-
- public void setCellId(String cellId) {
- }
-
- public int getAdc2() {
- return adc2;
- }
-
- public void setAdc2(String adc2) {
- this.adc2 = Integer.parseInt(adc2);
- }
-
- public double getSpeed() {
- return speed;
- }
-
- public void setSpeed(double speed) {
- this.speed = speed;
- }
-
- public void setTimestampPacket(int year, int month, int day, int hours, int minutes, int seconds) {
+ public Date getDatefromIntegerParameters(int year, int month, int day, int hours, int minutes, int seconds) {
String dataString = ""+year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yy-MM-dd HH:mm:ss");
simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
try {
- Date deviceTime = simpleDateFormat.parse(dataString);
- long timestampPacket = deviceTime.toInstant().toEpochMilli();
- this.setDatePacket(deviceTime);
+ return simpleDateFormat.parse(dataString);
} catch (ParseException e) {
e.printStackTrace();
}
+ return null;
}
protected void setDeviceAlert(Position position, int alert) {
@@ -188,166 +89,130 @@ public class TranSyncProtocolDecoder extends BaseProtocolDecoder {
}
- protected void setInstanceParameters(Object msg) throws Exception {
- ByteBuf buf = (ByteBuf) msg;
+ private void setNetwork(Position position, int lacInt, int cellIdInt, int mobileNetworkCode, int gsmSignalStrength){
+ CellTower cellTower = CellTower.fromLacCid(getConfig(), lacInt, cellIdInt);
+ cellTower.setMobileNetworkCode(mobileNetworkCode);
+ cellTower.setSignalStrength(gsmSignalStrength);
+ position.setNetwork(new Network(cellTower));
+
+ }
+
+ private String getTrackerModel(int mask){
+
+ switch (mask) {
+ case 1:
+ return "basic";
+ case 2:
+ return "asset";
+ case 3:
+ return "bike";
+
+ case 4:
+ return "serial";
+
+ case 5:
+ return "obd";
+ case 6:
+ return "l1";
+ case 7:
+ return "ais";
+ default:
+ return "unknown";
+ }
+
+ }
- if (ByteBufUtil.hexDump(buf, 0, 2).toUpperCase().equals(this.STX)) {
+ private Position parseData(Channel channel, SocketAddress remoteAddress, ByteBuf buf) {
+ if (ByteBufUtil.hexDump(buf, 0, 2).equalsIgnoreCase("3A3A")) {
buf.readUnsignedShort();
}
int packetLength = buf.readByte();
- this.lacInt = buf.readUnsignedShort();
- this.deviceId = ByteBufUtil.hexDump(buf, buf.readerIndex(), 8).toUpperCase().trim().replaceFirst("^0+(?!$)", "");
+ int lacInt = buf.readUnsignedShort();
+ String deviceId = ByteBufUtil.hexDump(buf, buf.readerIndex(), 8).toUpperCase().trim().replaceFirst("^0+(?!$)", "");
buf.readBytes(8);
int informationSerialNumber = buf.readUnsignedShort();
int protocolNumber = buf.readUnsignedByte();
- // Information Content
+ DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, deviceId);
+ if (deviceSession == null) {
+ return null;
+ }
+
+ Position position = new Position(getProtocolName());
+ long devicesessionId = deviceSession.getDeviceId();
+
+ position.setDeviceId(devicesessionId) ;
+ position.setValid(true);
int year = buf.readUnsignedByte();
int month = buf.readUnsignedByte();
int day = buf.readUnsignedByte();
int hour = buf.readUnsignedByte();
int minute = buf.readUnsignedByte();
int second = buf.readUnsignedByte();
- this.setTimestampPacket(year, month, day, hour, minute, second);
- this.latitude = (long) buf.readUnsignedInt() / 1800000.0;
- this.longitude = (long) buf.readUnsignedInt() / 1800000.0;
- this.speed = UnitsConverter.knotsFromKph(buf.readUnsignedByte());
- this.course = buf.readUnsignedShort();
- this.mobileNetworkCode = buf.readUnsignedByte();
- this.cellIdInt = buf.readUnsignedShort();
- // Status Bytes
+ position.setTime(getDatefromIntegerParameters(year, month, day, hour, minute, second));
+ position.setLatitude(buf.readUnsignedInt() / 1800000.0);
+ position.setLongitude(buf.readUnsignedInt() / 1800000.0);
+ position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedByte()));
+ position.setCourse(buf.readUnsignedShort());
+ int mobileNetworkCode = buf.readUnsignedByte();
+ int cellIdInt = buf.readUnsignedShort();
int zeroByte = buf.readUnsignedByte();
- this.isOutPutTwo = BitUtil.check(zeroByte, 0);
- this.isOutPutOne = BitUtil.check(zeroByte, 1);
- this.isInPutThree = BitUtil.check(zeroByte, 2);
- this.isPowerOff = BitUtil.check(zeroByte, 3);
- this.isIgnitionOff = BitUtil.check(zeroByte, 4);
- boolean isgpsFixed = BitUtil.check(zeroByte, 7);
-
-
- this.isGpsFix = BitUtil.check(zeroByte, 0);
+ position.set(Position.PREFIX_OUT + 1, BitUtil.check(zeroByte, 0));
+ position.set(Position.PREFIX_OUT + 2, BitUtil.check(zeroByte, 1));
+ position.set(Position.PREFIX_IN + 3, BitUtil.check(zeroByte, 2));
+ if (BitUtil.check(zeroByte, 3)) position.set(Position.ALARM_POWER_OFF, true);
+ position.set(Position.KEY_IGNITION, BitUtil.check(zeroByte, 4));
+ position.set("gpsFix", BitUtil.check(zeroByte, 7));
int oneByte = buf.readUnsignedByte();
- this.deviceAlert = buf.readUnsignedByte();
+ int deviceAlert = buf.readUnsignedByte();
+ if (deviceAlert > 0) { setDeviceAlert(position, deviceAlert); }
int threeByte = buf.readUnsignedByte();
- this.isLiveData = (threeByte & 0b10000000) == 0;
- this.hasGpsAlert = (threeByte & 0b00100000) != 0;
- int trackerType = threeByte & 0b00001111;
-
- switch (trackerType) {
- case 1:
- this.gpsTrackerModel = "basic";
- break;
- case 2:
- this.gpsTrackerModel = "asset";
- break;
- case 3:
- this.gpsTrackerModel = "bike";
- break;
- case 4:
- this.gpsTrackerModel = "serial";
- break;
- case 5:
- this.gpsTrackerModel = "obd";
- break;
- case 6:
- this.gpsTrackerModel = "l1";
- break;
- case 7:
- this.gpsTrackerModel = "ais";
- break;
- default:
- this.gpsTrackerModel = "unknown";
- break;
+ if (!((threeByte & 0b10000000) == 0)) position.set("restored", true);
+ if ((threeByte & 0b00100000) != 0) {
+ position.set(Position.ALARM_GPS_ANTENNA_CUT, true);
+ position.set("gpsAlert", true);
}
- // Additional Info
- this.gsmSignalStrength = buf.readUnsignedByte();
- this.batteryVoltage = (double) (buf.readUnsignedByte() / 10);
- this.satellitesNumber = buf.readUnsignedByte();
- this.hdopProtocol = buf.readUnsignedByte();
- this.adcVoltageInMilliVolts = (short) buf.readUnsignedShort();
- this.isOptionalParameters = (boolean) (buf.readableBytes() > 2);
- // Optional parameters
- if (this.isOptionalParameters) { // Always True
+ position.set("model", getTrackerModel(threeByte & 0b00001111));
+ int gsmSignalStrength = buf.readUnsignedByte();
+ position.set(Position.KEY_BATTERY, (double) (buf.readUnsignedByte() / 10));
+ position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
+ position.set(Position.KEY_HDOP, buf.readUnsignedByte());
+ position.set(Position.PREFIX_ADC + 1, (short) buf.readUnsignedShort());
+ boolean isOptionalParameters = (buf.readableBytes() > 2);
+ setNetwork(position, lacInt, cellIdInt, mobileNetworkCode, gsmSignalStrength);
+ if (isOptionalParameters) { // Always True
int odometerIndex = buf.readUnsignedByte();
int odometerLength = buf.readUnsignedByte();
if (odometerLength > 0) {
String odometerReading = ByteBufUtil.hexDump(buf, buf.readerIndex(), odometerLength).toUpperCase().trim().replaceFirst("^0+(?!$)", "");
- this.odometer = Integer.parseInt(odometerReading);
+ int odometer = Integer.parseInt(odometerReading);
buf.readBytes(odometerLength);
+ position.set(Position.KEY_ODOMETER, odometer);
}
if ((buf.readableBytes() > 2)) {
int rfidIndex = buf.readUnsignedByte();
int rfidLength = buf.readUnsignedByte();
if(rfidLength > 0) {
- this.rfidTagName = ByteBufUtil.hexDump(buf, buf.readerIndex(), rfidLength).toUpperCase().trim();
+ String rfidTagName = ByteBufUtil.hexDump(buf, buf.readerIndex(), rfidLength).toUpperCase().trim();
buf.readBytes(rfidLength);
+ position.set("tag", rfidTagName);
}
}
if ((buf.readableBytes() > 5)) {
int adcTwoIndex = buf.readUnsignedByte();
int adcTwoLength = buf.readUnsignedByte();
if (adcTwoLength > 0){
- this.adc2 = buf.readUnsignedShort();
+ position.set(Position.PREFIX_ADC + 2, buf.readUnsignedShort());
}
}
}
- }
-
- private Position positionHandler(Channel channel, SocketAddress remoteAddress) {
-
- DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, this.deviceId);
- if (deviceSession == null) {
- return null;
- }
- Position position = new Position(getProtocolName());
- long devicesessionId = deviceSession.getDeviceId();
- position.setDeviceId(devicesessionId) ;
- position.setValid(true);
- position.setTime(this.datePacket);
- position.setLatitude(this.latitude);
- position.setLongitude(this.longitude);
- position.setSpeed(this.speed);
- position.setCourse(this.course);
- position.set("model", this.gpsTrackerModel);
- position.set(Position.KEY_HDOP, this.hdopProtocol);
- position.set(Position.KEY_BATTERY, this.batteryVoltage);
- position.set(Position.KEY_ODOMETER, this.odometer);
- position.set(Position.PREFIX_ADC + 1, this.adcVoltageInMilliVolts);
- position.set(Position.PREFIX_ADC + 2, this.adc2);
- position.set("tag", this.rfidTagName);
- position.set(Position.KEY_SATELLITES, this.satellitesNumber);
- CellTower cellTower = CellTower.fromLacCid(getConfig(), this.lacInt, this.cellIdInt);
- cellTower.setMobileNetworkCode(this.mobileNetworkCode);
- cellTower.setSignalStrength(this.gsmSignalStrength);
- position.setNetwork(new Network(cellTower));
- if (this.isOutPutOne){ position.set(Position.PREFIX_OUT + 1, this.isOutPutOne);}
- if (this.isOutPutTwo){ position.set(Position.PREFIX_OUT + 2, this.isOutPutTwo);}
- if (this.isInPutThree){ position.set(Position.PREFIX_IN + 2, this.isInPutThree);}
- if (this.isGpsFix) { position.set("gpsFix", this.isGpsFix); }
- if (!this.isLiveData) { position.set("restored", true); }
- if (this.hasGpsAlert) {
- position.set(Position.ALARM_GPS_ANTENNA_CUT, true);
- position.set("gpsAlert", true);
- }
- position.set(Position.KEY_IGNITION, this.isIgnitionOff);
- if (isPowerOff){ position.set(Position.ALARM_POWER_OFF, this.isPowerOff );}
- position.set(Position.KEY_GPS, true);
- if (this.deviceAlert > 0) { setDeviceAlert(position, this.deviceAlert); }
-
return position;
}
@Override
protected Object decode( Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
-
- try {
- setInstanceParameters(msg);
- }
- catch (Exception e) {
- return null;
- }
-
- return positionHandler(channel, remoteAddress);
+ ByteBuf buffer = (ByteBuf) msg;
+ return parseData(channel, remoteAddress, buffer);
}
}