fix bug and add log

.gitignore

@@ -12,4 +12,5 @@
 /captures
 .externalNativeBuild
 .cxx
+.idea
 local.properties

CMakeLists.txt

@@ -26,6 +26,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
         add_library(face_sdk SHARED
                 app/src/main/cpp/main.cpp
                 app/src/main/cpp/AndroidOut.cpp
+                app/src/main/cpp/DebugLog.h
+                app/src/main/cpp/DebugLog.cpp
                 vulkan/AppBase.h
                 vulkan/AppBase.cpp
                 vulkan/Application.h

DEBUG_GUIDE.md

@@ -0,0 +1,191 @@
+# Face SDK 崩溃调试指南
+
+本文档说明如何配合 AI 定位 `libface_sdk.so` 里的崩溃 / 异常。核心思路：**把 Vulkan 每一次异常的上下文写进一个持久日志文件里，崩溃或画面卡住后把这份文件发给 AI 分析。**
+
+---
+
+## 一、已经加好的东西（不需要你做什么）
+
+### 1. `DebugLog` 模块（`app/src/main/cpp/DebugLog.{h,cpp}`）
+
+- 线程安全；
+- 每条日志带**时间戳 + 线程 ID（tid）**；
+- 写到 App **私有目录下的文件** —— 不会被 logcat 自动清掉；
+- 每写一行 `fflush`，进程挂了也不丢最后几行；
+- 文件大小超过 2MB 自动滚动到 `.old`；
+- 同步把日志镜像到 logcat，tag 是 `FACE_DBG`。
+
+### 2. 打点位置
+
+| 位置 | 打点内容 | 用途 |
+|---|---|---|
+| `android_main` 启动 | pid、tid、日志文件绝对路径 | 每次启动一条，作为分段锚点 |
+| 渲染循环心跳 | 每 600 帧一条：`frame=X exceptions_so_far=Y` | 判断启动多久后崩溃 / 异常持续性 |
+| `try/catch` 兜底 | 首 10 次异常每次都打，之后每 120 次打一次 | **Vulkan 异常不会再让进程硬崩**，留住现场 |
+| `handle_cmd` | 每个 `APP_CMD_*` 事件（尤其 `INIT_WINDOW`/`TERM_WINDOW`/`CONFIG_CHANGED`） | 旋转 / 切后台 / 锁屏场景的时间线 |
+| `FaceApp::initVulkan` 入/出口 | 调用次数、`_applicationInited` / `_faceAppInited` / `_sceondInited` 状态 | 判断是否被多次重复调用 |
+| `processImageNative` / `passDataToNative` | 每 300 次调用打一条 tid | 验证"Java 两个回调在不同线程并发调 Vulkan"假设 |
+| `Application::drawFrame` 里的 4 次 Vulkan 调用 | 非 `VK_SUCCESS` 时打印数值 + 字符串名（例如 `-4 (VK_ERROR_DEVICE_LOST)`） | **最关键的证据** |
+
+### 3. 关键行为变化
+
+**⚠️ 现在 `drawFrame` 里 Vulkan 抛出的异常会被 `try/catch` 吃掉 —— App 不会再因为这类问题硬崩溃。**
+
+- 好处：你能继续跑、继续复现、日志一直在写；
+- 代价：出问题时表现从"崩溃"变成"**画面卡住 / 黑屏 / 不再更新**"。
+- 如果想暂时回到硬崩行为：把 `app/src/main/cpp/main.cpp` 里那段 `try { g_Application->drawFrame(...); } catch (...) { ... }` 改回直接 `g_Application->drawFrame(frameTime);` 即可。
+
+---
+
+## 二、怎么把日志文件取出来
+
+### 方式 A：`run-as`（推荐，不需要 root）
+
+```bash
+adb shell "run-as com.inewme.uvmirror cat files/face_sdk_debug.log" > face_sdk_debug.log
+adb shell "run-as com.inewme.uvmirror cat files/face_sdk_debug.log.old" > face_sdk_debug.log.old
+```
+
+> `.old` 只有文件滚动过一次才存在，没有可以忽略错误。
+
+### 方式 B：直接看 logcat（实时）
+
+```bash
+adb logcat -s FACE_DBG
+```
+
+和文件内容基本一致。跑较久的话还是文件更可靠。
+
+### 方式 C：从 App 里拿路径
+
+启动后 `FACE_DBG` 第一条日志长这样：
+
+```
+[10:12:03.041][tid=12345] android_main start, pid=23456 tid=12345, logPath=/data/user/0/com.inewme.uvmirror/files/face_sdk_debug.log
+```
+
+照这个路径走就对了。
+
+---
+
+## 三、你现在要做的事（B 方案：两种场景都复现一次）
+
+### 场景 1：旋转崩溃（已确认必现）
+
+1. 打开 App，等初始化完成（画面能看到人脸渲染）。
+2. **旋转一次屏幕**。
+3. 等 3~5 秒让日志写进去。
+4. 取 `face_sdk_debug.log`，**不要清文件**，继续场景 2。
+
+期望看到的关键行：
+```
+>> handle_cmd APP_CMD_TERM_WINDOW(...)
+>> handle_cmd APP_CMD_INIT_WINDOW(...)
+FaceApp::initVulkan enter, call#2 ...
+drawFrame[NNN] vkAcquireNextImageKHR -> ??? (...)
+!!! drawFrame std::exception (frame=NNN count=M): failed to ...
+```
+
+注意里面那个 `???` —— 这是整件事的核心证据。
+
+### 场景 2：长时间运行崩溃（之前那个 10 分钟左右的）
+
+**不要退出 App，接着跑**。现在即使旋转触发了异常，进程没死，我们希望看后续会不会再出另一种 VkResult：
+
+1. 尽量不操作（不切后台、不旋转、不锁屏，让 App 持续渲染）。
+2. 连续跑 **15~20 分钟**，观察是否复现之前的"无外部事件崩溃"。
+3. 复现后（或稳定 20 分钟未复现也行），再取一次 `face_sdk_debug.log`（这次会覆盖场景 1 的那份，所以务必**先把场景 1 的单独保存好**）。
+
+期望看到的关键行（如果真的是 DEVICE_LOST）：
+```
+drawFrame[NNN] vkQueueSubmit -> -4 (VK_ERROR_DEVICE_LOST) ...
+```
+或者某个 Vulkan 调用返回其他错误码。
+
+### 辅助信息（手边有就顺便记一下）
+
+| 项 | 为什么要 |
+|---|---|
+| 机型 + Android 版本 | GPU 驱动差异；Adreno / Mali / Xclipse 表现差别大 |
+| 复现时手机是不是很烫 | 排查 GPU 温控 / thermal throttling |
+| 旋转时是"横屏 → 竖屏"还是"竖屏 → 横屏" / 多次连续旋转？ | 某些机型一次 vs 多次触发行为不同 |
+| 10 分钟崩溃时 App 在做什么（有在切换 motion 吗？） | 帮助排除 `changeMotionList` 相关路径 |
+
+---
+
+## 四、发给 AI 的时候包含什么
+
+最小集：
+
+1. `face_sdk_debug.log`（场景 1 旋转那份）
+2. `face_sdk_debug.log`（场景 2 长跑那份）
+3. 如果文件很大，**完整发**比截断发强（AI 主要关心最后几千行）
+4. 一句话说明这份日志对应场景 1 还是场景 2，是否复现了
+
+不需要的：
+
+- logcat 完整 dump（体积太大且大多无关，除非 AI 主动问特定 tag）
+- 录屏
+- 源代码（AI 已经能看到仓库）
+
+---
+
+## 五、当前未解决的假设，等日志验证
+
+| 假设 | 对应 VkResult | 修法 |
+|---|---|---|
+| 旋转导致 surface 失效未处理 | `VK_ERROR_OUT_OF_DATE_KHR` (-1000001004) 或 `VK_ERROR_SURFACE_LOST_KHR` (-1000000000) 或 `VK_SUBOPTIMAL_KHR` (1000001003) | 实现 `APP_CMD_TERM_WINDOW` 销毁流程 + swapchain 重建 |
+| Java 多线程并发提交 graphicsQueue 导致 GPU 长时间后挂 | `VK_ERROR_DEVICE_LOST` (-4)，且 `processImageNative` / `passDataToNative` 日志里 tid 不同 | 给所有 `vkQueueSubmit`/`vkQueuePresentKHR` 加全局 queue mutex |
+| 驱动 bug / 温度导致 GPU hang | `VK_ERROR_DEVICE_LOST` (-4)，单线程也出 | 捕获并尝试重建 device，或上报给机型厂商 |
+| 资源累积泄漏 | `VK_ERROR_OUT_OF_DEVICE_MEMORY` (-2) 或 `VK_ERROR_TOO_MANY_OBJECTS` | 排查 `beginSingleTimeCommands`/`processWithVulkan` 路径 |
+
+---
+
+## 六、日志样例（便于你确认打印是否正常）
+
+正常启动应该看到：
+```
+========== DebugLog opened @ 2026-04-23 14:05:12 (pid=12345) ==========
+[14:05:12.019][tid=12345] android_main start, pid=12345 tid=12345, logPath=/data/user/0/com.inewme.uvmirror/files/face_sdk_debug.log
+[14:05:12.155][tid=12345] >> handle_cmd APP_CMD_START(10) tid=12345
+[14:05:12.155][tid=12345] << handle_cmd APP_CMD_START done
+[14:05:12.210][tid=12345] >> handle_cmd APP_CMD_INIT_WINDOW(1) tid=12345
+[14:05:12.210][tid=12345] handle_cmd APP_CMD_INIT_WINDOW: calling initVulkan()
+[14:05:12.210][tid=12345] FaceApp::initVulkan enter, call#1 _applicationInited=0 _faceAppInited=0 _secondfaceAppInited=0
+[14:05:13.420][tid=12345] FaceApp::initVulkan exit, call#1 _applicationInited=1 _faceAppInited=1 _secondfaceAppInited=1
+[14:05:13.420][tid=12345] handle_cmd APP_CMD_INIT_WINDOW: initVulkan() returned, isInited=1
+[14:05:13.421][tid=12345] << handle_cmd APP_CMD_INIT_WINDOW done
+[14:05:14.005][tid=67890] processImageNative #1 tid=67890 w=480 h=480
+[14:05:14.008][tid=67891] passDataToNative #1 tid=67891 point_count=468 w=480 h=480
+[14:05:35.200][tid=12345] heartbeat: frame=600 exceptions_so_far=0
+```
+
+旋转时如果触发异常应该看到：
+```
+[14:06:10.112][tid=12345] >> handle_cmd APP_CMD_CONFIG_CHANGED(8) tid=12345
+[14:06:10.113][tid=12345] >> handle_cmd APP_CMD_TERM_WINDOW(2) tid=12345
+[14:06:10.113][tid=12345] handle_cmd APP_CMD_TERM_WINDOW: (no handler yet, ...)
+[14:06:10.113][tid=12345] << handle_cmd APP_CMD_TERM_WINDOW done
+[14:06:10.250][tid=12345] >> handle_cmd APP_CMD_INIT_WINDOW(1) tid=12345
+[14:06:10.250][tid=12345] FaceApp::initVulkan enter, call#2 _applicationInited=1 _faceAppInited=1 _secondfaceAppInited=0
+[14:06:10.250][tid=12345] FaceApp::initVulkan exit, call#2 _applicationInited=1 _faceAppInited=1 _secondfaceAppInited=1
+[14:06:10.280][tid=12345] drawFrame[1234] vkAcquireNextImageKHR -> -1000001004 (VK_ERROR_OUT_OF_DATE_KHR) currentFrame=0
+[14:06:10.280][tid=12345] !!! drawFrame std::exception (frame=1234 count=1): failed to acquire swap chain image!
+```
+
+**只要日志里能看到 `vkXxxKHR -> <数值> (<名字>)` 这一行，诊断就成立了。**
+
+---
+
+## 七、文件清单（仅供参考，日常不用动）
+
+```
+app/src/main/cpp/
+  DebugLog.h        新增
+  DebugLog.cpp      新增
+  main.cpp          改：日志初始化 / 心跳 / try-catch / cmd 日志 / JNI tid
+vulkan/
+  Application.cpp   改：drawFrame 4 处 VkResult 日志 + VkResultStr
+  FaceApp.cpp       改：initVulkan 入/出口日志
+CMakeLists.txt      改：加入 DebugLog.cpp 到 Android 构建
+```

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() {
-    // 采样纹理
-    outColor = texture(texSampler, inTexCoord);
+    // 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;
 
-    outFragColor = color;
+    // 屏幕中心（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/DebugLog.cpp

@@ -0,0 +1,165 @@
+#include "DebugLog.h"
+
+#include <android/log.h>
+#include <sys/stat.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+
+#include <cstdarg>
+#include <cstdio>
+#include <ctime>
+#include <cstring>
+#include <mutex>
+#include <string>
+#include <unordered_map>
+
+namespace {
+
+std::mutex  g_mtx;
+FILE*       g_fp = nullptr;
+std::string g_path;
+constexpr size_t kMaxSize = 2 * 1024 * 1024; // 2 MB before rotation
+
+// Throttle bookkeeping: one slot per distinct key passed to log_throttled().
+struct ThrottleSlot {
+    int64_t  last_emit_ms = 0; // when we last actually wrote a line for this key
+    uint32_t suppressed   = 0; // number of calls swallowed since last_emit_ms
+};
+std::unordered_map<std::string, ThrottleSlot> g_throttle;
+constexpr int64_t kThrottleWindowMs = 2000; // 2 seconds
+
+pid_t currentTid() {
+    return static_cast<pid_t>(syscall(SYS_gettid));
+}
+
+int64_t nowMs() {
+    timespec ts{};
+    clock_gettime(CLOCK_MONOTONIC, &ts);
+    return static_cast<int64_t>(ts.tv_sec) * 1000 + ts.tv_nsec / 1000000;
+}
+
+// Assumes g_mtx is held. Writes a single pre-formatted line to disk + logcat.
+void writeLineLocked(const char* body) {
+    pid_t tid = currentTid();
+
+    timespec ts{};
+    clock_gettime(CLOCK_REALTIME, &ts);
+    struct tm tm_info{};
+    localtime_r(&ts.tv_sec, &tm_info);
+    char timebuf[32];
+    strftime(timebuf, sizeof(timebuf), "%H:%M:%S", &tm_info);
+
+    if (g_fp) {
+        std::fprintf(g_fp, "[%s.%03ld][tid=%d] %s\n",
+                     timebuf, ts.tv_nsec / 1000000, tid, body);
+        std::fflush(g_fp);
+    }
+    __android_log_print(ANDROID_LOG_INFO, "FACE_DBG", "[tid=%d] %s", tid, body);
+}
+
+} // namespace
+
+namespace DebugLog {
+
+void init(const char* internalDataPath) {
+    std::lock_guard<std::mutex> lk(g_mtx);
+    if (g_fp) {
+        return; // already initialized
+    }
+
+    const char* base = (internalDataPath && *internalDataPath) ? internalDataPath : "/data/local/tmp";
+    g_path = std::string(base) + "/face_sdk_debug.log";
+
+    // Rotate once if current file is too large.
+    struct stat st{};
+    if (stat(g_path.c_str(), &st) == 0 && static_cast<size_t>(st.st_size) > kMaxSize) {
+        std::string backup = g_path + ".old";
+        std::remove(backup.c_str());
+        std::rename(g_path.c_str(), backup.c_str());
+    }
+
+    g_fp = std::fopen(g_path.c_str(), "a");
+    if (g_fp) {
+        time_t now = time(nullptr);
+        struct tm tm_info{};
+        localtime_r(&now, &tm_info);
+        char tbuf[64];
+        strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %H:%M:%S", &tm_info);
+        std::fprintf(g_fp,
+                     "\n========== DebugLog opened @ %s (pid=%d) ==========\n",
+                     tbuf, getpid());
+        std::fflush(g_fp);
+    }
+
+    __android_log_print(ANDROID_LOG_INFO, "FACE_DBG",
+                        "DebugLog file path: %s", g_path.c_str());
+}
+
+void log(const char* fmt, ...) {
+    char buf[1024];
+    va_list ap;
+    va_start(ap, fmt);
+    int n = std::vsnprintf(buf, sizeof(buf), fmt, ap);
+    va_end(ap);
+    if (n < 0) return;
+
+    std::lock_guard<std::mutex> lk(g_mtx);
+    writeLineLocked(buf);
+}
+
+void log_throttled(const char* key, const char* fmt, ...) {
+    char buf[1024];
+    va_list ap;
+    va_start(ap, fmt);
+    int n = std::vsnprintf(buf, sizeof(buf), fmt, ap);
+    va_end(ap);
+    if (n < 0) return;
+
+    const char* k = key ? key : "";
+    int64_t now = nowMs();
+
+    std::lock_guard<std::mutex> lk(g_mtx);
+    auto it = g_throttle.find(k);
+    if (it == g_throttle.end()) {
+        // First time we see this key -> always log.
+        ThrottleSlot slot;
+        slot.last_emit_ms = now;
+        slot.suppressed   = 0;
+        g_throttle.emplace(k, slot);
+        writeLineLocked(buf);
+        return;
+    }
+
+    ThrottleSlot& slot = it->second;
+    int64_t elapsed = now - slot.last_emit_ms;
+    if (elapsed < kThrottleWindowMs) {
+        // Still inside the 2s window -> swallow.
+        ++slot.suppressed;
+        return;
+    }
+
+    // Window elapsed: emit the line, annotated with how many we swallowed.
+    if (slot.suppressed > 0) {
+        char annotated[1200];
+        std::snprintf(annotated, sizeof(annotated),
+                      "%s (repeated %u times in last %lldms, key=%s)",
+                      buf, slot.suppressed, (long long)elapsed, k);
+        writeLineLocked(annotated);
+    } else {
+        writeLineLocked(buf);
+    }
+    slot.last_emit_ms = now;
+    slot.suppressed   = 0;
+}
+
+void flush() {
+    std::lock_guard<std::mutex> lk(g_mtx);
+    if (g_fp) std::fflush(g_fp);
+}
+
+std::string getLogPath() {
+    std::lock_guard<std::mutex> lk(g_mtx);
+    return g_path;
+}
+
+} // namespace DebugLog

app/src/main/cpp/DebugLog.h

@@ -0,0 +1,33 @@
+#ifndef FACE_SDK_DEBUGLOG_H
+#define FACE_SDK_DEBUGLOG_H
+
+#include <string>
+
+namespace DebugLog {
+
+// Call once (e.g. in android_main) with android_app->activity->internalDataPath.
+// Safe to call multiple times; subsequent calls are no-ops.
+void init(const char* internalDataPath);
+
+// Thread-safe. Also mirrored to logcat with tag "FACE_DBG".
+// Every line is prefixed with timestamp + thread id and flushed to disk immediately,
+// so even a hard crash will preserve the tail.
+void log(const char* fmt, ...) __attribute__((format(printf, 1, 2)));
+
+// Throttled variant keyed by a caller-supplied string.
+// - The first call with a given key is always written.
+// - Subsequent calls with the same key within 2 seconds are suppressed.
+// - When the throttle window elapses, the next matching call is written with a
+//   "(repeated N times in last Xms)" suffix describing the suppressed ones.
+// Use stable, short keys (e.g. "drawFrame.acquire", "drawFrame.present").
+void log_throttled(const char* key, const char* fmt, ...) __attribute__((format(printf, 2, 3)));
+
+// Force flush to disk.
+void flush();
+
+// Absolute path of the log file (valid after init()).
+std::string getLogPath();
+
+} // namespace DebugLog
+
+#endif // FACE_SDK_DEBUGLOG_H

app/src/main/cpp/main.cpp

@@ -3,12 +3,42 @@
 #include <game-activity/native_app_glue/android_native_app_glue.h>
 #include <game-activity/GameActivity.h>
 #include "AndroidOut.h"
+#include "DebugLog.h"
 #include "FaceApp.h"
 #include <android/asset_manager.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+#include <atomic>
 #include <chrono>
 #include <thread>
 
 using namespace std;
+
+static inline pid_t dbg_tid() {
+    return static_cast<pid_t>(syscall(SYS_gettid));
+}
+
+static const char* appCmdName(int32_t cmd) {
+    switch (cmd) {
+        case APP_CMD_INIT_WINDOW:           return "APP_CMD_INIT_WINDOW";
+        case APP_CMD_TERM_WINDOW:           return "APP_CMD_TERM_WINDOW";
+        case APP_CMD_WINDOW_RESIZED:        return "APP_CMD_WINDOW_RESIZED";
+        case APP_CMD_WINDOW_REDRAW_NEEDED:  return "APP_CMD_WINDOW_REDRAW_NEEDED";
+        case APP_CMD_CONTENT_RECT_CHANGED:  return "APP_CMD_CONTENT_RECT_CHANGED";
+        case APP_CMD_GAINED_FOCUS:          return "APP_CMD_GAINED_FOCUS";
+        case APP_CMD_LOST_FOCUS:            return "APP_CMD_LOST_FOCUS";
+        case APP_CMD_CONFIG_CHANGED:        return "APP_CMD_CONFIG_CHANGED";
+        case APP_CMD_LOW_MEMORY:            return "APP_CMD_LOW_MEMORY";
+        case APP_CMD_START:                 return "APP_CMD_START";
+        case APP_CMD_RESUME:                return "APP_CMD_RESUME";
+        case APP_CMD_SAVE_STATE:            return "APP_CMD_SAVE_STATE";
+        case APP_CMD_PAUSE:                 return "APP_CMD_PAUSE";
+        case APP_CMD_STOP:                  return "APP_CMD_STOP";
+        case APP_CMD_DESTROY:               return "APP_CMD_DESTROY";
+        default:                            return "APP_CMD_???";
+    }
+}
+
 extern "C" {
 
 android_app* g_android_app = nullptr;
@@ -19,29 +49,45 @@ jobject g_callback = nullptr;
 jobject g_callbackAnimationFinished = nullptr;
 
 void handle_cmd(android_app *pApp, int32_t cmd) {
+    DebugLog::log(">> handle_cmd %s(%d) tid=%d", appCmdName(cmd), (int)cmd, dbg_tid());
     switch (cmd) {
         case APP_CMD_INIT_WINDOW:
             aout << "APP_CMD_INIT_WINDOW" << std::endl;
-            g_Application->initVulkan();
+            DebugLog::log("handle_cmd APP_CMD_INIT_WINDOW: calling onWindowInit()");
+            g_Application->onWindowInit();
+            DebugLog::log("handle_cmd APP_CMD_INIT_WINDOW: onWindowInit() returned, isInited=%d",
+                          (int)g_Application->isInited());
             break;
         case APP_CMD_TERM_WINDOW:
             aout << "APP_CMD_TERM_WINDOW" << std::endl;
+            DebugLog::log("handle_cmd APP_CMD_TERM_WINDOW: calling onWindowLost()");
+            if (g_Application != nullptr) {
+                g_Application->onWindowLost();
+            }
+            DebugLog::log("handle_cmd APP_CMD_TERM_WINDOW: onWindowLost() returned");
             break;
         default:
             break;
     }
+    DebugLog::log("<< handle_cmd %s done", appCmdName(cmd));
 }
 
 const int ArgLen = 128*1024;
 char g_InitArgString[ArgLen] = {0};
 
 void android_main(struct android_app *pApp) {
+    DebugLog::init(pApp->activity->internalDataPath);
+    DebugLog::log("android_main start, pid=%d tid=%d, logPath=%s",
+                  getpid(), dbg_tid(), DebugLog::getLogPath().c_str());
     aout << "Welcome to android_main" << std::endl;
     g_android_app = pApp;
     g_assetManager = pApp->activity->assetManager;
-    FaceApp application;
-    g_Application = &application;
-    application.SetInitArg(g_InitArgString);
+    //FaceApp application;
+    //g_Application = &application;
+    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);
@@ -73,11 +119,41 @@ void android_main(struct android_app *pApp) {
                     }
             }
         }
-        if(application.isInited())
+        // isInited() checks _applicationInited && _faceAppInited && _sceondInited,
+        // so while the window is gone (between TERM_WINDOW and the next
+        // INIT_WINDOW) this is false and we skip drawFrame entirely — no
+        // exceptions, no log spam. The outer sleep at the bottom already
+        // caps the loop frequency.
+        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);
+
+            static uint64_t s_frameIdx = 0;
+            static uint64_t s_excCount = 0;
+            ++s_frameIdx;
+            if (s_frameIdx % 600 == 0) {
+                DebugLog::log("heartbeat: frame=%llu exceptions_so_far=%llu",
+                              (unsigned long long)s_frameIdx,
+                              (unsigned long long)s_excCount);
+            }
+
+            try {
+                g_Application->drawFrame(frameTime);
+            } catch (const std::exception& e) {
+                ++s_excCount;
+                DebugLog::log_throttled("main.drawFrame.stdexc",
+                              "!!! drawFrame std::exception (frame=%llu count=%llu): %s",
+                              (unsigned long long)s_frameIdx,
+                              (unsigned long long)s_excCount,
+                              e.what());
+            } catch (...) {
+                ++s_excCount;
+                DebugLog::log_throttled("main.drawFrame.unknown",
+                              "!!! drawFrame unknown exception (frame=%llu count=%llu)",
+                              (unsigned long long)s_frameIdx,
+                              (unsigned long long)s_excCount);
+            }
         }
         auto end_time = chrono::duration_cast<chrono::milliseconds>(chrono::system_clock::now().time_since_epoch()).count();
         auto frameTime = end_time - last_update_time;
@@ -89,7 +165,11 @@ void android_main(struct android_app *pApp) {
             this_thread::sleep_for(chrono::milliseconds((35-function_time)));
         }
     } while (!pApp->destroyRequested);
-    application.cleanup();
+    DebugLog::log("android_main: destroyRequested, running cleanup");
+    //application.cleanup();
+    g_Application->cleanupSecondInit();
+    g_Application->clearnSecondFaceApp();
+    DebugLog::log("android_main: exit");
 }
 }
 
@@ -109,6 +189,12 @@ Java_com_hmwl_face_1sdk_FaceActivity_processImageNative(JNIEnv *env, jobject thi
                                                         jint width, jint height, jint format,
                                                         jint row_stride, jint pixel_stride,
                                                         jint rotation) {
+    static std::atomic<uint64_t> s_imgCount{0};
+    uint64_t n = s_imgCount.fetch_add(1) + 1;
+    if (n == 1 || n % 300 == 0) {
+        DebugLog::log("processImageNative #%llu tid=%d w=%d h=%d",
+                      (unsigned long long)n, dbg_tid(), width, height);
+    }
     // TODO: implement processImageNative()
     uint8_t* imageData = static_cast<uint8_t*>(env->GetDirectBufferAddress(buffer));
     jlong capacity = env->GetDirectBufferCapacity(buffer);
@@ -125,6 +211,12 @@ extern "C"
 JNIEXPORT void JNICALL
 Java_com_hmwl_face_1sdk_FaceActivity_passDataToNative(JNIEnv *env, jobject thiz, jobject buffer,
                                                       jint point_count, jint width, jint height) {
+    static std::atomic<uint64_t> s_ptCount{0};
+    uint64_t n = s_ptCount.fetch_add(1) + 1;
+    if (n == 1 || n % 300 == 0) {
+        DebugLog::log("passDataToNative #%llu tid=%d point_count=%d w=%d h=%d",
+                      (unsigned long long)n, dbg_tid(), point_count, width, height);
+    }
     // TODO: implement passDataToNative()
     float* pos = static_cast<float*>(env->GetDirectBufferAddress(buffer));
 
@@ -140,9 +232,9 @@ Java_com_hmwl_face_1sdk_FaceActivity_passDataToNative(JNIEnv *env, jobject thiz,
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_hmwl_face_1sdk_FaceActivity_SetCppInitArg(JNIEnv *env, jobject thiz, jstring json) {
-    // TODO: implement SetCppInitArg()
     const char *nativeString = env->GetStringUTFChars(json, nullptr);
     jsize len = env->GetStringUTFLength(json);
+    DebugLog::log("JNI SetCppInitArg tid=%d len=%d", dbg_tid(), (int)len);
     if(len > ArgLen)
     {
         aout << "ArgLen to long:" << len << std::endl;
@@ -154,7 +246,8 @@ Java_com_hmwl_face_1sdk_FaceActivity_SetCppInitArg(JNIEnv *env, jobject thiz, js
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_hmwl_face_1sdk_FaceActivity_StopRunning(JNIEnv *env, jobject thiz) {
-    g_Application->_running = false;
+    DebugLog::log("JNI StopRunning tid=%d", dbg_tid());
+    g_Application->Stop();
 }
 
 JavaVM* g_jvm = nullptr;
@@ -165,7 +258,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) {
     return JNI_VERSION_1_6;
 }
 
-void CppCallback(const string& motion_type)
+void CppCallback()
 {
     JNIEnv* env = nullptr;
     bool needDetach = false;
@@ -196,7 +289,7 @@ void CppCallback(const string& motion_type)
     }
 
     // 2. 获取 OnLoadActionFinished 方法 ID（注意方法名大小写必须一致！）
-    jmethodID methodId = env->GetMethodID(callbackClass, "OnLoadActionFinished", "(Ljava/lang/String;)V");
+    jmethodID methodId = env->GetMethodID(callbackClass, "OnLoadMotionListFinished", "(Ljava/lang/String;)V");
     if (methodId == nullptr) {
         env->ExceptionDescribe(); // 打印异常
         env->ExceptionClear();
@@ -205,7 +298,7 @@ void CppCallback(const string& motion_type)
     }
 
     // 3. 构造 jstring 参数
-    jstring jResult = env->NewStringUTF(motion_type.c_str());
+    jstring jResult = env->NewStringUTF("ok");
 
     // 4. 调用 Java 回调
     env->CallVoidMethod(g_callback, methodId, jResult);
@@ -258,7 +351,7 @@ void CppAnimationFinishedCallback()
     }
 
     // 2. 获取 OnLoadActionFinished 方法 ID（注意方法名大小写必须一致！）
-    jmethodID methodId = env->GetMethodID(callbackClass, "OnAnimationFinished", "()V");
+    jmethodID methodId = env->GetMethodID(callbackClass, "OnPlayMotionListFinished", "()V");
     if (methodId == nullptr) {
         env->ExceptionDescribe(); // 打印异常
         env->ExceptionClear();
@@ -289,6 +382,7 @@ extern "C"
 JNIEXPORT jstring JNICALL
 Java_com_hmwl_face_1sdk_FaceActivity_PreReadAction(JNIEnv *env, jobject thiz, jstring motion,
                                                    jobject callback) {
+    DebugLog::log("JNI PreReadAction tid=%d", dbg_tid());
     // 清理旧的全局引用
     if (g_callback != nullptr) {
         env->DeleteGlobalRef(g_callback);
@@ -309,18 +403,39 @@ Java_com_hmwl_face_1sdk_FaceActivity_PreReadAction(JNIEnv *env, jobject thiz, js
         aout << "ArgLen to long:" << len << std::endl;
     }
 
-    std::string ret = g_Application->preReadyMotion(nativeString, CppCallback);
+    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);
+    DebugLog::log_throttled("JNI.ChangeMotionCpp",
+                            "JNI ChangeMotionCpp tid=%d len=%d loop=%d",
+                            dbg_tid(), (int)len, (int)loop);
     if(len > ArgLen)
     {
         aout << "ArgLen to long:" << len << std::endl;
@@ -336,6 +451,19 @@ Java_com_hmwl_face_1sdk_FaceActivity_ChangeMotionCpp(JNIEnv *env, jobject thiz,
 
     if(g_Application->isInited())
     {
-        g_Application->changeMotion(nativeString, CppAnimationFinishedCallback, loop);
+        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) {
+    DebugLog::log("JNI StopMotionNative tid=%d", dbg_tid());
+    g_Application->StopMotion();
+}
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_hmwl_face_1sdk_FaceActivity_ResumeMotionNative(JNIEnv *env, jobject thiz) {
+    DebugLog::log("JNI ResumeMotionNative tid=%d", dbg_tid());
+    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";
@@ -96,12 +94,12 @@ public class FaceActivity extends GameActivity implements FaceLandmarkerHelper.L
                             {
                                 detectFace(image);
                             }
-                            else
-                            {
-                                image.close();
-                            }
+//                            else
+//                            {
+//                                image.close();
+//                            }
                         } finally {
-                            //image.close(); // 确保在这里关闭
+                            image.close(); // 确保在这里关闭
                             //Log.d("Camera", "Image closed, ready for next frame");
                         }
                     }
@@ -141,6 +139,16 @@ public class FaceActivity extends GameActivity implements FaceLandmarkerHelper.L
         StopRunning();
     }
 
+    private native void StopMotionNative();
+    public void StopMotion(){
+        StopMotionNative();
+    }
+
+    private native void ResumeMotionNative();
+    public void ResumeMotion(){
+        ResumeMotionNative();
+    }
+
     private native void StopRunning();
 
     // Native 方法
@@ -282,28 +290,39 @@ 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);
     }
 
-    public interface CallbackInterface {
-        void OnLoadActionFinished(String result);
+    public interface LoadMotionListFinishedCallback {
+        void OnLoadMotionListFinished(String result);
     }
 
-    public interface AnimationFinishedCallbackInterface {
-        void OnAnimationFinished();
+    public interface PlayMotionListFinishedCallback {
+        void OnPlayMotionListFinished();
     }
 
-    protected native String PreReadAction(String motion, CallbackInterface callback);
-    protected String PreLoadAction(String json, CallbackInterface callback){
+    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, AnimationFinishedCallbackInterface callback, boolean loop);
-    protected void ChangeMotion(String json, AnimationFinishedCallbackInterface callback, boolean loop){
-        Log.i("FaceActivity", "ChangeState:" + json);
-        ChangeMotionCpp(json, callback, loop);
+    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);
     }
 
     // 添加这个缺失的方法

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

@@ -192,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

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,12 +4,23 @@ import org.json.JSONObject;
 public class InitArg {
     public int action_fps;
     public float zoom;
-
+    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("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 List<String> png_names = new ArrayList<>();
+    public String name = "no";
+    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);
-            JSONArray ja = new JSONArray();
-            for(int i = 0; i < png_names.size(); ++i){
-                ja.put(png_names.get(i));
+            jsonObject.put("name", name);
+            JSONArray jframes = new JSONArray();
+            for(int i = 0; i < frames.size(); ++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();
+    }
+}

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/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

@@ -9,7 +9,7 @@ android {
     compileSdk 36
 
     defaultConfig {
-        applicationId "com.inewme.uvmirror.f20251129"
+        applicationId "com.inewme.uvmirror.f20260113"
         minSdk 30
         targetSdk 36
         versionCode 1