整理卡死的问题

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 {
+//    kotlinOptions {
-        jvmTarget = '17'  // 与 Java 版本保持一致
+//        jvmTarget = '17'  // 与 Java 版本保持一致
-    }
+//    }
 
-    kotlin {
+//    kotlin {
-        jvmToolchain(21)
+//        jvmToolchain(17)
-    }
+//    }
 
     buildFeatures {
         prefab true
@@ -62,10 +74,10 @@ android {
                     'libs/tasks-vision/jni',
                     'libs/tasks-core/jni'
             ]
-            java.srcDirs += [
+            //java.srcDirs += [
-                    'libs/tasks-vision/vision_classes',
+            //        'libs/tasks-vision/vision_classes',
-                    'libs/tasks-core/core_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 'com.google.protobuf:protobuf-javalite:3.21.12'
-    //implementation files('libs/tasks-vision.jar', 'libs/tasks-core.jar')
+    implementation files('libs/tasks-vision.jar', 'libs/tasks-core.jar')
 
-    implementation fileTree(dir: 'libs/tasks-vision', include: ['*.jar'])
+    //implementation fileTree(dir: 'libs/tasks-vision', include: ['*.jar'])
-    implementation fileTree(dir: 'libs/tasks-core', include: ['*.jar'])
+    //implementation fileTree(dir: 'libs/tasks-core', include: ['*.jar'])
 
 
     def camerax_version = '1.4.2'

app/src/main/assets/shaders/bg.frag

@@ -9,7 +9,33 @@ layout(location = 0) out vec4 outColor;
 // 纹理采样器
 layout(binding = 0) uniform sampler2D texSampler;
 
+layout(push_constant) uniform PushConstants {
+    float zoom;
+	float r;
+	float g;
+	float b;
+	float radius;
+	float ux;
+	float uy;
+} pushConstants;
+
 void main() {
+    // outFragColor = color;
+    // 获取当前片元的屏幕坐标（左下角为原点）
+    vec2 fragCoord = gl_FragCoord.xy;
+
+    // 屏幕中心（480x480 的中心是 (240, 240)）
+    vec2 center = vec2(240.0, 240.0);
+
+    // 计算到中心的距离（欧氏距离，单位：像素）
+    float dist = length(fragCoord - center);
+
+    // 判断是否在半径之外
+    if (dist > pushConstants.radius) {
+        // 使用 push constant 中的 RGB 颜色（注意 alpha 设为 1.0）
+        outColor = vec4(pushConstants.r, pushConstants.g, pushConstants.b, 1.0);
+    } else {
         // 采样纹理
         outColor = texture(texSampler, inTexCoord);
+    }
 }

app/src/main/assets/shaders/bg.vert

@@ -38,7 +38,15 @@ const vec2 texCoords[6] = vec2[6](
 
 // 定义 Push Constant，只有一个 float
 layout(push_constant) uniform PushConstants {
-    float myValue;
+    float zoom;
+	float r;
+	float g;
+	float b;
+	float radius;
+	float ux;
+	float uy;
+    float offset_x;
+	float offset_y;
 } pushConstants;
 
 
@@ -48,7 +56,9 @@ layout(location = 0) out vec2 outTexCoord;
 void main() {
     // 获取顶点位置
     vec2 position = positions[gl_VertexIndex];
-    position = position * pushConstants.myValue;
+    position = position * pushConstants.zoom;
+    position.x = position.x + (pushConstants.offset_x/480);
+	position.y = position.y + (pushConstants.offset_y/480);
     
     // 设置输出位置（Vulkan使用不同的坐标系）
     gl_Position = vec4(position, 0.0, 1.0);

app/src/main/assets/shaders/texture.frag

@@ -5,13 +5,40 @@ layout (binding = 1) uniform sampler2D samplerColor;
 layout (location = 0) in vec2 inUV;
 layout (location = 1) in vec3 inNormal;
 
+layout(push_constant) uniform PushConstants {
+    float zoom;
+	float r;
+	float g;
+	float b;
+	float radius;
+	float ux;
+	float uy;
+} pushConstants;
+
 
 layout (location = 0) out vec4 outFragColor;
 
 void main() 
 {
-	vec4 color = texture(samplerColor, inUV);
+    // outFragColor = color;
+    // 获取当前片元的屏幕坐标（左下角为原点）
+    vec2 fragCoord = gl_FragCoord.xy;
 
+    // 屏幕中心（480x480 的中心是 (240, 240)）
+    vec2 center = vec2(240.0, 240.0);
+
+    // 计算到中心的距离（欧氏距离，单位：像素）
+    float dist = length(fragCoord - center);
+
+    // 判断是否在半径之外
+    if (dist > pushConstants.radius) {
+        // 使用 push constant 中的 RGB 颜色（注意 alpha 设为 1.0）
+        outFragColor = vec4(pushConstants.r, pushConstants.g, pushConstants.b, 1.0);
+    } else {
+        vec2 pos = vec2(pushConstants.ux/4096.f, pushConstants.uy/2048.f);
+        vec2 uv = pos + vec2(inUV.x/8.f, inUV.y/4.f);
+        vec4 color = texture(samplerColor, uv);
         outFragColor = color;
+    }
 
 }

app/src/main/assets/shaders/texture.vert

@@ -17,7 +17,15 @@ layout (location = 0) out vec2 outUV;
 layout (location = 1) out vec3 outNormal;
 
 layout(push_constant) uniform PushConstants {
-    float myValue;
+    float zoom;
+	float r;
+	float g;
+	float b;
+	float radius;
+	float ux;
+	float uy;
+	float offset_x;
+	float offset_y;
 } pushConstants;
 
 out gl_PerVertex 
@@ -30,7 +38,9 @@ void main()
 	outUV = inUV;
 
 	vec2 position = vec2(inPos.xy*2 -1);
-    position = position * pushConstants.myValue;
+    position = position * pushConstants.zoom;
+	position.x = position.x + (pushConstants.offset_x/480);
+	position.y = position.y + (pushConstants.offset_y/480);
     gl_Position = vec4(position, 0.5, 1.0);
 
     vec4 pos = ubo.model * vec4(inPos, 1.0);

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:
@@ -36,9 +39,12 @@ void android_main(struct android_app *pApp) {
     aout << "Welcome to android_main" << std::endl;
     g_android_app = pApp;
     g_assetManager = pApp->activity->assetManager;
-    FaceApp application;
+    //FaceApp application;
-    g_Application = &application;
+    //g_Application = &application;
-    application.SetInitArg(g_InitArgString);
+    if(g_Application == nullptr) {
+        g_Application = new FaceApp();
+    }
+    g_Application->SetInitArg(g_InitArgString);
     pApp->onAppCmd = handle_cmd;
     long long last_update_time = 0;
     android_app_set_motion_event_filter(pApp, nullptr);
@@ -70,23 +76,25 @@ void android_main(struct android_app *pApp) {
                     }
             }
         }
-        if(application.isInited())
+        if(g_Application->isInited())
         {
             auto frameTime = (start_time - _lastDrawFrameTime);
             _lastDrawFrameTime = chrono::duration_cast<chrono::milliseconds>(chrono::system_clock::now().time_since_epoch()).count();
-            application.drawFrame(frameTime);
+            g_Application->drawFrame(frameTime);
         }
         auto end_time = chrono::duration_cast<chrono::milliseconds>(chrono::system_clock::now().time_since_epoch()).count();
         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)));
         }
     } while (!pApp->destroyRequested);
-    application.cleanup();
+    //application.cleanup();
+    g_Application->cleanupSecondInit();
+    g_Application->clearnSecondFaceApp();
 }
 }
 
@@ -147,10 +155,194 @@ 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) {
+Java_com_hmwl_face_1sdk_FaceActivity_StopRunning(JNIEnv *env, jobject thiz) {
-    // TODO: implement ChangeStateCpp()
+    g_Application->Stop();
+}
+
+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()
+{
+    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, "OnLoadMotionListFinished", "(Ljava/lang/String;)V");
+    if (methodId == nullptr) {
+        env->ExceptionDescribe(); // 打印异常
+        env->ExceptionClear();
+        if (needDetach) vm->DetachCurrentThread();
+        return;
+    }
+
+    // 3. 构造 jstring 参数
+    jstring jResult = env->NewStringUTF("ok");
+
+    // 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, "OnPlayMotionListFinished", "()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->preLoadMotionList(nativeString, CppCallback);
+    return env->NewStringUTF(ret.c_str());
+}
+
+const char DELIMITER = 0x1F; // same as \u001F
+
+std::vector<std::string> splitMotionString(const std::string& input) {
+    std::vector<std::string> result;
+    if (input.empty()) return result;
+
+    size_t start = 0;
+    size_t pos = input.find(DELIMITER);
+
+    while (pos != std::string::npos) {
+        result.push_back(input.substr(start, pos - start));
+        start = pos + 1;
+        pos = input.find(DELIMITER, start);
+    }
+    // Add last part
+    result.push_back(input.substr(start));
+
+    return result;
+}
+
+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 +350,28 @@ 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);
+        std::vector<std::string> motions = splitMotionString(nativeString);
+        g_Application->changeMotionList(motions, CppAnimationFinishedCallback, loop);
     }
 }
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_hmwl_face_1sdk_FaceActivity_StopMotionNative(JNIEnv *env, jobject thiz) {
+    g_Application->StopMotion();
+}
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_hmwl_face_1sdk_FaceActivity_ResumeMotionNative(JNIEnv *env, jobject thiz) {
+    // TODO: implement ResumeMotionNative()
+    g_Application->ResumeMotion();
+}

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

@@ -4,7 +4,6 @@ import android.Manifest;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.MotionEvent;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -31,7 +30,6 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 
 public class FaceActivity extends GameActivity implements FaceLandmarkerHelper.LandmarkerListener {
     private static final String TAG = "FaceActivity";
@@ -50,6 +48,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);
@@ -81,12 +94,12 @@ public class FaceActivity extends GameActivity implements FaceLandmarkerHelper.L
                             {
                                 detectFace(image);
                             }
-                            else
+//                            else
-                            {
+//                            {
-                                image.close();
+//                                image.close();
-                            }
+//                            }
                         } finally {
-                            //image.close(); // 确保在这里关闭
+                            image.close(); // 确保在这里关闭
                             //Log.d("Camera", "Image closed, ready for next frame");
                         }
                     }
@@ -122,6 +135,22 @@ public class FaceActivity extends GameActivity implements FaceLandmarkerHelper.L
         }
     }
 
+    public void Stop(){
+        StopRunning();
+    }
+
+    private native void StopMotionNative();
+    public void StopMotion(){
+        StopMotionNative();
+    }
+
+    private native void ResumeMotionNative();
+    public void ResumeMotion(){
+        ResumeMotionNative();
+    }
+
+    private native void StopRunning();
+
     // Native 方法
     private native void processImageNative(ByteBuffer buffer, int width, int height,
                                            int format, int rowStride, int pixelStride,
@@ -261,21 +290,45 @@ public class FaceActivity extends GameActivity implements FaceLandmarkerHelper.L
 
     protected native void SetCppInitArg(String json);
 
-    protected void SetInitArg(String json)
+    public void SetInitArg(String json)
     {
         SetCppInitArg(json);
     }
 
-    protected native void ChangeStateCpp(String json);
+    public interface LoadMotionListFinishedCallback {
-    protected void ChangeState(String json){
+        void OnLoadMotionListFinished(String result);
-        Log.i("FaceActivity", "ChangeState:" + json);
+    }
-        ChangeStateCpp(json);
+
+    public interface PlayMotionListFinishedCallback {
+        void OnPlayMotionListFinished();
+    }
+
+    protected native String PreReadAction(String motion, LoadMotionListFinishedCallback callback);
+    public String PreLoadAction(String json, LoadMotionListFinishedCallback callback){
+        return PreReadAction(json, callback);
+    }
+
+    protected native void ChangeMotionCpp(String json, PlayMotionListFinishedCallback callback, boolean loop);
+    public void PlayMotionList(List<String> motionList, boolean loop, PlayMotionListFinishedCallback callback)
+    {
+        if(callback == null)
+        {
+            callback = new PlayMotionListFinishedCallback() {
+                @Override
+                public void OnPlayMotionListFinished() {
+                    Log.i(TAG, "OnPlayMotionListFinished: ");
+                }
+            };
+        }
+        final String DELIMITER = "\u001F"; // ASCII Unit Separator
+        String motion_list_str = String.join(DELIMITER, motionList);
+        ChangeMotionCpp(motion_list_str, 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
@@ -189,7 +192,7 @@ class FaceLandmarkerHelper(
                 Bitmap.Config.ARGB_8888
             )
         imageProxy.use { bitmapBuffer.copyPixelsFromBuffer(imageProxy.planes[0].buffer) }
-        imageProxy.close()
+        //imageProxy.close()
 
         val matrix = Matrix().apply {
             // Rotate the frame received from the camera to be in the same direction as it'll be shown
@@ -238,32 +241,33 @@ class FaceLandmarkerHelper(
         val frameId = result.timestampMs()
         if( result.faceLandmarks().size > 0 ) {
             // 计算各种延时
-            val timings = frameTimings[frameId]
+//            val timings = frameTimings[frameId]
-            if (timings != null) {
+//            if (timings != null) {
-                val totalLatency = resultTime - timings.captureTime
+//                val totalLatency = resultTime - timings.captureTime
-                val preprocessLatency = timings.preprocessEndTime - timings.preprocessStartTime
+//                val preprocessLatency = timings.preprocessEndTime - timings.preprocessStartTime
-                val detectionLatency = resultTime - timings.detectionStartTime
+//                val detectionLatency = resultTime - timings.detectionStartTime
-                val captureToDetectionLatency = timings.detectionStartTime - timings.captureTime
+//                val captureToDetectionLatency = timings.detectionStartTime - timings.captureTime
-
+//
-                Log.i("TimeLatency",
+//                Log.i("TimeLatency",
-                    "总延时: ${totalLatency}ms | " +
+//                    "总延时: ${totalLatency}ms | " +
-                            "预处理: ${preprocessLatency}ms | " +
+//                            "预处理: ${preprocessLatency}ms | " +
-                            "检测: ${detectionLatency}ms | " +
+//                            "检测: ${detectionLatency}ms | " +
-                            "捕获到检测: ${captureToDetectionLatency}ms | " +
+//                            "捕获到检测: ${captureToDetectionLatency}ms | " +
-                            "FPS: ${String.format("%.1f", currentFps)}"
+//                            "FPS: ${String.format("%.1f", currentFps)}"
-                )
+//                )
-
+//
-                val finishTimeMs = SystemClock.uptimeMillis()
+//                val finishTimeMs = SystemClock.uptimeMillis()
-                val inferenceTime = finishTimeMs - result.timestampMs()
+//                val inferenceTime = finishTimeMs - result.timestampMs()
-                faceLandmarkerHelperListener?.onResults(
+//                faceLandmarkerHelperListener?.onResults(
-                    ResultBundle(
+//                    ResultBundle(
-                        result,
+//                        result,
-                        inferenceTime, // 主要是检测时间
+//                        inferenceTime, // 主要是检测时间
-                        input.height,
+//                        input.height,
-                        input.width,
+//                        input.width,
-                    )
+//                    )
-                )
+//                )
-            } else {
+//            } 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/Frame.java

@@ -0,0 +1,27 @@
+package com.hmwl.face_sdk;
+
+import org.json.JSONObject;
+
+public class Frame {
+    public String name;
+    public float x;
+    public float y;
+    public Frame(String name, float x, float y)
+    {
+        this.name = name;
+        this.x = x;
+        this.y = y;
+    }
+    public JSONObject toJsonObject(){
+        try {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("name", name);
+            jsonObject.put("x", x);
+            jsonObject.put("y", y);
+            return jsonObject;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

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

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

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

@@ -5,32 +5,29 @@ import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.List;
 
+
 public class Motion {
-    public String type = "no";
+    public String name = "no";
-    public List<String> png_names = new ArrayList<>();
+    public List<Frame> frames = new ArrayList<>();
+    public Motion(String name, List<Frame> frames)
+    {
+        this.name = name;
+        this.frames = frames;
+    }
 
     public JSONObject toJsonObject() {
         try {
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("type", type);
+            jsonObject.put("name", name);
-            JSONArray ja = new JSONArray();
+            JSONArray jframes = new JSONArray();
-            for(int i = 0; i < png_names.size(); ++i){
+            for(int i = 0; i < frames.size(); ++i){
-                ja.put(png_names.get(i));
+                jframes.put(frames.get(i).toJsonObject());
             }
-            jsonObject.put("png_names", ja);
+            jsonObject.put("frames", jframes);
             return jsonObject;
         } catch (Exception e) {
             e.printStackTrace();
             return null;
         }
     }
-
-    public String toJson() {
-        try {
-            return toJsonObject().toString();
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
 };

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

@@ -0,0 +1,28 @@
+package com.hmwl.face_sdk;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MotionList {
+    public List<Motion> motions =  new ArrayList<>();
+    public JSONObject toJsonObject() {
+        try {
+            JSONObject jsonObject = new JSONObject();
+            JSONArray jMotions = new JSONArray();
+            for(int i = 0; i < motions.size(); ++i){
+                jMotions.put(motions.get(i).toJsonObject());
+            }
+            jsonObject.put("motions", jMotions);
+            return jsonObject;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new JSONObject();
+        }
+    }
+    public String toJsonString(){
+        return toJsonObject().toString();
+    }
+}

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  // 添加这行
+    alias(libs.plugins.android.library) apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.0' 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
 }

compile_shader.bat

@@ -4,8 +4,9 @@ glslangValidator -V app/src/main/assets/shaders/bg.vert -o app/src/main/assets/s
 glslangValidator -V app/src/main/assets/shaders/texture.frag -o app/src/main/assets/shaders/texture.frag.spv
 glslangValidator -V app/src/main/assets/shaders/texture.vert -o app/src/main/assets/shaders/texture.vert.spv
 
-glslangValidator -V app/src/main/assets/shaders/texture_thick.frag -o app/src/main/assets/shaders/texture_thick.frag.spv
-glslangValidator -V app/src/main/assets/shaders/texture_thick.vert -o app/src/main/assets/shaders/texture_thick.vert.spv
-
 glslangValidator -V app/src/main/assets/shaders/simple_shader.frag -o app/src/main/assets/shaders/simple_shader.frag.spv
 glslangValidator -V app/src/main/assets/shaders/simple_shader.vert -o app/src/main/assets/shaders/simple_shader.vert.spv
+
+glslangValidator -V app/src/main/assets/shaders/texture_thick.frag -o app/src/main/assets/shaders/texture_thick.frag.spv
+rem glslangValidator -V app/src/main/assets/shaders/texture_thick.vert -o app/src/main/assets/shaders/texture_thick.vert.spv
+

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.f20260113"
         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>