Merge pull request 'convert to mph' (#34) from convert_to_mph into develop

Reviewed-on: #34
Reviewed-by: Cristi Ene <cristi.ene@safemobile.com>

.gitignore

@@ -184,3 +184,6 @@ $RECYCLE.BIN/
 /.idea/misc.xml
 /.idea
 /.idea/modules.xml
+
+/safeDispatch/debug
+/safeDispatch/release

libSafeMobile/src/main/java/com/safemobile/services/TCPService.java

@@ -16,9 +16,9 @@ import android.widget.Toast;
 public class TCPService extends Service {
 
 	private int[] startModes = {START_STICKY, START_NOT_STICKY, START_REDELIVER_INTENT};
-	private int mStartMode = startModes[0];       // indicates how to behave if the service is killed
+	private int mStartMode = startModes[0];         // indicates how to behave if the service is killed
     private IBinder mBinder = new TCPBinder();      // interface for clients that bind
-    private boolean mAllowRebind = true; // indicates whether onRebind should be used
+    private boolean mAllowRebind = true;            // indicates whether onRebind should be used
     private TCPhandler tcp = null;
     private TCPmsgParser tcpParser = null;
     
@@ -112,27 +112,7 @@ public class TCPService extends Service {
     /** restart the TCP Connection after the connection parameters had been changed */
     public void recreateTCPConnection()
     {
-    	/*
+        recreateTCPConnection(AppParams.IP, AppParams.PORT);
-    	Thread t = new Thread(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					Thread.sleep(1000*2);
-				} catch (InterruptedException e) {
-					e.printStackTrace();
-				}
-				*/
-				// create a tcp connection
-		    	int port = 13589;
-		    	try {
-		    		port = Integer.parseInt(AppParams.PORT);
-		    	}
-		    	catch(Exception ex) { }
-		    	tcp = new TCPhandler(getApplicationContext(), AppParams.IP, port);		
-	/*		}
-		});
-    	t.start();
-    	*/
     }
     
     public void recreateTCPConnection(String _ip, String _port)

safeDispatch/release/output-metadata.json

@@ -1,20 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "com.safemobile.safedispatch",
-  "variantName": "release",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "versionCode": 8000091,
-      "versionName": "8.0.91",
-      "outputFile": "SafeDispatchMobile_v.8.0.91-release.apk"
-    }
-  ],
-  "elementType": "File"
-}

safeDispatch/src/main/java/com/safemobile/safedispatch/GoogleMapsInfoBubble.java

@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.Hashtable;
 import java.util.Locale;
+import java.util.concurrent.TimeUnit;
 
 
 public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
@@ -90,28 +91,38 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
 
         boolean isMilitaryTime = false;
         Date positionTime;
+        long timeGMT = 0;
         String speed, address, gpsLocation, name = "";
         if (isLiveTab) {
             SuperVehicle vehicle = superVehHash.get(key);
-            positionTime = new Date((new Date()).getTime() - vehicle.timeGMT);
+
+            //positionTime = new Date((new Date()).getTime() - vehicle.timeGMT);
+
+            timeGMT = vehicle.timeGMT;
             address = vehicle.Address != null ? vehicle.Address : "";
             name = vehicle.name;
-            speed = String.format(context.getResources().getString(R.string.speedMph), vehicle.speed);
+            speed = String.format(context.getResources().getString(R.string.speedMph), (int)(0.621371192 * vehicle.speed));
             gpsLocation = "[" + String.format("%.4f", vehicle.lat) + "," + String.format("%.4f",vehicle.lng) + "]";
         } else {
             HistPos histPos = histPosList.get(position);
-            positionTime = new Date((new Date()).getTime() - histPos.timeGMT);
+
+            //positionTime = new Date((new Date()).getTime() - histPos.timeGMT);
+            timeGMT = histPos.timeGMT;
             address = histPos.Address != null ? histPos.Address : "";
-            speed = String.format(context.getResources().getString(R.string.speedMph), histPos.speed);
+            speed = String.format(context.getResources().getString(R.string.speedMph),  (int)(0.621371192 * histPos.speed));
             gpsLocation = "[" + String.format("%.4f", histPos.lat) + "," + String.format("%.4f",histPos.lng) + "]";
         }
 
-        String timeFormat = isMilitaryTime
+        //String timeFormat = isMilitaryTime
-                ? "HH:mm:ss dd.MMM.yyyy"
+        //        ? "HH:mm:ss dd.MMM.yyyy"
-                : "hh:mm:ss a dd.MMM.yyy";
+        //       : "hh:mm:ss a dd.MMM.yyy";
+
+        //DateFormat format = new SimpleDateFormat(timeFormat, Locale.ENGLISH);
+        //tvTimeAgo.setText(format.format(positionTime));
+
+        DateFormat format = new SimpleDateFormat("hh:mm:ss", Locale.ENGLISH);
+        tvTimeAgo.setText( getDateTimeAgo(timeGMT * 1000)  +  "  [" +  format.format(new Date(timeGMT*1000) ) + "]");
 
-        DateFormat format = new SimpleDateFormat(timeFormat, Locale.ENGLISH);
-        tvTimeAgo.setText(format.format(positionTime));
         tvStreetView.setText(address);
         streetView.setVisibility(address.length() > 0 ? View.VISIBLE : View.GONE);
         tvStreetView.setVisibility(address.length() > 0 ? View.VISIBLE : View.GONE);
@@ -123,5 +134,38 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
         tvSpeed.setText(speed);
         tvGPSLocation.setText(gpsLocation);
     }
+
+    /// <summary>
+    /// Get a text representation for the date time representing
+    /// the difference in minutes/hours/days from now
+    /// </summary>
+    /// <param name="utcTime">DateTime value which needs to be converted</param>
+    /// <returns>String 'Ago' representation fot he date</returns>
+    public static String getDateTimeAgo(long time)
+    {
+        String timeValue = "";
+
+        long diffInMs = (new Date().getTime() - time);
+
+        long secondsDifference = TimeUnit.MILLISECONDS.toSeconds(diffInMs);;
+
+        if (secondsDifference < 60)
+            timeValue = "less than 1 minute";
+        else if (secondsDifference < 3600)
+            timeValue = (secondsDifference / 60) + " minute" + ((secondsDifference / 60) > 1 ? "s" : "") + " ago";
+        else if (secondsDifference < 7200)
+            timeValue = "1 hour ago";
+        else if (secondsDifference < 86400)
+        {
+            timeValue = (secondsDifference / 3600) + " hours ago";
+        }
+        else
+        {
+            timeValue = (secondsDifference / 86400) + " days ago";
+        }
+
+        return timeValue;
+    }
+
 }
 

safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java

@@ -2354,7 +2354,16 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 		// cancel old notification
 		mNotificationManager.cancel(icon);
 
-		PendingIntent pendingIntent = PendingIntent.getActivity(context, NOTIFICATION_ACTIVITY_RESULT, intent, PendingIntent.FLAG_CANCEL_CURRENT);
+		PendingIntent pendingIntent;
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+			pendingIntent = PendingIntent.getActivity(context, NOTIFICATION_ACTIVITY_RESULT, intent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
+
+		}else {
+			pendingIntent = PendingIntent.getActivity(context, NOTIFICATION_ACTIVITY_RESULT, intent, PendingIntent.FLAG_CANCEL_CURRENT);
+
+		}
+
+
 		createNotificationChannel(icon, contentTitle, contentText, pendingIntent);
 	}