From 4bc01f6f575dfbf6e48608cacaab28e5edabc92d Mon Sep 17 00:00:00 2001 From: jorgejimenez88 Date: Wed, 19 Aug 2015 10:51:25 -0500 Subject: Update MeitrackProtocol.java --- src/org/traccar/protocol/MeitrackProtocol.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/org') diff --git a/src/org/traccar/protocol/MeitrackProtocol.java b/src/org/traccar/protocol/MeitrackProtocol.java index bcc224a94..515330697 100644 --- a/src/org/traccar/protocol/MeitrackProtocol.java +++ b/src/org/traccar/protocol/MeitrackProtocol.java @@ -20,14 +20,21 @@ import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.handler.codec.string.StringEncoder; import org.traccar.BaseProtocol; import org.traccar.TrackerServer; +import org.traccar.model.Command; import java.nio.ByteOrder; import java.util.List; + public class MeitrackProtocol extends BaseProtocol { public MeitrackProtocol() { super("meitrack"); + setSupportedCommands( + Command.TYPE_ENGINE_STOP, + Command.TYPE_ENGINE_RESUME, + Command.TYPE_ALARM_ARM, + Command.TYPE_ALARM_DISARM); } @Override -- cgit v1.2.3 From f9501ab4213f462a2ee645fee34f754fa47d08b1 Mon Sep 17 00:00:00 2001 From: jorgejimenez88 Date: Wed, 19 Aug 2015 10:52:36 -0500 Subject: Create MeitrackProtocolEncoder.java --- .../traccar/protocol/MeitrackProtocolEncoder.java | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/org/traccar/protocol/MeitrackProtocolEncoder.java (limited to 'src/org') diff --git a/src/org/traccar/protocol/MeitrackProtocolEncoder.java b/src/org/traccar/protocol/MeitrackProtocolEncoder.java new file mode 100644 index 000000000..d03a6cd1b --- /dev/null +++ b/src/org/traccar/protocol/MeitrackProtocolEncoder.java @@ -0,0 +1,40 @@ +/* + * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.protocol; + +import org.traccar.StringProtocolEncoder; +import org.traccar.model.Command; + +public class MeitrackProtocolEncoder extends StringProtocolEncoder { + + @Override + protected Object encodeCommand(Command command) { + + switch (command.getType()) { + case Command.TYPE_ENGINE_STOP: + return formatCommand(command, "C01,0,12222"); + case Command.TYPE_ENGINE_RESUME: + return formatCommand(command, "C01,0,02222"); + case Command.TYPE_ALARM_ARM: + return formatCommand(command, "C01,0,22122"); + case Command.TYPE_ALARM_DISARM: + return formatCommand(command, "C01,0,22022"); + } + + return null; + } + +} -- cgit v1.2.3 From 89a615dff136fc590bd0cdeb1bb8d06ea17d24c9 Mon Sep 17 00:00:00 2001 From: jorgejimenez88 Date: Thu, 20 Aug 2015 15:12:24 -0500 Subject: Create MeitrackProtocolEncoder --- src/org/traccar/protocol/MeitrackProtocolEncoder.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/org') diff --git a/src/org/traccar/protocol/MeitrackProtocolEncoder.java b/src/org/traccar/protocol/MeitrackProtocolEncoder.java index d03a6cd1b..d5eca9a97 100644 --- a/src/org/traccar/protocol/MeitrackProtocolEncoder.java +++ b/src/org/traccar/protocol/MeitrackProtocolEncoder.java @@ -25,13 +25,13 @@ public class MeitrackProtocolEncoder extends StringProtocolEncoder { switch (command.getType()) { case Command.TYPE_ENGINE_STOP: - return formatCommand(command, "C01,0,12222"); + return formatCommand(command, "@@M34,{%s},C01,0,12222*18\r\n", Command.KEY_UNIQUE_ID); case Command.TYPE_ENGINE_RESUME: - return formatCommand(command, "C01,0,02222"); + return formatCommand(command, "@@M34,{%s},C01,0,02222*18\r\n", Command.KEY_UNIQUE_ID); case Command.TYPE_ALARM_ARM: - return formatCommand(command, "C01,0,22122"); + return formatCommand(command, "@@M34,{%s},C01,0,22122*18\r\n", Command.KEY_UNIQUE_ID); case Command.TYPE_ALARM_DISARM: - return formatCommand(command, "C01,0,22022"); + return formatCommand(command, "@@M34,{%s},C01,0,22022*18\r\n", Command.KEY_UNIQUE_ID); } return null; -- cgit v1.2.3 From 130b252455e217d5d2b8c4f41f8cff73b7f14f61 Mon Sep 17 00:00:00 2001 From: jorgejimenez88 Date: Fri, 21 Aug 2015 10:31:55 -0500 Subject: Create MeitrackProtocolEncoder.java --- src/org/traccar/protocol/MeitrackProtocolEncoder.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/org') diff --git a/src/org/traccar/protocol/MeitrackProtocolEncoder.java b/src/org/traccar/protocol/MeitrackProtocolEncoder.java index d5eca9a97..73f3d01e4 100644 --- a/src/org/traccar/protocol/MeitrackProtocolEncoder.java +++ b/src/org/traccar/protocol/MeitrackProtocolEncoder.java @@ -25,13 +25,13 @@ public class MeitrackProtocolEncoder extends StringProtocolEncoder { switch (command.getType()) { case Command.TYPE_ENGINE_STOP: - return formatCommand(command, "@@M34,{%s},C01,0,12222*18\r\n", Command.KEY_UNIQUE_ID); + return formatCommand(command, "@@M33,{%s},C01,0,12222*18\r\n", Command.KEY_UNIQUE_ID); case Command.TYPE_ENGINE_RESUME: - return formatCommand(command, "@@M34,{%s},C01,0,02222*18\r\n", Command.KEY_UNIQUE_ID); + return formatCommand(command, "@@M33,{%s},C01,0,02222*18\r\n", Command.KEY_UNIQUE_ID); case Command.TYPE_ALARM_ARM: - return formatCommand(command, "@@M34,{%s},C01,0,22122*18\r\n", Command.KEY_UNIQUE_ID); + return formatCommand(command, "@@M33,{%s},C01,0,22122*18\r\n", Command.KEY_UNIQUE_ID); case Command.TYPE_ALARM_DISARM: - return formatCommand(command, "@@M34,{%s},C01,0,22022*18\r\n", Command.KEY_UNIQUE_ID); + return formatCommand(command, "@@M33,{%s},C01,0,22022*18\r\n", Command.KEY_UNIQUE_ID); } return null; -- cgit v1.2.3