aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-12-27 18:13:56 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2018-12-27 18:13:56 -0800
commit2b9264c4afdf62ef4d80e7cf5993ddb03374a8be (patch)
tree216befedf59214315f39d262d4de9fe6c9b1a3e7 /src/org/traccar/protocol
parentd86f7a4befb7fd4b5ee1a558ccf1a5b553b02ab6 (diff)
downloadtraccar-server-2b9264c4afdf62ef4d80e7cf5993ddb03374a8be.tar.gz
traccar-server-2b9264c4afdf62ef4d80e7cf5993ddb03374a8be.tar.bz2
traccar-server-2b9264c4afdf62ef4d80e7cf5993ddb03374a8be.zip
Fix Wristband protocol response
Diffstat (limited to 'src/org/traccar/protocol')
-rw-r--r--src/org/traccar/protocol/MeiligaoProtocolDecoder.java2
-rw-r--r--src/org/traccar/protocol/WristbandProtocolDecoder.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
index 06ecba357..cbfc3660a 100644
--- a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
+++ b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
@@ -402,7 +402,7 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
sendResponse(channel, remoteAddress, id, MSG_HEARTBEAT, response);
return null;
} else if (command == MSG_SERVER) {
- ByteBuf response = Unpooled.copiedBuffer(getServer(channel), StandardCharsets.US_ASCII);
+ ByteBuf response = Unpooled.copiedBuffer(getServer(channel, ':'), StandardCharsets.US_ASCII);
sendResponse(channel, remoteAddress, id, MSG_SERVER, response);
return null;
} else if (command == MSG_UPLOAD_PHOTO) {
diff --git a/src/org/traccar/protocol/WristbandProtocolDecoder.java b/src/org/traccar/protocol/WristbandProtocolDecoder.java
index b750f1bad..84aeb6804 100644
--- a/src/org/traccar/protocol/WristbandProtocolDecoder.java
+++ b/src/org/traccar/protocol/WristbandProtocolDecoder.java
@@ -108,11 +108,11 @@ public class WristbandProtocolDecoder extends BaseProtocolDecoder {
switch (type) {
case 90:
- sendResponse(channel, imei, version, type, getServer(channel));
+ sendResponse(channel, imei, version, type, getServer(channel, ','));
break;
case 91:
String time = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(new Date());
- sendResponse(channel, imei, version, type, time + "|" + getServer(channel));
+ sendResponse(channel, imei, version, type, time + "|" + getServer(channel, ','));
break;
case 1:
sendResponse(channel, imei, version, type, "0");