X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=2ee7fe583ebfdcdd93065cc6643ddbb6c7a1d788;hb=bf7def1a7b93867dfe16fe6499ee028747634c41;hp=a1c5fede10b668c395ebd1d90e6c46418432c02f;hpb=24503eb330bf887f5c76afe2aaa9c9f2ce177460;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index a1c5fede..2ee7fe58 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -17,39 +17,93 @@
 
 package org.altusmetrum.AltosDroid;
 
+import java.util.ArrayList;
+import java.util.concurrent.LinkedBlockingQueue;
+
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
+import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
-import android.os.Binder;
 import android.os.IBinder;
+import android.os.Handler;
+import android.os.Message;
+import android.os.Messenger;
 import android.util.Log;
 import android.widget.Toast;
 
 // Need the following import to get access to the app resources, since this
 // class is in a sub-package.
-import org.altusmetrum.AltosDroid.R;
-
+//import org.altusmetrum.AltosDroid.R;
 
+import org.altusmetrum.AltosLib.*;
 
 public class TelemetryService extends Service {
 
-    /**
-     * Class for clients to access.  Because we know this service always
-     * runs in the same process as its clients, we don't need to deal with
-     * IPC.
-     */
-    public class TelemetryBinder extends Binder {
-        TelemetryService getService() {
-            return TelemetryService.this;
-        }
-    }
+	private static final String TAG = "TelemetryService";
+	private static final boolean D = true;
+
+	static final int MSG_REGISTER_CLIENT   = 1;
+	static final int MSG_UNREGISTER_CLIENT = 2;
+	static final int MSG_CONNECT_TELEBT    = 3;
+
+	public static final int STATE_NONE       = 0;
+	public static final int STATE_READY      = 1;
+	public static final int STATE_CONNECTING = 2;
+	public static final int STATE_CONNECTED  = 3;
+
 	// Unique Identification Number for the Notification.
 	// We use it on Notification start, and to cancel it.
 	private int NOTIFICATION = R.string.telemetry_service_label;
 	private NotificationManager mNM;
 
+	ArrayList<Messenger> mClients = new ArrayList<Messenger>(); // Keeps track of all current registered clients.
+	final Messenger mMessenger = new Messenger(new IncomingHandler()); // Target we publish for clients to send messages to IncomingHandler.
+
+	// Name of the connected device
+	private String mConnectedDeviceName = null;
+	private AltosBluetooth mAltosBluetooth = null;
+
+	LinkedBlockingQueue<AltosLine> telem;
+
+	// Handler of incoming messages from clients.
+	class IncomingHandler extends Handler {
+		@Override
+		public void handleMessage(Message msg) {
+			switch (msg.what) {
+			case MSG_REGISTER_CLIENT:
+				mClients.add(msg.replyTo);
+				if (D) Log.d(TAG, "Client bound to service");
+				break;
+			case MSG_UNREGISTER_CLIENT:
+				mClients.remove(msg.replyTo);
+				if (D) Log.d(TAG, "Client unbound from service");
+				break;
+			case MSG_CONNECT_TELEBT:
+				if (D) Log.d(TAG, "Connect command received");
+				TeleBT_stop();
+				TeleBT_start((BluetoothDevice) msg.obj);
+				break;
+			default:
+				super.handleMessage(msg);
+			}
+		}
+	}
+
+	private void TeleBT_stop() {
+		if (mAltosBluetooth != null) {
+			mAltosBluetooth.close();
+			mAltosBluetooth = null;
+		}
+		telem.clear();
+	}
+
+	private void TeleBT_start(BluetoothDevice d) {
+		mAltosBluetooth = new AltosBluetooth(d);
+		mAltosBluetooth.add_monitor(telem);
+	}
+
 	@Override
 	public void onCreate() {
 		// Create a reference to the NotificationManager so that we can update our notifcation text later
@@ -67,7 +121,7 @@ public class TelemetryService extends Service {
 
 		// The PendingIntent to launch our activity if the user selects this notification
 		PendingIntent contentIntent = PendingIntent.getActivity(this, 0,
-                new Intent(this, TelemetryServiceActivities.Controller.class), 0);
+				new Intent(this, AltosDroid.class), 0);
 
 		// Set the info for the views that show in the notification panel.
 		notification.setLatestEventInfo(this, getText(R.string.telemetry_service_label), text, contentIntent);
@@ -86,6 +140,8 @@ public class TelemetryService extends Service {
 	@Override
 	public void onDestroy() {
 
+		// Stop the bluetooth Comms threads
+		TeleBT_stop();
 
 		// Demote us from the foreground, and cancel the persistent notification.
 		stopForeground(true);
@@ -96,11 +152,8 @@ public class TelemetryService extends Service {
 
 	@Override
 	public IBinder onBind(Intent intent) {
-        return mBinder;
+		return mMessenger.getBinder();
 	}
 
-    // This is the object that receives interactions from clients.  See
-    // RemoteService for a more complete example.
-    private final IBinder mBinder = new TelemetryBinder();
 
 }