Merge branch 'PR-master-auto-online' of s416084/find-my-tutor-android into develop
This commit is contained in:
commit
80cd393cc9
@ -29,7 +29,7 @@
|
||||
</value>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
|
@ -10,8 +10,8 @@ android {
|
||||
applicationId "com.uam.wmi.findmytutor"
|
||||
minSdkVersion 22
|
||||
targetSdkVersion 27
|
||||
versionCode 14
|
||||
versionName "0.9.1-alpha"
|
||||
versionCode 1
|
||||
versionName "0.9.2-alpha"
|
||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables.useSupportLibrary = true
|
||||
}
|
||||
|
@ -16,8 +16,8 @@ import io.swagger.annotations.ApiModelProperty;
|
||||
*/
|
||||
|
||||
public class Coordinate extends BaseResponse {
|
||||
private Range<Double> latitudeRange = Const.latitudeRange;
|
||||
private Range<Double> longtitudeRange = Const.longitudeRange;
|
||||
private Range<Double> latitudeRange = Const.buildingLatitudeRange;
|
||||
private Range<Double> longtitudeRange = Const.buildingLongitudeRange;
|
||||
private List<String> allowedApproximatedLocations = Const.validApproximatedLocations;
|
||||
|
||||
@SerializedName("coordinateId")
|
||||
|
@ -26,7 +26,7 @@ public class ApiClient {
|
||||
private static Retrofit retrofit = null;
|
||||
private static int REQUEST_TIMEOUT = 60;
|
||||
private static OkHttpClient okHttpClient;
|
||||
private static final String BASE_URL = "https://s416084.projektstudencki.pl/develop/";
|
||||
private static final String BASE_URL = "https://s416084.projektstudencki.pl/master/";
|
||||
|
||||
public static Retrofit getClient(Context context) {
|
||||
|
||||
|
@ -25,7 +25,6 @@ import android.util.Log;
|
||||
import com.annimon.stream.Stream;
|
||||
import com.google.android.gms.location.FusedLocationProviderClient;
|
||||
import com.google.android.gms.location.LocationServices;
|
||||
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
|
||||
import com.mapbox.geojson.Point;
|
||||
import com.mapbox.mapboxsdk.geometry.LatLng;
|
||||
import com.uam.wmi.findmytutor.model.Coordinate;
|
||||
@ -33,23 +32,21 @@ import com.uam.wmi.findmytutor.network.ApiClient;
|
||||
import com.uam.wmi.findmytutor.utils.ApproximatedLocalization;
|
||||
import com.uam.wmi.findmytutor.utils.MapUtils;
|
||||
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
||||
import com.uam.wmi.findmytutor.utils.RestApiHelper;
|
||||
import com.uam.wmi.findmytutor.utils.SharingLevel;
|
||||
|
||||
import org.apache.commons.collections4.queue.CircularFifoQueue;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.TimerTask;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||
import io.reactivex.disposables.CompositeDisposable;
|
||||
import io.reactivex.observers.DisposableSingleObserver;
|
||||
import io.reactivex.schedulers.Schedulers;
|
||||
import okhttp3.ResponseBody;
|
||||
|
||||
import static com.uam.wmi.findmytutor.utils.Const.defaultBackgroundLocationInterval;
|
||||
import static com.uam.wmi.findmytutor.utils.Const.offlineBackgroundLocationInterval;
|
||||
import static com.uam.wmi.findmytutor.utils.Const.onlineBackgroundLocationInterval;
|
||||
import static com.uam.wmi.findmytutor.utils.Const.presenceApproximatedName;
|
||||
import static com.uam.wmi.findmytutor.utils.Const.presenceLatitude;
|
||||
import static com.uam.wmi.findmytutor.utils.Const.presenceLongitude;
|
||||
@ -58,12 +55,12 @@ import static com.uam.wmi.findmytutor.utils.PrefUtils.storeBackgroundLocationSta
|
||||
public class BackgroundLocalizationService extends Service {
|
||||
|
||||
private static final String TAG = "MyLocationService";
|
||||
private static final int LOCATION_INTERVAL = 1000;
|
||||
private static final float LOCATION_DISTANCE = 5f;
|
||||
private static long notify_interval = defaultBackgroundLocationInterval;
|
||||
private static long notify_interval_inside_building = defaultBackgroundLocationInterval;
|
||||
private static long notify_interval_outside_building = 360000;
|
||||
private static int coordinatesHistoryLength = 10;
|
||||
private static final float LOCATION_DISTANCE = 1f;
|
||||
private static long notify_interval = onlineBackgroundLocationInterval;
|
||||
private static long notify_interval_inside_building = onlineBackgroundLocationInterval;
|
||||
private static long notify_interval_outside_building = offlineBackgroundLocationInterval;
|
||||
private static int coordinatesHistoryLength = 5;
|
||||
private static final Long LOCATION_INTERVAL = notify_interval;
|
||||
private Location mLastLocation;
|
||||
private Boolean stopService = false;
|
||||
private ArrayList<String> providers = new ArrayList<String>();
|
||||
@ -149,7 +146,7 @@ public class BackgroundLocalizationService extends Service {
|
||||
if (!stopService) {
|
||||
mStatusChecker = () -> {
|
||||
try {
|
||||
fn_getlocation();
|
||||
getLocalizationFromListeners();
|
||||
changeBackgroundMode();
|
||||
} finally {
|
||||
mHandler.postDelayed(mStatusChecker, notify_interval);
|
||||
@ -178,9 +175,8 @@ public class BackgroundLocalizationService extends Service {
|
||||
|
||||
@RequiresApi(api = Build.VERSION_CODES.O)
|
||||
private void startMyOwnForeground() {
|
||||
|
||||
String NOTIFICATION_CHANNEL_ID = "com.example.fmt";
|
||||
String channelName = "My Background Service";
|
||||
String channelName = "FMT Background location service";
|
||||
NotificationChannel chan = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, NotificationManager.IMPORTANCE_NONE);
|
||||
chan.setLightColor(Color.BLUE);
|
||||
chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
|
||||
@ -197,7 +193,7 @@ public class BackgroundLocalizationService extends Service {
|
||||
startForeground(2, notification);
|
||||
}
|
||||
|
||||
private void fn_getlocation() {
|
||||
private void getLocalizationFromListeners() {
|
||||
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
|
||||
// TODO: Consider calling
|
||||
// ActivityCompat#requestPermissions
|
||||
@ -218,7 +214,7 @@ public class BackgroundLocalizationService extends Service {
|
||||
if (location != null) {
|
||||
mLastLocation = location;
|
||||
coordinatesHistory.add(location);
|
||||
fn_update(location);
|
||||
sendCoordinateToBackend(location);
|
||||
}
|
||||
|
||||
triggerAnotherLocationListener.set(true);
|
||||
@ -237,12 +233,11 @@ public class BackgroundLocalizationService extends Service {
|
||||
}
|
||||
|
||||
coordinatesHistory.add(bestLocation);
|
||||
Log.e("Best localization:", String.valueOf(bestLocation));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void fn_update(Location location) {
|
||||
private void sendCoordinateToBackend(Location location) {
|
||||
new Task(location).execute();
|
||||
}
|
||||
|
||||
@ -278,7 +273,7 @@ public class BackgroundLocalizationService extends Service {
|
||||
|
||||
private class LocationListener implements android.location.LocationListener {
|
||||
|
||||
public LocationListener(String provider) {
|
||||
LocationListener(String provider) {
|
||||
Log.e(TAG, "LocationListener " + provider);
|
||||
mLastLocation = new Location(provider);
|
||||
}
|
||||
@ -328,6 +323,7 @@ public class BackgroundLocalizationService extends Service {
|
||||
protected Object doInBackground(Object[] objects) {
|
||||
|
||||
String locationLevel = PrefUtils.getLocationLevel(getApplicationContext());
|
||||
String status = (PrefUtils.isStatusEnabled(getApplicationContext())) ? PrefUtils.getUserStatus(getApplicationContext()) : "";
|
||||
|
||||
if (locationLevel.equals(SharingLevel.PRESENCE.toString())) {
|
||||
latitude = presenceLatitude;
|
||||
@ -350,7 +346,7 @@ public class BackgroundLocalizationService extends Service {
|
||||
longitude,
|
||||
altitude,
|
||||
approximatedBuildingPart,
|
||||
(PrefUtils.isStatusEnabled(getApplicationContext())) ? PrefUtils.getUserStatus(getApplicationContext()) : "",
|
||||
status,
|
||||
PrefUtils.getUserId(getApplicationContext()),
|
||||
locationLevel
|
||||
);
|
||||
@ -361,16 +357,14 @@ public class BackgroundLocalizationService extends Service {
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribeWith(new DisposableSingleObserver<Coordinate>() {
|
||||
@SuppressLint("LongLogTag")
|
||||
@Override
|
||||
public void onSuccess(Coordinate coord) {
|
||||
Log.e("CoordinateService onSuccess", String.valueOf(coord));
|
||||
public void onSuccess(Coordinate coordinate) {
|
||||
Log.e(TAG, String.valueOf(coordinate));
|
||||
}
|
||||
|
||||
@SuppressLint("LongLogTag")
|
||||
@Override
|
||||
public void onError(Throwable e) {
|
||||
Log.e("CoordinateService onError", e.getMessage());
|
||||
Log.e(TAG, e.getMessage());
|
||||
}
|
||||
}));
|
||||
} catch (IllegalArgumentException e) {
|
||||
|
@ -6,13 +6,17 @@ import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
public class Const {
|
||||
public final static Integer defaultBackgroundLocationInterval = 15000;
|
||||
public final static Integer onlineBackgroundLocationInterval = 15000;
|
||||
public final static Integer offlineBackgroundLocationInterval = 36000;
|
||||
public final static Integer defaultMapZoom = 17;
|
||||
public final static Integer searchMapZoom = 13;
|
||||
public final static Double presenceLatitude = 52.466365;
|
||||
public final static Double presenceLongitude = 16.926792;
|
||||
public final static String presenceApproximatedName = "Unknown";
|
||||
public final static Range<Double> latitudeRange = Range.create(52.466092, 52.467529);
|
||||
public final static Range<Double> longitudeRange = Range.create(16.926159, 16.927759);
|
||||
public final static Range<Double> buildingLatitudeRange = Range.create(52.466092, 52.467529);
|
||||
public final static Range<Double> buildingLongitudeRange = Range.create(16.926159, 16.927759);
|
||||
public final static Range<Double> outsideLatitudeRange = Range.create(52.463512, 52.468837);
|
||||
public final static Range<Double> outsideLongitudeRange = Range.create(16.922372, 16.936004);
|
||||
public final static List<String> validApproximatedLocations = Arrays.asList("Skrzydło B", "Skrzydło A", "Aule", "Łącznik", "Biblioteka", "Hol", "Unknown");
|
||||
}
|
||||
|
||||
|
@ -14,8 +14,8 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
import static com.uam.wmi.findmytutor.utils.Const.latitudeRange;
|
||||
import static com.uam.wmi.findmytutor.utils.Const.longitudeRange;
|
||||
import static com.uam.wmi.findmytutor.utils.Const.outsideLongitudeRange;
|
||||
import static com.uam.wmi.findmytutor.utils.Const.outsideLatitudeRange;
|
||||
|
||||
public class MapUtils {
|
||||
|
||||
@ -59,7 +59,6 @@ public class MapUtils {
|
||||
|
||||
// read file to JSON
|
||||
public static String loadJsonFromAsset(Context context, String filename) {
|
||||
// Using this method to load in GeoJSON files from the assets folder.
|
||||
try {
|
||||
InputStream is = context.getAssets().open(filename);
|
||||
int size = is.available();
|
||||
@ -75,7 +74,7 @@ public class MapUtils {
|
||||
}
|
||||
|
||||
public static Boolean checkIfCoordinateIsValid(Location coordinate){
|
||||
return latitudeRange.contains(coordinate.getLatitude()) && longitudeRange.contains(coordinate.getLongitude());
|
||||
return outsideLatitudeRange.contains(coordinate.getLatitude()) && outsideLongitudeRange.contains(coordinate.getLongitude());
|
||||
}
|
||||
|
||||
// Function for marker animation
|
||||
|
Loading…
Reference in New Issue
Block a user