diff --git a/MethodCanary.js b/AndroidGodEye-MethodCanary.js
similarity index 64%
rename from MethodCanary.js
rename to AndroidGodEye-MethodCanary.js
index 9698edc3..c38e1e56 100644
--- a/MethodCanary.js
+++ b/AndroidGodEye-MethodCanary.js
@@ -10,10 +10,6 @@
          String name
          String desc}
 **/
-function isExclude(classInfo,methodInfo){
-    return false
-}
-
 function isInclude(classInfo,methodInfo){
-    return classInfo.name.startsWith('cn/hikyson/android/godeye/sample')
+    return classInfo.name.startsWith('cn/hikyson/godeye/sample')
 }
\ No newline at end of file
diff --git a/android-godeye-monitor/build.gradle b/android-godeye-monitor/build.gradle
index e915f543..3546e1f9 100644
--- a/android-godeye-monitor/build.gradle
+++ b/android-godeye-monitor/build.gradle
@@ -37,7 +37,7 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
     implementation project(':android-godeye')
-    api 'com.koushikdutta.async:androidasync:2.2.1'
+    implementation 'com.koushikdutta.async:androidasync:2.2.1'
     implementation "com.github.nisrulz:easydeviceinfo-base:2.4.1"
     implementation 'com.iqiyi.xcrash:xcrash-android-lib:2.4.6'
 }
diff --git a/android-godeye-sample/build.gradle b/android-godeye-sample/build.gradle
index 1a649172..25816f33 100644
--- a/android-godeye-sample/build.gradle
+++ b/android-godeye-sample/build.gradle
@@ -52,6 +52,8 @@ dependencies {
     implementation project(':android-godeye')
     implementation project(':android-godeye-toolboxes:android-godeye-okhttp')
     implementation project(':android-godeye-toolboxes:android-godeye-xcrash')
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
 }
 
 apply plugin: 'cn.hikyson.methodcanary.plugin'
\ No newline at end of file
diff --git a/android-godeye-sample/src/main/AndroidManifest.xml b/android-godeye-sample/src/main/AndroidManifest.xml
index 8d7964b2..08f2f5f1 100644
--- a/android-godeye-sample/src/main/AndroidManifest.xml
+++ b/android-godeye-sample/src/main/AndroidManifest.xml
@@ -3,21 +3,21 @@
     package="cn.hikyson.android.godeye.sample">
 
     <application
-        android:name=".SampleApp"
+        android:name="cn.hikyson.godeye.sample.SampleApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".ImageActivity"></activity>
+        <activity android:name="cn.hikyson.godeye.sample.ImageActivity"></activity>
         <activity
-            android:name=".Main2Activity"
+            android:name="cn.hikyson.godeye.sample.Main2Activity"
             android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
-        <activity android:name=".LeakActivity" />
-        <activity android:name=".ComplexLayoutActivity" />
-        <activity android:name=".LeakActivityV4" />
+        <activity android:name="cn.hikyson.godeye.sample.LeakActivity" />
+        <activity android:name="cn.hikyson.godeye.sample.ComplexLayoutActivity" />
+        <activity android:name="cn.hikyson.godeye.sample.LeakActivityV4" />
         <activity
-            android:name=".SplashActivity"
+            android:name="cn.hikyson.godeye.sample.SplashActivity"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -25,8 +25,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".SecondActivity" />
-        <activity android:name=".ThirdActivity" />
+        <activity android:name="cn.hikyson.godeye.sample.SecondActivity" />
+        <activity android:name="cn.hikyson.godeye.sample.ThirdActivity" />
     </application>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/AnimationFragmentV4.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/AnimationFragmentV4.java
similarity index 97%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/AnimationFragmentV4.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/AnimationFragmentV4.java
index 62051635..85f71256 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/AnimationFragmentV4.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/AnimationFragmentV4.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.animation.ObjectAnimator;
 import android.content.Context;
@@ -14,6 +14,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
+import cn.hikyson.android.godeye.sample.R;
+
 public class AnimationFragmentV4 extends Fragment {
 
     @Override
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/AppInfoProxyImpl.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/AppInfoProxyImpl.java
similarity index 94%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/AppInfoProxyImpl.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/AppInfoProxyImpl.java
index 2fdb4eb4..83fa2735 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/AppInfoProxyImpl.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/AppInfoProxyImpl.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ComplexLayoutActivity.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/ComplexLayoutActivity.java
similarity index 81%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ComplexLayoutActivity.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/ComplexLayoutActivity.java
index 6a674357..fc5ca67b 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ComplexLayoutActivity.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/ComplexLayoutActivity.java
@@ -1,9 +1,11 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.app.Activity;
 import android.os.Bundle;
 import androidx.annotation.Nullable;
 
+import cn.hikyson.android.godeye.sample.R;
+
 public class ComplexLayoutActivity extends Activity {
 
     @Override
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ConsumeFragment.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/ConsumeFragment.java
similarity index 98%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ConsumeFragment.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/ConsumeFragment.java
index 2fddd01f..a2ac0a5c 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ConsumeFragment.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/ConsumeFragment.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
@@ -16,6 +16,7 @@
 import java.util.Objects;
 import java.util.Set;
 
+import cn.hikyson.android.godeye.sample.R;
 import cn.hikyson.godeye.core.GodEye;
 import cn.hikyson.godeye.core.exceptions.UninstallException;
 import cn.hikyson.godeye.core.utils.L;
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/DeadLockMaker.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/DeadLockMaker.java
similarity index 98%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/DeadLockMaker.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/DeadLockMaker.java
index a7b2478d..402e7f2c 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/DeadLockMaker.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/DeadLockMaker.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import java.util.concurrent.CountDownLatch;
 
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ImageActivity.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/ImageActivity.java
similarity index 96%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ImageActivity.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/ImageActivity.java
index 4b645c0c..d01dc6de 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ImageActivity.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/ImageActivity.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.os.Bundle;
 import android.view.View;
@@ -8,6 +8,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+import cn.hikyson.android.godeye.sample.R;
 import cn.hikyson.godeye.core.utils.ThreadUtil;
 
 public class ImageActivity extends AppCompatActivity {
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/InstallFragment.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/InstallFragment.java
similarity index 98%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/InstallFragment.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/InstallFragment.java
index 9de2a41f..4aae3e74 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/InstallFragment.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/InstallFragment.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -14,6 +14,7 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
 
+import cn.hikyson.android.godeye.sample.R;
 import cn.hikyson.godeye.core.GodEye;
 import cn.hikyson.godeye.core.GodEyeConfig;
 import cn.hikyson.godeye.core.utils.L;
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LeakActivity.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LeakActivity.java
similarity index 94%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LeakActivity.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LeakActivity.java
index bebe20f7..2eb90e2c 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LeakActivity.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LeakActivity.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.app.Activity;
 import android.os.Build;
@@ -7,6 +7,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+import cn.hikyson.android.godeye.sample.R;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 
 
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LeakActivityV4.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LeakActivityV4.java
similarity index 91%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LeakActivityV4.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LeakActivityV4.java
index 71533c41..f1717770 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LeakActivityV4.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LeakActivityV4.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.os.Bundle;
 
@@ -6,6 +6,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+import cn.hikyson.android.godeye.sample.R;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 
 
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LeakFragment.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LeakFragment.java
similarity index 93%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LeakFragment.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LeakFragment.java
index 8697a494..468eb323 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LeakFragment.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LeakFragment.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.app.Fragment;
 import android.os.Bundle;
@@ -9,6 +9,8 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import cn.hikyson.android.godeye.sample.R;
+
 
 public class LeakFragment extends Fragment {
     private TextView mTv;
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LeakFragmentV4.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LeakFragmentV4.java
similarity index 92%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LeakFragmentV4.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LeakFragmentV4.java
index 6830d7e6..ab3ea828 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LeakFragmentV4.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LeakFragmentV4.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.os.Bundle;
 import androidx.annotation.NonNull;
@@ -8,6 +8,8 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import cn.hikyson.android.godeye.sample.R;
+
 public class LeakFragmentV4 extends Fragment {
 
     @Override
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LogObserver.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LogObserver.java
similarity index 91%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LogObserver.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LogObserver.java
index 45862569..77368ae4 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LogObserver.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LogObserver.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import io.reactivex.functions.Consumer;
 
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LogView.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LogView.java
similarity index 96%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LogView.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LogView.java
index 80a6b619..44dc6197 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LogView.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LogView.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.content.Context;
 import android.os.Handler;
@@ -8,6 +8,8 @@
 import android.widget.ScrollView;
 import android.widget.TextView;
 
+import cn.hikyson.android.godeye.sample.R;
+
 /**
  * 用于展示打印日志的View
  * Created by kysonchao on 2017/12/9.
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/Loggable.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/Loggable.java
similarity index 69%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/Loggable.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/Loggable.java
index ac43e63e..200f87fa 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/Loggable.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/Loggable.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 /**
  * Created by kysonchao on 2017/11/24.
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/Main2Activity.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/Main2Activity.java
similarity index 98%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/Main2Activity.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/Main2Activity.java
index 0a94ccff..9e72a99e 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/Main2Activity.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/Main2Activity.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -13,6 +13,7 @@
 import java.util.List;
 import java.util.Objects;
 
+import cn.hikyson.android.godeye.sample.R;
 import cn.hikyson.godeye.core.utils.L;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/SampleApp.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/SampleApp.java
similarity index 92%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/SampleApp.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/SampleApp.java
index bf7a31b9..bb42159f 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/SampleApp.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/SampleApp.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.app.Application;
 
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/SecondActivity.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/SecondActivity.java
similarity index 96%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/SecondActivity.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/SecondActivity.java
index 6c34b974..490220e3 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/SecondActivity.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/SecondActivity.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -9,6 +9,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentManager;
 
+import cn.hikyson.android.godeye.sample.R;
 import cn.hikyson.godeye.core.GodEyeHelper;
 import cn.hikyson.godeye.core.exceptions.UninstallException;
 
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/SplashActivity.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/SplashActivity.java
similarity index 93%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/SplashActivity.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/SplashActivity.java
index 138efe66..6725afef 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/SplashActivity.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/SplashActivity.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.Manifest;
 import android.app.Activity;
@@ -8,6 +8,8 @@
 import androidx.core.content.PermissionChecker;
 import android.widget.Toast;
 
+import cn.hikyson.android.godeye.sample.R;
+
 public class SplashActivity extends Activity {
 
     @Override
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/StartupTracer.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/StartupTracer.java
similarity index 93%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/StartupTracer.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/StartupTracer.java
index d6e90b1f..9c137cbe 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/StartupTracer.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/StartupTracer.java
@@ -1,13 +1,11 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.app.Activity;
 import android.os.Handler;
 import android.os.Looper;
 
-import cn.hikyson.godeye.core.GodEye;
 import cn.hikyson.godeye.core.GodEyeHelper;
 import cn.hikyson.godeye.core.exceptions.UninstallException;
-import cn.hikyson.godeye.core.internal.modules.startup.Startup;
 import cn.hikyson.godeye.core.internal.modules.startup.StartupInfo;
 
 
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ThirdActivity.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/ThirdActivity.java
similarity index 87%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ThirdActivity.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/ThirdActivity.java
index b57d415c..38c8ae6a 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ThirdActivity.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/ThirdActivity.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.os.Bundle;
 import android.os.Handler;
@@ -6,8 +6,9 @@
 import androidx.fragment.app.FragmentManager;
 import android.view.View;
 
-import cn.hikyson.android.godeye.sample.fragmentlifecycle.BlankFragment1;
-import cn.hikyson.android.godeye.sample.fragmentlifecycle.BlankFragment2;
+import cn.hikyson.android.godeye.sample.R;
+import cn.hikyson.godeye.sample.fragmentlifecycle.BlankFragment1;
+import cn.hikyson.godeye.sample.fragmentlifecycle.BlankFragment2;
 
 public class ThirdActivity extends FragmentActivity {
 
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ToolsFragment.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/ToolsFragment.java
similarity index 98%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ToolsFragment.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/ToolsFragment.java
index 95355abb..a6ff6cf8 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ToolsFragment.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/ToolsFragment.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -17,6 +17,7 @@
 import java.util.Random;
 
 import cn.hikyson.android.godeye.okhttp.GodEyePluginOkNetwork;
+import cn.hikyson.android.godeye.sample.R;
 import cn.hikyson.godeye.core.GodEyeHelper;
 import cn.hikyson.godeye.core.exceptions.UninstallException;
 import cn.hikyson.godeye.core.internal.modules.startup.StartupInfo;
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/fragmentlifecycle/BlankFragment1.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/fragmentlifecycle/BlankFragment1.java
similarity index 98%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/fragmentlifecycle/BlankFragment1.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/fragmentlifecycle/BlankFragment1.java
index c0b44583..f83cec94 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/fragmentlifecycle/BlankFragment1.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/fragmentlifecycle/BlankFragment1.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample.fragmentlifecycle;
+package cn.hikyson.godeye.sample.fragmentlifecycle;
 
 import android.content.Context;
 import android.net.Uri;
diff --git a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/fragmentlifecycle/BlankFragment2.java b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/fragmentlifecycle/BlankFragment2.java
similarity index 98%
rename from android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/fragmentlifecycle/BlankFragment2.java
rename to android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/fragmentlifecycle/BlankFragment2.java
index a05733bd..506402f4 100644
--- a/android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/fragmentlifecycle/BlankFragment2.java
+++ b/android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/fragmentlifecycle/BlankFragment2.java
@@ -1,4 +1,4 @@
-package cn.hikyson.android.godeye.sample.fragmentlifecycle;
+package cn.hikyson.godeye.sample.fragmentlifecycle;
 
 import android.content.Context;
 import android.net.Uri;
diff --git a/android-godeye-sample/src/main/res/layout/activity_image.xml b/android-godeye-sample/src/main/res/layout/activity_image.xml
index 04dd508f..a1ef2099 100644
--- a/android-godeye-sample/src/main/res/layout/activity_image.xml
+++ b/android-godeye-sample/src/main/res/layout/activity_image.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ImageActivity">
+    tools:context="cn.hikyson.godeye.sample.ImageActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/android-godeye-sample/src/main/res/layout/activity_leak.xml b/android-godeye-sample/src/main/res/layout/activity_leak.xml
index 7ce33c35..341bc83b 100644
--- a/android-godeye-sample/src/main/res/layout/activity_leak.xml
+++ b/android-godeye-sample/src/main/res/layout/activity_leak.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@android:color/white"
-    tools:context="cn.hikyson.android.godeye.sample.LeakActivity">
+    tools:context="cn.hikyson.android.godeye.sample.cn.hikyson.godeye.sample.LeakActivity">
 
     <TextView
         android:id="@+id/activity_leak_test"
diff --git a/android-godeye-sample/src/main/res/layout/activity_leak_v4.xml b/android-godeye-sample/src/main/res/layout/activity_leak_v4.xml
index 614b6fa6..f3a2cab4 100644
--- a/android-godeye-sample/src/main/res/layout/activity_leak_v4.xml
+++ b/android-godeye-sample/src/main/res/layout/activity_leak_v4.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="cn.hikyson.android.godeye.sample.LeakActivity">
+    tools:context="cn.hikyson.android.godeye.sample.cn.hikyson.godeye.sample.LeakActivity">
 
     <TextView
         android:id="@+id/activity_leak_test"
diff --git a/android-godeye-sample/src/main/res/layout/activity_main.xml b/android-godeye-sample/src/main/res/layout/activity_main.xml
index 1f1c037b..60a62f3f 100644
--- a/android-godeye-sample/src/main/res/layout/activity_main.xml
+++ b/android-godeye-sample/src/main/res/layout/activity_main.xml
@@ -7,13 +7,13 @@
     android:orientation="vertical"
     tools:context="cn.hikyson.android.godeye.sample.MainActivity">
 
-    <cn.hikyson.android.godeye.sample.LogView
+    <cn.hikyson.godeye.sample.LogView
         android:id="@+id/activity_main_logview"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
         android:background="#505050">
-    </cn.hikyson.android.godeye.sample.LogView>
+    </cn.hikyson.godeye.sample.LogView>
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/android-godeye-sample/src/main/res/layout/activity_main2.xml b/android-godeye-sample/src/main/res/layout/activity_main2.xml
index 93798ceb..e8dacebf 100644
--- a/android-godeye-sample/src/main/res/layout/activity_main2.xml
+++ b/android-godeye-sample/src/main/res/layout/activity_main2.xml
@@ -5,9 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".Main2Activity">
+    tools:context="cn.hikyson.godeye.sample.Main2Activity">
 
-    <cn.hikyson.android.godeye.sample.LogView
+    <cn.hikyson.godeye.sample.LogView
         android:id="@+id/activity_main2_logview"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/android-godeye-sample/src/main/res/layout/activity_second.xml b/android-godeye-sample/src/main/res/layout/activity_second.xml
index 4489e98e..419ba77b 100644
--- a/android-godeye-sample/src/main/res/layout/activity_second.xml
+++ b/android-godeye-sample/src/main/res/layout/activity_second.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="cn.hikyson.android.godeye.sample.SecondActivity">
+    tools:context="cn.hikyson.android.godeye.sample.cn.hikyson.godeye.sample.SecondActivity">
 
     <TextView
         android:id="@+id/textView"
diff --git a/android-godeye-sample/src/main/res/layout/activity_splash.xml b/android-godeye-sample/src/main/res/layout/activity_splash.xml
index 5ddb5695..cb32f86c 100644
--- a/android-godeye-sample/src/main/res/layout/activity_splash.xml
+++ b/android-godeye-sample/src/main/res/layout/activity_splash.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="cn.hikyson.android.godeye.sample.SplashActivity">
+    tools:context="cn.hikyson.android.godeye.sample.cn.hikyson.godeye.sample.SplashActivity">
 
     <ImageView
         android:layout_width="72dp"
diff --git a/android-godeye-sample/src/main/res/layout/activity_third.xml b/android-godeye-sample/src/main/res/layout/activity_third.xml
index e2f10fc0..57cd763b 100644
--- a/android-godeye-sample/src/main/res/layout/activity_third.xml
+++ b/android-godeye-sample/src/main/res/layout/activity_third.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="cn.hikyson.android.godeye.sample.ThirdActivity">
+    tools:context="cn.hikyson.android.godeye.sample.cn.hikyson.godeye.sample.ThirdActivity">
 
     <Button
         android:id="@+id/textView2"
diff --git a/android-godeye-sample/src/main/res/layout/fragment_blank_fragment1.xml b/android-godeye-sample/src/main/res/layout/fragment_blank_fragment1.xml
index 0d0c18b6..b02ef86c 100644
--- a/android-godeye-sample/src/main/res/layout/fragment_blank_fragment1.xml
+++ b/android-godeye-sample/src/main/res/layout/fragment_blank_fragment1.xml
@@ -3,7 +3,7 @@
              xmlns:tools="http://schemas.android.com/tools"
              android:layout_width="match_parent"
              android:layout_height="match_parent"
-             tools:context=".fragmentlifecycle.BlankFragment1">
+             tools:context="cn.hikyson.godeye.sample.fragmentlifecycle.BlankFragment1">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView
diff --git a/android-godeye-sample/src/main/res/layout/fragment_blank_fragment2.xml b/android-godeye-sample/src/main/res/layout/fragment_blank_fragment2.xml
index 533e9100..70c69640 100644
--- a/android-godeye-sample/src/main/res/layout/fragment_blank_fragment2.xml
+++ b/android-godeye-sample/src/main/res/layout/fragment_blank_fragment2.xml
@@ -3,7 +3,7 @@
              xmlns:tools="http://schemas.android.com/tools"
              android:layout_width="match_parent"
              android:layout_height="match_parent"
-             tools:context=".fragmentlifecycle.BlankFragment2">
+             tools:context="cn.hikyson.godeye.sample.fragmentlifecycle.BlankFragment2">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView
diff --git a/android-godeye-sample/src/main/res/layout/fragment_install.xml b/android-godeye-sample/src/main/res/layout/fragment_install.xml
index 8656e79c..f7f81f51 100644
--- a/android-godeye-sample/src/main/res/layout/fragment_install.xml
+++ b/android-godeye-sample/src/main/res/layout/fragment_install.xml
@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        tools:context=".InstallFragment">
+        tools:context="cn.hikyson.godeye.sample.InstallFragment">
 
         <Button
             android:id="@+id/fragment_install_default"
diff --git a/android-godeye-sample/src/main/res/layout/fragment_tools.xml b/android-godeye-sample/src/main/res/layout/fragment_tools.xml
index 4316e4e0..e26289fe 100644
--- a/android-godeye-sample/src/main/res/layout/fragment_tools.xml
+++ b/android-godeye-sample/src/main/res/layout/fragment_tools.xml
@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        tools:context=".ToolsFragment">
+        tools:context="cn.hikyson.godeye.sample.ToolsFragment">
 
         <Button
             android:id="@+id/fragment_tools_request_bt"
diff --git a/android-godeye-toolboxes/android-godeye-xcrash/build.gradle b/android-godeye-toolboxes/android-godeye-xcrash/build.gradle
index 6424a765..63313dc0 100644
--- a/android-godeye-toolboxes/android-godeye-xcrash/build.gradle
+++ b/android-godeye-toolboxes/android-godeye-xcrash/build.gradle
@@ -37,6 +37,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation 'com.iqiyi.xcrash:xcrash-android-lib:2.4.6'
     implementation project(':android-godeye')
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
 }
 
 apply from: rootProject.file('gradle/gradle-jcenter-push.gradle')
diff --git a/android-godeye/build.gradle b/android-godeye/build.gradle
index f884a798..da4e26f0 100644
--- a/android-godeye/build.gradle
+++ b/android-godeye/build.gradle
@@ -48,12 +48,12 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    api 'com.google.code.gson:gson:2.8.5'
-    api 'io.reactivex.rxjava2:rxjava:2.2.2'
-    api 'io.reactivex.rxjava2:rxandroid:2.1.0'
-    api 'com.squareup.leakcanary:leakcanary-android:1.6.3'
-    api 'com.squareup.leakcanary:leakcanary-support-fragment:1.6.3'
-    api 'cn.hikyson.methodcanary:lib:0.12.1'
+    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
+    implementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
+    implementation 'com.squareup.leakcanary:leakcanary-support-fragment:1.6.3'
+    implementation "cn.hikyson.methodcanary:lib:${VERSION_METHOD_CANARY}"
 }
 
 apply from: rootProject.file('gradle/gradle-jcenter-push.gradle')
\ No newline at end of file
diff --git a/android-godeye/src/main/java/cn/hikyson/godeye/core/internal/modules/methodcanary/MethodCanary.java b/android-godeye/src/main/java/cn/hikyson/godeye/core/internal/modules/methodcanary/MethodCanary.java
index 8c6df846..4db8a7c0 100644
--- a/android-godeye/src/main/java/cn/hikyson/godeye/core/internal/modules/methodcanary/MethodCanary.java
+++ b/android-godeye/src/main/java/cn/hikyson/godeye/core/internal/modules/methodcanary/MethodCanary.java
@@ -69,10 +69,10 @@ public synchronized void stopMonitor(String tag) {
                         long start1 = System.currentTimeMillis();
                         MethodCanaryConverter.filter(methodsRecordInfo, this.mMethodCanaryContext);
                         long end = System.currentTimeMillis();
-                        L.d(String.format("MethodCanary output converter cost %s ms, filter cost %s ms", end - start0, end - start1));
+                        L.d(String.format("MethodCanary output success! cost %s ms, filter cost %s ms", end - start0, end - start1));
                         produce(methodsRecordInfo);
                     });
-            L.d("MethodCanary stop monitor success.");
+            L.d("MethodCanary stopped monitor and output processing...");
         } catch (Exception e) {
             L.d("MethodCanary stop monitor fail:" + e);
         }
diff --git a/android-godeye/src/main/java/cn/hikyson/godeye/core/internal/modules/methodcanary/MethodCanaryConverter.java b/android-godeye/src/main/java/cn/hikyson/godeye/core/internal/modules/methodcanary/MethodCanaryConverter.java
index 48e6b540..e1383dd1 100644
--- a/android-godeye/src/main/java/cn/hikyson/godeye/core/internal/modules/methodcanary/MethodCanaryConverter.java
+++ b/android-godeye/src/main/java/cn/hikyson/godeye/core/internal/modules/methodcanary/MethodCanaryConverter.java
@@ -7,9 +7,7 @@
 import java.util.Map;
 import java.util.Stack;
 
-import cn.hikyson.methodcanary.lib.MethodEnterEvent;
 import cn.hikyson.methodcanary.lib.MethodEvent;
-import cn.hikyson.methodcanary.lib.MethodExitEvent;
 import cn.hikyson.methodcanary.lib.ThreadInfo;
 
 class MethodCanaryConverter {
@@ -24,8 +22,7 @@ static MethodsRecordInfo convertToMethodsRecordInfo(long startTimeNanos, long st
             List<MethodsRecordInfo.MethodInfoOfThreadInfo.MethodInfo> methodInfos = new ArrayList<>(methodEvents.size());
             Stack<MethodsRecordInfo.MethodInfoOfThreadInfo.MethodInfo> methodEventsStackOfCurrentThread = new Stack<>();
             for (MethodEvent methodEvent : methodEvents) {
-                // TODO KYSON 修改为type
-                if (methodEvent instanceof MethodEnterEvent) {
+                if (methodEvent.isEnter) {
                     MethodsRecordInfo.MethodInfoOfThreadInfo.MethodInfo methodInfo = new MethodsRecordInfo.MethodInfoOfThreadInfo.MethodInfo();
                     methodInfo.className = methodEvent.className;
                     methodInfo.methodAccessFlag = methodEvent.methodAccessFlag;
@@ -35,13 +32,14 @@ static MethodsRecordInfo convertToMethodsRecordInfo(long startTimeNanos, long st
                     methodInfo.stack = methodEventsStackOfCurrentThread.size();
                     methodInfos.add(methodInfo);
                     methodEventsStackOfCurrentThread.push(methodInfo);
-                } else if (methodEvent instanceof MethodExitEvent) {
+                } else {
                     MethodsRecordInfo.MethodInfoOfThreadInfo.MethodInfo methodInfo = null;
                     if (!methodEventsStackOfCurrentThread.empty()) {
                         methodInfo = methodEventsStackOfCurrentThread.pop();
                     }
                     if (methodInfo != null) {
                         methodInfo.end = methodEvent.eventNanoTime;
+                        assertMethodEventPair(methodInfo, methodEvent);
                     }
                 }
             }
@@ -50,6 +48,18 @@ static MethodsRecordInfo convertToMethodsRecordInfo(long startTimeNanos, long st
         return methodsRecordInfo;
     }
 
+    private static void assertMethodEventPair(MethodsRecordInfo.MethodInfoOfThreadInfo.MethodInfo methodInfo, MethodEvent methodExitEvent) {
+        if (!methodInfo.className.equals(methodExitEvent.className)
+                || !methodInfo.className.equals(methodExitEvent.pairMethodEvent.className)
+                || !methodInfo.methodName.equals(methodExitEvent.methodName)
+                || !methodInfo.methodName.equals(methodExitEvent.pairMethodEvent.methodName)
+                || !methodInfo.methodDesc.equals(methodExitEvent.methodDesc)
+                || !methodInfo.methodDesc.equals(methodExitEvent.pairMethodEvent.methodDesc)
+        ) {
+            throw new IllegalStateException("Error assertMethodEventPair, methodInfo: " + methodInfo + ", methodExitEvent: " + methodExitEvent);
+        }
+    }
+
     static void filter(MethodsRecordInfo methodsRecordInfo, MethodCanaryConfig methodCanaryContext) {
         int maxMethodCountSingleThreadByCost = methodCanaryContext.maxMethodCountSingleThreadByCost();
         Comparator<MethodsRecordInfo.MethodInfoOfThreadInfo.MethodInfo> methodInfoCostComparator = methodInfoCostComparator(methodsRecordInfo.start, methodsRecordInfo.end);
diff --git a/android-godeye/src/main/java/cn/hikyson/godeye/core/internal/modules/methodcanary/MethodsRecordInfo.java b/android-godeye/src/main/java/cn/hikyson/godeye/core/internal/modules/methodcanary/MethodsRecordInfo.java
index b8742eb6..16f5ac70 100644
--- a/android-godeye/src/main/java/cn/hikyson/godeye/core/internal/modules/methodcanary/MethodsRecordInfo.java
+++ b/android-godeye/src/main/java/cn/hikyson/godeye/core/internal/modules/methodcanary/MethodsRecordInfo.java
@@ -20,6 +20,15 @@ public MethodsRecordInfo(long start, long end, List<MethodInfoOfThreadInfo> meth
         this.methodInfoOfThreadInfos = methodInfoOfThreadInfos;
     }
 
+    @Override
+    public String toString() {
+        return "MethodsRecordInfo{" +
+                "start=" + start +
+                ", end=" + end +
+                ", methodInfoOfThreadInfos=" + methodInfoOfThreadInfos +
+                '}';
+    }
+
     @Keep
     public static class MethodInfoOfThreadInfo implements Serializable {
         public ThreadInfo threadInfo;
@@ -30,6 +39,14 @@ public MethodInfoOfThreadInfo(ThreadInfo threadInfo, List<MethodInfo> methodInfo
             this.methodInfos = methodInfos;
         }
 
+        @Override
+        public String toString() {
+            return "MethodInfoOfThreadInfo{" +
+                    "threadInfo=" + threadInfo +
+                    ", methodInfos=" + methodInfos +
+                    '}';
+        }
+
         @Keep
         public static class MethodInfo implements Serializable {
             public int stack;
@@ -39,6 +56,21 @@ public static class MethodInfo implements Serializable {
             public int methodAccessFlag;
             public String methodName;
             public String methodDesc;
+
+            @Override
+            public String toString() {
+                return "MethodInfo{" +
+                        "stack=" + stack +
+                        ", start=" + start +
+                        ", end=" + end +
+                        ", className='" + className + '\'' +
+                        ", methodAccessFlag=" + methodAccessFlag +
+                        ", methodName='" + methodName + '\'' +
+                        ", methodDesc='" + methodDesc + '\'' +
+                        '}';
+            }
         }
+
+
     }
 }
diff --git a/android-godeye/src/test/java/cn/hikyson/godeye/core/internal/modules/methodcanary/MethodCanaryConverterTest.java b/android-godeye/src/test/java/cn/hikyson/godeye/core/internal/modules/methodcanary/MethodCanaryConverterTest.java
index 729b3411..56116ceb 100644
--- a/android-godeye/src/test/java/cn/hikyson/godeye/core/internal/modules/methodcanary/MethodCanaryConverterTest.java
+++ b/android-godeye/src/test/java/cn/hikyson/godeye/core/internal/modules/methodcanary/MethodCanaryConverterTest.java
@@ -9,12 +9,10 @@
 import java.util.List;
 import java.util.Map;
 
-import cn.hikyson.methodcanary.lib.MethodEnterEvent;
 import cn.hikyson.methodcanary.lib.MethodEvent;
-import cn.hikyson.methodcanary.lib.MethodExitEvent;
 import cn.hikyson.methodcanary.lib.ThreadInfo;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 public class MethodCanaryConverterTest {
 
@@ -28,37 +26,37 @@ public void convertToMethodsRecordInfo() {
         assertEquals(methodsRecordInfo.methodInfoOfThreadInfos.size(), methodEventMap.size());
     }
 
-    public static Map<ThreadInfo, List<MethodEvent>> mockMethodEventMap() {
+    static Map<ThreadInfo, List<MethodEvent>> mockMethodEventMap() {
         Map<ThreadInfo, List<MethodEvent>> methodEventMap = new HashMap<>();
         methodEventMap.put(new ThreadInfo(1, "main", 5), new ArrayList<MethodEvent>());
         methodEventMap.put(new ThreadInfo(2, "thread2", 6), new ArrayList<MethodEvent>());
         methodEventMap.put(new ThreadInfo(3, "thread3", 8), new ArrayList<MethodEvent>());
         for (int i = 0; i < 10; i++) {
             if (i % 2 == 0) {
-                methodEventMap.get(new ThreadInfo(1, "main", 5)).add(new MethodEnterEvent("class" + i, i, "method" + i, "methoddesc" + i, System.nanoTime()));
-                methodEventMap.get(new ThreadInfo(1, "main", 5)).add(new MethodEnterEvent("class" + i + "x", i, "method" + i + "x", "methoddesc" + i + "x", System.nanoTime()));
+                methodEventMap.get(new ThreadInfo(1, "main", 5)).add(new MethodEvent("class" + i, i, "method" + i, "methoddesc" + i, true, System.nanoTime()));
+                methodEventMap.get(new ThreadInfo(1, "main", 5)).add(new MethodEvent("class" + i + "x", i, "method" + i + "x", "methoddesc" + i + "x", true, System.nanoTime()));
             } else {
-                methodEventMap.get(new ThreadInfo(1, "main", 5)).add(new MethodExitEvent("class" + i, i, "method" + i, "methoddesc" + i, System.nanoTime()));
-                methodEventMap.get(new ThreadInfo(1, "main", 5)).add(new MethodExitEvent("class" + i + "x", i, "method" + i + "x", "methoddesc" + i + "x", System.nanoTime()));
+                methodEventMap.get(new ThreadInfo(1, "main", 5)).add(new MethodEvent("class" + i, i, "method" + i, "methoddesc" + i, false, System.nanoTime()));
+                methodEventMap.get(new ThreadInfo(1, "main", 5)).add(new MethodEvent("class" + i + "x", i, "method" + i + "x", "methoddesc" + i + "x", false, System.nanoTime()));
             }
         }
         for (int i = 15; i < 20; i++) {
             if (i % 2 == 0) {
-                methodEventMap.get(new ThreadInfo(2, "thread2", 6)).add(new MethodExitEvent("class" + i, i, "method" + i, "methoddesc" + i, System.nanoTime()));
+                methodEventMap.get(new ThreadInfo(2, "thread2", 6)).add(new MethodEvent("class" + i, i, "method" + i, "methoddesc" + i, false, System.nanoTime()));
             } else {
-                methodEventMap.get(new ThreadInfo(2, "thread2", 6)).add(new MethodEnterEvent("class" + i, i, "method" + i, "methoddesc" + i, System.nanoTime()));
+                methodEventMap.get(new ThreadInfo(2, "thread2", 6)).add(new MethodEvent("class" + i, i, "method" + i, "methoddesc" + i, false, System.nanoTime()));
             }
         }
-        methodEventMap.get(new ThreadInfo(3, "thread3", 8)).add(new MethodEnterEvent("class" + 99, 99, "method" + 99, "methoddesc" + 99, System.nanoTime()));
+        methodEventMap.get(new ThreadInfo(3, "thread3", 8)).add(new MethodEvent("class" + 99, 99, "method" + 99, "methoddesc" + 99, true, System.nanoTime()));
         for (int i = 100; i < 103; i++) {
-            methodEventMap.get(new ThreadInfo(3, "thread3", 8)).add(new MethodExitEvent("class" + i, i, "method" + i, "methoddesc" + i, System.nanoTime()));
+            methodEventMap.get(new ThreadInfo(3, "thread3", 8)).add(new MethodEvent("class" + i, i, "method" + i, "methoddesc" + i, false, System.nanoTime()));
         }
-        methodEventMap.get(new ThreadInfo(3, "thread3", 8)).add(new MethodEnterEvent("class" + 103, 103, "method" + 103, "methoddesc" + 103, System.nanoTime()));
-        methodEventMap.get(new ThreadInfo(3, "thread3", 8)).add(new MethodExitEvent("class" + 104, 104, "method" + 104, "methoddesc" + 104, System.nanoTime()));
+        methodEventMap.get(new ThreadInfo(3, "thread3", 8)).add(new MethodEvent("class" + 103, 103, "method" + 103, "methoddesc" + 103, true, System.nanoTime()));
+        methodEventMap.get(new ThreadInfo(3, "thread3", 8)).add(new MethodEvent("class" + 104, 104, "method" + 104, "methoddesc" + 104, false, System.nanoTime()));
         return methodEventMap;
     }
 
-    public static MethodsRecordInfo mockMethodsRecordInfo(Map<ThreadInfo, List<MethodEvent>> methodEventMap) {
+    static MethodsRecordInfo mockMethodsRecordInfo(Map<ThreadInfo, List<MethodEvent>> methodEventMap) {
         long start = System.nanoTime();
         return MethodCanaryConverter.convertToMethodsRecordInfo(start, System.nanoTime(), methodEventMap);
     }
diff --git a/build.gradle b/build.gradle
index 128491a9..ffcf0d04 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.novoda:bintray-release:0.9.1'
-        classpath "cn.hikyson.methodcanary:plugin:0.12.1"
+        classpath "cn.hikyson.methodcanary:plugin:${VERSION_METHOD_CANARY}"
         classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
     }
 }
diff --git a/gradle.properties b/gradle.properties
index b0ce28de..c2b1bbe8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -43,4 +43,5 @@ BUILD_TOOLS_VERSION=29.0.2
 MIN_SDK_VERSION=16
 TARGET_SDK_VERSION=29
 
-USE_ALIYUN_REPO=false
\ No newline at end of file
+USE_ALIYUN_REPO=true
+VERSION_METHOD_CANARY=0.13.5
\ No newline at end of file