增强对插件主题的支持。默认使用插件Manifest文件中Application节点指定的主题；更新测试demo

limpoxe · limpoxe · commit 04fbd53aadec · 2015-10-09T00:02:54.000+08:00
diff --git a/PluginCore/src/com/plugin/core/PluginCompat.java b/PluginCore/src/com/plugin/core/PluginCompat.java
@@ -3,7 +3,6 @@
 import com.plugin.content.PluginDescriptor;
 
 import android.content.Context;
-import android.os.Build;
 
 public class PluginCompat {
 	
@@ -20,7 +19,12 @@ public class PluginCompat {
 	 * @param clazz
 	 */
 	public static void setTheme(Context pluginContext, int resId, @SuppressWarnings("rawtypes") Class clazz) {
-		
+		setTheme(pluginContext, resId, PluginLoader.getPluginDescriptorByClassName(clazz.getName()));
+	}
+
+	public static void setTheme(Context pluginContext, int resId, PluginDescriptor pd) {
+
+		/**
 		boolean isThemeInHostResouce = false;
 		try {
 			//如果使用public.xml,采用下面的判断方式
@@ -36,7 +40,7 @@ public static void setTheme(Context pluginContext, int resId, @SuppressWarnings(
 			}
 		} catch (Exception e) {
 		}
-		
+
 		if (isThemeInHostResouce) {
 			//使用主程序资源Id不需要区分版本
 			pluginContext.setTheme(resId);
@@ -45,12 +49,14 @@ public static void setTheme(Context pluginContext, int resId, @SuppressWarnings(
 			if (Build.VERSION.SDK_INT >= 14 && Build.VERSION.SDK_INT <= 20) {
 				pluginContext.setTheme(resId);
 			} else {
-				PluginDescriptor pd = PluginLoader.getPluginDescriptorByClassName(clazz.getName());
 				((PluginContextTheme)pluginContext).mResources = PluginCreator.createPluginResourceFor5(PluginLoader.getApplicatoin(), pd.getInstalledPath());
 				((PluginContextTheme)pluginContext).mTheme = null;
 				pluginContext.setTheme(resId);
 			}
-		}
+		}*/
+
+		((PluginContextTheme)pluginContext).mTheme = null;
+		pluginContext.setTheme(resId);
 	}
 	
 }
diff --git a/PluginCore/src/com/plugin/core/PluginCreator.java b/PluginCore/src/com/plugin/core/PluginCreator.java
@@ -101,6 +101,9 @@ private static String[] buildAssetPath(boolean isStandalone, String app, String
 
 	}
 
+	/**
+	 * 未使用
+	 */
 	/* package */static Resources createPluginResourceFor5(Application application, String absolutePluginApkPath) {
 		try {
 			AssetManager assetMgr = AssetManager.class.newInstance();
diff --git a/PluginCore/src/com/plugin/core/PluginInjector.java b/PluginCore/src/com/plugin/core/PluginInjector.java
@@ -163,18 +163,7 @@ static void injectActivityContext(Activity activity) {
 			RefInvoker.invokeMethod(activity, ContextThemeWrapper.class.getName(), android_content_ContextThemeWrapper_attachBaseContext,
 					new Class[]{Context.class }, new Object[] { pluginContext });
 
-			// 重设LayoutInflater
-			LogUtil.d(activity.getWindow().getClass().getName());
-			RefInvoker.setFieldObject(activity.getWindow(), activity.getWindow().getClass().getName(),
-					"mLayoutInflater", LayoutInflater.from(pluginContext));
-
-			// 如果api>=11,还要重设factory2
-			if (Build.VERSION.SDK_INT >= 11) {
-				RefInvoker.invokeMethod(activity.getWindow().getLayoutInflater(), LayoutInflater.class.getName(),
-						"setPrivateFactory", new Class[] { LayoutInflater.Factory2.class }, new Object[] { activity });
-			}
-
-			// 由于在attach的时候Resource已经被初始化了，所以还需要重置Resource
+			// 由于在attach的时候Resource已经被初始化了，所以需要重置Resource
 			RefInvoker.setFieldObject(activity, ContextThemeWrapper.class.getName(), android_content_ContextThemeWrapper_mResources, null);
 
 			// 重设theme
@@ -189,6 +178,21 @@ static void injectActivityContext(Activity activity) {
 				activity.setTheme(pluginAppTheme);
 			}
 
+			// 重设theme
+			((PluginContextTheme)pluginContext).mTheme = null;
+			pluginContext.setTheme(pluginAppTheme);
+
+			// 重设LayoutInflater
+			LogUtil.d(activity.getWindow().getClass().getName());
+			RefInvoker.setFieldObject(activity.getWindow(), activity.getWindow().getClass().getName(),
+					"mLayoutInflater", LayoutInflater.from(pluginContext));
+
+			// 如果api>=11,还要重设factory2
+			if (Build.VERSION.SDK_INT >= 11) {
+				RefInvoker.invokeMethod(activity.getWindow().getLayoutInflater(), LayoutInflater.class.getName(),
+						"setPrivateFactory", new Class[]{LayoutInflater.Factory2.class}, new Object[]{activity});
+			}
+
 			//如果是独立插件，由于没有合并资源，这里还需要替换掉 mActivityInfo， 避免activity试图通过ActivityInfo中的资源id来读取资源时失败
 			activityInfo.icon = pd.getApplicationIcon();
 			activityInfo.logo = pd.getApplicationLogo();
diff --git a/PluginMain/assets/PluginTest-debug.apk b/PluginMain/assets/PluginTest-debug.apk
diff --git a/PluginTest/AndroidManifest.xml b/PluginTest/AndroidManifest.xml
@@ -13,13 +13,15 @@
 
  	<application 
  	    android:name="com.example.plugintest.PluginTestApplication"
- 	    android:label="包含UI的插件demo">
+        android:theme="@style/PluginTheme2">
         
         <!-- for fragment -->
         <meta-data android:name="fragment_id_fragmentTest1" android:value="com.example.plugintest.fragment.PluginSpecFragment"/>
         <!-- for fragment -->
         <meta-data android:name="fragment_id_fragmentTest2" android:value="com.example.plugintest.fragment.PluginNormalFragment"/>
-        
+
+        <meta-data android:name="test_meta_1" android:value="123"/>
+
         <activity
             android:name="com.example.plugintest.activity.PluginTestActivity" >
             <intent-filter>
diff --git a/PluginTest/res/values/styles.xml b/PluginTest/res/values/styles.xml
@@ -4,6 +4,13 @@
         <item name="android:gravity">center_vertical|center_horizontal</item>
         <item name="android:textColor">@android:color/black</item>
     </style>
+
+    <style name="MyButton2">
+        <item name="android:background">#00ffA3</item>
+        <item name="android:gravity">center_vertical|center_horizontal</item>
+        <item name="android:textColor">#e3a438</item>
+    </style>
+
     <!--
         Base application theme, dependent on API level. This theme is replaced
         by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
@@ -22,4 +29,9 @@
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
     </style>
 
+    <!-- Application theme. -->
+    <style name="PluginTheme2" parent="AppBaseTheme">
+        <item name="android:buttonStyle">@style/MyButton2</item>
+    </style>
+
 </resources>
diff --git a/PluginTest/src/com/example/plugintest/activity/PluginForOppoAndVivoActivity.java b/PluginTest/src/com/example/plugintest/activity/PluginForOppoAndVivoActivity.java
@@ -14,29 +14,23 @@
 
 import com.example.plugintest.R;
 
-/**
- * 完整生命周期模式 不使用反射、也不使用代理，真真正证实现activity无需在Manifest中注册！
- * 
- * @author cailiming
- *
- */
 public class PluginForOppoAndVivoActivity extends Activity implements OnClickListener {
 
 	private ViewGroup mRoot;
+
 	private LayoutInflater mInflater;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setTitle("测试插件中拥有真正生命周期的Activity");
-		mInflater = getLayoutInflater();
-		View scrollview = mInflater.inflate(R.layout.plugin_layout, null);
+		setTitle("测试插件主题");
 
-		mRoot = (ViewGroup) scrollview.findViewById(R.id.content);
+		setContentView(R.layout.plugin_layout);
 
 		initViews();
 
-		setContentView(scrollview);
+		mInflater = getLayoutInflater();
+
 	}
 
 	@Override
@@ -53,6 +47,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 	}
 	
 	public void initViews() {
+		mRoot = (ViewGroup) findViewById(R.id.content);
 
 		Button btn1 = (Button) mRoot.findViewById(R.id.plugin_test_btn1);
 		btn1.setOnClickListener(this);
diff --git a/PluginTest/src/com/example/plugintest/fragment/PluginNormalFragment.java b/PluginTest/src/com/example/plugintest/fragment/PluginNormalFragment.java
@@ -13,7 +13,7 @@
 import android.widget.Toast;
 
 /**
- * 这个fragment会被嵌在 插件 提供的Activity中展示
+ * 此fragment没有使用特定的context,因此只能在插件中的activity，或者宿主中的特定activity中展示
  */
 public class PluginNormalFragment extends Fragment implements OnClickListener {
 
@@ -28,7 +28,7 @@ public void onCreate(Bundle savedInstanceState) {
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		getActivity().setTitle("测试插件中非自由模式的Fragment");
+		getActivity().setTitle("测试插件中的Fragment，使用插件默认主题");
 
 		mInflater = inflater;
 		View scrollview = mInflater.inflate(R.layout.plugin_layout, null);
diff --git a/PluginTest/src/com/example/plugintest/fragment/PluginSpecFragment.java b/PluginTest/src/com/example/plugintest/fragment/PluginSpecFragment.java
@@ -16,8 +16,10 @@
 import com.plugin.core.PluginLoader;
 
 /**
- * 这个fragment会被嵌在 宿主程序 提供的activity中展示
+ * 此fragment使用了特定的context,因此可以在在插件中的activity，或者宿主中的特定activity、
+ * 或者宿主中的非特定activity中展示
  */
+
 public class PluginSpecFragment extends Fragment implements OnClickListener {
 
 	private ViewGroup mRoot;
@@ -28,7 +30,7 @@ public class PluginSpecFragment extends Fragment implements OnClickListener {
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
-		getActivity().setTitle("测试插件自由模式的Fragment");
+		getActivity().setTitle("测试插件中的Fragment，使用插件中指定的PluginTheme主题");
 
 		// 默认是宿主程序Application主题
 		pluginContext = PluginLoader.getNewPluginContext(PluginSpecFragment.class);

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,9 @@ private static String[] buildAssetPath(boolean isStandalone, String app, String`
`101`	`101`
`102`	`102`	`}`
`103`	`103`
	`104`	`+ /**`
	`105`	`+ * 未使用`
	`106`	`+ */`
`104`	`107`	`/* package */static Resources createPluginResourceFor5(Application application, String absolutePluginApkPath) {`
`105`	`108`	`try {`
`106`	`109`	`AssetManager assetMgr = AssetManager.class.newInstance();`