From ba8600ce744354ea1f42953f2ad7c514259693d0 Mon Sep 17 00:00:00 2001
From: Xiang Silian <youmiss@163.com>
Date: Mon, 8 Sep 2025 16:49:57 +0800
Subject: [PATCH] save code

---
 and_proj/app/build.gradle                     |  4 +-
 app/android/AndroidManifest.xml               |  4 ++
 .../khronos/vulkan_samples/MainActivity.java  | 47 ++++++++++++++++++-
 .../vulkan_samples/SecondActivity.java        | 39 +++++++++++++++
 app/android/res/layout/activity_second.xml    | 23 +++++++++
 components/android/src/context.cpp            |  8 +++-
 6 files changed, 121 insertions(+), 4 deletions(-)
 create mode 100644 app/android/java/com/khronos/vulkan_samples/SecondActivity.java
 create mode 100644 app/android/res/layout/activity_second.xml

diff --git a/and_proj/app/build.gradle b/and_proj/app/build.gradle
index 6120a51..8140fb0 100644
--- a/and_proj/app/build.gradle
+++ b/and_proj/app/build.gradle
@@ -12,14 +12,14 @@ android {
 	defaultConfig {
 		applicationId 'com.khronos.vulkan_samples'
 	namespace "com.khronos.vulkan_samples"
-		minSdk 30
+		minSdk 28
 		targetSdk 35
 		versionCode 1
 		versionName "1.0"
 
 		externalNativeBuild {
 			cmake {
-				abiFilters.addAll( 'arm64-v8a' )
+				abiFilters.addAll( 'arm64-v8a', 'x86_64')
 				arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_static', '-DVKB_VALIDATION_LAYERS=OFF'
 			}
 		}
diff --git a/app/android/AndroidManifest.xml b/app/android/AndroidManifest.xml
index 92ad2e1..86f3efe 100644
--- a/app/android/AndroidManifest.xml
+++ b/app/android/AndroidManifest.xml
@@ -44,6 +44,10 @@
 				android:value="@string/native_lib_name" />
 		</activity>
 
+		<activity
+			android:name=".SecondActivity"
+			android:exported="false" />
+
 		<provider
 			android:authorities="${applicationId}.provider"
 			android:name="androidx.core.content.FileProvider"
diff --git a/app/android/java/com/khronos/vulkan_samples/MainActivity.java b/app/android/java/com/khronos/vulkan_samples/MainActivity.java
index 293ddae..6a5f1a7 100644
--- a/app/android/java/com/khronos/vulkan_samples/MainActivity.java
+++ b/app/android/java/com/khronos/vulkan_samples/MainActivity.java
@@ -1,8 +1,12 @@
 package com.khronos.vulkan_samples;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Debug;
 import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.Toast;
 
 import androidx.activity.EdgeToEdge;
@@ -17,8 +21,8 @@ public class MainActivity extends GameActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        String native_lib_name = getResources().getString(R.string.native_lib_name);
         try {
-            String native_lib_name = getResources().getString(R.string.native_lib_name);
             System.loadLibrary(native_lib_name);
         } catch (UnsatisfiedLinkError e) {
             Toast.makeText(getApplicationContext(), "Native code library failed to load.", Toast.LENGTH_SHORT).show();
@@ -29,6 +33,47 @@ public class MainActivity extends GameActivity {
         sendArgumentsToPlatform(argArray);
         super.onCreate(savedInstanceState);
         Log.i("MainActivity", "onCreate: ");
+
+        // 添加按钮到布局
+        addButtonToLayout();
     }
+
+    private void addButtonToLayout() {
+        // 创建按钮
+        Button button = new Button(this);
+        button.setText("Vulkan 按钮");
+
+        // 设置按钮位置（使用绝对坐标）
+        button.setX(50);  // 距离左边50像素
+        button.setY(50);  // 距离顶部50像素
+
+        // 设置按钮点击事件
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onButtonClicked();
+            }
+        });
+
+        // 将按钮添加到 GameActivity 的布局中（不会覆盖 Vulkan 表面）
+        addContentView(button, new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.WRAP_CONTENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+        ));
+    }
+
+
+    private void onButtonClicked() {
+        Toast.makeText(this, "Vulkan 按钮被点击了!", Toast.LENGTH_SHORT).show();
+        nativeButtonClicked();
+        // 启动SecondActivity
+        Intent intent = new Intent(MainActivity.this, SecondActivity.class);
+        // 可以传递数据
+        intent.putExtra("message", "Hello from MainActivity!");
+        startActivity(intent);
+    }
+
+    private native void nativeButtonClicked();
+
     private native void sendArgumentsToPlatform(String[] args);
 }
\ No newline at end of file
diff --git a/app/android/java/com/khronos/vulkan_samples/SecondActivity.java b/app/android/java/com/khronos/vulkan_samples/SecondActivity.java
new file mode 100644
index 0000000..c23a960
--- /dev/null
+++ b/app/android/java/com/khronos/vulkan_samples/SecondActivity.java
@@ -0,0 +1,39 @@
+package com.khronos.vulkan_samples;
+import androidx.appcompat.app.AppCompatActivity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+public class SecondActivity extends AppCompatActivity {
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_second);
+        
+        TextView textView = findViewById(R.id.textViewSecond);
+        Button buttonBack = findViewById(R.id.buttonBack);
+        
+        // 接收从MainActivity传递的数据
+        Intent intent = getIntent();
+        if (intent != null && intent.hasExtra("message")) {
+            String message = intent.getStringExtra("message");
+            textView.setText(message);
+        }
+        
+        buttonBack.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                // 返回数据到MainActivity
+                Intent returnIntent = new Intent();
+                returnIntent.putExtra("returnData", "Hello back from SecondActivity!");
+                setResult(RESULT_OK, returnIntent);
+                
+                // 结束当前Activity
+                finish();
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/android/res/layout/activity_second.xml b/app/android/res/layout/activity_second.xml
new file mode 100644
index 0000000..ed8443d
--- /dev/null
+++ b/app/android/res/layout/activity_second.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp"
+    android:gravity="center">
+    
+    <TextView
+        android:id="@+id/textViewSecond"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Second Activity"
+        android:textSize="24sp"
+        android:layout_marginBottom="32dp"/>
+    
+    <Button
+        android:id="@+id/buttonBack"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Back to Main Activity"/>
+    
+</LinearLayout>
\ No newline at end of file
diff --git a/components/android/src/context.cpp b/components/android/src/context.cpp
index 8f25d94..c2042ce 100644
--- a/components/android/src/context.cpp
+++ b/components/android/src/context.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "android/context.hpp"
-
+#include "core/util/logging.hpp"
 #include <jni.h>
 
 extern "C"
@@ -101,4 +101,10 @@ Java_com_khronos_vulkan_1samples_MainActivity_sendArgumentsToPlatform(JNIEnv *en
     }
 
     vkb::AndroidPlatformContext::android_arguments = args;
+}
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_khronos_vulkan_1samples_MainActivity_nativeButtonClicked(JNIEnv *env, jobject thiz) {
+    // TODO: implement nativeButtonClicked()
+	LOGI("call MainActivity_nativeButtonClicked.");
 }
\ No newline at end of file