CycledLeScanner : a version scanning when screen turns on or off

build.gradle

@@ -66,11 +66,11 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
-    sourceSets {
+    /*sourceSets {
         androidTest {
             setRoot('src/test')
         }
-    }
+    }*/
 
     lintOptions {
         abortOnError false

src/main/java/org/altbeacon/beacon/BeaconManager.java

@@ -44,6 +44,7 @@
 import org.altbeacon.beacon.service.RegionMonitoringState;
 import org.altbeacon.beacon.service.RunningAverageRssiFilter;
 import org.altbeacon.beacon.service.StartRMData;
+import org.altbeacon.beacon.service.scanner.CycledLeScanner;
 import org.altbeacon.beacon.service.scanner.NonBeaconLeScanCallback;
 import org.altbeacon.beacon.simulator.BeaconSimulator;
 
@@ -117,6 +118,7 @@ public class BeaconManager {
     protected final Set<MonitorNotifier> monitorNotifiers = new CopyOnWriteArraySet<>();
     private final ArrayList<Region> rangedRegions = new ArrayList<Region>();
     private final List<BeaconParser> beaconParsers = new CopyOnWriteArrayList<>();
+    private CycledLeScanner cycledLeScanner;
     private NonBeaconLeScanCallback mNonBeaconLeScanCallback;
     private boolean mBackgroundMode = false;
     private boolean mBackgroundModeUninitialized = true;
@@ -253,6 +255,8 @@ protected BeaconManager(Context context) {
          verifyServiceDeclaration();
       }
       this.beaconParsers.add(new AltBeaconParser());
+       cycledLeScanner = new CycledLeScanner(BeaconManager.DEFAULT_FOREGROUND_SCAN_PERIOD,
+               BeaconManager.DEFAULT_FOREGROUND_BETWEEN_SCAN_PERIOD, false);
    }
 
    /**
@@ -997,4 +1001,20 @@ public static void setAndroidLScanningDisabled(boolean disabled) {
     public static void setsManifestCheckingDisabled(boolean disabled) {
         sManifestCheckingDisabled = disabled;
     }
+
+    /**
+     *
+     * @return the CycledLeScanner to use
+     */
+    public CycledLeScanner getCycledLeScanner(){
+        return cycledLeScanner;
+    }
+
+    /**
+     * Permits to update the way the library scans for beacon
+     * @param cycledLeScanner : the CycledLeScanner to use to scan for beacons
+     */
+    public void setCycledLeScanner(CycledLeScanner cycledLeScanner){
+        this.cycledLeScanner = cycledLeScanner;
+    }
 }

src/main/java/org/altbeacon/beacon/service/BeaconService.java

@@ -31,6 +31,7 @@
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.os.AsyncTask;
 import android.os.Binder;
@@ -51,6 +52,8 @@
 import org.altbeacon.beacon.service.scanner.CycledLeScanCallback;
 import org.altbeacon.beacon.service.scanner.CycledLeScanner;
 import org.altbeacon.beacon.service.scanner.NonBeaconLeScanCallback;
+import org.altbeacon.beacon.service.scanner.screenstate.ScreenStateBroadcastReceiver;
+import org.altbeacon.beacon.service.scanner.screenstate.ScreenStateListener;
 import org.altbeacon.beacon.startup.StartupBroadcastReceiver;
 import org.altbeacon.bluetooth.BluetoothCrashResolver;
 
@@ -91,6 +94,7 @@ public class BeaconService extends Service {
     private boolean mBackgroundFlag = false;
     private ExtraDataBeaconTracker mExtraDataBeaconTracker;
     private ExecutorService mExecutor;
+    private ScreenStateBroadcastReceiver screenStateBroadcastReceiver;
 
     /*
      * The scan period is how long we wait between restarting the BLE advertisement scans
@@ -197,12 +201,15 @@ public void onCreate() {
         // Create a private executor so we don't compete with threads used by AsyncTask
         // This uses fewer threads than the default executor so it won't hog CPU
         mExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() + 1);
-
-        mCycledScanner = CycledLeScanner.createScanner(this, BeaconManager.DEFAULT_FOREGROUND_SCAN_PERIOD,
-                BeaconManager.DEFAULT_FOREGROUND_BETWEEN_SCAN_PERIOD, mBackgroundFlag, mCycledLeScanCallback, bluetoothCrashResolver);
-
         beaconManager = BeaconManager.getInstanceForApplication(getApplicationContext());
-
+        mCycledScanner = beaconManager.getCycledLeScanner();
+        mCycledScanner.initScanner(this, mCycledLeScanCallback, bluetoothCrashResolver);
+        if(mCycledScanner instanceof ScreenStateListener){
+            IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_ON);
+            filter.addAction(Intent.ACTION_SCREEN_OFF);
+            screenStateBroadcastReceiver = new ScreenStateBroadcastReceiver();
+            registerReceiver(screenStateBroadcastReceiver, filter);
+        }
         //flatMap all beacon parsers
         boolean matchBeaconsByServiceUUID = true;
         if (beaconManager.getBeaconParsers() != null) {
@@ -275,6 +282,9 @@ public void onDestroy() {
         mCycledScanner.stop();
         mCycledScanner.destroy();
         monitoringStatus.stopStatusPreservation();
+        if(screenStateBroadcastReceiver != null){
+            unregisterReceiver(screenStateBroadcastReceiver);
+        }
     }
 
     @Override