mirror/traccar
1
0
Fork 0
mirror of https://github.com/traccar/traccar.git synced 2026-05-19 14:18:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3217 from 5of9/master

Browse Source 
Wondex upgrade and fix for a little missing thing
This commit is contained in:
Anton Tananaev
2017-06-04 11:17:47 +12:00
committed by GitHub
parent 4268c1f184 d6e8af781b
commit 40cb222ddd
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/traccar/model/Command.java
View File

@@ -47,6 +47,8 @@ public class Command extends Message {
public static final String TYPE_FIRMWARE_UPDATE = "firmwareUpdate";
public static final String TYPE_SET_CONNECTION = "setConnection";
public static final String TYPE_SET_ODOMETER = "setOdometer";
public static final String TYPE_GET_MODEM_STATUS = "getModemStatus";
public static final String TYPE_GET_DEVICE_STATUS = "getDeviceStatus";
public static final String TYPE_MODE_POWER_SAVING = "modePowerSaving";
public static final String TYPE_MODE_DEEP_SLEEP = "modeDeepSleep";

3
src/org/traccar/protocol/WondexProtocol.java
View File

@@ -31,8 +31,11 @@ public class WondexProtocol extends BaseProtocol {
super("wondex");
setTextCommandEncoder(new WondexProtocolEncoder());
setSupportedCommands(
Command.TYPE_GET_DEVICE_STATUS,
Command.TYPE_GET_MODEM_STATUS,
Command.TYPE_REBOOT_DEVICE,
Command.TYPE_POSITION_SINGLE,
Command.TYPE_GET_VERSION,
Command.TYPE_IDENTIFICATION);
}

3
src/org/traccar/protocol/WondexProtocolDecoder.java
View File

@@ -69,7 +69,8 @@ public class WondexProtocolDecoder extends BaseProtocolDecoder {
return null;
} else if (buf.toString(StandardCharsets.US_ASCII).startsWith("$OK:")
|| buf.toString(StandardCharsets.US_ASCII).startsWith("$ERR:")) {
|| buf.toString(StandardCharsets.US_ASCII).startsWith("$ERR:")
|| buf.toString(StandardCharsets.US_ASCII).startsWith("$MSG:")) {
DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);

8
src/org/traccar/protocol/WondexProtocolEncoder.java
View File

@@ -28,9 +28,15 @@ public class WondexProtocolEncoder extends StringProtocolEncoder {
switch (command.getType()) {
case Command.TYPE_REBOOT_DEVICE:
return formatCommand(command, "$WP+REBOOT={%s}", Command.KEY_DEVICE_PASSWORD);
case Command.TYPE_GET_DEVICE_STATUS:
return formatCommand(command, "$WP+TEST={%s}", Command.KEY_DEVICE_PASSWORD);
case Command.TYPE_GET_MODEM_STATUS:
return formatCommand(command, "$WP+GSMINFO={%s}", Command.KEY_DEVICE_PASSWORD);
case Command.TYPE_IDENTIFICATION:
return formatCommand(command, "$WP+IMEI={%s}", Command.KEY_DEVICE_PASSWORD);
case Command.TYPE_POSITION_SINGLE:
return formatCommand(command, "$WP+GETLOCATION={%s}", Command.KEY_DEVICE_PASSWORD);
case Command.TYPE_IDENTIFICATION:
case Command.TYPE_GET_VERSION:
return formatCommand(command, "$WP+VER={%s}", Command.KEY_DEVICE_PASSWORD);
default:
Log.warning(new UnsupportedOperationException(command.getType()));