refactor CocosActivity

native/cocos/platform/android/java/src/com/cocos/lib/CocosActivity.java

@@ -26,61 +26,36 @@
 
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.media.AudioManager;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.SurfaceView;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
-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 CocosWebViewHelper mWebViewHelper = null;
-    private CocosVideoHelper mVideoHelper = null;
-
-    private CocosSensorHandler mSensorHandler;
-    private List<CocosSurfaceView> mSurfaceViewArray;
-    private FrameLayout mRootLayout;
-
-
-
-    private native void onCreateNative();
+    private CocosEngine mCocosEngine;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        onLoadNativeLibraries();
-        onCreateNative();
+        String libName = getLibraryName();
+        mCocosEngine = new CocosEngine(this, libName);
 
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
         getWindow().requestFeature(Window.FEATURE_NO_TITLE);
-        super.onCreate(savedInstanceState);
-
-        // GlobalObject.init should be initialized at first.
-        GlobalObject.init(this, this);
-
-        CocosHelper.registerBatteryLevelReceiver(this);
-        CocosHelper.init();
-        CocosAudioFocusManager.registerAudioFocusListener(this);
-        CanvasRenderingContext2DImpl.init(this);
-        this.setVolumeControlStream(AudioManager.STREAM_MUSIC);
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
+        getIntent().putExtra(GameActivity.META_DATA_LIB_NAME, libName);
+        super.onCreate(savedInstanceState);
         initView();
-
-
-        mSensorHandler = new CocosSensorHandler(this);
+        mCocosEngine.init();
 
         setImmersiveMode();
-
         Utils.hideVirtualButton();
 
         mSurfaceView.setOnTouchListener((v, event) -> processMotionEvent(event));
@@ -110,100 +85,53 @@ private void setImmersiveMode() {
         }
     }
 
+    //Deprecated, for compatibility, keep this interface for now
     protected void initView() {
-        mRootLayout = findViewById(contentViewId);
-        if (mWebViewHelper == null) {
-            mWebViewHelper = new CocosWebViewHelper(mRootLayout);
-        }
-
-        if (mVideoHelper == null) {
-            mVideoHelper = new CocosVideoHelper(this, mRootLayout);
-        }
+        mCocosEngine.initView(findViewById(contentViewId));
     }
 
-
-
     public SurfaceView getSurfaceView() {
-        return this.mSurfaceView;
+        return mSurfaceView;
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        CocosHelper.unregisterBatteryLevelReceiver(this);
-        CocosAudioFocusManager.unregisterAudioFocusListener(this);
-        CanvasRenderingContext2DImpl.destroy();
-        GlobalObject.destroy();
+        mCocosEngine.destroy();
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        mSensorHandler.onPause();
+        mCocosEngine.pause();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        mSensorHandler.onResume();
         Utils.hideVirtualButton();
-        if (CocosAudioFocusManager.isAudioFocusLoss()) {
-            CocosAudioFocusManager.registerAudioFocusListener(this);
-        }
+        mCocosEngine.resume();
     }
 
     @Override
     protected void onStop() {
         super.onStop();
-        mSurfaceView.setVisibility(View.INVISIBLE);
-        if (null != mSurfaceViewArray) {
-            for (CocosSurfaceView surfaceView : mSurfaceViewArray) {
-                surfaceView.setVisibility(View.INVISIBLE);
-            }
-        }
+        mCocosEngine.stop();
     }
 
     @Override
     protected void onStart() {
         super.onStart();
-        mSurfaceView.setVisibility(View.VISIBLE);
-        if (null != mSurfaceViewArray) {
-            for (CocosSurfaceView surfaceView : mSurfaceViewArray) {
-                surfaceView.setVisibility(View.VISIBLE);
-            }
-        }
+        mCocosEngine.start();
     }
 
     @Override
     public void onWindowFocusChanged(boolean hasFocus) {
         super.onWindowFocusChanged(hasFocus);
-        if (hasFocus && CocosAudioFocusManager.isAudioFocusLoss()) {
-            CocosAudioFocusManager.registerAudioFocusListener(this);
-        }
-    }
-
-    // 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);
-            }
-        });
+        mCocosEngine.setAudioFocus(hasFocus);
     }
 
-    private void onLoadNativeLibraries() {
+    private String getLibraryName() {
         try {
             ApplicationInfo ai = getPackageManager().getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA);
 
@@ -212,11 +140,10 @@ private void onLoadNativeLibraries() {
             if (TextUtils.isEmpty(libName)) {
                 Log.e(TAG, "can not find library, please config android.app.lib_name at AndroidManifest.xml");
             }
-            assert libName != null;
-            System.loadLibrary(libName);
-            getIntent().putExtra(GameActivity.META_DATA_LIB_NAME, libName);
+            return libName;
         } catch (Exception e) {
             e.printStackTrace();
         }
+        return null;
     }
 }

native/cocos/platform/android/java/src/com/cocos/lib/CocosEditBoxActivity.java

@@ -413,14 +413,14 @@ private static void showNative(String defaultValue, int maxLength, boolean isMul
         GlobalObject.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                Intent i = new Intent(GlobalObject.getActivity(), CocosEditBoxActivity.class);
+                Intent i = new Intent(GlobalObject.getContext(), CocosEditBoxActivity.class);
                 i.putExtra("defaultValue", defaultValue);
                 i.putExtra("maxLength", maxLength);
                 i.putExtra("isMultiline", isMultiline);
                 i.putExtra("confirmHold", confirmHold);
                 i.putExtra("confirmType", confirmType);
                 i.putExtra("inputType", inputType);
-                GlobalObject.getActivity().startActivity(i);
+                GlobalObject.getContext().startActivity(i);
             }
         });
     }

native/cocos/platform/android/java/src/com/cocos/lib/CocosEngine.java

@@ -0,0 +1,155 @@
+package com.cocos.lib;
+
+import android.app.Activity;
+import android.content.Context;
+import android.media.AudioManager;
+import android.os.Handler;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class CocosEngine {
+    private static WeakReference<CocosEngine> mRefCocosEngine;
+    private Context mContext;
+
+    private CocosSensorHandler mSensorHandler;
+
+    private CocosWebViewHelper mWebViewHelper = null;
+    private CocosVideoHelper mVideoHelper = null;
+    private FrameLayout mRootLayout;
+    private final Handler mHandler;
+
+    private List<CocosSurfaceView> mSurfaceViewArray;
+    private SurfaceView mSurfaceView;
+
+    private native void initEnvNative(Context context);
+
+    public CocosEngine(Context context, String libName) {
+        mRefCocosEngine = new WeakReference<>(this);
+        mContext = context;
+        mHandler = new Handler(context.getMainLooper());
+        System.loadLibrary(libName);
+        initEnvNative(context);
+    }
+
+    public void destroy() {
+        mRefCocosEngine.clear();
+        CocosHelper.unregisterBatteryLevelReceiver(mContext);
+        CocosAudioFocusManager.unregisterAudioFocusListener(mContext);
+        CanvasRenderingContext2DImpl.destroy();
+        GlobalObject.destroy();
+        mContext = null;
+    }
+
+    public void init() {
+        Activity activity = null;
+        if (mContext instanceof Activity) {
+            activity = (Activity) mContext;
+        }
+
+        // GlobalObject.init should be initialized at first.
+        GlobalObject.init(mContext, activity);
+
+        CocosHelper.registerBatteryLevelReceiver(mContext);
+        CocosHelper.init();
+        CocosAudioFocusManager.registerAudioFocusListener(mContext);
+        CanvasRenderingContext2DImpl.init(mContext);
+        if (activity != null) {
+            activity.setVolumeControlStream(AudioManager.STREAM_MUSIC);
+        }
+
+        mSensorHandler = new CocosSensorHandler(mContext);
+    }
+
+    public void start() {
+        mSurfaceView.setVisibility(View.VISIBLE);
+        if (null != mSurfaceViewArray) {
+            for (CocosSurfaceView surfaceView : mSurfaceViewArray) {
+                surfaceView.setVisibility(View.VISIBLE);
+            }
+        }
+    }
+
+    public void stop() {
+        mSurfaceView.setVisibility(View.INVISIBLE);
+        if (null != mSurfaceViewArray) {
+            for (CocosSurfaceView surfaceView : mSurfaceViewArray) {
+                surfaceView.setVisibility(View.INVISIBLE);
+            }
+        }
+    }
+
+    public void pause() {
+        mSensorHandler.onPause();
+    }
+
+    public void resume() {
+        mSensorHandler.onResume();
+        Utils.hideVirtualButton();
+        if (CocosAudioFocusManager.isAudioFocusLoss()) {
+            CocosAudioFocusManager.registerAudioFocusListener(mContext);
+        }
+    }
+
+    public SurfaceView getRenderView() {
+        return mSurfaceView;
+    }
+
+    public void setAudioFocus(boolean hasFocus) {
+        if (hasFocus && CocosAudioFocusManager.isAudioFocusLoss()) {
+            CocosAudioFocusManager.registerAudioFocusListener(mContext);
+        }
+    }
+
+    void initView(FrameLayout parentView) {
+        mRootLayout = parentView;
+        CocosActivity cocosActivity = null;
+        if (mContext instanceof CocosActivity) {
+            cocosActivity = (CocosActivity) mContext;
+            mSurfaceView = cocosActivity.getSurfaceView();
+        } else {
+            // todo: create surfaceView
+        }
+
+        if (mWebViewHelper == null) {
+            mWebViewHelper = new CocosWebViewHelper(mRootLayout);
+        }
+
+        if (mVideoHelper == null) {
+            mVideoHelper = new CocosVideoHelper(cocosActivity, mRootLayout);
+        }
+    }
+
+    // invoke from native code
+    @SuppressWarnings({"UnusedDeclaration"})
+    private static void createSurface(int x, int y, int width, int height, int windowId) {
+        CocosEngine cocosEngine = mRefCocosEngine.get();
+        if (cocosEngine == null) return;
+        cocosEngine.mHandler.post(() -> {
+            CocosSurfaceView view = new CocosSurfaceView(cocosEngine.mContext, 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);
+            cocosEngine.mRootLayout.addView(view, params);
+            if (null == cocosEngine.mSurfaceViewArray) {
+                cocosEngine.mSurfaceViewArray = new ArrayList<>();
+            }
+            cocosEngine.mSurfaceViewArray.add(view);
+        });
+    }
+}
+
+
+
+
+
+
+

native/cocos/platform/android/java/src/com/cocos/lib/CocosHelper.java

@@ -262,7 +262,7 @@ public static void vibrate(float duration) {
     }
 
     public static boolean openURL(String url) {
-        if (GlobalObject.getActivity() == null) {
+        if (GlobalObject.getContext() == null) {
             Log.e(TAG, "activity is null");
             return false;
         }
@@ -271,7 +271,7 @@ public static boolean openURL(String url) {
         try {
             Intent i = new Intent(Intent.ACTION_VIEW);
             i.setData(Uri.parse(url));
-            GlobalObject.getActivity().startActivity(i);
+            GlobalObject.getContext().startActivity(i);
             ret = true;
         } catch (Exception e) {
         }

native/cocos/platform/android/jni/JniCocosEntry.cpp

@@ -39,7 +39,7 @@ void android_main(struct android_app *app) {
 }
 
 //NOLINTNEXTLINE
-JNIEXPORT void JNICALL Java_com_cocos_lib_CocosActivity_onCreateNative(JNIEnv *env, jobject activity) {
+JNIEXPORT void JNICALL Java_com_cocos_lib_CocosEngine_initEnvNative(JNIEnv *env, jobject /**/, jobject activity) {
     cc::JniHelper::init(env, activity);
 }
 }