From 6189898878ddb74ca38e82f84ebf5b1af941b8bc Mon Sep 17 00:00:00 2001 From: bofeng-song Date: Tue, 20 Sep 2022 11:38:42 +0800 Subject: [PATCH] support create surfaceview dynamically at android platform (#12551) * support create surfaceview dynamically at android platform --- .../java/src/com/cocos/lib/CocosActivity.java | 52 +++++++--- .../src/com/cocos/lib/CocosSurfaceView.java | 14 +-- .../src/com/cocos/lib/CocosTouchHandler.java | 26 ++--- .../android/jni/JniCocosSurfaceView.cpp | 95 ++++++++++--------- .../android/libcocos2dx/proguard-rules.pro | 5 + .../platform/java/modules/SystemWindow.cpp | 37 +++++++- .../platform/java/modules/SystemWindow.h | 8 +- 7 files changed, 159 insertions(+), 78 deletions(-) diff --git a/native/cocos/platform/android/java/src/com/cocos/lib/CocosActivity.java b/native/cocos/platform/android/java/src/com/cocos/lib/CocosActivity.java index bf9b6f7cb2..ff6834f806 100644 --- a/native/cocos/platform/android/java/src/com/cocos/lib/CocosActivity.java +++ b/native/cocos/platform/android/java/src/com/cocos/lib/CocosActivity.java @@ -24,6 +24,7 @@ package com.cocos.lib; +import android.annotation.SuppressLint; import android.content.Context; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; @@ -42,16 +43,18 @@ import android.widget.FrameLayout; import com.google.androidgamesdk.GameActivity; import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; public class CocosActivity extends GameActivity { private static final String TAG = "CocosActivity"; - private static final boolean ENABLE_SUBSURFACE = false; private CocosWebViewHelper mWebViewHelper = null; private CocosVideoHelper mVideoHelper = null; private CocosOrientationHelper mOrientationHelper = null; private CocosSensorHandler mSensorHandler; - private CocosSurfaceView mSubsurfaceView; + private List mSurfaceViewArray; + private FrameLayout mRootLayout; @@ -114,22 +117,18 @@ public class CocosActivity extends GameActivity { } protected void initView() { - FrameLayout frameLayout = findViewById(contentViewId); + mRootLayout = findViewById(contentViewId); if (mWebViewHelper == null) { - mWebViewHelper = new CocosWebViewHelper(frameLayout); + mWebViewHelper = new CocosWebViewHelper(mRootLayout); } if (mVideoHelper == null) { - mVideoHelper = new CocosVideoHelper(this, frameLayout); - } - if (ENABLE_SUBSURFACE) { - mSubsurfaceView = new CocosSurfaceView(this); - mSubsurfaceView.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)); - //mSubsurfaceView.setBackgroundColor(Color.BLUE); - frameLayout.addView(mSubsurfaceView, 1000, 1000); + mVideoHelper = new CocosVideoHelper(this, mRootLayout); } } + + public SurfaceView getSurfaceView() { return this.mSurfaceView; } @@ -168,12 +167,22 @@ public class CocosActivity extends GameActivity { protected void onStop() { super.onStop(); mSurfaceView.setVisibility(View.INVISIBLE); + if (null != mSurfaceViewArray) { + for (CocosSurfaceView surfaceView : mSurfaceViewArray) { + surfaceView.setVisibility(View.INVISIBLE); + } + } } @Override protected void onStart() { super.onStart(); mSurfaceView.setVisibility(View.VISIBLE); + if (null != mSurfaceViewArray) { + for (CocosSurfaceView surfaceView : mSurfaceViewArray) { + surfaceView.setVisibility(View.VISIBLE); + } + } } @Override @@ -184,6 +193,27 @@ public class CocosActivity extends GameActivity { } } + // invoke from native code + @SuppressWarnings({"UnusedDeclaration"}) + private void createSurface(int x, int y, int width, int height, int windowId) { + runOnUiThread(new Runnable() { + @Override + public void run() { + CocosSurfaceView view = new CocosSurfaceView(CocosActivity.this, windowId); + view.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)); + FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(width, height); + params.leftMargin = x; + params.topMargin = y; + //mSubsurfaceView.setBackgroundColor(Color.BLUE); + mRootLayout.addView(view, params); + if (null == mSurfaceViewArray) { + mSurfaceViewArray = new ArrayList<>(); + } + mSurfaceViewArray.add(view); + } + }); + } + private void onLoadNativeLibraries() { try { ApplicationInfo ai = getPackageManager().getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA); diff --git a/native/cocos/platform/android/java/src/com/cocos/lib/CocosSurfaceView.java b/native/cocos/platform/android/java/src/com/cocos/lib/CocosSurfaceView.java index 7013df6872..62b5486574 100644 --- a/native/cocos/platform/android/java/src/com/cocos/lib/CocosSurfaceView.java +++ b/native/cocos/platform/android/java/src/com/cocos/lib/CocosSurfaceView.java @@ -34,17 +34,19 @@ import android.view.SurfaceView; public class CocosSurfaceView extends SurfaceView implements android.view.SurfaceHolder.Callback2 { private CocosTouchHandler mTouchHandler; private long mNativeHandle; + private int mWindowId; - public CocosSurfaceView(Context context) { + public CocosSurfaceView(Context context, int windowId) { super(context); - mNativeHandle = constructNative(); - mTouchHandler = new CocosTouchHandler(mNativeHandle); + mWindowId = windowId; + mNativeHandle = constructNative(windowId); + mTouchHandler = new CocosTouchHandler(mWindowId); getHolder().addCallback(this); } - private native long constructNative(); + private native long constructNative(int windowId); private native void destructNative(long handle); - private native void onSizeChangedNative(long handle, int width, final int height); + private native void onSizeChangedNative(int windowId, int width, final int height); private native void onSurfaceRedrawNeededNative(long handle); private native void onSurfaceCreatedNative(long handle, Surface surface); private native void onSurfaceChangedNative(long handle, Surface surface, int format, int width, int height); @@ -57,7 +59,7 @@ public class CocosSurfaceView extends SurfaceView implements android.view.Surfac CocosHelper.runOnGameThreadAtForeground(new Runnable() { @Override public void run() { - onSizeChangedNative(mNativeHandle, w, h); + onSizeChangedNative(mWindowId, w, h); } }); } diff --git a/native/cocos/platform/android/java/src/com/cocos/lib/CocosTouchHandler.java b/native/cocos/platform/android/java/src/com/cocos/lib/CocosTouchHandler.java index e67ff9a893..729aba1d47 100644 --- a/native/cocos/platform/android/java/src/com/cocos/lib/CocosTouchHandler.java +++ b/native/cocos/platform/android/java/src/com/cocos/lib/CocosTouchHandler.java @@ -33,10 +33,10 @@ import android.view.SurfaceView; public class CocosTouchHandler { public final static String TAG = "CocosTouchHandler"; private boolean mStopHandleTouchAndKeyEvents = false; - private long mNativeHandle; + private int mWindowId; - public CocosTouchHandler(long handle) { - mNativeHandle = handle; + public CocosTouchHandler(int windowId) { + mWindowId = windowId; } boolean onTouchEvent(MotionEvent pMotionEvent) { @@ -66,7 +66,7 @@ public class CocosTouchHandler { CocosHelper.runOnGameThreadAtForeground(new Runnable() { @Override public void run() { - handleActionDown(mNativeHandle, idPointerDown, xPointerDown, yPointerDown); + handleActionDown(mWindowId, idPointerDown, xPointerDown, yPointerDown); } }); break; @@ -85,7 +85,7 @@ public class CocosTouchHandler { CocosHelper.runOnGameThreadAtForeground(new Runnable() { @Override public void run() { - handleActionDown(mNativeHandle, idDown, xDown, yDown); + handleActionDown(mWindowId, idDown, xDown, yDown); } }); @@ -95,7 +95,7 @@ public class CocosTouchHandler { CocosHelper.runOnGameThreadAtForeground(new Runnable() { @Override public void run() { - handleActionMove(mNativeHandle, ids, xs, ys); + handleActionMove(mWindowId, ids, xs, ys); } }); @@ -109,7 +109,7 @@ public class CocosTouchHandler { CocosHelper.runOnGameThreadAtForeground(new Runnable() { @Override public void run() { - handleActionUp(mNativeHandle, idPointerUp, xPointerUp, yPointerUp); + handleActionUp(mWindowId, idPointerUp, xPointerUp, yPointerUp); } }); @@ -123,7 +123,7 @@ public class CocosTouchHandler { CocosHelper.runOnGameThreadAtForeground(new Runnable() { @Override public void run() { - handleActionUp(mNativeHandle, idUp, xUp, yUp); + handleActionUp(mWindowId, idUp, xUp, yUp); } }); @@ -133,7 +133,7 @@ public class CocosTouchHandler { CocosHelper.runOnGameThreadAtForeground(new Runnable() { @Override public void run() { - handleActionCancel(mNativeHandle, ids, xs, ys); + handleActionCancel(mWindowId, ids, xs, ys); } }); break; @@ -173,12 +173,12 @@ public class CocosTouchHandler { Log.d(TAG, sb.toString()); } - private native void handleActionDown(long handle, final int id, final float x, final float y); + private native void handleActionDown(int windowId, final int id, final float x, final float y); - private native void handleActionMove(long handle, final int[] ids, final float[] xPointerList, final float[] yPointerList); + private native void handleActionMove(int windowId, final int[] ids, final float[] xPointerList, final float[] yPointerList); - private native void handleActionUp(long handle, final int id, final float x, final float y); + private native void handleActionUp(int windowId, final int id, final float x, final float y); - private native void handleActionCancel(long handle, final int[] ids, final float[] xPointerList, final float[] yPointerList); + private native void handleActionCancel(int windowId, final int[] ids, final float[] xPointerList, final float[] yPointerList); } diff --git a/native/cocos/platform/android/jni/JniCocosSurfaceView.cpp b/native/cocos/platform/android/jni/JniCocosSurfaceView.cpp index 97e034a8c0..b12ce6ea52 100644 --- a/native/cocos/platform/android/jni/JniCocosSurfaceView.cpp +++ b/native/cocos/platform/android/jni/JniCocosSurfaceView.cpp @@ -41,6 +41,10 @@ struct cc::TouchEvent touchEvent; class NativeWindowCache { public: + explicit NativeWindowCache(int windowId) :_windowId{windowId} { + + } + ~NativeWindowCache() { setSurface(nullptr); } @@ -60,27 +64,24 @@ public: return _nativeWindow; } + int getWindowId() const { + return _windowId; + } + JNIEnv *env; private: + int _windowId{0}; ANativeWindow *_nativeWindow{nullptr}; }; - -uint32_t getWindowIdFromWindowCache(jlong windowCacheHandle) { - auto *windowCache = reinterpret_cast(windowCacheHandle); - auto *windowMgr = cc::BasePlatform::getPlatform()->getInterface(); - cc::ISystemWindow *window = windowMgr->getWindowFromANativeWindow(windowCache->getNativeWindow()); - CC_ASSERT(window); - return window->getWindowId(); -} } // namespace //#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, "JniCocosSurfaceView JNI", __VA_ARGS__) extern "C" { -JNIEXPORT jlong Java_com_cocos_lib_CocosSurfaceView_constructNative(JNIEnv *env, jobject /*thiz*/) { //NOLINT JNI function name - auto *cache = ccnew NativeWindowCache(); +JNIEXPORT jlong Java_com_cocos_lib_CocosSurfaceView_constructNative(JNIEnv *env, jobject /*thiz*/, jint windowId) {//NOLINT JNI function name + auto *cache = ccnew NativeWindowCache(windowId); cache->env = env; return reinterpret_cast(cache); } @@ -90,9 +91,9 @@ JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_destructNative(JNIEnv CC_SAFE_DELETE(windowCache); } -JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_onSizeChangedNative(JNIEnv * /*env*/, jobject /*thiz*/, jlong handle, jint width, jint height) { //NOLINT JNI function name +JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_onSizeChangedNative(JNIEnv */*env*/, jobject /*thiz*/, jint windowId, jint width, jint height) {//NOLINT JNI function name cc::WindowEvent ev; - ev.windowId = getWindowIdFromWindowCache(handle); + ev.windowId = windowId; ev.type = cc::WindowEvent::Type::SIZE_CHANGED; ev.width = width; ev.height = height; @@ -113,22 +114,18 @@ JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_onSurfaceCreatedNativ auto *platform = static_cast(cc::BasePlatform::getPlatform()); auto *windowMgr = platform->getInterface(); + auto *iSysWindow = windowMgr->getWindow(windowCache->getWindowId()); + auto *sysWindow = static_cast(iSysWindow); + sysWindow->setWindowHandle(nativeWindow); if (oldNativeWindow) { - auto *iSysWindow = windowMgr->getWindowFromANativeWindow(oldNativeWindow); - auto *sysWindow = static_cast(iSysWindow); - sysWindow->setWindowHandle(nativeWindow); - - cc::CustomEvent event; - event.name = EVENT_RECREATE_WINDOW; - event.args->ptrVal = reinterpret_cast(sysWindow->getWindowId()); - auto *platform = static_cast(cc::BasePlatform::getPlatform()); - platform->dispatchEvent(event); - } else { - cc::ISystemWindowInfo info; - info.width = ANativeWindow_getWidth(nativeWindow); - info.height = ANativeWindow_getHeight(nativeWindow); - info.externalHandle = nativeWindow; - cc::ISystemWindow *window = windowMgr->createWindow(info); + auto func = [sysWindow]() -> void { + cc::CustomEvent event; + event.name = EVENT_RECREATE_WINDOW; + event.args->ptrVal = reinterpret_cast(sysWindow->getWindowId()); + auto *platform = static_cast(cc::BasePlatform::getPlatform()); + platform->dispatchEvent(event); + }; + CC_CURRENT_ENGINE()->getScheduler()->performFunctionInCocosThread(func); } } @@ -155,15 +152,18 @@ JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_onSurfaceChangedNativ windowCache->setSurface(surface); ANativeWindow *newNativeWindow = windowCache->getNativeWindow(); if (oldNativeWindow != newNativeWindow) { - auto *iSysWindow = CC_GET_PLATFORM_INTERFACE(cc::SystemWindowManager)->getWindowFromANativeWindow(oldNativeWindow); + auto *iSysWindow = CC_GET_PLATFORM_INTERFACE(cc::SystemWindowManager)->getWindow(windowCache->getWindowId()); auto *sysWindow = static_cast(iSysWindow); sysWindow->setWindowHandle(newNativeWindow); - cc::CustomEvent event; - event.name = EVENT_RECREATE_WINDOW; - event.args->ptrVal = reinterpret_cast(sysWindow->getWindowId()); - auto *platform = static_cast(cc::BasePlatform::getPlatform()); - platform->dispatchEvent(event); + auto func = [sysWindow]() -> void { + cc::CustomEvent event; + event.name = EVENT_RECREATE_WINDOW; + event.args->ptrVal = reinterpret_cast(sysWindow->getWindowId()); + auto *platform = static_cast(cc::BasePlatform::getPlatform()); + platform->dispatchEvent(event); + }; + CC_CURRENT_ENGINE()->getScheduler()->performFunctionInCocosThread(func); } // Release the window we acquired earlier. if (oldNativeWindow != nullptr) { @@ -177,25 +177,28 @@ JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_onSurfaceDestroyedNat ANativeWindow *nativeWindow = windowCache->getNativeWindow(); // todo: destroy gfx surface - auto *platform = static_cast(cc::BasePlatform::getPlatform()); - cc::CustomEvent event; - event.name = EVENT_DESTROY_WINDOW; - event.args->ptrVal = reinterpret_cast(nativeWindow); - platform->dispatchEvent(event); + auto func = [nativeWindow]() -> void { + auto *platform = static_cast(cc::BasePlatform::getPlatform()); + cc::CustomEvent event; + event.name = EVENT_DESTROY_WINDOW; + event.args->ptrVal = reinterpret_cast(nativeWindow); + platform->dispatchEvent(event); + }; + CC_CURRENT_ENGINE()->getScheduler()->performFunctionInCocosThread(func); } // NOLINTNEXTLINE JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionDown(JNIEnv *env, //NOLINT JNI function name jobject obj, - jlong windowCacheHandle, + jint windowId, jint id, jfloat x, jfloat y) { CC_UNUSED_PARAM(env); CC_UNUSED_PARAM(obj); - touchEvent.windowId = getWindowIdFromWindowCache(windowCacheHandle); + touchEvent.windowId = windowId; touchEvent.type = cc::TouchEvent::Type::BEGAN; touchEvent.touches.emplace_back(x, y, id); auto *platform = static_cast(cc::BasePlatform::getPlatform()); @@ -206,14 +209,14 @@ Java_com_cocos_lib_CocosTouchHandler_handleActionDown(JNIEnv *env, //NOLINT JNI // NOLINTNEXTLINE JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionUp(JNIEnv *env, //NOLINT JNI function name jobject obj, - jlong windowCacheHandle, + jint windowId, jint id, jfloat x, jfloat y) { CC_UNUSED_PARAM(env); CC_UNUSED_PARAM(obj); - touchEvent.windowId = getWindowIdFromWindowCache(windowCacheHandle); + touchEvent.windowId = windowId; touchEvent.type = cc::TouchEvent::Type::ENDED; touchEvent.touches.emplace_back(x, y, id); auto *platform = static_cast(cc::BasePlatform::getPlatform()); @@ -224,13 +227,13 @@ JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionUp(JNIEn // NOLINTNEXTLINE JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionMove(JNIEnv *env, //NOLINT JNI function name jobject obj, - jlong windowCacheHandle, + jint windowId, jintArray ids, jfloatArray xs, jfloatArray ys) { CC_UNUSED_PARAM(obj); - touchEvent.windowId = getWindowIdFromWindowCache(windowCacheHandle); + touchEvent.windowId = windowId; touchEvent.type = cc::TouchEvent::Type::MOVED; int size = env->GetArrayLength(ids); jint id[size]; @@ -252,13 +255,13 @@ JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionMove(JNI // NOLINTNEXTLINE JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionCancel(JNIEnv *env, //NOLINT JNI function name jobject obj, - jlong windowCacheHandle, + jint windowId, jintArray ids, jfloatArray xs, jfloatArray ys) { CC_UNUSED_PARAM(obj); - touchEvent.windowId = getWindowIdFromWindowCache(windowCacheHandle); + touchEvent.windowId = windowId; touchEvent.type = cc::TouchEvent::Type::CANCELLED; int size = env->GetArrayLength(ids); jint id[size]; diff --git a/native/cocos/platform/android/libcocos2dx/proguard-rules.pro b/native/cocos/platform/android/libcocos2dx/proguard-rules.pro index 452c999aec..031a158bb4 100644 --- a/native/cocos/platform/android/libcocos2dx/proguard-rules.pro +++ b/native/cocos/platform/android/libcocos2dx/proguard-rules.pro @@ -10,3 +10,8 @@ # Add any project specific keep options here: -keep public class com.google.** { *; } -keep public class androidx.** { *; } +-keep class com.cocos.lib.CocosActivity { + public ; + protected ; + private void createSurface(...); +} diff --git a/native/cocos/platform/java/modules/SystemWindow.cpp b/native/cocos/platform/java/modules/SystemWindow.cpp index 9df4727b11..0fb43277be 100644 --- a/native/cocos/platform/java/modules/SystemWindow.cpp +++ b/native/cocos/platform/java/modules/SystemWindow.cpp @@ -36,11 +36,14 @@ #include "BasePlatform.h" #include "base/Log.h" #include "base/Macros.h" +#include "platform/java/jni/JniHelper.h" #include "platform/java/jni/JniImp.h" #include "platform/java/jni/glue/JniNativeGlue.h" namespace { - +#ifndef JCLS_COCOSACTIVITY +#define JCLS_COCOSACTIVITY "com/cocos/lib/CocosActivity" +#endif } // namespace namespace cc { @@ -56,11 +59,25 @@ void SystemWindow::copyTextToClipboard(const ccstd::string &text) { } void SystemWindow::setWindowHandle(void *handle) { +#if (CC_PLATFORM == CC_PLATFORM_ANDROID) + std::lock_guard lock(_handleMutex); + bool needNotify = _windowHandle == nullptr; _windowHandle = handle; + if (needNotify) { + _windowHandlePromise.set_value(); + } +#else + _windowHandle = handle; +#endif } uintptr_t SystemWindow::getWindowHandle() const { #if (CC_PLATFORM == CC_PLATFORM_ANDROID) + std::lock_guard lock(const_cast(_handleMutex)); + if (!_windowHandle) { + auto& future = const_cast&>(_windowHandlePromise); + future.get_future().get(); + } CC_ASSERT(_windowHandle); return reinterpret_cast(_windowHandle); #else @@ -89,4 +106,22 @@ void SystemWindow::closeWindow() { #endif } +bool SystemWindow::createWindow(const char *title, int x, int y, int w, int h, int flags) { + CC_UNUSED_PARAM(title); + CC_UNUSED_PARAM(flags); +#if (CC_PLATFORM == CC_PLATFORM_ANDROID) + cc::JniHelper::callObjectVoidMethod(cc::JniHelper::getActivity(), JCLS_COCOSACTIVITY, "createSurface", x, y, w, h, static_cast(_windowId)); +#endif + return true; +} + +bool SystemWindow::createWindow(const char *title, int w, int h, int flags) { + CC_UNUSED_PARAM(title); + CC_UNUSED_PARAM(flags); +#if (CC_PLATFORM == CC_PLATFORM_ANDROID) + cc::JniHelper::callObjectVoidMethod(cc::JniHelper::getActivity(), JCLS_COCOSACTIVITY, "createSurface", 0, 0, w, h, static_cast(_windowId)); +#endif + return true; +} + } // namespace cc diff --git a/native/cocos/platform/java/modules/SystemWindow.h b/native/cocos/platform/java/modules/SystemWindow.h index ac78d24d70..a35e5474e1 100644 --- a/native/cocos/platform/java/modules/SystemWindow.h +++ b/native/cocos/platform/java/modules/SystemWindow.h @@ -26,7 +26,7 @@ #pragma once #include - +#include #include "platform/interfaces/modules/ISystemWindow.h" namespace cc { @@ -35,6 +35,10 @@ class SystemWindow : public ISystemWindow { public: SystemWindow(uint32_t windowId, void *externalHandle); + bool createWindow(const char *title, int x, int y, int w, int h, int flags) override; + + bool createWindow(const char *title, int w, int h, int flags) override; + /** @brief enable/disable(lock) the cursor, default is enabled */ @@ -51,6 +55,8 @@ public: void closeWindow() override; private: + std::mutex _handleMutex; + std::promise _windowHandlePromise; uint32_t _windowId{0}; void *_windowHandle{nullptr}; };