Skip to content

Commit

Permalink
refactor CocosActivity (#16203)
Browse files Browse the repository at this point in the history 
* refactor CocosActivity
  • Loading branch information
@bofeng-song
bofeng-song authored Sep 8, 2023
1 parent bbadf9f commit 10ba495
Show file tree
Hide file tree
Showing 7 changed files with 244 additions and 100 deletions.
107 changes: 16 additions & 91 deletions native/cocos/platform/android/java/src/com/cocos/lib/CocosActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,61 +26,34 @@

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);
getIntent().putExtra(GameActivity.META_DATA_LIB_NAME, libName);
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);
initView();


mSensorHandler = new CocosSensorHandler(this);

setImmersiveMode();

Utils.hideVirtualButton();

mSurfaceView.setOnTouchListener((v, event) -> processMotionEvent(event));
Expand Down Expand Up @@ -110,100 +83,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.getAudio().setFocus(hasFocus);
}

private void onLoadNativeLibraries() {
private String getLibraryName() {
try {
ApplicationInfo ai = getPackageManager().getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA);

Expand All @@ -212,11 +138,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;
}
}
47 changes: 47 additions & 0 deletions native/cocos/platform/android/java/src/com/cocos/lib/CocosAudio.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/****************************************************************************
Copyright (c) 2023 Xiamen Yaji Software Co., Ltd.
http://www.cocos.com
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated engine source code (the "Software"), a limited,
worldwide, royalty-free, non-assignable, revocable and non-exclusive license
to use Cocos Creator solely to develop games on your target platforms. You shall
not use Cocos Creator software for developing other software or tools that's
used for developing games. You are not granted to publish, distribute,
sublicense, and/or sell copies of Cocos Creator.
The software or tools in this License Agreement are licensed, not sold.
Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/

package com.cocos.lib;

import android.content.Context;

public class CocosAudio {
Context mApplicationContext;

CocosAudio(Context context) {
mApplicationContext = context.getApplicationContext();
}

public void setFocus(boolean hasFocus) {
if (hasFocus && CocosAudioFocusManager.isAudioFocusLoss()) {
CocosAudioFocusManager.registerAudioFocusListener(mApplicationContext);
}
}

void destroy() {
CocosAudioFocusManager.unregisterAudioFocusListener(mApplicationContext);
mApplicationContext = null;
}
}
4 changes: 2 additions & 2 deletions native/cocos/platform/android/java/src/com/cocos/lib/CocosEditBoxActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
});
}
Expand Down
Loading

0 comments on commit 10ba495

Please sign in to comment.