finish import baidu faceSDK rk35XX & add test function in DebugActivity

app/build.gradle

@@ -31,6 +31,8 @@ android {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/NOTICE'
         exclude 'META-INF/NOTICE.txt'
+        // 排除重复的OpenNI类
+        exclude 'org/openni/**'
     }
 
     buildTypes {
@@ -81,10 +83,19 @@ dependencies {
     
     // 人脸识别库
     implementation project(':facelibrary')
+    implementation project(':financelibrary')
     // implementation project(':oxplugin_padface')
-    implementation files('libs/orbbec_module-debug.aar')
+    
+    // 添加对orbbec_module-debug.aar的依赖，通过flatDir方式
+    implementation(name: 'orbbec_module-debug', ext: 'aar')
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
+
+configurations {
+    all {
+        exclude group: 'org.openni'
+    }
+}

app/src/main/java/com/ouxuan/oxface/DebugActivity.java

@@ -15,6 +15,12 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+// 恢复原来的导入
+//import com.baidu.idl.face.main.finance.manager.FaceSDKManager;
+
+import com.baidu.idl.face.main.finance.listener.SdkInitListener;
+
+import com.baidu.idl.face.main.finance.manager.FaceSDKManager;
 import com.ouxuan.oxface.device.DeviceUtils;
 import com.ouxuan.oxface.network.utils.NetworkUtils;
 import com.ouxuan.oxface.utils.AutoStartManager;
@@ -156,6 +162,15 @@ public class DebugActivity extends Activity {
             }
         });
         
+        // 初始化人脸SDK按钮
+        Button btnInitFaceSDK = findViewById(R.id.btnInitFaceSDK);
+        btnInitFaceSDK.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                initFaceSDK();
+            }
+        });
+        
         // 关闭按钮
         Button btnClose = findViewById(R.id.btnClose);
         btnClose.setOnClickListener(new View.OnClickListener() {
@@ -341,6 +356,111 @@ public class DebugActivity extends Activity {
     }
     
     /**
+     * 初始化人脸SDK
+     */
+    private void initFaceSDK() {
+        logMessage("开始初始化人脸SDK...");
+        try {
+            FaceSDKManager faceSDKManager = FaceSDKManager.getInstance();
+            
+            // 打印SDK版本信息
+            logMessage("人脸SDK管理器实例获取成功");
+            logMessage("当前SDK初始化状态: " + FaceSDKManager.initStatus);
+            
+            faceSDKManager.init(this, "GEXH-QSMV-3MDX-Y9XS", new SdkInitListener() {
+                @Override
+                public void initStart() {
+                    logMessage("人脸SDK授权初始化开始...");
+                    logMessage("设备信息: " + android.os.Build.MODEL + " (" + android.os.Build.VERSION.SDK_INT + ")");
+                }
+
+                @Override
+                public void initLicenseSuccess() {
+                    logMessage("人脸SDK授权成功");
+                    // 获取并显示授权信息
+                    String licenseData = faceSDKManager.getLicenseData(DebugActivity.this);
+                    logMessage("人脸SDK授权有效期至: " + licenseData);
+                    logMessage("授权后SDK状态: " + FaceSDKManager.initStatus);
+                    showToast("人脸SDK授权成功");
+                    // 授权成功后继续初始化模型
+                    initFaceModels();
+                }
+
+                @Override
+                public void initLicenseFail(int errorCode, String msg) {
+                    logMessage("人脸SDK授权失败 - 错误码: " + errorCode + ", 错误信息: " + msg);
+                    logMessage("失败时SDK状态: " + FaceSDKManager.initStatus);
+                    showToast("人脸SDK授权失败");
+                }
+
+                @Override
+                public void initModelSuccess() {
+                    // 这个回调在init方法中不会触发，因为init方法不初始化模型
+                }
+
+                @Override
+                public void initModelFail(int errorCode, String msg) {
+                    // 这个回调在init方法中不会触发，因为init方法不初始化模型
+                }
+            });
+
+        } catch (Exception e) {
+            Log.e(TAG, "初始化人脸SDK失败", e);
+            logMessage("初始化人脸SDK失败: " + e.getMessage());
+            showToast("初始化人脸SDK失败");
+        }
+    }
+    
+    /**
+     * 初始化人脸模型
+     */
+    private void initFaceModels() {
+        logMessage("开始初始化人脸模型...");
+        logMessage("初始化前模型状态: " + FaceSDKManager.initModelSuccess);
+        try {
+            FaceSDKManager faceSDKManager = FaceSDKManager.getInstance();
+            
+            // 初始化模型
+            faceSDKManager.initModel(this, new SdkInitListener() {
+                @Override
+                public void initStart() {
+                    logMessage("人脸模型初始化开始...");
+                }
+
+                @Override
+                public void initLicenseSuccess() {
+                    // 授权已在initFaceSDK中处理
+                }
+
+                @Override
+                public void initLicenseFail(int errorCode, String msg) {
+                    // 授权已在initFaceSDK中处理
+                }
+
+                @Override
+                public void initModelSuccess() {
+                    logMessage("人脸SDK模型初始化成功");
+                    logMessage("模型初始化完成，当前状态: " + FaceSDKManager.initModelSuccess);
+                    showToast("人脸SDK模型初始化成功");
+                    logMessage("人脸SDK初始化完成，可以开始使用人脸识别功能");
+                    logMessage("SDK最终状态 - 授权: " + FaceSDKManager.initStatus + ", 模型: " + FaceSDKManager.initModelSuccess);
+                }
+
+                @Override
+                public void initModelFail(int errorCode, String msg) {
+                    logMessage("人脸SDK模型初始化失败 - 错误码: " + errorCode + ", 错误信息: " + msg);
+                    logMessage("模型初始化失败，当前状态: " + FaceSDKManager.initModelSuccess);
+                    showToast("人脸SDK模型初始化失败");
+                }
+            });
+        } catch (Exception e) {
+            Log.e(TAG, "初始化人脸模型失败", e);
+            logMessage("初始化人脸模型失败: " + e.getMessage());
+            showToast("初始化人脸模型失败");
+        }
+    }
+    
+    /**
      * 在日志输出区域添加消息
      * @param message 要添加的消息
      */
@@ -368,6 +488,11 @@ public class DebugActivity extends Activity {
      * @param message 要显示的消息
      */
     private void showToast(String message) {
-        Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                Toast.makeText(DebugActivity.this, message, Toast.LENGTH_SHORT).show();
+            }
+        });
     }
 }

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

@@ -166,14 +166,53 @@
                     android:textSize="12sp" />
 
                 <Button
+                    android:id="@+id/btnInitFaceSDK"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="初始化人脸SDK"
+                    android:layout_marginStart="4dp"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+
+            <!-- 第五行按钮 -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginBottom="8dp">
+
+                <Button
                     android:id="@+id/btnClose"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="关闭"
-                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="4dp"
                     android:textSize="12sp" />
 
+                <Button
+                    android:id="@+id/btnPlaceholder1"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="占位符1"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="4dp"
+                    android:textSize="12sp"
+                    android:visibility="invisible" />
+
+                <Button
+                    android:id="@+id/btnPlaceholder2"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="占位符2"
+                    android:layout_marginStart="4dp"
+                    android:textSize="12sp"
+                    android:visibility="invisible" />
+
             </LinearLayout>
 
         </LinearLayout>

financelibrary/build.gradle

@@ -37,6 +37,9 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation project(path: ':facelibrary')
     
+    // 添加对orbbec_module-debug.aar的依赖，通过flatDir方式
+    implementation(name: 'orbbec_module-debug', ext: 'aar')
+
 //    implementation 'me.jessyan:autosize:1.2.1'
     implementation 'com.github.JessYanCoding:AndroidAutoSize:v1.2.1'
 

financelibrary/src/main/java/com/baidu/idl/face/main/finance/manager/FaceSDKManager.java

@@ -1,6 +1,8 @@
 package com.baidu.idl.face.main.finance.manager;
 
 import android.content.Context;
+import android.content.SharedPreferences;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.baidu.idl.face.main.finance.callback.FaceDetectCallBack;
@@ -8,6 +10,8 @@ import com.baidu.idl.face.main.finance.listener.SdkInitListener;
 import com.baidu.idl.face.main.finance.model.GlobalSet;
 import com.baidu.idl.face.main.finance.model.LivenessModel;
 import com.baidu.idl.face.main.finance.model.SingleBaseConfig;
+import com.baidu.idl.face.main.finance.utils.PreferencesManager;
+import com.baidu.idl.face.main.finance.utils.ToastUtils;
 
 import com.baidu.idl.main.facesdk.FaceAuth;
 import com.baidu.idl.main.facesdk.FaceDarkEnhance;
@@ -16,6 +20,7 @@ import com.baidu.idl.main.facesdk.FaceFeature;
 import com.baidu.idl.main.facesdk.FaceInfo;
 import com.baidu.idl.main.facesdk.FaceLive;
 import com.baidu.idl.main.facesdk.callback.Callback;
+import com.baidu.idl.main.facesdk.license.BDFaceLicenseAuthInfo;
 import com.baidu.idl.main.facesdk.model.BDFaceDetectListConf;
 import com.baidu.idl.main.facesdk.model.BDFaceImageInstance;
 import com.baidu.idl.main.facesdk.model.BDFaceInstance;
@@ -23,7 +28,9 @@ import com.baidu.idl.main.facesdk.model.BDFaceOcclusion;
 import com.baidu.idl.main.facesdk.model.BDFaceSDKCommon;
 import com.baidu.idl.main.facesdk.model.BDFaceSDKConfig;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -66,6 +73,7 @@ public class FaceSDKManager {
         faceAuth.setCoreConfigure(BDFaceSDKCommon.BDFaceCoreRunMode.BDFACE_LITE_POWER_LOW, 2);
     }
 
+    
     public void setActiveLog(){
         if (faceAuth != null){
             Log.e("FaceSDKManager", "setActiveLog: "+ SingleBaseConfig.getBaseConfig().isLog());
@@ -86,6 +94,24 @@ public class FaceSDKManager {
         return HolderClass.instance;
     }
 
+    /**
+     * 获取授权信息
+     * @param context 上下文
+     * @return 授权信息字符串
+     */
+    public String getLicenseData(Context context) {
+        try {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+            BDFaceLicenseAuthInfo bdFaceLicenseAuthInfo = faceAuth.getAuthInfo(context);
+            Date dateLong = new Date(bdFaceLicenseAuthInfo.expireTime * 1000L);
+            String dateTime = simpleDateFormat.format(dateLong);
+            return dateTime;
+        } catch (Exception e) {
+            Log.e("FaceSDKManager", "获取授权信息失败: " + e.getMessage());
+            return "获取授权信息失败";
+        }
+    }
+
     public FaceDetect getFaceDetect() {
         return faceDetect;
     }
@@ -98,6 +124,51 @@ public class FaceSDKManager {
         return faceFeature;
     }
 
+
+    /**
+     * 初始化鉴权，如果鉴权通过，直接初始化模型
+     *  @param context
+     * @param number
+     * @param listener
+     */
+    public void init(final Context context, String number, final SdkInitListener listener) {
+
+//        PreferencesUtil.initPrefs(context.getApplicationContext());
+//        final String licenseOfflineKey = PreferencesUtil.getString("activate_offline_key", "");
+//        final String licenseOnlineKey = PreferencesUtil.getString("activate_online_key", "");
+//        final String licenseBatchlineKey = PreferencesUtil.getString("activate_batchline_key", "");
+
+        String licenseOnlineKey = number;
+
+        // todo 增加判空处理
+        if (listener != null) {
+            listener.initStart();
+        }
+
+        if (!TextUtils.isEmpty(licenseOnlineKey)) {
+            // 在线激活
+            faceAuth.initLicenseOnLine(context, licenseOnlineKey, new Callback() {
+                @Override
+                public void onResponse(int code, String response) {
+                    if (code == 0) {
+                        initStatus = SDK_INIT_SUCCESS;
+                        if (listener != null) {
+                            listener.initLicenseSuccess();
+                        }
+//                        initModel(context, listener);
+                        return;
+                    } else {
+                        listener.initLicenseFail(code, response);
+                    }
+                }
+            });
+        } else {
+            if (listener != null) {
+                listener.initLicenseFail(-1, "授权码不存在，请重新输入！");
+            }
+        }
+    }
+
     /**
      * 初始化模型，目前包含检查，活体，识别模型；因为初始化是顺序执行，可以在最好初始化回掉中返回状态结果
      *
@@ -220,6 +291,113 @@ public class FaceSDKManager {
 
     }
 
+    /**
+     * 初始化鉴权，如果鉴权通过，直接初始化模型
+     *
+     * @param context
+     * @param listener
+     */
+    public void init(final Context context, final SdkInitListener listener) {
+        // 使用PreferencesManager替代PreferencesUtil
+        final String licenseOfflineKey = PreferencesManager.getInstance(context).getStringValue("share", "activate_offline_key", "");
+        final String licenseOnlineKey = PreferencesManager.getInstance(context).getStringValue("share", "activate_online_key", "");
+        final String licenseBatchlineKey = PreferencesManager.getInstance(context).getStringValue("share", "activate_batchline_key", "");
+        SharedPreferences sharedPreferences = context.getSharedPreferences("share", 0);
+        final boolean isAuthChip = sharedPreferences.getBoolean("isAuthChip", false);
+
+        // 如果licenseKey 不存在提示授权码为空，并跳转授权页面授权
+        if (TextUtils.isEmpty(licenseOfflineKey) && TextUtils.isEmpty(licenseOnlineKey)
+                && TextUtils.isEmpty(licenseBatchlineKey) && !isAuthChip) {
+            ToastUtils.toast(context, "未授权设备，请完成授权激活");
+            if (listener != null) {
+                listener.initLicenseFail(-1, "授权码不存在，请重新输入！");
+            }
+            return;
+        }
+        // todo 增加判空处理
+        if (listener != null) {
+            listener.initStart();
+        }
+
+        if (!TextUtils.isEmpty(licenseOnlineKey)) {
+            // 在线激活
+            faceAuth.initLicenseOnLine(context, licenseOnlineKey, new Callback() {
+                @Override
+                public void onResponse(int code, String response) {
+                    if (code == 0) {
+                        initStatus = SDK_INIT_SUCCESS;
+                        if (listener != null) {
+                            listener.initLicenseSuccess();
+                        }
+//                        initModel(context, listener);
+                        return;
+                    } else {
+                        listener.initLicenseFail(code, response);
+                    }
+                }
+            });
+        } else if (!TextUtils.isEmpty(licenseOfflineKey)) {
+            // 离线激活
+            faceAuth.initLicenseOffLine(context, new Callback() {
+                @Override
+                public void onResponse(int code, String response) {
+                    if (code == 0) {
+                        initStatus = SDK_INIT_SUCCESS;
+                        if (listener != null) {
+                            listener.initLicenseSuccess();
+                        }
+//                        initModel(context, listener);
+                        return;
+                    } else {
+                        listener.initLicenseFail(code, response);
+                    }
+                }
+            });
+        } else if (!TextUtils.isEmpty(licenseBatchlineKey)) {
+            // 应用激活
+            faceAuth.initLicenseBatchLine(context, licenseBatchlineKey, new Callback() {
+                @Override
+                public void onResponse(int code, String response) {
+                    if (code == 0) {
+                        PreferencesManager.getInstance(context).setStringValue("share", "activate_batchline_key", licenseBatchlineKey);
+                        initStatus = SDK_INIT_SUCCESS;
+                        if (listener != null) {
+                            listener.initLicenseSuccess();
+                        }
+//                        initModel(context, listener);
+                        return;
+                    } else {
+                        listener.initLicenseFail(code, response);
+                    }
+                }
+            });
+        } else if (isAuthChip){
+            faceAuth.initLicenseAuthChip(context, new Callback() {
+                @Override
+                public void onResponse(final int code, final String response) {
+                    if (code == 0) {
+                        initStatus = SDK_INIT_SUCCESS;
+                        if (listener != null) {
+                            listener.initLicenseSuccess();
+                        }
+//                        initModel(context, listener);
+                        return;
+                    } else {
+                        SharedPreferences sharedPreferences = context.getSharedPreferences("share", 0);
+                        SharedPreferences.Editor editor = sharedPreferences.edit();
+                        editor.putBoolean("isAuthChip", false);
+                        editor.commit();
+                        listener.initLicenseFail(code, response);
+                    }
+
+                }
+            });
+        } else{
+            if (listener != null) {
+                listener.initLicenseFail(-1, "授权码不存在，请重新输入！");
+            }
+        }
+    }
 
     /**
      * 初始化配置

financelibrary/src/main/java/com/baidu/idl/face/main/finance/utils/PreferencesManager.java

@@ -41,4 +41,12 @@ public class PreferencesManager extends BasePreferencesManager {
         return getInt(RGB_NIR_DEPTH, "rgb_nir_depth", 0);
     }
 
+    // 添加公共方法来访问BasePreferencesManager中的受保护方法
+    public String getStringValue(String preferences, String key, String defaultValue) {
+        return getString(preferences, key, defaultValue);
+    }
+
+    public void setStringValue(String preferences, String key, String value) {
+        setString(preferences, key, value);
+    }
 }

financelibrary/src/main/res/drawable/setting_switch_track_off.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFCCCCCC" />
+    <corners android:radius="15dp" />
+    <size android:width="50dp" android:height="30dp" />
+</shape>

financelibrary/src/main/res/drawable/setting_switch_track_on.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FF009874" />
+    <corners android:radius="15dp" />
+    <size android:width="50dp" android:height="30dp" />
+</shape>

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-9.0.0-bin.zip
-
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,81 +15,115 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS="-Xmx1024m -Xms256m"
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +132,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
+fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if [ "$darwin" = "true" ]; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
 
-# Collect all arguments for the java command
-set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

settings.gradle

@@ -13,6 +13,8 @@ dependencyResolutionManagement {
         maven { url "https://jitpack.io" }
         flatDir {
             dirs '../facelibrary/libs'
+            dirs '../app/libs'
+            dirs 'app/libs'
         }
     }
 }
@@ -22,4 +24,3 @@ include ':app'
 include ':facelibrary'
 include ':financelibrary'
 include ':datalibrary'
-// include ':oxplugin_padface'