aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/Tk103ProtocolEncoder.java
diff options
context:
space:
mode:
authorValerii Vyshniak <valeravi@vi-soft.com.ua>2017-12-03 15:20:13 +0100
committerValerii Vyshniak <valeravi@vi-soft.com.ua>2017-12-03 15:20:13 +0100
commit8e60c4319f7931eabd98c88eeadfa1280c47974e (patch)
tree63bb9ea1d8361a7068d559c5d9c11a31137770d3 /src/org/traccar/protocol/Tk103ProtocolEncoder.java
parentf58fe1fcbfcc2be5a0a8113e9e561794eb9b2491 (diff)
downloadtrackermap-server-8e60c4319f7931eabd98c88eeadfa1280c47974e.tar.gz
trackermap-server-8e60c4319f7931eabd98c88eeadfa1280c47974e.tar.bz2
trackermap-server-8e60c4319f7931eabd98c88eeadfa1280c47974e.zip
T580W: tk103 encoder alternative commands in separate class to be able to test them separately
Diffstat (limited to 'src/org/traccar/protocol/Tk103ProtocolEncoder.java')
-rw-r--r--src/org/traccar/protocol/Tk103ProtocolEncoder.java45
1 files changed, 10 insertions, 35 deletions
diff --git a/src/org/traccar/protocol/Tk103ProtocolEncoder.java b/src/org/traccar/protocol/Tk103ProtocolEncoder.java
index 26b966d48..03b12b296 100644
--- a/src/org/traccar/protocol/Tk103ProtocolEncoder.java
+++ b/src/org/traccar/protocol/Tk103ProtocolEncoder.java
@@ -26,55 +26,30 @@ public class Tk103ProtocolEncoder extends StringProtocolEncoder {
@Override
protected Object encodeCommand(Command command) {
- boolean alternative = Context.getIdentityManager().lookupAttributeBoolean(
- command.getDeviceId(), "tk103.alternative", false, true);
-
- initDevicePassword(command, "123456");
+ if (Context.getIdentityManager().lookupAttributeBoolean(
+ command.getDeviceId(), "tk103.alternative", false, true)) {
+ Tk103ProtocolEncoderAlternative alternative = new Tk103ProtocolEncoderAlternative();
+ return alternative.encodeCommand(command);
+ }
switch (command.getType()) {
case Command.TYPE_GET_VERSION:
- return alternative ? formatCommand(command, "[begin]sms2,*about*,[end]")
- : formatCommand(command, "({%s}AP07)", Command.KEY_UNIQUE_ID);
+ return formatCommand(command, "({%s}AP07)", Command.KEY_UNIQUE_ID);
case Command.TYPE_REBOOT_DEVICE:
- return alternative ? formatCommand(command, "[begin]sms2,88888888,[end]")
- : formatCommand(command, "({%s}AT00)", Command.KEY_UNIQUE_ID);
+ return formatCommand(command, "({%s}AT00)", Command.KEY_UNIQUE_ID);
case Command.TYPE_SET_ODOMETER:
return formatCommand(command, "({%s}AX01)", Command.KEY_UNIQUE_ID);
case Command.TYPE_POSITION_SINGLE:
- return alternative ? formatCommand(command, "[begin]sms2,*getposl*,[end]")
- : formatCommand(command, "({%s}AP00)", Command.KEY_UNIQUE_ID);
+ return formatCommand(command, "({%s}AP00)", Command.KEY_UNIQUE_ID);
case Command.TYPE_POSITION_PERIODIC:
- return alternative ? formatCommand(command, "[begin]sms2,*routetrack*99*,[end]")
- : formatCommand(command, "({%s}AR00%s0000)", Command.KEY_UNIQUE_ID,
+ return formatCommand(command, "({%s}AR00%s0000)", Command.KEY_UNIQUE_ID,
String.format("%04X", command.getInteger(Command.KEY_FREQUENCY)));
case Command.TYPE_POSITION_STOP:
- return alternative ? formatCommand(command, "[begin]sms2,*routetrackoff*,[end]")
- : formatCommand(command, "({%s}AR0000000000)", Command.KEY_UNIQUE_ID);
+ return formatCommand(command, "({%s}AR0000000000)", Command.KEY_UNIQUE_ID);
case Command.TYPE_ENGINE_STOP:
return formatCommand(command, "({%s}AV011)", Command.KEY_UNIQUE_ID);
case Command.TYPE_ENGINE_RESUME:
return formatCommand(command, "({%s}AV010)", Command.KEY_UNIQUE_ID);
- case Command.TYPE_CUSTOM:
- return formatCommand(command, "[begin]sms2,{%s},[end]", Command.KEY_DATA);
- case Command.TYPE_GET_DEVICE_STATUS:
- return formatCommand(command, "[begin]sms2,*status*,[end]");
- case Command.TYPE_IDENTIFICATION:
- return formatCommand(command, "[begin]sms2,999999,[end]");
- case Command.TYPE_MODE_DEEP_SLEEP:
- return formatCommand(command, command.getBoolean(Command.KEY_ENABLE)
- ? "[begin]sms2,*sleep*2*,[end]" : "[begin]sms2,*sleepoff*,[end]");
- case Command.TYPE_MODE_POWER_SAVING:
- return formatCommand(command, command.getBoolean(Command.KEY_ENABLE)
- ? "[begin]sms2,*sleepv*,[end]" : "[begin]sms2,*sleepoff*,[end]");
- case Command.TYPE_ALARM_SOS:
- return formatCommand(command, command.getBoolean(Command.KEY_ENABLE)
- ? "[begin]sms2,*soson*,[end]" : "[begin]sms2,*sosoff*,[end]");
- case Command.TYPE_SET_CONNECTION:
- return formatCommand(command, "[begin]sms2,*setip*%s*{%s}*,[end]",
- command.getString(Command.KEY_SERVER).replace(".", "*"), Command.KEY_PORT);
- case Command.TYPE_SOS_NUMBER:
- return formatCommand(command, "[begin]sms2,*master*{%s}*{%s}*,[end]",
- Command.KEY_DEVICE_PASSWORD, Command.KEY_PHONE);
default:
Log.warning(new UnsupportedOperationException(command.getType()));
break;