From 90ab184310e0fec03170aadd8729914cbf2aacdd Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Wed, 21 Mar 2018 16:27:09 +0800
Subject: [PATCH] fix(canvas): rendering thread not restart when a destroyed
 surface is recreated

---
 .../core/graphics/ScriptCanvasView.java       | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

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