refreshes the solo companion computer state on heartbeat restoration.

Author: m4gr3d

ServiceApp/build.gradle

@@ -40,7 +40,7 @@ dependencies {
 def versionMajor = 1
 def versionMinor = 3
 def versionPatch = 4
-def versionBuild = 1 //bump for dogfood builds, public betas, etc.
+def versionBuild = 2 //bump for dogfood builds, public betas, etc.
 def versionPrefix = "3DR Services v"
 
 android {

ServiceApp/src/org/droidplanner/services/android/core/drone/DroneManager.java

@@ -751,6 +751,8 @@ public void onDroneEvent(DroneInterfaces.DroneEventsType event, MavLinkDrone dro
                     if (!soloComp.isConnected()) {
                         soloComp.start();
                         return;
+                    } else{
+                        soloComp.refreshState();
                     }
                 }
 
@@ -770,6 +772,9 @@ public void onDroneEvent(DroneInterfaces.DroneEventsType event, MavLinkDrone dro
                     handler.removeCallbacks(disconnectSoloCompTask);
                     if (!soloComp.isConnected())
                         soloComp.start();
+                    else{
+                        soloComp.refreshState();
+                    }
                 }
                 break;
 

ServiceApp/src/org/droidplanner/services/android/core/drone/companion/solo/AbstractLinkManager.java

@@ -21,6 +21,8 @@ public abstract class AbstractLinkManager<T extends AbstractLinkManager.LinkList
 
     protected static final long RECONNECT_COUNTDOWN = 1000l; //ms
 
+    public abstract void refreshState();
+
     public interface LinkListener {
         void onLinkConnected();
 
@@ -133,6 +135,9 @@ public void stop() {
     public void onIpConnected() {
         handler.removeCallbacks(reconnectTask);
         wasConnected.set(true);
+
+        refreshState();
+
         if (linkListener != null)
             linkListener.onLinkConnected();
     }

ServiceApp/src/org/droidplanner/services/android/core/drone/companion/solo/SoloComp.java

@@ -126,6 +126,11 @@ public void stop() {
         soloLinkMgr.stop();
     }
 
+    public void refreshState() {
+        soloLinkMgr.refreshState();
+        artooMgr.refreshState();
+    }
+
     /**
      * Terminates and releases resources used by this companion computer instance. The instance should no longer be used after calling this method.
      */

ServiceApp/src/org/droidplanner/services/android/core/drone/companion/solo/controller/ControllerLinkManager.java

@@ -346,9 +346,7 @@ public boolean isLinkConnected() {
     }
 
     @Override
-    public void onIpConnected() {
-        super.onIpConnected();
-
+    public void refreshState(){
         Timber.d("Artoo link connected.");
 
         startVideoManager();

ServiceApp/src/org/droidplanner/services/android/core/drone/companion/solo/controller/VideoManager.java

@@ -60,6 +60,12 @@ void stopDecoding(DecoderListener listener) {
         mediaCodecManager.stopDecoding(listener);
     }
 
+    @Override
+    public void refreshState() {
+        //We're good to go for the video stream.
+        Timber.d( "Connected to video stream");
+    }
+
     @Override
     public void start(LinkListener listener) {
         Timber.d("Starting video manager");
@@ -72,13 +78,6 @@ public void stop() {
         super.stop();
     }
 
-    @Override
-    public void onIpConnected() {
-        //We're good to go for the video stream.
-        Timber.d( "Connected to video stream");
-        super.onIpConnected();
-    }
-
     @Override
     public void onIpDisconnected() {
         Timber.d( "Video stream disconnected");

ServiceApp/src/org/droidplanner/services/android/core/drone/companion/solo/sololink/SoloLinkManager.java

@@ -152,9 +152,8 @@ public void stop() {
     }
 
     @Override
-    public void onIpConnected() {
+    public void refreshState(){
         Timber.d("Connected to sololink.");
-        super.onIpConnected();
 
         loadPresetButtonSettings();
         loadGoproState();
@@ -348,4 +347,6 @@ public void refreshSoloLinkVersions() {
         updatePixhawkVersion();
         updateGimbalVersion();
     }
+
+
 }