X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=521588fbe7b929ebdf7ec4f85bc1ab055dde995e;hb=80bf63702175322053f2b38c4fff56b653ab7c70;hp=17084863d4784633d96565eeb479caa460eca376;hpb=7aab6e6b6e361455a7515fe6db7b0e9a6e4c786c;p=fw%2Faltos diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index 17084863..521588fb 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -64,10 +64,6 @@ public class AltosDroid extends Activity { private EditText mOutEditText; private Button mSendButton; - // String buffer for outgoing messages - private StringBuffer mOutStringBuffer; - // Member object for the chat services - private BluetoothChatService mChatService = null; // Intent request codes private static final int REQUEST_CONNECT_DEVICE = 1; private static final int REQUEST_ENABLE_BT = 2; @@ -80,8 +76,8 @@ public class AltosDroid extends Activity { // Local Bluetooth adapter private BluetoothAdapter mBluetoothAdapter = null; - @Override - public void onCreate(Bundle savedInstanceState) { + @Override + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); if(D) Log.e(TAG, "+++ ON CREATE +++"); @@ -97,16 +93,17 @@ public class AltosDroid extends Activity { mTitle.setText(R.string.app_name); mTitle = (TextView) findViewById(R.id.title_right_text); - // If the adapter is null, then Bluetooth is not supported + // If the adapter is null, then Bluetooth is not supported if (mBluetoothAdapter == null) { Toast.makeText(this, "Bluetooth is not available", Toast.LENGTH_LONG).show(); finish(); return; } - } - @Override - public void onStart() { + } + + @Override + public void onStart() { super.onStart(); if(D) Log.e(TAG, "++ ON START ++"); @@ -114,50 +111,49 @@ public class AltosDroid extends Activity { Intent enableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE); startActivityForResult(enableIntent, REQUEST_ENABLE_BT); } else { - if (mChatService == null) setupChat(); + //if (mChatService == null) setupChat(); } - } + } - @Override - public synchronized void onResume() { + @Override + public synchronized void onResume() { 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 - public synchronized void onPause() { + //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 + public synchronized void onPause() { super.onPause(); if(D) Log.e(TAG, "- ON PAUSE -"); - } + } - @Override - public void onStop() { + @Override + public void onStop() { super.onStop(); if(D) Log.e(TAG, "-- ON STOP --"); - } + } - @Override - public void onDestroy() { + @Override + public void onDestroy() { super.onDestroy(); - // Stop the Bluetooth chat services - if (mChatService != null) mChatService.stop(); if(D) Log.e(TAG, "--- ON DESTROY ---"); - } + } - private void setupChat() { +/* + private void setupChat() { Log.d(TAG, "setupChat()"); mSerialView = (TextView) findViewById(R.id.in); @@ -173,10 +169,10 @@ public class AltosDroid extends Activity { 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 + // 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); + sendMessage(message); } }); @@ -185,14 +181,15 @@ public class AltosDroid extends Activity { // 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) { + 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(); @@ -212,8 +209,8 @@ public class AltosDroid extends Activity { } - // The action listener for the EditText widget, to listen for the return key - private TextView.OnEditorActionListener mWriteListener = + // 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 @@ -222,59 +219,12 @@ public class AltosDroid extends Activity { sendMessage(message); } if(D) Log.i(TAG, "END onEditorAction"); - return true; - } - }; - - // The Handler that gets information back from the BluetoothChatService - private final Handler mHandler = new Handler() { - @Override - public void handleMessage(Message msg) { - switch (msg.what) { - case MESSAGE_STATE_CHANGE: - if(D) Log.i(TAG, "MESSAGE_STATE_CHANGE: " + msg.arg1); - switch (msg.arg1) { - case BluetoothChatService.STATE_CONNECTED: - mTitle.setText(R.string.title_connected_to); - mTitle.append(mConnectedDeviceName); - mSerialView.setText(""); - break; - case BluetoothChatService.STATE_CONNECTING: - mTitle.setText(R.string.title_connecting); - break; - case BluetoothChatService.STATE_READY: - case BluetoothChatService.STATE_NONE: - mTitle.setText(R.string.title_not_connected); - break; - } - break; - case MESSAGE_WRITE: - byte[] writeBuf = (byte[]) msg.obj; - // construct a string from the buffer - String writeMessage = new String(writeBuf); - mSerialView.append(writeMessage + '\n'); - break; - case MESSAGE_READ: - byte[] readBuf = (byte[]) msg.obj; - // construct a string from the valid bytes in the buffer - String readMessage = new String(readBuf, 0, msg.arg1); - mSerialView.append(readMessage); - break; - case MESSAGE_DEVICE_NAME: - // save the connected device's name - mConnectedDeviceName = msg.getData().getString(DEVICE_NAME); - Toast.makeText(getApplicationContext(), "Connected to " - + mConnectedDeviceName, Toast.LENGTH_SHORT).show(); - break; - case MESSAGE_TOAST: - Toast.makeText(getApplicationContext(), msg.getData().getString(TOAST), - Toast.LENGTH_SHORT).show(); - break; - } - } - }; - - public void onActivityResult(int requestCode, int resultCode, Intent data) { + return true; + } + }; + */ + + public void onActivityResult(int requestCode, int resultCode, Intent data) { if(D) Log.d(TAG, "onActivityResult " + resultCode); switch (requestCode) { case REQUEST_CONNECT_DEVICE: @@ -287,7 +237,7 @@ public class AltosDroid extends Activity { // When the request to enable Bluetooth returns if (resultCode == Activity.RESULT_OK) { // Bluetooth is now enabled, so set up a chat session - setupChat(); + //setupChat(); } else { // User did not enable Bluetooth or an error occured Log.d(TAG, "BT not enabled"); @@ -296,36 +246,28 @@ public class AltosDroid extends Activity { finish(); } } - } + } - private void connectDevice(Intent data) { + private void connectDevice(Intent data) { // Get the device MAC address String address = data.getExtras().getString(DeviceListActivity.EXTRA_DEVICE_ADDRESS); // Get the BLuetoothDevice object BluetoothDevice device = mBluetoothAdapter.getRemoteDevice(address); // Attempt to connect to the device - mChatService.connect(device); - } + } + - @Override - public boolean onCreateOptionsMenu(Menu menu) { + @Override + public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.option_menu, menu); return true; - } + } - @Override - public boolean onOptionsItemSelected(MenuItem item) { + @Override + public boolean onOptionsItemSelected(MenuItem item) { Intent serverIntent = null; switch (item.getItemId()) { - case R.id.telemetry_service_control: - serverIntent = new Intent(this, TelemetryServiceActivities.Controller.class); - startActivity(serverIntent); - return true; - case R.id.telemetry_service_bind: - serverIntent = new Intent(this, TelemetryServiceActivities.Binding.class); - startActivity(serverIntent); - return true; case R.id.connect_scan: // Launch the DeviceListActivity to see devices and do scan serverIntent = new Intent(this, DeviceListActivity.class); @@ -333,6 +275,6 @@ public class AltosDroid extends Activity { return true; } return false; - } + } }