Merge pull request #305 from 'CorvexConnectedSafety-lib2.11' into v3.x

petermetz · Aug 23, 2017 · a1ecd80 · a1ecd80 · Ponsen · Aug 23, 2017
2 parents be63d3b + 1f4b83b
commit a1ecd80
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/libs/android/altbeacon.jar b/libs/android/altbeacon.jar
diff --git a/plugin.xml b/plugin.xml
@@ -104,6 +104,7 @@
                      android:isolatedProcess="false"
                      android:label="iBeacon"
                      android:name="org.altbeacon.beacon.service.BeaconService">
+                     <meta-data android:name="longScanForcingEnabled" android:value="true" />
             </service>
             <service android:enabled="true"
                      android:name="org.altbeacon.beacon.BeaconIntentProcessor">

diff --git a/src/android/LocationManager.java b/src/android/LocationManager.java
@@ -81,7 +81,7 @@ public class LocationManager extends CordovaPlugin implements BeaconConsumer {
     private static final int DEFAULT_FOREGROUND_BETWEEN_SCAN_PERIOD = 0;
     private static final String SAMPLE_EXPIRATION_MILLISECOND = "com.unarin.cordova.beacon.android.altbeacon.SampleExpirationMilliseconds";
     private static final int DEFAULT_SAMPLE_EXPIRATION_MILLISECOND = 20000;
-    private static final int DEFAULT_FOREGROUND_SCAN_PERIOD = 200;
+    private static final int DEFAULT_FOREGROUND_SCAN_PERIOD = 1100;
     private static int CDV_LOCATION_MANAGER_DOM_DELEGATE_TIMEOUT = 30;
     private static final int BUILD_VERSION_CODES_M = 23;
 
@@ -123,6 +123,12 @@ public void initialize(CordovaInterface cordova, CordovaWebView webView) {
         Log.i(TAG, "Determined config value FOREGROUND_BETWEEN_SCAN_PERIOD: " +
                 String.valueOf(foregroundBetweenScanPeriod));
 
+        final int foregroundScanPeriod = this.preferences.getInteger(
+                FOREGROUND_SCAN_PERIOD_NAME, DEFAULT_FOREGROUND_SCAN_PERIOD);
+
+        Log.i(TAG, "Determined config value FOREGROUND_SCAN_PERIOD: " +
+                String.valueOf(foregroundScanPeriod));
+
         iBeaconManager = BeaconManager.getInstanceForApplication(cordovaActivity);
         iBeaconManager.setForegroundBetweenScanPeriod(foregroundBetweenScanPeriod);
         iBeaconManager.setForegroundScanPeriod(foregroundScanPeriod);
@@ -133,7 +139,7 @@ public void initialize(CordovaInterface cordova, CordovaWebView webView) {
         Log.i(TAG, "Determined config value SAMPLE_EXPIRATION_MILLISECOND: " +
                 String.valueOf(sampleExpirationMilliseconds));
 
-        iBeaconManager.setRssiFilterImplClass(RunningAverageRssiFilter.class);        
+        iBeaconManager.setRssiFilterImplClass(RunningAverageRssiFilter.class);
         RunningAverageRssiFilter.setSampleExpirationMilliseconds(sampleExpirationMilliseconds);
         RangedBeacon.setSampleExpirationMilliseconds(sampleExpirationMilliseconds);