Version 2.1 stable

ElasticSensorDump/build.gradle

@@ -2,26 +2,35 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         applicationId "ca.dungeons.sensordump"
-        minSdkVersion 20
+        minSdkVersion 25
+        //noinspection OldTargetApi
         targetSdkVersion 25
         versionCode 16
-        versionName "1.4.7"
+        versionName "2.1.0"
     }
     buildTypes {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    useLibrary 'org.apache.http.legacy'
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    //noinspection GradleCompatible
+    compile 'com.android.support:appcompat-v7:25.4.0'
+    compile 'com.android.support:support-v4:25.4.0'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    compile 'com.android.support:support-v4:25.1.0'
+    compile 'com.android.support:design:25.4.0'
+    compile 'com.android.support:support-v4:25.4.0'
+    implementation 'com.google.android.gms:play-services:11.4.2'
 }
+
+apply plugin: 'com.google.gms.google-services'

ElasticSensorDump/src/main/AndroidManifest.xml

@@ -4,6 +4,10 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
 
     <application
         android:allowBackup="true"
@@ -16,13 +20,27 @@
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
         <activity
             android:name=".SettingsActivity"
             android:label="Settings">
         </activity>
+
+        <service
+            android:name=".EsdServiceManager"
+            android:exported="false"
+            android:label="ESD Service Manager">
+        </service>
+
+        <activity android:name=".ui.camera.BarcodeCaptureActivity">
+        </activity>
+
+        <activity android:name=".ui.camera.BarcodeMainActivity">
+        </activity>
     </application>
 
-</manifest>
+</manifest>

ElasticSensorDump/src/main/java/ca/dungeons/sensordump/AudioRunnable.java

@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ca.dungeons.sensordump;
+
+import android.media.AudioFormat;
+import android.media.AudioRecord;
+import android.media.MediaRecorder;
+import android.util.Log;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+class AudioRunnable implements Runnable {
+  /** Identify logcat messages. */
+  private final String logTag = "audioLogger";
+  /** We use this to indicate to the sensor thread if we have data to send. */
+  boolean hasData = false;
+  /** Use this control variable to stop the recording of audio data. */
+  private boolean stopThread = false;
+  /** A reference to the current audio sample "loudness" in terms of percentage of mic capability. */
+  private float amplitude = 0;
+  /** A reference to the current audio sample frequency. */
+  private float frequency = 0;
+  /** The sampling rate of the audio recording. */
+  private final int SAMPLE_RATE = 44100;
+  /** Short type array to feed to the recording API. */
+  private short[] audioBuffer;
+  /** Minimum buffer size required by AudioRecord API. */
+  private int bufferSize;
+
+  /**
+   * Default constructor.
+   * Determine minimum buffer size, get data from Android audio api.
+   * Set variables before executing the runnable.
+   */
+  AudioRunnable() {
+    // Buffer size in bytes.
+    bufferSize = AudioRecord.getMinBufferSize(
+            SAMPLE_RATE, AudioFormat.CHANNEL_IN_MONO, AudioFormat.ENCODING_PCM_16BIT
+    );
+    // A check to make sure we are doing math on valid objects.
+    if (bufferSize == AudioRecord.ERROR || bufferSize == AudioRecord.ERROR_BAD_VALUE) {
+      bufferSize = SAMPLE_RATE * 2;
+    }
+  }
+
+  /** Stop the audio logging thread. */
+  void setStopAudioThread() {
+    stopThread = true;
+  }
+
+  /** Main run method. */
+  @SuppressWarnings("ConstantConditions")
+  @Override
+  public void run() {
+    // ?????
+    audioBuffer = new short[bufferSize / 2];
+    // New instance of Android audio recording api.
+    AudioRecord audioRecord = new AudioRecord(
+            MediaRecorder.AudioSource.DEFAULT,
+            SAMPLE_RATE,
+            AudioFormat.CHANNEL_IN_MONO,
+            AudioFormat.ENCODING_PCM_16BIT,
+            bufferSize
+    );
+
+    if (audioRecord.getState() != AudioRecord.STATE_INITIALIZED) {
+      Log.e("Audio Error", "AudioRecord has not been initialized properly.");
+      return;
+    }
+    while (!stopThread) {
+      audioRecord.read(audioBuffer, 0, audioBuffer.length);
+      float lowest = 0;
+      float highest = 0;
+      int zeroes = 0;
+      int last_value = 0;
+      if (audioBuffer != null) {
+        // Exploring the buffer. Record the highest and lowest readings
+        for (short anAudioBuffer : audioBuffer) {
+          lowest = anAudioBuffer < lowest ? anAudioBuffer : lowest;
+          highest = anAudioBuffer > highest ? anAudioBuffer : highest;
+          // Down and coming up
+          if (anAudioBuffer > 0 && last_value < 0) {
+            zeroes++;
+          }
+          // Up and down
+          if (anAudioBuffer < 0 && last_value > 0) {
+            zeroes++;
+          }
+          last_value = anAudioBuffer;
+          // Calculate highest and lowest peak difference as a % of the max possible
+          // value
+          amplitude = (highest - lowest) / 65536 * 100;
+          // Take the count of the peaks in the time that we had based on the sample
+          // rate to calculate frequency
+          if (audioBuffer != null) {
+            float seconds = (float) audioBuffer.length / SAMPLE_RATE;
+            frequency = (float) zeroes / seconds / 2;
+
+            hasData = true;
+          }
+        }
+      }
+    }
+    audioRecord.stop();
+    audioRecord.release();
+    Log.i(logTag, "Audio recording stopping.");
+  }
+
+  /** Called on the sensor thread, delivers data to the sensor message handler. */
+  JSONObject getAudioData(JSONObject passedJson) {
+    if (passedJson != null) {
+      try {
+        passedJson.put("frequency", frequency);
+        passedJson.put("amplitude", amplitude);
+      } catch (JSONException jsonEx) {
+        Log.e(logTag, "Error adding data to json. ");
+        return passedJson;
+      }
+    }
+    audioBuffer = new short[bufferSize / 2];
+    hasData = false;
+    return passedJson;
+  }
+
+
+}