diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2012-10-26 21:31:55 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2012-10-26 21:31:55 +1300 |
| commit | 4b357b2a726402c58934019e2ee0fde6f554dcaf (patch) | |
| tree | 2040b218354aaf237da1a13a90c97572a6cb1977 /src/org/traccar/protocol | |
| parent | add041a617fb105c2e17f9dd0266522d1034390f (diff) | |
| parent | 50bba1160c091e844a471b010dbe3835ca11a207 (diff) | |
| download | trackermap-server-4b357b2a726402c58934019e2ee0fde6f554dcaf.tar.gz trackermap-server-4b357b2a726402c58934019e2ee0fde6f554dcaf.tar.bz2 trackermap-server-4b357b2a726402c58934019e2ee0fde6f554dcaf.zip | |
Merge branch 'williamchitto'
Diffstat (limited to 'src/org/traccar/protocol')
| -rw-r--r-- | src/org/traccar/protocol/ST210ProtocolDecoder.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/ST210ProtocolDecoder.java b/src/org/traccar/protocol/ST210ProtocolDecoder.java index 3d176098e..9418293fc 100644 --- a/src/org/traccar/protocol/ST210ProtocolDecoder.java +++ b/src/org/traccar/protocol/ST210ProtocolDecoder.java @@ -46,7 +46,7 @@ public class ST210ProtocolDecoder extends GenericProtocolDecoder { MSG_NUM("(\\d{4});","Message number - After 9999 is reported, message number returns to 0000"), EMG_ID("(\\d);", "Emergency type"), EVT_ID("(\\d);", "Event type"), - ALERT_ID("(\\d);", "Alert type"); + ALERT_ID("(\\d+);", "Alert type"); private String pattern; @@ -94,6 +94,10 @@ public class ST210ProtocolDecoder extends GenericProtocolDecoder { case SPD: position.setSpeed(Double.valueOf(groupValue)); break; + + case MODE: + //position.setMode(Integer.parseInt(groupValue)); + break; case DATE: { // Date @@ -107,7 +111,7 @@ public class ST210ProtocolDecoder extends GenericProtocolDecoder { ret.setTimeInMillis(time.getTimeInMillis() + TimeZone.getTimeZone("UTC").getOffset(time.getTimeInMillis()) - - TimeZone.getDefault().getOffset(time.getTimeInMillis()));*/ + TimeZone.getDefault().getOffset(time.getTimeInMillis()));*/ position.setTime(time.getTime()); @@ -128,7 +132,7 @@ public class ST210ProtocolDecoder extends GenericProtocolDecoder { ret.setTimeInMillis(time.getTimeInMillis() + TimeZone.getTimeZone("UTC").getOffset(time.getTimeInMillis()) - - TimeZone.getDefault().getOffset(time.getTimeInMillis()));*/ + TimeZone.getDefault().getOffset(time.getTimeInMillis()));*/ position.setTime(time.getTime()); |