From 4b8b4e8723a6d911d6cba2a811105c0a7e172fff Mon Sep 17 00:00:00 2001
From: Jenly <jenly1314@gmail.com>
Date: Tue, 28 Apr 2020 21:08:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/king/zxing/CaptureHelper.java    | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/king/zxing/CaptureHelper.java b/lib/src/main/java/com/king/zxing/CaptureHelper.java
index 8e5be52..2f23b5c 100644
--- a/lib/src/main/java/com/king/zxing/CaptureHelper.java
+++ b/lib/src/main/java/com/king/zxing/CaptureHelper.java
@@ -242,6 +242,7 @@ public class CaptureHelper implements CaptureLifecycle,CaptureTouchEvent,Capture
     public void onPause(){
         if (captureHandler != null) {
             captureHandler.quitSynchronously();
+            captureHandler = null;
         }
         inactivityTimer.onPause();
         ambientLightManager.stop();
@@ -526,16 +527,18 @@ public class CaptureHelper implements CaptureLifecycle,CaptureTouchEvent,Capture
         }
 
         if(isPlayBeep){//如果播放音效，则稍微延迟一点，给予播放音效时间
-            captureHandler.postDelayed(() -> {
-                //如果设置了回调，并且onCallback返回为true，则表示拦截
-                if(onCaptureCallback!=null && onCaptureCallback.onResultCallback(text)){
-                    return;
-                }
-                Intent intent = new Intent();
-                intent.putExtra(Intents.Scan.RESULT,text);
-                activity.setResult(Activity.RESULT_OK,intent);
-                activity.finish();
-            },100);
+            if(captureHandler != null){
+                captureHandler.postDelayed(() -> {
+                    //如果设置了回调，并且onCallback返回为true，则表示拦截
+                    if(onCaptureCallback!=null && onCaptureCallback.onResultCallback(text)){
+                        return;
+                    }
+                    Intent intent = new Intent();
+                    intent.putExtra(Intents.Scan.RESULT,text);
+                    activity.setResult(Activity.RESULT_OK,intent);
+                    activity.finish();
+                },100);
+            }
             return;
         }