sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Attempt to clean up some references to help with out of memory issues on second start of app on Android

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10047 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
iwg..ic 2012-12-28 04:27:10 +00:00
parent 5a90cd7082
commit 1df4fe8346
5 changed files with 102 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
engine/src/android/com/jme3/app/AndroidHarness.java
View File

@ -6,7 +6,6 @@ import android.content.DialogInterface;
import android.content.pm.ActivityInfo;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.NinePatchDrawable;
import android.opengl.GLSurfaceView;
import android.os.Bundle;
import android.util.Log;
import android.view.*;
@ -14,6 +13,7 @@ import android.view.ViewGroup.LayoutParams;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
import com.jme3.asset.DesktopAssetManager;
import com.jme3.audio.AudioRenderer;
import com.jme3.audio.android.AndroidAudioRenderer;
import com.jme3.input.JoyInput;
@ -22,6 +22,7 @@ import com.jme3.input.android.AndroidSensorJoyInput;
import com.jme3.input.controls.TouchListener;
import com.jme3.input.controls.TouchTrigger;
import com.jme3.input.event.TouchEvent;
import com.jme3.renderer.android.AndroidGLSurfaceView;
import com.jme3.system.AppSettings;
import com.jme3.system.SystemListener;
import com.jme3.system.android.AndroidConfigChooser.ConfigType;
@ -141,7 +142,7 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
*/
protected int screenOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR;
protected OGLESContext ctx;
protected GLSurfaceView view = null;
protected AndroidGLSurfaceView view = null;
protected boolean isGLThreadPaused = true;
protected ImageView splashImageView = null;
protected FrameLayout frameLayout = null;
@ -155,7 +156,7 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
@Override
public Object onRetainNonConfigurationInstance() {
logger.log(Level.INFO, "onRetainNonConfigurationInstance called");
logger.log(Level.INFO, "onRetainNonConfigurationInstance");
final DataObject data = new DataObject();
data.app = this.app;
inConfigChange = true;
@ -165,6 +166,7 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
@Override
public void onCreate(Bundle savedInstanceState) {
logger.info("onCreate");
super.onCreate(savedInstanceState);
JmeAndroidSystem.setActivity(this);
@ -185,11 +187,6 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
logger.log(Level.INFO, "Using Retained App");
this.app = data.app;
ctx = (OGLESContext) app.getContext();
view = ctx.createView(eglConfigType, eglConfigVerboseLogging);
ctx.setSystemListener(this);
layoutDisplay();
} else {
// Discover the screen reolution
//TODO try to find a better way to get a hand on the resolution
@ -215,38 +212,41 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
app.setSettings(settings);
app.start();
ctx = (OGLESContext) app.getContext();
view = ctx.createView(eglConfigType, eglConfigVerboseLogging);
// AndroidHarness wraps the app as a SystemListener.
ctx.setSystemListener(this);
layoutDisplay();
} catch (Exception ex) {
handleError("Class " + appClass + " init failed", ex);
setContentView(new TextView(this));
}
}
ctx = (OGLESContext) app.getContext();
view = ctx.createView(eglConfigType, eglConfigVerboseLogging);
// AndroidHarness wraps the app as a SystemListener.
ctx.setSystemListener(this);
layoutDisplay();
}
@Override
protected void onRestart() {
logger.info("onRestart");
super.onRestart();
if (app != null) {
app.restart();
}
logger.info("onRestart");
}
@Override
protected void onStart() {
super.onStart();
logger.info("onStart");
super.onStart();
}
@Override
protected void onResume() {
logger.info("onResume");
super.onResume();
if (view != null) {
view.onResume();
@ -274,11 +274,11 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
}
isGLThreadPaused = false;
logger.info("onResume");
}
@Override
protected void onPause() {
logger.info("onPause");
super.onPause();
if (view != null) {
view.onPause();
@ -306,18 +306,18 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
}
}
isGLThreadPaused = true;
logger.info("onPause");
}
@Override
protected void onStop() {
super.onStop();
logger.info("onStop");
super.onStop();
}
@Override
protected void onDestroy() {
logger.info("onDestroy");
final DataObject data = (DataObject) getLastNonConfigurationInstance();
if (data != null || inConfigChange) {
logger.info("In Config Change, not stopping app.");
@ -326,7 +326,11 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
app.stop(!isGLThreadPaused);
}
}
logger.info("onDestroy");
JmeAndroidSystem.setActivity(null);
ctx = null;
app = null;
view = null;
super.onDestroy();
}

2
engine/src/android/com/jme3/audio/android/AndroidAudioRenderer.java
View File

@ -64,7 +64,6 @@ public class AndroidAudioRenderer implements AudioRenderer,
private final Vector3f listenerPosition = new Vector3f();
// For temp use
private final Vector3f distanceVector = new Vector3f();
private final Context context;
private final AssetManager assetManager;
private HashMap<Integer, AudioNode> soundpoolStillLoading = new HashMap<Integer, AudioNode>();
private Listener listener;
@ -72,7 +71,6 @@ public class AndroidAudioRenderer implements AudioRenderer,
private final AudioManager manager;
public AndroidAudioRenderer(Activity context) {
this.context = context;
manager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
context.setVolumeControlStream(AudioManager.STREAM_MUSIC);
assetManager = context.getAssets();

17
engine/src/android/com/jme3/input/android/AndroidInput.java
View File

@ -12,7 +12,6 @@ import com.jme3.math.Vector2f;
import com.jme3.system.AppSettings;
import com.jme3.util.RingBuffer;
import java.util.HashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
@ -148,16 +147,17 @@ public class AndroidInput implements
0x0,//mute
};
public AndroidInput(View view) {
setView(view);
detector = new GestureDetector(null, this, null, false);
scaledetector = new ScaleGestureDetector(view.getContext(), this);
public AndroidInput() {
}
public void setView(View view) {
this.view = view;
this.view.setOnTouchListener(this);
this.view.setOnKeyListener(this);
if (view != null) {
detector = new GestureDetector(null, this, null, false);
scaledetector = new ScaleGestureDetector(view.getContext(), this);
view.setOnTouchListener(this);
view.setOnKeyListener(this);
}
}
private TouchEvent getNextFreeTouchEvent() {
@ -373,6 +373,9 @@ public class AndroidInput implements
while (!eventQueue.isEmpty()) {
eventQueue.pop();
}
this.view = null;
}
@Override

27
engine/src/android/com/jme3/input/android/AndroidSensorJoyInput.java
View File

@ -32,15 +32,15 @@
package com.jme3.input.android;
import android.app.Activity;
import android.content.Context;
import android.hardware.Sensor;
import android.hardware.SensorEvent;
import android.hardware.SensorEventListener;
import android.hardware.SensorManager;
import android.os.Vibrator;
import android.view.Display;
import android.view.Surface;
import android.view.WindowManager;
import android.view.View;
import com.jme3.input.AbstractJoystick;
import com.jme3.input.DefaultJoystickAxis;
import com.jme3.input.InputManager;
@ -98,6 +98,7 @@ import java.util.logging.Logger;
public class AndroidSensorJoyInput implements JoyInput, SensorEventListener {
private final static Logger logger = Logger.getLogger(AndroidSensorJoyInput.class.getName());
private Activity activity = null;
private InputManager inputManager = null;
private SensorManager sensorManager = null;
private Vibrator vibrator = null;
@ -106,8 +107,6 @@ public class AndroidSensorJoyInput implements JoyInput, SensorEventListener {
private RawInputListener listener = null;
private IntMap<SensorData> sensors = new IntMap<SensorData>();
private AndroidJoystick[] joysticks;
private WindowManager window;
private Display disp;
private int lastRotation = 0;
private boolean initialized = false;
private boolean loaded = false;
@ -136,25 +135,16 @@ public class AndroidSensorJoyInput implements JoyInput, SensorEventListener {
}
private void initSensorManager() {
initWindow();
this.activity = JmeAndroidSystem.getActivity();
// Get instance of the SensorManager from the current Context
sensorManager = (SensorManager) JmeAndroidSystem.getActivity().getSystemService(Context.SENSOR_SERVICE);
sensorManager = (SensorManager) activity.getSystemService(Context.SENSOR_SERVICE);
// Get instance of Vibrator from current Context
vibrator = (Vibrator) JmeAndroidSystem.getActivity().getSystemService(Context.VIBRATOR_SERVICE);
vibrator = (Vibrator) activity.getSystemService(Context.VIBRATOR_SERVICE);
if (vibrator == null) {
logger.log(Level.INFO, "Vibrator Service not found.");
}
}
/**
* Used internally. Do not use.
* Allows the context to reset the current activity for getting device rotation
*/
public void initWindow() {
window = JmeAndroidSystem.getActivity().getWindowManager();
disp = window.getDefaultDisplay();
}
private SensorData initSensor(int sensorType) {
boolean success = false;
@ -316,7 +306,7 @@ public class AndroidSensorJoyInput implements JoyInput, SensorEventListener {
* @return Current device rotation amount
*/
private int getScreenRotation() {
return disp.getRotation();
return activity.getWindowManager().getDefaultDisplay().getRotation();
}
/**
@ -600,6 +590,9 @@ public class AndroidSensorJoyInput implements JoyInput, SensorEventListener {
initialized = false;
loaded = false;
joysticks = null;
sensorManager = null;
vibrator = null;
activity = null;
}
public boolean isInitialized() {

26
engine/src/android/com/jme3/system/android/OGLESContext.java
View File

@ -31,6 +31,7 @@
*/
package com.jme3.system.android;
import android.app.Activity;
import com.jme3.renderer.android.AndroidGLSurfaceView;
import android.app.AlertDialog;
import android.content.DialogInterface;
@ -75,7 +76,6 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer, SoftTex
protected SystemListener listener;
protected boolean autoFlush = true;
protected AndroidInput androidInput;
protected AndroidGLSurfaceView view;
protected int minFrameDuration = 0; // No FPS cap
protected JoyInput androidSensorJoyInput = null;
/**
@ -107,20 +107,15 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer, SoftTex
* @param eglConfigVerboseLogging if true show all found configs
* @return GLSurfaceView The newly created view
*/
public GLSurfaceView createView(ConfigType configType, boolean eglConfigVerboseLogging) {
// if simulated joysticks are used, init the window to update the activity used to
// get the window orientation
if (androidSensorJoyInput != null && androidSensorJoyInput instanceof AndroidSensorJoyInput) {
((AndroidSensorJoyInput)androidSensorJoyInput).initWindow();
}
public AndroidGLSurfaceView createView(ConfigType configType, boolean eglConfigVerboseLogging) {
AndroidGLSurfaceView view;
// Start to set up the view
view = new AndroidGLSurfaceView(JmeAndroidSystem.getActivity());
view = new AndroidGLSurfaceView(JmeAndroidSystem.getActivity().getApplication());
if (androidInput == null) {
androidInput = new AndroidInput(view);
} else {
androidInput.setView(view);
androidInput = new AndroidInput();
}
androidInput.setView(view);
androidInput.loadSettings(settings);
if (configType == ConfigType.LEGACY) {
@ -402,13 +397,14 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer, SoftTex
logger.log(Level.INFO, "requestDialog: title: {0}, initialValue: {1}",
new Object[]{title, initialValue});
JmeAndroidSystem.getActivity().runOnUiThread(new Runnable() {
final Activity activity = JmeAndroidSystem.getActivity();
activity.runOnUiThread(new Runnable() {
@Override
public void run() {
final FrameLayout layoutTextDialogInput = new FrameLayout(JmeAndroidSystem.getActivity());
final EditText editTextDialogInput = new EditText(JmeAndroidSystem.getActivity());
final FrameLayout layoutTextDialogInput = new FrameLayout(activity);
final EditText editTextDialogInput = new EditText(activity);
editTextDialogInput.setWidth(LayoutParams.FILL_PARENT);
editTextDialogInput.setHeight(LayoutParams.FILL_PARENT);
editTextDialogInput.setPadding(20, 20, 20, 20);
@ -438,7 +434,7 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer, SoftTex
layoutTextDialogInput.addView(editTextDialogInput);
AlertDialog dialogTextInput = new AlertDialog.Builder(JmeAndroidSystem.getActivity()).setTitle(title).setView(layoutTextDialogInput).setPositiveButton("OK",
AlertDialog dialogTextInput = new AlertDialog.Builder(activity).setTitle(title).setView(layoutTextDialogInput).setPositiveButton("OK",
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {