aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Valley <ed.valley@yandex.com>2019-07-05 02:42:01 -0400
committerEdward Valley <ed.valley@yandex.com>2019-07-05 02:42:01 -0400
commit11568839d89fa5bf58da0a654248f9b7696ee406 (patch)
tree4961aa62e4649b160810d946f5e1f5c83e6b7ff3
parent0e4e396fee573aa8d00a0f970085266ffdb45e93 (diff)
downloadtraccar-server-11568839d89fa5bf58da0a654248f9b7696ee406.tar.gz
traccar-server-11568839d89fa5bf58da0a654248f9b7696ee406.tar.bz2
traccar-server-11568839d89fa5bf58da0a654248f9b7696ee406.zip
Changes after second review
-rw-r--r--src/main/java/org/traccar/protocol/LaipacProtocol.java4
-rw-r--r--src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java73
-rw-r--r--src/main/java/org/traccar/protocol/LaipacProtocolEncoder.java14
3 files changed, 37 insertions, 54 deletions
diff --git a/src/main/java/org/traccar/protocol/LaipacProtocol.java b/src/main/java/org/traccar/protocol/LaipacProtocol.java
index 601e652c4..b325755c8 100644
--- a/src/main/java/org/traccar/protocol/LaipacProtocol.java
+++ b/src/main/java/org/traccar/protocol/LaipacProtocol.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2019 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ public class LaipacProtocol extends BaseProtocol {
pipeline.addLast(new LineBasedFrameDecoder(1024));
pipeline.addLast(new StringEncoder());
pipeline.addLast(new StringDecoder());
- pipeline.addLast(new LaipacProtocolEncoder(LaipacProtocol.this));
+ pipeline.addLast(new LaipacProtocolEncoder());
pipeline.addLast(new LaipacProtocolDecoder(LaipacProtocol.this));
}
});
diff --git a/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java b/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java
index b8a0b167c..c028d78b6 100644
--- a/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2013 - 2019 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -36,13 +36,12 @@ import java.util.regex.Pattern;
public class LaipacProtocolDecoder extends BaseProtocolDecoder {
- private final String defaultDevicePassword;
-
public LaipacProtocolDecoder(Protocol protocol) {
super(protocol);
- defaultDevicePassword = "00000000";
}
+ public static final String DEFAULT_DEVICE_PASSWORD = "00000000";
+
private static final Pattern PATTERN_ECHK = new PatternBuilder()
.text("$ECHK")
.expression(",([^,]+)") // identifier
@@ -52,27 +51,27 @@ public class LaipacProtocolDecoder extends BaseProtocolDecoder {
.compile();
private static final Pattern PATTERN_AVRMC = new PatternBuilder()
- .text("$AVRMC")
- .expression(",([^,]+)") // identifier
- .number(",(dd)(dd)(dd)") // time (hhmmss)
- .expression(",([AVRPavrp])") // validity
- .number(",(dd)(dd.d+)") // latitude
- .expression(",([NS])") // latitude hemisphere
- .number(",(ddd)(dd.d+)") // longitude
- .number(",([EW])") // longitude hemisphere
- .number(",(d+.d+)") // speed
- .number(",(d+.d+)") // course
- .number(",(dd)(dd)(dd)") // date (ddmmyy)
- .expression(",([0-9A-Za-z])") // event code
- .expression(",([\\d.]+)") // battery voltage
- .number(",(d+)") // current mileage
- .number(",(d)") // gps status
- .number(",(d+)") // adc1
- .number(",(d+)") // adc2
- .number(",(x{4}|x{1})") // lac | lac+cid = 0
- .number("(x{4})") // cid | nothing
- .number(",(d{3}|d{1})") // mcc | mcc+mnc = 0
- .number("(d{3})") // mnc | nothing
+ .text("$AVRMC,")
+ .expression("([^,]+),") // identifier
+ .number("(dd)(dd)(dd),") // time (hhmmss)
+ .expression("([AVRPavrp]),") // validity
+ .number("(dd)(dd.d+),") // latitude
+ .expression("([NS]),") // latitude hemisphere
+ .number("(ddd)(dd.d+),") // longitude
+ .number("([EW]),") // longitude hemisphere
+ .number("(d+.d+),") // speed
+ .number("(d+.d+),") // course
+ .number("(dd)(dd)(dd),") // date (ddmmyy)
+ .expression("([0-9A-Za-z]),") // event code
+ .expression("([\\d.]+),") // battery voltage
+ .number("(d+),") // current mileage
+ .number("(d),") // gps status
+ .number("(d+),") // adc1
+ .number("(d+)") // adc2
+ .number(",(xxxx|x)") // lac | lac+cid = 0
+ .number("(xxxx),") // cid | nothing
+ .number("(ddd|d)") // mcc | mcc+mnc = 0
+ .number("(ddd)") // mnc | nothing
.optional(4)
.expression(",([^*]*)") // anything remaining (be forward compatible)
.optional(1)
@@ -126,7 +125,7 @@ public class LaipacProtocolDecoder extends BaseProtocolDecoder {
private String getDevicePassword(DeviceSession deviceSession) {
- String devicePassword = defaultDevicePassword;
+ String devicePassword = DEFAULT_DEVICE_PASSWORD;
Device device = Context.getIdentityManager().getById(deviceSession.getDeviceId());
if (device != null) {
@@ -139,7 +138,8 @@ public class LaipacProtocolDecoder extends BaseProtocolDecoder {
return devicePassword;
}
- private String getEventResponse(String event, String devicePassword) {
+ private void sendEventResponse(
+ String event, String devicePassword, Channel channel, SocketAddress remoteAddress) {
String responseCode = null;
@@ -168,21 +168,20 @@ public class LaipacProtocolDecoder extends BaseProtocolDecoder {
if (responseCode != null) {
String response = "$AVCFG," + devicePassword + "," + responseCode;
response += Checksum.nmea(response) + "\r\n";
- return response;
+ channel.writeAndFlush(new NetworkMessage(response, remoteAddress));
}
- return null;
}
- private String getStatusResponse(String status, String event, String checksum) {
+ private void sendAcknowledge(
+ String status, String event, String checksum, Channel channel, SocketAddress remoteAddress) {
if (Character.isLowerCase(status.charAt(0))) {
String response = "$EAVACK," + event + "," + checksum;
response += Checksum.nmea(response) + "\r\n";
- return response;
+ channel.writeAndFlush(new NetworkMessage(response, remoteAddress));
}
- return null;
}
private Object handleEchk(
@@ -246,16 +245,10 @@ public class LaipacProtocolDecoder extends BaseProtocolDecoder {
if (channel != null) {
- String statusResponse = getStatusResponse(status, event, checksum);
- if (statusResponse != null) {
- channel.writeAndFlush(new NetworkMessage(statusResponse, remoteAddress));
- }
+ sendAcknowledge(status, event, checksum, channel, remoteAddress);
String devicePassword = getDevicePassword(deviceSession);
- String eventResponse = getEventResponse(event, devicePassword);
- if (eventResponse != null) {
- channel.writeAndFlush(new NetworkMessage(eventResponse, remoteAddress));
- }
+ sendEventResponse(event, devicePassword, channel, remoteAddress);
}
return position;
diff --git a/src/main/java/org/traccar/protocol/LaipacProtocolEncoder.java b/src/main/java/org/traccar/protocol/LaipacProtocolEncoder.java
index fac82d2fd..6f540fa3e 100644
--- a/src/main/java/org/traccar/protocol/LaipacProtocolEncoder.java
+++ b/src/main/java/org/traccar/protocol/LaipacProtocolEncoder.java
@@ -15,29 +15,19 @@
*/
package org.traccar.protocol;
-import org.traccar.Protocol;
import org.traccar.StringProtocolEncoder;
import org.traccar.model.Command;
import org.traccar.helper.Checksum;
public class LaipacProtocolEncoder extends StringProtocolEncoder {
- private final Protocol protocol;
- private final String defaultDevicePassword;
-
- public LaipacProtocolEncoder(Protocol protocol) {
- this.protocol = protocol;
- defaultDevicePassword = "00000000";
- }
-
- protected String getProtocolName() {
- return protocol.getName();
+ public LaipacProtocolEncoder() {
}
@Override
protected Object encodeCommand(Command command) {
- initDevicePassword(command, defaultDevicePassword);
+ initDevicePassword(command, LaipacProtocolDecoder.DEFAULT_DEVICE_PASSWORD);
String commandSentence = null;