update: 兼容 AndroidX

GitLqr · Dec 8, 2021 · 77d442d · 77d442d
1 parent 91c7e92
commit 77d442d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/...com/qihoo360/replugin/gradle/plugin/injector/loaderactivity/LoaderActivityInjector.groovy b/...com/qihoo360/replugin/gradle/plugin/injector/loaderactivity/LoaderActivityInjector.groovy
@@ -45,6 +45,8 @@ public class LoaderActivityInjector extends BaseInjector {
             'android.app.ActivityGroup'               : 'com.qihoo360.replugin.loader.a.PluginActivityGroup',
             'android.support.v4.app.FragmentActivity' : 'com.qihoo360.replugin.loader.a.PluginFragmentActivity',
             'android.support.v7.app.AppCompatActivity': 'com.qihoo360.replugin.loader.a.PluginAppCompatActivity',
+            'androidx.fragment.app.FragmentActivity'  : 'com.qihoo360.replugin.loader.a.PluginFragmentActivity',
+            'androidx.appcompat.app.AppCompatActivity': 'com.qihoo360.replugin.loader.a.PluginAppCompatActivity',
             'android.preference.PreferenceActivity'   : 'com.qihoo360.replugin.loader.a.PluginPreferenceActivity',
             'android.app.ExpandableListActivity'      : 'com.qihoo360.replugin.loader.a.PluginExpandableListActivity'
     ]

diff --git a/...m/qihoo360/replugin/gradle/plugin/injector/localbroadcast/LocalBroadcastExprEditor.groovy b/...m/qihoo360/replugin/gradle/plugin/injector/localbroadcast/LocalBroadcastExprEditor.groovy
@@ -26,7 +26,10 @@ import javassist.expr.MethodCall
  */
 public class LocalBroadcastExprEditor extends ExprEditor {
 
-    static def TARGET_CLASS = 'android.support.v4.content.LocalBroadcastManager'
+    static def TARGET_CLASSES = [
+            'android.support.v4.content.LocalBroadcastManager',
+            'androidx.localbroadcastmanager.content.LocalBroadcastManager'
+    ]
     static def PROXY_CLASS = 'com.qihoo360.replugin.loader.b.PluginLocalBroadcastManager'
 
     /** 处理以下方法 */
@@ -41,7 +44,7 @@ public class LocalBroadcastExprEditor extends ExprEditor {
 
     @Override
     void edit(MethodCall call) throws CannotCompileException {
-        if (call.getClassName().equalsIgnoreCase(TARGET_CLASS)) {
+        if (TARGET_CLASSES.any { it.equalsIgnoreCase(call.getClassName()) }) {
             if (!(call.getMethodName() in includeMethodCall)) {
                 // println "Skip $methodName"
                 return
@@ -66,6 +69,7 @@ public class LocalBroadcastExprEditor extends ExprEditor {
             }
         }
 
+        def TARGET_CLASS = TARGET_CLASSES.find { it.equalsIgnoreCase(call.getClassName()) }
         println ">>> Replace: ${filePath} <line:${call.lineNumber}> ${TARGET_CLASS}.${method}() <With> ${PROXY_CLASS}.${method}()\n"
     }
 }
diff --git a/...com/qihoo360/replugin/gradle/plugin/injector/localbroadcast/LocalBroadcastInjector.groovy b/...com/qihoo360/replugin/gradle/plugin/injector/localbroadcast/LocalBroadcastInjector.groovy
@@ -64,7 +64,10 @@ public class LocalBroadcastInjector extends BaseInjector {
                 def stream, ctCls
                 try {
                     // 不处理 LocalBroadcastManager.class
-                    if (filePath.contains('android/support/v4/content/LocalBroadcastManager')) {
+                    if (
+                        filePath.contains('android/support/v4/content/LocalBroadcastManager') ||
+                        filePath.contains('androidx/localbroadcastmanager/content/LocalBroadcastManager')
+                    ) {
                         println "Ignore ${filePath}"
                         return super.visitFile(file, attrs)
                     }