diff options
| -rw-r--r-- | src/org/traccar/protocol/GalileoProtocolDecoder.java | 47 |
1 files changed, 38 insertions, 9 deletions
diff --git a/src/org/traccar/protocol/GalileoProtocolDecoder.java b/src/org/traccar/protocol/GalileoProtocolDecoder.java index 0b4cba259..cc05a525b 100644 --- a/src/org/traccar/protocol/GalileoProtocolDecoder.java +++ b/src/org/traccar/protocol/GalileoProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 - 2014 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2013 - 2015 Anton Tananaev (anton.tananaev@gmail.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,14 +54,43 @@ public class GalileoProtocolDecoder extends BaseProtocolDecoder { private static final Map<Integer, Integer> tagLengthMap = new HashMap<>(); static { - int[] l1 = {0x01,0x02,0x35,0x43,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd5,0x88,0x8a,0x8b,0x8c,0xa0,0xaf,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae}; - int[] l2 = {0x04,0x10,0x34,0x40,0x41,0x42,0x45,0x46,0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x60,0x61,0x62,0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7,0xb8,0xb9,0xd6,0xd7,0xd8,0xd9,0xda}; - int[] l3 = {0x63,0x64,0x6f,0x5d,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e}; - int[] l4 = {0x20,0x33,0x44,0x90,0xc0,0xc1,0xc2,0xc3,0xd3,0xd4,0xdb,0xdc,0xdd,0xde,0xdf,0xf0,0xf9,0x5a,0x47,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8}; - for (int i : l1) { tagLengthMap.put(i, 1); } - for (int i : l2) { tagLengthMap.put(i, 2); } - for (int i : l3) { tagLengthMap.put(i, 3); } - for (int i : l4) { tagLengthMap.put(i, 4); } + int[] l1 = { + 0x01, 0x02, 0x35, 0x43, 0xc4, 0xc5, 0xc6, 0xc7, + 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, + 0xd0, 0xd1, 0xd2, 0xd5, 0x88, 0x8a, 0x8b, 0x8c, + 0xa0, 0xaf, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, + 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae + }; + int[] l2 = { + 0x04, 0x10, 0x34, 0x40, 0x41, 0x42, 0x45, 0x46, + 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, + 0x58, 0x59, 0x60, 0x61, 0x62, 0x70, 0x71, 0x72, + 0x73, 0x74, 0x75, 0x76, 0x77, 0xb0, 0xb1, 0xb2, + 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xd6, + 0xd7, 0xd8, 0xd9, 0xda + }; + int[] l3 = { + 0x63, 0x64, 0x6f, 0x5d, 0x65, 0x66, 0x67, 0x68, + 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e + }; + int[] l4 = { + 0x20, 0x33, 0x44, 0x90, 0xc0, 0xc1, 0xc2, 0xc3, + 0xd3, 0xd4, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xf0, + 0xf9, 0x5a, 0x47, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, + 0xf6, 0xf7, 0xf8 + }; + for (int i : l1) { + tagLengthMap.put(i, 1); + } + for (int i : l2) { + tagLengthMap.put(i, 2); + } + for (int i : l3) { + tagLengthMap.put(i, 3); + } + for (int i : l4) { + tagLengthMap.put(i, 4); + } tagLengthMap.put(TAG_COORDINATES, 9); tagLengthMap.put(TAG_IMEI, 15); tagLengthMap.put(TAG_REFRIGERATOR, 7); // variable length |