aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/org/traccar/MainEventHandler.java5
-rw-r--r--src/org/traccar/protocol/WondexProtocolDecoder.java14
2 files changed, 11 insertions, 8 deletions
diff --git a/src/org/traccar/MainEventHandler.java b/src/org/traccar/MainEventHandler.java
index 5a8952abe..0f20b312b 100644
--- a/src/org/traccar/MainEventHandler.java
+++ b/src/org/traccar/MainEventHandler.java
@@ -50,8 +50,9 @@ public class MainEventHandler extends IdleStateAwareChannelHandler {
s.append("lon: ").append(String.format("%.5f", position.getLongitude())).append(", ");
s.append("speed: ").append(String.format("%.1f", position.getSpeed())).append(", ");
s.append("course: ").append(String.format("%.1f", position.getCourse()));
- if ((position.getAttributes().get(Event.KEY_RESULT) != null)) {
- s.append(", result: ").append(position.getAttributes().get(Event.KEY_RESULT));
+ Object cmdResult = position.getAttributes().get(Event.KEY_RESULT);
+ if (cmdResult != null) {
+ s.append(", result: ").append(cmdResult);
}
Log.info(s.toString());
diff --git a/src/org/traccar/protocol/WondexProtocolDecoder.java b/src/org/traccar/protocol/WondexProtocolDecoder.java
index 837f40a08..366466143 100644
--- a/src/org/traccar/protocol/WondexProtocolDecoder.java
+++ b/src/org/traccar/protocol/WondexProtocolDecoder.java
@@ -61,26 +61,28 @@ public class WondexProtocolDecoder extends BaseProtocolDecoder {
protected Object decode(
Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
- if (((ChannelBuffer) msg).getUnsignedByte(0) == 0xD0) {
+ ChannelBuffer buf = (ChannelBuffer) msg;
- long deviceId = ((Long.reverseBytes((((ChannelBuffer) msg).getLong(0)))) >> 32) & 0xFFFFFFFFL;
+ if (buf.getUnsignedByte(0) == 0xD0) {
+
+ long deviceId = ((Long.reverseBytes(buf.getLong(0))) >> 32) & 0xFFFFFFFFL;
identify(String.valueOf(deviceId), channel, remoteAddress);
return null;
- } else if (((ChannelBuffer) msg).toString(StandardCharsets.US_ASCII).startsWith("$OK:")
- || ((ChannelBuffer) msg).toString(StandardCharsets.US_ASCII).startsWith("$ERR:")) {
+ } else if (buf.toString(StandardCharsets.US_ASCII).startsWith("$OK:")
+ || buf.toString(StandardCharsets.US_ASCII).startsWith("$ERR:")) {
Position position = new Position();
position.setProtocol(getProtocolName());
position.setDeviceId(getDeviceId());
getLastLocation(position, new Date());
position.setValid(false);
- position.set(Event.KEY_RESULT, ((ChannelBuffer) msg).toString(StandardCharsets.US_ASCII));
+ position.set(Event.KEY_RESULT, buf.toString(StandardCharsets.US_ASCII));
return position;
} else {
- Parser parser = new Parser(PATTERN, ((ChannelBuffer) msg).toString(StandardCharsets.US_ASCII));
+ Parser parser = new Parser(PATTERN, buf.toString(StandardCharsets.US_ASCII));
if (!parser.matches()) {
return null;
}