JUnit Test support

SensorRecordFromDevice/.classpath

@@ -3,5 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

SensorRecordFromDevice/.gitignore

@@ -0,0 +1,2 @@
+bin/
+gen/

SensorSimulatorSettings/project.properties → SensorRecordFromDevice/project.properties

@@ -3,9 +3,12 @@
 #
 # This file must be checked in Version Control Systems.
 #
-# To customize properties used by the Ant build system use,
+# To customize properties used by the Ant build system edit
 # "ant.properties", and override values to adapt the script to your
 # project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-14
+target=android-7

SensorRecordFromDevice/src/org/openintents/sensorsimulator/record/SensorRecordService.java

@@ -1,7 +1,9 @@
 package org.openintents.sensorsimulator.record;
 
+import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
+import java.io.OutputStream;
 import java.net.Socket;
 import java.util.ArrayList;
 import android.app.Notification;
@@ -24,6 +26,8 @@
 public class SensorRecordService extends Service {
 	private static final String TAG = "SensorRecordService";
 
+	private static final int PORT = 9100;
+
 	private static final CharSequence MSG_SERVER_UNREACHABLE = "Please check"
 			+ " the IP address and make sure that you have started the java"
 			+ " desktop application!";
@@ -35,7 +39,7 @@ public class SensorRecordService extends Service {
 
 	// communication
 	private Socket mRequestSocket;
-	private ObjectOutputStream mOutStream;
+	private DataOutputStream mOutStream;
 
 	// sensors
 	private ArrayList<SensorEventListener> mListenersArray;
@@ -66,31 +70,30 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 		// get ip address (from intent)
 		String ipAddress = intent.getStringExtra("ip");
 		try {
-			mRequestSocket = new Socket(ipAddress, Global.PORT);
+			mRequestSocket = new Socket(ipAddress, PORT);
 			Log.d(TAG, "created socket for ip address:" + ipAddress);
-			mOutStream = new ObjectOutputStream(
+			mOutStream = new DataOutputStream(
 					mRequestSocket.getOutputStream());
 			mHandler = new Handler(new Callback() {
 				@Override
 				public boolean handleMessage(Message msg) {
 					// event captured by a listener
 					// send event values to the server (sockets)
 					try {
-						// sensorType
-						mOutStream.writeObject(msg.arg1);
-						// float[] - sensor values
-						mOutStream.writeObject(msg.obj);
-
-						// Log.d(TAG, "send message:" + ((float[]) msg.obj)[0] +
-						// " "
-						// + ((float[]) msg.obj)[1] + " " + ((float[])
-						// msg.obj)[2]);
-						//
+						SensorEventContainer event = (SensorEventContainer) msg.obj;
+
+						mOutStream.writeInt(event.type);
+						mOutStream.writeInt(event.accuracy);
+						mOutStream.writeLong(event.timestamp);
+						mOutStream.writeInt(event.values.length);
+						for (float value : event.values) {
+							mOutStream.writeFloat(value);
+						}
+
 					} catch (IOException e) {
 						Log.e(TAG, "Connection closed!");
 						clearAll(false);
 					}
-
 					return true;
 				}
 			});
@@ -119,8 +122,9 @@ private void registerListener(final int sensorType) {
 			@Override
 			public void onSensorChanged(SensorEvent event) {
 				Message msg = new Message();
-				msg.obj = event.values.clone();
-				msg.arg1 = sensorType;
+				msg.obj = new SensorEventContainer(
+						sensorType, event.accuracy, event.timestamp,
+						event.values.clone());
 				mHandler.sendMessage(msg);
 			}
 
@@ -181,4 +185,28 @@ private void showNotification() {
 		// Send the notification.
 		mNotificationManager.notify(NOTIFICATION, notification);
 	}
+
+	/**
+	 * Simple Container Class to wrap sensor data and put them in the queue for
+	 * the network handler. Not necessary, when handler would just process the
+	 * sensor event, but I did not have the time to check the "sensor - id"
+	 * mapping at the time.
+	 * 
+	 * @author Qui Don Ho
+	 * 
+	 */
+	private class SensorEventContainer {
+		public int type;
+		public int accuracy;
+		public long timestamp;
+		public float[] values;
+
+		public SensorEventContainer(int type, int accuracy, long timestamp,
+				float[] values) {
+			this.type = type;
+			this.accuracy = accuracy;
+			this.timestamp = timestamp;
+			this.values = values;
+		}
+	}
 }