#Changed#

Upgrade method canary to 0.13.5, change 'MethodCanary.js' to 'AndroidGodEye-MethodCanary.js'
Sample package name changed

MethodCanary.js → 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')
 }

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'
 }

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'

android-godeye-sample/src/main/AndroidManifest.xml

@@ -3,30 +3,30 @@
     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" />
 
                 <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" />

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/AnimationFragmentV4.java → 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

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/AppInfoProxyImpl.java → 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;

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ComplexLayoutActivity.java → 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

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ConsumeFragment.java → 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;

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/DeadLockMaker.java → 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;
 

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ImageActivity.java → 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 {

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/InstallFragment.java → 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;

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LeakActivity.java → 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;
 
 

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LeakActivityV4.java → android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/LeakActivityV4.java

@@ -1,11 +1,12 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.os.Bundle;
 
 import androidx.fragment.app.FragmentActivity;
 
 import java.util.concurrent.TimeUnit;
 
+import cn.hikyson.android.godeye.sample.R;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 
 

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LeakFragment.java → 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;

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LeakFragmentV4.java → 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

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LogObserver.java → 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;
 

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/LogView.java → 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.

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/Loggable.java → 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.

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/Main2Activity.java → 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;
 

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/SampleApp.java → 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;
 

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/SecondActivity.java → 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;
 

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/SplashActivity.java → 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

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/StartupTracer.java → 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;
 
 

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ThirdActivity.java → android-godeye-sample/src/main/java/cn/hikyson/godeye/sample/ThirdActivity.java

@@ -1,13 +1,14 @@
-package cn.hikyson.android.godeye.sample;
+package cn.hikyson.godeye.sample;
 
 import android.os.Bundle;
 import android.os.Handler;
 import androidx.fragment.app.FragmentActivity;
 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 {
 

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/ToolsFragment.java → 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;

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/fragmentlifecycle/BlankFragment1.java → 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;

android-godeye-sample/src/main/java/cn/hikyson/android/godeye/sample/fragmentlifecycle/BlankFragment2.java → 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;

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"

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"

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"

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"