diff --git a/app/src/main/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java b/app/src/main/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java index 50f85649a5..a553067f38 100644 --- a/app/src/main/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java +++ b/app/src/main/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java @@ -131,7 +131,7 @@ public class HookInvokerImpl implements IHookInvoker { builder .append(type) .append("#") - .append(caller == null ? "caller is null" : caller.getClass().getSimpleName()) + .append(caller == null ? "caller is null" : caller.getClass().getName()) .append("#") .append(methodName); if (args.length > 0) { @@ -141,7 +141,7 @@ public class HookInvokerImpl implements IHookInvoker { if (o == null) { continue; } - builder.append(o.getClass().getSimpleName()) + builder.append(o.getClass().getName()) .append(","); } @@ -151,10 +151,11 @@ public class HookInvokerImpl implements IHookInvoker { } builder.append("#").append(cost); + boolean flag = false; if (extra != null && extra.length() > 0) { builder.append("#"); builder.append(extra); - extra.setLength(0); + flag = true; } // dump堆栈阈值 long dumpStackThreshold = 20; @@ -168,6 +169,9 @@ public class HookInvokerImpl implements IHookInvoker { } Log.w("HookHandler", "Junk Detected:" + builder); linkedLog(type, builder.toString()); + if (flag) { + extra.setLength(0); + } } } diff --git a/config.gradle b/config.gradle index ad66f81eff..25d1b30550 100644 --- a/config.gradle +++ b/config.gradle @@ -228,7 +228,7 @@ ext { passport_secret : "com.zhidaoauto:sdk-java:1.0.5-SNAPSHOT", // 主线程卡顿监测 - block_detector : "com.mogo.eagle.core.block:runtime:10.90.0", + block_detector : "com.mogo.eagle.core.block:runtime:10.90.10", //======================== google auto-service =============== google_auto_service : "com.google.auto.service:auto-service:1.0-rc7", diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt index 47961c8d09..41174b3d7e 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt @@ -57,8 +57,8 @@ internal class MoGoBlockProviderImpl: IMoGoBlockProvider, IBlockListener { val processUsage = cpu.remove("ProcessUsage") if (mainThreadUsage != null && processUsage != null) { map["cpu"] = ArrayList().also { - it.add("MainThread: ${ "%.2f".format(mainThreadUsage * 1.0f * 100 / processUsage) }% ($mainThreadUsage, $processUsage)") - cpu.entries.sortedByDescending { e -> + it.add("main-thread: ${ "%.2f".format(mainThreadUsage * 1.0f * 100 / processUsage) }% ($mainThreadUsage, $processUsage)") + for (e in cpu.entries.sortedByDescending { e -> e.value }) { it.add("${e.key}: ${ "%.2f".format(e.value * 1.0f * 100 / processUsage) }% (${e.value}, $processUsage)") } }