diff --git a/app/release/app-release-4.0.5c.apk b/app/release/app-release-4.0.5.apk similarity index 88% rename from app/release/app-release-4.0.5c.apk rename to app/release/app-release-4.0.5.apk index 62117de..4b70c48 100644 Binary files a/app/release/app-release-4.0.5c.apk and b/app/release/app-release-4.0.5.apk differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7ce8823..5df9440 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" package="uk.org.openseizuredetector" android:versionCode="101" - android:versionName="4.0.5c"> + android:versionName="4.0.5"> diff --git a/app/src/main/java/uk/org/openseizuredetector/SdData.java b/app/src/main/java/uk/org/openseizuredetector/SdData.java index 0471060..fd73a29 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdData.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdData.java @@ -205,6 +205,7 @@ public class SdData implements Parcelable { for (int i = 0; i < rawData.length; i++) { rawArr.put(rawData[i]); } + //Log.v(TAG,"rawData[0]="+rawData[0]+", rawArr[0]="+rawArr.getDouble(0)); jsonObj.put("rawData", rawArr); JSONArray raw3DArr = new JSONArray(); @@ -214,6 +215,7 @@ public class SdData implements Parcelable { jsonObj.put("rawData3D", raw3DArr); retval = jsonObj.toString(); + Log.v(TAG,"retval rawData="+retval); } catch (Exception ex) { Log.v(TAG, "Error Creating Data Object - " + ex.toString()); retval = "Error Creating Data Object - " + ex.toString(); diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSource.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSource.java index 95e3be0..c274af5 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdDataSource.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSource.java @@ -291,9 +291,10 @@ public abstract class SdDataSource { } int i; for (i = 0; i < accelVals.length(); i++) { - mSdData.rawData[i] = accelVals.getInt(i); + mSdData.rawData[i] = accelVals.getDouble(i); } mSdData.mNsamp = accelVals.length(); + //Log.d(TAG,"accelVals[0]="+accelVals.getDouble(0)+", mSdData.rawData[0]="+mSdData.rawData[0]); try { accelVals3D = dataObject.getJSONArray("data3D"); Log.v(TAG, "Received " + accelVals3D.length() + " acceleration 3D values, rawData Length is " + mSdData.rawData3D.length); @@ -302,7 +303,7 @@ public abstract class SdDataSource { + mSdData.rawData3D.length); } for (i = 0; i < accelVals3D.length(); i++) { - mSdData.rawData3D[i] = accelVals3D.getInt(i); + mSdData.rawData3D[i] = accelVals3D.getDouble(i); } } catch (JSONException e) { // If we get an error, just set rawData3D to zero