Updated BluetoothService and added some new methods to SimpleBluetoot…

…h and BluetoothUtility.
DeveloperPaul123 · Jan 13, 2016 · 2282a47 · 2282a47
1 parent ffb136c
commit 2282a47
Show file tree

Hide file tree

Showing 7 changed files with 393 additions and 38 deletions.
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/app.iml b/app/app.iml
@@ -65,22 +65,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />

diff --git a/app/src/main/java/com/devpaul/bluetoothutilitydemo/TestActivity.java b/app/src/main/java/com/devpaul/bluetoothutilitydemo/TestActivity.java
@@ -13,7 +13,7 @@
 public class TestActivity extends BaseBluetoothActivity {
 
     @Override
-    public SimpleBluetoothListener getListener() {
+    public SimpleBluetoothListener getSimpleBluetoothListener() {
         return new SimpleBluetoothListener() {
             @Override
             public void onBluetoothDataReceived(byte[] bytes, String data) {

diff --git a/btutillib/btutillib.iml b/btutillib/btutillib.iml
@@ -65,23 +65,16 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />

diff --git a/btutillib/src/main/java/com/devpaul/bluetoothutillib/SimpleBluetooth.java b/btutillib/src/main/java/com/devpaul/bluetoothutillib/SimpleBluetooth.java
@@ -21,8 +21,9 @@
 import static com.devpaul.bluetoothutillib.utils.BluetoothUtility.InputStreamType;
 
 /**
- * Created by Paul Tsouchlos
- * Class for easily setting up bluetooth connections.
+ * Created by Paul T
+ * Class for easily setting up and managing bluetooth connections. Takes care of all the hard
+ * stuff for you.
  */
 public class SimpleBluetooth {
 
@@ -170,12 +171,6 @@ public SimpleBluetooth(Context context, Activity refActivity) {
         this.bluetoothUtility = new BluetoothUtility(mContext, mActivity, mHandler);
         //register the state change receiver.
         this.curType = InputStreamType.NORMAL;
-
-        /*
-        Trying onActivityResult instead of this for now.
-         */
-//        this.bluetoothBroadcastReceiver = BluetoothBroadcastReceiver
-//                .register(mContext, bluetoothBroadcastRecieverCallback);
         this.bluetoothStateReceiver = BluetoothStateReceiver
                 .register(mContext, stateRecieverCallback);
 
@@ -204,12 +199,6 @@ public SimpleBluetooth(Context context, Activity refActivity, BluetoothHandler h
                 new NullPointerException("Custom BluetoothHandler cannot be null!");
         this.bluetoothUtility = new BluetoothUtility(mContext, mActivity, customHandler);
         //register the state change receiver.
-        /*
-        Trying onActivityResult instead of this method.
-         */
-//        this.bluetoothBroadcastReceiver = BluetoothBroadcastReceiver
-//                .register(mContext, bluetoothBroadcastRecieverCallback);
-
         this.bluetoothStateReceiver = BluetoothStateReceiver
                 .register(mContext, stateRecieverCallback);
         this.bluetoothPairingReceiver = BluetoothPairingReceiver
@@ -277,14 +266,28 @@ public void handleMessage(Message message) {
     };
 
     /**
-     * Method that must be called to set everything up for this service.
+     * Method that must be called to set everything up for this class.
      */
     public boolean initializeSimpleBluetooth() {
         if(!bluetoothUtility.checkIfEnabled()) {
             bluetoothUtility.enableBluetooth();
         } else {
             isInitialized = true;
         }
+        return isInitialized;
+    }
+
+    /**
+     * Method that must be called (or initializeSimpleBluetooth()) to setup
+     * the simplebluetooth class.
+     * @return
+     */
+    public boolean initializeSimpleBluetoothSilent() {
+        if(!bluetoothUtility.checkIfEnabled()) {
+            bluetoothUtility.enableBluetoothSilent();
+        } else {
+            isInitialized = true;
+        }
 
         return isInitialized;
     }
@@ -306,6 +309,13 @@ public void sendData(int data) {
         bluetoothUtility.sendData(data);
     }
 
+    /**
+     * Sends byte array data to the connected bluetooth device.
+     * @param data the data to send.
+     */
+    public void sendData(byte[] data) {
+        bluetoothUtility.sendData(data);
+    }
 
     /**
      * Starts the device dialog to get a device to connect to.