diff --git a/ART/android_god_eye_connect.jpg b/ART/android_god_eye_connect.jpg index a6bd00a9..3308cfbb 100644 Binary files a/ART/android_god_eye_connect.jpg and b/ART/android_god_eye_connect.jpg differ diff --git a/README.md b/README.md index 5a6ca37f..e72c39c4 100644 --- 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 index 03515b8d..873af66e 100644 --- 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 index 6a0ab75d..a776aa12 100644 --- 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 index e69de29b..940e3da2 100644 --- 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.** \ No newline at end of file diff --git a/android-godeye-toolboxes/android-godeye-okhttp/consumer-rules.pro b/android-godeye-toolboxes/android-godeye-okhttp/consumer-rules.pro index e69de29b..6d6194e2 100644 --- 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.** { *; } \ No newline at end of file diff --git a/android-godeye/build.gradle b/android-godeye/build.gradle index 8eb8283f..e1318eb1 100644 --- 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 new file mode 100644 index 00000000..40b67767 --- /dev/null +++ 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 index f1b42451..cf504086 100644 --- 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 index 9d062d15..9a0f2e06 100644 --- a/android-godeye/src/main/AndroidManifest.xml +++ b/android-godeye/src/main/AndroidManifest.xml @@ -13,23 +13,6 @@ android:exported="false" android:multiprocess="true" /> - - - - - - - - - - - - - -