aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/org/traccar/protocol/TotemProtocol.java12
-rw-r--r--src/main/java/org/traccar/protocol/TotemProtocolEncoder.java36
-rw-r--r--src/main/java/org/traccar/protocol/TotemProtocolSmsEncoder.java37
-rw-r--r--src/test/java/org/traccar/protocol/TotemProtocolEncoderTest.java18
4 files changed, 89 insertions, 14 deletions
diff --git a/src/main/java/org/traccar/protocol/TotemProtocol.java b/src/main/java/org/traccar/protocol/TotemProtocol.java
index 7cf30475b..417a4d6b0 100644
--- a/src/main/java/org/traccar/protocol/TotemProtocol.java
+++ b/src/main/java/org/traccar/protocol/TotemProtocol.java
@@ -34,6 +34,18 @@ public class TotemProtocol extends BaseProtocol {
Command.TYPE_ENGINE_RESUME,
Command.TYPE_ENGINE_STOP
);
+
+ setTextCommandEncoder(new TotemProtocolSmsEncoder(this));
+ setSupportedTextCommands(
+ Command.TYPE_CUSTOM,
+ Command.TYPE_REBOOT_DEVICE,
+ Command.TYPE_FACTORY_RESET,
+ Command.TYPE_GET_VERSION,
+ Command.TYPE_POSITION_SINGLE,
+ Command.TYPE_ENGINE_RESUME,
+ Command.TYPE_ENGINE_STOP
+ );
+
addServer(new TrackerServer(false, getName()) {
@Override
protected void addProtocolHandlers(PipelineBuilder pipeline) {
diff --git a/src/main/java/org/traccar/protocol/TotemProtocolEncoder.java b/src/main/java/org/traccar/protocol/TotemProtocolEncoder.java
index a6fd8e9c3..4b22ade03 100644
--- a/src/main/java/org/traccar/protocol/TotemProtocolEncoder.java
+++ b/src/main/java/org/traccar/protocol/TotemProtocolEncoder.java
@@ -19,6 +19,7 @@ package org.traccar.protocol;
import org.traccar.StringProtocolEncoder;
import org.traccar.model.Command;
import org.traccar.Protocol;
+import org.traccar.helper.Checksum;
public class TotemProtocolEncoder extends StringProtocolEncoder {
@@ -26,30 +27,41 @@ public class TotemProtocolEncoder extends StringProtocolEncoder {
super(protocol);
}
- @Override
- protected Object encodeCommand(Command command) {
-
- initDevicePassword(command, "000000");
-
+ public static String formatContent(Command command) {
switch (command.getType()) {
case Command.TYPE_CUSTOM:
- return formatCommand(command, "*%s,%s#", Command.KEY_DEVICE_PASSWORD, Command.KEY_DATA);
+ return String.format("%s,%s",
+ command.getAttributes().get(Command.KEY_DEVICE_PASSWORD),
+ command.getAttributes().get(Command.KEY_DATA)
+ );
case Command.TYPE_REBOOT_DEVICE:
- return formatCommand(command, "*%s,006#", Command.KEY_DEVICE_PASSWORD);
+ return String.format("%s,006", command.getAttributes().get(Command.KEY_DEVICE_PASSWORD));
case Command.TYPE_FACTORY_RESET:
- return formatCommand(command, "*%s,007#", Command.KEY_DEVICE_PASSWORD);
+ return String.format("%s,007", command.getAttributes().get(Command.KEY_DEVICE_PASSWORD));
case Command.TYPE_GET_VERSION:
- return formatCommand(command, "*%s,056#", Command.KEY_DEVICE_PASSWORD);
+ return String.format("%s,056", command.getAttributes().get(Command.KEY_DEVICE_PASSWORD));
case Command.TYPE_POSITION_SINGLE:
- return formatCommand(command, "*%s,012#", Command.KEY_DEVICE_PASSWORD);
+ return String.format("%s,012", command.getAttributes().get(Command.KEY_DEVICE_PASSWORD));
// Assuming PIN 8 (Output C) is the power wire, like manual says but it can be PIN 5,7,8
case Command.TYPE_ENGINE_STOP:
- return formatCommand(command, "*%s,025,C,1#", Command.KEY_DEVICE_PASSWORD);
+ return String.format("%s,025,C,1", command.getAttributes().get(Command.KEY_DEVICE_PASSWORD));
case Command.TYPE_ENGINE_RESUME:
- return formatCommand(command, "*%s,025,C,0#", Command.KEY_DEVICE_PASSWORD);
+ return String.format("%s,025,C,0", command.getAttributes().get(Command.KEY_DEVICE_PASSWORD));
default:
return null;
}
}
+ @Override
+ protected Object encodeCommand(Command command) {
+
+ initDevicePassword(command, "000000");
+
+ String commandString = formatContent(command);
+ String builtCommand = String.format("$$%04dCF%s", 10 + commandString.getBytes().length, commandString);
+
+ return String.format("%s%02X", builtCommand, Checksum.xor(builtCommand));
+
+ }
+
}
diff --git a/src/main/java/org/traccar/protocol/TotemProtocolSmsEncoder.java b/src/main/java/org/traccar/protocol/TotemProtocolSmsEncoder.java
new file mode 100644
index 000000000..8656f8a5c
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/TotemProtocolSmsEncoder.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 Irving Gonzalez
+ * Copyright 2015 - 2019 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.traccar.StringProtocolEncoder;
+import org.traccar.model.Command;
+import org.traccar.Protocol;
+
+public class TotemProtocolSmsEncoder extends StringProtocolEncoder {
+
+ public TotemProtocolSmsEncoder(Protocol protocol) {
+ super(protocol);
+ }
+
+ @Override
+ protected Object encodeCommand(Command command) {
+
+ initDevicePassword(command, "000000");
+
+ return String.format("*%s#", TotemProtocolEncoder.formatContent(command));
+ }
+
+}
diff --git a/src/test/java/org/traccar/protocol/TotemProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/TotemProtocolEncoderTest.java
index 51e5bac92..a4fca2d9e 100644
--- a/src/test/java/org/traccar/protocol/TotemProtocolEncoderTest.java
+++ b/src/test/java/org/traccar/protocol/TotemProtocolEncoderTest.java
@@ -15,10 +15,24 @@ public class TotemProtocolEncoderTest extends ProtocolTest {
Command command = new Command();
command.setDeviceId(2);
- command.setType(Command.TYPE_ENGINE_STOP);
+ command.setType(Command.TYPE_REBOOT_DEVICE);
command.set(Command.KEY_DEVICE_PASSWORD, "000000");
- assertEquals("*000000,025,C,1#", encoder.encodeCommand(command));
+ assertEquals("$$0020CF000000,0061D", encoder.encodeCommand(command));
+
+ }
+
+ @Test
+ public void testSmsEncode() throws Exception {
+
+ var encoder = new TotemProtocolSmsEncoder(null);
+
+ Command command = new Command();
+ command.setDeviceId(2);
+ command.setType(Command.TYPE_REBOOT_DEVICE);
+ command.set(Command.KEY_DEVICE_PASSWORD, "000000");
+
+ assertEquals("*000000,006#", encoder.encodeCommand(command));
}