eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-10 14:20:55 +00:00
Code Activity

Merge branch 'master' into ubilabs--rcapp--master

Browse Source
This commit is contained in:
Peter Siegmund committed 2015-06-25 20:46:01 +02:00
2 parents b8ee00a552 a3b5689f51
commit ec89a57255
137 files changed
+1529 -713
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/MessageSendingService.java
+2 -2
View File
@@ -286,7 +286,7 @@ public class MessageSendingService extends Service implements MessageSendingList
int resendMillis = PrefUtils.getInt(this, R.string.preference_messageResendIntervalMillis_key,
R.integer.preference_messageResendIntervalMillis_default);
if (!success) {
ExLog.i(this, "MS", "success");
ExLog.i(this, "MS", "!success");
reportApiConnectivity(APIConnectivity.transmissionError);
ExLog.w(this, TAG, "Error while posting intent to server. Will persist intent...");
try {
@@ -302,7 +302,7 @@ public class MessageSendingService extends Service implements MessageSendingList
reportUnsentGPSFixesCount();
serviceLogger.onMessageSentFailed();
} else {
ExLog.i(this, "MS", "!success");
ExLog.i(this, "MS", "success");
reportApiConnectivity(APIConnectivity.transmissionSuccess);
ExLog.i(this, TAG, "Message successfully sent.");
if (persistenceManager.areIntentsDelayed()) {
mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
+18 -4
View File
@@ -1,5 +1,7 @@
package com.sap.sailing.android.buoy.positioning.app.ui.fragments;
import java.text.DecimalFormat;
import android.content.Context;
import android.location.Location;
import android.location.LocationListener;
@@ -23,14 +25,15 @@ import com.sap.sailing.android.buoy.positioning.app.util.PingHelper;
import com.sap.sailing.android.buoy.positioning.app.valueobjects.MarkInfo;
import com.sap.sailing.android.buoy.positioning.app.valueobjects.MarkPingInfo;
import com.sap.sailing.android.shared.data.LeaderboardInfo;
import com.sap.sailing.android.shared.logging.ExLog;
import com.sap.sailing.android.shared.ui.customviews.OpenSansButton;
import com.sap.sailing.android.shared.ui.customviews.OpenSansTextView;
import com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView;
import com.sap.sailing.android.ui.fragments.BaseFragment;
import java.text.DecimalFormat;
public class BuoyFragment extends BaseFragment implements LocationListener {
private static final int GPS_MIN_DISTANCE = 1;
private static final int GPS_MIN_TIME = 1000;
private OpenSansTextView markHeaderTextView;
private OpenSansTextView latitudeTextView;
private OpenSansTextView longitudeTextView;
@@ -80,7 +83,7 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
signalQualityIndicatorView.setSignalQuality(GPSQuality.noSignal.toInt());
if (mark != null) {
markHeaderTextView.setText(mark.getName());
setUpTextUI(null);
setUpTextUI(lastKnownLocation);
GoogleMap map = mapFragment.getMap();
configureMap(map);
updateMap();
@@ -124,6 +127,11 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
accuracyText += " (" + String.format(accuracyString, accuracyFormatter.format(markPing.getAccuracy()))
+ ")";
}
ExLog.w(getActivity(), getTag(), "Setting latitude to: "+latitudeText);
ExLog.w(getActivity(), getTag(), "Setting longitude to: "+longitudeText);
ExLog.w(getActivity(), getTag(), "Setting accuracy to: "+accuracyText);
latitudeTextView.setText(latitudeText);
longitudeTextView.setText(longitudeText);
accuracyTextView.setText(accuracyText);
@@ -179,7 +187,13 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
private void initLocationProvider() {
locationManager = (LocationManager) getActivity().getSystemService(Context.LOCATION_SERVICE);
locationManager.removeUpdates(this);
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 10000, 10, this);
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, GPS_MIN_TIME, GPS_MIN_DISTANCE, this);
Location initialLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
if (initialLocation != null) {
onLocationChanged(initialLocation);
}
}
public void updateMap() {