diff --git a/app/build.gradle b/app/build.gradle
index 09cb51b..da81e90 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,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 {
diff --git a/example/build.gradle b/example/build.gradle
index ed25e85..6fe8693 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -9,7 +9,7 @@ android {
compileSdk 36
defaultConfig {
- applicationId "com.inewme.uvmirror.f20251112"
+ applicationId "com.inewme.uvmirror.f20251118"
minSdk 30
targetSdk 36
versionCode 1
@@ -20,6 +20,7 @@ android {
buildTypes {
release {
+ signingConfig signingConfigs.debug
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
@@ -63,7 +64,7 @@ dependencies {
implementation "androidx.compose.runtime:runtime:1.5.0"
implementation "androidx.activity:activity-compose:1.7.2" // �ؼ����ṩ setContent
- debugImplementation("androidx.compose.ui:ui-tooling:1.5.4")
+ implementation "androidx.compose.ui:ui-tooling:1.5.4"
def camerax_version = '1.4.2'
implementation "androidx.camera:camera-core:$camerax_version"
diff --git a/example/src/main/assets/pic/11.png b/example/src/main/assets/pic/11.png
index ddc955b..fcaca18 100644
Binary files a/example/src/main/assets/pic/11.png and b/example/src/main/assets/pic/11.png differ
diff --git a/example/src/main/assets/pic/11/11.png b/example/src/main/assets/pic/11/11.png
index ddc955b..fcaca18 100644
Binary files a/example/src/main/assets/pic/11/11.png and b/example/src/main/assets/pic/11/11.png differ
diff --git a/example/src/main/assets/pic/23.png b/example/src/main/assets/pic/23.png
index e4cff43..037af80 100644
Binary files a/example/src/main/assets/pic/23.png and b/example/src/main/assets/pic/23.png differ
diff --git a/example/src/main/assets/pic/23/23.png b/example/src/main/assets/pic/23/23.png
index e4cff43..037af80 100644
Binary files a/example/src/main/assets/pic/23/23.png and b/example/src/main/assets/pic/23/23.png differ
diff --git a/example/src/main/assets/pic/24.png b/example/src/main/assets/pic/24.png
index 787078e..ff8a150 100644
Binary files a/example/src/main/assets/pic/24.png and b/example/src/main/assets/pic/24.png differ
diff --git a/example/src/main/assets/pic/24/24.png b/example/src/main/assets/pic/24/24.png
index 787078e..ff8a150 100644
Binary files a/example/src/main/assets/pic/24/24.png and b/example/src/main/assets/pic/24/24.png differ
diff --git a/example/src/main/assets/pic/26.png b/example/src/main/assets/pic/26.png
index 0eb9e2f..390f03c 100644
Binary files a/example/src/main/assets/pic/26.png and b/example/src/main/assets/pic/26.png differ
diff --git a/example/src/main/assets/pic/26/26.png b/example/src/main/assets/pic/26/26.png
index 0eb9e2f..390f03c 100644
Binary files a/example/src/main/assets/pic/26/26.png and b/example/src/main/assets/pic/26/26.png differ
diff --git a/example/src/main/assets/pic/27.png b/example/src/main/assets/pic/27.png
index a659059..50da06e 100644
Binary files a/example/src/main/assets/pic/27.png and b/example/src/main/assets/pic/27.png differ
diff --git a/example/src/main/assets/pic/27/27.png b/example/src/main/assets/pic/27/27.png
index a659059..50da06e 100644
Binary files a/example/src/main/assets/pic/27/27.png and b/example/src/main/assets/pic/27/27.png differ
diff --git a/example/src/main/assets/pic/4.png b/example/src/main/assets/pic/4.png
index 1ef1851..7842427 100644
Binary files a/example/src/main/assets/pic/4.png and b/example/src/main/assets/pic/4.png differ
diff --git a/example/src/main/assets/pic/4/4.png b/example/src/main/assets/pic/4/4.png
index 1ef1851..7842427 100644
Binary files a/example/src/main/assets/pic/4/4.png and b/example/src/main/assets/pic/4/4.png differ
diff --git a/example/src/main/assets/pic/49.png b/example/src/main/assets/pic/49.png
index 4de2382..c48796e 100644
Binary files a/example/src/main/assets/pic/49.png and b/example/src/main/assets/pic/49.png differ
diff --git a/example/src/main/assets/pic/49/49.png b/example/src/main/assets/pic/49/49.png
index 4de2382..c48796e 100644
Binary files a/example/src/main/assets/pic/49/49.png and b/example/src/main/assets/pic/49/49.png differ
diff --git a/example/src/main/assets/pic/5.png b/example/src/main/assets/pic/5.png
index 388c97e..9527950 100644
Binary files a/example/src/main/assets/pic/5.png and b/example/src/main/assets/pic/5.png differ
diff --git a/example/src/main/assets/pic/5/5.png b/example/src/main/assets/pic/5/5.png
index 388c97e..9527950 100644
Binary files a/example/src/main/assets/pic/5/5.png and b/example/src/main/assets/pic/5/5.png differ
diff --git a/example/src/main/assets/pic/6.png b/example/src/main/assets/pic/6.png
index bff8bff..a182c2e 100644
Binary files a/example/src/main/assets/pic/6.png and b/example/src/main/assets/pic/6.png differ
diff --git a/example/src/main/assets/pic/6/6.png b/example/src/main/assets/pic/6/6.png
index bff8bff..a182c2e 100644
Binary files a/example/src/main/assets/pic/6/6.png and b/example/src/main/assets/pic/6/6.png differ
diff --git a/example/src/main/assets/pic/68.png b/example/src/main/assets/pic/68.png
index 17ec183..c4bac40 100644
Binary files a/example/src/main/assets/pic/68.png and b/example/src/main/assets/pic/68.png differ
diff --git a/example/src/main/assets/pic/68/68.png b/example/src/main/assets/pic/68/68.png
index 17ec183..c4bac40 100644
Binary files a/example/src/main/assets/pic/68/68.png and b/example/src/main/assets/pic/68/68.png differ
diff --git a/example/src/main/assets/pic/7.png b/example/src/main/assets/pic/7.png
index 7c34052..80ab6d9 100644
Binary files a/example/src/main/assets/pic/7.png and b/example/src/main/assets/pic/7.png differ
diff --git a/example/src/main/assets/pic/7/7.png b/example/src/main/assets/pic/7/7.png
index 7c34052..80ab6d9 100644
Binary files a/example/src/main/assets/pic/7/7.png and b/example/src/main/assets/pic/7/7.png differ
diff --git a/example/src/main/assets/pic/76.png b/example/src/main/assets/pic/76.png
index 1431084..18b08b2 100644
Binary files a/example/src/main/assets/pic/76.png and b/example/src/main/assets/pic/76.png differ
diff --git a/example/src/main/assets/pic/76/76.png b/example/src/main/assets/pic/76/76.png
index 1431084..18b08b2 100644
Binary files a/example/src/main/assets/pic/76/76.png and b/example/src/main/assets/pic/76/76.png differ
diff --git a/example/src/main/assets/pic/77.png b/example/src/main/assets/pic/77.png
index 8a7a476..ba46d98 100644
Binary files a/example/src/main/assets/pic/77.png and b/example/src/main/assets/pic/77.png differ
diff --git a/example/src/main/assets/pic/77/77.png b/example/src/main/assets/pic/77/77.png
index 8a7a476..ba46d98 100644
Binary files a/example/src/main/assets/pic/77/77.png and b/example/src/main/assets/pic/77/77.png differ
diff --git a/example/src/main/assets/pic/78.png b/example/src/main/assets/pic/78.png
index 834e1b4..cef6e74 100644
Binary files a/example/src/main/assets/pic/78.png and b/example/src/main/assets/pic/78.png differ
diff --git a/example/src/main/assets/pic/78/78.png b/example/src/main/assets/pic/78/78.png
index 834e1b4..cef6e74 100644
Binary files a/example/src/main/assets/pic/78/78.png and b/example/src/main/assets/pic/78/78.png differ
diff --git a/example/src/main/assets/pic/81.png b/example/src/main/assets/pic/81.png
index 7d57236..7892c44 100644
Binary files a/example/src/main/assets/pic/81.png and b/example/src/main/assets/pic/81.png differ
diff --git a/example/src/main/assets/pic/81/81.png b/example/src/main/assets/pic/81/81.png
index 7d57236..7892c44 100644
Binary files a/example/src/main/assets/pic/81/81.png and b/example/src/main/assets/pic/81/81.png differ
diff --git a/example/src/main/java/com/inewme/uvmirror/MakeupActivity.kt b/example/src/main/java/com/inewme/uvmirror/MakeupActivity.kt
index ab508ee..75ae2be 100644
--- a/example/src/main/java/com/inewme/uvmirror/MakeupActivity.kt
+++ b/example/src/main/java/com/inewme/uvmirror/MakeupActivity.kt
@@ -54,10 +54,9 @@ class MakeupActivity : FaceActivity() {
when (event.action) {
MotionEvent.ACTION_DOWN -> {
Log.d("TouchEvent", "手指按下 - X: ${event.x}, Y: ${event.y}")
- if(curIndex == 1)
+ if(curIndex == 31)
{
- Stop();
- finish();
+
}
}
MotionEvent.ACTION_MOVE -> {
@@ -69,6 +68,8 @@ class MakeupActivity : FaceActivity() {
pngFilesByFolder?.let { folders ->
if (curIndex > folders.size - 1) {
curIndex = 0
+ Stop();
+ finish();
}
ChangeState(getCurMotionState(curIndex))
Toast.makeText(this, folders[curIndex].folderName, Toast.LENGTH_LONG).show()
diff --git a/example/src/main/res/values/strings.xml b/example/src/main/res/values/strings.xml
index 468f9ea..7dcd4e0 100644
--- a/example/src/main/res/values/strings.xml
+++ b/example/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
- f20251112
+ f20251118
\ No newline at end of file
diff --git a/vulkan/FaceApp.cpp b/vulkan/FaceApp.cpp
index be25a7a..2a6126f 100644
--- a/vulkan/FaceApp.cpp
+++ b/vulkan/FaceApp.cpp
@@ -747,6 +747,7 @@ void FaceApp::initVulkan()
last_update_time = getCurrentTimeMillis();
changeMotion(_initArg.motion);
+ _running = true;
faceAppInited = true;
#if _WIN32
std::vector floatArray;