save code

app/build.gradle

@@ -1,7 +1,8 @@
 plugins {
     //alias(libs.plugins.android.application)
     alias(libs.plugins.android.library)
-    id 'org.jetbrains.kotlin.android'
+    alias(libs.plugins.kotlin.android)
+    //id 'org.jetbrains.kotlin.android'
 }
 
 ext.vvl_version='1.4.321.0'
@@ -30,6 +31,17 @@ android {
         debug {
             debuggable true
             jniDebuggable true
+
+            externalNativeBuild {
+                cmake {
+                    arguments "-DCMAKE_BUILD_TYPE=Debug"
+                    cppFlags "-DDEBUG -O0 -g"
+                }
+            }
+
+            ndk {
+                debugSymbolLevel 'FULL'  // Debug 版本包含完整符号
+            }
         }
 
         release {
@@ -43,13 +55,13 @@ android {
     }
 
     // 添加 Kotlin 编译选项
-    kotlinOptions {
-        jvmTarget = '17'  // 与 Java 版本保持一致
-    }
+//    kotlinOptions {
+//        jvmTarget = '17'  // 与 Java 版本保持一致
+//    }
 
-    kotlin {
-        jvmToolchain(21)
-    }
+//    kotlin {
+//        jvmToolchain(17)
+//    }
 
     buildFeatures {
         prefab true
@@ -62,10 +74,10 @@ android {
                     'libs/tasks-vision/jni',
                     'libs/tasks-core/jni'
             ]
-            java.srcDirs += [
-                    'libs/tasks-vision/vision_classes',
-                    'libs/tasks-core/core_classes'
-            ]
+            //java.srcDirs += [
+            //        'libs/tasks-vision/vision_classes',
+            //        'libs/tasks-core/core_classes'
+            //]
             res.srcDirs += [
                     'libs/tasks-vision/res',
                     'libs/tasks-core/res'
@@ -79,6 +91,13 @@ android {
             version '3.22.1'
         }
     }
+
+    packagingOptions {
+        pickFirst '**/*.jar'
+    }
+    kotlinOptions {
+        jvmTarget = '17'
+    }
 }
 
 dependencies {
@@ -86,16 +105,17 @@ dependencies {
     implementation libs.appcompat
     implementation libs.material
     implementation libs.games.activity
+    implementation libs.androidx.core.core.ktx
     testImplementation libs.junit
     androidTestImplementation libs.ext.junit
     androidTestImplementation libs.espresso.core
 
 
-    //implementation 'com.google.protobuf:protobuf-javalite:3.21.12'
-    //implementation files('libs/tasks-vision.jar', 'libs/tasks-core.jar')
+    implementation 'com.google.protobuf:protobuf-javalite:3.21.12'
+    implementation files('libs/tasks-vision.jar', 'libs/tasks-core.jar')
 
-    implementation fileTree(dir: 'libs/tasks-vision', include: ['*.jar'])
-    implementation fileTree(dir: 'libs/tasks-core', include: ['*.jar'])
+    //implementation fileTree(dir: 'libs/tasks-vision', include: ['*.jar'])
+    //implementation fileTree(dir: 'libs/tasks-core', include: ['*.jar'])
 
 
     def camerax_version = '1.4.2'

app/src/main/cpp/main.cpp

@@ -15,6 +15,9 @@ android_app* g_android_app = nullptr;
 FaceApp* g_Application = nullptr;
 AAssetManager* g_assetManager = nullptr;
 
+jobject g_callback = nullptr;
+jobject g_callbackAnimationFinished = nullptr;
+
 void handle_cmd(android_app *pApp, int32_t cmd) {
     switch (cmd) {
         case APP_CMD_INIT_WINDOW:
@@ -80,7 +83,7 @@ void android_main(struct android_app *pApp) {
         auto frameTime = end_time - last_update_time;
         last_update_time = end_time;
         auto function_time = (end_time - start_time);
-        aout << "function_time:" << function_time << " fps:" << (1000/frameTime) << std::endl;
+        //aout << "function_time:" << function_time << " fps:" << (1000/frameTime) << std::endl;
         if(function_time < 35)
         {
             this_thread::sleep_for(chrono::milliseconds((35-function_time)));
@@ -147,10 +150,175 @@ Java_com_hmwl_face_1sdk_FaceActivity_SetCppInitArg(JNIEnv *env, jobject thiz, js
     }
     memcpy(g_InitArgString, nativeString, len);
 }
+
 extern "C"
 JNIEXPORT void JNICALL
-Java_com_hmwl_face_1sdk_FaceActivity_ChangeStateCpp(JNIEnv *env, jobject thiz, jstring json) {
-    // TODO: implement ChangeStateCpp()
+Java_com_hmwl_face_1sdk_FaceActivity_StopRunning(JNIEnv *env, jobject thiz) {
+    g_Application->_running = false;
+}
+
+JavaVM* g_jvm = nullptr;
+
+// 添加 JNI_OnLoad 函数
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) {
+    g_jvm = vm;  // 保存 JavaVM 指针，供其他线程使用
+    return JNI_VERSION_1_6;
+}
+
+void CppCallback(const string& motion_type)
+{
+    JNIEnv* env = nullptr;
+    bool needDetach = false;
+
+    // 获取当前线程的 JNIEnv
+    JavaVM* vm = g_jvm; // 你需要提前保存 JavaVM* 到全局变量 g_jvm
+    int status = vm->GetEnv((void**)&env, JNI_VERSION_1_6);
+    if (status == JNI_EDETACHED) {
+        // 当前线程未 attach，需 attach
+        if (vm->AttachCurrentThread(&env, nullptr) != 0) {
+            return;
+        }
+        needDetach = true;
+    } else if (status != JNI_OK) {
+        return;
+    }
+
+    if (g_callback == nullptr) {
+        if (needDetach) vm->DetachCurrentThread();
+        return;
+    }
+
+    // 1. 获取 CallbackInterface 的 class
+    jclass callbackClass = env->GetObjectClass(g_callback);
+    if (callbackClass == nullptr) {
+        if (needDetach) vm->DetachCurrentThread();
+        return;
+    }
+
+    // 2. 获取 OnLoadActionFinished 方法 ID（注意方法名大小写必须一致！）
+    jmethodID methodId = env->GetMethodID(callbackClass, "OnLoadActionFinished", "(Ljava/lang/String;)V");
+    if (methodId == nullptr) {
+        env->ExceptionDescribe(); // 打印异常
+        env->ExceptionClear();
+        if (needDetach) vm->DetachCurrentThread();
+        return;
+    }
+
+    // 3. 构造 jstring 参数
+    jstring jResult = env->NewStringUTF(motion_type.c_str());
+
+    // 4. 调用 Java 回调
+    env->CallVoidMethod(g_callback, methodId, jResult);
+
+    // 5. 检查是否抛出异常
+    if (env->ExceptionCheck()) {
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+    }
+
+    // 6. 释放局部引用（可选，但推荐）
+    env->DeleteLocalRef(jResult);
+    env->DeleteLocalRef(callbackClass);
+
+    // 7. 如果是临时 attach 的线程，要 detach
+    if (needDetach) {
+        vm->DetachCurrentThread();
+    }
+}
+
+
+void CppAnimationFinishedCallback()
+{
+    JNIEnv* env = nullptr;
+    bool needDetach = false;
+
+    // 获取当前线程的 JNIEnv
+    JavaVM* vm = g_jvm; // 你需要提前保存 JavaVM* 到全局变量 g_jvm
+    int status = vm->GetEnv((void**)&env, JNI_VERSION_1_6);
+    if (status == JNI_EDETACHED) {
+        // 当前线程未 attach，需 attach
+        if (vm->AttachCurrentThread(&env, nullptr) != 0) {
+            return;
+        }
+        needDetach = true;
+    } else if (status != JNI_OK) {
+        return;
+    }
+
+    if (g_callbackAnimationFinished == nullptr) {
+        if (needDetach) vm->DetachCurrentThread();
+        return;
+    }
+
+    // 1. 获取 CallbackInterface 的 class
+    jclass callbackClass = env->GetObjectClass(g_callbackAnimationFinished);
+    if (callbackClass == nullptr) {
+        if (needDetach) vm->DetachCurrentThread();
+        return;
+    }
+
+    // 2. 获取 OnLoadActionFinished 方法 ID（注意方法名大小写必须一致！）
+    jmethodID methodId = env->GetMethodID(callbackClass, "OnAnimationFinished", "()V");
+    if (methodId == nullptr) {
+        env->ExceptionDescribe(); // 打印异常
+        env->ExceptionClear();
+        if (needDetach) vm->DetachCurrentThread();
+        return;
+    }
+
+    // 4. 调用 Java 回调
+    env->CallVoidMethod(g_callbackAnimationFinished, methodId);
+
+    // 5. 检查是否抛出异常
+    if (env->ExceptionCheck()) {
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+    }
+
+    env->DeleteLocalRef(callbackClass);
+
+    // 7. 如果是临时 attach 的线程，要 detach
+    if (needDetach) {
+        vm->DetachCurrentThread();
+    }
+}
+
+
+
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_hmwl_face_1sdk_FaceActivity_PreReadAction(JNIEnv *env, jobject thiz, jstring motion,
+                                                   jobject callback) {
+    // 清理旧的全局引用
+    if (g_callback != nullptr) {
+        env->DeleteGlobalRef(g_callback);
+        g_callback = nullptr;
+    }
+
+    // 保存新的回调
+    if (callback != nullptr) {
+        g_callback = env->NewGlobalRef(callback);
+    } else {
+        g_callback = nullptr;
+    }
+
+    const char *nativeString = env->GetStringUTFChars(motion, nullptr);
+    jsize len = env->GetStringUTFLength(motion);
+    if(len > ArgLen)
+    {
+        aout << "ArgLen to long:" << len << std::endl;
+    }
+
+    std::string ret = g_Application->preReadyMotion(nativeString, CppCallback);
+    return env->NewStringUTF(ret.c_str());
+}
+
+
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_hmwl_face_1sdk_FaceActivity_ChangeMotionCpp(JNIEnv *env, jobject thiz, jstring json,
+                                                     jobject callback, jboolean loop) {
+    // TODO: implement ChangeMotionCpp()
     const char *nativeString = env->GetStringUTFChars(json, nullptr);
     jsize len = env->GetStringUTFLength(json);
     if(len > ArgLen)
@@ -158,8 +326,16 @@ Java_com_hmwl_face_1sdk_FaceActivity_ChangeStateCpp(JNIEnv *env, jobject thiz, j
         aout << "ArgLen to long:" << len << std::endl;
         return;
     }
+
+    // 保存新的回调
+    if (callback != nullptr) {
+        g_callbackAnimationFinished = env->NewGlobalRef(callback);
+    } else {
+        g_callbackAnimationFinished = nullptr;
+    }
+
     if(g_Application->isInited())
     {
-        g_Application->changeMotion(nativeString);
+        g_Application->changeMotion(nativeString, CppAnimationFinishedCallback, loop);
     }
 }

app/src/main/java/com/hmwl/face_sdk/FaceActivity.java

@@ -50,6 +50,21 @@ public class FaceActivity extends GameActivity implements FaceLandmarkerHelper.L
         }
     }
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        if (requestCode == REQUEST_CAMERA_PERMISSION) {
+            // 检查权限是否被授予
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                // 用户授予了权限，启动相机
+                startCamera();
+            } else {
+                requestCameraPermission();
+            }
+        }
+    }
+
     private void startCamera() {
         ListenableFuture<ProcessCameraProvider> cameraProviderFuture =
                 ProcessCameraProvider.getInstance(this);
@@ -122,6 +137,12 @@ public class FaceActivity extends GameActivity implements FaceLandmarkerHelper.L
         }
     }
 
+    public void Stop(){
+        StopRunning();
+    }
+
+    private native void StopRunning();
+
     // Native 方法
     private native void processImageNative(ByteBuffer buffer, int width, int height,
                                            int format, int rowStride, int pixelStride,
@@ -266,16 +287,29 @@ public class FaceActivity extends GameActivity implements FaceLandmarkerHelper.L
         SetCppInitArg(json);
     }
 
-    protected native void ChangeStateCpp(String json);
-    protected void ChangeState(String json){
+    public interface CallbackInterface {
+        void OnLoadActionFinished(String result);
+    }
+
+    public interface AnimationFinishedCallbackInterface {
+        void OnAnimationFinished();
+    }
+
+    protected native String PreReadAction(String motion, CallbackInterface callback);
+    protected String PreLoadAction(String json, CallbackInterface callback){
+        return PreReadAction(json, callback);
+    }
+
+    protected native void ChangeMotionCpp(String json, AnimationFinishedCallbackInterface callback, boolean loop);
+    protected void ChangeMotion(String json, AnimationFinishedCallbackInterface callback, boolean loop){
         Log.i("FaceActivity", "ChangeState:" + json);
-        ChangeStateCpp(json);
+        ChangeMotionCpp(json, callback, loop);
     }
 
     // 添加这个缺失的方法
     @Override
     public void onEmpty() {
         // 当没有检测到人脸时的处理逻辑
-        Log.d(TAG, "No face detected in the current frame");
+        //Log.d(TAG, "No face detected in the current frame");
     }
 }

app/src/main/java/com/hmwl/face_sdk/FaceLandmarkerHelper.kt

@@ -67,6 +67,9 @@ class FaceLandmarkerHelper(
             }
         }
 
+        minFaceDetectionConfidence = 0.1f;
+        minFaceTrackingConfidence = 0.1f;
+        minFacePresenceConfidence = 0.1f;
         try {
             val baseOptions = baseOptionBuilder.build()
             // Create an option builder with base options and specific
@@ -238,32 +241,33 @@ class FaceLandmarkerHelper(
         val frameId = result.timestampMs()
         if( result.faceLandmarks().size > 0 ) {
             // 计算各种延时
-            val timings = frameTimings[frameId]
-            if (timings != null) {
-                val totalLatency = resultTime - timings.captureTime
-                val preprocessLatency = timings.preprocessEndTime - timings.preprocessStartTime
-                val detectionLatency = resultTime - timings.detectionStartTime
-                val captureToDetectionLatency = timings.detectionStartTime - timings.captureTime
-
-                Log.i("TimeLatency",
-                    "总延时: ${totalLatency}ms | " +
-                            "预处理: ${preprocessLatency}ms | " +
-                            "检测: ${detectionLatency}ms | " +
-                            "捕获到检测: ${captureToDetectionLatency}ms | " +
-                            "FPS: ${String.format("%.1f", currentFps)}"
-                )
-
-                val finishTimeMs = SystemClock.uptimeMillis()
-                val inferenceTime = finishTimeMs - result.timestampMs()
-                faceLandmarkerHelperListener?.onResults(
-                    ResultBundle(
-                        result,
-                        inferenceTime, // 主要是检测时间
-                        input.height,
-                        input.width,
-                    )
-                )
-            } else {
+//            val timings = frameTimings[frameId]
+//            if (timings != null) {
+//                val totalLatency = resultTime - timings.captureTime
+//                val preprocessLatency = timings.preprocessEndTime - timings.preprocessStartTime
+//                val detectionLatency = resultTime - timings.detectionStartTime
+//                val captureToDetectionLatency = timings.detectionStartTime - timings.captureTime
+//
+//                Log.i("TimeLatency",
+//                    "总延时: ${totalLatency}ms | " +
+//                            "预处理: ${preprocessLatency}ms | " +
+//                            "检测: ${detectionLatency}ms | " +
+//                            "捕获到检测: ${captureToDetectionLatency}ms | " +
+//                            "FPS: ${String.format("%.1f", currentFps)}"
+//                )
+//
+//                val finishTimeMs = SystemClock.uptimeMillis()
+//                val inferenceTime = finishTimeMs - result.timestampMs()
+//                faceLandmarkerHelperListener?.onResults(
+//                    ResultBundle(
+//                        result,
+//                        inferenceTime, // 主要是检测时间
+//                        input.height,
+//                        input.width,
+//                    )
+//                )
+//            } else
+            //{
                 val finishTimeMs = SystemClock.uptimeMillis()
                 val inferenceTime = finishTimeMs - result.timestampMs()
                 Log.i("TimeLatency",
@@ -277,7 +281,7 @@ class FaceLandmarkerHelper(
                         input.width
                     )
                 )
-            }
+            //}
         }
         else {
             faceLandmarkerHelperListener?.onEmpty()

app/src/main/java/com/hmwl/face_sdk/InitArg.java

@@ -4,13 +4,12 @@ import org.json.JSONObject;
 public class InitArg {
     public int action_fps;
     public float zoom;
-    public Motion motion;
+
     public String toJson() {
         try {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("action_fps", action_fps);
             jsonObject.put("zoom", zoom);
-            jsonObject.put("motion", motion.toJsonObject());
             return jsonObject.toString();
         } catch (Exception e) {
             e.printStackTrace();

build.gradle

@@ -1,6 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:8.3.2'
+    }
+}
+
 plugins {
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.android.library) apply false  // 添加这行
-    id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.kotlin.android) apply false  // 添加这行
+    //alias(libs.plugins.kotlin.android) apply false
+    //id 'org.jetbrains.kotlin.android' version '2.2.0' apply false
 }

example/build.gradle

@@ -1,13 +1,15 @@
 plugins {
     alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    //alias(libs.plugins.kotlin.android)
 }
 
 android {
-    namespace 'com.hmwl.example'
+    namespace 'com.inewme.uvmirror'
     compileSdk 36
 
     defaultConfig {
-        applicationId "com.hmwl.f20251110"
+        applicationId "com.inewme.uvmirror.f20251129"
         minSdk 30
         targetSdk 36
         versionCode 1
@@ -18,6 +20,7 @@ android {
 
     buildTypes {
         release {
+            signingConfig signingConfigs.debug
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
@@ -26,6 +29,20 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+
+    buildFeatures {
+        compose true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion '1.5.1'
+    }
+    kotlinOptions {
+        jvmTarget = '17'
+    }
+//    kotlinOptions {
+//        jvmTarget = '17'
+//    }
 }
 
 dependencies {
@@ -33,11 +50,21 @@ dependencies {
     implementation libs.appcompat
     implementation libs.material
     implementation libs.games.activity
+    implementation libs.core.ktx
+    implementation libs.androidx.core.ktx
     testImplementation libs.junit
     androidTestImplementation libs.ext.junit
     androidTestImplementation libs.espresso.core
 
     implementation project(':app')
+    // Jetpack Compose
+    implementation "androidx.compose.ui:ui:1.5.0"
+    implementation "androidx.compose.material3:material3:1.0.0"
+    implementation "androidx.compose.foundation:foundation:1.5.0"
+    implementation "androidx.compose.runtime:runtime:1.5.0"
+    implementation "androidx.activity:activity-compose:1.7.2" // �ؼ����ṩ setContent
+
+    implementation "androidx.compose.ui:ui-tooling:1.5.4"
 
     def camerax_version = '1.4.2'
     implementation "androidx.camera:camera-core:$camerax_version"
@@ -53,4 +80,7 @@ dependencies {
     implementation 'com.google.flogger:flogger-system-backend:0.7.4'
 
     implementation 'com.google.guava:guava:31.1-android'
+
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7") // 提供 lifecycleScope
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0")
 }

example/src/main/AndroidManifest.xml

@@ -20,6 +20,10 @@
                 android:name="android.app.lib_name"
                 android:value="face_sdk" />
         </activity>
+
+        <activity
+            android:name=".MakeupActivity"
+            android:exported="false" />
     </application>
 
 </manifest>