aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-12-21 22:40:55 +1300
committerGitHub <noreply@github.com>2016-12-21 22:40:55 +1300
commitd8e016bc5fcb55f43fa0af676f977a99ebcb35b8 (patch)
treed70be97a1d2c4428b3483c94190dc7114da5de1c /src/org
parent48f83827701d06c3c2eab7d051a5f011cc42f65d (diff)
parentc70c026d31ae673e06abb58333f4808db875f6a6 (diff)
downloadtraccar-server-d8e016bc5fcb55f43fa0af676f977a99ebcb35b8.tar.gz
traccar-server-d8e016bc5fcb55f43fa0af676f977a99ebcb35b8.tar.bz2
traccar-server-d8e016bc5fcb55f43fa0af676f977a99ebcb35b8.zip
Merge pull request #2712 from AddisMap/feature/2702-watch-ext
Feature #2702 watch ext
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/model/Command.java1
-rw-r--r--src/org/traccar/protocol/WatchProtocol.java5
-rw-r--r--src/org/traccar/protocol/WatchProtocolEncoder.java23
3 files changed, 26 insertions, 3 deletions
diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java
index 51a61b966..da73af1bb 100644
--- a/src/org/traccar/model/Command.java
+++ b/src/org/traccar/model/Command.java
@@ -41,6 +41,7 @@ public class Command extends Message {
public static final String TYPE_OUTPUT_CONTROL = "outputControl";
public static final String TYPE_VOICE_MONITORING = "voiceMonitoring";
public static final String TYPE_SET_AGPS = "setAgps";
+ public static final String TYPE_SET_INDICATOR = "setIndicator";
public static final String TYPE_MODE_POWER_SAVING = "modePowerSaving";
public static final String TYPE_MODE_DEEP_SLEEP = "modeDeepSleep";
diff --git a/src/org/traccar/protocol/WatchProtocol.java b/src/org/traccar/protocol/WatchProtocol.java
index b13fcfb11..abce3d16a 100644
--- a/src/org/traccar/protocol/WatchProtocol.java
+++ b/src/org/traccar/protocol/WatchProtocol.java
@@ -32,6 +32,7 @@ public class WatchProtocol extends BaseProtocol {
super("watch");
setSupportedCommands(
Command.TYPE_POSITION_SINGLE,
+ Command.TYPE_POSITION_PERIODIC,
Command.TYPE_SOS_NUMBER,
Command.TYPE_ALARM_SOS,
Command.TYPE_ALARM_BATTERY,
@@ -40,7 +41,9 @@ public class WatchProtocol extends BaseProtocol {
Command.TYPE_SILENCE_TIME,
Command.TYPE_ALARM_CLOCK,
Command.TYPE_SET_PHONEBOOK,
- Command.TYPE_VOICE_MESSAGE);
+ Command.TYPE_VOICE_MESSAGE,
+ Command.TYPE_SET_TIMEZONE,
+ Command.TYPE_SET_INDICATOR);
}
@Override
diff --git a/src/org/traccar/protocol/WatchProtocolEncoder.java b/src/org/traccar/protocol/WatchProtocolEncoder.java
index 0b6a83ce9..f394034d3 100644
--- a/src/org/traccar/protocol/WatchProtocolEncoder.java
+++ b/src/org/traccar/protocol/WatchProtocolEncoder.java
@@ -21,13 +21,26 @@ import org.traccar.model.Command;
import javax.xml.bind.DatatypeConverter;
import java.nio.charset.StandardCharsets;
+import java.text.DecimalFormat;
import java.util.HashMap;
import java.util.Map;
-public class WatchProtocolEncoder extends StringProtocolEncoder {
+public class WatchProtocolEncoder extends StringProtocolEncoder implements StringProtocolEncoder.ValueFormatter {
+
+ @Override
+ public String formatValue(String key, Object value) {
+ if (key.equals(Command.KEY_TIMEZONE)) {
+ double offset = ((Number) value).longValue() / 3600.0;
+ DecimalFormat fmt = new DecimalFormat("+#.##;-#.##");
+ return fmt.format(offset);
+ }
+
+ return null;
+ }
+
protected String formatCommand(Command command, String format, String... keys) {
- String content = super.formatCommand(command, format, keys);
+ String content = super.formatCommand(command, format, this, keys);
return String.format("[CS*%s*%04x*%s]",
getUniqueId(command.getDeviceId()), content.length(), content);
}
@@ -102,6 +115,12 @@ public class WatchProtocolEncoder extends StringProtocolEncoder {
return formatCommand(command, "PHB,{%s}", Command.KEY_DATA);
case Command.TYPE_VOICE_MESSAGE:
return formatCommand(command, "TK," + getBinaryData(command));
+ case Command.TYPE_POSITION_PERIODIC:
+ return formatCommand(command, "UPLOAD,{%s}", Command.KEY_FREQUENCY);
+ case Command.TYPE_SET_TIMEZONE:
+ return formatCommand(command, "LZ,,{%s}", Command.KEY_TIMEZONE);
+ case Command.TYPE_SET_INDICATOR:
+ return formatCommand(command, "FLOWER,{%s}", Command.KEY_DATA);
default:
Log.warning(new UnsupportedOperationException(command.getType()));
break;