Add initial code for device status

tymiles003 · Nov 8, 2015 · 9ec7166 · 9ec7166
1 parent f727af1
commit 9ec7166
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 7 deletions.
diff --git a/src/org/traccar/BaseProtocolDecoder.java b/src/org/traccar/BaseProtocolDecoder.java
@@ -46,7 +46,7 @@ public boolean identify(String uniqueId, Channel channel, SocketAddress remoteAd
             Device device = Context.getIdentityManager().getDeviceByUniqueId(uniqueId);
             if (device != null) {
                 deviceId = device.getId();
-                Context.getConnectionManager().setActiveDevice(deviceId, protocol, channel, remoteAddress);
+                Context.getConnectionManager().addActiveDevice(deviceId, protocol, channel, remoteAddress);
                 return true;
             } else {
                 deviceId = 0;
@@ -95,4 +95,11 @@ public void getLastLocation(Position position, Date deviceTime) {
         }
     }
 
+    @Override
+    protected void onMessageEvent(Channel channel, SocketAddress remoteAddress, Object msg) {
+        if (hasDeviceId()) {
+            Context.getConnectionManager().updateDevice(deviceId, Device.STATUS_ONLINE, new Date());
+        }
+    }
+
 }
diff --git a/src/org/traccar/ExtendedObjectDecoder.java b/src/org/traccar/ExtendedObjectDecoder.java
@@ -37,6 +37,7 @@ public void handleUpstream(
         MessageEvent e = (MessageEvent) evt;
         Object originalMessage = e.getMessage();
         Object decodedMessage = decode(e.getChannel(), e.getRemoteAddress(), originalMessage);
+        onMessageEvent(e.getChannel(), e.getRemoteAddress(), originalMessage); // call after decode
         if (originalMessage == decodedMessage) {
             ctx.sendUpstream(evt);
         } else if (decodedMessage != null) {
@@ -50,6 +51,9 @@ public void handleUpstream(
         }
     }
 
+    protected void onMessageEvent(Channel channel, SocketAddress remoteAddress, Object msg) {
+    }
+
     protected abstract Object decode(Channel channel, SocketAddress remoteAddress, Object msg) throws Exception;
 
 }
diff --git a/src/org/traccar/MainEventHandler.java b/src/org/traccar/MainEventHandler.java
@@ -46,7 +46,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) {
             s.append("course: ").append(position.getCourse());
             Log.info(s.toString());
 
-            Context.getConnectionManager().update(position);
+            Context.getConnectionManager().updatePosition(position);
         }
     }
 

diff --git a/src/org/traccar/database/ConnectionManager.java b/src/org/traccar/database/ConnectionManager.java
@@ -18,6 +18,7 @@
 import java.net.SocketAddress;
 import java.sql.SQLException;
 import java.util.Collection;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -27,6 +28,7 @@
 import org.jboss.netty.channel.Channel;
 import org.traccar.Protocol;
 import org.traccar.helper.Log;
+import org.traccar.model.Device;
 import org.traccar.model.Position;
 
 public class ConnectionManager {
@@ -47,13 +49,14 @@ public ConnectionManager(DataManager dataManager) {
         }
     }
 
-    public void setActiveDevice(long deviceId, Protocol protocol, Channel channel, SocketAddress remoteAddress) {
+    public void addActiveDevice(long deviceId, Protocol protocol, Channel channel, SocketAddress remoteAddress) {
         activeDevices.put(deviceId, new ActiveDevice(deviceId, protocol, channel, remoteAddress));
     }
 
     public void removeActiveDevice(Channel channel) {
         for (ActiveDevice activeDevice : activeDevices.values()) {
             if (activeDevice.getChannel() == channel) {
+                updateDevice(activeDevice.getDeviceId(), Device.STATUS_OFFLINE, new Date());
                 activeDevices.remove(activeDevice.getDeviceId());
                 break;
             }
@@ -64,12 +67,17 @@ public ActiveDevice getActiveDevice(long deviceId) {
         return activeDevices.get(deviceId);
     }
 
-    public synchronized void update(Position position) {
+    public synchronized void updateDevice(long deviceId, String status, Date time) {
+        // TODO update cache and call listener
+        Log.debug(deviceId + " " + status + " " + time);
+    }
+
+    public synchronized void updatePosition(Position position) {
         long deviceId = position.getDeviceId();
         positions.put(deviceId, position);
         if (listeners.containsKey(deviceId)) {
             for (DataCacheListener listener : listeners.get(deviceId)) {
-                listener.onUpdate(position);
+                listener.onUpdatePosition(position);
             }
         }
     }
@@ -92,7 +100,7 @@ public synchronized Collection<Position> getInitialState(Collection<Long> device
     }
 
     public interface DataCacheListener {
-        void onUpdate(Position position);
+        void onUpdatePosition(Position position);
     }
 
     public void addListener(Collection<Long> devices, DataCacheListener listener) {

diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java
@@ -54,6 +54,10 @@ public void setUniqueId(String uniqueId) {
         this.uniqueId = uniqueId;
     }
 
+    public static final String STATUS_UNKNOWN = "unknown";
+    public static final String STATUS_ONLINE = "online";
+    public static final String STATUS_OFFLINE = "offline";
+
     private String status;
 
     public String getStatus() {

diff --git a/src/org/traccar/web/AsyncServlet.java b/src/org/traccar/web/AsyncServlet.java
@@ -88,7 +88,7 @@ public boolean hasDevice(long deviceId) {
 
         private final ConnectionManager.DataCacheListener dataListener = new ConnectionManager.DataCacheListener() {
             @Override
-            public void onUpdate(Position position) {
+            public void onUpdatePosition(Position position) {
                 synchronized (AsyncSession.this) {
                     logEvent("onUpdate deviceId: " + position.getDeviceId());
                     if (!destroyed) {