diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2019-01-29 20:45:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-29 20:45:42 -0800 |
| commit | ccbb2893352ef62c95be6f1968214e4a6fa1a08d (patch) | |
| tree | df31297ebf5bcd11ae35c7ee86925872445afd50 | |
| parent | 91dc8dab007f5eb2b3f2036b3aab9a5f70271c0f (diff) | |
| parent | 61eb28513bdef0aae9e776f9f872b6c26661556a (diff) | |
| download | trackermap-server-ccbb2893352ef62c95be6f1968214e4a6fa1a08d.tar.gz trackermap-server-ccbb2893352ef62c95be6f1968214e4a6fa1a08d.tar.bz2 trackermap-server-ccbb2893352ef62c95be6f1968214e4a6fa1a08d.zip | |
Merge pull request #4206 from flocsy/message-encoding
fixed message encoding
| -rw-r--r-- | src/org/traccar/protocol/WatchProtocolEncoder.java | 2 | ||||
| -rw-r--r-- | test/org/traccar/protocol/WatchProtocolEncoderTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/WatchProtocolEncoder.java b/src/org/traccar/protocol/WatchProtocolEncoder.java index f66ba4072..431b0455a 100644 --- a/src/org/traccar/protocol/WatchProtocolEncoder.java +++ b/src/org/traccar/protocol/WatchProtocolEncoder.java @@ -37,7 +37,7 @@ public class WatchProtocolEncoder extends StringProtocolEncoder implements Strin DecimalFormat fmt = new DecimalFormat("+#.##;-#.##", DecimalFormatSymbols.getInstance(Locale.US)); return fmt.format(offset); } else if (key.equals(Command.KEY_MESSAGE)) { - return DataConverter.printHex(value.toString().getBytes()); + return DataConverter.printHex(value.toString().getBytes(StandardCharsets.UTF_16BE)); } return null; diff --git a/test/org/traccar/protocol/WatchProtocolEncoderTest.java b/test/org/traccar/protocol/WatchProtocolEncoderTest.java index e088a2b04..f55086082 100644 --- a/test/org/traccar/protocol/WatchProtocolEncoderTest.java +++ b/test/org/traccar/protocol/WatchProtocolEncoderTest.java @@ -43,7 +43,7 @@ public class WatchProtocolEncoderTest extends ProtocolTest { command.setDeviceId(1); command.setType(Command.TYPE_MESSAGE); command.set(Command.KEY_MESSAGE, "text"); - assertEquals("[CS*123456789012345*0010*MESSAGE,74657874]", encoder.encodeCommand(null, command)); + assertEquals("[CS*123456789012345*0018*MESSAGE,0074006500780074]", encoder.encodeCommand(null, command)); command = new Command(); command.setDeviceId(1); |