diff --git a/README.md b/README.md index 49c3426..ac69368 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ ************* -####Changelog +#### Changelog ************* diff --git a/phoneClients/android/.idea/libraries/appcompat_v7_19_0_1.xml b/phoneClients/android/.idea/libraries/appcompat_v7_19_0_1.xml new file mode 100644 index 0000000..762f843 --- /dev/null +++ b/phoneClients/android/.idea/libraries/appcompat_v7_19_0_1.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/phoneClients/android/.idea/libraries/play_services_4_0_30.xml b/phoneClients/android/.idea/libraries/play_services_4_0_30.xml new file mode 100644 index 0000000..d50c09d --- /dev/null +++ b/phoneClients/android/.idea/libraries/play_services_4_0_30.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/phoneClients/android/.idea/workspace.xml b/phoneClients/android/.idea/workspace.xml index 8c81e95..d33bbe2 100644 --- a/phoneClients/android/.idea/workspace.xml +++ b/phoneClients/android/.idea/workspace.xml @@ -40,6 +40,15 @@ + + + + + + + + + @@ -108,7 +117,7 @@ - + @@ -118,20 +127,32 @@ - - - - - + + + + + + + + + + + + + + + + + - + @@ -192,7 +213,7 @@ + - @@ -604,6 +775,7 @@ + @@ -776,7 +948,6 @@ - @@ -828,6 +999,19 @@ - - + + + @@ -1002,13 +1174,12 @@ - + - @@ -1017,15 +1188,15 @@ - - - + + + - + @@ -1038,8 +1209,8 @@ - + @@ -1071,14 +1242,26 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -1111,14 +1294,26 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -1151,14 +1346,26 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -1244,14 +1451,26 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -1277,14 +1496,26 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -1303,14 +1534,26 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -1327,14 +1570,26 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -1360,14 +1615,26 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -1424,36 +1691,48 @@ - - - - - - - + + + - - - - + - + + + + + + + + + + + + + + + + + + + + - + diff --git a/phoneClients/android/GpsTracker/GpsTracker.iml b/phoneClients/android/GpsTracker/GpsTracker.iml index 7fbe37f..c8f6e0a 100644 --- a/phoneClients/android/GpsTracker/GpsTracker.iml +++ b/phoneClients/android/GpsTracker/GpsTracker.iml @@ -30,10 +30,10 @@ - - - - + + + + @@ -71,9 +71,9 @@ - + - + diff --git a/phoneClients/android/GpsTracker/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java b/phoneClients/android/GpsTracker/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java index aedcfb9..f6bfbe2 100644 --- a/phoneClients/android/GpsTracker/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java +++ b/phoneClients/android/GpsTracker/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java @@ -39,7 +39,7 @@ private static TextView accuracyTextView; private static TextView providerTextView; private static TextView timeStampTextView; - private static TextView sessionIDTextView; + private static TextView phoneNumberTextView; private LocationRequest locationRequest; private LocationClient locationClient; @@ -48,6 +48,8 @@ private boolean firstTimeGettingPosition = true; private boolean currentlyTracking = false; private String sessionID; + private String shortSessionID; + private String phoneNumber = "androidUser"; @Override protected void onCreate(Bundle savedInstanceState) { @@ -85,7 +87,8 @@ protected void startTracking() { sessionID = UUID.randomUUID().toString(); - sessionIDTextView.setText("sessionID: " + sessionID); + shortSessionID = sessionID.substring(0,5); + phoneNumberTextView.setText("phoneNumber: " + phoneNumber + "-" + shortSessionID); totalDistanceInMeters = 0.0f; int intervalInSeconds = 60; // one minute @@ -97,7 +100,7 @@ } protected void stopTracking() { - sessionIDTextView.setText("sessionID: "); + phoneNumberTextView.setText("phoneNumber: "); if (locationClient != null && locationClient.isConnected()) { locationClient.removeLocationUpdates(this); @@ -145,6 +148,8 @@ requestParams.put("distance", 0); // in miles } + String shortSessionID = sessionID.substring(0,5); + requestParams.put("phonenumber", "androidUser"); requestParams.put("sessionid", sessionID); // uuid requestParams.put("accuracy", Float.toString(location.getAccuracy())); // in meters @@ -178,7 +183,7 @@ providerTextView.setText("provider: " + location.getProvider()); timeStampTextView.setText("timeStamp: " + dateFormat.format(date)); - Log.e(TAG, dateFormat.format(date) + " accuracy: " + location.getAccuracy()); + Log.e(TAG, dateFormat.format(date) + " accuracy: " + location.getAccuracy()); } @Override @@ -256,7 +261,7 @@ accuracyTextView = (TextView)rootView.findViewById(R.id.accuracyTextView); providerTextView = (TextView)rootView.findViewById(R.id.providerTextView); timeStampTextView = (TextView)rootView.findViewById(R.id.timeStampTextView); - sessionIDTextView = (TextView)rootView.findViewById(R.id.sessionIDTextView); + phoneNumberTextView = (TextView)rootView.findViewById(R.id.phoneNumberTextView); return rootView; } } diff --git a/phoneClients/android/GpsTracker/src/main/res/layout/fragment_gpstracker.xml b/phoneClients/android/GpsTracker/src/main/res/layout/fragment_gpstracker.xml index 62ea9ed..553cf92 100644 --- a/phoneClients/android/GpsTracker/src/main/res/layout/fragment_gpstracker.xml +++ b/phoneClients/android/GpsTracker/src/main/res/layout/fragment_gpstracker.xml @@ -52,19 +52,19 @@ android:text="@string/timeStamp" /> + android:text="@string/phoneNumber" />