X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=cd47c6f9587b0e833b9d7a455327a7860f819603;hb=5ce8c63850dbc6462d7c41ce917e0e06672ec0ab;hp=9059ca7950f599360910f267c867cd231448d378;hpb=5f4c47389a3d0d10d659a2e00fc74a150b5fed88;p=fw%2Faltos diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java index 9059ca79..cd47c6f9 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java @@ -17,28 +17,26 @@ package org.altusmetrum.AltosDroid; +import java.lang.ref.WeakReference; import java.util.ArrayList; -import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.TimeoutException; import android.app.Notification; -import android.app.NotificationManager; +//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.Bundle; import android.os.IBinder; import android.os.Handler; import android.os.Message; import android.os.Messenger; +import android.os.RemoteException; 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.AltosLib.*; +//import org.altusmetrum.AltosLib.*; public class TelemetryService extends Service { @@ -47,7 +45,11 @@ public class TelemetryService extends Service { static final int MSG_REGISTER_CLIENT = 1; static final int MSG_UNREGISTER_CLIENT = 2; - static final int MSG_CONNECT_TELEBT = 3; + static final int MSG_CONNECT = 3; + static final int MSG_CONNECTED = 4; + static final int MSG_CONNECT_FAILED = 5; + static final int MSG_DISCONNECTED = 6; + static final int MSG_TELEMETRY = 7; public static final int STATE_NONE = 0; public static final int STATE_READY = 1; @@ -57,34 +59,65 @@ public class TelemetryService extends Service { // 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; + //private NotificationManager mNM; ArrayList mClients = new ArrayList(); // Keeps track of all current registered clients. - final Messenger mMessenger = new Messenger(new IncomingHandler()); // Target we publish for clients to send messages to IncomingHandler. + final Handler mHandler = new IncomingHandler(this); + final Messenger mMessenger = new Messenger(mHandler); // Target we publish for clients to send messages to IncomingHandler. // Name of the connected device - private String mConnectedDeviceName = null; - private AltosBluetooth mAltosBluetooth = null; + private BluetoothDevice device = null; + private AltosBluetooth mAltosBluetooth = null; + private TelemetryReader mTelemetryReader = null; - LinkedBlockingQueue telem; + // internally track state of bluetooth connection + private int state = STATE_NONE; // Handler of incoming messages from clients. - class IncomingHandler extends Handler { + static class IncomingHandler extends Handler { + private final WeakReference service; + IncomingHandler(TelemetryService s) { service = new WeakReference(s); } + @Override public void handleMessage(Message msg) { + TelemetryService s = service.get(); switch (msg.what) { case MSG_REGISTER_CLIENT: - mClients.add(msg.replyTo); + s.mClients.add(msg.replyTo); + try { + msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_DEVNAME, s.device.getName())); + msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, s.state, -1)); + } catch (RemoteException e) { + s.mClients.remove(msg.replyTo); + } if (D) Log.d(TAG, "Client bound to service"); break; case MSG_UNREGISTER_CLIENT: - mClients.remove(msg.replyTo); + s.mClients.remove(msg.replyTo); if (D) Log.d(TAG, "Client unbound from service"); break; - case MSG_CONNECT_TELEBT: + case MSG_CONNECT: if (D) Log.d(TAG, "Connect command received"); - TeleBT_stop(); - TeleBT_start((BluetoothDevice) msg.obj); + s.device = (BluetoothDevice) msg.obj; + s.startAltosBluetooth(); + break; + case MSG_CONNECTED: + if (D) Log.d(TAG, "Connected to device"); + s.connected(); + break; + case MSG_CONNECT_FAILED: + if (D) Log.d(TAG, "Connection failed... retrying"); + s.startAltosBluetooth(); + break; + case MSG_DISCONNECTED: + // Only do the following if we haven't been shutdown elsewhere.. + if (s.device != null) { + if (D) Log.d(TAG, "Disconnected from " + s.device.getName()); + s.stopAltosBluetooth(); + } + break; + case MSG_TELEMETRY: + s.sendMessageToClients(Message.obtain(null, AltosDroid.MSG_TELEMETRY, msg.obj)); break; default: super.handleMessage(msg); @@ -92,23 +125,79 @@ public class TelemetryService extends Service { } } - private void TeleBT_stop() { + private void sendMessageToClients(Message m) { + for (int i=mClients.size()-1; i>=0; i--) { + try { + mClients.get(i).send(m); + } catch (RemoteException e) { + mClients.remove(i); + } + } + } + + private void stopAltosBluetooth() { + if (D) Log.d(TAG, "stopAltosBluetooth(): begin"); + setState(STATE_READY); + if (mTelemetryReader != null) { + if (D) Log.d(TAG, "stopAltosBluetooth(): stopping TelemetryReader"); + mTelemetryReader.interrupt(); + try { + mTelemetryReader.join(); + } catch (InterruptedException e) { + } + mTelemetryReader = null; + } if (mAltosBluetooth != null) { + if (D) Log.d(TAG, "stopAltosBluetooth(): stopping AltosBluetooth"); mAltosBluetooth.close(); mAltosBluetooth = null; } - telem.clear(); + device = null; + } + + private void startAltosBluetooth() { + if (mAltosBluetooth == null) { + if (D) Log.d(TAG, String.format("startAltosBluetooth(): Connecting to %s (%s)", device.getName(), device.getAddress())); + mAltosBluetooth = new AltosBluetooth(device, mHandler); + setState(STATE_CONNECTING); + } else { + // This is a bit of a hack - if it appears we're still connected, we treat this as a restart. + // So, to give a suitable delay to teardown/bringup, we just schedule a resend of a message + // to ourselves in a few seconds time that will ultimately call this method again. + // ... then we tear down the existing connection. + // We do it this way around so that we don't lose a reference to the device when this method + // is called on reception of MSG_CONNECT_FAILED in the handler above. + mHandler.sendMessageDelayed(Message.obtain(null, MSG_CONNECT, device), 3000); + stopAltosBluetooth(); + } + } + + private synchronized void setState(int s) { + if (D) Log.d(TAG, "setState(): " + state + " -> " + s); + state = s; + + sendMessageToClients(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, state, -1)); } - private void TeleBT_start(BluetoothDevice d) { - mAltosBluetooth = new AltosBluetooth(d); - mAltosBluetooth.add_monitor(telem); + private void connected() { + sendMessageToClients(Message.obtain(null, AltosDroid.MSG_DEVNAME, device.getName())); + setState(STATE_CONNECTED); + try { + sendMessageToClients(Message.obtain(null, AltosDroid.MSG_DEVCONFIG, mAltosBluetooth.config_data())); + } catch (InterruptedException e) { + } catch (TimeoutException e) { + } + mTelemetryReader = new TelemetryReader(mAltosBluetooth, mHandler); + mTelemetryReader.start(); } + @Override public void onCreate() { // Create a reference to the NotificationManager so that we can update our notifcation text later - mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE); + //mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE); + + setState(STATE_READY); } @Override @@ -142,7 +231,7 @@ public class TelemetryService extends Service { public void onDestroy() { // Stop the bluetooth Comms threads - TeleBT_stop(); + stopAltosBluetooth(); // Demote us from the foreground, and cancel the persistent notification. stopForeground(true);