Safemobile/safedispatch-mobile
20
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Reviewed-on: #34
Reviewed-by: Cristi Ene <cristi.ene@safemobile.com>
This commit is contained in:
Laurențiu Constantin 2024-03-14 11:07:48 +00:00
commit 4ba0ceb627
4 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

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

20
safeDispatch/release/output-metadata.json
View File

@ -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"
}

4
safeDispatch/src/main/java/com/safemobile/safedispatch/GoogleMapsInfoBubble.java
View File

@ -101,7 +101,7 @@ public class GoogleMapsInfoBubble implements GoogleMap.InfoWindowAdapter {
timeGMT = vehicle.timeGMT; timeGMT = vehicle.timeGMT;
address = vehicle.Address != null ? vehicle.Address : ""; address = vehicle.Address != null ? vehicle.Address : "";
name = vehicle.name; 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) + "]"; gpsLocation = "[" + String.format("%.4f", vehicle.lat) + "," + String.format("%.4f",vehicle.lng) + "]";
} else { } else {
HistPos histPos = histPosList.get(position); HistPos histPos = histPosList.get(position);
@ -109,7 +109,7 @@ public class GoogleMapsInfoBubble implements GoogleMap.InfoWindowAdapter {
//positionTime = new Date((new Date()).getTime() - histPos.timeGMT); //positionTime = new Date((new Date()).getTime() - histPos.timeGMT);
timeGMT = histPos.timeGMT; timeGMT = histPos.timeGMT;
address = histPos.Address != null ? histPos.Address : ""; 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) + "]"; gpsLocation = "[" + String.format("%.4f", histPos.lat) + "," + String.format("%.4f",histPos.lng) + "]";
} }

11
safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java
View File

@ -2354,7 +2354,16 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
// cancel old notification // cancel old notification
mNotificationManager.cancel(icon); 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); createNotificationChannel(icon, contentTitle, contentText, pendingIntent);
} }