tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(canvas): rendering thread not restart when a destroyed surface is recreated

Browse Source
This commit is contained in:
hyb1996
2018-03-21 16:27:09 +08:00
parent efa31915c2
commit 90ab184310
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvasView.java
View File

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Paint;
import android.util.Log; import android.util.Log;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import android.view.SurfaceView; import android.view.SurfaceView;
@@ -14,6 +13,7 @@ import com.stardust.autojs.runtime.ScriptRuntime;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ThreadPoolExecutor;
/** /**
* Created by Stardust on 2018/3/16. * Created by Stardust on 2018/3/16.
@@ -29,7 +29,6 @@ public class ScriptCanvasView extends SurfaceView implements SurfaceHolder.Callb
private ExecutorService mDrawingThreadPool; private ExecutorService mDrawingThreadPool;
private ScriptRuntime mScriptRuntime; private ScriptRuntime mScriptRuntime;
public ScriptCanvasView(Context context, ScriptRuntime scriptRuntime) { public ScriptCanvasView(Context context, ScriptRuntime scriptRuntime) {
super(context); super(context);
mScriptRuntime = scriptRuntime; mScriptRuntime = scriptRuntime;
@@ -45,6 +44,7 @@ public class ScriptCanvasView extends SurfaceView implements SurfaceHolder.Callb
@Override @Override
public void surfaceCreated(SurfaceHolder holder) { public void surfaceCreated(SurfaceHolder holder) {
performDraw(); performDraw();
Log.d(LOG_TAG, "surfaceCreated: " + this);
} }
@Override @Override
@@ -52,8 +52,9 @@ public class ScriptCanvasView extends SurfaceView implements SurfaceHolder.Callb
} }
private void performDraw() { private synchronized void performDraw() {
if (mDrawingThreadPool == null) if (mDrawingThreadPool != null)
return;
mDrawingThreadPool = Executors.newCachedThreadPool(); mDrawingThreadPool = Executors.newCachedThreadPool();
mDrawingThreadPool.execute(() -> { mDrawingThreadPool.execute(() -> {
Canvas canvas = null; Canvas canvas = null;
@@ -79,11 +80,9 @@ public class ScriptCanvasView extends SurfaceView implements SurfaceHolder.Callb
@Override @Override
protected void onWindowVisibilityChanged(int visibility) { protected void onWindowVisibilityChanged(int visibility) {
Log.d(LOG_TAG, "onWindowVisibilityChanged: " + this + ": visibility=" + visibility + ", mDrawingThreadPool=" + mDrawingThreadPool);
if (visibility == VISIBLE) { if (visibility == VISIBLE) {
if (mDrawingThreadPool != null) {
mDrawing = true; mDrawing = true;
performDraw();
}
} else { } else {
mDrawing = false; mDrawing = false;
} }
@@ -91,12 +90,11 @@ public class ScriptCanvasView extends SurfaceView implements SurfaceHolder.Callb
} }
@Override @Override
public void surfaceDestroyed(SurfaceHolder holder) { public synchronized void surfaceDestroyed(SurfaceHolder holder) {
Log.d(LOG_TAG, "surfaceDestroyed: mRunning = true");
mDrawing = false; mDrawing = false;
Log.d(LOG_TAG, "surfaceDestroyed: mRunning = false");
mDrawingThreadPool.shutdown(); mDrawingThreadPool.shutdown();
mDrawingThreadPool = null; mDrawingThreadPool = null;
Log.d(LOG_TAG, "surfaceDestroyed: " + this);
} }
public EventEmitter once(String eventName, Object listener) { public EventEmitter once(String eventName, Object listener) {