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

Merge pull request #637 from rh101/fix-screen-blank 

Fix Android screen blank issue after unlocking device
This commit is contained in:
一线灵 2022-06-07 20:05:29 +08:00 committed by GitHub
parent 6943fb9dce 3a3b899636
commit 0117dd5c7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java
View File

@ -171,8 +171,9 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe
Log.d(TAG, "onResume()"); Log.d(TAG, "onResume()");
paused = false; paused = false;
super.onResume(); super.onResume();
this.hideVirtualButton(); if (this.hasFocus) {
resumeIfHasFocus(); resume();
}
} }
@Override @Override
@ -181,7 +182,15 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe
super.onWindowFocusChanged(hasFocus); super.onWindowFocusChanged(hasFocus);
this.hasFocus = hasFocus; this.hasFocus = hasFocus;
resumeIfHasFocus(); if (this.hasFocus && !paused) {
resume();
}
}
private void resume() {
this.hideVirtualButton();
Cocos2dxHelper.onResume();
mGLSurfaceView.onResume();
} }
private void resumeIfHasFocus() { private void resumeIfHasFocus() {
@ -190,9 +199,7 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe
boolean readyToPlay = !isDeviceLocked() && !isDeviceAsleep(); boolean readyToPlay = !isDeviceLocked() && !isDeviceAsleep();
if(hasFocus && readyToPlay) { if(hasFocus && readyToPlay) {
this.hideVirtualButton(); resume();
Cocos2dxHelper.onResume();
mGLSurfaceView.onResume();
} }
} }