From ce2444bd0731e83f0fcb94c2783002d08b60896e Mon Sep 17 00:00:00 2001 From: xiangsilian Date: Wed, 22 Oct 2025 00:07:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E5=87=BAaar=20=E5=88=B0=E6=96=B0?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=EF=BC=8C=E8=BF=90=E8=A1=8C=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 18 ++++++++---------- .../classes.jar => tasks-core.jar} | Bin .../classes.jar => tasks-vision.jar} | Bin app/src/main/AndroidManifest.xml | 4 ++-- .../main/java/com/hmwl/face/FaceActivity.java | 4 ++++ app/src/main/res/values-night/themes.xml | 16 ---------------- app/src/main/res/values/themes.xml | 16 ---------------- gradle/libs.versions.toml | 2 +- 8 files changed, 15 insertions(+), 45 deletions(-) rename app/libs/{tasks-core/classes.jar => tasks-core.jar} (100%) rename app/libs/{tasks-vision/classes.jar => tasks-vision.jar} (100%) delete mode 100644 app/src/main/res/values-night/themes.xml delete mode 100644 app/src/main/res/values/themes.xml diff --git a/app/build.gradle b/app/build.gradle index 06c035b..d3d87e6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,12 +9,11 @@ apply from: "./download_vvl.gradle" android { namespace 'com.hmwl.sample' - compileSdk 35 - + compileSdk 36 defaultConfig { // applicationId "com.hmwl.sample" minSdk 30 - targetSdk 35 + targetSdk 36 versionCode 1 versionName "1.0" @@ -57,17 +56,16 @@ android { } - // 添加解压的 AAR 资源 sourceSets { main { jniLibs.srcDirs += [ 'libs/tasks-vision/jni', 'libs/tasks-core/jni' ] - java.srcDirs += [ - 'libs/tasks-vision/classes', - 'libs/tasks-core/classes' - ] +// java.srcDirs += [ +// 'libs/tasks-vision/vision_classes', +// 'libs/tasks-core/core_classes' +// ] res.srcDirs += [ 'libs/tasks-vision/res', 'libs/tasks-core/res' @@ -95,8 +93,8 @@ dependencies { // implementation files('libs/tasks-vision-0.10.26.aar') // implementation files('libs/tasks-core-0.10.26.aar') - implementation fileTree(dir: 'libs/tasks-vision', include: ['*.jar']) - implementation fileTree(dir: 'libs/tasks-core', include: ['*.jar']) + implementation 'com.google.protobuf:protobuf-javalite:3.21.12' + implementation files('libs/tasks-vision.jar', 'libs/tasks-core.jar') def camerax_version = '1.4.2' diff --git a/app/libs/tasks-core/classes.jar b/app/libs/tasks-core.jar similarity index 100% rename from app/libs/tasks-core/classes.jar rename to app/libs/tasks-core.jar diff --git a/app/libs/tasks-vision/classes.jar b/app/libs/tasks-vision.jar similarity index 100% rename from app/libs/tasks-vision/classes.jar rename to app/libs/tasks-vision.jar diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0f0cf4c..0e0f6e6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,8 +14,8 @@ diff --git a/app/src/main/java/com/hmwl/face/FaceActivity.java b/app/src/main/java/com/hmwl/face/FaceActivity.java index ea0e1cb..8ba5640 100644 --- a/app/src/main/java/com/hmwl/face/FaceActivity.java +++ b/app/src/main/java/com/hmwl/face/FaceActivity.java @@ -308,4 +308,8 @@ public class FaceActivity extends GameActivity implements FaceLandmarkerHelper.L } public native void passDataToNative(ByteBuffer buffer, int pointCount, int width, int height); + + protected void ChangeState(String json){ + Log.i("FaceActivity", "ChangeState:" + json); + } } \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml deleted file mode 100644 index c0fd1e9..0000000 --- a/app/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml deleted file mode 100644 index fb0958c..0000000 --- a/app/src/main/res/values/themes.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b513bf1..8c134b8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ junitVersion = "1.3.0" espressoCore = "3.7.0" appcompat = "1.7.1" material = "1.13.0" -gamesActivity = "4.0.0" +gamesActivity = "2.0.2" [libraries] junit = { group = "junit", name = "junit", version.ref = "junit" }