From 119c50579a4490a71a3879d5481727cbd9b9930b Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 21 Dec 2023 11:44:01 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.6][=E6=8A=80=E6=9C=AF=E4=BC=98=E5=8C=96]?= =?UTF-8?q?=20=E9=87=8D=E5=91=BD=E5=90=8D=E5=8D=A1=E9=A1=BF=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=9A=84=E6=BA=90=E7=A0=81=E7=9B=AE=E5=BD=95=EF=BC=8C?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=89=93debug=E5=8C=85=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../jank/compiler/JankPointAutoGenerator.java | 0 .../lancet/jank/spi/HandlerHookerImpl.kt | 0 .../lancet/jank/spi/HookInvokerImpl.java | 0 .../launcher/lancet/jank/ui/UiPostLancet.kt | 0 .../lancet/ViewPressedStateLancet.java | 18 +++++++++++++----- 6 files changed, 14 insertions(+), 6 deletions(-) rename app/src/{debug => block}/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java (100%) rename app/src/{debug => block}/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt (100%) rename app/src/{debug => block}/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java (100%) rename app/src/{debug => block}/java/com/mogo/launcher/lancet/jank/ui/UiPostLancet.kt (100%) diff --git a/app/build.gradle b/app/build.gradle index b2792e571b..bf6d37c52d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,7 +35,7 @@ android { sourceSets { main { if (rootProject.isJunkDetectEnable()) { - java.srcDirs = ['src/main/java', 'src/debug/java'] + java.srcDirs = ['src/main/java', 'src/block/java'] } else { java.srcDirs = ['src/main/java'] } diff --git a/app/src/debug/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java b/app/src/block/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java similarity index 100% rename from app/src/debug/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java rename to app/src/block/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java diff --git a/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt b/app/src/block/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt similarity index 100% rename from app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt rename to app/src/block/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt diff --git a/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java b/app/src/block/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java similarity index 100% rename from app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java rename to app/src/block/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java diff --git a/app/src/debug/java/com/mogo/launcher/lancet/jank/ui/UiPostLancet.kt b/app/src/block/java/com/mogo/launcher/lancet/jank/ui/UiPostLancet.kt similarity index 100% rename from app/src/debug/java/com/mogo/launcher/lancet/jank/ui/UiPostLancet.kt rename to app/src/block/java/com/mogo/launcher/lancet/jank/ui/UiPostLancet.kt diff --git a/app/src/main/java/com/mogo/launcher/lancet/ViewPressedStateLancet.java b/app/src/main/java/com/mogo/launcher/lancet/ViewPressedStateLancet.java index cdfb67fb94..2e7f4d47cc 100644 --- a/app/src/main/java/com/mogo/launcher/lancet/ViewPressedStateLancet.java +++ b/app/src/main/java/com/mogo/launcher/lancet/ViewPressedStateLancet.java @@ -72,6 +72,10 @@ public class ViewPressedStateLancet { if (view == null) { return; } + if (listener == null) { + view.setOnClickListener(null); + return; + } view.setOnClickListener(new OnClickWrapper(listener)); } @@ -82,6 +86,10 @@ public class ViewPressedStateLancet { if (view == null) { return; } + if (listener == null) { + view.setOnLongClickListener(null); + return; + } view.setOnLongClickListener(new OnLongClickWrapper(listener)); } @@ -89,7 +97,6 @@ public class ViewPressedStateLancet { @Insert(mayCreateSuper = true) @TargetMethod(methodName = "onCreateView") public View onCreateView(String name, Context context, AttributeSet attrs) { - Log.d("XXXXXX", "onCreateView -- 1: name:" + name); View view = (View) Origin.call(); if (view == null && attrs != null) { view = tryCreateView(name, context, attrs); @@ -102,7 +109,6 @@ public class ViewPressedStateLancet { @Insert(mayCreateSuper = true) @TargetMethod(methodName = "onCreateView") public View onCreateView(View parent, String name, Context context, AttributeSet attrs) { - Log.d("XXXXXX", "onCreateView -- 2: name:" + name); View view = (View) Origin.call(); if (view == null && attrs != null) { view = tryCreateView(name, context, attrs); @@ -239,9 +245,11 @@ public class ViewPressedStateLancet { } return; } - Drawable replaced = checkAndReplaceDrawable(view.getBackground(), alpha); - if (replaced != null) { - ViewCompat.setBackground(view, replaced); + if (view != null) { + Drawable replaced = checkAndReplaceDrawable(view.getBackground(), alpha); + if (replaced != null) { + ViewCompat.setBackground(view, replaced); + } } } catch (Throwable t) { t.printStackTrace();