X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=e3e6012e7357b0501b187c60ec92c1dd6eb40db3;hb=c6d667a6ac0decfde5bc8a180b14774e9942dd0c;hp=3855f6f9a262670f7c4925e940cd1485fb0b25ef;hpb=162c640d382b9f823573578fe97584adc94cd9b6;p=fw%2Faltos diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index 3855f6f9..e3e6012e 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -36,19 +36,14 @@ import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech.OnInitListener; import android.text.method.ScrollingMovementMethod; import android.util.Log; -//import android.view.KeyEvent; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -//import android.view.View; import android.view.Window; -//import android.view.View.OnClickListener; -//import android.view.inputmethod.EditorInfo; -//import android.widget.Button; -//import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; -//import org.altusmetrum.AltosDroid.R; + +import org.altusmetrum.AltosLib.*; /** * This is the main Activity that displays the current chat session. @@ -58,12 +53,9 @@ public class AltosDroid extends Activity { private static final String TAG = "AltosDroid"; private static final boolean D = true; - // Message types sent from the TelemetryService Handler + // Message types received by our Handler public static final int MSG_STATE_CHANGE = 1; - public static final int MSG_DEVNAME = 2; - public static final int MSG_TOAST = 3; - public static final int MSG_DEVCONFIG = 4; - public static final int MSG_TELEMETRY = 5; + public static final int MSG_TELEMETRY = 2; // Intent request codes private static final int REQUEST_CONNECT_DEVICE = 1; @@ -72,19 +64,19 @@ public class AltosDroid extends Activity { // Layout Views private TextView mTitle; private TextView mSerialView; - //private EditText mOutEditText; - //private Button mSendButton; - private boolean mIsBound; - Messenger mService = null; + // Service + private boolean mIsBound = false; + private Messenger mService = null; final Messenger mMessenger = new Messenger(new IncomingHandler(this)); - // Name of the connected device - private String mConnectedDeviceName = null; + // TeleBT Config data + private AltosConfigData mConfigData = null; // Local Bluetooth adapter private BluetoothAdapter mBluetoothAdapter = null; - private TextToSpeech tts; + // Text to Speech + private TextToSpeech tts = null; private boolean tts_enabled = false; // The Handler that gets information back from the Telemetry Service @@ -97,42 +89,32 @@ public class AltosDroid extends Activity { AltosDroid ad = mAltosDroid.get(); switch (msg.what) { case MSG_STATE_CHANGE: - if(D) Log.i(TAG, "MSG_STATE_CHANGE: " + msg.arg1); + if(D) Log.d(TAG, "MSG_STATE_CHANGE: " + msg.arg1); switch (msg.arg1) { case TelemetryService.STATE_CONNECTED: + ad.mConfigData = (AltosConfigData) msg.obj; + String str = String.format(" %s S/N: %d", ad.mConfigData.product, ad.mConfigData.serial); ad.mTitle.setText(R.string.title_connected_to); - ad.mTitle.append(ad.mConnectedDeviceName); - ad.mSerialView.setText(""); + ad.mTitle.append(str); + Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show(); break; case TelemetryService.STATE_CONNECTING: ad.mTitle.setText(R.string.title_connecting); break; case TelemetryService.STATE_READY: case TelemetryService.STATE_NONE: + ad.mConfigData = null; ad.mTitle.setText(R.string.title_not_connected); + ad.mSerialView.setText(""); break; } break; - 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); break; - case MSG_DEVNAME: - // save the connected device's name - 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(), - (String) msg.obj, - Toast.LENGTH_SHORT).show(); - break; } } }; @@ -172,6 +154,7 @@ public class AltosDroid extends Activity { mTitle.setText(R.string.app_name); mTitle = (TextView) findViewById(R.id.title_right_text); + // Set up the temporary Text View mSerialView = (TextView) findViewById(R.id.in); mSerialView.setMovementMethod(new ScrollingMovementMethod()); mSerialView.setClickable(false); @@ -209,8 +192,6 @@ public class AltosDroid extends Activity { if (!mBluetoothAdapter.isEnabled()) { Intent enableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE); startActivityForResult(enableIntent, REQUEST_ENABLE_BT); - } else { - //if (mChatService == null) setupChat(); } } @@ -219,16 +200,6 @@ public class AltosDroid extends Activity { super.onResume(); if(D) Log.e(TAG, "+ ON RESUME +"); - // Performing this check in onResume() covers the case in which BT was - // not enabled during onStart(), so we were paused to enable it... - // onResume() will be called when ACTION_REQUEST_ENABLE activity returns. - //if (mChatService != null) { - // Only if the state is STATE_NONE, do we know that we haven't started already - //if (mChatService.getState() == BluetoothChatService.STATE_NONE) { - // Start the Bluetooth chat services - //mChatService.start(); - //} - //} } @Override @@ -256,72 +227,6 @@ public class AltosDroid extends Activity { -/* - private void setupChat() { - Log.d(TAG, "setupChat()"); - - // Initialize the compose field with a listener for the return key - mOutEditText = (EditText) findViewById(R.id.edit_text_out); - mOutEditText.setOnEditorActionListener(mWriteListener); - - // Initialize the send button with a listener that for click events - mSendButton = (Button) findViewById(R.id.button_send); - mSendButton.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - // Send a message using content of the edit text widget - TextView view = (TextView) findViewById(R.id.edit_text_out); - String message = view.getText().toString(); - sendMessage(message); - } - }); - - // Initialize the BluetoothChatService to perform bluetooth connections - mChatService = new BluetoothChatService(this, mHandler); - - // Initialize the buffer for outgoing messages - mOutStringBuffer = new StringBuffer(""); - } -*/ - - /** - * Sends a message. - * @param message A string of text to send. - */ - /* - private void sendMessage(String message) { - // Check that we're actually connected before trying anything - if (mChatService.getState() != BluetoothChatService.STATE_CONNECTED) { - Toast.makeText(this, R.string.not_connected, Toast.LENGTH_SHORT).show(); - return; - } - - // Check that there's actually something to send - if (message.length() > 0) { - // Get the message bytes and tell the BluetoothChatService to write - byte[] send = message.getBytes(); - mChatService.write(send); - - // Reset out string buffer to zero and clear the edit text field - mOutStringBuffer.setLength(0); - mOutEditText.setText(mOutStringBuffer); - } - } - - - // The action listener for the EditText widget, to listen for the return key - private TextView.OnEditorActionListener mWriteListener = - new TextView.OnEditorActionListener() { - public boolean onEditorAction(TextView view, int actionId, KeyEvent event) { - // If the action is a key-up event on the return key, send the message - if (actionId == EditorInfo.IME_NULL && event.getAction() == KeyEvent.ACTION_UP) { - String message = view.getText().toString(); - sendMessage(message); - } - if(D) Log.i(TAG, "END onEditorAction"); - return true; - } - }; - */ public void onActivityResult(int requestCode, int resultCode, Intent data) { if(D) Log.d(TAG, "onActivityResult " + resultCode); @@ -339,7 +244,7 @@ public class AltosDroid extends Activity { //setupChat(); } else { // User did not enable Bluetooth or an error occured - Log.d(TAG, "BT not enabled"); + Log.e(TAG, "BT not enabled"); stopService(new Intent(AltosDroid.this, TelemetryService.class)); Toast.makeText(this, R.string.bt_not_enabled, Toast.LENGTH_SHORT).show(); finish(); @@ -355,13 +260,9 @@ public class AltosDroid extends Activity { BluetoothDevice device = mBluetoothAdapter.getRemoteDevice(address); // Attempt to connect to the device try { - //Message msg = Message.obtain(null, TelemetryService.MSG_CONNECT_TELEBT); - //msg.obj = device; - //mService.send(msg); - if (D) Log.i(TAG, "Connecting to " + device.getName()); + if (D) Log.d(TAG, "Connecting to " + device.getName()); mService.send(Message.obtain(null, TelemetryService.MSG_CONNECT, device)); } catch (RemoteException e) { - e.printStackTrace(); } }