aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-04-24 23:58:41 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2016-04-24 23:58:41 +1200
commitdceebc4430b3df2f4033b6d9cace29e58d94cefa (patch)
tree70dcbbbfea03ca267407d0520d9cb2a60a7b33bb /src
parent69b3a1e33ae071d722b7c73df8405d8e8fb9bd08 (diff)
downloadtraccar-server-dceebc4430b3df2f4033b6d9cace29e58d94cefa.tar.gz
traccar-server-dceebc4430b3df2f4033b6d9cace29e58d94cefa.tar.bz2
traccar-server-dceebc4430b3df2f4033b6d9cace29e58d94cefa.zip
Minor H02 encoder cleanup
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/protocol/H02ProtocolEncoder.java33
1 files changed, 14 insertions, 19 deletions
diff --git a/src/org/traccar/protocol/H02ProtocolEncoder.java b/src/org/traccar/protocol/H02ProtocolEncoder.java
index 6475c0c67..948495b61 100644
--- a/src/org/traccar/protocol/H02ProtocolEncoder.java
+++ b/src/org/traccar/protocol/H02ProtocolEncoder.java
@@ -22,19 +22,13 @@ import org.traccar.helper.Log;
import org.traccar.model.Command;
public class H02ProtocolEncoder extends StringProtocolEncoder {
+
private static final String MARKER = "HQ";
- private Object formatCommand(DateTime dt, String uniqueId, String cmd, String... params) {
+ private Object formatCommand(DateTime time, String uniqueId, String type, String... params) {
- String result = String.format(
- "*%s,%s,%s,%02d%02d%02d",
- MARKER,
- uniqueId,
- cmd,
- dt.getHourOfDay(),
- dt.getMinuteOfHour(),
- dt.getSecondOfMinute()
- );
+ String result = String.format("*%s,%s,%s,%02d%02d%02d",
+ MARKER, uniqueId, type, time.getHourOfDay(), time.getMinuteOfHour(), time.getSecondOfMinute());
for (String param : params) {
result += "," + param;
@@ -45,21 +39,22 @@ public class H02ProtocolEncoder extends StringProtocolEncoder {
return result;
}
- protected Object encodeCommand(Command command, DateTime dt) {
+ protected Object encodeCommand(Command command, DateTime time) {
String uniqueId = getUniqueId(command.getDeviceId());
switch (command.getType()) {
case Command.TYPE_ALARM_ARM:
- return formatCommand(dt, uniqueId, "SCF", "0", "0");
+ return formatCommand(time, uniqueId, "SCF", "0", "0");
case Command.TYPE_ALARM_DISARM:
- return formatCommand(dt, uniqueId, "SCF", "1", "1");
+ return formatCommand(time, uniqueId, "SCF", "1", "1");
case Command.TYPE_ENGINE_STOP:
- return formatCommand(dt, uniqueId, "S20", "1", "3", "10", "3", "5", "5", "3", "5", "3", "5", "3", "5");
+ return formatCommand(
+ time, uniqueId, "S20", "1", "3", "10", "3", "5", "5", "3", "5", "3", "5", "3", "5");
case Command.TYPE_ENGINE_RESUME:
- return formatCommand(dt, uniqueId, "S20", "0", "0");
+ return formatCommand(time, uniqueId, "S20", "0", "0");
case Command.TYPE_POSITION_PERIODIC:
- return formatCommand(dt, uniqueId, "S71", "22",
- command.getAttributes().get(Command.KEY_FREQUENCY).toString());
+ return formatCommand(
+ time, uniqueId, "S71", "22", command.getAttributes().get(Command.KEY_FREQUENCY).toString());
default:
Log.warning(new UnsupportedOperationException(command.getType()));
break;
@@ -70,7 +65,7 @@ public class H02ProtocolEncoder extends StringProtocolEncoder {
@Override
protected Object encodeCommand(Command command) {
- DateTime dt = new DateTime(DateTimeZone.UTC);
- return encodeCommand(command, dt);
+ return encodeCommand(command, new DateTime(DateTimeZone.UTC));
}
+
}