修复两个Multidex插件有重复Activity名的问题。

jjyw · May 5, 2019 · d5a7d34 · d5a7d34
1 parent 7de0886
commit d5a7d34
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 17 deletions.
diff --git a/projects/demo/host-apk/src/main/java/com/tencent/shadow/demo/host/MainActivity.java b/projects/demo/host-apk/src/main/java/com/tencent/shadow/demo/host/MainActivity.java
@@ -56,8 +56,10 @@ public void onClick(View v) {
                         intent.putExtra(Constant.KEY_ACTIVITY_CLASSNAME, "com.tencent.shadow.demo.gallery.splash.SplashActivity");
                         break;
                     case Constant.PART_KEY_MULTIDEX_V1_0_2:
+                        intent.putExtra(Constant.KEY_ACTIVITY_CLASSNAME, "com.tencent.shadow.demo.plugin.multidex.v1_0_2.PluginMultidexV1_0_2Activity");
+                        break;
                     case Constant.PART_KEY_MULTIDEX_V2_0_1:
-                        intent.putExtra(Constant.KEY_ACTIVITY_CLASSNAME, "com.tencent.shadow.demo.plugin.multidex.main.PluginMultidexMainActivity");
+                        intent.putExtra(Constant.KEY_ACTIVITY_CLASSNAME, "com.tencent.shadow.demo.plugin.multidex.v2_0_1.PluginMultidexV2_0_1Activity");
                         break;
                 }
                 startActivity(intent);

diff --git a/projects/demo/plugin-multidex/multidex-config.pro b/projects/demo/plugin-multidex/multidex-config.pro
@@ -1 +1,2 @@
 -keep class android.support.multidex.**
+-keep class androidx.multidex.**
diff --git a/projects/demo/plugin-multidex/plugin-multidex-main/src/main/AndroidManifest.xml b/projects/demo/plugin-multidex/plugin-multidex-main/src/main/AndroidManifest.xml
@@ -1,14 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tencent.shadow.demo.plugin.multidex.main">
-
-    <application>
-        <activity android:name=".PluginMultidexMainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>
+<manifest package="com.tencent.shadow.demo.plugin.multidex.main" />
diff --git a/...rc/main/kotlin/com/tencent/shadow/demo/plugin/multidex/main/PluginMultidexMainActivity.kt b/...rc/main/kotlin/com/tencent/shadow/demo/plugin/multidex/main/PluginMultidexMainActivity.kt
@@ -4,7 +4,7 @@ import android.app.Activity
 import android.os.Bundle
 import android.widget.TextView
 
-class PluginMultidexMainActivity : Activity() {
+open class PluginMultidexMainActivity : Activity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

diff --git a/projects/demo/plugin-multidex/plugin-multidex-v1_0_2/src/main/AndroidManifest.xml b/projects/demo/plugin-multidex/plugin-multidex-v1_0_2/src/main/AndroidManifest.xml
@@ -2,5 +2,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.tencent.shadow.demo.plugin.multidex.v1_0_2">
 
-    <application android:name="android.support.multidex.MultiDexApplication" />
+    <application android:name="android.support.multidex.MultiDexApplication">
+        <activity android:name=".PluginMultidexV1_0_2Activity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
 </manifest>
diff --git a/...ain/java/com/tencent/shadow/demo/plugin/multidex/v1_0_2/PluginMultidexV1_0_2Activity.java b/...ain/java/com/tencent/shadow/demo/plugin/multidex/v1_0_2/PluginMultidexV1_0_2Activity.java
@@ -0,0 +1,6 @@
+package com.tencent.shadow.demo.plugin.multidex.v1_0_2;
+
+import com.tencent.shadow.demo.plugin.multidex.main.PluginMultidexMainActivity;
+
+public class PluginMultidexV1_0_2Activity extends PluginMultidexMainActivity {
+}
diff --git a/projects/demo/plugin-multidex/plugin-multidex-v2_0_1/src/main/AndroidManifest.xml b/projects/demo/plugin-multidex/plugin-multidex-v2_0_1/src/main/AndroidManifest.xml
@@ -2,5 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.tencent.shadow.demo.plugin.multidex.v2_0_1">
 
-    <application android:name="androidx.multidex.MultiDexApplication" />
+    <application android:name="androidx.multidex.MultiDexApplication">
+        <activity android:name=".PluginMultidexV2_0_1Activity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
 </manifest>
diff --git a/...ain/java/com/tencent/shadow/demo/plugin/multidex/v2_0_1/PluginMultidexV2_0_1Activity.java b/...ain/java/com/tencent/shadow/demo/plugin/multidex/v2_0_1/PluginMultidexV2_0_1Activity.java
@@ -0,0 +1,6 @@
+package com.tencent.shadow.demo.plugin.multidex.v2_0_1;
+
+import com.tencent.shadow.demo.plugin.multidex.main.PluginMultidexMainActivity;
+
+public class PluginMultidexV2_0_1Activity extends PluginMultidexMainActivity {
+}