update core for 5.x and 2.x theme compat

limpoxe · limpoxe · commit 6e204b89a2f0 · 2015-05-14T15:21:36.000+08:00
Signed-off-by: Cai Liming &lt;405977146@163.com&gt;
diff --git a/PluginCore/src/com/plugin/core/PluginCompat.java b/PluginCore/src/com/plugin/core/PluginCompat.java
@@ -0,0 +1,38 @@
+package com.plugin.core;
+
+import android.content.Context;
+import android.os.Build;
+
+public class PluginCompat {
+	
+	/**
+	 * 
+	 * @param pluginContext
+	 * @param resId    宿主程序中定义的主题资源ID
+	 * @param clazz
+	 */
+	public static void applyHostTheme(Context pluginContext, int resId, @SuppressWarnings("rawtypes") Class clazz) {
+		//使用主程序资源Id不需要区分版本
+		pluginContext.setTheme(resId);
+	}
+	
+	/**
+	 * 
+	 * @param pluginContext
+	 * @param resId  插件程序中定义的主题资源ID
+	 * @param clazz
+	 */
+	public static void applyPluginTheme(Context pluginContext, int resId, @SuppressWarnings("rawtypes") Class clazz) {
+		//使用插件程序主题资源Id的时候需要区分版本
+		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);
+		}
+	}
+ 
+	
+}
diff --git a/PluginCore/src/com/plugin/core/PluginContextTheme.java b/PluginCore/src/com/plugin/core/PluginContextTheme.java
@@ -10,10 +10,10 @@
 
 public class PluginContextTheme extends ContextWrapper {
     private int mThemeResource;
-    private Resources.Theme mTheme;
+    Resources.Theme mTheme;
     private LayoutInflater mInflater;
     
-    private Resources mResources;
+    Resources mResources;
     private ClassLoader mClassLoader;
 
     public PluginContextTheme(Context base, Resources resources, ClassLoader classLoader) {
diff --git a/PluginCore/src/com/plugin/core/PluginLoader.java b/PluginCore/src/com/plugin/core/PluginLoader.java
@@ -221,32 +221,13 @@ public static Context getDefaultPluginContext(@SuppressWarnings("rawtypes") Clas
 	 * @return
 	 */
 	public static Context getNewPluginContext(@SuppressWarnings("rawtypes") Class clazz) {
-
 		Context pluginContext = getDefaultPluginContext(clazz);
-		//为了使5.0支持主题， 这里做api版本区分
-		if (Build.VERSION.SDK_INT >= 14 && Build.VERSION.SDK_INT <= 20 ) {
-			
-			if (pluginContext != null) {
-				pluginContext = PluginCreator.createPluginApplicationContext(sApplication,
-						pluginContext.getResources(), (DexClassLoader)pluginContext.getClassLoader());
-				pluginContext.setTheme(sApplication.getApplicationContext().getApplicationInfo().theme);
-			}
-			
-			return pluginContext;
-			
-		} else {
-			PluginDescriptor pd = getPluginDescriptorByClassName(clazz.getName());
-
-			Resources resFor5 = PluginCreator.createPluginResourceFor5(sApplication, pd.getInstalledPath());
-			
-			if (pluginContext != null) {
-				pluginContext = PluginCreator.createPluginApplicationContext(sApplication,
-						resFor5, (DexClassLoader)pluginContext.getClassLoader());
-				pluginContext.setTheme(sApplication.getApplicationContext().getApplicationInfo().theme);
-			}
-			return pluginContext;
+		if (pluginContext != null) {
+			pluginContext = PluginCreator.createPluginApplicationContext(sApplication,
+					pluginContext.getResources(), (DexClassLoader)pluginContext.getClassLoader());
+			pluginContext.setTheme(sApplication.getApplicationContext().getApplicationInfo().theme);
 		}
-		
+		return pluginContext;
 	}
 
 	/**
@@ -358,7 +339,7 @@ public static PluginDescriptor getPluginDescriptorByPluginId(String pluginId) {
 		return null;
 	}
 	
-	private static PluginDescriptor getPluginDescriptorByClassName(String clazzName) {
+	public static PluginDescriptor getPluginDescriptorByClassName(String clazzName) {
 		Iterator<PluginDescriptor> itr = sInstalledPlugins.values().iterator();
 		while (itr.hasNext()) {
 			PluginDescriptor descriptor = itr.next();
