Compare commits
1 Commits
develop
...
SD_256_inc
Author | SHA1 | Date | |
---|---|---|---|
fffb067e3c |
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -184,6 +184,3 @@ $RECYCLE.BIN/
|
||||||
/.idea/misc.xml
|
/.idea/misc.xml
|
||||||
/.idea
|
/.idea
|
||||||
/.idea/modules.xml
|
/.idea/modules.xml
|
||||||
|
|
||||||
/safeDispatch/debug
|
|
||||||
/safeDispatch/release
|
|
||||||
|
|
BIN
SafeDispatchMobile_key
Normal file
BIN
SafeDispatchMobile_key
Normal file
Binary file not shown.
|
@ -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), (int)(0.621371192 * vehicle.speed));
|
speed = String.format(context.getResources().getString(R.string.speedMph), 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), (int)(0.621371192 * histPos.speed));
|
speed = String.format(context.getResources().getString(R.string.speedMph), histPos.speed);
|
||||||
gpsLocation = "[" + String.format("%.4f", histPos.lat) + "," + String.format("%.4f",histPos.lng) + "]";
|
gpsLocation = "[" + String.format("%.4f", histPos.lat) + "," + String.format("%.4f",histPos.lng) + "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2354,16 +2354,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||||
// cancel old notification
|
// cancel old notification
|
||||||
mNotificationManager.cancel(icon);
|
mNotificationManager.cancel(icon);
|
||||||
|
|
||||||
PendingIntent pendingIntent;
|
PendingIntent pendingIntent = PendingIntent.getActivity(context, NOTIFICATION_ACTIVITY_RESULT, intent, PendingIntent.FLAG_CANCEL_CURRENT);
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user