插件Activity关闭后回收LaunchMode映射关系。

limpoxe · limpoxe · commit eb02038b3d1f · 2015-10-13T00:20:27.000+08:00
diff --git a/PluginCore/src/com/plugin/core/PluginInjector.java b/PluginCore/src/com/plugin/core/PluginInjector.java
@@ -223,7 +223,10 @@ static void injectActivityContext(Activity activity) {
 				if (null != pluginActivityInfo.getScreenOrientation()) {
 					int orientation = Integer.parseInt(pluginActivityInfo.getScreenOrientation());
 					//noinspection ResourceType
-					activity.setRequestedOrientation(orientation);
+					if (orientation != activityInfo.screenOrientation) {
+						//noinspection ResourceType
+						activity.setRequestedOrientation(orientation);
+					}
 				}
 				if (Build.VERSION.SDK_INT >= 18) {
 					Boolean isImmersive = ResourceUtil.getBoolean(pluginActivityInfo.getImmersive(), pluginContext);
diff --git a/PluginCore/src/com/plugin/core/PluginIntentResolver.java b/PluginCore/src/com/plugin/core/PluginIntentResolver.java
@@ -99,7 +99,7 @@ public class PluginIntentResolver {
 
 			PluginActivityInfo pluginActivityInfo = pd.getActivityInfos().get(className);
 
-			String stubActivityName = PluginStubBinding.getLaunchModeStubActivity(className, Integer.parseInt(pluginActivityInfo.getLaunchMode()));
+			String stubActivityName = PluginStubBinding.bindLaunchModeStubActivity(className, Integer.parseInt(pluginActivityInfo.getLaunchMode()));
 
 			intent.setComponent(
 					new ComponentName(PluginLoader.getApplicatoin().getPackageName(), stubActivityName));
diff --git a/PluginCore/src/com/plugin/core/PluginLoader.java b/PluginCore/src/com/plugin/core/PluginLoader.java
@@ -8,15 +8,19 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
+import android.app.Activity;
 import android.app.Application;
 import android.app.Instrumentation;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.Signature;
 import android.content.res.Resources;
+import android.os.Build;
+import android.os.Bundle;
 import android.text.TextUtils;
 
 import com.plugin.content.PluginDescriptor;
@@ -84,6 +88,39 @@ public static synchronized void initLoader(Application app, PluginManager manage
 			pluginManager.loadInstalledPlugins();
 			changeListener.onPluginLoaderInited();
 
+			if (Build.VERSION.SDK_INT >= 14) {
+
+				sApplication.registerActivityLifecycleCallbacks(new Application.ActivityLifecycleCallbacks() {
+					@Override
+					public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+					}
+
+					@Override
+					public void onActivityStarted(Activity activity) {
+					}
+
+					@Override
+					public void onActivityResumed(Activity activity) {
+					}
+
+					@Override
+					public void onActivityPaused(Activity activity) {
+					}
+
+					@Override
+					public void onActivityStopped(Activity activity) {
+					}
+
+					@Override
+					public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+					}
+
+					@Override
+					public void onActivityDestroyed(Activity activity) {
+						PluginStubBinding.unBindLaunchModeStubActivity(activity.getClass().getName(), activity.getIntent());
+					}
+				});
+			}
 			LogUtil.d("插件框架初始化完成");
 		}
 	}
diff --git a/PluginCore/src/com/plugin/core/PluginStubBinding.java b/PluginCore/src/com/plugin/core/PluginStubBinding.java
@@ -1,5 +1,6 @@
 package com.plugin.core;
 
+import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
@@ -21,13 +22,17 @@ public class PluginStubBinding {
 
 	private static final String ACTION_LAUNCH_MODE = "com.plugin.core.LAUNCH_MODE";
 
+	/**
+	 * key:stub Activity Name
+	 * value:plugin Activity Name
+	 */
 	private static HashMap<String, String> singleTaskMapping = new HashMap<String, String>();
 	private static HashMap<String, String> singleTopMapping = new HashMap<String, String>();
 	private static HashMap<String, String> singleInstanceMapping = new HashMap<String, String>();
 
 	private static boolean isPoolInited = false;
 
-	public static String getLaunchModeStubActivity(String pluginActivityClassName, int launchMode) {
+	public static String bindLaunchModeStubActivity(String pluginActivityClassName, int launchMode) {
 
 		initPool();
 
@@ -108,4 +113,22 @@ private static void initPool() {
 
 		isPoolInited = true;
 	}
+
+	public static void unBindLaunchModeStubActivity(String activityName, Intent intent) {
+		if (activityName.startsWith(PluginStubBinding.STUB_ACTIVITY_PRE)) {
+			if (intent != null) {
+				ComponentName cn = intent.getComponent();
+				if (cn != null) {
+					String pluginActivityName = cn.getClassName();
+					if (pluginActivityName.equals(singleTaskMapping.get(activityName))) {
+						singleTaskMapping.put(activityName, null);
+					} else if (pluginActivityName.equals(singleInstanceMapping.get(activityName))) {
+						singleInstanceMapping.put(activityName, null);
+					} else {
+						//对于standard和singleTop的launchmode，不做处理。
+					}
+				}
+			}
+		}
+	}
 }
