From 03732e5e38a30d0a1328f97971ff98dbf5aa148b Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Thu, 13 Aug 2020 15:30:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7monitor=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties                              |  2 +-
 .../module/monitor/MogoMonitorProvider.java    | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index e070196a50..620f4a0289 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -105,7 +105,7 @@ MOGO_MODULE_SPLASH_VERSION = 1.0.0-SNAPSHOT
 MOGO_MODULE_SPLASH_NOOP_VERSION = 1.0.0-SNAPSHOT
 
 # loglib
-LOGLIB_VERSION = 1.0.1-SNAPSHOT
+LOGLIB_VERSION = 1.0.4
 # monitor
 MOGO_MODULE_MONITOR_VERSION = 1.0.0-SNAPSHOT
 
diff --git a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java
index 08bf4df033..5cee06832c 100644
--- a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java
+++ b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java
@@ -11,10 +11,12 @@ import com.mogo.service.connection.IMogoOnMessageListener;
 import com.mogo.service.monitor.IMogoMonitorProvider;
 import com.mogo.utils.logger.LogLevel;
 import com.mogo.utils.logger.Logger;
+import com.zhidao.loglib.ILogListener;
 import com.zhidao.loglib.LogInfoManager;
 import com.zhidao.loglib.bean.RemoteLogPushContent;
 import com.zhidao.loglib.dialog.ILogDialogListener;
 import com.zhidao.loglib.upload.UploadManager;
+import com.zhidao.loglib.util.Constant;
 import com.zhidao.loglib.util.LogInfoManagerFactory;
 import com.zhidao.loglib.util.LoggingNotice;
 
@@ -25,7 +27,7 @@ import java.util.Map;
  * @author tongchenfei
  */
 @Route(path = MogoMonitorConst.MODULE_PATH)
-public class MogoMonitorProvider implements IMogoMonitorProvider, IMogoOnMessageListener<RemoteLogPushContent>, ILogDialogListener {
+public class MogoMonitorProvider implements IMogoMonitorProvider, IMogoOnMessageListener<RemoteLogPushContent>, ILogDialogListener , ILogListener {
     private static final String TAG = MogoMonitorConst.MODULE_NAME;
     private LogInfoManager manualCatchLog = null;
     private Map<String, LogInfoManager> managerCache = new ArrayMap<>();
@@ -34,7 +36,7 @@ public class MogoMonitorProvider implements IMogoMonitorProvider, IMogoOnMessage
     @Override
     public void showLogDebugDialog() {
         if (manualCatchLog == null) {
-            manualCatchLog = LogInfoManagerFactory.createManualLogInfoManager(context);
+            manualCatchLog = LogInfoManagerFactory.createManualLogInfoManager(context,this);
         }
         manualCatchLog.showDebugWindow().setDialogListener(this);
     }
@@ -69,7 +71,7 @@ public class MogoMonitorProvider implements IMogoMonitorProvider, IMogoOnMessage
                 }
                 openLoggerLevel();
                 LogInfoManager infoManager =
-                        LogInfoManagerFactory.createPushLogInfoManager(context, obj);
+                        LogInfoManagerFactory.createPushLogInfoManager(context, obj,this);
                 infoManager.start();
                 managerCache.put(obj.getPkgName(), infoManager);
                 break;
@@ -115,4 +117,14 @@ public class MogoMonitorProvider implements IMogoMonitorProvider, IMogoOnMessage
             Logger.init( BuildConfig.DEBUG ? LogLevel.DEBUG : LogLevel.OFF );
         }
     }
+
+    @Override
+    public void onClose(String pkgName) {
+        if (pkgName.equals(Constant.MANUAL_PKG_NAME)) {
+            onLogStop();
+        }else{
+            LogInfoManager stopManager = managerCache.remove(pkgName);
+            closeLoggerLevel();
+        }
+    }
 }