Improved face detection

Author: julianschmuckli

.gitignore

@@ -8,3 +8,4 @@
 /build
 /captures
 .externalNativeBuild
+.idea/caches/build_file_checksums.ser

app/build.gradle

@@ -24,6 +24,7 @@ dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
     implementation 'com.android.support:support-v4:27.1.1'
     implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
+    implementation 'gun0912.ted:tedpermission:2.2.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

app/src/main/AndroidManifest.xml

@@ -6,6 +6,10 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.REORDER_TASKS" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
 
     <application
         android:allowBackup="false"

app/src/main/java/com/coderbunker/kioskapp/KioskActivity.java

@@ -1,5 +1,6 @@
 package com.coderbunker.kioskapp;
 
+import android.Manifest;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
@@ -29,6 +30,8 @@
 import com.coderbunker.kioskapp.facerecognition.FaceDetectionListener;
 import com.coderbunker.kioskapp.lib.HOTP;
 import com.coderbunker.kioskapp.lib.TOTP;
+import com.gun0912.tedpermission.PermissionListener;
+import com.gun0912.tedpermission.TedPermission;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -141,10 +144,11 @@ public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError e
                 handler.proceed(); //Ignore SSL certificate error
             }
         });
+
         webView.getSettings().setJavaScriptEnabled(true);
         webView.getSettings().setAppCacheEnabled(true);
-        webView.getSettings().setAppCacheMaxSize(5000 * 1000 * 1000);
-        webView.getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
+        webView.getSettings().setAppCacheMaxSize(200 * 1024 * 1024);
+        webView.getSettings().setCacheMode(WebSettings.LOAD_DEFAULT);
         webView.getSettings().setMediaPlaybackRequiresUserGesture(false);
         webView.loadUrl(URL);
 
@@ -207,22 +211,42 @@ public void run() {
 
 
         if (checkCameraHardware(this)) {
-            mCamera = getCameraInstance();
-            if (mCamera != null) {
 
-                FaceDetectionListener faceDetectionListener = new FaceDetectionListener();
-                faceDetectionListener.addObserver(this);
-                mCamera.setFaceDetectionListener(faceDetectionListener);
+            PermissionListener permissionlistener = new PermissionListener() {
+                @Override
+                public void onPermissionGranted() {
+                    try{
+                        mCamera.unlock();
+                    }catch (Exception e){
+
+                    }
+                    mCamera = getCameraInstance();
+                    if (mCamera != null) {
 
-                mCameraPreview = new CameraPreview(this, mCamera);
+                        FaceDetectionListener faceDetectionListener = new FaceDetectionListener();
+                        faceDetectionListener.addObserver(KioskActivity.this);
+                        mCamera.setFaceDetectionListener(faceDetectionListener);
 
-                FrameLayout preview = findViewById(R.id.camera_preview);
-                preview.addView(mCameraPreview);
+                        mCameraPreview = new CameraPreview(context, mCamera);
 
-                mCamera.startPreview();
-            } else {
+                        FrameLayout preview = findViewById(R.id.camera_preview);
+                        preview.addView(mCameraPreview);
 
-            }
+                        mCamera.startPreview();
+                        Toast.makeText(context, "Face recognition started", Toast.LENGTH_LONG).show();
+                    } else {
+                        Toast.makeText(context, "Due a camera issue the face recognition can not be started.", Toast.LENGTH_LONG).show();
+                    }
+                }
+
+                @Override
+                public void onPermissionDenied(ArrayList<String> deniedPermissions) {
+                    Toast.makeText(context, "Face recognition not active due denied permissions.", Toast.LENGTH_SHORT).show();
+                }
+
+            };
+
+            TedPermission.with(context).setPermissionListener(permissionlistener).setPermissions(Manifest.permission.CAMERA).check();
         }
 
 
@@ -465,31 +489,12 @@ protected void onPause() {
         super.onPause();
     }
 
-    private long last_detected = 0;
-    private long face_current_counter = 0;
-    private long face_counter = 0;
-
     @Override
     public void update(Observable o, Object arg) {
         if (o instanceof FaceDetectionListener) {
-            Camera.Face face = ((Camera.Face) arg);
-
-            face_detection_score.setText("Score:" + face.score);
-
-            if (face.score >= 85) {
-                face_current_counter++;
-            } else {
-                face_current_counter = 0;
-            }
-
-            if (face_current_counter >= 5 && last_detected < System.currentTimeMillis() + 45000) {
-                face_counter++;
-                last_detected = System.currentTimeMillis();
-                face_current_counter = -5000;
-            }
-
-            face_counter_view.setText("Viewers: " + face_counter);
-
+            Camera.Face[] faces = ((Camera.Face[]) arg);
+            //face_detection_score.setText("Faces:" + faces.length);
+            face_counter_view.setText("Current faces: " + faces.length);
         }
     }
 }

app/src/main/java/com/coderbunker/kioskapp/facerecognition/CameraPreview.java

@@ -80,7 +80,11 @@ public void startFaceDetection() {
         // start face detection only *after* preview has started
         if (params.getMaxNumDetectedFaces() > 0) {
             // camera supports face detection, so can start it:
-            mCamera.startFaceDetection();
+            try {
+                mCamera.startFaceDetection();
+            } catch (RuntimeException ex) {
+                System.out.println("Face recognition not started");
+            }
         }
     }
 }

app/src/main/java/com/coderbunker/kioskapp/facerecognition/FaceDetectionListener.java

@@ -8,17 +8,8 @@ public class FaceDetectionListener extends Observable implements Camera.FaceDete
 
     @Override
     public void onFaceDetection(Camera.Face[] faces, Camera camera) {
-        if (faces.length > 0) {
-            for (Camera.Face face : faces) {
-                try {
-                    /*System.out.println("--------------------------");
-                    System.out.println(face.score);*/
-                    setChanged();
-                    notifyObservers(face);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
+        setChanged();
+        notifyObservers(faces);
     }
+
 }

app/src/main/res/layout/activity_kiosk.xml

@@ -41,7 +41,7 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:background="#000"
-        android:text="0"
+        android:text="Current faces: 0"
         android:textColor="#FFF"
         android:textSize="18sp"
         android:visibility="visible"