diff options
| author | hackerunet <hackerunet@gmail.com> | 2012-10-26 11:01:12 -0700 |
|---|---|---|
| committer | hackerunet <hackerunet@gmail.com> | 2012-10-26 11:01:12 -0700 |
| commit | 534b62acef775a4590239cb96a227d138b262025 (patch) | |
| tree | 973ed2df229c3539005a152c442d266ec73d9969 /src/org | |
| parent | d9f2a13b3277486b99a9e796fac150bbb9443f9a (diff) | |
| parent | 47274f73878ac429ac261cfbcba84c06c48fb547 (diff) | |
| download | traccar-server-534b62acef775a4590239cb96a227d138b262025.tar.gz traccar-server-534b62acef775a4590239cb96a227d138b262025.tar.bz2 traccar-server-534b62acef775a4590239cb96a227d138b262025.zip | |
Merge pull request #1 from tananaev/master
New pull request from Anton last merge
Diffstat (limited to 'src/org')
| -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()); |