Redesign liveness detection

alexfaceplugin · alexfaceplugin · commit 69c8580a22d8 · 2024-02-29T08:47:06.000-08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,11 +4,11 @@ plugins {
 }
 
 android {
-    namespace 'com.faceplugin.facerecognition'
+    namespace 'com.faceplugin.faceliveness'
     compileSdk 33
 
     defaultConfig {
-        applicationId "com.faceplugin.facerecognition"
+        applicationId "com.faceplugin.faceliveness"
         minSdk 24
         targetSdk 33
         versionCode 2
diff --git a/app/src/androidTest/java/com/faceplugin/faceliveness/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/faceplugin/faceliveness/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition
+package com.faceplugin.faceliveness
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
             android:name=".AttributeActivity"
             android:exported="false" />
         <activity
-            android:name=".MainActivity"
+            android:name=".SplashActivity"
             android:exported="false"
             android:screenOrientation="portrait"/>
         <activity
@@ -48,7 +48,7 @@
             android:exported="false"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".SplashActivity"
+            android:name=".MainActivity"
             android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter>
diff --git a/app/src/main/java/com/faceplugin/faceliveness/AboutActivity.kt b/app/src/main/java/com/faceplugin/faceliveness/AboutActivity.kt
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition
+package com.faceplugin.faceliveness
 
 import android.content.Intent
 import android.content.pm.ResolveInfo
diff --git a/app/src/main/java/com/faceplugin/faceliveness/AttributeActivity.kt b/app/src/main/java/com/faceplugin/faceliveness/AttributeActivity.kt
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition
+package com.faceplugin.faceliveness
 
 import android.graphics.Bitmap
 import android.os.Bundle
diff --git a/app/src/main/java/com/faceplugin/faceliveness/CameraActivity.java b/app/src/main/java/com/faceplugin/faceliveness/CameraActivity.java
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition;
+package com.faceplugin.faceliveness;
 
 
 import static androidx.camera.core.ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST;
diff --git a/app/src/main/java/com/faceplugin/faceliveness/CameraActivityKt.kt b/app/src/main/java/com/faceplugin/faceliveness/CameraActivityKt.kt
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition
+package com.faceplugin.faceliveness
 
 import android.Manifest
 import android.content.Context
diff --git a/app/src/main/java/com/faceplugin/faceliveness/CaptureActivity.java b/app/src/main/java/com/faceplugin/faceliveness/CaptureActivity.java
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition;
+package com.faceplugin.faceliveness;
 
 
 import static androidx.camera.core.ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST;
diff --git a/app/src/main/java/com/faceplugin/faceliveness/CaptureView.java b/app/src/main/java/com/faceplugin/faceliveness/CaptureView.java
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition;
+package com.faceplugin.faceliveness;
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;
diff --git a/app/src/main/java/com/faceplugin/faceliveness/DBManager.java b/app/src/main/java/com/faceplugin/faceliveness/DBManager.java
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition;
+package com.faceplugin.faceliveness;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/app/src/main/java/com/faceplugin/faceliveness/DatabaseActivity.java b/app/src/main/java/com/faceplugin/faceliveness/DatabaseActivity.java
@@ -0,0 +1,14 @@
+package com.faceplugin.faceliveness;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class DatabaseActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_splash);
+    }
+}
diff --git a/app/src/main/java/com/faceplugin/faceliveness/FACE_CAPTURE_STATE.java b/app/src/main/java/com/faceplugin/faceliveness/FACE_CAPTURE_STATE.java
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition;
+package com.faceplugin.faceliveness;
 
 public enum FACE_CAPTURE_STATE {
     NO_FACE, MULTIPLE_FACES, FIT_IN_CIRCLE, MOVE_CLOSER, NO_FRONT, FACE_OCCLUDED, EYE_CLOSED, MOUTH_OPENED, SPOOFED_FACE, CAPTURE_OK
diff --git a/app/src/main/java/com/faceplugin/faceliveness/FaceView.java b/app/src/main/java/com/faceplugin/faceliveness/FaceView.java
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition;
+package com.faceplugin.faceliveness;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/app/src/main/java/com/faceplugin/faceliveness/MainActivity.kt b/app/src/main/java/com/faceplugin/faceliveness/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition
+package com.faceplugin.faceliveness
 
 import android.content.Intent
 import android.graphics.Bitmap
@@ -27,15 +27,14 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        textWarning = findViewById<TextView>(R.id.textWarning)
-
+//        textWarning = findViewById<TextView>(R.id.textWarning)
 
         var ret = FaceSDK.setActivation(
-            "Nd7j+5R17t1DEkFbd8eXiVMSCdYkHNFMaLDYEMPtJehvdILceeRQDlzpCeOBw0BnyWGCK09XfQDX\n" +
-                    "l3jIeFIi001ynzyleFk5IwA7ZCqnYWBXOCaMfPpd/RUKMKewAdj5q5nbNRzTVIT2v2cir9g6yiNb\n" +
-                    "dav0nX3pLt0q+wB5gyyBZiBcL9Qg2vGeM7F/pN5j0m0v04BVle50GOpn7tIc4Bab+WEC3e9tYAQC\n" +
-                    "adKDtlWrV+wwsmvWtxbtafkohUEW/dGcjURPpQ1TVAj20wfpDdz6HEiXkJQ/jCbaQmg7haB9Pj9+\n" +
-                    "yl9CDAj/THRzoz8C193VhFQG6No8iUFc7w6oCg=="
+            "f0Y15I2DXE4BP9g3pkGRzcM7HQatMXrQ3B85fFNSb80QJ7txgdrdWpX8EbRjafdCoPBmv3TqeHRc\n" +
+                    "lTIrQBGF7sQUpe2XdEcrkjZgvQBhD4zFlAqMrBvaRaSiGE+LLGa/5XjrOlFpk+1UAlZcPiq+YrBG\n" +
+                    "eS5zDY7FkhPze1q9nsg19yJ7yDFFkCc04ChKcXyNAk8UipYc4CWWx8xnVticyDQI74bdm273kQJw\n" +
+                    "IhL/lwCspEDEVScFycCSIPPTDf3JX3jmZIjcKk8cQjWcPT00/Bly/eYM3KyDk19QXgQ9w86yCL3S\n" +
+                    "kpS91aW3SY7PqVZR2fK56bqxP4dsagSIUJHO6Q=="
         )
 
         if (ret == FaceSDK.SDK_SUCCESS) {
@@ -61,30 +60,30 @@ class MainActivity : AppCompatActivity() {
         dbManager.loadPerson()
 
         personAdapter = PersonAdapter(this, DBManager.personList)
-        val listView: ListView = findViewById<View>(R.id.listPerson) as ListView
-        listView.setAdapter(personAdapter)
-
-        findViewById<Button>(R.id.buttonEnroll).setOnClickListener {
-            val intent = Intent()
-            intent.setType("image/*")
-            intent.setAction(Intent.ACTION_PICK)
-            startActivityForResult(Intent.createChooser(intent, getString(R.string.select_picture)), SELECT_PHOTO_REQUEST_CODE)
-        }
-
+//        val listView: ListView = findViewById<View>(R.id.listPerson) as ListView
+//        listView.setAdapter(personAdapter)
+//
+//        findViewById<Button>(R.id.buttonEnroll).setOnClickListener {
+//            val intent = Intent()
+//            intent.setType("image/*")
+//            intent.setAction(Intent.ACTION_PICK)
+//            startActivityForResult(Intent.createChooser(intent, getString(R.string.select_picture)), SELECT_PHOTO_REQUEST_CODE)
+//        }
+//
         findViewById<Button>(R.id.buttonIdentify).setOnClickListener {
             startActivity(Intent(this, CameraActivity::class.java))
         }
 
-        findViewById<Button>(R.id.buttonCapture).setOnClickListener {
-            startActivity(Intent(this, CaptureActivity::class.java))
-        }
-
-        findViewById<Button>(R.id.buttonAttribute).setOnClickListener {
-            val intent = Intent()
-            intent.setType("image/*")
-            intent.setAction(Intent.ACTION_PICK)
-            startActivityForResult(Intent.createChooser(intent, getString(R.string.select_picture)), SELECT_ATTRIBUTE_REQUEST_CODE)
-        }
+//        findViewById<Button>(R.id.buttonCapture).setOnClickListener {
+//            startActivity(Intent(this, CaptureActivity::class.java))
+//        }
+//
+//        findViewById<Button>(R.id.buttonAttribute).setOnClickListener {
+//            val intent = Intent()
+//            intent.setType("image/*")
+//            intent.setAction(Intent.ACTION_PICK)
+//            startActivityForResult(Intent.createChooser(intent, getString(R.string.select_picture)), SELECT_ATTRIBUTE_REQUEST_CODE)
+//        }
 
         findViewById<Button>(R.id.buttonSettings).setOnClickListener {
             startActivity(Intent(this, SettingsActivity::class.java))
diff --git a/app/src/main/java/com/faceplugin/faceliveness/MyGlobal.java b/app/src/main/java/com/faceplugin/faceliveness/MyGlobal.java
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition;
+package com.faceplugin.faceliveness;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/com/faceplugin/faceliveness/Person.java b/app/src/main/java/com/faceplugin/faceliveness/Person.java
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition;
+package com.faceplugin.faceliveness;
 
 import android.graphics.Bitmap;
 
diff --git a/app/src/main/java/com/faceplugin/faceliveness/PersonAdapter.java b/app/src/main/java/com/faceplugin/faceliveness/PersonAdapter.java
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition;
+package com.faceplugin.faceliveness;
 
 import android.content.Context;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/faceplugin/faceliveness/ResultActivity.kt b/app/src/main/java/com/faceplugin/faceliveness/ResultActivity.kt
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition
+package com.faceplugin.faceliveness
 
 import android.graphics.Bitmap
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/com/faceplugin/faceliveness/SettingsActivity.kt b/app/src/main/java/com/faceplugin/faceliveness/SettingsActivity.kt
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition
+package com.faceplugin.faceliveness
 
 import android.content.Context
 import android.os.Bundle
@@ -170,20 +170,20 @@ class SettingsActivity : AppCompatActivity() {
                 }
             }
 
-            rollThresholdPref?.setOnPreferenceChangeListener{ preference, newValue ->
-                val stringPref = newValue as String
-                try {
-                    if(stringPref.toFloat() < 0.0f || stringPref.toFloat() > 30.0f) {
-                        Toast.makeText(context, getString(R.string.invalid_value), Toast.LENGTH_SHORT).show()
-                        false
-                    } else {
-                        true
-                    }
-                } catch (e:Exception) {
-                    Toast.makeText(context, getString(R.string.invalid_value), Toast.LENGTH_SHORT).show()
-                    false
-                }
-            }
+//            rollThresholdPref?.setOnPreferenceChangeListener{ preference, newValue ->
+//                val stringPref = newValue as String
+//                try {
+//                    if(stringPref.toFloat() < 0.0f || stringPref.toFloat() > 30.0f) {
+//                        Toast.makeText(context, getString(R.string.invalid_value), Toast.LENGTH_SHORT).show()
+//                        false
+//                    } else {
+//                        true
+//                    }
+//                } catch (e:Exception) {
+//                    Toast.makeText(context, getString(R.string.invalid_value), Toast.LENGTH_SHORT).show()
+//                    false
+//                }
+//            }
 
             pitchThresholdPref?.setOnPreferenceChangeListener{ preference, newValue ->
                 val stringPref = newValue as String
diff --git a/app/src/main/java/com/faceplugin/faceliveness/SplashActivity.java b/app/src/main/java/com/faceplugin/faceliveness/SplashActivity.java
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition;
+package com.faceplugin.faceliveness;
 
 import androidx.appcompat.app.AppCompatActivity;
 
diff --git a/app/src/main/java/com/faceplugin/faceliveness/Utils.java b/app/src/main/java/com/faceplugin/faceliveness/Utils.java
@@ -1,4 +1,4 @@
-package com.faceplugin.facerecognition;
+package com.faceplugin.faceliveness;
 
 import android.content.Context;
 import android.database.Cursor;
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -25,8 +25,7 @@
         android:gravity="center_vertical | left"
         android:text="FacePlugin Ltd specializes in cutting-edge solutions including face liveness detection, ID card recognition, face recognition, biometric authentication, and e-KYC (Electronic Know Your Customer) solutions.\n\n
 Our solutions cater to a diverse range of industries, including finance, healthcare, retail, transportation, government, and more.\n\n
-We are always available to support you here.\n\n\n
-Please contact us:"
+We are always available to support you here.\n\n\n"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         android:layout_marginTop="16dp"
@@ -73,7 +72,7 @@ Please contact us:"
         android:layout_width="300dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
-        android:text="Skype: live:.cid.6f515492327084aa"
+        android:text="Skype: live:.cid.bd9468a0cefb151d"
         app:layout_constraintStart_toEndOf="@id/imageSkype"
         app:layout_constraintTop_toTopOf="@id/imageSkype"
         app:layout_constraintBottom_toBottomOf="@id/imageSkype"
diff --git a/app/src/main/res/layout/activity_camera.xml b/app/src/main/res/layout/activity_camera.xml
@@ -15,14 +15,14 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.faceplugin.facerecognition.FaceView
+    <com.faceplugin.faceliveness.FaceView
         android:id="@+id/faceView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
-    </com.faceplugin.facerecognition.FaceView>
+    </com.faceplugin.faceliveness.FaceView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_camera_kt.xml b/app/src/main/res/layout/activity_camera_kt.xml
@@ -12,14 +12,14 @@
         android:layout_height="match_parent">
 
     </io.fotoapparat.view.CameraView>
-    <com.faceplugin.facerecognition.FaceView
+    <com.faceplugin.faceliveness.FaceView
         android:id="@+id/faceView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
-    </com.faceplugin.facerecognition.FaceView>
+    </com.faceplugin.faceliveness.FaceView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_capture.xml b/app/src/main/res/layout/activity_capture.xml
@@ -16,15 +16,15 @@
         app:layout_constraintTop_toTopOf="parent" />
 
 
-    <com.faceplugin.facerecognition.CaptureView
+    <com.faceplugin.faceliveness.CaptureView
         android:id="@+id/captureView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
-    </com.faceplugin.facerecognition.CaptureView>
+    </com.faceplugin.faceliveness.CaptureView>
 
     <TextView
         android:id="@+id/textTitle"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
diff --git a/app/src/test/java/com/faceplugin/faceliveness/ExampleUnitTest.kt b/app/src/test/java/com/faceplugin/faceliveness/ExampleUnitTest.kt
diff --git a/settings.gradle b/settings.gradle

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.faceplugin.facerecognition`
	`1`	`+package com.faceplugin.faceliveness`
`2`	`2`
`3`	`3`	`import androidx.test.platform.app.InstrumentationRegistry`
`4`	`4`	`import androidx.test.ext.junit.runners.AndroidJUnit4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.faceplugin.facerecognition;`
	`1`	`+package com.faceplugin.faceliveness;`
`2`	`2`
`3`	`3`
`4`	`4`	`import static androidx.camera.core.ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST;`