forked from traccar/traccar
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# Conflicts: # src/org/traccar/protocol/AquilaProtocolDecoder.java # src/org/traccar/protocol/L100FrameDecoder.java
- Loading branch information
Showing
32 changed files
with
1,159 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <databaseChangeLog | ||
| xmlns="http://www.liquibase.org/xml/ns/dbchangelog" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog | ||
| http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd" | ||
| logicalFilePath="changelog-4.0"> | ||
|
|
||
| <changeSet author="author" id="changelog-4.0-renaming"> | ||
|
|
||
| <preConditions onFail="MARK_RAN"> | ||
| <not> | ||
| <tableExists tableName="tc_servers" /> | ||
| </not> | ||
| </preConditions> | ||
|
|
||
| <renameTable oldTableName="attributes" newTableName="tc_attributes" /> | ||
| <renameTable oldTableName="calendars" newTableName="tc_calendars" /> | ||
| <renameTable oldTableName="commands" newTableName="tc_commands" /> | ||
| <renameTable oldTableName="device_attribute" newTableName="tc_device_attribute" /> | ||
| <renameTable oldTableName="device_command" newTableName="tc_device_command" /> | ||
| <renameTable oldTableName="device_driver" newTableName="tc_device_driver" /> | ||
| <renameTable oldTableName="device_geofence" newTableName="tc_device_geofence" /> | ||
| <renameTable oldTableName="device_maintenance" newTableName="tc_device_maintenance" /> | ||
| <renameTable oldTableName="device_notification" newTableName="tc_device_notification" /> | ||
| <renameTable oldTableName="devices" newTableName="tc_devices" /> | ||
| <renameTable oldTableName="drivers" newTableName="tc_drivers" /> | ||
| <renameTable oldTableName="events" newTableName="tc_events" /> | ||
| <renameTable oldTableName="geofences" newTableName="tc_geofences" /> | ||
| <renameTable oldTableName="group_attribute" newTableName="tc_group_attribute" /> | ||
| <renameTable oldTableName="group_command" newTableName="tc_group_command" /> | ||
| <renameTable oldTableName="group_driver" newTableName="tc_group_driver" /> | ||
| <renameTable oldTableName="group_geofence" newTableName="tc_group_geofence" /> | ||
| <renameTable oldTableName="group_maintenance" newTableName="tc_group_maintenance" /> | ||
| <renameTable oldTableName="group_notification" newTableName="tc_group_notification" /> | ||
| <renameTable oldTableName="groups" newTableName="tc_groups" /> | ||
| <renameTable oldTableName="maintenances" newTableName="tc_maintenances" /> | ||
| <renameTable oldTableName="notifications" newTableName="tc_notifications" /> | ||
| <renameTable oldTableName="positions" newTableName="tc_positions" /> | ||
| <renameTable oldTableName="servers" newTableName="tc_servers" /> | ||
| <renameTable oldTableName="statistics" newTableName="tc_statistics" /> | ||
| <renameTable oldTableName="user_attribute" newTableName="tc_user_attribute" /> | ||
| <renameTable oldTableName="user_calendar" newTableName="tc_user_calendar" /> | ||
| <renameTable oldTableName="user_command" newTableName="tc_user_command" /> | ||
| <renameTable oldTableName="user_device" newTableName="tc_user_device" /> | ||
| <renameTable oldTableName="user_driver" newTableName="tc_user_driver" /> | ||
| <renameTable oldTableName="user_geofence" newTableName="tc_user_geofence" /> | ||
| <renameTable oldTableName="user_group" newTableName="tc_user_group" /> | ||
| <renameTable oldTableName="user_maintenance" newTableName="tc_user_maintenance" /> | ||
| <renameTable oldTableName="user_notification" newTableName="tc_user_notification" /> | ||
| <renameTable oldTableName="user_user" newTableName="tc_user_user" /> | ||
| <renameTable oldTableName="users" newTableName="tc_users" /> | ||
|
|
||
| </changeSet> | ||
|
|
||
| </databaseChangeLog> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * Copyright 2018 Anton Tananaev ([email protected]) | ||
| * | ||
| * 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.bootstrap.ServerBootstrap; | ||
| import org.jboss.netty.channel.ChannelPipeline; | ||
| import org.jboss.netty.handler.codec.frame.LineBasedFrameDecoder; | ||
| import org.jboss.netty.handler.codec.string.StringDecoder; | ||
| import org.jboss.netty.handler.codec.string.StringEncoder; | ||
| import org.traccar.BaseProtocol; | ||
| import org.traccar.TrackerServer; | ||
| import org.traccar.model.Command; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class EsealProtocol extends BaseProtocol { | ||
|
|
||
| public EsealProtocol() { | ||
| super("eseal"); | ||
| setSupportedDataCommands( | ||
| Command.TYPE_CUSTOM, | ||
| Command.TYPE_ALARM_ARM, | ||
| Command.TYPE_ALARM_DISARM); | ||
| } | ||
|
|
||
| @Override | ||
| public void initTrackerServers(List<TrackerServer> serverList) { | ||
| serverList.add(new TrackerServer(new ServerBootstrap(), getName()) { | ||
| @Override | ||
| protected void addSpecificHandlers(ChannelPipeline pipeline) { | ||
| pipeline.addLast("frameDecoder", new LineBasedFrameDecoder(1024)); | ||
| pipeline.addLast("stringEncoder", new StringEncoder()); | ||
| pipeline.addLast("stringDecoder", new StringDecoder()); | ||
| pipeline.addLast("objectEncoder", new EsealProtocolEncoder()); | ||
| pipeline.addLast("objectDecoder", new EsealProtocolDecoder(EsealProtocol.this)); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| /* | ||
| * Copyright 2018 Anton Tananaev ([email protected]) | ||
| * | ||
| * 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.channel.Channel; | ||
| import org.traccar.BaseProtocolDecoder; | ||
| import org.traccar.Context; | ||
| import org.traccar.DeviceSession; | ||
| import org.traccar.helper.Parser; | ||
| import org.traccar.helper.PatternBuilder; | ||
| import org.traccar.helper.UnitsConverter; | ||
| import org.traccar.model.Position; | ||
|
|
||
| import java.net.SocketAddress; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| public class EsealProtocolDecoder extends BaseProtocolDecoder { | ||
|
|
||
| private String config; | ||
|
|
||
| public EsealProtocolDecoder(EsealProtocol protocol) { | ||
| super(protocol); | ||
| config = Context.getConfig().getString(getProtocolName() + ".config"); | ||
| } | ||
|
|
||
| private static final Pattern PATTERN = new PatternBuilder() | ||
| .text("##S,") | ||
| .expression("[^,]+,") // device type | ||
| .number("(d+),") // device id | ||
| .number("d+,") // customer id | ||
| .expression("[^,]+,") // firmware version | ||
| .expression("([^,]+),") // type | ||
| .number("(d+),") // index | ||
| .number("(dddd)-(dd)-(dd),") // date | ||
| .number("(dd):(dd):(dd),") // time | ||
| .number("d+,") // interval | ||
| .expression("([AV]),") // validity | ||
| .number("(d+.d+)([NS]) ") // latitude | ||
| .number("(d+.d+)([EW]),") // longitude | ||
| .number("(d+),") // course | ||
| .number("(d+),") // speed | ||
| .expression("([^,]+),") // door | ||
| .number("(d+.d+),") // acceleration | ||
| .expression("([^,]+),") // nfc | ||
| .number("(d+.d+),") // battery | ||
| .number("(-?d+),") // rssi | ||
| .text("E##") | ||
| .compile(); | ||
|
|
||
| private void sendResponse(Channel channel, String prefix, String type, String payload) { | ||
| if (channel != null) { | ||
| channel.write(prefix + type + "," + payload + ",E##\r\n"); | ||
| } | ||
| } | ||
|
|
||
| private String decodeAlarm(String type) { | ||
| switch (type) { | ||
| case "Event-Door": | ||
| return Position.ALARM_DOOR; | ||
| case "Event-Shock": | ||
| return Position.ALARM_SHOCK; | ||
| case "Event-Drop": | ||
| return Position.ALARM_FALL_DOWN; | ||
| case "Event-Lock": | ||
| return Position.ALARM_LOCK; | ||
| case "Event-RC-Unlock": | ||
| return Position.ALARM_UNLOCK; | ||
| default: | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected Object decode( | ||
| Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { | ||
|
|
||
| String sentence = (String) msg; | ||
| Parser parser = new Parser(PATTERN, sentence); | ||
| if (!parser.matches()) { | ||
| return null; | ||
| } | ||
|
|
||
| DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next()); | ||
| if (deviceSession == null) { | ||
| return null; | ||
| } | ||
|
|
||
| Position position = new Position(getProtocolName()); | ||
| position.setDeviceId(deviceSession.getDeviceId()); | ||
|
|
||
| String type = parser.next(); | ||
| String prefix = sentence.substring(0, sentence.indexOf(type)); | ||
| int index = parser.nextInt(); | ||
|
|
||
| position.set(Position.KEY_INDEX, index); | ||
| position.set(Position.KEY_ALARM, decodeAlarm(type)); | ||
|
|
||
| switch (type) { | ||
| case "Startup": | ||
| sendResponse(channel, prefix, type + " ACK", index + "," + config); | ||
| break; | ||
| case "Normal": | ||
| case "Button-Normal": | ||
| case "Termination": | ||
| case "Event-Door": | ||
| case "Event-Shock": | ||
| case "Event-Drop": | ||
| case "Event-Lock": | ||
| case "Event-RC-Unlock": | ||
| sendResponse(channel, prefix, type + " ACK", String.valueOf(index)); | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
|
|
||
| position.setTime(parser.nextDateTime()); | ||
| position.setValid(parser.next().equals("A")); | ||
| position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM)); | ||
| position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM)); | ||
| position.setCourse(parser.nextInt()); | ||
| position.setSpeed(UnitsConverter.knotsFromKph(parser.nextInt())); | ||
|
|
||
| switch (parser.next()) { | ||
| case "Open": | ||
| position.set(Position.KEY_DOOR, true); | ||
| break; | ||
| case "Close": | ||
| position.set(Position.KEY_DOOR, false); | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
|
|
||
| position.set(Position.KEY_ACCELERATION, parser.nextDouble()); | ||
| position.set("nfc", parser.next()); | ||
| position.set(Position.KEY_BATTERY, parser.nextDouble()); | ||
| position.set(Position.KEY_RSSI, parser.nextInt()); | ||
|
|
||
| return position; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.