Merge branch 'develop' of https://github.com/Kyson/AndroidGodEye into develop

hui.zhao · hui.zhao · commit e9ad0d9a368d · 2020-03-25T11:53:15.000+08:00
diff --git a/ART/android_god_eye_connect.jpg b/ART/android_god_eye_connect.jpg
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ It is divided into 3 parts:
 |CPU|Cpu info of device and app|
 |BATTERY|Battery info|
 |FPS|Fps info|
-|LEAK|Detect memory leak|
+|LEAK_CANARY|Memory leak detector base on LeakCanary and Shark|
 |HEAP|Heap memory|
 |PSS|Pss|
 |RAM|Ram|
diff --git a/README_zh.md b/README_zh.md
@@ -43,7 +43,7 @@ AndroidGodEye是一个可以在PC浏览器中实时监控Android性能数据指
 |CPU|手机和App Cpu检测|
 |BATTERY|电池检测|
 |FPS|帧率检测|
-|LEAK|内存泄漏检测|
+|LEAK_CANARY|基于LeakCanary和shark的内存泄漏检测|
 |HEAP|运行堆内存占用检测|
 |PSS|实际物理共享内存占用检测|
 |RAM|手机内存|
diff --git a/android-godeye-sample/proguard-rules.pro b/android-godeye-sample/proguard-rules.pro
@@ -19,11 +19,6 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
-
--dontwarn okio.**
--dontwarn com.squareup.okhttp3.**
--keep class com.squareup.okhttp3.** { *; }
--keep interface com.squareup.okhttp3.** { *; }
 -dontwarn javax.annotation.**
 -dontwarn org.codehaus.**
 -dontwarn org.conscrypt.**
diff --git a/android-godeye-toolboxes/android-godeye-leakcanary/consumer-rules.pro b/android-godeye-toolboxes/android-godeye-leakcanary/consumer-rules.pro
@@ -0,0 +1,2 @@
+-dontwarn leakcanary.**
+-keep class leakcanary.**
diff --git a/android-godeye-toolboxes/android-godeye-okhttp/consumer-rules.pro b/android-godeye-toolboxes/android-godeye-okhttp/consumer-rules.pro
@@ -0,0 +1,4 @@
+-dontwarn okio.**
+-dontwarn com.squareup.okhttp3.**
+-keep class com.squareup.okhttp3.** { *; }
+-keep interface com.squareup.okhttp3.** { *; }
diff --git a/android-godeye/build.gradle b/android-godeye/build.gradle
@@ -13,6 +13,7 @@ android {
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
     }
     compileOptions {
         targetCompatibility = "8"
diff --git a/android-godeye/consumer-rules.pro b/android-godeye/consumer-rules.pro
@@ -0,0 +1,3 @@
+-dontwarn leakcanary.**
+-dontwarn okio.**
+-keep class leakcanary.**
diff --git a/android-godeye/proguard-rules.pro b/android-godeye/proguard-rules.pro
@@ -19,3 +19,4 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
diff --git a/android-godeye/src/main/AndroidManifest.xml b/android-godeye/src/main/AndroidManifest.xml
@@ -13,23 +13,6 @@
             android:exported="false"
             android:multiprocess="true" />
 
-<!--        <receiver-->
-<!--            android:name=".internal.modules.leakdetector.debug.LeakOutputReceiver"-->
-<!--            android:enabled="true"-->
-<!--            android:exported="false">-->
-<!--            <intent-filter>-->
-<!--                <action android:name="com.ctrip.ibu.leakcanary.output.start" />-->
-<!--                <action android:name="com.ctrip.ibu.leakcanary.output.progress" />-->
-<!--                <action android:name="com.ctrip.ibu.leakcanary.output.retry" />-->
-<!--                <action android:name="com.ctrip.ibu.leakcanary.output.done" />-->
-<!--            </intent-filter>-->
-<!--        </receiver>-->
-
-        <service
-            android:name=".internal.modules.leakdetector.debug.DebugHeapAnalyzerService"
-            android:enabled="false"
-            android:process=":leakcanary" />
-
         <service
             android:name=".internal.notification.LocalNotificationListenerService"
             android:enabled="true"
diff --git a/android-godeye/src/main/java/cn/hikyson/godeye/core/internal/modules/leakdetector/LeakConfig.java b/android-godeye/src/main/java/cn/hikyson/godeye/core/internal/modules/leakdetector/LeakConfig.java
@@ -22,6 +22,10 @@ public class LeakConfig implements Serializable {
     @Deprecated
     public String leakRefInfoProvider;
 
+    /**
+     * @deprecated
+     */
+    @Deprecated
     public LeakConfig(boolean debug, boolean debugNotification, String leakRefInfoProvider) {
         this.debug = debug;
     }
@@ -30,6 +34,10 @@ public LeakConfig() {
         this.debug = true;
     }
 
+    public LeakConfig(boolean debug) {
+        this.debug = debug;
+    }
+
     public boolean debug() {
         return debug;
     }
@@ -43,6 +51,7 @@ public boolean debugNotification() {
     }
 
     // LeakRefInfoProvider
+
     /**
      * @deprecated
      */
diff --git a/gradle.properties b/gradle.properties
@@ -44,4 +44,4 @@ BUILD_TOOLS_VERSION=29.0.2
 MIN_SDK_VERSION=16
 TARGET_SDK_VERSION=29
 
-USE_ALIYUN_REPO=true
+USE_ALIYUN_REPO=false

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-dontwarn leakcanary.**`
	`2`	`+-keep class leakcanary.**`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ android {`
`13`	`13`	`versionName "1.0"`
`14`	`14`
`15`	`15`	`testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
	`16`	`+ consumerProguardFiles 'consumer-rules.pro'`
`16`	`17`	`}`
`17`	`18`	`compileOptions {`
`18`	`19`	`targetCompatibility = "8"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+-dontwarn leakcanary.**`
	`2`	`+-dontwarn okio.**`
	`3`	`+-keep class leakcanary.**`