altosdroid: Implement voice just like altosui

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosDroid.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index bc129feed576a4e0b758e5f4641918dcba567c72..20904d2b0845f6de6723144bfb6bf2dca3ac23b9 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -32,8 +32,6 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;

-import android.speech.tts.TextToSpeech;
-import android.speech.tts.TextToSpeech.OnInitListener;

 import android.text.method.ScrollingMovementMethod;
 import android.util.Log;
 import android.view.Menu;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Log;
 import android.view.Menu;


@@ -93,8 +91,7 @@ public class AltosDroid extends Activity {
        private BluetoothAdapter mBluetoothAdapter = null;
 
        // Text to Speech
        private BluetoothAdapter mBluetoothAdapter = null;
 
        // Text to Speech

-       private TextToSpeech tts    = null;
-       private boolean tts_enabled = false;
+       private AltosVoice mAltosVoice = null;

 
        // The Handler that gets information back from the Telemetry Service
        static class IncomingHandler extends Handler {
 
        // The Handler that gets information back from the Telemetry Service
        static class IncomingHandler extends Handler {


@@ -114,6 +111,7 @@ public class AltosDroid extends Activity {
                                        ad.mTitle.setText(R.string.title_connected_to);
                                        ad.mTitle.append(str);
                                        Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show();
                                        ad.mTitle.setText(R.string.title_connected_to);
                                        ad.mTitle.append(str);
                                        Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show();

+                                       ad.mAltosVoice.speak("Connected");

                                        //TEST!
                                        ad.mTextView.setText(Dumper.dump(ad.mConfigData));
                                        break;
                                        //TEST!
                                        ad.mTextView.setText(Dumper.dump(ad.mConfigData));
                                        break;


@@ -198,6 +196,8 @@ public class AltosDroid extends Activity {
                        mBearingView.setText(String.format("%3.0f°", state.from_pad.bearing));
                mLatitudeView.setText(pos(state.gps.lat, "N", "S"));
                mLongitudeView.setText(pos(state.gps.lon, "W", "E"));
                        mBearingView.setText(String.format("%3.0f°", state.from_pad.bearing));
                mLatitudeView.setText(pos(state.gps.lat, "N", "S"));
                mLongitudeView.setText(pos(state.gps.lon, "W", "E"));

+
+               mAltosVoice.tell(state);

        }
 
        String pos(double p, String pos, String neg) {
        }
 
        String pos(double p, String pos, String neg) {


@@ -257,14 +257,7 @@ public class AltosDroid extends Activity {
                mLatitudeView  = (TextView) findViewById(R.id.latitude_value);
                mLongitudeView = (TextView) findViewById(R.id.longitude_value);
 
                mLatitudeView  = (TextView) findViewById(R.id.latitude_value);
                mLongitudeView = (TextView) findViewById(R.id.longitude_value);
 

-               // Enable Text to Speech
-               tts = new TextToSpeech(this, new OnInitListener() {
-                       public void onInit(int status) {
-                               if (status == TextToSpeech.SUCCESS) tts_enabled = true;
-                               if (tts_enabled) tts.speak("AltosDroid ready", TextToSpeech.QUEUE_ADD, null );
-                       }
-               });
-
+               mAltosVoice = new AltosVoice(this);

        }
 
        @Override
        }
 
        @Override


@@ -308,7 +301,7 @@ public class AltosDroid extends Activity {
                super.onDestroy();
                if(D) Log.e(TAG, "--- ON DESTROY ---");
 
                super.onDestroy();
                if(D) Log.e(TAG, "--- ON DESTROY ---");
 

-               if (tts != null) tts.shutdown();
+               mAltosVoice.stop();

        }
 
 
        }