correct state update for new clients to existing vehicle connection.

dronekit · Mar 27, 2015 · 1ba29fc · 1ba29fc
1 parent 89bc7f3
commit 1ba29fc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/ClientLib/mobile/libs/AidlLib.jar b/ClientLib/mobile/libs/AidlLib.jar
diff --git a/ServiceApp/src/org/droidplanner/services/android/drone/DroneManager.java b/ServiceApp/src/org/droidplanner/services/android/drone/DroneManager.java
@@ -30,7 +30,6 @@
 import org.droidplanner.services.android.location.FusedLocation;
 import org.droidplanner.services.android.utils.AndroidApWarningParser;
 import org.droidplanner.services.android.utils.analytics.GAUtils;
-import org.droidplanner.services.android.utils.file.IO.CameraInfoLoader;
 import org.droidplanner.services.android.utils.prefs.DroidPlannerPrefs;
 
 import java.util.List;
@@ -134,6 +133,13 @@ public void connect(String appId, DroneEventsListener listener) throws Connectio
             mavClient.openConnection();
         } else {
             listener.onDroneEvent(DroneInterfaces.DroneEventsType.CONNECTED, drone);
+
+            if (drone.isConnectionAlive())
+                listener.onDroneEvent(DroneInterfaces.DroneEventsType.HEARTBEAT_FIRST, drone);
+            else
+                listener.onDroneEvent(DroneInterfaces.DroneEventsType.HEARTBEAT_TIMEOUT, drone);
+
+
             notifyConnected(appId, listener);
         }
 
@@ -152,7 +158,7 @@ private void disconnect() {
         }
     }
 
-    public int getConnectedAppsCount(){
+    public int getConnectedAppsCount() {
         return connectedApps.size();
     }
 
@@ -406,11 +412,11 @@ public ConnectionParameter getConnectionParameter() {
 
     @Override
     public void onMessageLogged(int mavSeverity, String message) {
-        if(connectedApps.isEmpty())
+        if (connectedApps.isEmpty())
             return;
 
         final int logLevel;
-        switch(mavSeverity){
+        switch (mavSeverity) {
             case MAV_SEVERITY.MAV_SEVERITY_ALERT:
             case MAV_SEVERITY.MAV_SEVERITY_CRITICAL:
             case MAV_SEVERITY.MAV_SEVERITY_EMERGENCY:
@@ -436,7 +442,7 @@ public void onMessageLogged(int mavSeverity, String message) {
                 break;
         }
 
-        for(DroneEventsListener listener: connectedApps.values()){
+        for (DroneEventsListener listener : connectedApps.values()) {
             listener.onMessageLogged(logLevel, message);
         }
     }