altosdroid: miscellaneous cleanup

[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 b8ddd5743245470f407ec81d53670dfe76f8910c..3855f6f9a262670f7c4925e940cd1485fb0b25ef 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -18,6 +18,7 @@
 package org.altusmetrum.AltosDroid;
 
 import java.lang.ref.WeakReference;
+
 import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -31,6 +32,8 @@ import android.os.Handler;
 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.KeyEvent;
@@ -45,7 +48,7 @@ import android.view.Window;
 //import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
-import org.altusmetrum.AltosDroid.R;
+//import org.altusmetrum.AltosDroid.R;
 
 /**
  * This is the main Activity that displays the current chat session.
@@ -58,12 +61,9 @@ public class AltosDroid extends Activity {
        // Message types sent from the TelemetryService Handler
        public static final int MSG_STATE_CHANGE    = 1;
        public static final int MSG_DEVNAME         = 2;
-       public static final int MSG_INCOMING_TELEM  = 3;
-       public static final int MSG_TOAST           = 4;
-
-       // Key names received from the TelemetryService Handler
-       public static final String KEY_DEVNAME = "key_devname";
-       public static final String KEY_TOAST   = "key_toast";
+       public static final int MSG_TOAST           = 3;
+       public static final int MSG_DEVCONFIG       = 4;
+       public static final int MSG_TELEMETRY       = 5;
 
        // Intent request codes
        private static final int REQUEST_CONNECT_DEVICE = 1;
@@ -77,13 +77,15 @@ public class AltosDroid extends Activity {
 
        private boolean mIsBound;
        Messenger mService = null;
-       final Messenger mMessenger = new Messenger(new IncomingHandler());
+       final Messenger mMessenger = new Messenger(new IncomingHandler(this));
 
        // Name of the connected device
        private String mConnectedDeviceName = null;
        // Local Bluetooth adapter
        private BluetoothAdapter mBluetoothAdapter = null;
 
+       private TextToSpeech tts;
+       private boolean tts_enabled = false;
 
        // The Handler that gets information back from the Telemetry Service
        static class IncomingHandler extends Handler {
@@ -111,22 +113,24 @@ public class AltosDroid extends Activity {
                                        break;
                                }
                                break;
-                       case MSG_INCOMING_TELEM:
-                               byte[] buf = (byte[]) msg.obj;
+                       case MSG_DEVCONFIG:
+                       case MSG_TELEMETRY:
+                               //byte[] buf = (byte[]) msg.obj;
                                // construct a string from the buffer
-                               String telem = new String(buf);
-                               ad.mSerialView.append(telem);
+                               //String telem = new String(buf);
+                               //ad.mSerialView.append(telem);
                                break;
                        case MSG_DEVNAME:
                                // save the connected device's name
-                               ad.mConnectedDeviceName = msg.getData().getString(KEY_DEVNAME);
-                               Toast.makeText(ad.getApplicationContext(), "Connected to "
+                               ad.mConnectedDeviceName = (String) msg.obj;
+                               if (ad.mConnectedDeviceName != null)
+                                       Toast.makeText(ad.getApplicationContext(), "Connected to "
                                                        + ad.mConnectedDeviceName, Toast.LENGTH_SHORT).show();
                                break;
                        case MSG_TOAST:
                                Toast.makeText(
                                                ad.getApplicationContext(),
-                                               msg.getData().getString(KEY_TOAST),
+                                               (String) msg.obj,
                                                Toast.LENGTH_SHORT).show();
                                break;
                        }
@@ -183,6 +187,14 @@ public class AltosDroid extends Activity {
                        return;
                }
 
+               // 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 );
+                       }
+               });
+
                // Start Telemetry Service
                startService(new Intent(AltosDroid.this, TelemetryService.class));
 
@@ -237,6 +249,8 @@ public class AltosDroid extends Activity {
 
                doUnbindService();
 
+               if (tts != null) tts.shutdown();
+
                if(D) Log.e(TAG, "--- ON DESTROY ---");
        }
 
@@ -327,9 +341,10 @@ public class AltosDroid extends Activity {
                                // User did not enable Bluetooth or an error occured
                                Log.d(TAG, "BT not enabled");
                                stopService(new Intent(AltosDroid.this, TelemetryService.class));
-                               Toast.makeText(this, R.string.bt_not_enabled_leaving, Toast.LENGTH_SHORT).show();
+                               Toast.makeText(this, R.string.bt_not_enabled, Toast.LENGTH_SHORT).show();
                                finish();
                        }
+                       break;
                }
        }
 
@@ -343,13 +358,13 @@ public class AltosDroid extends Activity {
                        //Message msg = Message.obtain(null, TelemetryService.MSG_CONNECT_TELEBT);
                        //msg.obj = device;
                        //mService.send(msg);
+                       if (D) Log.i(TAG, "Connecting to " + device.getName());
                        mService.send(Message.obtain(null, TelemetryService.MSG_CONNECT, device));
                } catch (RemoteException e) {
                        e.printStackTrace();
                }
        }
 
-
        @Override
        public boolean onCreateOptionsMenu(Menu menu) {
                MenuInflater inflater = getMenuInflater();