Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71 from c4games/sync-v3-pull-19256 

Sync v3 pr-19256
This commit is contained in:
HALX99 2020-02-24 19:52:22 +08:00 committed by GitHub
parent 0c291dd470 f5eac1eede
commit b350a7abf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java
View File

@ -280,6 +280,7 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe
// Cocos2dxGLSurfaceView // Cocos2dxGLSurfaceView
this.mGLSurfaceView = this.onCreateView(); this.mGLSurfaceView = this.onCreateView();
this.mGLSurfaceView.setPreserveEGLContextOnPause(true);
// ...add to FrameLayout // ...add to FrameLayout
mFrameLayout.addView(this.mGLSurfaceView); mFrameLayout.addView(this.mGLSurfaceView);

2
cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
View File

@ -199,7 +199,7 @@ public class Cocos2dxGLSurfaceView extends GLSurfaceView {
} }
}); });
this.setRenderMode(RENDERMODE_WHEN_DIRTY); this.setRenderMode(RENDERMODE_WHEN_DIRTY);
//super.onPause(); super.onPause();
} }
@Override @Override