diff --git a/Android/app/src/debug/java/com/didichuxing/doraemondemo/MainDebugActivity.java b/Android/app/src/debug/java/com/didichuxing/doraemondemo/MainDebugActivity.java
index afcdddc9c7490e47daba21e74720afebf2279075..819ccc1bc8747b21d6e55b6124007cc00e61ccaf 100644
--- a/Android/app/src/debug/java/com/didichuxing/doraemondemo/MainDebugActivity.java
+++ b/Android/app/src/debug/java/com/didichuxing/doraemondemo/MainDebugActivity.java
@@ -38,7 +38,6 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.didichuxing.doraemondemo.util.FrescoUtil;
import com.didichuxing.doraemonkit.DoraemonKit;
-import com.didichuxing.doraemonkit.aop.MethodCostUtil;
import com.didichuxing.doraemonkit.kit.largepicture.glide.LargeBitmapGlideTransformation;
import com.didichuxing.doraemonkit.kit.largepicture.picasso.LargeBitmapPicassoTransformation;
import com.didichuxing.doraemonkit.kit.methodtrace.MethodCost;
@@ -311,9 +310,7 @@ public class MainDebugActivity extends AppCompatActivity implements View.OnClick
break;
case R.id.btn_jump:
-
startActivity(new Intent(this, SecondActivity.class));
-
break;
case R.id.btn_jump_leak:
diff --git a/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/DokitCommClassAdapter.java b/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/DokitCommClassAdapter.java
index a56120af3a52f3847719c9e7c636024ffc47929b..bd98358cc9920497330c34cf99c667254bcfa976 100644
--- a/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/DokitCommClassAdapter.java
+++ b/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/DokitCommClassAdapter.java
@@ -33,7 +33,10 @@ public final class DokitCommClassAdapter extends ClassVisitor {
private DokitExtension dokitExtension;
/**
- * @param cv 传进来的是 ClassWriter
+ *
+ * @param cv cv
+ * @param appExtension appExtension
+ * @param dokitExtension dokitExtension
*/
public DokitCommClassAdapter(final ClassVisitor cv, AppExtension appExtension, DokitExtension dokitExtension) {
super(Opcodes.ASM7, cv);
diff --git a/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/DokitSlowMethodClassAdapter.java b/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/DokitSlowMethodClassAdapter.java
index 13ccd7c2379192bdfbbdce6b7c5f62989a6947ce..12596a61911aee7cd047fa2c8b6c4c0b36fb860b 100644
--- a/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/DokitSlowMethodClassAdapter.java
+++ b/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/DokitSlowMethodClassAdapter.java
@@ -38,8 +38,12 @@ public final class DokitSlowMethodClassAdapter extends ClassVisitor {
*/
private int thresholdTime = 500;
+
/**
- * @param cv 传进来的是 ClassWriter
+ *
+ * @param cv cv 传进来的是 ClassWriter
+ * @param appExtension appExtension
+ * @param dokitExtension dokitExtension
*/
public DokitSlowMethodClassAdapter(final ClassVisitor cv, AppExtension appExtension, DokitExtension dokitExtension) {
super(Opcodes.ASM7, cv);
@@ -108,7 +112,6 @@ public final class DokitSlowMethodClassAdapter extends ClassVisitor {
/**
- * access值得计算方式为Opcodes.ACC_PUBLIC & Opcodes.ACC_STATIC
*
* Visits a method of the class. This method must return a new {@link MethodVisitor}
* instance (or {@literal null}) each time it is called, i.e., it should not return a previously
diff --git a/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/DokitUrlConnectionClassAdapter.java b/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/DokitUrlConnectionClassAdapter.java
index 4a7946e0bc5ada6c8f28a1f9ac85e8689964fa39..10985fd862f4e4948c288edb532995536da45908 100644
--- a/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/DokitUrlConnectionClassAdapter.java
+++ b/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/DokitUrlConnectionClassAdapter.java
@@ -26,8 +26,12 @@ public final class DokitUrlConnectionClassAdapter extends ClassVisitor {
private DokitExtension dokitExtension;
+
/**
- * @param cv 传进来的是 ClassWriter
+ *
+ * @param cv cv 传进来的是 ClassWriter
+ * @param appExtension appExtension
+ * @param dokitExtension dokitExtension
*/
public DokitUrlConnectionClassAdapter(final ClassVisitor cv, AppExtension appExtension, DokitExtension dokitExtension) {
super(Opcodes.ASM7, cv);
diff --git a/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/method/slow_method/SlowMethodAdapter.java b/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/method/slow_method/SlowMethodAdapter.java
index 7f457735e3245c698386f9a8ee421e25b178f5a6..a4f67b25d90b02d81fa181ad3172906c1c0c1da0 100644
--- a/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/method/slow_method/SlowMethodAdapter.java
+++ b/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/method/slow_method/SlowMethodAdapter.java
@@ -41,6 +41,7 @@ public final class SlowMethodAdapter extends AdviceAdapter {
super(Opcodes.ASM7, methodVisitor, access, methodName, descriptor);
this.className = className;
this.thresholdTime = thresholdTime;
+ //access值得计算方式为 Opcodes.ACC_PUBLIC & Opcodes.ACC_STATIC
this.isStaticMethod = (access & Opcodes.ACC_STATIC) != 0;
}
diff --git a/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/method/urlconnection/UrlConnectionMethodAdapter.java b/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/method/urlconnection/UrlConnectionMethodAdapter.java
index c9cb43b87bc81b4e707156efdcc0e5d2ce1bdbeb..6d28e68237298eb14919aa782aa511a515e6108d 100644
--- a/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/method/urlconnection/UrlConnectionMethodAdapter.java
+++ b/Android/doraemonkit-plugin/src/main/groovy/com/didichuxing/doraemonkit/plugin/bytecode/method/urlconnection/UrlConnectionMethodAdapter.java
@@ -21,7 +21,7 @@ public final class UrlConnectionMethodAdapter extends LocalVariablesSorter imple
* @param owner 调用对象
* @param name 函数名
* @param desc 函数签名
- * @param isInterface
+ * @param isInterface 是否是接口
*/
@Override
public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean isInterface) {
diff --git a/Android/doraemonkit-rpc/src/main/java/com/didichuxing/foundation/net/rpc/http/PlatformHttpHook.java b/Android/doraemonkit-rpc/src/main/java/com/didichuxing/foundation/net/rpc/http/PlatformHttpHook.java
index 55878cc6c1ddfe2105e6c83bc96b9557fba32f57..618f918b197067fa64ec2028e31d063accdf0c9e 100644
--- a/Android/doraemonkit-rpc/src/main/java/com/didichuxing/foundation/net/rpc/http/PlatformHttpHook.java
+++ b/Android/doraemonkit-rpc/src/main/java/com/didichuxing/foundation/net/rpc/http/PlatformHttpHook.java
@@ -27,10 +27,15 @@ public class PlatformHttpHook {
if (IS_INSTALL) {
return;
}
- OkHttpRpc.OkHttpRpcInterceptor rpcMockInterceptor = new OkHttpRpc.OkHttpRpcInterceptor((new RpcMockInterceptor()));
- OkHttpRpc.OkHttpRpcInterceptor rpcMonitorInterceptor = new OkHttpRpc.OkHttpRpcInterceptor((new RpcMonitorInterceptor()));
- globalInterceptors.add(rpcMockInterceptor);
- globalInterceptors.add(rpcMonitorInterceptor);
- IS_INSTALL = true;
+ try {
+ //可能存在用户没有引入滴滴内部网络库的情况
+ OkHttpRpc.OkHttpRpcInterceptor rpcMockInterceptor = new OkHttpRpc.OkHttpRpcInterceptor((new RpcMockInterceptor()));
+ OkHttpRpc.OkHttpRpcInterceptor rpcMonitorInterceptor = new OkHttpRpc.OkHttpRpcInterceptor((new RpcMonitorInterceptor()));
+ globalInterceptors.add(rpcMockInterceptor);
+ globalInterceptors.add(rpcMonitorInterceptor);
+ IS_INSTALL = true;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
diff --git a/Android/doraemonkit-weex/src/main/res/layout/dk_weex_float_log_info.xml b/Android/doraemonkit-weex/src/main/res/layout/dk_weex_float_log_info.xml
index d1ad63e2adead3b58d0108751dde07d449ac6065..4818ba27312d327c527454da80db50d1a8eb59b6 100644
--- a/Android/doraemonkit-weex/src/main/res/layout/dk_weex_float_log_info.xml
+++ b/Android/doraemonkit-weex/src/main/res/layout/dk_weex_float_log_info.xml
@@ -16,10 +16,9 @@
android:layout_width="match_parent"
android:layout_height="89dp"
android:layout_alignParentTop="true"
- app:dkIcon="@drawable/dk_close_icon"
- app:dkTitle="@string/dk_console_log_title"
android:background="@color/foreground_wtf"
- />
+ app:dkIcon="@drawable/dk_close_icon"
+ app:dkTitle="@string/dk_console_log_title" />
+
+