Merge remote-tracking branch 'origin/devleop_4x'

zhxhcoder · zhxhcoder · commit 779dbee69129 · 2021-03-29T11:27:54.000+08:00
# Conflicts:
#	app/build.gradle
#	netspylib/build.gradle
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ https://www.jianshu.com/p/12995ed85a38
 
 ####项目引用：
 ```
-implementation 'com.creditease:netspylib:4.7.7'
+implementation 'com.creditease:netspylib:4.7.9'
 ```
 ####项目介绍：
 项目历经十几个版本，从只是记录接口返回，到现在已经逐步扩展到，接口数据镜像，异常记录与上传等实用功能。
diff --git a/netspylib/src/main/java/com/creditease/netspy/BugSpyHelper.java b/netspylib/src/main/java/com/creditease/netspy/BugSpyHelper.java
@@ -1,6 +1,5 @@
 package com.creditease.netspy;
 
-import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 
@@ -22,15 +21,13 @@ public final class BugSpyHelper implements Thread.UncaughtExceptionHandler {
     static String deviceInfo = "";
 
     private Thread.UncaughtExceptionHandler exceptionHandler;
-    private Application app;
 
-    private BugSpyHelper(Application app) {
+    private BugSpyHelper() {
         this.exceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
-        this.app = app;
     }
 
-    static void install(Application app) {
-        Thread.setDefaultUncaughtExceptionHandler(new BugSpyHelper(app));
+    static void install() {
+        Thread.setDefaultUncaughtExceptionHandler(new BugSpyHelper());
     }
 
     /**
diff --git a/netspylib/src/main/java/com/creditease/netspy/NetSpyHelper.java b/netspylib/src/main/java/com/creditease/netspy/NetSpyHelper.java
@@ -33,11 +33,12 @@ public static void install(Application netSpyApp, String source) {
 
     //总初始化
     public static void install(Application netSpyApp, String source, String baseURL, String strParamSet) {
-        NetSpyHelper.setSource(source);
+        //NetSpyHelper相关参数的初始化
         NetSpyHelper.setSpyApp(netSpyApp);
+        NetSpyHelper.setSource(source);
 
         //BugSpyHelper注册异常监控的初始化
-        BugSpyHelper.install(netSpyApp);
+        BugSpyHelper.install();
 
         //ApiMockHelper相关参数的初始化
         ApiMockHelper.initBaseURL(baseURL);
@@ -84,6 +85,8 @@ public static void launchActivity(Context context) {
         }
     }
 
+    /*********************************************http相关***************************************/
+
     //加入event 例如api/reward/fee
     public static void insertHttpEvent(String method, String url, String response) {
         insertHttpEvent(NetSpyHelper.getSource(), method, url, response);
