aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/org/traccar/BaseProtocol.java6
-rw-r--r--src/org/traccar/Protocol.java3
-rw-r--r--src/org/traccar/ServerManager.java11
-rw-r--r--src/org/traccar/api/resource/CommandTypeResource.java42
-rw-r--r--src/org/traccar/api/resource/DeviceResource.java1
-rw-r--r--src/org/traccar/database/ActiveDevice.java14
-rw-r--r--src/org/traccar/database/DataManager.java1
-rw-r--r--src/org/traccar/model/CommandType.java33
-rw-r--r--src/org/traccar/web/WebServer.java11
-rw-r--r--web/app/store/CommandTypes.js45
-rw-r--r--web/app/view/CommandDialog.js2
-rw-r--r--web/app/view/DevicesController.js7
12 files changed, 147 insertions, 29 deletions
diff --git a/src/org/traccar/BaseProtocol.java b/src/org/traccar/BaseProtocol.java
index 826a290d0..446f57d65 100644
--- a/src/org/traccar/BaseProtocol.java
+++ b/src/org/traccar/BaseProtocol.java
@@ -22,6 +22,7 @@ import org.traccar.model.Command;
import javax.xml.bind.DatatypeConverter;
import java.util.Arrays;
+import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@@ -44,6 +45,11 @@ public abstract class BaseProtocol implements Protocol {
}
@Override
+ public Collection<String> getSupportedCommands() {
+ return supportedCommands;
+ }
+
+ @Override
public void sendCommand(ActiveDevice activeDevice, Command command) {
if (command.getType().equals(Command.TYPE_CUSTOM)) {
String data = (String) command.getAttributes().get(Command.KEY_DATA);
diff --git a/src/org/traccar/Protocol.java b/src/org/traccar/Protocol.java
index edf9bfb36..c99fd8ecb 100644
--- a/src/org/traccar/Protocol.java
+++ b/src/org/traccar/Protocol.java
@@ -3,12 +3,15 @@ package org.traccar;
import org.traccar.database.ActiveDevice;
import org.traccar.model.Command;
+import java.util.Collection;
import java.util.List;
public interface Protocol {
String getName();
+ Collection<String> getSupportedCommands();
+
void sendCommand(ActiveDevice activeDevice, Command command);
void initTrackerServers(List<TrackerServer> serverList);
diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index cd6a071db..010438a44 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -62,20 +62,21 @@ public class ServerManager {
for (String name : names) {
Class protocolClass = Class.forName(packageName + '.' + name);
if (BaseProtocol.class.isAssignableFrom(protocolClass)) {
- initProtocolServer((BaseProtocol) protocolClass.newInstance());
+ BaseProtocol baseProtocol = (BaseProtocol) protocolClass.newInstance();
+ initProtocolServer(baseProtocol);
}
}
}
public void start() {
- for (Object server: serverList) {
- ((TrackerServer) server).start();
+ for (TrackerServer server: serverList) {
+ server.start();
}
}
public void stop() {
- for (Object server: serverList) {
- ((TrackerServer) server).stop();
+ for (TrackerServer server: serverList) {
+ server.stop();
}
// Release resources
diff --git a/src/org/traccar/api/resource/CommandTypeResource.java b/src/org/traccar/api/resource/CommandTypeResource.java
new file mode 100644
index 000000000..ce27f5241
--- /dev/null
+++ b/src/org/traccar/api/resource/CommandTypeResource.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2016 Gabor Somogyi (gabor.g.somogyi@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.api.resource;
+
+import org.traccar.Context;
+import org.traccar.api.BaseResource;
+import org.traccar.model.CommandType;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+import java.sql.SQLException;
+import java.util.Collection;
+
+@Path("commandtypes")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public class CommandTypeResource extends BaseResource {
+
+ @GET
+ public Collection<CommandType> get(@QueryParam("deviceId") long deviceId) throws SQLException {
+ Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
+ return Context.getConnectionManager().getActiveDevice(deviceId).getCommandTypes();
+ }
+
+}
diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/org/traccar/api/resource/DeviceResource.java
index 0017f13ee..6c0ef32ca 100644
--- a/src/org/traccar/api/resource/DeviceResource.java
+++ b/src/org/traccar/api/resource/DeviceResource.java
@@ -30,6 +30,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+
import java.sql.SQLException;
import java.util.Collection;
diff --git a/src/org/traccar/database/ActiveDevice.java b/src/org/traccar/database/ActiveDevice.java
index 746d3b393..3f2510af1 100644
--- a/src/org/traccar/database/ActiveDevice.java
+++ b/src/org/traccar/database/ActiveDevice.java
@@ -18,8 +18,12 @@ package org.traccar.database;
import org.jboss.netty.channel.Channel;
import org.traccar.Protocol;
import org.traccar.model.Command;
+import org.traccar.model.CommandType;
import java.net.SocketAddress;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
public class ActiveDevice {
@@ -43,6 +47,16 @@ public class ActiveDevice {
return deviceId;
}
+ public Collection<CommandType> getCommandTypes() {
+ List<CommandType> result = new ArrayList<>();
+
+ for (String commandKey : protocol.getSupportedCommands()) {
+ result.add(new CommandType(commandKey));
+ }
+
+ return result;
+ }
+
public void sendCommand(Command command) {
protocol.sendCommand(this, command);
}
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 5a233411b..ac3be45ac 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -482,5 +482,4 @@ public class DataManager implements IdentityManager {
.setObject(server)
.executeUpdate();
}
-
}
diff --git a/src/org/traccar/model/CommandType.java b/src/org/traccar/model/CommandType.java
new file mode 100644
index 000000000..210316f71
--- /dev/null
+++ b/src/org/traccar/model/CommandType.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016 Gabor Somogyi (gabor.g.somogyi@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.model;
+
+public class CommandType {
+
+ private String type;
+
+ public CommandType(String type) {
+ this.type = type;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+}
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index fc78dce65..8144af0b6 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -35,14 +35,15 @@ import org.traccar.api.ObjectMapperProvider;
import org.traccar.api.ResourceErrorHandler;
import org.traccar.api.SecurityRequestFilter;
import org.traccar.api.resource.CommandResource;
-import org.traccar.api.resource.DevicePermissionResource;
-import org.traccar.api.resource.DeviceResource;
import org.traccar.api.resource.GroupPermissionResource;
-import org.traccar.api.resource.GroupResource;
-import org.traccar.api.resource.PositionResource;
import org.traccar.api.resource.ServerResource;
import org.traccar.api.resource.SessionResource;
+import org.traccar.api.resource.DevicePermissionResource;
import org.traccar.api.resource.UserResource;
+import org.traccar.api.resource.GroupResource;
+import org.traccar.api.resource.DeviceResource;
+import org.traccar.api.resource.PositionResource;
+import org.traccar.api.resource.CommandTypeResource;
import org.traccar.helper.Log;
import javax.naming.InitialContext;
@@ -147,7 +148,7 @@ public class WebServer {
resourceConfig.register(CorsResponseFilter.class);
resourceConfig.registerClasses(ServerResource.class, SessionResource.class, CommandResource.class,
GroupPermissionResource.class, DevicePermissionResource.class, UserResource.class,
- GroupResource.class, DeviceResource.class, PositionResource.class);
+ GroupResource.class, DeviceResource.class, PositionResource.class, CommandTypeResource.class);
servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/*");
handlers.addHandler(servletHandler);
diff --git a/web/app/store/CommandTypes.js b/web/app/store/CommandTypes.js
index 3f5094266..2ef190edc 100644
--- a/web/app/store/CommandTypes.js
+++ b/web/app/store/CommandTypes.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 Gabor Somogyi (gabor.g.somogyi@gmail.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,19 +16,34 @@
Ext.define('Traccar.store.CommandTypes', {
extend: 'Ext.data.Store',
- fields: ['key', 'name'],
+ fields: ['type', 'name'],
- data: [{
- key: 'positionPeriodic',
- name: Strings.commandPositionPeriodic
- }, {
- key: 'positionStop',
- name: Strings.commandPositionStop
- }, {
- key: 'engineStop',
- name: Strings.commandEngineStop
- }, {
- key: 'engineResume',
- name: Strings.commandEngineResume
- }]
+ listeners: {
+ 'beforeload' : function(store) {
+ var proxy;
+ proxy = store.getProxy();
+ proxy.setUrl('/api/commandtypes?deviceId' + proxy.extraParams.deviceId);
+ }
+ },
+
+ proxy: {
+ type: 'rest',
+ url: '',
+ reader: {
+ type: 'json',
+ getData: function(data) {
+ Ext.each(data, function(entry) {
+ entry.name = entry.type;
+ if (typeof entry.type !== "undefined") {
+ var nameKey = 'command' + entry.type.charAt(0).toUpperCase() + entry.type.slice(1);
+ var name = Strings[nameKey];
+ if (typeof name !== "undefined") {
+ entry.name = name;
+ }
+ }
+ });
+ return data;
+ }
+ }
+ }
});
diff --git a/web/app/view/CommandDialog.js b/web/app/view/CommandDialog.js
index 66cd190ea..d23b50d4c 100644
--- a/web/app/view/CommandDialog.js
+++ b/web/app/view/CommandDialog.js
@@ -32,7 +32,7 @@ Ext.define('Traccar.view.CommandDialog', {
fieldLabel: Strings.commandType,
store: 'CommandTypes',
displayField: 'name',
- valueField: 'key',
+ valueField: 'type',
listeners: {
select: 'onSelect'
}
diff --git a/web/app/view/DevicesController.js b/web/app/view/DevicesController.js
index 10918c13a..9dee0ff7c 100644
--- a/web/app/view/DevicesController.js
+++ b/web/app/view/DevicesController.js
@@ -80,11 +80,14 @@ Ext.define('Traccar.view.DevicesController', {
},
onCommandClick: function () {
- var device, command, dialog;
+ var device, deviceId, command, dialog, comboStore;
device = this.getView().getSelectionModel().getSelection()[0];
+ deviceId = device.get('id');
command = Ext.create('Traccar.model.Command');
- command.set('deviceId', device.get('id'));
+ command.set('deviceId', deviceId);
dialog = Ext.create('Traccar.view.CommandDialog');
+ comboStore = dialog.down('form').down('combobox').getStore();
+ comboStore.getProxy().setExtraParam('deviceId', deviceId);
dialog.down('form').loadRecord(command);
dialog.show();
},