增加对插件Activity横竖屏配置、输入法mode配置的支持

limpoxe · limpoxe · commit 6960197418df · 2015-10-10T00:47:29.000+08:00
diff --git a/PluginCore/src/com/plugin/content/PluginActivityInfo.java b/PluginCore/src/com/plugin/content/PluginActivityInfo.java
@@ -17,6 +17,15 @@ public class PluginActivityInfo implements Serializable {
 	private String screenOrientation;//string
 	private String theme;//int
 	private String immersive;//int string
+	private String uiOptions;
+
+	public String getUiOptions() {
+		return uiOptions;
+	}
+
+	public void setUiOptions(String uiOptions) {
+		this.uiOptions = uiOptions;
+	}
 
 	public String getImmersive() {
 		return immersive;
diff --git a/PluginCore/src/com/plugin/core/PluginInjector.java b/PluginCore/src/com/plugin/core/PluginInjector.java
@@ -13,6 +13,7 @@
 import android.os.Handler;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
+import android.view.Window;
 
 import com.plugin.content.PluginActivityInfo;
 import com.plugin.content.PluginDescriptor;
@@ -192,6 +193,14 @@ static void injectActivityContext(Activity activity) {
 			((PluginContextTheme)pluginContext).mTheme = null;
 			pluginContext.setTheme(pluginAppTheme);
 
+			//重设mContext
+			RefInvoker.setFieldObject(activity.getWindow(), Window.class.getName(),
+					"mContext", pluginContext);
+
+			//重设mWindowStyle
+			RefInvoker.setFieldObject(activity.getWindow(), Window.class.getName(),
+					"mWindowStyle", null);
+
 			// 重设LayoutInflater
 			LogUtil.d(activity.getWindow().getClass().getName());
 			RefInvoker.setFieldObject(activity.getWindow(), activity.getWindow().getClass().getName(),
@@ -204,10 +213,19 @@ static void injectActivityContext(Activity activity) {
 			}
 
 			if (pluginActivityInfo != null) {
+
+				if (null != pluginActivityInfo.getWindowSoftInputMode()) {
+					activity.getWindow().setSoftInputMode(Integer.parseInt(pluginActivityInfo.getWindowSoftInputMode().replace("0x", ""), 16));
+				}
+				if (Build.VERSION.SDK_INT >= 14) {
+					if (null != pluginActivityInfo.getUiOptions()) {
+						activity.getWindow().setUiOptions(Integer.parseInt(pluginActivityInfo.getUiOptions().replace("0x", ""), 16));
+					}
+				}
 				if (null != pluginActivityInfo.getScreenOrientation()) {
 					int orientation = Integer.parseInt(pluginActivityInfo.getScreenOrientation());
 					//noinspection ResourceType
-					//activity.setRequestedOrientation(orientation);
+					activity.setRequestedOrientation(orientation);
 				}
 				if (Build.VERSION.SDK_INT >= 18) {
 					Boolean isImmersive = ResourceUtil.getBoolean(pluginActivityInfo.getImmersive(), pluginContext);
@@ -220,7 +238,7 @@ static void injectActivityContext(Activity activity) {
 				LogUtil.d(activity.getClass().getName(), "screenOrientation", pluginActivityInfo.getScreenOrientation());
 				LogUtil.d(activity.getClass().getName(), "launchMode", pluginActivityInfo.getLaunchMode());
 				LogUtil.d(activity.getClass().getName(), "windowSoftInputMode", pluginActivityInfo.getWindowSoftInputMode());
-
+				LogUtil.d(activity.getClass().getName(), "uiOptions", pluginActivityInfo.getUiOptions());
 			}
 
 			//如果是独立插件，由于没有合并资源，这里还需要替换掉 mActivityInfo， 避免activity试图通过ActivityInfo中的资源id来读取资源时失败
diff --git a/PluginCore/src/com/plugin/core/PluginInstrumentionWrapper.java b/PluginCore/src/com/plugin/core/PluginInstrumentionWrapper.java
@@ -45,23 +45,35 @@ public Activity newActivity(ClassLoader cl, String className, Intent intent) thr
 			IllegalAccessException, ClassNotFoundException {
 		// 将PluginStubActivity替换成插件中的activity
 		if (className.equals(PluginStubActivity.class.getName())) {
+
 			String action = intent.getAction();
-			if (action != null) {
+
+			//
+			if (action != null && action.contains(PluginIntentResolver.ACTIVITY_ACTION_IN_PLUGIN)) {
 
 				String[] targetClassName  = action.split(PluginIntentResolver.ACTIVITY_ACTION_IN_PLUGIN);
 
 				LogUtil.d(className, action, targetClassName[0]);
-				Class clazz = PluginLoader.loadPluginClassByName(targetClassName[0]);
-				cl = clazz.getClassLoader();
+
 				className = targetClassName[0];
+				Class clazz = PluginLoader.loadPluginClassByName(className);
+				cl = clazz.getClassLoader();
 
 				intent.setExtrasClassLoader(cl);
+				intent.putExtra(PluginIntentResolver.ACTIVITY_ACTION_IN_PLUGIN, className);
 				//由于之前intent被修改过 这里再吧Intent还原到原始的intent
 				if (targetClassName.length >1) {
 					intent.setAction(targetClassName[1]);
 				} else {
 					intent.setAction(null);
 				}
+
+			} else {
+				//进入这个分支可能是activity重启了，比如横竖屏切换
+				className = intent.getStringExtra(PluginIntentResolver.ACTIVITY_ACTION_IN_PLUGIN);
+				Class clazz = PluginLoader.loadPluginClassByName(className);
+
+				cl = clazz.getClassLoader();
 			}
 		}
 
diff --git a/PluginCore/src/com/plugin/util/ManifestParser.java b/PluginCore/src/com/plugin/util/ManifestParser.java
@@ -115,6 +115,7 @@ public static PluginDescriptor parseManifest(String pluginPath) {
                             String screenOrientation = parser.getAttributeValue(namespaceAndroid, "screenOrientation");//string
                             String theme = parser.getAttributeValue(namespaceAndroid, "theme");//int
                             String immersive = parser.getAttributeValue(namespaceAndroid, "immersive");//int string
+                            String uiOptions = parser.getAttributeValue(namespaceAndroid, "uiOptions");//int string
 
                             HashMap<String, ArrayList<PluginIntentFilter>> map = desciptor.getActivitys();
                             if (map == null) {
@@ -141,6 +142,7 @@ public static PluginDescriptor parseManifest(String pluginPath) {
                             pluginActivityInfo.setScreenOrientation(screenOrientation);
                             pluginActivityInfo.setTheme(theme);
                             pluginActivityInfo.setWindowSoftInputMode(windowSoftInputMode);
+                            pluginActivityInfo.setUiOptions(uiOptions);
 
                         } else if ("receiver".equals(parser.getName())) {
 
diff --git a/PluginMain/assets/PluginTest-debug.apk b/PluginMain/assets/PluginTest-debug.apk
diff --git a/PluginTest/AndroidManifest.xml b/PluginTest/AndroidManifest.xml
@@ -50,6 +50,7 @@
             android:launchMode="singleTop"
             android:immersive="true"
             android:screenOrientation="landscape"
+            android:uiOptions="splitActionBarWhenNarrow"
             android:theme="@style/PluginTheme">
             <intent-filter>
                 <action
