eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-24 21:13:50 +00:00
Code Activity

Merge branch 'ubilabs--tracking_app--bugfix--bug_2993_help' into ubilabs--tracking_app--bugfix--bug_2993

Browse Source
This commit is contained in:
Bennet Brunsen committed 2015-06-26 10:06:21 +02:00
2 parents bdf77e1a9c f7ec122d38
commit 86f594fa18
2 files changed
+59 -54
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.buoy.positioning/AndroidManifest.xml
+42 -42
View File
@@ -1,28 +1,27 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest package="com.sap.sailing.android.buoy.positioning.app"
package="com.sap.sailing.android.buoy.positioning.app" xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0" > android:versionName="1.0">
<uses-sdk <uses-sdk
android:minSdkVersion="14" android:minSdkVersion="14"
android:targetSdkVersion="22" /> android:targetSdkVersion="22"/>
<!-- <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" /> --> <!-- <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" /> -->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE" /> <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" /> <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" /> <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-feature <uses-feature
android:glEsVersion="0x00020000" android:glEsVersion="0x00020000"
android:required="true" /> android:required="true"/>
<application <application
@@ -31,69 +30,70 @@
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/AppTheme" > android:theme="@style/AppTheme">
<meta-data <meta-data
android:name="com.google.android.gms.version" android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" /> android:value="@integer/google_play_services_version"/>
<meta-data <meta-data
android:name="com.google.android.maps.v2.API_KEY" android:name="com.google.android.maps.v2.API_KEY"
android:value="AIzaSyDH-Dwy5yFlyBa2-VUgiZ3qGGUO8M_0MPY" /> android:value="AIzaSyDH-Dwy5yFlyBa2-VUgiZ3qGGUO8M_0MPY"/>
<activity <activity
android:name=".ui.activities.StartActivity" android:name=".ui.activities.StartActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:screenOrientation="portrait" > android:screenOrientation="portrait">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER"/>
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT"/>
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE"/>
<data <data
android:host="*" android:host="*"
android:pathPattern=".*buoy-tender/checkin.*" android:pathPattern=".*buoy-tender/checkin.*"
android:scheme="http" /> android:scheme="http"/>
<data <data
android:host="*" android:host="*"
android:pathPattern=".*buoy-tender/checkin.*" android:pathPattern=".*buoy-tender/checkin.*"
android:scheme="http" /> android:scheme="http"/>
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".ui.activities.RegattaActivity" android:name=".ui.activities.RegattaActivity"
android:screenOrientation="portrait" > android:screenOrientation="portrait"/>
</activity>
<activity <activity
android:name=".ui.activities.PositioningActivity" android:name=".ui.activities.PositioningActivity"
android:screenOrientation="portrait" > android:screenOrientation="portrait"/>
</activity> <activity
android:name=".ui.activities.SettingActivity"/>
<service <service
android:name="com.sap.sailing.android.shared.services.sending.MessageSendingService" android:name="com.sap.sailing.android.shared.services.sending.MessageSendingService"
android:exported="false" > android:exported="false">
<intent-filter> <intent-filter>
<action android:name="com.sap.sailing.android.tracking.app.action.sendSavedIntents" /> <action android:name="com.sap.sailing.android.tracking.app.action.sendSavedIntents"/>
<action android:name="com.sap.sailing.android.tracking.app.action.sendMessage" /> <action android:name="com.sap.sailing.android.tracking.app.action.sendMessage"/>
</intent-filter> </intent-filter>
</service> </service>
<service <service
android:name=".service.MarkerService" android:name=".service.MarkerService"
android:exported="false" /> android:exported="false"/>
<receiver android:name="com.sap.sailing.android.shared.services.sending.ConnectivityChangedReceiver">
<intent-filter>
<action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
</intent-filter>
</receiver>
<provider <provider
android:name=".provider.AnalyticsProvider" android:name=".provider.AnalyticsProvider"
android:authorities="com.sap.sailing.android.buoy.positioning.app.provider.db" android:authorities="com.sap.sailing.android.buoy.positioning.app.provider.db"
android:exported="false" /> android:exported="false"/>
<activity
android:name=".ui.activities.SettingActivity" >
</activity>
</application> </application>
</manifest> </manifest>
mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
+17 -12
View File
@@ -32,6 +32,7 @@ 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.OpenSansButton;
import com.sap.sailing.android.shared.ui.customviews.OpenSansTextView; import com.sap.sailing.android.shared.ui.customviews.OpenSansTextView;
import com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView; import com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView;
import com.sap.sailing.android.shared.util.ViewHolder;
import com.sap.sailing.android.ui.fragments.BaseFragment; import com.sap.sailing.android.ui.fragments.BaseFragment;
import java.text.DecimalFormat; import java.text.DecimalFormat;
@@ -55,29 +56,33 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
private boolean initialLocationUpdate; private boolean initialLocationUpdate;
private IntentReceiver mReceiver; private IntentReceiver mReceiver;
private PositioningActivity positioningActivity; private PositioningActivity positioningActivity;
private LocalBroadcastManager mBroadcastManager;
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
super.onCreateView(inflater, container, savedInstanceState); super.onCreateView(inflater, container, savedInstanceState);
View view = inflater.inflate(R.layout.fragment_buoy_postion_detail, container, false); View layout = inflater.inflate(R.layout.fragment_buoy_postion_detail, container, false);
markHeaderTextView = (OpenSansTextView) view.findViewById(R.id.mark_header); markHeaderTextView = ViewHolder.get(layout, R.id.mark_header);
latitudeTextView = (OpenSansTextView) view.findViewById(R.id.marker_gps_latitude); latitudeTextView = ViewHolder.get(layout, R.id.marker_gps_latitude);
longitudeTextView = (OpenSansTextView) view.findViewById(R.id.marker_gps_longitude); longitudeTextView = ViewHolder.get(layout, R.id.marker_gps_longitude);
accuracyTextView = (OpenSansTextView) view.findViewById(R.id.marker_gps_accuracy); accuracyTextView = ViewHolder.get(layout, R.id.marker_gps_accuracy);
ClickListener clickListener = new ClickListener(); ClickListener clickListener = new ClickListener();
setPositionButton = (OpenSansButton) view.findViewById(R.id.marker_set_position_button); setPositionButton = ViewHolder.get(layout, R.id.marker_set_position_button);
setPositionButton.setVisibility(View.GONE); setPositionButton.setVisibility(View.GONE);
setPositionButton.setOnClickListener(clickListener); setPositionButton.setOnClickListener(clickListener);
resetPositionButton = (OpenSansButton) view.findViewById(R.id.marker_reset_position_button); resetPositionButton = ViewHolder.get(layout, R.id.marker_reset_position_button);
resetPositionButton.setOnClickListener(clickListener); resetPositionButton.setOnClickListener(clickListener);
resetPositionButton.setVisibility(View.GONE); resetPositionButton.setVisibility(View.GONE);
signalQualityIndicatorView = (SignalQualityIndicatorView) view.findViewById(R.id.signal_quality_indicator); signalQualityIndicatorView = ViewHolder.get(layout, R.id.signal_quality_indicator);
signalQualityIndicatorView.setSignalQuality(GPSQuality.noSignal.toInt()); signalQualityIndicatorView.setSignalQuality(GPSQuality.noSignal.toInt());
return view;
mReceiver = new IntentReceiver();
mBroadcastManager = LocalBroadcastManager.getInstance(inflater.getContext());
return layout;
} }
@Override @Override
@@ -104,10 +109,10 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
} }
private void initMarkerReceiver() { private void initMarkerReceiver() {
mReceiver = new IntentReceiver();
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addAction(getString(R.string.database_changed)); filter.addAction(getString(R.string.database_changed));
LocalBroadcastManager.getInstance(positioningActivity.getApplicationContext()).registerReceiver(mReceiver, filter); filter.addAction(getString(R.string.ping_reached_server));
mBroadcastManager.registerReceiver(mReceiver, filter);
} }
@Override @Override
@@ -115,7 +120,7 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
super.onPause(); super.onPause();
// Unsubscribe location updates for power saving // Unsubscribe location updates for power saving
locationManager.removeUpdates(this); locationManager.removeUpdates(this);
LocalBroadcastManager.getInstance(positioningActivity.getApplicationContext()).unregisterReceiver(mReceiver); mBroadcastManager.unregisterReceiver(mReceiver);
} }
public void setUpTextUI(Location location) { public void setUpTextUI(Location location) {