Changeset 3baad6d in orbit for android/src

Timestamp:

12/22/13 08:34:27 (9 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

3444b8e

Parents:

ca52be2

Message:

• Added Controlled Descent support

Location:

android/src/info/puzzlebox/orbit

Files:

• FragmentTabAdvanced.java (modified) (3 diffs)
• OrbitTabActivity.java (modified) (3 diffs)

android/src/info/puzzlebox/orbit/FragmentTabAdvanced.java

@@ -12 +12 @@
 import org.apache.http.conn.util.InetAddressUtils;
 
+import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
@@ -97 +98 @@
         int viewSpaceGenerateAudioWidth = 120;
 
+        OrbitControlledDescentTask orbitControlledDescentTask;
+
 
         private SensorManager sensorManager;
@@ -800 +803 @@
 
 
+        // ################################################################
+
+        public void registerControlledDescent() {
+
+                orbitControlledDescentTask = new OrbitControlledDescentTask();
+                orbitControlledDescentTask.execute();
+
+        }
+
+        // ################################################################
+
+        public void unregisterControlledDescent(boolean callStopAudio) {
+
+                Log.v(TAG, "unregisterControlledDescent()");
+
+                if (callStopAudio)
+                        ((OrbitTabActivity)getActivity()).stopAudio();
+
+        }
+
+
+        // ################################################################
+        // ################################################################
+
+        class OrbitControlledDescentTask extends AsyncTask<Integer, Void, Integer> {
+
+                private String TAG = "OrbitControlledDescentTask";
+                FragmentTabAdvanced fragmentAdvanced;
+
+                private int throttleTarget = 0;
+                private int throttleStep = 1;
+                private int throttleStepSleep = 50;
+                public int throttlePrevious;
+                public boolean keepDescending = true;
+                public boolean callStopAudio = true;
+
+                protected Integer doInBackground(Integer... params) {
+
+                        String id = ((OrbitTabActivity)getActivity()).getTabFragmentAdvanced();
+
+                        fragmentAdvanced = 
+                                        (FragmentTabAdvanced) getFragmentManager().findFragmentByTag(id);
+
+                        throttlePrevious = fragmentAdvanced.seekBarThrottle.getProgress();
+
+                        while ((keepDescending) && (fragmentAdvanced.seekBarThrottle.getProgress() > throttleTarget)) {
+
+                                fragmentAdvanced.seekBarThrottle.setProgress( fragmentAdvanced.seekBarThrottle.getProgress() - throttleStep);
+
+                                try {
+                                        Thread.sleep(throttleStepSleep);
+                                } catch (InterruptedException e) {
+                                        Log.e(TAG, "Thread InterruptedException");
+                                        e.printStackTrace();
+                                } // sleep is in milliseconds
+
+                        }
+
+                        return 1;
+
+                } // doInBackground
+
+
+                // #############################################################
+
+                @Override
+                protected void onPostExecute(Integer params) {
+
+                        Log.d(TAG, "onPostExecute()");
+
+                        fragmentAdvanced.unregisterControlledDescent(callStopAudio);
+
+                        fragmentAdvanced.seekBarThrottle.setProgress(throttlePrevious);
+
+                } // onPostExecute
+
+        } // MediaPlayerTask
+
+
 } // FragmentTabAdvanced

android/src/info/puzzlebox/orbit/OrbitTabActivity.java

@@ -805 +805 @@
                          * Generate signal on the fly
                          */
-
-                        if (audioHandler != null) {
+                        
+                        // Handle controlled descent thread if activated
+                        if ((fragmentAdvanced.orbitControlledDescentTask != null) && 
+                                        (fragmentAdvanced.orbitControlledDescentTask.keepDescending)) {
+                                fragmentAdvanced.orbitControlledDescentTask.callStopAudio = false;
+                                fragmentAdvanced.orbitControlledDescentTask.keepDescending = false;
+                        }
+
+
+//                      if (audioHandler != null) {
 
                                 //                              serviceBinder.ifFlip = fragmentAdvanced.checkBoxInvertControlSignal.isChecked(); // if checked then flip
@@ -824 +832 @@
 
                                 audioHandler.mutexNotify();
-                        }
+//                      }
 
 
@@ -859 +867 @@
         public void stopControl() {
 
+                FragmentTabAdvanced fragmentAdvanced = 
+                                (FragmentTabAdvanced) getSupportFragmentManager().findFragmentByTag( getTabFragmentAdvanced() );
+
+//              if ((generateAudio) &&
+//                              (fragmentAdvanced != null) &&
+//                              (fragmentAdvanced.orbitControlledDescentTask != null) && 
+//                              (fragmentAdvanced.orbitControlledDescentTask.keepDescending)) {
+//                      fragmentAdvanced.orbitControlledDescentTask.keepDescending = false;
+                if ((generateAudio) &&
+                                (fragmentAdvanced != null) &&
+                                (audioHandler != null)) {
+                        fragmentAdvanced.registerControlledDescent();
+                } else {
+                        stopAudio();
+                }
+
+        } // stopControl
+
+
+        // ################################################################
+
+        public void stopAudio() {
+
                 /**
                  * stop AudioTrack as well as destroy service.