aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/protocol/HuabaoProtocol.java7
-rw-r--r--src/org/traccar/protocol/HuabaoProtocolDecoder.java52
-rw-r--r--src/org/traccar/protocol/HuabaoProtocolEncoder.java54
3 files changed, 87 insertions, 26 deletions
diff --git a/src/org/traccar/protocol/HuabaoProtocol.java b/src/org/traccar/protocol/HuabaoProtocol.java
index 053ce59bb..d5e68e091 100644
--- a/src/org/traccar/protocol/HuabaoProtocol.java
+++ b/src/org/traccar/protocol/HuabaoProtocol.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.channel.ChannelPipeline;
import org.traccar.BaseProtocol;
import org.traccar.TrackerServer;
+import org.traccar.model.Command;
import java.util.List;
@@ -26,6 +27,9 @@ public class HuabaoProtocol extends BaseProtocol {
public HuabaoProtocol() {
super("huabao");
+ setSupportedCommands(
+ Command.TYPE_ENGINE_STOP,
+ Command.TYPE_ENGINE_RESUME);
}
@Override
@@ -34,6 +38,7 @@ public class HuabaoProtocol extends BaseProtocol {
@Override
protected void addSpecificHandlers(ChannelPipeline pipeline) {
pipeline.addLast("frameDecoder", new HuabaoFrameDecoder());
+ pipeline.addLast("objectEncoder", new HuabaoProtocolEncoder());
pipeline.addLast("objectDecoder", new HuabaoProtocolDecoder(HuabaoProtocol.this));
}
});
diff --git a/src/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/org/traccar/protocol/HuabaoProtocolDecoder.java
index 196d7927d..c31c6af1c 100644
--- a/src/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -42,32 +42,32 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
public static final int MSG_TERMINAL_REGISTER_RESPONSE = 0x8100;
public static final int MSG_TERMINAL_AUTH = 0x0102;
public static final int MSG_LOCATION_REPORT = 0x0200;
+ public static final int MSG_OIL_CONTROL = 0XA006;
public static final int RESULT_SUCCESS = 0;
- private void sendResponse(
- Channel channel, SocketAddress remoteAddress, int type, ChannelBuffer id, ChannelBuffer data) {
- ChannelBuffer response = ChannelBuffers.dynamicBuffer();
- response.writeByte(0x7e);
- response.writeShort(type);
- response.writeShort(data.readableBytes());
- response.writeBytes(id);
- response.writeShort(1); // index
- response.writeBytes(data);
- response.writeByte(Checksum.xor(response.toByteBuffer(1, response.readableBytes() - 1)));
- response.writeByte(0x7e);
- if (channel != null) {
- channel.write(response, remoteAddress);
- }
+ public static ChannelBuffer formatMessage(int type, ChannelBuffer id, ChannelBuffer data) {
+ ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
+ buf.writeByte(0x7e);
+ buf.writeShort(type);
+ buf.writeShort(data.readableBytes());
+ buf.writeBytes(id);
+ buf.writeShort(1); // index
+ buf.writeBytes(data);
+ buf.writeByte(Checksum.xor(buf.toByteBuffer(1, buf.readableBytes() - 1)));
+ buf.writeByte(0x7e);
+ return buf;
}
private void sendGeneralResponse(
Channel channel, SocketAddress remoteAddress, ChannelBuffer id, int type, int index) {
- ChannelBuffer response = ChannelBuffers.dynamicBuffer();
- response.writeShort(index);
- response.writeShort(type);
- response.writeByte(RESULT_SUCCESS);
- sendResponse(channel, remoteAddress, MSG_GENERAL_RESPONSE, id, response);
+ if (channel != null) {
+ ChannelBuffer response = ChannelBuffers.dynamicBuffer();
+ response.writeShort(index);
+ response.writeShort(type);
+ response.writeByte(RESULT_SUCCESS);
+ channel.write(formatMessage(MSG_GENERAL_RESPONSE, id, response), remoteAddress);
+ }
}
private String decodeAlarm(long value) {
@@ -115,11 +115,13 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
if (type == MSG_TERMINAL_REGISTER) {
- ChannelBuffer response = ChannelBuffers.dynamicBuffer();
- response.writeShort(index);
- response.writeByte(RESULT_SUCCESS);
- response.writeBytes("authentication".getBytes(StandardCharsets.US_ASCII));
- sendResponse(channel, remoteAddress, MSG_TERMINAL_REGISTER_RESPONSE, id, response);
+ if (channel != null) {
+ ChannelBuffer response = ChannelBuffers.dynamicBuffer();
+ response.writeShort(index);
+ response.writeByte(RESULT_SUCCESS);
+ response.writeBytes("authentication".getBytes(StandardCharsets.US_ASCII));
+ channel.write(formatMessage(MSG_TERMINAL_REGISTER_RESPONSE, id, response), remoteAddress);
+ }
} else if (type == MSG_TERMINAL_AUTH) {
diff --git a/src/org/traccar/protocol/HuabaoProtocolEncoder.java b/src/org/traccar/protocol/HuabaoProtocolEncoder.java
new file mode 100644
index 000000000..7d6f0510d
--- /dev/null
+++ b/src/org/traccar/protocol/HuabaoProtocolEncoder.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ *
+ * 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.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.traccar.BaseProtocolEncoder;
+import org.traccar.helper.Log;
+import org.traccar.model.Command;
+
+import javax.xml.bind.DatatypeConverter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class HuabaoProtocolEncoder extends BaseProtocolEncoder {
+
+ @Override
+ protected Object encodeCommand(Command command) {
+
+ ChannelBuffer id = ChannelBuffers.wrappedBuffer(
+ DatatypeConverter.parseHexBinary(getUniqueId(command.getDeviceId())));
+
+ ChannelBuffer data = ChannelBuffers.dynamicBuffer();
+ byte[] time = DatatypeConverter.parseHexBinary(new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
+
+ switch (command.getType()) {
+ case Command.TYPE_ENGINE_STOP:
+ data.writeByte(0x01);
+ data.writeBytes(time);
+ return HuabaoProtocolDecoder.formatMessage(HuabaoProtocolDecoder.MSG_OIL_CONTROL, id, data);
+ case Command.TYPE_ENGINE_RESUME:
+ data.writeByte(0x00);
+ data.writeBytes(time);
+ return HuabaoProtocolDecoder.formatMessage(HuabaoProtocolDecoder.MSG_OIL_CONTROL, id, data);
+ default:
+ Log.warning(new UnsupportedOperationException(command.getType()));
+ return null;
+ }
+ }
+
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-03 15:11:42 +0000