修复多线程状态上出现静态空值的问题

Author: getActivity

Logcat.apk

@@ -9,7 +9,7 @@
 #### 集成步骤
 
     dependencies {
-        debugImplementation 'com.hjq:logcat:6.9'
+        debugImplementation 'com.hjq:logcat:8.0'
     }
 
 #### 使用方式

README.md

@@ -7,8 +7,8 @@ android {
         applicationId "com.hjq.logcat.demo"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 69
-        versionName "6.9"
+        versionCode 80
+        versionName "8.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/build.gradle

@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 69
-        versionName "6.9"
+        versionCode 80
+        versionName "8.0"
     }
 }
 
@@ -26,7 +26,7 @@ publish {
     userOrg = 'getactivity'
     groupId = 'com.hjq'
     artifactId = 'logcat'
-    version = '6.9'
+    version = '8.0'
     description = 'This is to help developers quickly see the logging framework they want'
     website = "https://github.com/getActivity/Logcat"
 }

library/build.gradle

@@ -510,10 +510,21 @@ public void onBackPressed() {
         moveTaskToBack(false);
     }
 
+    @Override
+    protected void onResume() {
+        LogcatManager.resume();
+        super.onResume();
+    }
+
+    @Override
+    protected void onPause() {
+        LogcatManager.pause();
+        super.onPause();
+    }
+
     @Override
     protected void onDestroy() {
-        // 把监听对象置空，不然会导致内存泄漏
-        LogcatManager.start(null);
+        LogcatManager.destroy();
         super.onDestroy();
     }
 }

library/src/main/java/com/hjq/logcat/LogcatActivity.java

@@ -15,6 +15,7 @@
  */
 final class LogcatManager {
 
+    /** 日志捕捉监听对象 */
     private static volatile Listener sListener;
     /** 日志捕捉标记 */
     private static volatile boolean FLAG_WORK;
@@ -25,10 +26,8 @@ final class LogcatManager {
      * 开始捕捉
      */
     static void start(Listener listener) {
-        if (sListener == null) {
-            FLAG_WORK = true;
-            new Thread(new LogRunnable()).start();
-        }
+        FLAG_WORK = true;
+        new Thread(new LogRunnable()).start();
         sListener = listener;
     }
 
@@ -37,9 +36,10 @@ static void start(Listener listener) {
      */
     static void resume() {
         FLAG_WORK = true;
-        if (sListener != null && !LOG_BACKUP.isEmpty()) {
+        final Listener listener = sListener;
+        if (listener != null && !LOG_BACKUP.isEmpty()) {
             for (LogcatInfo info : LOG_BACKUP) {
-                sListener.onReceiveLog(info);
+                listener.onReceiveLog(info);
             }
         }
         LOG_BACKUP.clear();
@@ -52,6 +52,15 @@ static void pause() {
         FLAG_WORK = false;
     }
 
+    /**
+     * 停止捕捉
+     */
+    static void destroy() {
+        FLAG_WORK = false;
+        // 把监听对象置空，不然会导致内存泄漏
+        sListener = null;
+    }
+
     /**
      * 清空日志
      */
@@ -77,10 +86,11 @@ public void run() {
                         continue;
                     }
                     if (FLAG_WORK) {
-                        if (sListener != null) {
-                            LogcatInfo info = LogcatInfo.create(line);
-                            if (info != null) {
-                                sListener.onReceiveLog(info);
+                        LogcatInfo info = LogcatInfo.create(line);
+                        if (info != null) {
+                            final Listener listener = sListener;
+                            if (listener != null) {
+                                listener.onReceiveLog(info);
                             }
                         }
                     } else {